From 3bb2849a88f278a780f42ad31baabba2adc6fa86 Mon Sep 17 00:00:00 2001
From: David Kramer <daveskypilot@gmail.com>
Date: Mon, 18 Jun 2018 13:06:34 -0600
Subject: [PATCH 001/912] Sends broadcast on app open to notify addon termux
 receivers

---
 .../java/com/termux/app/TermuxActivity.java   | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index d50ab4304e..9478ca7cf0 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -17,6 +17,7 @@
 import android.content.IntentFilter;
 import android.content.ServiceConnection;
 import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
 import android.graphics.Color;
 import android.graphics.Paint;
 import android.graphics.Typeface;
@@ -104,6 +105,8 @@ public final class TermuxActivity extends Activity implements ServiceConnection
 
     private static final String RELOAD_STYLE_ACTION = "com.termux.app.reload_style";
 
+    private static final String BROADCAST_TERMUX_OPENED = "com.termux.app.OPENED";
+
     /** The main view of the activity showing the terminal. Initialized in onCreate(). */
     @SuppressWarnings("NullableProblems")
     @NonNull
@@ -334,6 +337,26 @@ public boolean onLongClick(View v) {
         checkForFontAndColors();
 
         mBellSoundId = mBellSoundPool.load(this, R.raw.bell, 1);
+
+        sendOpenedBroadcast();
+    }
+
+    /**
+     * Send a broadcast notifying Termux app has been opened
+     */
+    void sendOpenedBroadcast() {
+        Intent broadcast = new Intent(BROADCAST_TERMUX_OPENED);
+        List<ResolveInfo> matches = getPackageManager().queryBroadcastReceivers(broadcast, 0);
+
+        // send broadcast to registered Termux receivers
+        // this technique is needed to work around broadcast changes that Oreo introduced
+        for (ResolveInfo info : matches) {
+            Intent explicitBroadcast = new Intent(broadcast);
+            ComponentName cname = new ComponentName(info.activityInfo.applicationInfo.packageName,
+                                                    info.activityInfo.name);
+            explicitBroadcast.setComponent(cname);
+            sendBroadcast(explicitBroadcast);
+        }
     }
 
     void toggleShowExtraKeys() {

From 35a4fdacbe4d75bae0d648cf66a6526d0daee313 Mon Sep 17 00:00:00 2001
From: mao <maokai1905@gmail.com>
Date: Sat, 5 Oct 2019 18:05:42 +0800
Subject: [PATCH 002/912] Add selection mode cursor controller

---
 .../java/com/termux/view/TerminalView.java    | 741 +++++++++++++++---
 1 file changed, 635 insertions(+), 106 deletions(-)

diff --git a/terminal-view/src/main/java/com/termux/view/TerminalView.java b/terminal-view/src/main/java/com/termux/view/TerminalView.java
index 9ec398046b..2065248779 100644
--- a/terminal-view/src/main/java/com/termux/view/TerminalView.java
+++ b/terminal-view/src/main/java/com/termux/view/TerminalView.java
@@ -8,14 +8,13 @@
 import android.graphics.Canvas;
 import android.graphics.Rect;
 import android.graphics.Typeface;
-import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.text.Editable;
 import android.text.InputType;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.util.Log;
-import android.view.accessibility.AccessibilityManager;
 import android.view.ActionMode;
 import android.view.HapticFeedbackConstants;
 import android.view.InputDevice;
@@ -25,9 +24,16 @@
 import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.View;
+import android.view.ViewConfiguration;
+import android.view.ViewGroup;
+import android.view.ViewParent;
+import android.view.ViewTreeObserver;
+import android.view.WindowManager;
+import android.view.accessibility.AccessibilityManager;
 import android.view.inputmethod.BaseInputConnection;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputConnection;
+import android.widget.PopupWindow;
 import android.widget.Scroller;
 
 import com.termux.terminal.EmulatorDebug;
@@ -54,11 +60,14 @@ public final class TerminalView extends View {
     /** The top row of text to display. Ranges from -activeTranscriptRows to 0. */
     int mTopRow;
 
-    boolean mIsSelectingText = false, mIsDraggingLeftSelection, mInitialTextSelection;
+    boolean mIsSelectingText = false;
     int mSelX1 = -1, mSelX2 = -1, mSelY1 = -1, mSelY2 = -1;
-    float mSelectionDownX, mSelectionDownY;
     private ActionMode mActionMode;
-    private BitmapDrawable mLeftSelectionHandle, mRightSelectionHandle;
+    Drawable mSelectHandleLeft;
+    Drawable mSelectHandleRight;
+    final int[] mTempCoords = new int[2];
+    Rect mTempRect;
+    private SelectionModifierCursorController mSelectionModifierCursorController;
 
     float mScaleFactor = 1.f;
     final GestureAndScaleRecognizer mGestureRecognizer;
@@ -102,7 +111,7 @@ public boolean onUp(MotionEvent e) {
             public boolean onSingleTapUp(MotionEvent e) {
                 if (mEmulator == null) return true;
                 if (mIsSelectingText) {
-                    toggleSelectingText(null);
+                    stopTextSelectionMode();
                     return true;
                 }
                 requestFocus();
@@ -117,7 +126,7 @@ public boolean onSingleTapUp(MotionEvent e) {
 
             @Override
             public boolean onScroll(MotionEvent e, float distanceX, float distanceY) {
-                if (mEmulator == null || mIsSelectingText) return true;
+                if (mEmulator == null) return true;
                 if (mEmulator.isMouseTrackingActive() && e.isFromSource(InputDevice.SOURCE_MOUSE)) {
                     // If moving with mouse pointer while pressing button, report that instead of scroll.
                     // This means that we never report moving with button press-events for touch input,
@@ -195,7 +204,7 @@ public void onLongPress(MotionEvent e) {
                 if (mClient.onLongPress(e)) return;
                 if (!mIsSelectingText) {
                     performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);
-                    toggleSelectingText(e);
+                    startSelectingText(e);
                 }
             }
         });
@@ -368,7 +377,7 @@ public void onScreenUpdated() {
             if (-mTopRow + rowShift > rowsInHistory) {
                 // .. unless we're hitting the end of history transcript, in which
                 // case we abort text selection and scroll to end.
-                toggleSelectingText(null);
+                stopTextSelectionMode();
             } else {
                 skipScrolling = true;
                 mTopRow -= rowShift;
@@ -475,56 +484,7 @@ public boolean onTouchEvent(MotionEvent ev) {
         final int action = ev.getAction();
 
         if (mIsSelectingText) {
-            int cy = (int) (ev.getY() / mRenderer.mFontLineSpacing) + mTopRow;
-            int cx = (int) (ev.getX() / mRenderer.mFontWidth);
-
-            switch (action) {
-                case MotionEvent.ACTION_UP:
-                    mInitialTextSelection = false;
-                    break;
-                case MotionEvent.ACTION_DOWN:
-                    int distanceFromSel1 = Math.abs(cx - mSelX1) + Math.abs(cy - mSelY1);
-                    int distanceFromSel2 = Math.abs(cx - mSelX2) + Math.abs(cy - mSelY2);
-                    mIsDraggingLeftSelection = distanceFromSel1 <= distanceFromSel2;
-                    mSelectionDownX = ev.getX();
-                    mSelectionDownY = ev.getY();
-                    break;
-                case MotionEvent.ACTION_MOVE:
-                    if (mInitialTextSelection) break;
-                    float deltaX = ev.getX() - mSelectionDownX;
-                    float deltaY = ev.getY() - mSelectionDownY;
-                    int deltaCols = (int) Math.ceil(deltaX / mRenderer.mFontWidth);
-                    int deltaRows = (int) Math.ceil(deltaY / mRenderer.mFontLineSpacing);
-                    mSelectionDownX += deltaCols * mRenderer.mFontWidth;
-                    mSelectionDownY += deltaRows * mRenderer.mFontLineSpacing;
-                    if (mIsDraggingLeftSelection) {
-                        mSelX1 += deltaCols;
-                        mSelY1 += deltaRows;
-                    } else {
-                        mSelX2 += deltaCols;
-                        mSelY2 += deltaRows;
-                    }
-
-                    mSelX1 = Math.min(mEmulator.mColumns, Math.max(0, mSelX1));
-                    mSelX2 = Math.min(mEmulator.mColumns, Math.max(0, mSelX2));
-
-                    if (mSelY1 == mSelY2 && mSelX1 > mSelX2 || mSelY1 > mSelY2) {
-                        // Switch handles.
-                        mIsDraggingLeftSelection = !mIsDraggingLeftSelection;
-                        int tmpX1 = mSelX1, tmpY1 = mSelY1;
-                        mSelX1 = mSelX2;
-                        mSelY1 = mSelY2;
-                        mSelX2 = tmpX1;
-                        mSelY2 = tmpY1;
-                    }
-
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M)
-                        mActionMode.invalidateContentRect();
-                    invalidate();
-                    break;
-                default:
-                    break;
-            }
+            updateFloatingToolbarVisibility(ev);
             mGestureRecognizer.onTouchEvent(ev);
             return true;
         } else if (ev.isFromSource(InputDevice.SOURCE_MOUSE)) {
@@ -562,7 +522,7 @@ public boolean onKeyPreIme(int keyCode, KeyEvent event) {
             Log.i(EmulatorDebug.LOG_TAG, "onKeyPreIme(keyCode=" + keyCode + ", event=" + event + ")");
         if (keyCode == KeyEvent.KEYCODE_BACK) {
             if (mIsSelectingText) {
-                toggleSelectingText(null);
+                stopTextSelectionMode();
                 return true;
             } else if (mClient.shouldBackButtonBeMappedToEscape()) {
                 // Intercept back button to treat it as escape:
@@ -771,59 +731,439 @@ protected void onDraw(Canvas canvas) {
         } else {
             mRenderer.render(mEmulator, canvas, mTopRow, mSelY1, mSelY2, mSelX1, mSelX2);
 
-            if (mIsSelectingText) {
-                final int gripHandleWidth = mLeftSelectionHandle.getIntrinsicWidth();
-                final int gripHandleMargin = gripHandleWidth / 4; // See the png.
-
-                int right = Math.round((mSelX1) * mRenderer.mFontWidth) + gripHandleMargin;
-                int top = (mSelY1 + 1 - mTopRow) * mRenderer.mFontLineSpacing + mRenderer.mFontLineSpacingAndAscent;
-                mLeftSelectionHandle.setBounds(right - gripHandleWidth, top, right, top + mLeftSelectionHandle.getIntrinsicHeight());
-                mLeftSelectionHandle.draw(canvas);
 
-                int left = Math.round((mSelX2 + 1) * mRenderer.mFontWidth) - gripHandleMargin;
-                top = (mSelY2 + 1 - mTopRow) * mRenderer.mFontLineSpacing + mRenderer.mFontLineSpacingAndAscent;
-                mRightSelectionHandle.setBounds(left, top, left + gripHandleWidth, top + mRightSelectionHandle.getIntrinsicHeight());
-                mRightSelectionHandle.draw(canvas);
+            SelectionModifierCursorController selectionController = getSelectionController();
+            if (selectionController != null && selectionController.isActive()) {
+                selectionController.updatePosition();
             }
         }
     }
 
     /** Toggle text selection mode in the view. */
     @TargetApi(23)
-    public void toggleSelectingText(MotionEvent ev) {
-        mIsSelectingText = !mIsSelectingText;
-        mClient.copyModeChanged(mIsSelectingText);
+    public void startSelectingText(MotionEvent ev) {
+        int cx = (int) (ev.getX() / mRenderer.mFontWidth);
+        final boolean eventFromMouse = ev.isFromSource(InputDevice.SOURCE_MOUSE);
+        // Offset for finger:
+        final int SELECT_TEXT_OFFSET_Y = eventFromMouse ? 0 : -40;
+        int cy = (int) ((ev.getY() + SELECT_TEXT_OFFSET_Y) / mRenderer.mFontLineSpacing) + mTopRow;
+
+        mSelX1 = mSelX2 = cx;
+        mSelY1 = mSelY2 = cy;
+
+        TerminalBuffer screen = mEmulator.getScreen();
+        if (!" ".equals(screen.getSelectedText(mSelX1, mSelY1, mSelX1, mSelY1))) {
+            // Selecting something other than whitespace. Expand to word.
+            while (mSelX1 > 0 && !"".equals(screen.getSelectedText(mSelX1 - 1, mSelY1, mSelX1 - 1, mSelY1))) {
+                mSelX1--;
+            }
+            while (mSelX2 < mEmulator.mColumns - 1 && !"".equals(screen.getSelectedText(mSelX2 + 1, mSelY1, mSelX2 + 1, mSelY1))) {
+                mSelX2++;
+            }
+        }
+        startTextSelectionMode();
+    }
 
-        if (mIsSelectingText) {
-            if (mLeftSelectionHandle == null) {
-                mLeftSelectionHandle = (BitmapDrawable) getContext().getDrawable(R.drawable.text_select_handle_left_material);
-                mRightSelectionHandle = (BitmapDrawable) getContext().getDrawable(R.drawable.text_select_handle_right_material);
+    public TerminalSession getCurrentSession() {
+        return mTermSession;
+    }
+
+    private CharSequence getText() {
+        return mEmulator.getScreen().getSelectedText(0, mTopRow, mEmulator.mColumns, mTopRow + mEmulator.mRows);
+    }
+
+    @Override
+    protected void onAttachedToWindow() {
+        super.onAttachedToWindow();
+
+        if (mSelectionModifierCursorController != null) {
+            getViewTreeObserver().addOnTouchModeChangeListener(mSelectionModifierCursorController);
+        }
+    }
+
+    @Override
+    protected void onDetachedFromWindow() {
+        super.onDetachedFromWindow();
+
+        if (mSelectionModifierCursorController != null) {
+            getViewTreeObserver().removeOnTouchModeChangeListener(mSelectionModifierCursorController);
+            mSelectionModifierCursorController.onDetached();
+        }
+    }
+
+
+    private int getCursorX(float x) {
+        return (int) (x / mRenderer.mFontWidth);
+    }
+
+    private int getCursorY(float y) {
+        return (int) (((y - 40) / mRenderer.mFontLineSpacing) + mTopRow);
+    }
+
+    private int getPointX(int cx) {
+        if (cx > mEmulator.mColumns) {
+            cx = mEmulator.mColumns;
+        }
+        return Math.round(cx * mRenderer.mFontWidth);
+    }
+
+    private int getPointY(int cy) {
+        return Math.round((cy - mTopRow) * mRenderer.mFontLineSpacing);
+    }
+
+    /**
+     * A CursorController instance can be used to control a cursor in the text.
+     * It is not used outside of {@link TerminalView}.
+     */
+    private interface CursorController extends ViewTreeObserver.OnTouchModeChangeListener {
+        /**
+         * Makes the cursor controller visible on screen. Will be drawn by {@link #draw(Canvas)}.
+         * See also {@link #hide()}.
+         */
+        void show();
+
+        /**
+         * Hide the cursor controller from screen.
+         * See also {@link #show()}.
+         */
+        void hide();
+
+        /**
+         * @return true if the CursorController is currently visible
+         */
+        boolean isActive();
+
+        /**
+         * Update the controller's position.
+         */
+        void updatePosition(HandleView handle, int x, int y);
+
+        void updatePosition();
+
+        /**
+         * This method is called by {@link #onTouchEvent(MotionEvent)} and gives the controller
+         * a chance to become active and/or visible.
+         *
+         * @param event The touch event
+         */
+        boolean onTouchEvent(MotionEvent event);
+
+        /**
+         * Called when the view is detached from window. Perform house keeping task, such as
+         * stopping Runnable thread that would otherwise keep a reference on the context, thus
+         * preventing the activity to be recycled.
+         */
+        void onDetached();
+    }
+
+    private class HandleView extends View {
+        private Drawable mDrawable;
+        private PopupWindow mContainer;
+        private int mPointX;
+        private int mPointY;
+        private CursorController mController;
+        private boolean mIsDragging;
+        private float mTouchToWindowOffsetX;
+        private float mTouchToWindowOffsetY;
+        private float mHotspotX;
+        private float mHotspotY;
+        private float mTouchOffsetY;
+        private int mLastParentX;
+        private int mLastParentY;
+
+        int mHandleWidth;
+        private final int mOrigOrient;
+        private int mOrientation;
+
+
+        public static final int LEFT = 0;
+        public static final int RIGHT = 2;
+        private int mHandleHeight;
+
+        public HandleView(CursorController controller, int orientation) {
+            super(TerminalView.this.getContext());
+            mController = controller;
+            mContainer = new PopupWindow(TerminalView.this.getContext(), null,
+                android.R.attr.textSelectHandleWindowStyle);
+            mContainer.setSplitTouchEnabled(true);
+            mContainer.setClippingEnabled(false);
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                mContainer.setWindowLayoutType(WindowManager.LayoutParams.TYPE_APPLICATION_SUB_PANEL);
             }
+            mContainer.setWidth(ViewGroup.LayoutParams.WRAP_CONTENT);
+            mContainer.setHeight(ViewGroup.LayoutParams.WRAP_CONTENT);
 
-            int cx = (int) (ev.getX() / mRenderer.mFontWidth);
-            final boolean eventFromMouse = ev.isFromSource(InputDevice.SOURCE_MOUSE);
-            // Offset for finger:
-            final int SELECT_TEXT_OFFSET_Y = eventFromMouse ? 0 : -40;
-            int cy = (int) ((ev.getY() + SELECT_TEXT_OFFSET_Y) / mRenderer.mFontLineSpacing) + mTopRow;
+            this.mOrigOrient = orientation;
+            setOrientation(orientation);
+        }
+
+        public void setOrientation(int orientation) {
+            mOrientation = orientation;
+            int handleWidth = 0;
+            switch (orientation) {
+                case LEFT: {
+                    if (mSelectHandleLeft == null) {
 
-            mSelX1 = mSelX2 = cx;
-            mSelY1 = mSelY2 = cy;
+                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                            mSelectHandleLeft = getContext().getDrawable(
+                                R.drawable.text_select_handle_left_material);
+                        } else {
+                            mSelectHandleLeft = getContext().getResources().getDrawable(
+                                R.drawable.text_select_handle_left_material);
 
-            TerminalBuffer screen = mEmulator.getScreen();
-            if (!" ".equals(screen.getSelectedText(mSelX1, mSelY1, mSelX1, mSelY1))) {
-                // Selecting something other than whitespace. Expand to word.
-                while (mSelX1 > 0 && !"".equals(screen.getSelectedText(mSelX1 - 1, mSelY1, mSelX1 - 1, mSelY1))) {
-                    mSelX1--;
+                        }
+                    }
+                    //
+                    mDrawable = mSelectHandleLeft;
+                    handleWidth = mDrawable.getIntrinsicWidth();
+                    mHotspotX = (handleWidth * 3) / 4;
+                    break;
                 }
-                while (mSelX2 < mEmulator.mColumns - 1 && !"".equals(screen.getSelectedText(mSelX2 + 1, mSelY1, mSelX2 + 1, mSelY1))) {
-                    mSelX2++;
+
+                case RIGHT: {
+                    if (mSelectHandleRight == null) {
+                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                            mSelectHandleRight = getContext().getDrawable(
+                                R.drawable.text_select_handle_right_material);
+                        } else {
+                            mSelectHandleRight = getContext().getResources().getDrawable(
+                                R.drawable.text_select_handle_right_material);
+                        }
+                    }
+                    mDrawable = mSelectHandleRight;
+                    handleWidth = mDrawable.getIntrinsicWidth();
+                    mHotspotX = handleWidth / 4;
+                    break;
                 }
+
+            }
+
+            mHandleHeight = mDrawable.getIntrinsicHeight();
+
+            mHandleWidth = handleWidth;
+            mTouchOffsetY = -mHandleHeight * 0.3f;
+            mHotspotY = 0;
+            invalidate();
+        }
+
+        public void changeOrientation(int orientation) {
+            if (mOrientation != orientation) {
+                setOrientation(orientation);
             }
+        }
+
+        @Override
+        public void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+            setMeasuredDimension(mDrawable.getIntrinsicWidth(),
+                mDrawable.getIntrinsicHeight());
+        }
+
+        public void show() {
+            if (!isPositionVisible()) {
+                hide();
+                return;
+            }
+            mContainer.setContentView(this);
+            final int[] coords = mTempCoords;
+            TerminalView.this.getLocationInWindow(coords);
+            coords[0] += mPointX;
+            coords[1] += mPointY;
+            mContainer.showAtLocation(TerminalView.this, 0, coords[0], coords[1]);
+        }
 
-            mInitialTextSelection = true;
-            mIsDraggingLeftSelection = true;
-            mSelectionDownX = ev.getX();
-            mSelectionDownY = ev.getY();
+        public void hide() {
+            mIsDragging = false;
+            mContainer.dismiss();
+        }
+
+        public boolean isShowing() {
+            return mContainer.isShowing();
+        }
+
+        private void checkChangedOrientation() {
+
+            final TerminalView hostView = TerminalView.this;
+            final int left = hostView.getLeft();
+            final int right = hostView.getWidth();
+            final int top = hostView.getTop();
+            final int bottom = hostView.getHeight();
+
+            if (mTempRect == null) {
+                mTempRect = new Rect();
+            }
+            final Rect clip = mTempRect;
+            clip.left = left + TerminalView.this.getPaddingLeft();
+            clip.top = top + TerminalView.this.getPaddingTop();
+            clip.right = right - TerminalView.this.getPaddingRight();
+            clip.bottom = bottom - TerminalView.this.getPaddingBottom();
+
+            final ViewParent parent = hostView.getParent();
+            if (parent == null || !parent.getChildVisibleRect(hostView, clip, null)) {
+                return;
+            }
+
+            final int[] coords = mTempCoords;
+            hostView.getLocationInWindow(coords);
+            final int posX = coords[0] + mPointX;
+            if (posX + (int) mHotspotX < clip.left) {
+                changeOrientation(RIGHT);
+            } else if (posX + mHandleWidth > clip.right) {
+                changeOrientation(LEFT);
+            } else {
+                changeOrientation(mOrigOrient);
+            }
+        }
+
+        private boolean isPositionVisible() {
+            // Always show a dragging handle.
+            if (mIsDragging) {
+                return true;
+            }
+
+            final TerminalView hostView = TerminalView.this;
+            final int left = 0;
+            final int right = hostView.getWidth();
+            final int top = 0;
+            final int bottom = hostView.getHeight();
+
+            if (mTempRect == null) {
+                mTempRect = new Rect();
+            }
+            final Rect clip = mTempRect;
+            clip.left = left + TerminalView.this.getPaddingLeft();
+            clip.top = top + TerminalView.this.getPaddingTop();
+            clip.right = right - TerminalView.this.getPaddingRight();
+            clip.bottom = bottom - TerminalView.this.getPaddingBottom();
+
+            final ViewParent parent = hostView.getParent();
+            if (parent == null || !parent.getChildVisibleRect(hostView, clip, null)) {
+                return false;
+            }
+
+            final int[] coords = mTempCoords;
+            hostView.getLocationInWindow(coords);
+            final int posX = coords[0] + mPointX + (int) mHotspotX;
+            final int posY = coords[1] + mPointY + (int) mHotspotY;
+
+            return posX >= clip.left && posX <= clip.right &&
+                posY >= clip.top && posY <= clip.bottom;
+        }
+
+        private void moveTo(int x, int y) {
+            mPointX = x;
+            mPointY = y;
+            checkChangedOrientation();
+            if (isPositionVisible()) {
+                int[] coords = null;
+                if (mContainer.isShowing()) {
+                    coords = mTempCoords;
+                    TerminalView.this.getLocationInWindow(coords);
+                    int x1 = coords[0] + mPointX;
+                    int y1 = coords[1] + mPointY;
+                    mContainer.update(x1, y1,
+                        getWidth(), getHeight());
+                } else {
+                    show();
+                }
+
+                if (mIsDragging) {
+                    if (coords == null) {
+                        coords = mTempCoords;
+                        TerminalView.this.getLocationInWindow(coords);
+                    }
+                    if (coords[0] != mLastParentX || coords[1] != mLastParentY) {
+                        mTouchToWindowOffsetX += coords[0] - mLastParentX;
+                        mTouchToWindowOffsetY += coords[1] - mLastParentY;
+                        mLastParentX = coords[0];
+                        mLastParentY = coords[1];
+                    }
+                }
+            } else {
+                if (isShowing()) {
+                    hide();
+                }
+            }
+        }
+
+        @Override
+        public void onDraw(Canvas c) {
+            final int drawWidth = mDrawable.getIntrinsicWidth();
+            int height = mDrawable.getIntrinsicHeight();
+            mDrawable.setBounds(0, 0, drawWidth, height);
+            mDrawable.draw(c);
+
+        }
+
+        @SuppressLint("ClickableViewAccessibility")
+        @Override
+        public boolean onTouchEvent(MotionEvent ev) {
+            updateFloatingToolbarVisibility(ev);
+            switch (ev.getActionMasked()) {
+                case MotionEvent.ACTION_DOWN: {
+                    final float rawX = ev.getRawX();
+                    final float rawY = ev.getRawY();
+                    mTouchToWindowOffsetX = rawX - mPointX;
+                    mTouchToWindowOffsetY = rawY - mPointY;
+                    final int[] coords = mTempCoords;
+                    TerminalView.this.getLocationInWindow(coords);
+                    mLastParentX = coords[0];
+                    mLastParentY = coords[1];
+                    mIsDragging = true;
+                    break;
+                }
+
+                case MotionEvent.ACTION_MOVE: {
+                    final float rawX = ev.getRawX();
+                    final float rawY = ev.getRawY();
+
+                    final float newPosX = rawX - mTouchToWindowOffsetX + mHotspotX;
+                    final float newPosY = rawY - mTouchToWindowOffsetY + mHotspotY + mTouchOffsetY;
+
+                    mController.updatePosition(this, Math.round(newPosX), Math.round(newPosY));
+
+
+                    break;
+                }
+
+                case MotionEvent.ACTION_UP:
+                case MotionEvent.ACTION_CANCEL:
+                    mIsDragging = false;
+            }
+            return true;
+        }
+
+
+        public boolean isDragging() {
+            return mIsDragging;
+        }
+
+        void positionAtCursor(final int cx, final int cy) {
+            int left = (int) (getPointX(cx) - mHotspotX);
+            int bottom = getPointY(cy + 1);
+            moveTo(left, bottom);
+        }
+    }
+
+
+    private class SelectionModifierCursorController implements CursorController {
+        private final int mHandleHeight;
+        // The cursor controller images
+        private HandleView mStartHandle, mEndHandle;
+        // Whether selection anchors are active
+        private boolean mIsShowing;
+
+        SelectionModifierCursorController() {
+            mStartHandle = new HandleView(this, HandleView.LEFT);
+            mEndHandle = new HandleView(this, HandleView.RIGHT);
+
+            mHandleHeight = Math.max(mStartHandle.mHandleHeight, mEndHandle.mHandleHeight);
+        }
+
+        public void show() {
+            mIsShowing = true;
+            updatePosition();
+            mStartHandle.show();
+            mEndHandle.show();
 
             final ActionMode.Callback callback = new ActionMode.Callback() {
                 @Override
@@ -865,7 +1205,7 @@ public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
                             showContextMenu();
                             break;
                     }
-                    toggleSelectingText(null);
+                    stopTextSelectionMode();
                     return true;
                 }
 
@@ -874,7 +1214,6 @@ public void onDestroyActionMode(ActionMode mode) {
                 }
 
             };
-
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
                 mActionMode = startActionMode(new ActionMode.Callback2() {
                     @Override
@@ -903,28 +1242,218 @@ public void onGetContentRect(ActionMode mode, View view, Rect outRect) {
                         int x2 = Math.round(mSelX2 * mRenderer.mFontWidth);
                         int y1 = Math.round((mSelY1 - mTopRow) * mRenderer.mFontLineSpacing);
                         int y2 = Math.round((mSelY2 + 1 - mTopRow) * mRenderer.mFontLineSpacing);
-                        outRect.set(Math.min(x1, x2), y1, Math.max(x1, x2), y2);
+
+
+                        if (x1 > x2) {
+                            int tmp = x1;
+                            x1 = x2;
+                            x2 = tmp;
+                        }
+
+                        outRect.set(x1, y1 + mHandleHeight, x2, y2 + mHandleHeight);
                     }
                 }, ActionMode.TYPE_FLOATING);
             } else {
                 mActionMode = startActionMode(callback);
             }
+        }
+
+        public void hide() {
+            mStartHandle.hide();
+            mEndHandle.hide();
+            mIsShowing = false;
+            if (mActionMode != null) {
+                // This will hide the mSelectionModifierCursorController
+                mActionMode.finish();
+            }
 
+        }
+
+        public boolean isActive() {
+            return mIsShowing;
+        }
+
+        public void updatePosition(HandleView handle, int x, int y) {
+            final int scrollRows = mEmulator.getScreen().getActiveRows() - mEmulator.mRows;
+            if (y < mRenderer.mFontLineSpacing) {//up
+                mTopRow--;
+                if (mTopRow < -scrollRows) {
+                    mTopRow = -scrollRows;
+                }
+            } else if (y + 2 * mRenderer.mFontLineSpacing > TerminalView.this.getHeight()) {//down
+                mTopRow++;
+                if (mTopRow > 0) {
+                    mTopRow = 0;
+                }
+            }
+            if (handle == mStartHandle) {
+                mSelX1 = getCursorX(x);
+                mSelY1 = getCursorY(y);
+                if (mSelX1 < 0) {
+                    mSelX1 = 0;
+                }
+                if (mSelY1 < -scrollRows) {
+                    mSelY1 = -scrollRows;
+                } else if (mSelY1 > mEmulator.mRows - 1) {
+                    mSelY1 = mEmulator.mRows - 1;
+                }
+
+                if (mSelY1 > mSelY2) {
+                    mSelY1 = mSelY2;
+                }
+                if (mSelY1 == mSelY2 && mSelX1 > mSelX2) {
+                    mSelX1 = mSelX2;
+                }
+            } else {
+                mSelX2 = getCursorX(x);
+                mSelY2 = getCursorY(y);
+                if (mSelX2 < 0) {
+                    mSelX2 = 0;
+                }
+                if (mSelY2 < -scrollRows) {
+                    mSelY2 = -scrollRows;
+                } else if (mSelY2 > mEmulator.mRows - 1) {
+                    mSelY2 = mEmulator.mRows - 1;
+                }
+
+                if (mSelY1 > mSelY2) {
+                    mSelY2 = mSelY1;
+                }
+                if (mSelY1 == mSelY2 && mSelX1 > mSelX2) {
+                    mSelX2 = mSelX1;
+                }
+            }
 
             invalidate();
-        } else {
-            mActionMode.finish();
+        }
+
+        public void updatePosition() {
+            if (!isActive()) {
+                return;
+            }
+
+            mStartHandle.positionAtCursor(mSelX1, mSelY1);
+
+            mEndHandle.positionAtCursor(mSelX2 + 1, mSelY2);
+
+            if (mActionMode != null) {
+                mActionMode.invalidate();
+            }
+
+        }
+
+        public boolean onTouchEvent(MotionEvent event) {
+
+            return false;
+        }
+
+
+        /**
+         * @return true iff this controller is currently used to move the selection start.
+         */
+        public boolean isSelectionStartDragged() {
+            return mStartHandle.isDragging();
+        }
+
+        public boolean isSelectionEndDragged() {
+            return mEndHandle.isDragging();
+        }
+
+        public void onTouchModeChanged(boolean isInTouchMode) {
+            if (!isInTouchMode) {
+                hide();
+            }
+        }
+
+        @Override
+        public void onDetached() {
+        }
+    }
+
+    SelectionModifierCursorController getSelectionController() {
+        if (mSelectionModifierCursorController == null) {
+            mSelectionModifierCursorController = new SelectionModifierCursorController();
+
+            final ViewTreeObserver observer = getViewTreeObserver();
+            if (observer != null) {
+                observer.addOnTouchModeChangeListener(mSelectionModifierCursorController);
+            }
+        }
+
+        return mSelectionModifierCursorController;
+    }
+
+    private void hideSelectionModifierCursorController() {
+        if (mSelectionModifierCursorController != null && mSelectionModifierCursorController.isActive()) {
+            mSelectionModifierCursorController.hide();
+        }
+    }
+
+
+    private void startTextSelectionMode() {
+        if (!requestFocus()) {
+            return;
+        }
+
+        getSelectionController().show();
+
+        mIsSelectingText = true;
+
+        mClient.copyModeChanged(mIsSelectingText);
+
+        invalidate();
+    }
+
+    private void stopTextSelectionMode() {
+        if (mIsSelectingText) {
+            hideSelectionModifierCursorController();
             mSelX1 = mSelY1 = mSelX2 = mSelY2 = -1;
+            mIsSelectingText = false;
+
+            mClient.copyModeChanged(mIsSelectingText);
+
             invalidate();
         }
     }
 
-    public TerminalSession getCurrentSession() {
-        return mTermSession;
+
+    private final Runnable mShowFloatingToolbar = new Runnable() {
+        @Override
+        public void run() {
+            if (mActionMode != null) {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                    mActionMode.hide(0);  // hide off.
+                }
+            }
+        }
+    };
+
+    void hideFloatingToolbar(int duration) {
+        if (mActionMode != null) {
+            removeCallbacks(mShowFloatingToolbar);
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                mActionMode.hide(duration);
+            }
+        }
     }
 
-    private CharSequence getText() {
-        return mEmulator.getScreen().getSelectedText(0, mTopRow, mEmulator.mColumns, mTopRow +mEmulator.mRows);
+    private void showFloatingToolbar() {
+        if (mActionMode != null) {
+            int delay = ViewConfiguration.getDoubleTapTimeout();
+            postDelayed(mShowFloatingToolbar, delay);
+        }
     }
 
+    private void updateFloatingToolbarVisibility(MotionEvent event) {
+        if (mActionMode != null) {
+            switch (event.getActionMasked()) {
+                case MotionEvent.ACTION_MOVE:
+                    hideFloatingToolbar(-1);
+                    break;
+                case MotionEvent.ACTION_UP:  // fall through
+                case MotionEvent.ACTION_CANCEL:
+                    showFloatingToolbar();
+            }
+        }
+    }
 }

From 3b4ece6bd8970df992662c39845add4a1a9a60c4 Mon Sep 17 00:00:00 2001
From: mao <maokai1905@gmail.com>
Date: Sat, 5 Oct 2019 18:30:54 +0800
Subject: [PATCH 003/912] Selection mode fling

---
 terminal-view/src/main/java/com/termux/view/TerminalView.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/terminal-view/src/main/java/com/termux/view/TerminalView.java b/terminal-view/src/main/java/com/termux/view/TerminalView.java
index 2065248779..09eae230cb 100644
--- a/terminal-view/src/main/java/com/termux/view/TerminalView.java
+++ b/terminal-view/src/main/java/com/termux/view/TerminalView.java
@@ -153,7 +153,7 @@ public boolean onScale(float focusX, float focusY, float scale) {
 
             @Override
             public boolean onFling(final MotionEvent e2, float velocityX, float velocityY) {
-                if (mEmulator == null || mIsSelectingText) return true;
+                if (mEmulator == null) return true;
                 // Do not start scrolling until last fling has been taken care of:
                 if (!mScroller.isFinished()) return true;
 

From 937eb350b28766bd991c6111458f23bdff0a3c00 Mon Sep 17 00:00:00 2001
From: mao <maokai1905@gmail.com>
Date: Sat, 5 Oct 2019 18:54:15 +0800
Subject: [PATCH 004/912] Stop selection mode on enter

---
 terminal-view/src/main/java/com/termux/view/TerminalView.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/terminal-view/src/main/java/com/termux/view/TerminalView.java b/terminal-view/src/main/java/com/termux/view/TerminalView.java
index 09eae230cb..2cb3cb28c2 100644
--- a/terminal-view/src/main/java/com/termux/view/TerminalView.java
+++ b/terminal-view/src/main/java/com/termux/view/TerminalView.java
@@ -296,6 +296,7 @@ public boolean deleteSurroundingText(int leftLength, int rightLength) {
             }
 
             void sendTextToTerminal(CharSequence text) {
+                stopTextSelectionMode();
                 final int textLengthInChars = text.length();
                 for (int i = 0; i < textLengthInChars; i++) {
                     char firstChar = text.charAt(i);
@@ -542,6 +543,7 @@ public boolean onKeyDown(int keyCode, KeyEvent event) {
         if (LOG_KEY_EVENTS)
             Log.i(EmulatorDebug.LOG_TAG, "onKeyDown(keyCode=" + keyCode + ", isSystem()=" + event.isSystem() + ", event=" + event + ")");
         if (mEmulator == null) return true;
+        stopTextSelectionMode();
 
         if (mClient.onKeyDown(keyCode, event, mTermSession)) {
             invalidate();

From fdb3764f5c11cc5a0581d5741938f22f8782f730 Mon Sep 17 00:00:00 2001
From: mao <maokai1905@gmail.com>
Date: Fri, 11 Oct 2019 07:37:57 +0800
Subject: [PATCH 005/912] Optimize handle view

---
 .../src/main/java/com/termux/view/TerminalView.java    | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/terminal-view/src/main/java/com/termux/view/TerminalView.java b/terminal-view/src/main/java/com/termux/view/TerminalView.java
index 2cb3cb28c2..e67a24df1f 100644
--- a/terminal-view/src/main/java/com/termux/view/TerminalView.java
+++ b/terminal-view/src/main/java/com/termux/view/TerminalView.java
@@ -10,6 +10,7 @@
 import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
+import android.os.SystemClock;
 import android.text.Editable;
 import android.text.InputType;
 import android.text.TextUtils;
@@ -882,6 +883,8 @@ private class HandleView extends View {
         public static final int RIGHT = 2;
         private int mHandleHeight;
 
+        private long mLastTime;
+
         public HandleView(CursorController controller, int orientation) {
             super(TerminalView.this.getContext());
             mController = controller;
@@ -983,6 +986,11 @@ public boolean isShowing() {
         }
 
         private void checkChangedOrientation() {
+            long millis = SystemClock.currentThreadTimeMillis();
+            if (millis - mLastTime < 50) {
+                return;
+            }
+            mLastTime = millis;
 
             final TerminalView hostView = TerminalView.this;
             final int left = hostView.getLeft();
@@ -1007,7 +1015,7 @@ private void checkChangedOrientation() {
             final int[] coords = mTempCoords;
             hostView.getLocationInWindow(coords);
             final int posX = coords[0] + mPointX;
-            if (posX + (int) mHotspotX < clip.left) {
+            if (posX < clip.left) {
                 changeOrientation(RIGHT);
             } else if (posX + mHandleWidth > clip.right) {
                 changeOrientation(LEFT);

From 4189f598b937217cb70494ccda7b39a9d66426b6 Mon Sep 17 00:00:00 2001
From: Leonid Plyushch <leonid.plyushch@gmail.com>
Date: Wed, 9 Oct 2019 23:00:51 +0300
Subject: [PATCH 006/912] add permission ACCESS_NETWORK_STATE

Seems to be required by some Android TV devices.
---
 app/src/main/AndroidManifest.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 17aecc5c71..8d45b96583 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -8,6 +8,7 @@
     <uses-feature android:name="android.hardware.touchscreen" android:required="false" />
     <uses-feature android:name="android.software.leanback" android:required="false" />
 
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />

From c50a3670632c18c6107e2f25e5b9e7d61ff75c2a Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Sun, 13 Oct 2019 20:48:09 +0200
Subject: [PATCH 007/912] Add .cxx folder to gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index a7327fbaaf..0b3a39edcb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@ build/
 *.apk
 *.so
 .externalNativeBuild
+.cxx
 
 # Crashlytics configuations
 com_crashlytics_export_strings.xml

From 468f878a382d34cfe102f705c624fca23ab432d6 Mon Sep 17 00:00:00 2001
From: Leon Omelan <rozpierog@gmail.com>
Date: Sun, 6 Oct 2019 18:06:41 +0200
Subject: [PATCH 008/912] Unified UI colors across the app. Dark sidebar and
 dark app theme for dark Alert Dialogs

---
 app/src/main/java/com/termux/app/TermuxActivity.java |  2 +-
 app/src/main/res/drawable/current_session.xml        |  4 ++--
 app/src/main/res/drawable/session_ripple.xml         |  4 ++--
 app/src/main/res/layout/drawer_layout.xml            |  2 +-
 app/src/main/res/values/styles.xml                   | 11 ++---------
 5 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index 28f968ce0a..f3395716a8 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -454,7 +454,7 @@ public View getView(int position, View convertView, @NonNull ViewGroup parent) {
                 } else {
                     firstLineView.setPaintFlags(firstLineView.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG);
                 }
-                int color = sessionRunning || sessionAtRow.getExitStatus() == 0 ? Color.BLACK : Color.RED;
+                int color = sessionRunning || sessionAtRow.getExitStatus() == 0 ? Color.WHITE : Color.RED;
                 firstLineView.setTextColor(color);
                 return row;
             }
diff --git a/app/src/main/res/drawable/current_session.xml b/app/src/main/res/drawable/current_session.xml
index e118aa0174..6a9264992f 100644
--- a/app/src/main/res/drawable/current_session.xml
+++ b/app/src/main/res/drawable/current_session.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <solid android:color="#E0E0E0" />
-</shape>
\ No newline at end of file
+    <solid android:color="#212325" />
+</shape>
diff --git a/app/src/main/res/drawable/session_ripple.xml b/app/src/main/res/drawable/session_ripple.xml
index f38d75b66e..21423eb51b 100644
--- a/app/src/main/res/drawable/session_ripple.xml
+++ b/app/src/main/res/drawable/session_ripple.xml
@@ -2,6 +2,6 @@
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
     android:color="@android:color/darker_gray" >
     <item>
-        <color android:color="@android:color/white" />
+        <color android:color="@android:color/background_dark" />
     </item>
-</ripple>
\ No newline at end of file
+</ripple>
diff --git a/app/src/main/res/layout/drawer_layout.xml b/app/src/main/res/layout/drawer_layout.xml
index c5117f14db..14ea1b646c 100644
--- a/app/src/main/res/layout/drawer_layout.xml
+++ b/app/src/main/res/layout/drawer_layout.xml
@@ -26,7 +26,7 @@
             android:layout_width="240dp"
             android:layout_height="match_parent"
             android:layout_gravity="start"
-            android:background="@android:color/white"
+            android:background="@android:color/background_dark"
             android:choiceMode="singleChoice"
             android:divider="@android:color/transparent"
             android:dividerHeight="0dp"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index f7c5cc3a0f..5dac43a178 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -3,14 +3,13 @@
 
     <!-- See https://developer.android.com/training/material/theme.html for how to customize the Material theme. -->
     <!-- NOTE: Cannot use "Light." since it hides the terminal scrollbar on the default black background. -->
-    <style name="Theme.Termux" parent="@android:style/Theme.Material.Light.NoActionBar">
+    <style name="Theme.Termux" parent="@android:style/Theme.Material.NoActionBar">
         <item name="android:statusBarColor">#000000</item>
         <item name="android:colorPrimary">#FF000000</item>
         <item name="android:windowBackground">@android:color/black</item>
 
         <!-- Seen in buttons on left drawer: -->
-        <item name="android:colorAccent">#212121</item>
-        <item name="android:alertDialogTheme">@style/TermuxAlertDialogStyle</item>
+        <item name="android:colorAccent">#FDFDFD</item>
         <!-- Avoid action mode toolbar pushing down terminal content when
              selecting text on pre-6.0 (non-floating toolbar). -->
         <item name="android:windowActionModeOverlay">true</item>
@@ -22,10 +21,4 @@
         <item name="android:windowAllowReturnTransitionOverlap">true</item>
         <item name="android:windowAllowEnterTransitionOverlap">true</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>
-    </style>
-
 </resources>

From 5ba3f7cf6d8b2c29eb4f4d51a6a8961db502500d Mon Sep 17 00:00:00 2001
From: Leon Omelan <rozpierog@gmail.com>
Date: Mon, 7 Oct 2019 17:15:17 +0200
Subject: [PATCH 009/912] Made Black UI an option to configure

---
 .../java/com/termux/app/TermuxActivity.java   | 28 ++++++++++++++++---
 .../com/termux/app/TermuxPreferences.java     |  7 +++++
 app/src/main/res/drawable/current_session.xml |  2 +-
 .../res/drawable/current_session_black.xml    |  4 +++
 .../selected_session_background_black.xml     |  5 ++++
 app/src/main/res/drawable/session_ripple.xml  |  2 +-
 .../res/drawable/session_ripple_black.xml     |  7 +++++
 app/src/main/res/layout/drawer_layout.xml     |  2 +-
 app/src/main/res/values/styles.xml            | 27 +++++++++++++++++-
 9 files changed, 76 insertions(+), 8 deletions(-)
 create mode 100644 app/src/main/res/drawable/current_session_black.xml
 create mode 100644 app/src/main/res/drawable/selected_session_background_black.xml
 create mode 100644 app/src/main/res/drawable/session_ripple_black.xml

diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index f3395716a8..a84a7be7cb 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -127,6 +127,8 @@ public final class TermuxActivity extends Activity implements ServiceConnection
      */
     boolean mIsVisible;
 
+    boolean mIsUsingBlackUI;
+
     final SoundPool mBellSoundPool = new SoundPool.Builder().setMaxStreams(1).setAudioAttributes(
         new AudioAttributes.Builder().setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
             .setUsage(AudioAttributes.USAGE_ASSISTANCE_SONIFICATION).build()).build();
@@ -203,11 +205,24 @@ public boolean ensureStoragePermissionGranted() {
 
     @Override
     public void onCreate(Bundle bundle) {
-        super.onCreate(bundle);
-
         mSettings = new TermuxPreferences(this);
+        mIsUsingBlackUI = mSettings.isUsingBlackUI();
+        if (mIsUsingBlackUI) {
+            this.setTheme(R.style.Theme_Termux_Black);
+        } else {
+            this.setTheme(R.style.Theme_Termux);
+        }
+
+        super.onCreate(bundle);
 
         setContentView(R.layout.drawer_layout);
+
+        if (mIsUsingBlackUI) {
+            findViewById(R.id.left_drawer).setBackgroundColor(
+                getResources().getColor(android.R.color.background_dark)
+            );
+        }
+
         mTerminalView = findViewById(R.id.terminal_view);
         mTerminalView.setOnKeyListener(new TermuxViewClient(this));
 
@@ -434,7 +449,11 @@ public View getView(int position, View convertView, @NonNull ViewGroup parent) {
                 boolean sessionRunning = sessionAtRow.isRunning();
 
                 TextView firstLineView = row.findViewById(R.id.row_line);
-
+                if (mIsUsingBlackUI) {
+                    firstLineView.setBackground(
+                        getResources().getDrawable(R.drawable.selected_session_background_black)
+                    );
+                }
                 String name = sessionAtRow.mSessionName;
                 String sessionTitle = sessionAtRow.getTitle();
 
@@ -454,7 +473,8 @@ public View getView(int position, View convertView, @NonNull ViewGroup parent) {
                 } else {
                     firstLineView.setPaintFlags(firstLineView.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG);
                 }
-                int color = sessionRunning || sessionAtRow.getExitStatus() == 0 ? Color.WHITE : Color.RED;
+                int defaultColor = mIsUsingBlackUI ? Color.WHITE : Color.BLACK;
+                int color = sessionRunning || sessionAtRow.getExitStatus() == 0 ? defaultColor : Color.RED;
                 firstLineView.setTextColor(color);
                 return row;
             }
diff --git a/app/src/main/java/com/termux/app/TermuxPreferences.java b/app/src/main/java/com/termux/app/TermuxPreferences.java
index 16a996ed20..f6095837fb 100644
--- a/app/src/main/java/com/termux/app/TermuxPreferences.java
+++ b/app/src/main/java/com/termux/app/TermuxPreferences.java
@@ -58,6 +58,7 @@ final static class KeyboardShortcut {
     private static final String CURRENT_SESSION_KEY = "current_session";
     private static final String SCREEN_ALWAYS_ON_KEY = "screen_always_on";
 
+    private String mUseDarkUI;
     private boolean mScreenAlwaysOn;
     private int mFontSize;
 
@@ -126,6 +127,10 @@ boolean isScreenAlwaysOn() {
         return mScreenAlwaysOn;
     }
 
+    boolean isUsingBlackUI() {
+        return mUseDarkUI.toLowerCase().equals("true");
+    }
+
     void setScreenAlwaysOn(Context context, boolean newValue) {
         mScreenAlwaysOn = newValue;
         PreferenceManager.getDefaultSharedPreferences(context).edit().putBoolean(SCREEN_ALWAYS_ON_KEY, newValue).apply();
@@ -173,6 +178,8 @@ void reloadFromProperties(Context context) {
                 break;
         }
 
+        mUseDarkUI = props.getProperty("use-black-ui", "false");
+
         try {
             JSONArray arr = new JSONArray(props.getProperty("extra-keys", "[['ESC', 'TAB', 'CTRL', 'ALT', '-', 'DOWN', 'UP']]"));
 
diff --git a/app/src/main/res/drawable/current_session.xml b/app/src/main/res/drawable/current_session.xml
index 6a9264992f..90dd28182b 100644
--- a/app/src/main/res/drawable/current_session.xml
+++ b/app/src/main/res/drawable/current_session.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <solid android:color="#212325" />
+    <solid android:color="#E0E0E0" />
 </shape>
diff --git a/app/src/main/res/drawable/current_session_black.xml b/app/src/main/res/drawable/current_session_black.xml
new file mode 100644
index 0000000000..6a9264992f
--- /dev/null
+++ b/app/src/main/res/drawable/current_session_black.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <solid android:color="#212325" />
+</shape>
diff --git a/app/src/main/res/drawable/selected_session_background_black.xml b/app/src/main/res/drawable/selected_session_background_black.xml
new file mode 100644
index 0000000000..25b7506f47
--- /dev/null
+++ b/app/src/main/res/drawable/selected_session_background_black.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_activated="true" android:drawable="@drawable/current_session_black"/>
+    <item android:state_activated="false" android:drawable="@drawable/session_ripple_black"/>
+</selector>
diff --git a/app/src/main/res/drawable/session_ripple.xml b/app/src/main/res/drawable/session_ripple.xml
index 21423eb51b..9c4a1e7954 100644
--- a/app/src/main/res/drawable/session_ripple.xml
+++ b/app/src/main/res/drawable/session_ripple.xml
@@ -2,6 +2,6 @@
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
     android:color="@android:color/darker_gray" >
     <item>
-        <color android:color="@android:color/background_dark" />
+        <color android:color="@android:color/white" />
     </item>
 </ripple>
diff --git a/app/src/main/res/drawable/session_ripple_black.xml b/app/src/main/res/drawable/session_ripple_black.xml
new file mode 100644
index 0000000000..21423eb51b
--- /dev/null
+++ b/app/src/main/res/drawable/session_ripple_black.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@android:color/darker_gray" >
+    <item>
+        <color android:color="@android:color/background_dark" />
+    </item>
+</ripple>
diff --git a/app/src/main/res/layout/drawer_layout.xml b/app/src/main/res/layout/drawer_layout.xml
index 14ea1b646c..c5117f14db 100644
--- a/app/src/main/res/layout/drawer_layout.xml
+++ b/app/src/main/res/layout/drawer_layout.xml
@@ -26,7 +26,7 @@
             android:layout_width="240dp"
             android:layout_height="match_parent"
             android:layout_gravity="start"
-            android:background="@android:color/background_dark"
+            android:background="@android:color/white"
             android:choiceMode="singleChoice"
             android:divider="@android:color/transparent"
             android:dividerHeight="0dp"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 5dac43a178..1f352423c9 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,9 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
+    <style name="Theme.Termux" parent="@android:style/Theme.Material.Light.NoActionBar">
+        <item name="android:statusBarColor">#000000</item>
+        <item name="android:colorPrimary">#FF000000</item>
+        <item name="android:windowBackground">@android:color/black</item>
+
+        <!-- Seen in buttons on left drawer: -->
+        <item name="android:colorAccent">#212121</item>
+        <item name="android:alertDialogTheme">@style/TermuxAlertDialogStyle</item>
+        <!-- Avoid action mode toolbar pushing down terminal content when
+             selecting text on pre-6.0 (non-floating toolbar). -->
+        <item name="android:windowActionModeOverlay">true</item>
+
+        <item name="android:windowTranslucentStatus">true</item>
+        <item name="android:windowTranslucentNavigation">true</item>
+
+        <!-- https://developer.android.com/training/tv/start/start.html#transition-color -->
+        <item name="android:windowAllowReturnTransitionOverlap">true</item>
+        <item name="android:windowAllowEnterTransitionOverlap">true</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>
+    </style>
+
     <!-- See https://developer.android.com/training/material/theme.html for how to customize the Material theme. -->
     <!-- NOTE: Cannot use "Light." since it hides the terminal scrollbar on the default black background. -->
-    <style name="Theme.Termux" parent="@android:style/Theme.Material.NoActionBar">
+    <style name="Theme.Termux.Black" parent="@android:style/Theme.Material.NoActionBar">
         <item name="android:statusBarColor">#000000</item>
         <item name="android:colorPrimary">#FF000000</item>
         <item name="android:windowBackground">@android:color/black</item>

From c76cec186af4df7b1020cd1471ea50dfcb25afba Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Sun, 13 Oct 2019 23:13:06 +0200
Subject: [PATCH 010/912] Include bootstrap zips as shared libraries

---
 .gitignore                                    |  1 +
 app/build.gradle                              | 89 ++++++++++++++++++-
 app/src/main/cpp/Android.mk                   |  5 ++
 app/src/main/cpp/termux-bootstrap-zip.S       | 18 ++++
 app/src/main/cpp/termux-bootstrap.c           | 11 +++
 .../java/com/termux/app/TermuxInstaller.java  | 38 ++------
 6 files changed, 131 insertions(+), 31 deletions(-)
 create mode 100644 app/src/main/cpp/Android.mk
 create mode 100644 app/src/main/cpp/termux-bootstrap-zip.S
 create mode 100644 app/src/main/cpp/termux-bootstrap.c

diff --git a/.gitignore b/.gitignore
index 0b3a39edcb..5f7ee3c3dc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@ build/
 *.so
 .externalNativeBuild
 .cxx
+*.zip
 
 # Crashlytics configuations
 com_crashlytics_export_strings.xml
diff --git a/app/build.gradle b/app/build.gradle
index 2bf47f8028..5c4b25aec2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,4 +1,6 @@
-apply plugin: 'com.android.application'
+plugins {
+  id "com.android.application"
+}
 
 android {
     compileSdkVersion 28
@@ -12,10 +14,21 @@ android {
 
     defaultConfig {
         applicationId "com.termux"
-        minSdkVersion 21
+        minSdkVersion 24
         targetSdkVersion 28
         versionCode 75
         versionName "0.75"
+
+        externalNativeBuild {
+            ndkBuild {
+                cFlags "-std=c11", "-Wall", "-Wextra", "-Werror", "-Os", "-fno-stack-protector", "-Wl,--gc-sections"
+            }
+        }
+
+        ndk {
+            abiFilters 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a'
+        }
+
     }
 
     signingConfigs {
@@ -43,6 +56,12 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+
+    externalNativeBuild {
+        ndkBuild {
+            path "src/main/cpp/Android.mk"
+        }
+    }
 }
 
 dependencies {
@@ -54,3 +73,69 @@ task versionName {
     print android.defaultConfig.versionName
   }
 }
+
+def downloadBootstrap(String arch, String expectedChecksum, int version) {
+    def digest = java.security.MessageDigest.getInstance("SHA-256")
+
+    def localUrl = "src/main/cpp/bootstrap-" + arch + ".zip"
+    def file = new File(projectDir, localUrl)
+    if (file.exists()) {
+        def buffer = new byte[8192]
+        def input = new FileInputStream(file)
+        while (true) {
+            def readBytes = input.read(buffer)
+            if (readBytes < 0) break
+            digest.update(buffer, 0, readBytes)
+        }
+        def checksum = new BigInteger(1, digest.digest()).toString(16)
+        if (checksum == expectedChecksum) {
+            return
+        } else {
+            logger.quiet("Deleting old local file with wrong hash: " + localUrl)
+            file.delete()
+        }
+    }
+
+    def remoteUrl = "https://bintray.com/termux/bootstrap/download_file?file_path=bootstrap-" + arch + "-v" + version + ".zip"
+    logger.quiet("Downloading " + remoteUrl + " ...")
+
+    file.parentFile.mkdirs()
+    def out = new BufferedOutputStream(new FileOutputStream(file))
+
+    def connection = new URL(remoteUrl).openConnection()
+    connection.setInstanceFollowRedirects(true)
+    def digestStream = new java.security.DigestInputStream(connection.inputStream, digest)
+    out << digestStream
+    out.close()
+
+    def checksum = new BigInteger(1, digest.digest()).toString(16)
+    if (checksum != expectedChecksum) {
+        file.delete()
+        throw new GradleException("Wrong checksum for " + remoteUrl + ": expected: " + expectedChecksum + ", actual: " + checksum)
+    }
+}
+
+clean {
+    doLast {
+        def tree = fileTree(new File(projectDir, 'src/main/cpp'))
+        tree.include 'bootstrap-*.zip'
+        tree.each { it.delete() }
+    }
+}
+
+task downloadBootstraps(){
+    doLast {
+        def version = 17
+        downloadBootstrap("aarch64", "1846c453e7d4399559683e9a74eb8db048d1e88872668361652752b40ea2f3a2", version)
+        downloadBootstrap("arm",     "2f5a8061a1c13d48b659cb57c3767d59f5151f247ea032e2401135701dbd8058", version)
+        downloadBootstrap("i686",    "ca0e3559c5ac925528a7c8725a83a752ca63d5c1e0ff306e5ecd6ea9dd4c1de5", version)
+        downloadBootstrap("x86_64",  "9de2ac75ed0f3370418d3c55b470c176f69180079ba9461034bc7f6195fc5872", version)
+    }
+}
+
+afterEvaluate {
+  android.applicationVariants.all { variant ->
+    variant.javaCompiler.dependsOn(downloadBootstraps)
+  }
+}
+
diff --git a/app/src/main/cpp/Android.mk b/app/src/main/cpp/Android.mk
new file mode 100644
index 0000000000..d013e2ed98
--- /dev/null
+++ b/app/src/main/cpp/Android.mk
@@ -0,0 +1,5 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+LOCAL_MODULE := libtermux-bootstrap
+LOCAL_SRC_FILES := termux-bootstrap-zip.S termux-bootstrap.c
+include $(BUILD_SHARED_LIBRARY)
diff --git a/app/src/main/cpp/termux-bootstrap-zip.S b/app/src/main/cpp/termux-bootstrap-zip.S
new file mode 100644
index 0000000000..1cfc958049
--- /dev/null
+++ b/app/src/main/cpp/termux-bootstrap-zip.S
@@ -0,0 +1,18 @@
+     .global blob
+     .global blob_size
+     .section .rodata
+ blob:
+ #if defined __i686__
+     .incbin "bootstrap-i686.zip"
+ #elif defined __x86_64__
+     .incbin "bootstrap-x86_64.zip"
+ #elif defined __aarch64__
+     .incbin "bootstrap-aarch64.zip"
+ #elif defined __arm__
+     .incbin "bootstrap-arm.zip"
+ #else
+ # error Unsupported arch
+ #endif
+ 1:
+ blob_size:
+     .int 1b - blob
diff --git a/app/src/main/cpp/termux-bootstrap.c b/app/src/main/cpp/termux-bootstrap.c
new file mode 100644
index 0000000000..8ba745ffca
--- /dev/null
+++ b/app/src/main/cpp/termux-bootstrap.c
@@ -0,0 +1,11 @@
+#include <jni.h>
+
+extern jbyte blob[];
+extern int blob_size;
+
+JNIEXPORT jbyteArray JNICALL Java_com_termux_app_TermuxInstaller_getZip(JNIEnv *env, __attribute__((__unused__)) jobject This)
+{
+    jbyteArray ret = (*env)->NewByteArray(env, blob_size);
+    (*env)->SetByteArrayRegion(env, ret, 0, blob_size, blob);
+    return ret;
+}
diff --git a/app/src/main/java/com/termux/app/TermuxInstaller.java b/app/src/main/java/com/termux/app/TermuxInstaller.java
index 74823b63ce..34b5b15de6 100644
--- a/app/src/main/java/com/termux/app/TermuxInstaller.java
+++ b/app/src/main/java/com/termux/app/TermuxInstaller.java
@@ -16,6 +16,7 @@
 import com.termux.terminal.EmulatorDebug;
 
 import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -38,7 +39,7 @@
  * <p/>
  * (3) A staging folder, $STAGING_PREFIX, is {@link #deleteFolder(File)} if left over from broken installation below.
  * <p/>
- * (4) The architecture is determined and an appropriate bootstrap zip url is determined in {@link #determineZipUrl()}.
+ * (4) The zip file is loaded from a shared library.
  * <p/>
  * (5) The zip, containing entries relative to the $PREFIX, is is downloaded and extracted by a zip input stream
  * continuously encountering zip file entries:
@@ -82,8 +83,8 @@ public void run() {
                     final byte[] buffer = new byte[8096];
                     final List<Pair<String, String>> symlinks = new ArrayList<>(50);
 
-                    final URL zipUrl = determineZipUrl();
-                    try (ZipInputStream zipInput = new ZipInputStream(zipUrl.openStream())) {
+                    final byte[] zipBytes = loadZipBytes();
+                    try (ZipInputStream zipInput = new ZipInputStream(new ByteArrayInputStream(zipBytes))) {
                         ZipEntry zipEntry;
                         while ((zipEntry = zipInput.getNextEntry()) != null) {
                             if (zipEntry.getName().equals("SYMLINKS.txt")) {
@@ -167,34 +168,13 @@ private static void ensureDirectoryExists(File directory) {
         }
     }
 
-    /** Get bootstrap zip url for this systems cpu architecture. */
-    private static URL determineZipUrl() throws MalformedURLException {
-        String archName = determineTermuxArchName();
-        String url = Build.VERSION.SDK_INT >= Build.VERSION_CODES.N
-            ? "https://termux.org/bootstrap-" + archName + ".zip"
-            : "https://termux.net/bootstrap/bootstrap-" + archName + ".zip";
-        return new URL(url);
+    public static byte[] loadZipBytes() {
+        // Only load the shared library when necessary to save memory usage.
+        System.loadLibrary("termux-bootstrap");
+        return getZip();
     }
 
-    private static String determineTermuxArchName() {
-        // Note that we cannot use System.getProperty("os.arch") since that may give e.g. "aarch64"
-        // while a 64-bit runtime may not be installed (like on the Samsung Galaxy S5 Neo).
-        // Instead we search through the supported abi:s on the device, see:
-        // http://developer.android.com/ndk/guides/abis.html
-        // Note that we search for abi:s in preferred order (the ordering of the
-        // Build.SUPPORTED_ABIS list) to avoid e.g. installing arm on an x86 system where arm
-        // emulation is available.
-        for (String androidArch : Build.SUPPORTED_ABIS) {
-            switch (androidArch) {
-                case "arm64-v8a": return "aarch64";
-                case "armeabi-v7a": return "arm";
-                case "x86_64": return "x86_64";
-                case "x86": return "i686";
-            }
-        }
-        throw new RuntimeException("Unable to determine arch from Build.SUPPORTED_ABIS =  " +
-            Arrays.toString(Build.SUPPORTED_ABIS));
-    }
+    public static native byte[] getZip();
 
     /** Delete a folder and all its content or throw. Don't follow symlinks. */
     static void deleteFolder(File fileOrDirectory) throws IOException {

From 08b08d1c4792bf5a3489968572884a84cc21c2f4 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Sun, 20 Oct 2019 20:16:48 +0200
Subject: [PATCH 011/912] Bump version to 0.76

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 5c4b25aec2..ad2fe43771 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -16,8 +16,8 @@ android {
         applicationId "com.termux"
         minSdkVersion 24
         targetSdkVersion 28
-        versionCode 75
-        versionName "0.75"
+        versionCode 76
+        versionName "0.76"
 
         externalNativeBuild {
             ndkBuild {

From c0a0822843969affedbf9760d44234caf46c8cd5 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Sun, 20 Oct 2019 20:43:03 +0200
Subject: [PATCH 012/912] Do not set LD_LIBRARY_PATH by default

See https://github.com/termux/termux-app/issues/1286
---
 app/src/main/java/com/termux/app/BackgroundJob.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/termux/app/BackgroundJob.java b/app/src/main/java/com/termux/app/BackgroundJob.java
index 11c8985167..5fef2bd1e1 100644
--- a/app/src/main/java/com/termux/app/BackgroundJob.java
+++ b/app/src/main/java/com/termux/app/BackgroundJob.java
@@ -139,14 +139,14 @@ private static boolean shouldAddLdLibraryPath() {
         try (BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(TermuxService.PREFIX_PATH + "/etc/apt/sources.list")))) {
             String line;
             while ((line = in.readLine()) != null) {
-                if (!line.startsWith("#") && line.contains("https://dl.bintray.com/termux/termux-packages-24")) {
-                    return false;
+                if (!line.startsWith("#") && line.contains("//termux.net stable")) {
+                    return true;
                 }
             }
         } catch (IOException e) {
             Log.e(LOG_TAG, "Error trying to read sources.list", e);
         }
-        return true;
+        return false;
     }
 
     public static int getPid(Process p) {

From 6c55c3c1bedcd72c679c38868ae9f4ea6daaa385 Mon Sep 17 00:00:00 2001
From: Leonid Plyushch <leonid.plyushch@gmail.com>
Date: Sun, 20 Oct 2019 22:06:18 +0300
Subject: [PATCH 013/912] bootstraps: update to v18

---
 app/build.gradle | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index ad2fe43771..0e94dff5a2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -125,11 +125,11 @@ clean {
 
 task downloadBootstraps(){
     doLast {
-        def version = 17
-        downloadBootstrap("aarch64", "1846c453e7d4399559683e9a74eb8db048d1e88872668361652752b40ea2f3a2", version)
-        downloadBootstrap("arm",     "2f5a8061a1c13d48b659cb57c3767d59f5151f247ea032e2401135701dbd8058", version)
-        downloadBootstrap("i686",    "ca0e3559c5ac925528a7c8725a83a752ca63d5c1e0ff306e5ecd6ea9dd4c1de5", version)
-        downloadBootstrap("x86_64",  "9de2ac75ed0f3370418d3c55b470c176f69180079ba9461034bc7f6195fc5872", version)
+        def version = 18
+        downloadBootstrap("aarch64", "1a4c08a696d452b58f69102428239ec0c07521c0ca9f48b23ef70ae0e5e3d4f8", version)
+        downloadBootstrap("arm",     "bff11f2c7e9c1055a22fc5f20bb7507b75f6034e0f5d591ec6725b3407981b85", version)
+        downloadBootstrap("i686",    "6fb93020db2807337d82a1537e24612400cacbd10cf4bccaeb0714d51e653da1", version)
+        downloadBootstrap("x86_64",  "a6067e5decc486dcad190c1ed9e15366c798e5e7d9b9b9ee6b4b8231290524c3", version)
     }
 }
 

From ae717d8f5fccd76c696f5520d97283ae88a40810 Mon Sep 17 00:00:00 2001
From: Leonid Plyushch <leonid.plyushch@gmail.com>
Date: Thu, 24 Oct 2019 16:53:58 +0300
Subject: [PATCH 014/912] do not allow to backup data by Google

Why:

 * During backup process Termux is being killed in most cases.
 * Backup data is limited to 25 MB.
 * Backup may not be performed/updated in certain cases.
---
 app/src/main/AndroidManifest.xml      | 3 +--
 app/src/main/res/xml/backupscheme.xml | 5 -----
 2 files changed, 1 insertion(+), 7 deletions(-)
 delete mode 100644 app/src/main/res/xml/backupscheme.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 8d45b96583..c8effb2c17 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -18,8 +18,7 @@
 
     <application
         android:extractNativeLibs="true"
-        android:allowBackup="true"
-        android:fullBackupContent="@xml/backupscheme"
+        android:allowBackup="false"
         android:icon="@drawable/ic_launcher"
         android:banner="@drawable/banner"
         android:label="@string/application_name"
diff --git a/app/src/main/res/xml/backupscheme.xml b/app/src/main/res/xml/backupscheme.xml
deleted file mode 100644
index 07566b9c06..0000000000
--- a/app/src/main/res/xml/backupscheme.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<full-backup-content>
-    <!-- See https://developer.android.com/training/backup/autosyncapi.html -->
-    <include domain="file" path="home/backup" />
-</full-backup-content>

From 3b969a00770fc45fe966cb7f91fff7d803c4fdf0 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Mon, 28 Oct 2019 01:54:50 +0100
Subject: [PATCH 015/912] Bump version to 0.77

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 0e94dff5a2..d3cb93f1af 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -16,8 +16,8 @@ android {
         applicationId "com.termux"
         minSdkVersion 24
         targetSdkVersion 28
-        versionCode 76
-        versionName "0.76"
+        versionCode 77
+        versionName "0.77"
 
         externalNativeBuild {
             ndkBuild {

From e930ac08aa78ee5cd9f0aa57ff4d193789d033c2 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Sun, 3 Nov 2019 19:18:31 +0100
Subject: [PATCH 016/912] Bump version to 0.78

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index d3cb93f1af..ad220f1017 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -16,8 +16,8 @@ android {
         applicationId "com.termux"
         minSdkVersion 24
         targetSdkVersion 28
-        versionCode 77
-        versionName "0.77"
+        versionCode 78
+        versionName "0.78"
 
         externalNativeBuild {
             ndkBuild {

From 29815fb3f054f7e1b9460d6bcf8bfe7bb6ec23d5 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Sun, 3 Nov 2019 22:35:52 +0100
Subject: [PATCH 017/912] Fix gradle deprecation warning

---
 app/build.gradle | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index ad220f1017..994ea78892 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -16,8 +16,8 @@ android {
         applicationId "com.termux"
         minSdkVersion 24
         targetSdkVersion 28
-        versionCode 78
-        versionName "0.78"
+        versionCode 80
+        versionName "0.80"
 
         externalNativeBuild {
             ndkBuild {
@@ -135,7 +135,7 @@ task downloadBootstraps(){
 
 afterEvaluate {
   android.applicationVariants.all { variant ->
-    variant.javaCompiler.dependsOn(downloadBootstraps)
+    variant.javaCompileProvider.get().dependsOn(downloadBootstraps)
   }
 }
 

From e5a8c0eb4af5e7f4b86fef000948386cb073f7db Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Sun, 3 Nov 2019 22:39:21 +0100
Subject: [PATCH 018/912] Cleanup after requiring Android 7.0

---
 app/src/main/AndroidManifest.xml              |  2 +-
 .../java/com/termux/app/ExtraKeysView.java    |  6 +-
 .../java/com/termux/app/TermuxActivity.java   | 14 ++---
 .../java/com/termux/app/TermuxService.java    | 24 ++++----
 .../java/com/termux/view/TerminalView.java    | 60 +++++++++----------
 5 files changed, 44 insertions(+), 62 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c8effb2c17..901c1bbe69 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -14,7 +14,7 @@
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-permission-sdk-23 android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"/>
+    <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"/>
 
     <application
         android:extractNativeLibs="true"
diff --git a/app/src/main/java/com/termux/app/ExtraKeysView.java b/app/src/main/java/com/termux/app/ExtraKeysView.java
index d0d6f91da4..4c2694cee3 100644
--- a/app/src/main/java/com/termux/app/ExtraKeysView.java
+++ b/app/src/main/java/com/termux/app/ExtraKeysView.java
@@ -427,11 +427,7 @@ void reload(String[][] buttons, CharDisplayMap charDisplayMap) {
 
                 LayoutParams param = new GridLayout.LayoutParams();
                 param.width = 0;
-                if(Build.VERSION.SDK_INT == Build.VERSION_CODES.LOLLIPOP) { // special handle api 21
-                    param.height = (int)(37.5 * getResources().getDisplayMetrics().density + 0.5); // 37.5 equal to R.id.viewpager layout_height / rows in DP
-                } else {
-                    param.height = 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);
diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index a84a7be7cb..0fe5b5df56 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -188,18 +188,12 @@ void updateBackgroundColor() {
     }
 
     /** For processes to access shared internal storage (/sdcard) we need this permission. */
-    @TargetApi(Build.VERSION_CODES.M)
     public boolean ensureStoragePermissionGranted() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            if (checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED) {
-                return true;
-            } else {
-                requestPermissions(new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, REQUESTCODE_PERMISSION_STORAGE);
-                return false;
-            }
-        } else {
-            // Always granted before Android 6.0.
+        if (checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED) {
             return true;
+        } else {
+            requestPermissions(new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, REQUESTCODE_PERMISSION_STORAGE);
+            return false;
         }
     }
 
diff --git a/app/src/main/java/com/termux/app/TermuxService.java b/app/src/main/java/com/termux/app/TermuxService.java
index 3bc2583b33..b17643fe49 100644
--- a/app/src/main/java/com/termux/app/TermuxService.java
+++ b/app/src/main/java/com/termux/app/TermuxService.java
@@ -114,19 +114,17 @@ public int onStartCommand(Intent intent, int flags, int startId) {
                 mWifiLock = wm.createWifiLock(WifiManager.WIFI_MODE_FULL_HIGH_PERF, EmulatorDebug.LOG_TAG);
                 mWifiLock.acquire();
 
-                if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                    String packageName = getPackageName();
-                    if (!pm.isIgnoringBatteryOptimizations(packageName)) {
-                        Intent whitelist = new Intent();
-                        whitelist.setAction(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS);
-                        whitelist.setData(Uri.parse("package:" + packageName));
-                        whitelist.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-
-                        try {
-                            startActivity(whitelist);
-                        } catch (ActivityNotFoundException e) {
-                            Log.e(EmulatorDebug.LOG_TAG, "Failed to call ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS", e);
-                        }
+                String packageName = getPackageName();
+                if (!pm.isIgnoringBatteryOptimizations(packageName)) {
+                    Intent whitelist = new Intent();
+                    whitelist.setAction(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS);
+                    whitelist.setData(Uri.parse("package:" + packageName));
+                    whitelist.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+
+                    try {
+                        startActivity(whitelist);
+                    } catch (ActivityNotFoundException e) {
+                        Log.e(EmulatorDebug.LOG_TAG, "Failed to call ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS", e);
                     }
                 }
 
diff --git a/terminal-view/src/main/java/com/termux/view/TerminalView.java b/terminal-view/src/main/java/com/termux/view/TerminalView.java
index 9ec398046b..95c13086e9 100644
--- a/terminal-view/src/main/java/com/termux/view/TerminalView.java
+++ b/terminal-view/src/main/java/com/termux/view/TerminalView.java
@@ -518,8 +518,7 @@ public boolean onTouchEvent(MotionEvent ev) {
                         mSelY2 = tmpY1;
                     }
 
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M)
-                        mActionMode.invalidateContentRect();
+                    mActionMode.invalidateContentRect();
                     invalidate();
                     break;
                 default:
@@ -875,41 +874,36 @@ public void onDestroyActionMode(ActionMode mode) {
 
             };
 
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                mActionMode = startActionMode(new ActionMode.Callback2() {
-                    @Override
-                    public boolean onCreateActionMode(ActionMode mode, Menu menu) {
-                        return callback.onCreateActionMode(mode, menu);
-                    }
-
-                    @Override
-                    public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
-                        return false;
-                    }
+            mActionMode = startActionMode(new ActionMode.Callback2() {
+                @Override
+                public boolean onCreateActionMode(ActionMode mode, Menu menu) {
+                    return callback.onCreateActionMode(mode, menu);
+                }
 
-                    @Override
-                    public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
-                        return callback.onActionItemClicked(mode, item);
-                    }
+                @Override
+                public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
+                    return false;
+                }
 
-                    @Override
-                    public void onDestroyActionMode(ActionMode mode) {
-                        // Ignore.
-                    }
+                @Override
+                public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
+                    return callback.onActionItemClicked(mode, item);
+                }
 
-                    @Override
-                    public void onGetContentRect(ActionMode mode, View view, Rect outRect) {
-                        int x1 = Math.round(mSelX1 * mRenderer.mFontWidth);
-                        int x2 = Math.round(mSelX2 * mRenderer.mFontWidth);
-                        int y1 = Math.round((mSelY1 - mTopRow) * mRenderer.mFontLineSpacing);
-                        int y2 = Math.round((mSelY2 + 1 - mTopRow) * mRenderer.mFontLineSpacing);
-                        outRect.set(Math.min(x1, x2), y1, Math.max(x1, x2), y2);
-                    }
-                }, ActionMode.TYPE_FLOATING);
-            } else {
-                mActionMode = startActionMode(callback);
-            }
+                @Override
+                public void onDestroyActionMode(ActionMode mode) {
+                    // Ignore.
+                }
 
+                @Override
+                public void onGetContentRect(ActionMode mode, View view, Rect outRect) {
+                    int x1 = Math.round(mSelX1 * mRenderer.mFontWidth);
+                    int x2 = Math.round(mSelX2 * mRenderer.mFontWidth);
+                    int y1 = Math.round((mSelY1 - mTopRow) * mRenderer.mFontLineSpacing);
+                    int y2 = Math.round((mSelY2 + 1 - mTopRow) * mRenderer.mFontLineSpacing);
+                    outRect.set(Math.min(x1, x2), y1, Math.max(x1, x2), y2);
+                }
+            }, ActionMode.TYPE_FLOATING);
 
             invalidate();
         } else {

From 69ded4b33e97f70b75991792c75669e5a2583bad Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Sun, 10 Nov 2019 19:26:01 +0100
Subject: [PATCH 019/912] Update Android gradle plug-in

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index e8b19a7da4..107f303057 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.1'
+        classpath 'com.android.tools.build:gradle:3.5.2'
     }
 }
 

From 070436a6edb338bf82ebca8bfef21348058d2ad9 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Sun, 10 Nov 2019 19:26:10 +0100
Subject: [PATCH 020/912] Bump version to 0.82

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 994ea78892..dd3bbd9606 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -16,8 +16,8 @@ android {
         applicationId "com.termux"
         minSdkVersion 24
         targetSdkVersion 28
-        versionCode 80
-        versionName "0.80"
+        versionCode 82
+        versionName "0.82"
 
         externalNativeBuild {
             ndkBuild {

From cdccc2c43350acdbf612117f2901e121f7b52938 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Sun, 10 Nov 2019 22:05:06 +0100
Subject: [PATCH 021/912] Do not limit cursor movement to scroll region

The scrolling region set by DECSTBM should not affect the
Cursor Down (CUD) and Cursor Up (CUU) escape sequences.

Fixes #1340.
---
 .../com/termux/terminal/TerminalEmulator.java |  4 ++--
 .../com/termux/terminal/ScrollRegionTest.java | 20 +++++++++++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java b/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
index f778cf9240..3d9d7c8c79 100644
--- a/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
+++ b/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
@@ -1376,10 +1376,10 @@ private void doCsi(int b) {
             }
             break;
             case 'A': // "CSI${n}A" - Cursor up (CUU) ${n} rows.
-                setCursorRow(Math.max(mTopMargin, mCursorRow - getArg0(1)));
+                setCursorRow(Math.max(0, mCursorRow - getArg0(1)));
                 break;
             case 'B': // "CSI${n}B" - Cursor down (CUD) ${n} rows.
-                setCursorRow(Math.min(mBottomMargin - 1, mCursorRow + getArg0(1)));
+                setCursorRow(Math.min(mRows - 1, mCursorRow + getArg0(1)));
                 break;
             case 'C': // "CSI${n}C" - Cursor forward (CUF).
             case 'a': // "CSI${n}a" - Horizontal position relative (HPR). From ISO-6428/ECMA-48.
diff --git a/terminal-emulator/src/test/java/com/termux/terminal/ScrollRegionTest.java b/terminal-emulator/src/test/java/com/termux/terminal/ScrollRegionTest.java
index 260a481a69..bbb5e7ac73 100644
--- a/terminal-emulator/src/test/java/com/termux/terminal/ScrollRegionTest.java
+++ b/terminal-emulator/src/test/java/com/termux/terminal/ScrollRegionTest.java
@@ -107,4 +107,24 @@ public void testScrollDownBelowScrollRegion() {
 		assertLinesAre("1 ", "2 ", "3 ", "QQ", "YY");
 	}
 
+    /** See https://github.com/termux/termux-app/issues/1340 */
+    public void testScrollRegionDoesNotLimitCursorMovement() {
+        withTerminalSized(6, 4)
+            .enterString("\033[4;7r\033[3;1Haaa\033[Axxx")
+            .assertLinesAre(
+                "      ",
+                "   xxx",
+                "aaa   ",
+                "      "
+            );
+
+        withTerminalSized(6, 4)
+            .enterString("\033[1;3r\033[3;1Haaa\033[Bxxx")
+            .assertLinesAre(
+                "      ",
+                "      ",
+                "aaa   ",
+                "   xxx"
+            );
+    }
 }

From 677d75e173e44c38e4d4e02d160d15afd5b81928 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Sun, 24 Nov 2019 19:07:34 +0100
Subject: [PATCH 022/912] Remove outdated tests

Remove tests that asserted that Cursor Down (CUD) and Cursor Up (CUU)
escape sequences were affected by the scrolling region set by DECSTBM.

This was incorrect and recently fixed:
https://github.com/termux/termux-app/issues/1340
---
 .../test/java/com/termux/terminal/CursorAndScreenTest.java    | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/terminal-emulator/src/test/java/com/termux/terminal/CursorAndScreenTest.java b/terminal-emulator/src/test/java/com/termux/terminal/CursorAndScreenTest.java
index 12635425ad..121cb22318 100644
--- a/terminal-emulator/src/test/java/com/termux/terminal/CursorAndScreenTest.java
+++ b/terminal-emulator/src/test/java/com/termux/terminal/CursorAndScreenTest.java
@@ -133,8 +133,6 @@ public void testCursorUp() {
 		withTerminalSized(3, 3).enterString("ABCDEFG\033[2AH").assertLinesAre("AHC", "DEF", "G  ");
 		// If an attempt is made to move the cursor above the top margin, the cursor stops at the top margin:
 		withTerminalSized(3, 3).enterString("ABCDEFG\033[44AH").assertLinesAre("AHC", "DEF", "G  ");
-		// Set top margin and validate that cursor does not go above it:
-		withTerminalSized(3, 3).enterString("\033[2rABCDEFG\033[44AH").assertLinesAre("ABC", "DHF", "G  ");
 	}
 
 	public void testCursorDown() {
@@ -143,8 +141,6 @@ public void testCursorDown() {
 		withTerminalSized(3, 3).enterString("AB\033[2BC").assertLinesAre("AB ", "   ", "  C");
 		// If an attempt is made to move the cursor below the bottom margin, the cursor stops at the bottom margin:
 		withTerminalSized(3, 3).enterString("AB\033[44BC").assertLinesAre("AB ", "   ", "  C");
-		// Set bottom margin and validate that cursor does not go above it:
-		withTerminalSized(3, 3).enterString("\033[1;2rAB\033[44BC").assertLinesAre("AB ", "  C", "   ");
 	}
 
 	public void testReportCursorPosition() {

From cf883f5f0504686aa1424733bbbfb1a095f64253 Mon Sep 17 00:00:00 2001
From: Leonid Plyushch <leonid.plyushch@gmail.com>
Date: Sat, 23 Nov 2019 15:22:11 +0200
Subject: [PATCH 023/912] extra keys: handle actions UP & CANCEL separately

Related issue: https://github.com/termux/termux-app/issues/905
---
 app/src/main/java/com/termux/app/ExtraKeysView.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/termux/app/ExtraKeysView.java b/app/src/main/java/com/termux/app/ExtraKeysView.java
index 4c2694cee3..1af2830a0b 100644
--- a/app/src/main/java/com/termux/app/ExtraKeysView.java
+++ b/app/src/main/java/com/termux/app/ExtraKeysView.java
@@ -401,8 +401,14 @@ void reload(String[][] buttons, CharDisplayMap charDisplayMap) {
                             }
                             return true;
 
-                        case MotionEvent.ACTION_UP:
                         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();

From 87841886d4bf6c4a60d48774333dba6609c97f1f Mon Sep 17 00:00:00 2001
From: Leonid Plyushch <leonid.plyushch@gmail.com>
Date: Sat, 23 Nov 2019 19:49:07 +0200
Subject: [PATCH 024/912] extra keys: improve handling of DnD mode

Do not disturb mode is now handled only for SDKs pre-28. Extra keys will
not vibrate only when total silence mode is used.
---
 app/src/main/java/com/termux/app/ExtraKeysView.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/termux/app/ExtraKeysView.java b/app/src/main/java/com/termux/app/ExtraKeysView.java
index 1af2830a0b..e2f76dc3eb 100644
--- a/app/src/main/java/com/termux/app/ExtraKeysView.java
+++ b/app/src/main/java/com/termux/app/ExtraKeysView.java
@@ -354,9 +354,13 @@ void reload(String[][] buttons, CharDisplayMap charDisplayMap) {
                     if (Settings.System.getInt(getContext().getContentResolver(),
                         Settings.System.HAPTIC_FEEDBACK_ENABLED, 0) != 0) {
 
-                        // Depending on DnD settings, value can be >1 but 0 means "disabled".
-                        if (Settings.Global.getInt(getContext().getContentResolver(), "zen_mode", 0) < 1) {
+                        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);
+                            }
                         }
                     }
 

From f4db9ff212a672572c2a8fbf2f494e67d38a6d27 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Sun, 24 Nov 2019 19:09:59 +0100
Subject: [PATCH 025/912] Bump version to 0.84

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index dd3bbd9606..d56089c09c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -16,8 +16,8 @@ android {
         applicationId "com.termux"
         minSdkVersion 24
         targetSdkVersion 28
-        versionCode 82
-        versionName "0.82"
+        versionCode 84
+        versionName "0.84"
 
         externalNativeBuild {
             ndkBuild {

From fcd3bc113331c138778a1d04051b0e55f688efb6 Mon Sep 17 00:00:00 2001
From: Leonid Plyushch <leonid.plyushch@gmail.com>
Date: Mon, 2 Dec 2019 17:19:17 +0200
Subject: [PATCH 026/912] update gradle wrapper

---
 gradle/wrapper/gradle-wrapper.jar        | Bin 55190 -> 55616 bytes
 gradle/wrapper/gradle-wrapper.properties |   3 +--
 gradlew                                  |  22 +++++++++++++++++++---
 gradlew.bat                              |  18 +++++++++++++++++-
 4 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 87b738cbd051603d91cc39de6cb000dd98fe6b02..5c2d1cf016b3885f6930543d57b744ea8c220a1a 100644
GIT binary patch
delta 3320
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
R^3$e5zsN`FCc2S<;XjD90!#n^

delta 2991
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
Pbkbqm3=F=5f2aQeBaWHL

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index f23127f7e9..0ebb3108e2 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Sun Aug 25 01:57:11 CEST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
diff --git a/gradlew b/gradlew
index af6708ff22..83f2acfdc3 100755
--- a/gradlew
+++ b/gradlew
@@ -1,5 +1,21 @@
 #!/usr/bin/env sh
 
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m"'
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
@@ -109,8 +125,8 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
     JAVACMD=`cygpath --unix "$JAVACMD"`
diff --git a/gradlew.bat b/gradlew.bat
index 0f8d5937c4..24467a141f 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,3 +1,19 @@
+@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
@@ -14,7 +30,7 @@ set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
 @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"
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome

From 951df6b4e2386458fdf5b8089e9c58ac9c1dc9f9 Mon Sep 17 00:00:00 2001
From: mao <maokai1905@gmail.com>
Date: Sat, 5 Oct 2019 18:05:42 +0800
Subject: [PATCH 027/912] Add selection mode cursor controller

---
 .../java/com/termux/view/TerminalView.java    | 787 +++++++++++++++---
 1 file changed, 661 insertions(+), 126 deletions(-)

diff --git a/terminal-view/src/main/java/com/termux/view/TerminalView.java b/terminal-view/src/main/java/com/termux/view/TerminalView.java
index 95c13086e9..2065248779 100644
--- a/terminal-view/src/main/java/com/termux/view/TerminalView.java
+++ b/terminal-view/src/main/java/com/termux/view/TerminalView.java
@@ -8,14 +8,13 @@
 import android.graphics.Canvas;
 import android.graphics.Rect;
 import android.graphics.Typeface;
-import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.text.Editable;
 import android.text.InputType;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.util.Log;
-import android.view.accessibility.AccessibilityManager;
 import android.view.ActionMode;
 import android.view.HapticFeedbackConstants;
 import android.view.InputDevice;
@@ -25,9 +24,16 @@
 import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.View;
+import android.view.ViewConfiguration;
+import android.view.ViewGroup;
+import android.view.ViewParent;
+import android.view.ViewTreeObserver;
+import android.view.WindowManager;
+import android.view.accessibility.AccessibilityManager;
 import android.view.inputmethod.BaseInputConnection;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputConnection;
+import android.widget.PopupWindow;
 import android.widget.Scroller;
 
 import com.termux.terminal.EmulatorDebug;
@@ -54,11 +60,14 @@ public final class TerminalView extends View {
     /** The top row of text to display. Ranges from -activeTranscriptRows to 0. */
     int mTopRow;
 
-    boolean mIsSelectingText = false, mIsDraggingLeftSelection, mInitialTextSelection;
+    boolean mIsSelectingText = false;
     int mSelX1 = -1, mSelX2 = -1, mSelY1 = -1, mSelY2 = -1;
-    float mSelectionDownX, mSelectionDownY;
     private ActionMode mActionMode;
-    private BitmapDrawable mLeftSelectionHandle, mRightSelectionHandle;
+    Drawable mSelectHandleLeft;
+    Drawable mSelectHandleRight;
+    final int[] mTempCoords = new int[2];
+    Rect mTempRect;
+    private SelectionModifierCursorController mSelectionModifierCursorController;
 
     float mScaleFactor = 1.f;
     final GestureAndScaleRecognizer mGestureRecognizer;
@@ -102,7 +111,7 @@ public boolean onUp(MotionEvent e) {
             public boolean onSingleTapUp(MotionEvent e) {
                 if (mEmulator == null) return true;
                 if (mIsSelectingText) {
-                    toggleSelectingText(null);
+                    stopTextSelectionMode();
                     return true;
                 }
                 requestFocus();
@@ -117,7 +126,7 @@ public boolean onSingleTapUp(MotionEvent e) {
 
             @Override
             public boolean onScroll(MotionEvent e, float distanceX, float distanceY) {
-                if (mEmulator == null || mIsSelectingText) return true;
+                if (mEmulator == null) return true;
                 if (mEmulator.isMouseTrackingActive() && e.isFromSource(InputDevice.SOURCE_MOUSE)) {
                     // If moving with mouse pointer while pressing button, report that instead of scroll.
                     // This means that we never report moving with button press-events for touch input,
@@ -195,7 +204,7 @@ public void onLongPress(MotionEvent e) {
                 if (mClient.onLongPress(e)) return;
                 if (!mIsSelectingText) {
                     performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);
-                    toggleSelectingText(e);
+                    startSelectingText(e);
                 }
             }
         });
@@ -368,7 +377,7 @@ public void onScreenUpdated() {
             if (-mTopRow + rowShift > rowsInHistory) {
                 // .. unless we're hitting the end of history transcript, in which
                 // case we abort text selection and scroll to end.
-                toggleSelectingText(null);
+                stopTextSelectionMode();
             } else {
                 skipScrolling = true;
                 mTopRow -= rowShift;
@@ -475,55 +484,7 @@ public boolean onTouchEvent(MotionEvent ev) {
         final int action = ev.getAction();
 
         if (mIsSelectingText) {
-            int cy = (int) (ev.getY() / mRenderer.mFontLineSpacing) + mTopRow;
-            int cx = (int) (ev.getX() / mRenderer.mFontWidth);
-
-            switch (action) {
-                case MotionEvent.ACTION_UP:
-                    mInitialTextSelection = false;
-                    break;
-                case MotionEvent.ACTION_DOWN:
-                    int distanceFromSel1 = Math.abs(cx - mSelX1) + Math.abs(cy - mSelY1);
-                    int distanceFromSel2 = Math.abs(cx - mSelX2) + Math.abs(cy - mSelY2);
-                    mIsDraggingLeftSelection = distanceFromSel1 <= distanceFromSel2;
-                    mSelectionDownX = ev.getX();
-                    mSelectionDownY = ev.getY();
-                    break;
-                case MotionEvent.ACTION_MOVE:
-                    if (mInitialTextSelection) break;
-                    float deltaX = ev.getX() - mSelectionDownX;
-                    float deltaY = ev.getY() - mSelectionDownY;
-                    int deltaCols = (int) Math.ceil(deltaX / mRenderer.mFontWidth);
-                    int deltaRows = (int) Math.ceil(deltaY / mRenderer.mFontLineSpacing);
-                    mSelectionDownX += deltaCols * mRenderer.mFontWidth;
-                    mSelectionDownY += deltaRows * mRenderer.mFontLineSpacing;
-                    if (mIsDraggingLeftSelection) {
-                        mSelX1 += deltaCols;
-                        mSelY1 += deltaRows;
-                    } else {
-                        mSelX2 += deltaCols;
-                        mSelY2 += deltaRows;
-                    }
-
-                    mSelX1 = Math.min(mEmulator.mColumns, Math.max(0, mSelX1));
-                    mSelX2 = Math.min(mEmulator.mColumns, Math.max(0, mSelX2));
-
-                    if (mSelY1 == mSelY2 && mSelX1 > mSelX2 || mSelY1 > mSelY2) {
-                        // Switch handles.
-                        mIsDraggingLeftSelection = !mIsDraggingLeftSelection;
-                        int tmpX1 = mSelX1, tmpY1 = mSelY1;
-                        mSelX1 = mSelX2;
-                        mSelY1 = mSelY2;
-                        mSelX2 = tmpX1;
-                        mSelY2 = tmpY1;
-                    }
-
-                    mActionMode.invalidateContentRect();
-                    invalidate();
-                    break;
-                default:
-                    break;
-            }
+            updateFloatingToolbarVisibility(ev);
             mGestureRecognizer.onTouchEvent(ev);
             return true;
         } else if (ev.isFromSource(InputDevice.SOURCE_MOUSE)) {
@@ -561,7 +522,7 @@ public boolean onKeyPreIme(int keyCode, KeyEvent event) {
             Log.i(EmulatorDebug.LOG_TAG, "onKeyPreIme(keyCode=" + keyCode + ", event=" + event + ")");
         if (keyCode == KeyEvent.KEYCODE_BACK) {
             if (mIsSelectingText) {
-                toggleSelectingText(null);
+                stopTextSelectionMode();
                 return true;
             } else if (mClient.shouldBackButtonBeMappedToEscape()) {
                 // Intercept back button to treat it as escape:
@@ -770,59 +731,439 @@ protected void onDraw(Canvas canvas) {
         } else {
             mRenderer.render(mEmulator, canvas, mTopRow, mSelY1, mSelY2, mSelX1, mSelX2);
 
-            if (mIsSelectingText) {
-                final int gripHandleWidth = mLeftSelectionHandle.getIntrinsicWidth();
-                final int gripHandleMargin = gripHandleWidth / 4; // See the png.
-
-                int right = Math.round((mSelX1) * mRenderer.mFontWidth) + gripHandleMargin;
-                int top = (mSelY1 + 1 - mTopRow) * mRenderer.mFontLineSpacing + mRenderer.mFontLineSpacingAndAscent;
-                mLeftSelectionHandle.setBounds(right - gripHandleWidth, top, right, top + mLeftSelectionHandle.getIntrinsicHeight());
-                mLeftSelectionHandle.draw(canvas);
 
-                int left = Math.round((mSelX2 + 1) * mRenderer.mFontWidth) - gripHandleMargin;
-                top = (mSelY2 + 1 - mTopRow) * mRenderer.mFontLineSpacing + mRenderer.mFontLineSpacingAndAscent;
-                mRightSelectionHandle.setBounds(left, top, left + gripHandleWidth, top + mRightSelectionHandle.getIntrinsicHeight());
-                mRightSelectionHandle.draw(canvas);
+            SelectionModifierCursorController selectionController = getSelectionController();
+            if (selectionController != null && selectionController.isActive()) {
+                selectionController.updatePosition();
             }
         }
     }
 
     /** Toggle text selection mode in the view. */
     @TargetApi(23)
-    public void toggleSelectingText(MotionEvent ev) {
-        mIsSelectingText = !mIsSelectingText;
-        mClient.copyModeChanged(mIsSelectingText);
+    public void startSelectingText(MotionEvent ev) {
+        int cx = (int) (ev.getX() / mRenderer.mFontWidth);
+        final boolean eventFromMouse = ev.isFromSource(InputDevice.SOURCE_MOUSE);
+        // Offset for finger:
+        final int SELECT_TEXT_OFFSET_Y = eventFromMouse ? 0 : -40;
+        int cy = (int) ((ev.getY() + SELECT_TEXT_OFFSET_Y) / mRenderer.mFontLineSpacing) + mTopRow;
+
+        mSelX1 = mSelX2 = cx;
+        mSelY1 = mSelY2 = cy;
+
+        TerminalBuffer screen = mEmulator.getScreen();
+        if (!" ".equals(screen.getSelectedText(mSelX1, mSelY1, mSelX1, mSelY1))) {
+            // Selecting something other than whitespace. Expand to word.
+            while (mSelX1 > 0 && !"".equals(screen.getSelectedText(mSelX1 - 1, mSelY1, mSelX1 - 1, mSelY1))) {
+                mSelX1--;
+            }
+            while (mSelX2 < mEmulator.mColumns - 1 && !"".equals(screen.getSelectedText(mSelX2 + 1, mSelY1, mSelX2 + 1, mSelY1))) {
+                mSelX2++;
+            }
+        }
+        startTextSelectionMode();
+    }
 
-        if (mIsSelectingText) {
-            if (mLeftSelectionHandle == null) {
-                mLeftSelectionHandle = (BitmapDrawable) getContext().getDrawable(R.drawable.text_select_handle_left_material);
-                mRightSelectionHandle = (BitmapDrawable) getContext().getDrawable(R.drawable.text_select_handle_right_material);
+    public TerminalSession getCurrentSession() {
+        return mTermSession;
+    }
+
+    private CharSequence getText() {
+        return mEmulator.getScreen().getSelectedText(0, mTopRow, mEmulator.mColumns, mTopRow + mEmulator.mRows);
+    }
+
+    @Override
+    protected void onAttachedToWindow() {
+        super.onAttachedToWindow();
+
+        if (mSelectionModifierCursorController != null) {
+            getViewTreeObserver().addOnTouchModeChangeListener(mSelectionModifierCursorController);
+        }
+    }
+
+    @Override
+    protected void onDetachedFromWindow() {
+        super.onDetachedFromWindow();
+
+        if (mSelectionModifierCursorController != null) {
+            getViewTreeObserver().removeOnTouchModeChangeListener(mSelectionModifierCursorController);
+            mSelectionModifierCursorController.onDetached();
+        }
+    }
+
+
+    private int getCursorX(float x) {
+        return (int) (x / mRenderer.mFontWidth);
+    }
+
+    private int getCursorY(float y) {
+        return (int) (((y - 40) / mRenderer.mFontLineSpacing) + mTopRow);
+    }
+
+    private int getPointX(int cx) {
+        if (cx > mEmulator.mColumns) {
+            cx = mEmulator.mColumns;
+        }
+        return Math.round(cx * mRenderer.mFontWidth);
+    }
+
+    private int getPointY(int cy) {
+        return Math.round((cy - mTopRow) * mRenderer.mFontLineSpacing);
+    }
+
+    /**
+     * A CursorController instance can be used to control a cursor in the text.
+     * It is not used outside of {@link TerminalView}.
+     */
+    private interface CursorController extends ViewTreeObserver.OnTouchModeChangeListener {
+        /**
+         * Makes the cursor controller visible on screen. Will be drawn by {@link #draw(Canvas)}.
+         * See also {@link #hide()}.
+         */
+        void show();
+
+        /**
+         * Hide the cursor controller from screen.
+         * See also {@link #show()}.
+         */
+        void hide();
+
+        /**
+         * @return true if the CursorController is currently visible
+         */
+        boolean isActive();
+
+        /**
+         * Update the controller's position.
+         */
+        void updatePosition(HandleView handle, int x, int y);
+
+        void updatePosition();
+
+        /**
+         * This method is called by {@link #onTouchEvent(MotionEvent)} and gives the controller
+         * a chance to become active and/or visible.
+         *
+         * @param event The touch event
+         */
+        boolean onTouchEvent(MotionEvent event);
+
+        /**
+         * Called when the view is detached from window. Perform house keeping task, such as
+         * stopping Runnable thread that would otherwise keep a reference on the context, thus
+         * preventing the activity to be recycled.
+         */
+        void onDetached();
+    }
+
+    private class HandleView extends View {
+        private Drawable mDrawable;
+        private PopupWindow mContainer;
+        private int mPointX;
+        private int mPointY;
+        private CursorController mController;
+        private boolean mIsDragging;
+        private float mTouchToWindowOffsetX;
+        private float mTouchToWindowOffsetY;
+        private float mHotspotX;
+        private float mHotspotY;
+        private float mTouchOffsetY;
+        private int mLastParentX;
+        private int mLastParentY;
+
+        int mHandleWidth;
+        private final int mOrigOrient;
+        private int mOrientation;
+
+
+        public static final int LEFT = 0;
+        public static final int RIGHT = 2;
+        private int mHandleHeight;
+
+        public HandleView(CursorController controller, int orientation) {
+            super(TerminalView.this.getContext());
+            mController = controller;
+            mContainer = new PopupWindow(TerminalView.this.getContext(), null,
+                android.R.attr.textSelectHandleWindowStyle);
+            mContainer.setSplitTouchEnabled(true);
+            mContainer.setClippingEnabled(false);
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                mContainer.setWindowLayoutType(WindowManager.LayoutParams.TYPE_APPLICATION_SUB_PANEL);
+            }
+            mContainer.setWidth(ViewGroup.LayoutParams.WRAP_CONTENT);
+            mContainer.setHeight(ViewGroup.LayoutParams.WRAP_CONTENT);
+
+            this.mOrigOrient = orientation;
+            setOrientation(orientation);
+        }
+
+        public void setOrientation(int orientation) {
+            mOrientation = orientation;
+            int handleWidth = 0;
+            switch (orientation) {
+                case LEFT: {
+                    if (mSelectHandleLeft == null) {
+
+                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                            mSelectHandleLeft = getContext().getDrawable(
+                                R.drawable.text_select_handle_left_material);
+                        } else {
+                            mSelectHandleLeft = getContext().getResources().getDrawable(
+                                R.drawable.text_select_handle_left_material);
+
+                        }
+                    }
+                    //
+                    mDrawable = mSelectHandleLeft;
+                    handleWidth = mDrawable.getIntrinsicWidth();
+                    mHotspotX = (handleWidth * 3) / 4;
+                    break;
+                }
+
+                case RIGHT: {
+                    if (mSelectHandleRight == null) {
+                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                            mSelectHandleRight = getContext().getDrawable(
+                                R.drawable.text_select_handle_right_material);
+                        } else {
+                            mSelectHandleRight = getContext().getResources().getDrawable(
+                                R.drawable.text_select_handle_right_material);
+                        }
+                    }
+                    mDrawable = mSelectHandleRight;
+                    handleWidth = mDrawable.getIntrinsicWidth();
+                    mHotspotX = handleWidth / 4;
+                    break;
+                }
+
+            }
+
+            mHandleHeight = mDrawable.getIntrinsicHeight();
+
+            mHandleWidth = handleWidth;
+            mTouchOffsetY = -mHandleHeight * 0.3f;
+            mHotspotY = 0;
+            invalidate();
+        }
+
+        public void changeOrientation(int orientation) {
+            if (mOrientation != orientation) {
+                setOrientation(orientation);
+            }
+        }
+
+        @Override
+        public void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+            setMeasuredDimension(mDrawable.getIntrinsicWidth(),
+                mDrawable.getIntrinsicHeight());
+        }
+
+        public void show() {
+            if (!isPositionVisible()) {
+                hide();
+                return;
+            }
+            mContainer.setContentView(this);
+            final int[] coords = mTempCoords;
+            TerminalView.this.getLocationInWindow(coords);
+            coords[0] += mPointX;
+            coords[1] += mPointY;
+            mContainer.showAtLocation(TerminalView.this, 0, coords[0], coords[1]);
+        }
+
+        public void hide() {
+            mIsDragging = false;
+            mContainer.dismiss();
+        }
+
+        public boolean isShowing() {
+            return mContainer.isShowing();
+        }
+
+        private void checkChangedOrientation() {
+
+            final TerminalView hostView = TerminalView.this;
+            final int left = hostView.getLeft();
+            final int right = hostView.getWidth();
+            final int top = hostView.getTop();
+            final int bottom = hostView.getHeight();
+
+            if (mTempRect == null) {
+                mTempRect = new Rect();
+            }
+            final Rect clip = mTempRect;
+            clip.left = left + TerminalView.this.getPaddingLeft();
+            clip.top = top + TerminalView.this.getPaddingTop();
+            clip.right = right - TerminalView.this.getPaddingRight();
+            clip.bottom = bottom - TerminalView.this.getPaddingBottom();
+
+            final ViewParent parent = hostView.getParent();
+            if (parent == null || !parent.getChildVisibleRect(hostView, clip, null)) {
+                return;
+            }
+
+            final int[] coords = mTempCoords;
+            hostView.getLocationInWindow(coords);
+            final int posX = coords[0] + mPointX;
+            if (posX + (int) mHotspotX < clip.left) {
+                changeOrientation(RIGHT);
+            } else if (posX + mHandleWidth > clip.right) {
+                changeOrientation(LEFT);
+            } else {
+                changeOrientation(mOrigOrient);
+            }
+        }
+
+        private boolean isPositionVisible() {
+            // Always show a dragging handle.
+            if (mIsDragging) {
+                return true;
+            }
+
+            final TerminalView hostView = TerminalView.this;
+            final int left = 0;
+            final int right = hostView.getWidth();
+            final int top = 0;
+            final int bottom = hostView.getHeight();
+
+            if (mTempRect == null) {
+                mTempRect = new Rect();
+            }
+            final Rect clip = mTempRect;
+            clip.left = left + TerminalView.this.getPaddingLeft();
+            clip.top = top + TerminalView.this.getPaddingTop();
+            clip.right = right - TerminalView.this.getPaddingRight();
+            clip.bottom = bottom - TerminalView.this.getPaddingBottom();
+
+            final ViewParent parent = hostView.getParent();
+            if (parent == null || !parent.getChildVisibleRect(hostView, clip, null)) {
+                return false;
             }
 
-            int cx = (int) (ev.getX() / mRenderer.mFontWidth);
-            final boolean eventFromMouse = ev.isFromSource(InputDevice.SOURCE_MOUSE);
-            // Offset for finger:
-            final int SELECT_TEXT_OFFSET_Y = eventFromMouse ? 0 : -40;
-            int cy = (int) ((ev.getY() + SELECT_TEXT_OFFSET_Y) / mRenderer.mFontLineSpacing) + mTopRow;
+            final int[] coords = mTempCoords;
+            hostView.getLocationInWindow(coords);
+            final int posX = coords[0] + mPointX + (int) mHotspotX;
+            final int posY = coords[1] + mPointY + (int) mHotspotY;
+
+            return posX >= clip.left && posX <= clip.right &&
+                posY >= clip.top && posY <= clip.bottom;
+        }
 
-            mSelX1 = mSelX2 = cx;
-            mSelY1 = mSelY2 = cy;
+        private void moveTo(int x, int y) {
+            mPointX = x;
+            mPointY = y;
+            checkChangedOrientation();
+            if (isPositionVisible()) {
+                int[] coords = null;
+                if (mContainer.isShowing()) {
+                    coords = mTempCoords;
+                    TerminalView.this.getLocationInWindow(coords);
+                    int x1 = coords[0] + mPointX;
+                    int y1 = coords[1] + mPointY;
+                    mContainer.update(x1, y1,
+                        getWidth(), getHeight());
+                } else {
+                    show();
+                }
 
-            TerminalBuffer screen = mEmulator.getScreen();
-            if (!" ".equals(screen.getSelectedText(mSelX1, mSelY1, mSelX1, mSelY1))) {
-                // Selecting something other than whitespace. Expand to word.
-                while (mSelX1 > 0 && !"".equals(screen.getSelectedText(mSelX1 - 1, mSelY1, mSelX1 - 1, mSelY1))) {
-                    mSelX1--;
+                if (mIsDragging) {
+                    if (coords == null) {
+                        coords = mTempCoords;
+                        TerminalView.this.getLocationInWindow(coords);
+                    }
+                    if (coords[0] != mLastParentX || coords[1] != mLastParentY) {
+                        mTouchToWindowOffsetX += coords[0] - mLastParentX;
+                        mTouchToWindowOffsetY += coords[1] - mLastParentY;
+                        mLastParentX = coords[0];
+                        mLastParentY = coords[1];
+                    }
                 }
-                while (mSelX2 < mEmulator.mColumns - 1 && !"".equals(screen.getSelectedText(mSelX2 + 1, mSelY1, mSelX2 + 1, mSelY1))) {
-                    mSelX2++;
+            } else {
+                if (isShowing()) {
+                    hide();
                 }
             }
+        }
+
+        @Override
+        public void onDraw(Canvas c) {
+            final int drawWidth = mDrawable.getIntrinsicWidth();
+            int height = mDrawable.getIntrinsicHeight();
+            mDrawable.setBounds(0, 0, drawWidth, height);
+            mDrawable.draw(c);
+
+        }
+
+        @SuppressLint("ClickableViewAccessibility")
+        @Override
+        public boolean onTouchEvent(MotionEvent ev) {
+            updateFloatingToolbarVisibility(ev);
+            switch (ev.getActionMasked()) {
+                case MotionEvent.ACTION_DOWN: {
+                    final float rawX = ev.getRawX();
+                    final float rawY = ev.getRawY();
+                    mTouchToWindowOffsetX = rawX - mPointX;
+                    mTouchToWindowOffsetY = rawY - mPointY;
+                    final int[] coords = mTempCoords;
+                    TerminalView.this.getLocationInWindow(coords);
+                    mLastParentX = coords[0];
+                    mLastParentY = coords[1];
+                    mIsDragging = true;
+                    break;
+                }
+
+                case MotionEvent.ACTION_MOVE: {
+                    final float rawX = ev.getRawX();
+                    final float rawY = ev.getRawY();
+
+                    final float newPosX = rawX - mTouchToWindowOffsetX + mHotspotX;
+                    final float newPosY = rawY - mTouchToWindowOffsetY + mHotspotY + mTouchOffsetY;
+
+                    mController.updatePosition(this, Math.round(newPosX), Math.round(newPosY));
 
-            mInitialTextSelection = true;
-            mIsDraggingLeftSelection = true;
-            mSelectionDownX = ev.getX();
-            mSelectionDownY = ev.getY();
+
+                    break;
+                }
+
+                case MotionEvent.ACTION_UP:
+                case MotionEvent.ACTION_CANCEL:
+                    mIsDragging = false;
+            }
+            return true;
+        }
+
+
+        public boolean isDragging() {
+            return mIsDragging;
+        }
+
+        void positionAtCursor(final int cx, final int cy) {
+            int left = (int) (getPointX(cx) - mHotspotX);
+            int bottom = getPointY(cy + 1);
+            moveTo(left, bottom);
+        }
+    }
+
+
+    private class SelectionModifierCursorController implements CursorController {
+        private final int mHandleHeight;
+        // The cursor controller images
+        private HandleView mStartHandle, mEndHandle;
+        // Whether selection anchors are active
+        private boolean mIsShowing;
+
+        SelectionModifierCursorController() {
+            mStartHandle = new HandleView(this, HandleView.LEFT);
+            mEndHandle = new HandleView(this, HandleView.RIGHT);
+
+            mHandleHeight = Math.max(mStartHandle.mHandleHeight, mEndHandle.mHandleHeight);
+        }
+
+        public void show() {
+            mIsShowing = true;
+            updatePosition();
+            mStartHandle.show();
+            mEndHandle.show();
 
             final ActionMode.Callback callback = new ActionMode.Callback() {
                 @Override
@@ -864,7 +1205,7 @@ public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
                             showContextMenu();
                             break;
                     }
-                    toggleSelectingText(null);
+                    stopTextSelectionMode();
                     return true;
                 }
 
@@ -873,52 +1214,246 @@ public void onDestroyActionMode(ActionMode mode) {
                 }
 
             };
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                mActionMode = startActionMode(new ActionMode.Callback2() {
+                    @Override
+                    public boolean onCreateActionMode(ActionMode mode, Menu menu) {
+                        return callback.onCreateActionMode(mode, menu);
+                    }
 
-            mActionMode = startActionMode(new ActionMode.Callback2() {
-                @Override
-                public boolean onCreateActionMode(ActionMode mode, Menu menu) {
-                    return callback.onCreateActionMode(mode, menu);
-                }
+                    @Override
+                    public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
+                        return false;
+                    }
 
-                @Override
-                public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
-                    return false;
-                }
+                    @Override
+                    public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
+                        return callback.onActionItemClicked(mode, item);
+                    }
 
-                @Override
-                public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
-                    return callback.onActionItemClicked(mode, item);
+                    @Override
+                    public void onDestroyActionMode(ActionMode mode) {
+                        // Ignore.
+                    }
+
+                    @Override
+                    public void onGetContentRect(ActionMode mode, View view, Rect outRect) {
+                        int x1 = Math.round(mSelX1 * mRenderer.mFontWidth);
+                        int x2 = Math.round(mSelX2 * mRenderer.mFontWidth);
+                        int y1 = Math.round((mSelY1 - mTopRow) * mRenderer.mFontLineSpacing);
+                        int y2 = Math.round((mSelY2 + 1 - mTopRow) * mRenderer.mFontLineSpacing);
+
+
+                        if (x1 > x2) {
+                            int tmp = x1;
+                            x1 = x2;
+                            x2 = tmp;
+                        }
+
+                        outRect.set(x1, y1 + mHandleHeight, x2, y2 + mHandleHeight);
+                    }
+                }, ActionMode.TYPE_FLOATING);
+            } else {
+                mActionMode = startActionMode(callback);
+            }
+        }
+
+        public void hide() {
+            mStartHandle.hide();
+            mEndHandle.hide();
+            mIsShowing = false;
+            if (mActionMode != null) {
+                // This will hide the mSelectionModifierCursorController
+                mActionMode.finish();
+            }
+
+        }
+
+        public boolean isActive() {
+            return mIsShowing;
+        }
+
+        public void updatePosition(HandleView handle, int x, int y) {
+            final int scrollRows = mEmulator.getScreen().getActiveRows() - mEmulator.mRows;
+            if (y < mRenderer.mFontLineSpacing) {//up
+                mTopRow--;
+                if (mTopRow < -scrollRows) {
+                    mTopRow = -scrollRows;
+                }
+            } else if (y + 2 * mRenderer.mFontLineSpacing > TerminalView.this.getHeight()) {//down
+                mTopRow++;
+                if (mTopRow > 0) {
+                    mTopRow = 0;
+                }
+            }
+            if (handle == mStartHandle) {
+                mSelX1 = getCursorX(x);
+                mSelY1 = getCursorY(y);
+                if (mSelX1 < 0) {
+                    mSelX1 = 0;
+                }
+                if (mSelY1 < -scrollRows) {
+                    mSelY1 = -scrollRows;
+                } else if (mSelY1 > mEmulator.mRows - 1) {
+                    mSelY1 = mEmulator.mRows - 1;
                 }
 
-                @Override
-                public void onDestroyActionMode(ActionMode mode) {
-                    // Ignore.
+                if (mSelY1 > mSelY2) {
+                    mSelY1 = mSelY2;
+                }
+                if (mSelY1 == mSelY2 && mSelX1 > mSelX2) {
+                    mSelX1 = mSelX2;
+                }
+            } else {
+                mSelX2 = getCursorX(x);
+                mSelY2 = getCursorY(y);
+                if (mSelX2 < 0) {
+                    mSelX2 = 0;
+                }
+                if (mSelY2 < -scrollRows) {
+                    mSelY2 = -scrollRows;
+                } else if (mSelY2 > mEmulator.mRows - 1) {
+                    mSelY2 = mEmulator.mRows - 1;
                 }
 
-                @Override
-                public void onGetContentRect(ActionMode mode, View view, Rect outRect) {
-                    int x1 = Math.round(mSelX1 * mRenderer.mFontWidth);
-                    int x2 = Math.round(mSelX2 * mRenderer.mFontWidth);
-                    int y1 = Math.round((mSelY1 - mTopRow) * mRenderer.mFontLineSpacing);
-                    int y2 = Math.round((mSelY2 + 1 - mTopRow) * mRenderer.mFontLineSpacing);
-                    outRect.set(Math.min(x1, x2), y1, Math.max(x1, x2), y2);
+                if (mSelY1 > mSelY2) {
+                    mSelY2 = mSelY1;
+                }
+                if (mSelY1 == mSelY2 && mSelX1 > mSelX2) {
+                    mSelX2 = mSelX1;
                 }
-            }, ActionMode.TYPE_FLOATING);
+            }
 
             invalidate();
-        } else {
-            mActionMode.finish();
+        }
+
+        public void updatePosition() {
+            if (!isActive()) {
+                return;
+            }
+
+            mStartHandle.positionAtCursor(mSelX1, mSelY1);
+
+            mEndHandle.positionAtCursor(mSelX2 + 1, mSelY2);
+
+            if (mActionMode != null) {
+                mActionMode.invalidate();
+            }
+
+        }
+
+        public boolean onTouchEvent(MotionEvent event) {
+
+            return false;
+        }
+
+
+        /**
+         * @return true iff this controller is currently used to move the selection start.
+         */
+        public boolean isSelectionStartDragged() {
+            return mStartHandle.isDragging();
+        }
+
+        public boolean isSelectionEndDragged() {
+            return mEndHandle.isDragging();
+        }
+
+        public void onTouchModeChanged(boolean isInTouchMode) {
+            if (!isInTouchMode) {
+                hide();
+            }
+        }
+
+        @Override
+        public void onDetached() {
+        }
+    }
+
+    SelectionModifierCursorController getSelectionController() {
+        if (mSelectionModifierCursorController == null) {
+            mSelectionModifierCursorController = new SelectionModifierCursorController();
+
+            final ViewTreeObserver observer = getViewTreeObserver();
+            if (observer != null) {
+                observer.addOnTouchModeChangeListener(mSelectionModifierCursorController);
+            }
+        }
+
+        return mSelectionModifierCursorController;
+    }
+
+    private void hideSelectionModifierCursorController() {
+        if (mSelectionModifierCursorController != null && mSelectionModifierCursorController.isActive()) {
+            mSelectionModifierCursorController.hide();
+        }
+    }
+
+
+    private void startTextSelectionMode() {
+        if (!requestFocus()) {
+            return;
+        }
+
+        getSelectionController().show();
+
+        mIsSelectingText = true;
+
+        mClient.copyModeChanged(mIsSelectingText);
+
+        invalidate();
+    }
+
+    private void stopTextSelectionMode() {
+        if (mIsSelectingText) {
+            hideSelectionModifierCursorController();
             mSelX1 = mSelY1 = mSelX2 = mSelY2 = -1;
+            mIsSelectingText = false;
+
+            mClient.copyModeChanged(mIsSelectingText);
+
             invalidate();
         }
     }
 
-    public TerminalSession getCurrentSession() {
-        return mTermSession;
+
+    private final Runnable mShowFloatingToolbar = new Runnable() {
+        @Override
+        public void run() {
+            if (mActionMode != null) {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                    mActionMode.hide(0);  // hide off.
+                }
+            }
+        }
+    };
+
+    void hideFloatingToolbar(int duration) {
+        if (mActionMode != null) {
+            removeCallbacks(mShowFloatingToolbar);
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                mActionMode.hide(duration);
+            }
+        }
     }
 
-    private CharSequence getText() {
-        return mEmulator.getScreen().getSelectedText(0, mTopRow, mEmulator.mColumns, mTopRow +mEmulator.mRows);
+    private void showFloatingToolbar() {
+        if (mActionMode != null) {
+            int delay = ViewConfiguration.getDoubleTapTimeout();
+            postDelayed(mShowFloatingToolbar, delay);
+        }
     }
 
+    private void updateFloatingToolbarVisibility(MotionEvent event) {
+        if (mActionMode != null) {
+            switch (event.getActionMasked()) {
+                case MotionEvent.ACTION_MOVE:
+                    hideFloatingToolbar(-1);
+                    break;
+                case MotionEvent.ACTION_UP:  // fall through
+                case MotionEvent.ACTION_CANCEL:
+                    showFloatingToolbar();
+            }
+        }
+    }
 }

From e47bd3168199a845f54d29752a21ce67e3681171 Mon Sep 17 00:00:00 2001
From: mao <maokai1905@gmail.com>
Date: Sat, 5 Oct 2019 18:30:54 +0800
Subject: [PATCH 028/912] Selection mode fling

---
 terminal-view/src/main/java/com/termux/view/TerminalView.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/terminal-view/src/main/java/com/termux/view/TerminalView.java b/terminal-view/src/main/java/com/termux/view/TerminalView.java
index 2065248779..09eae230cb 100644
--- a/terminal-view/src/main/java/com/termux/view/TerminalView.java
+++ b/terminal-view/src/main/java/com/termux/view/TerminalView.java
@@ -153,7 +153,7 @@ public boolean onScale(float focusX, float focusY, float scale) {
 
             @Override
             public boolean onFling(final MotionEvent e2, float velocityX, float velocityY) {
-                if (mEmulator == null || mIsSelectingText) return true;
+                if (mEmulator == null) return true;
                 // Do not start scrolling until last fling has been taken care of:
                 if (!mScroller.isFinished()) return true;
 

From 60e1556871592adc97e8d969e3d6e5f7952f5f96 Mon Sep 17 00:00:00 2001
From: mao <maokai1905@gmail.com>
Date: Sat, 5 Oct 2019 18:54:15 +0800
Subject: [PATCH 029/912] Stop selection mode on enter

---
 terminal-view/src/main/java/com/termux/view/TerminalView.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/terminal-view/src/main/java/com/termux/view/TerminalView.java b/terminal-view/src/main/java/com/termux/view/TerminalView.java
index 09eae230cb..2cb3cb28c2 100644
--- a/terminal-view/src/main/java/com/termux/view/TerminalView.java
+++ b/terminal-view/src/main/java/com/termux/view/TerminalView.java
@@ -296,6 +296,7 @@ public boolean deleteSurroundingText(int leftLength, int rightLength) {
             }
 
             void sendTextToTerminal(CharSequence text) {
+                stopTextSelectionMode();
                 final int textLengthInChars = text.length();
                 for (int i = 0; i < textLengthInChars; i++) {
                     char firstChar = text.charAt(i);
@@ -542,6 +543,7 @@ public boolean onKeyDown(int keyCode, KeyEvent event) {
         if (LOG_KEY_EVENTS)
             Log.i(EmulatorDebug.LOG_TAG, "onKeyDown(keyCode=" + keyCode + ", isSystem()=" + event.isSystem() + ", event=" + event + ")");
         if (mEmulator == null) return true;
+        stopTextSelectionMode();
 
         if (mClient.onKeyDown(keyCode, event, mTermSession)) {
             invalidate();

From c238c8bddb690404305bc034fe940f006cf5432e Mon Sep 17 00:00:00 2001
From: mao <maokai1905@gmail.com>
Date: Fri, 11 Oct 2019 07:37:57 +0800
Subject: [PATCH 030/912] Optimize handle view

---
 .../src/main/java/com/termux/view/TerminalView.java    | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/terminal-view/src/main/java/com/termux/view/TerminalView.java b/terminal-view/src/main/java/com/termux/view/TerminalView.java
index 2cb3cb28c2..e67a24df1f 100644
--- a/terminal-view/src/main/java/com/termux/view/TerminalView.java
+++ b/terminal-view/src/main/java/com/termux/view/TerminalView.java
@@ -10,6 +10,7 @@
 import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
+import android.os.SystemClock;
 import android.text.Editable;
 import android.text.InputType;
 import android.text.TextUtils;
@@ -882,6 +883,8 @@ private class HandleView extends View {
         public static final int RIGHT = 2;
         private int mHandleHeight;
 
+        private long mLastTime;
+
         public HandleView(CursorController controller, int orientation) {
             super(TerminalView.this.getContext());
             mController = controller;
@@ -983,6 +986,11 @@ public boolean isShowing() {
         }
 
         private void checkChangedOrientation() {
+            long millis = SystemClock.currentThreadTimeMillis();
+            if (millis - mLastTime < 50) {
+                return;
+            }
+            mLastTime = millis;
 
             final TerminalView hostView = TerminalView.this;
             final int left = hostView.getLeft();
@@ -1007,7 +1015,7 @@ private void checkChangedOrientation() {
             final int[] coords = mTempCoords;
             hostView.getLocationInWindow(coords);
             final int posX = coords[0] + mPointX;
-            if (posX + (int) mHotspotX < clip.left) {
+            if (posX < clip.left) {
                 changeOrientation(RIGHT);
             } else if (posX + mHandleWidth > clip.right) {
                 changeOrientation(LEFT);

From 6db51bdec03ad2f0654b89eb9da91bf1596890d5 Mon Sep 17 00:00:00 2001
From: Leonid Plyushch <leonid.plyushch@gmail.com>
Date: Wed, 18 Dec 2019 14:06:06 +0200
Subject: [PATCH 031/912] remove SDK_INT conditionals

We are targting on API 24, so conditionals for Android 5/6 compatibillity
are useless now.
---
 .../java/com/termux/view/TerminalView.java    | 97 ++++++++-----------
 1 file changed, 38 insertions(+), 59 deletions(-)

diff --git a/terminal-view/src/main/java/com/termux/view/TerminalView.java b/terminal-view/src/main/java/com/termux/view/TerminalView.java
index e67a24df1f..c8ab055d1b 100644
--- a/terminal-view/src/main/java/com/termux/view/TerminalView.java
+++ b/terminal-view/src/main/java/com/termux/view/TerminalView.java
@@ -892,9 +892,7 @@ public HandleView(CursorController controller, int orientation) {
                 android.R.attr.textSelectHandleWindowStyle);
             mContainer.setSplitTouchEnabled(true);
             mContainer.setClippingEnabled(false);
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                mContainer.setWindowLayoutType(WindowManager.LayoutParams.TYPE_APPLICATION_SUB_PANEL);
-            }
+            mContainer.setWindowLayoutType(WindowManager.LayoutParams.TYPE_APPLICATION_SUB_PANEL);
             mContainer.setWidth(ViewGroup.LayoutParams.WRAP_CONTENT);
             mContainer.setHeight(ViewGroup.LayoutParams.WRAP_CONTENT);
 
@@ -908,15 +906,8 @@ public void setOrientation(int orientation) {
             switch (orientation) {
                 case LEFT: {
                     if (mSelectHandleLeft == null) {
-
-                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-                            mSelectHandleLeft = getContext().getDrawable(
-                                R.drawable.text_select_handle_left_material);
-                        } else {
-                            mSelectHandleLeft = getContext().getResources().getDrawable(
-                                R.drawable.text_select_handle_left_material);
-
-                        }
+                        mSelectHandleLeft = getContext().getDrawable(
+                            R.drawable.text_select_handle_left_material);
                     }
                     //
                     mDrawable = mSelectHandleLeft;
@@ -927,13 +918,8 @@ public void setOrientation(int orientation) {
 
                 case RIGHT: {
                     if (mSelectHandleRight == null) {
-                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-                            mSelectHandleRight = getContext().getDrawable(
-                                R.drawable.text_select_handle_right_material);
-                        } else {
-                            mSelectHandleRight = getContext().getResources().getDrawable(
-                                R.drawable.text_select_handle_right_material);
-                        }
+                        mSelectHandleRight = getContext().getDrawable(
+                            R.drawable.text_select_handle_right_material);
                     }
                     mDrawable = mSelectHandleRight;
                     handleWidth = mDrawable.getIntrinsicWidth();
@@ -1224,48 +1210,45 @@ public void onDestroyActionMode(ActionMode mode) {
                 }
 
             };
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                mActionMode = startActionMode(new ActionMode.Callback2() {
-                    @Override
-                    public boolean onCreateActionMode(ActionMode mode, Menu menu) {
-                        return callback.onCreateActionMode(mode, menu);
-                    }
 
-                    @Override
-                    public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
-                        return false;
-                    }
+            mActionMode = startActionMode(new ActionMode.Callback2() {
+                @Override
+                public boolean onCreateActionMode(ActionMode mode, Menu menu) {
+                    return callback.onCreateActionMode(mode, menu);
+                }
 
-                    @Override
-                    public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
-                        return callback.onActionItemClicked(mode, item);
-                    }
+                @Override
+                public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
+                    return false;
+                }
 
-                    @Override
-                    public void onDestroyActionMode(ActionMode mode) {
-                        // Ignore.
-                    }
+                @Override
+                public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
+                    return callback.onActionItemClicked(mode, item);
+                }
 
-                    @Override
-                    public void onGetContentRect(ActionMode mode, View view, Rect outRect) {
-                        int x1 = Math.round(mSelX1 * mRenderer.mFontWidth);
-                        int x2 = Math.round(mSelX2 * mRenderer.mFontWidth);
-                        int y1 = Math.round((mSelY1 - mTopRow) * mRenderer.mFontLineSpacing);
-                        int y2 = Math.round((mSelY2 + 1 - mTopRow) * mRenderer.mFontLineSpacing);
+                @Override
+                public void onDestroyActionMode(ActionMode mode) {
+                    // Ignore.
+                }
 
+                @Override
+                public void onGetContentRect(ActionMode mode, View view, Rect outRect) {
+                    int x1 = Math.round(mSelX1 * mRenderer.mFontWidth);
+                    int x2 = Math.round(mSelX2 * mRenderer.mFontWidth);
+                    int y1 = Math.round((mSelY1 - mTopRow) * mRenderer.mFontLineSpacing);
+                    int y2 = Math.round((mSelY2 + 1 - mTopRow) * mRenderer.mFontLineSpacing);
 
-                        if (x1 > x2) {
-                            int tmp = x1;
-                            x1 = x2;
-                            x2 = tmp;
-                        }
 
-                        outRect.set(x1, y1 + mHandleHeight, x2, y2 + mHandleHeight);
+                    if (x1 > x2) {
+                        int tmp = x1;
+                        x1 = x2;
+                        x2 = tmp;
                     }
-                }, ActionMode.TYPE_FLOATING);
-            } else {
-                mActionMode = startActionMode(callback);
-            }
+
+                    outRect.set(x1, y1 + mHandleHeight, x2, y2 + mHandleHeight);
+                }
+            }, ActionMode.TYPE_FLOATING);
         }
 
         public void hide() {
@@ -1431,9 +1414,7 @@ private void stopTextSelectionMode() {
         @Override
         public void run() {
             if (mActionMode != null) {
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                    mActionMode.hide(0);  // hide off.
-                }
+                mActionMode.hide(0);  // hide off.
             }
         }
     };
@@ -1441,9 +1422,7 @@ public void run() {
     void hideFloatingToolbar(int duration) {
         if (mActionMode != null) {
             removeCallbacks(mShowFloatingToolbar);
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                mActionMode.hide(duration);
-            }
+            mActionMode.hide(duration);
         }
     }
 

From 3d2756f3762103f65692e935aba6743aeebea242 Mon Sep 17 00:00:00 2001
From: mao <maokai1905@gmail.com>
Date: Wed, 18 Dec 2019 23:50:23 +0800
Subject: [PATCH 032/912] Optimize handleView move.

---
 .../java/com/termux/view/TerminalView.java    | 95 ++++++++++++++++---
 1 file changed, 82 insertions(+), 13 deletions(-)

diff --git a/terminal-view/src/main/java/com/termux/view/TerminalView.java b/terminal-view/src/main/java/com/termux/view/TerminalView.java
index e67a24df1f..529cd57ec6 100644
--- a/terminal-view/src/main/java/com/termux/view/TerminalView.java
+++ b/terminal-view/src/main/java/com/termux/view/TerminalView.java
@@ -42,6 +42,7 @@
 import com.termux.terminal.TerminalBuffer;
 import com.termux.terminal.TerminalEmulator;
 import com.termux.terminal.TerminalSession;
+import com.termux.terminal.WcWidth;
 
 /** View displaying and interacting with a {@link TerminalSession}. */
 public final class TerminalView extends View {
@@ -986,6 +987,9 @@ public boolean isShowing() {
         }
 
         private void checkChangedOrientation() {
+            if (!mIsDragging) {
+                return;
+            }
             long millis = SystemClock.currentThreadTimeMillis();
             if (millis - mLastTime < 50) {
                 return;
@@ -1283,43 +1287,59 @@ public boolean isActive() {
             return mIsShowing;
         }
 
+
         public void updatePosition(HandleView handle, int x, int y) {
-            final int scrollRows = mEmulator.getScreen().getActiveRows() - mEmulator.mRows;
-            if (y < mRenderer.mFontLineSpacing) {//up
-                mTopRow--;
-                if (mTopRow < -scrollRows) {
-                    mTopRow = -scrollRows;
-                }
-            } else if (y + 2 * mRenderer.mFontLineSpacing > TerminalView.this.getHeight()) {//down
-                mTopRow++;
-                if (mTopRow > 0) {
-                    mTopRow = 0;
-                }
-            }
+
+            TerminalBuffer screen = mEmulator.getScreen();
+            final int scrollRows = screen.getActiveRows() - mEmulator.mRows;
             if (handle == mStartHandle) {
                 mSelX1 = getCursorX(x);
                 mSelY1 = getCursorY(y);
                 if (mSelX1 < 0) {
                     mSelX1 = 0;
                 }
+
                 if (mSelY1 < -scrollRows) {
                     mSelY1 = -scrollRows;
+
                 } else if (mSelY1 > mEmulator.mRows - 1) {
                     mSelY1 = mEmulator.mRows - 1;
+
                 }
 
+
                 if (mSelY1 > mSelY2) {
                     mSelY1 = mSelY2;
                 }
                 if (mSelY1 == mSelY2 && mSelX1 > mSelX2) {
                     mSelX1 = mSelX2;
                 }
+
+                if (!mEmulator.isAlternateBufferActive()) {
+                    if (mSelY1 <= mTopRow) {
+                        mTopRow--;
+                        if (mTopRow < -scrollRows) {
+                            mTopRow = -scrollRows;
+                        }
+                    } else if (mSelY1 >= mTopRow + mEmulator.mRows) {
+                        mTopRow++;
+                        if (mTopRow > 0) {
+                            mTopRow = 0;
+                        }
+                    }
+                }
+
+
+                mSelX1 = getValidCurX(screen, mSelY1, mSelX1);
+
             } else {
                 mSelX2 = getCursorX(x);
                 mSelY2 = getCursorY(y);
                 if (mSelX2 < 0) {
                     mSelX2 = 0;
                 }
+
+
                 if (mSelY2 < -scrollRows) {
                     mSelY2 = -scrollRows;
                 } else if (mSelY2 > mEmulator.mRows - 1) {
@@ -1332,11 +1352,60 @@ public void updatePosition(HandleView handle, int x, int y) {
                 if (mSelY1 == mSelY2 && mSelX1 > mSelX2) {
                     mSelX2 = mSelX1;
                 }
+
+                if (!mEmulator.isAlternateBufferActive()) {
+                    if (mSelY2 <= mTopRow) {
+                        mTopRow--;
+                        if (mTopRow < -scrollRows) {
+                            mTopRow = -scrollRows;
+                        }
+                    } else if (mSelY2 >= mTopRow + mEmulator.mRows) {
+                        mTopRow++;
+                        if (mTopRow > 0) {
+                            mTopRow = 0;
+                        }
+                    }
+                }
+
+                mSelX2 = getValidCurX(screen, mSelY2, mSelX2);
             }
 
             invalidate();
         }
 
+
+        private int getValidCurX(TerminalBuffer screen, int cy, int cx) {
+            String line = screen.getSelectedText(0, cy, cx, cy);
+            if (!TextUtils.isEmpty(line)) {
+                int col = 0;
+                for (int i = 0, len = line.length(); i < len; i++) {
+                    char ch1 = line.charAt(i);
+                    if (ch1 == 0) {
+                        break;
+                    }
+
+
+                    int wc;
+                    if (Character.isHighSurrogate(ch1) && i + 1 < len) {
+                        char ch2 = line.charAt(++i);
+                        wc = WcWidth.width(Character.toCodePoint(ch1, ch2));
+                    } else {
+                        wc = WcWidth.width(ch1);
+                    }
+
+                    final int cend = col + wc;
+                    if (cx > col && cx < cend) {
+                        return cend;
+                    }
+                    if (cend == col) {
+                        return col;
+                    }
+                    col = cend;
+                }
+            }
+            return cx;
+        }
+
         public void updatePosition() {
             if (!isActive()) {
                 return;
@@ -1344,7 +1413,7 @@ public void updatePosition() {
 
             mStartHandle.positionAtCursor(mSelX1, mSelY1);
 
-            mEndHandle.positionAtCursor(mSelX2 + 1, mSelY2);
+            mEndHandle.positionAtCursor(mSelX2 + 1, mSelY2); //bug
 
             if (mActionMode != null) {
                 mActionMode.invalidate();

From 82730d9e08164ae47763cbb4bc7ff8e87b6569f5 Mon Sep 17 00:00:00 2001
From: mao <maokai1905@gmail.com>
Date: Thu, 19 Dec 2019 00:34:14 +0800
Subject: [PATCH 033/912] confict

---
 .../java/com/termux/view/TerminalView.java    | 90 ++++++++-----------
 1 file changed, 35 insertions(+), 55 deletions(-)

diff --git a/terminal-view/src/main/java/com/termux/view/TerminalView.java b/terminal-view/src/main/java/com/termux/view/TerminalView.java
index 529cd57ec6..cc3df20e31 100644
--- a/terminal-view/src/main/java/com/termux/view/TerminalView.java
+++ b/terminal-view/src/main/java/com/termux/view/TerminalView.java
@@ -893,9 +893,7 @@ public HandleView(CursorController controller, int orientation) {
                 android.R.attr.textSelectHandleWindowStyle);
             mContainer.setSplitTouchEnabled(true);
             mContainer.setClippingEnabled(false);
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                mContainer.setWindowLayoutType(WindowManager.LayoutParams.TYPE_APPLICATION_SUB_PANEL);
-            }
+            mContainer.setWindowLayoutType(WindowManager.LayoutParams.TYPE_APPLICATION_SUB_PANEL);
             mContainer.setWidth(ViewGroup.LayoutParams.WRAP_CONTENT);
             mContainer.setHeight(ViewGroup.LayoutParams.WRAP_CONTENT);
 
@@ -910,14 +908,8 @@ public void setOrientation(int orientation) {
                 case LEFT: {
                     if (mSelectHandleLeft == null) {
 
-                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
                             mSelectHandleLeft = getContext().getDrawable(
                                 R.drawable.text_select_handle_left_material);
-                        } else {
-                            mSelectHandleLeft = getContext().getResources().getDrawable(
-                                R.drawable.text_select_handle_left_material);
-
-                        }
                     }
                     //
                     mDrawable = mSelectHandleLeft;
@@ -928,13 +920,8 @@ public void setOrientation(int orientation) {
 
                 case RIGHT: {
                     if (mSelectHandleRight == null) {
-                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
                             mSelectHandleRight = getContext().getDrawable(
                                 R.drawable.text_select_handle_right_material);
-                        } else {
-                            mSelectHandleRight = getContext().getResources().getDrawable(
-                                R.drawable.text_select_handle_right_material);
-                        }
                     }
                     mDrawable = mSelectHandleRight;
                     handleWidth = mDrawable.getIntrinsicWidth();
@@ -1228,48 +1215,45 @@ public void onDestroyActionMode(ActionMode mode) {
                 }
 
             };
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                mActionMode = startActionMode(new ActionMode.Callback2() {
-                    @Override
-                    public boolean onCreateActionMode(ActionMode mode, Menu menu) {
-                        return callback.onCreateActionMode(mode, menu);
-                    }
-
-                    @Override
-                    public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
-                        return false;
-                    }
+            mActionMode = startActionMode(new ActionMode.Callback2() {
+                @Override
+                public boolean onCreateActionMode(ActionMode mode, Menu menu) {
+                    return callback.onCreateActionMode(mode, menu);
+                }
 
-                    @Override
-                    public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
-                        return callback.onActionItemClicked(mode, item);
-                    }
+                @Override
+                public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
+                    return false;
+                }
 
-                    @Override
-                    public void onDestroyActionMode(ActionMode mode) {
-                        // Ignore.
-                    }
+                @Override
+                public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
+                    return callback.onActionItemClicked(mode, item);
+                }
 
-                    @Override
-                    public void onGetContentRect(ActionMode mode, View view, Rect outRect) {
-                        int x1 = Math.round(mSelX1 * mRenderer.mFontWidth);
-                        int x2 = Math.round(mSelX2 * mRenderer.mFontWidth);
-                        int y1 = Math.round((mSelY1 - mTopRow) * mRenderer.mFontLineSpacing);
-                        int y2 = Math.round((mSelY2 + 1 - mTopRow) * mRenderer.mFontLineSpacing);
+                @Override
+                public void onDestroyActionMode(ActionMode mode) {
+                    // Ignore.
+                }
 
+                @Override
+                public void onGetContentRect(ActionMode mode, View view, Rect outRect) {
+                    int x1 = Math.round(mSelX1 * mRenderer.mFontWidth);
+                    int x2 = Math.round(mSelX2 * mRenderer.mFontWidth);
+                    int y1 = Math.round((mSelY1 - mTopRow) * mRenderer.mFontLineSpacing);
+                    int y2 = Math.round((mSelY2 + 1 - mTopRow) * mRenderer.mFontLineSpacing);
 
-                        if (x1 > x2) {
-                            int tmp = x1;
-                            x1 = x2;
-                            x2 = tmp;
-                        }
 
-                        outRect.set(x1, y1 + mHandleHeight, x2, y2 + mHandleHeight);
+                    if (x1 > x2) {
+                        int tmp = x1;
+                        x1 = x2;
+                        x2 = tmp;
                     }
-                }, ActionMode.TYPE_FLOATING);
-            } else {
-                mActionMode = startActionMode(callback);
-            }
+
+                    outRect.set(x1, y1 + mHandleHeight, x2, y2 + mHandleHeight);
+                }
+            }, ActionMode.TYPE_FLOATING);
+
         }
 
         public void hide() {
@@ -1500,9 +1484,7 @@ private void stopTextSelectionMode() {
         @Override
         public void run() {
             if (mActionMode != null) {
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                    mActionMode.hide(0);  // hide off.
-                }
+                mActionMode.hide(0);  // hide off.
             }
         }
     };
@@ -1510,9 +1492,7 @@ public void run() {
     void hideFloatingToolbar(int duration) {
         if (mActionMode != null) {
             removeCallbacks(mShowFloatingToolbar);
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                mActionMode.hide(duration);
-            }
+            mActionMode.hide(duration);
         }
     }
 

From 490853e42720c4e1299cd1e82c56f823c2a7c02c Mon Sep 17 00:00:00 2001
From: Leonid Plyushch <leonid.plyushch@gmail.com>
Date: Sat, 21 Dec 2019 21:16:33 +0200
Subject: [PATCH 034/912] terminal emulator: clear scrollback buffer when
 resetting to initial state

Fixes utility 'reset' not being able to clear scrollback buffer.
---
 .../src/main/java/com/termux/terminal/TerminalEmulator.java      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java b/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
index 3d9d7c8c79..4e74b9e5f5 100644
--- a/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
+++ b/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
@@ -1267,6 +1267,7 @@ private void doEsc(int b) {
                 break;
             case 'c': // RIS - Reset to Initial State (http://vt100.net/docs/vt510-rm/RIS).
                 reset();
+                mMainBuffer.clearTranscript();
                 blockClear(0, 0, mColumns, mRows);
                 setCursorPosition(0, 0);
                 break;

From 37b3a9f8db3e4b8577f9f5df969ca06eb75f0252 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Sun, 29 Dec 2019 18:49:10 +0100
Subject: [PATCH 035/912] Update Android Gradle plug-in

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 107f303057..c36378c7f4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.2'
+        classpath 'com.android.tools.build:gradle:3.5.3'
     }
 }
 

From 9e295b105c80316e24e3e029cd74e1516bf6f3ad Mon Sep 17 00:00:00 2001
From: Leonid Plyushch <leonid.plyushch@gmail.com>
Date: Sat, 21 Dec 2019 21:16:33 +0200
Subject: [PATCH 036/912] terminal emulator: clear scrollback buffer when
 resetting to initial state

Fixes utility 'reset' not being able to clear scrollback buffer.
---
 .../src/main/java/com/termux/terminal/TerminalEmulator.java      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java b/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
index 3d9d7c8c79..4e74b9e5f5 100644
--- a/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
+++ b/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
@@ -1267,6 +1267,7 @@ private void doEsc(int b) {
                 break;
             case 'c': // RIS - Reset to Initial State (http://vt100.net/docs/vt510-rm/RIS).
                 reset();
+                mMainBuffer.clearTranscript();
                 blockClear(0, 0, mColumns, mRows);
                 setCursorPosition(0, 0);
                 break;

From c987ff718af1171f9f420b0a1ad7d56686f49d24 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Sun, 29 Dec 2019 18:49:10 +0100
Subject: [PATCH 037/912] Update Android Gradle plug-in

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 107f303057..c36378c7f4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.2'
+        classpath 'com.android.tools.build:gradle:3.5.3'
     }
 }
 

From 3c01b09fff0b5999074d49e26f327e07492df869 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Sun, 29 Dec 2019 18:53:00 +0100
Subject: [PATCH 038/912] Bump version to 0.85

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index d56089c09c..c2a2f1c37e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -16,8 +16,8 @@ android {
         applicationId "com.termux"
         minSdkVersion 24
         targetSdkVersion 28
-        versionCode 84
-        versionName "0.84"
+        versionCode 85
+        versionName "0.85"
 
         externalNativeBuild {
             ndkBuild {

From 662b5cace6fdb5daa8d62786e5ba94a1e0949b32 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Wed, 1 Jan 2020 22:57:52 +0100
Subject: [PATCH 039/912] Update gradle wrapper

---
 gradle/wrapper/gradle-wrapper.jar        | Bin 55616 -> 58702 bytes
 gradle/wrapper/gradle-wrapper.properties |   2 +-
 gradlew                                  |  29 ++++++++++-------------
 3 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 5c2d1cf016b3885f6930543d57b744ea8c220a1a..cc4fdc293d0e50b0ad9b65c16e7ddd1db2f6025b 100644
GIT binary patch
delta 16535
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
U#ULQK|Neget<zCj{4eSM0|LcRF8}}l

delta 13615
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
O=|=?tu^Rs0)%hQKQa~60

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0ebb3108e2..94920145f3 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 83f2acfdc3..2fe81a7d95 100755
--- a/gradlew
+++ b/gradlew
@@ -154,19 +154,19 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $i + 1`
     done
     case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
@@ -175,14 +175,9 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"

From 269c3cafb0c3f610746fde3be2510501b87f942a Mon Sep 17 00:00:00 2001
From: Leonid Plyushch <leonid.plyushch@gmail.com>
Date: Fri, 3 Jan 2020 16:05:57 +0200
Subject: [PATCH 040/912] properly set bootclasspath environment variable

---
 app/src/main/java/com/termux/app/BackgroundJob.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/termux/app/BackgroundJob.java b/app/src/main/java/com/termux/app/BackgroundJob.java
index 5fef2bd1e1..8ebf3bf168 100644
--- a/app/src/main/java/com/termux/app/BackgroundJob.java
+++ b/app/src/main/java/com/termux/app/BackgroundJob.java
@@ -110,7 +110,7 @@ static String[] buildEnvironment(boolean failSafe, String cwd) {
         environment.add("TERM=xterm-256color");
         environment.add("HOME=" + TermuxService.HOME_PATH);
         environment.add("PREFIX=" + TermuxService.PREFIX_PATH);
-        environment.add("BOOTCLASSPATH" + System.getenv("BOOTCLASSPATH"));
+        environment.add("BOOTCLASSPATH=" + System.getenv("BOOTCLASSPATH"));
         environment.add("ANDROID_ROOT=" + System.getenv("ANDROID_ROOT"));
         environment.add("ANDROID_DATA=" + System.getenv("ANDROID_DATA"));
         // EXTERNAL_STORAGE is needed for /system/bin/am to work on at least

From fd13f3f98d4c3ab99a9b31d0c79fdfeda95e6101 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Sun, 5 Jan 2020 01:02:13 +0100
Subject: [PATCH 041/912] Handle magnet links with termux-url-opener

Fixes #1339 and #1382.
---
 app/build.gradle                              | 11 +++++--
 .../TermuxFileReceiverActivity.java           |  8 ++++-
 .../com/termux/app/TermuxActivityTest.java    | 28 ++++++++--------
 .../TermuxFileReceiverActivityTest.java       | 32 +++++++++++++++++++
 terminal-emulator/build.gradle                |  2 +-
 terminal-view/build.gradle                    |  4 +--
 6 files changed, 66 insertions(+), 19 deletions(-)
 create mode 100644 app/src/test/java/com/termux/filepicker/TermuxFileReceiverActivityTest.java

diff --git a/app/build.gradle b/app/build.gradle
index c2a2f1c37e..70088b781c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,7 +6,7 @@ android {
     compileSdkVersion 28
 
     dependencies {
-        implementation "androidx.annotation:annotation:1.0.1"
+        implementation "androidx.annotation:annotation:1.1.0"
         implementation "androidx.viewpager:viewpager:1.0.0"
         implementation "androidx.drawerlayout:drawerlayout:1.0.0"
         implementation project(":terminal-view")
@@ -62,10 +62,17 @@ android {
             path "src/main/cpp/Android.mk"
         }
     }
+
+    testOptions {
+        unitTests {
+            includeAndroidResources = true
+        }
+    }
 }
 
 dependencies {
-    testImplementation 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.13'
+    testImplementation 'org.robolectric:robolectric:4.3'
 }
 
 task versionName {
diff --git a/app/src/main/java/com/termux/filepicker/TermuxFileReceiverActivity.java b/app/src/main/java/com/termux/filepicker/TermuxFileReceiverActivity.java
index 1081e4cf87..e1ef5d423f 100644
--- a/app/src/main/java/com/termux/filepicker/TermuxFileReceiverActivity.java
+++ b/app/src/main/java/com/termux/filepicker/TermuxFileReceiverActivity.java
@@ -21,6 +21,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
+import java.util.regex.Pattern;
 
 public class TermuxFileReceiverActivity extends Activity {
 
@@ -36,6 +37,11 @@ public class TermuxFileReceiverActivity extends Activity {
      */
     boolean mFinishOnDismissNameDialog = true;
 
+    static boolean isSharedTextAnUrl(String sharedText) {
+        return Patterns.WEB_URL.matcher(sharedText).matches()
+            || Pattern.matches("magnet:\\?xt=urn:btih:.*?", sharedText);
+    }
+
     @Override
     protected void onResume() {
         super.onResume();
@@ -50,7 +56,7 @@ protected void onResume() {
             final Uri sharedUri = intent.getParcelableExtra(Intent.EXTRA_STREAM);
 
             if (sharedText != null) {
-                if (Patterns.WEB_URL.matcher(sharedText).matches()) {
+                if (isSharedTextAnUrl(sharedText)) {
                     handleUrlAndFinish(sharedText);
                 } else {
                     String subject = intent.getStringExtra(Intent.EXTRA_SUBJECT);
diff --git a/app/src/test/java/com/termux/app/TermuxActivityTest.java b/app/src/test/java/com/termux/app/TermuxActivityTest.java
index b9358aa3dc..07be4773e1 100644
--- a/app/src/test/java/com/termux/app/TermuxActivityTest.java
+++ b/app/src/test/java/com/termux/app/TermuxActivityTest.java
@@ -1,25 +1,27 @@
 package com.termux.app;
 
-import junit.framework.TestCase;
+import org.junit.Assert;
+import org.junit.Test;
 
 import java.util.Collections;
 import java.util.LinkedHashSet;
 
-public class TermuxActivityTest extends TestCase {
+public class TermuxActivityTest {
 
-	private void assertUrlsAre(String text, String... urls) {
-		LinkedHashSet<String> expected = new LinkedHashSet<>();
-		Collections.addAll(expected, urls);
-		assertEquals(expected, TermuxActivity.extractUrls(text));
-	}
+    private void assertUrlsAre(String text, String... urls) {
+        LinkedHashSet<String> expected = new LinkedHashSet<>();
+        Collections.addAll(expected, urls);
+        Assert.assertEquals(expected, TermuxActivity.extractUrls(text));
+    }
 
-	public void testExtractUrls() {
-		assertUrlsAre("hello http://example.com world", "http://example.com");
+    @Test
+    public void testExtractUrls() {
+        assertUrlsAre("hello http://example.com world", "http://example.com");
 
-		assertUrlsAre("http://example.com\nhttp://another.com", "http://example.com", "http://another.com");
+        assertUrlsAre("http://example.com\nhttp://another.com", "http://example.com", "http://another.com");
 
-		assertUrlsAre("hello http://example.com world and http://more.example.com with secure https://more.example.com",
-				"http://example.com", "http://more.example.com", "https://more.example.com");
-	}
+        assertUrlsAre("hello http://example.com world and http://more.example.com with secure https://more.example.com",
+            "http://example.com", "http://more.example.com", "https://more.example.com");
+    }
 
 }
diff --git a/app/src/test/java/com/termux/filepicker/TermuxFileReceiverActivityTest.java b/app/src/test/java/com/termux/filepicker/TermuxFileReceiverActivityTest.java
new file mode 100644
index 0000000000..9becbefcd0
--- /dev/null
+++ b/app/src/test/java/com/termux/filepicker/TermuxFileReceiverActivityTest.java
@@ -0,0 +1,32 @@
+package com.termux.filepicker;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@RunWith(RobolectricTestRunner.class)
+public class TermuxFileReceiverActivityTest {
+
+    @Test
+    public void testIsSharedTextAnUrl() {
+        List<String> validUrls = new ArrayList<>();
+        validUrls.add("http://example.com");
+        validUrls.add("https://example.com");
+        validUrls.add("https://example.com/path/parameter=foo");
+        validUrls.add("magnet:?xt=urn:btih:d540fc48eb12f2833163eed6421d449dd8f1ce1f&dn=Ubuntu+desktop+19.04+%2864bit%29&tr=udp%3A%2F%2Ftracker.openbittorrent.com%3A80&tr=udp%3A%2F%2Ftracker.publicbt.com%3A80&tr=udp%3A%2F%2Ftracker.ccc.de%3A80");
+        for (String url : validUrls) {
+            Assert.assertTrue(TermuxFileReceiverActivity.isSharedTextAnUrl(url));
+        }
+
+        List<String> invalidUrls = new ArrayList<>();
+        invalidUrls.add("a test with example.com");
+        for (String url : invalidUrls) {
+            Assert.assertFalse(TermuxFileReceiverActivity.isSharedTextAnUrl(url));
+        }
+    }
+
+}
diff --git a/terminal-emulator/build.gradle b/terminal-emulator/build.gradle
index 320e549d99..dd6da0a300 100644
--- a/terminal-emulator/build.gradle
+++ b/terminal-emulator/build.gradle
@@ -60,7 +60,7 @@ tasks.withType(Test) {
 }
 
 dependencies {
-    testImplementation 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.13'
 }
 
 apply from: '../scripts/bintray-publish.gradle'
diff --git a/terminal-view/build.gradle b/terminal-view/build.gradle
index 12a19a145a..3aad164402 100644
--- a/terminal-view/build.gradle
+++ b/terminal-view/build.gradle
@@ -20,7 +20,7 @@ android {
     compileSdkVersion 28
 
     dependencies {
-        implementation "androidx.annotation:annotation:1.0.1"
+        implementation "androidx.annotation:annotation:1.1.0"
         api project(":terminal-emulator")
     }
 
@@ -44,7 +44,7 @@ android {
 }
 
 dependencies {
-    testImplementation 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.13'
 }
 
 apply from: '../scripts/bintray-publish.gradle'

From 76df44e6bb9cea197c075e174493e61b15b2c2d1 Mon Sep 17 00:00:00 2001
From: Archenoth <archenoth@gmail.com>
Date: Mon, 2 Dec 2019 02:28:30 -0700
Subject: [PATCH 042/912] Start stderr BackgroundJob Thread

---
 app/src/main/java/com/termux/app/BackgroundJob.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/termux/app/BackgroundJob.java b/app/src/main/java/com/termux/app/BackgroundJob.java
index 8ebf3bf168..61e9ad23d2 100644
--- a/app/src/main/java/com/termux/app/BackgroundJob.java
+++ b/app/src/main/java/com/termux/app/BackgroundJob.java
@@ -90,7 +90,7 @@ public void run() {
                     // Ignore.
                 }
             }
-        };
+        }.start();
     }
 
     private static void addToEnvIfPresent(List<String> environment, String name) {

From 7f7c1efac1af19badae86c39118903c4da383838 Mon Sep 17 00:00:00 2001
From: Archenoth <archenoth@gmail.com>
Date: Mon, 2 Dec 2019 02:38:37 -0700
Subject: [PATCH 043/912] Add PendingIntent in TermuxService to return data
 from execution

This commit adds an optional final argument to the BackgroundJob
constructor for a PendingIntent to return the results of its
execution to, and also attempts to pass an optional pendingIntent to
it from the Service start intent
---
 .../java/com/termux/app/BackgroundJob.java    | 67 ++++++++++++++-----
 .../java/com/termux/app/TermuxService.java    |  2 +-
 2 files changed, 50 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/com/termux/app/BackgroundJob.java b/app/src/main/java/com/termux/app/BackgroundJob.java
index 61e9ad23d2..2b1888aa04 100644
--- a/app/src/main/java/com/termux/app/BackgroundJob.java
+++ b/app/src/main/java/com/termux/app/BackgroundJob.java
@@ -1,5 +1,9 @@
 package com.termux.app;
 
+import android.app.Activity;
+import android.app.PendingIntent;
+import android.content.Intent;
+import android.os.Bundle;
 import android.util.Log;
 
 import java.io.BufferedReader;
@@ -24,7 +28,11 @@ public final class BackgroundJob {
 
     final Process mProcess;
 
-    public BackgroundJob(String cwd, String fileToExecute, final String[] args, final TermuxService service) {
+    public BackgroundJob(String cwd, String fileToExecute, final String[] args, final TermuxService service){
+        this(cwd, fileToExecute, args, service, null);
+    }
+
+    public BackgroundJob(String cwd, String fileToExecute, final String[] args, final TermuxService service, PendingIntent pendingIntent) {
         String[] env = buildEnvironment(false, cwd);
         if (cwd == null) cwd = TermuxService.HOME_PATH;
 
@@ -43,6 +51,28 @@ public BackgroundJob(String cwd, String fileToExecute, final String[] args, fina
 
         mProcess = process;
         final int pid = getPid(mProcess);
+        final Bundle result = new Bundle();
+        final StringBuilder outResult = new StringBuilder();
+        final StringBuilder errResult = new StringBuilder();
+
+        Thread errThread = new Thread() {
+            @Override
+            public void run() {
+                InputStream stderr = mProcess.getErrorStream();
+                BufferedReader reader = new BufferedReader(new InputStreamReader(stderr, StandardCharsets.UTF_8));
+                String line;
+                try {
+                    // FIXME: Long lines.
+                    while ((line = reader.readLine()) != null) {
+                        errResult.append(line).append('\n');
+                        Log.i(LOG_TAG, "[" + pid + "] stderr: " + line);
+                    }
+                } catch (IOException e) {
+                    // Ignore.
+                }
+            }
+        };
+        errThread.start();
 
         new Thread() {
             @Override
@@ -50,11 +80,13 @@ public void run() {
                 Log.i(LOG_TAG, "[" + pid + "] starting: " + processDescription);
                 InputStream stdout = mProcess.getInputStream();
                 BufferedReader reader = new BufferedReader(new InputStreamReader(stdout, StandardCharsets.UTF_8));
+
                 String line;
                 try {
                     // FIXME: Long lines.
                     while ((line = reader.readLine()) != null) {
                         Log.i(LOG_TAG, "[" + pid + "] stdout: " + line);
+                        outResult.append(line).append('\n');
                     }
                 } catch (IOException e) {
                     Log.e(LOG_TAG, "Error reading output", e);
@@ -68,26 +100,25 @@ public void run() {
                     } else {
                         Log.w(LOG_TAG, "[" + pid + "] exited with code: " + exitCode);
                     }
-                } catch (InterruptedException e) {
-                    // Ignore.
-                }
-            }
-        }.start();
 
+                    result.putString("stdout", outResult.toString());
+                    result.putInt("exitCode", exitCode);
 
-        new Thread() {
-            @Override
-            public void run() {
-                InputStream stderr = mProcess.getErrorStream();
-                BufferedReader reader = new BufferedReader(new InputStreamReader(stderr, StandardCharsets.UTF_8));
-                String line;
-                try {
-                    // FIXME: Long lines.
-                    while ((line = reader.readLine()) != null) {
-                        Log.i(LOG_TAG, "[" + pid + "] stderr: " + line);
+                    errThread.join();
+                    result.putString("stderr", errResult.toString());
+
+                    Intent data = new Intent();
+                    data.putExtra("result", result);
+
+                    if(pendingIntent != null) {
+                        try {
+                            pendingIntent.send(service.getApplicationContext(), Activity.RESULT_OK, data);
+                        } catch (PendingIntent.CanceledException e) {
+                            // The caller doesn't want the result? That's fine, just ignore
+                        }
                     }
-                } catch (IOException e) {
-                    // Ignore.
+                } catch (InterruptedException e) {
+                    // Ignore
                 }
             }
         }.start();
diff --git a/app/src/main/java/com/termux/app/TermuxService.java b/app/src/main/java/com/termux/app/TermuxService.java
index b17643fe49..bbaf87c548 100644
--- a/app/src/main/java/com/termux/app/TermuxService.java
+++ b/app/src/main/java/com/termux/app/TermuxService.java
@@ -148,7 +148,7 @@ public int onStartCommand(Intent intent, int flags, int startId) {
             String cwd = intent.getStringExtra(EXTRA_CURRENT_WORKING_DIRECTORY);
 
             if (intent.getBooleanExtra(EXTRA_EXECUTE_IN_BACKGROUND, false)) {
-                BackgroundJob task = new BackgroundJob(cwd, executablePath, arguments, this);
+                BackgroundJob task = new BackgroundJob(cwd, executablePath, arguments, this, intent.getParcelableExtra("pendingIntent"));
                 mBackgroundTasks.add(task);
                 updateNotification();
             } else {

From e28be01dc23d480d3938ac26e7fc2cff39379c3e Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Sun, 5 Jan 2020 02:00:25 +0100
Subject: [PATCH 044/912] Create new terminal sessions with directory of active
 session

This mimics the behaviour of most tabbed terminal emulators.

Fixes #1009.
---
 .../java/com/termux/app/TermuxActivity.java   |  4 +++-
 .../com/termux/terminal/TerminalSession.java  | 22 +++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index 0fe5b5df56..c0517b673b 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -603,7 +603,9 @@ void addNewSession(boolean failSafe, String sessionName) {
             new AlertDialog.Builder(this).setTitle(R.string.max_terminals_reached_title).setMessage(R.string.max_terminals_reached_message)
                 .setPositiveButton(android.R.string.ok, null).show();
         } else {
-            TerminalSession newSession = mTermService.createTermSession(null, null, null, failSafe);
+            TerminalSession currentSession = getCurrentTermSession();
+            String workingDirectory = (currentSession == null) ? null : currentSession.getCwd();
+            TerminalSession newSession = mTermService.createTermSession(null, null, workingDirectory, failSafe);
             if (sessionName != null) {
                 newSession.mSessionName = sessionName;
             }
diff --git a/terminal-emulator/src/main/java/com/termux/terminal/TerminalSession.java b/terminal-emulator/src/main/java/com/termux/terminal/TerminalSession.java
index 5b82b0f98c..1743e844c6 100644
--- a/terminal-emulator/src/main/java/com/termux/terminal/TerminalSession.java
+++ b/terminal-emulator/src/main/java/com/termux/terminal/TerminalSession.java
@@ -8,6 +8,7 @@
 import android.system.OsConstants;
 import android.util.Log;
 
+import java.io.File;
 import java.io.FileDescriptor;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
@@ -339,4 +340,25 @@ public int getPid() {
         return mShellPid;
     }
 
+    /** Returns the shell's working directory or null if it was unavailable. */
+    public String getCwd() {
+        if (mShellPid < 1) {
+            return null;
+        }
+        try {
+            final String cwdSymlink = String.format("/proc/%s/cwd/", mShellPid);
+            String outputPath = new File(cwdSymlink).getCanonicalPath();
+            if (!outputPath.endsWith("/")) {
+                outputPath += '/';
+            }
+            if (!cwdSymlink.equals(outputPath)) {
+                return outputPath;
+            }
+        } catch (IOException | SecurityException e) {
+            Log.e(EmulatorDebug.LOG_TAG, "Error getting current directory", e);
+        }
+        return null;
+    }
+
+
 }

From a94bcb02f16b638c7920b16a49bdfe65650fa1d2 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Sun, 5 Jan 2020 02:02:05 +0100
Subject: [PATCH 045/912] Bump version to 0.86

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 70088b781c..b522bd93a3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -16,8 +16,8 @@ android {
         applicationId "com.termux"
         minSdkVersion 24
         targetSdkVersion 28
-        versionCode 85
-        versionName "0.85"
+        versionCode 86
+        versionName "0.86"
 
         externalNativeBuild {
             ndkBuild {

From b729085d524e7727cb092a1b36f62b8601bf56ea Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Sun, 5 Jan 2020 19:14:35 +0100
Subject: [PATCH 046/912] Bump version to 0.88

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index b522bd93a3..06d1ce9b93 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -16,8 +16,8 @@ android {
         applicationId "com.termux"
         minSdkVersion 24
         targetSdkVersion 28
-        versionCode 86
-        versionName "0.86"
+        versionCode 88
+        versionName "0.88"
 
         externalNativeBuild {
             ndkBuild {

From 566d656c16e9e8dae7040c7e6b5d08f142d2ce69 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Sun, 5 Jan 2020 19:09:10 +0100
Subject: [PATCH 047/912] Avoid trailing slash in CWD (fixes #1413)

---
 .../src/main/java/com/termux/terminal/TerminalSession.java   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/terminal-emulator/src/main/java/com/termux/terminal/TerminalSession.java b/terminal-emulator/src/main/java/com/termux/terminal/TerminalSession.java
index 1743e844c6..a8c08a8d2b 100644
--- a/terminal-emulator/src/main/java/com/termux/terminal/TerminalSession.java
+++ b/terminal-emulator/src/main/java/com/termux/terminal/TerminalSession.java
@@ -348,10 +348,11 @@ public String getCwd() {
         try {
             final String cwdSymlink = String.format("/proc/%s/cwd/", mShellPid);
             String outputPath = new File(cwdSymlink).getCanonicalPath();
+            String outputPathWithTrailingSlash = outputPath;
             if (!outputPath.endsWith("/")) {
-                outputPath += '/';
+                outputPathWithTrailingSlash += '/';
             }
-            if (!cwdSymlink.equals(outputPath)) {
+            if (!cwdSymlink.equals(outputPathWithTrailingSlash)) {
                 return outputPath;
             }
         } catch (IOException | SecurityException e) {

From 90e6260d5e05211ec3e6dfeb9e6e631b56062281 Mon Sep 17 00:00:00 2001
From: Edontin <1924446+Edontin@users.noreply.github.com>
Date: Sat, 26 Jan 2019 22:31:55 +1100
Subject: [PATCH 048/912] Allow the user to disable virtual key emulation.

Use volume-keys=volume within termux.properties to disable.
---
 app/src/main/java/com/termux/app/TermuxPreferences.java | 2 ++
 app/src/main/java/com/termux/app/TermuxViewClient.java  | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/termux/app/TermuxPreferences.java b/app/src/main/java/com/termux/app/TermuxPreferences.java
index f6095837fb..1fbac2b70e 100644
--- a/app/src/main/java/com/termux/app/TermuxPreferences.java
+++ b/app/src/main/java/com/termux/app/TermuxPreferences.java
@@ -66,6 +66,7 @@ final static class KeyboardShortcut {
     int mBellBehaviour = BELL_VIBRATE;
 
     boolean mBackIsEscape;
+    boolean mDisableVolumeVirtualKeys;
     boolean mShowExtraKeys;
 
     String[][] mExtraKeys;
@@ -198,6 +199,7 @@ void reloadFromProperties(Context context) {
         }
 
         mBackIsEscape = "escape".equals(props.getProperty("back-key", "back"));
+        mDisableVolumeVirtualKeys = "volume".equals(props.getProperty("volume-keys", "virtual"));
 
         shortcuts.clear();
         parseAction("shortcut.create-session", SHORTCUT_ACTION_CREATE_SESSION, props);
diff --git a/app/src/main/java/com/termux/app/TermuxViewClient.java b/app/src/main/java/com/termux/app/TermuxViewClient.java
index 0b8aee2314..3dcc406c77 100644
--- a/app/src/main/java/com/termux/app/TermuxViewClient.java
+++ b/app/src/main/java/com/termux/app/TermuxViewClient.java
@@ -264,7 +264,9 @@ public boolean onLongPress(MotionEvent event) {
     /** Handle dedicated volume buttons as virtual keys if applicable. */
     private boolean handleVirtualKeys(int keyCode, KeyEvent event, boolean down) {
         InputDevice inputDevice = event.getDevice();
-        if (inputDevice != null && inputDevice.getKeyboardType() == InputDevice.KEYBOARD_TYPE_ALPHABETIC) {
+        if (mActivity.mSettings.mDisableVolumeVirtualKeys) {
+            return false;
+        } else if (inputDevice != null && inputDevice.getKeyboardType() == InputDevice.KEYBOARD_TYPE_ALPHABETIC) {
             // Do not steal dedicated buttons from a full external keyboard.
             return false;
         } else if (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN) {

From b8f04306993e4461c7011202b65773a126ae2f46 Mon Sep 17 00:00:00 2001
From: Jean Schurger <jean@schurger.org>
Date: Tue, 28 Jan 2020 14:21:56 -0500
Subject: [PATCH 049/912] Prevent kill by Samsung Dex on plug/unplug.

---
 app/src/main/AndroidManifest.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 901c1bbe69..1fbdab95a9 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -31,11 +31,11 @@
 
         <activity
             android:name="com.termux.app.TermuxActivity"
-            android:label="@string/application_name"
-            android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
+	    android:label="@string/application_name"
+	    android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation"
             android:launchMode="singleTask"
             android:resizeableActivity="true"
-            android:windowSoftInputMode="adjustResize|stateAlwaysVisible" >
+	    android:windowSoftInputMode="adjustResize|stateAlwaysVisible" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -120,8 +120,8 @@
                   android:exported="true"
                   android:grantUriPermissions="true"
                   android:name="com.termux.app.TermuxOpenReceiver$ContentProvider" />
-
-        <meta-data android:name="com.sec.android.support.multiwindow" android:value="true" />
+	<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>

From 36db64d585526d6dd5f544f429b9c84aeb6c64ca Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Sun, 2 Feb 2020 03:36:52 +0100
Subject: [PATCH 050/912] Bump version to 0.90

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 06d1ce9b93..a02668b428 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -16,8 +16,8 @@ android {
         applicationId "com.termux"
         minSdkVersion 24
         targetSdkVersion 28
-        versionCode 88
-        versionName "0.88"
+        versionCode 90
+        versionName "0.90"
 
         externalNativeBuild {
             ndkBuild {

From f928efed4e70e7e8affc30f3dbdc07508d7e9a98 Mon Sep 17 00:00:00 2001
From: Leonid Plyushch <leonid.plyushch@gmail.com>
Date: Fri, 7 Feb 2020 13:47:22 +0200
Subject: [PATCH 051/912] CI: switch to Github Actions

---
 .cirrus.yml                       | 20 --------------------
 .github/workflows/debug_build.yml | 18 ++++++++++++++++++
 2 files changed, 18 insertions(+), 20 deletions(-)
 delete mode 100644 .cirrus.yml
 create mode 100644 .github/workflows/debug_build.yml

diff --git a/.cirrus.yml b/.cirrus.yml
deleted file mode 100644
index 8e6a5449cd..0000000000
--- a/.cirrus.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-container:
-  image: cirrusci/android-sdk:28
-  cpu: 2
-  memory: 8G
-
-task:
-  name: tests
-  script: ./gradlew test
-
-task:
-  name: debug-build
-
-  depends_on:
-    - tests
-
-  script: |
-    ./gradlew assembleDebug
-
-  output_artifacts:
-    path: "./app/build/outputs/apk/debug/*.apk"
diff --git a/.github/workflows/debug_build.yml b/.github/workflows/debug_build.yml
new file mode 100644
index 0000000000..ba0bdf4c06
--- /dev/null
+++ b/.github/workflows/debug_build.yml
@@ -0,0 +1,18 @@
+name: Termux application debug build
+
+on: push
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Clone repository
+      uses: actions/checkout@v2
+    - name: Build
+      run: |
+        ./gradlew assembleDebug
+    - name: Store generated APK file
+      uses: actions/upload-artifact@v1
+      with:
+        name: termux-app
+        path: ./app/build/outputs/apk/debug/app-debug.apk

From b75cf0bb84357c09418526fd17210f71eea0b4d3 Mon Sep 17 00:00:00 2001
From: Leonid Plyushch <leonid.plyushch@gmail.com>
Date: Fri, 7 Feb 2020 13:50:12 +0200
Subject: [PATCH 052/912] CI: add configuration for running terminal emulator
 unit tests

---
 .github/workflows/run_tests.yml | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 .github/workflows/run_tests.yml

diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml
new file mode 100644
index 0000000000..6d8882717f
--- /dev/null
+++ b/.github/workflows/run_tests.yml
@@ -0,0 +1,13 @@
+name: Terminal unit tests
+
+on: push
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Clone repository
+      uses: actions/checkout@v2
+    - name: Execute tests
+      run: |
+        ./gradlew test

From d92e80646114710b395f60a9b1ffc2fab79d72c4 Mon Sep 17 00:00:00 2001
From: Leonid Plyushch <leonid.plyushch@gmail.com>
Date: Fri, 7 Feb 2020 13:55:45 +0200
Subject: [PATCH 053/912] CI: update workflow labels

---
 .github/workflows/debug_build.yml | 2 +-
 .github/workflows/run_tests.yml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/debug_build.yml b/.github/workflows/debug_build.yml
index ba0bdf4c06..52d06aa07a 100644
--- a/.github/workflows/debug_build.yml
+++ b/.github/workflows/debug_build.yml
@@ -1,4 +1,4 @@
-name: Termux application debug build
+name: Build
 
 on: push
 
diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml
index 6d8882717f..aa8aeb4d36 100644
--- a/.github/workflows/run_tests.yml
+++ b/.github/workflows/run_tests.yml
@@ -1,4 +1,4 @@
-name: Terminal unit tests
+name: Unit tests
 
 on: push
 

From 4647beb0d239a7947aa5531554a0ebbbc7b7b788 Mon Sep 17 00:00:00 2001
From: Leonid Plyushch <leonid.plyushch@gmail.com>
Date: Fri, 7 Feb 2020 13:57:08 +0200
Subject: [PATCH 054/912] update readme

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 734fc6a444..57f98e6a93 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,7 @@
 # Termux application
 
-[![Build status](https://api.cirrus-ci.com/github/termux/termux-app.svg?branch=master)](https://cirrus-ci.com/termux/termux-app)
+[![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)
 
 [Termux](https://termux.com) is an Android terminal application and Linux environment.

From a240f4cf45aa3eee31da1994f3bd8192ff0e28b7 Mon Sep 17 00:00:00 2001
From: Leonid Plyushch <leonid.plyushch@gmail.com>
Date: Fri, 7 Feb 2020 14:02:34 +0200
Subject: [PATCH 055/912] CI: fix job name in run_tests.yml

---
 .github/workflows/run_tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml
index aa8aeb4d36..8d208c160e 100644
--- a/.github/workflows/run_tests.yml
+++ b/.github/workflows/run_tests.yml
@@ -3,7 +3,7 @@ name: Unit tests
 on: push
 
 jobs:
-  build:
+  testing:
     runs-on: ubuntu-latest
     steps:
     - name: Clone repository

From 3270506bff040762e47e3dde775266e1cad67b42 Mon Sep 17 00:00:00 2001
From: Leonid Plyushch <leonid.plyushch@gmail.com>
Date: Fri, 7 Feb 2020 15:05:16 +0200
Subject: [PATCH 056/912] update issue templates

---
 .github/ISSUE_TEMPLATE/bug_report.md      | 27 ++++++++++++++++++-----
 .github/ISSUE_TEMPLATE/feature_request.md | 14 ++++++++++--
 2 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index dc7917b441..440cc3fe4f 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,20 +1,35 @@
 ---
 name: Bug report
-about: Create a report to help us improve termux-app
+about: Create a report to help us improve Termux application
 
 ---
 
-<!-- Important note: Refusing to provide needed information may result in issue closing. If you are having problems with a package in termux then a bug report should be filed in the termux-packages repo: https://github.com/termux/termux-packages -->
+<!--
+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 with the termux app is. You may post screenshots in addition to description.
+<!--
+A clear and concise description of what the problem is.
+You may post screenshots in addition to description.
+-->
 
 **Steps to reproduce**
-Please post all steps that are needed to reproduce the issue.
+<!--
+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**
-Post output of command `termux-info`.
-If you are rooted or have access to adb then capture a logcat with `logcat -d "*:W"`, from a adb or root shell.
+
+* Termux application version:
+* Android OS version:
+* Device model:
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 898fab0971..c1e99f1048 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,12 +1,22 @@
 ---
 name: Feature request
-about: Suggest a new feature in termux-app
+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
+Provide links to more background information.

From 9fdf2a49fd53ab5285466734c2d42b0906128e14 Mon Sep 17 00:00:00 2001
From: Leonid Plyushch <leonid.plyushch@gmail.com>
Date: Fri, 7 Feb 2020 15:48:32 +0200
Subject: [PATCH 057/912] update readme

---
 README.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 57f98e6a93..f1db39db24 100644
--- a/README.md
+++ b/README.md
@@ -22,9 +22,10 @@ Termux:Widget application can be obtained from:
 - [F-Droid](https://f-droid.org/en/packages/com.termux/)
 - [Kali Nethunter Store](https://store.nethunter.com/en/packages/com.termux/)
 
-Additionally we offer development builds for those who want to try out latest
-features ready to be included in future versions. Such build can be obtained
-directly from [Cirrus CI artifacts](https://api.cirrus-ci.com/v1/artifact/github/termux/termux-app/debug-build/output/app/build/outputs/apk/debug/app-debug.apk).
+Additionally we provide per-commit debug builds for those who want to try
+out the latest features or test their pull request. This build can be obtained
+from one of the workflow runs listed on [Github Actions](https://github.com/termux/termux-app/actions)
+page.
 
 Signature keys of all offered builds are different. Before you switch the
 installation source, you will have to uninstall the Termux application and

From 453b838b242baed8a5bc3e92c9294f4f693273ab Mon Sep 17 00:00:00 2001
From: Leonid Plyushch <leonid.plyushch@gmail.com>
Date: Sat, 8 Feb 2020 20:33:34 +0200
Subject: [PATCH 058/912] update bootstrap archives

---
 app/build.gradle | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index a02668b428..341e41575e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -132,11 +132,11 @@ clean {
 
 task downloadBootstraps(){
     doLast {
-        def version = 18
-        downloadBootstrap("aarch64", "1a4c08a696d452b58f69102428239ec0c07521c0ca9f48b23ef70ae0e5e3d4f8", version)
-        downloadBootstrap("arm",     "bff11f2c7e9c1055a22fc5f20bb7507b75f6034e0f5d591ec6725b3407981b85", version)
-        downloadBootstrap("i686",    "6fb93020db2807337d82a1537e24612400cacbd10cf4bccaeb0714d51e653da1", version)
-        downloadBootstrap("x86_64",  "a6067e5decc486dcad190c1ed9e15366c798e5e7d9b9b9ee6b4b8231290524c3", version)
+        def version = 19
+        downloadBootstrap("aarch64", "b3ed0c7e1744f3fb3e80c13bda14b7b489f2fd835f9c968325cf94bd5143699b", version)
+        downloadBootstrap("arm",     "1e41f06e8e8f66f5cfa79831c0376af5fc6c06344521345195842aea59d64112", version)
+        downloadBootstrap("i686",    "354194fc83444acebc0cf1819937e076476c9799e1bc78f1a92b3b7eae926f33", version)
+        downloadBootstrap("x86_64",  "8bfda3fe8d6e77d2772d459fc1bb182ab662a64670bc7a76de06effde439f5fb", version)
     }
 }
 
@@ -145,4 +145,3 @@ afterEvaluate {
     variant.javaCompileProvider.get().dependsOn(downloadBootstraps)
   }
 }
-

From 9749f25ebabd47ef6504219fbcbd827fc7344c59 Mon Sep 17 00:00:00 2001
From: Leonid Plyushch <leonid.plyushch@gmail.com>
Date: Sun, 9 Feb 2020 12:34:11 +0200
Subject: [PATCH 059/912] update bootstrap archives

v19 had a problem with metadata which broke the package manager.
---
 app/build.gradle | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 341e41575e..7bc2b721fc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -132,11 +132,11 @@ clean {
 
 task downloadBootstraps(){
     doLast {
-        def version = 19
-        downloadBootstrap("aarch64", "b3ed0c7e1744f3fb3e80c13bda14b7b489f2fd835f9c968325cf94bd5143699b", version)
-        downloadBootstrap("arm",     "1e41f06e8e8f66f5cfa79831c0376af5fc6c06344521345195842aea59d64112", version)
-        downloadBootstrap("i686",    "354194fc83444acebc0cf1819937e076476c9799e1bc78f1a92b3b7eae926f33", version)
-        downloadBootstrap("x86_64",  "8bfda3fe8d6e77d2772d459fc1bb182ab662a64670bc7a76de06effde439f5fb", version)
+        def version = 20
+        downloadBootstrap("aarch64", "2ea6aaff12d8316223e5c1f22719d20633fae669d6461a6802b67b4adbe796de", version)
+        downloadBootstrap("arm",     "8a3a7e8adeff8eb769b03cad947f81b8c42b7c4c8edeea37c71a9d7abd9de99c", version)
+        downloadBootstrap("i686",    "b3e1f8e3ccb695d6fab7714c62b2028fbc37187ccfaff0a9f6bd64f738bc5adc", version)
+        downloadBootstrap("x86_64",  "2a9f6adbfb6f5e7c0bd03e022856a140768fa25ada850384d635c25c8e966ea3", version)
     }
 }
 

From 9703bd31ad9db1083eb2fad646c5a67921db5b40 Mon Sep 17 00:00:00 2001
From: x0b <x0bdev@gmail.com>
Date: Thu, 6 Feb 2020 16:45:11 +0100
Subject: [PATCH 060/912] Fix #1424: Support ACTION_OPEN_DOCUMENT_TREE

---
 .../com/termux/filepicker/TermuxDocumentsProvider.java     | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/termux/filepicker/TermuxDocumentsProvider.java b/app/src/main/java/com/termux/filepicker/TermuxDocumentsProvider.java
index 48b16391fd..ed13ee9dcd 100644
--- a/app/src/main/java/com/termux/filepicker/TermuxDocumentsProvider.java
+++ b/app/src/main/java/com/termux/filepicker/TermuxDocumentsProvider.java
@@ -71,7 +71,7 @@ public Cursor queryRoots(String[] projection) throws FileNotFoundException {
         row.add(Root.COLUMN_ROOT_ID, getDocIdForFile(BASE_DIR));
         row.add(Root.COLUMN_DOCUMENT_ID, getDocIdForFile(BASE_DIR));
         row.add(Root.COLUMN_SUMMARY, null);
-        row.add(Root.COLUMN_FLAGS, Root.FLAG_SUPPORTS_CREATE | Root.FLAG_SUPPORTS_SEARCH);
+        row.add(Root.COLUMN_FLAGS, Root.FLAG_SUPPORTS_CREATE | Root.FLAG_SUPPORTS_SEARCH | Root.FLAG_SUPPORTS_IS_CHILD);
         row.add(Root.COLUMN_TITLE, applicationName);
         row.add(Root.COLUMN_MIME_TYPES, ALL_MIME_TYPES);
         row.add(Root.COLUMN_AVAILABLE_BYTES, BASE_DIR.getFreeSpace());
@@ -169,6 +169,11 @@ public Cursor querySearchDocuments(String rootId, String query, String[] project
         return result;
     }
 
+    @Override
+    public boolean isChildDocument(String parentDocumentId, String documentId) {
+        return documentId.startsWith(parentDocumentId);
+    }
+
     /**
      * Get the document id given a file. This document id must be consistent across time as other
      * applications may save the ID and use it to reference documents later.

From ed9afa082a0756678b4b56ceb2b17bda9d35bad4 Mon Sep 17 00:00:00 2001
From: x0b <x0bdev@gmail.com>
Date: Thu, 6 Feb 2020 16:46:51 +0100
Subject: [PATCH 061/912] Fix #1350: Support createDocument(...)

---
 .../filepicker/TermuxDocumentsProvider.java   | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/app/src/main/java/com/termux/filepicker/TermuxDocumentsProvider.java b/app/src/main/java/com/termux/filepicker/TermuxDocumentsProvider.java
index ed13ee9dcd..16c697eb0e 100644
--- a/app/src/main/java/com/termux/filepicker/TermuxDocumentsProvider.java
+++ b/app/src/main/java/com/termux/filepicker/TermuxDocumentsProvider.java
@@ -117,6 +117,29 @@ public boolean onCreate() {
         return true;
     }
 
+    @Override
+    public String createDocument(String parentDocumentId, String mimeType, String displayName) throws FileNotFoundException {
+        File newFile = new File(parentDocumentId, displayName);
+        int noConflictId = 2;
+        while (newFile.exists()) {
+            newFile = new File(parentDocumentId, displayName + " (" + noConflictId++ + ")");
+        }
+        try {
+            boolean succeeded;
+            if (Document.MIME_TYPE_DIR.equals(mimeType)) {
+                succeeded = newFile.mkdir();
+            } else {
+                succeeded = newFile.createNewFile();
+            }
+            if (!succeeded) {
+                throw new FileNotFoundException("Failed to create document with id " + newFile.getPath());
+            }
+        } catch (IOException e) {
+            throw new FileNotFoundException("Failed to create document with id " + newFile.getPath());
+        }
+        return newFile.getPath();
+    }
+
     @Override
     public void deleteDocument(String documentId) throws FileNotFoundException {
         File file = getFileForDocId(documentId);

From 5d06f040e80a16cd93cca256af3498d72d219e78 Mon Sep 17 00:00:00 2001
From: x0b <x0bdev@gmail.com>
Date: Thu, 6 Feb 2020 16:48:44 +0100
Subject: [PATCH 062/912] Fix deletable flags in DocumentProvider

A file is deletable if the _parent_ is writable, not the file itself.
---
 .../java/com/termux/filepicker/TermuxDocumentsProvider.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/termux/filepicker/TermuxDocumentsProvider.java b/app/src/main/java/com/termux/filepicker/TermuxDocumentsProvider.java
index 16c697eb0e..6a84904033 100644
--- a/app/src/main/java/com/termux/filepicker/TermuxDocumentsProvider.java
+++ b/app/src/main/java/com/termux/filepicker/TermuxDocumentsProvider.java
@@ -248,10 +248,11 @@ private void includeFile(MatrixCursor result, String docId, File file)
 
         int flags = 0;
         if (file.isDirectory()) {
-            if (file.isDirectory() && file.canWrite()) flags |= Document.FLAG_DIR_SUPPORTS_CREATE;
+            if (file.canWrite()) flags |= Document.FLAG_DIR_SUPPORTS_CREATE;
         } else if (file.canWrite()) {
-            flags |= Document.FLAG_SUPPORTS_WRITE | Document.FLAG_SUPPORTS_DELETE;
+            flags |= Document.FLAG_SUPPORTS_WRITE;
         }
+        if (file.getParentFile().canWrite()) flags |= Document.FLAG_SUPPORTS_DELETE;
 
         final String displayName = file.getName();
         final String mimeType = getMimeType(file);

From 93724b7aa634109974f10699891b351c1df85f8d Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Sun, 9 Feb 2020 22:59:33 +0100
Subject: [PATCH 063/912] Bump version to 0.92

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 7bc2b721fc..3f3f0b9316 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -16,8 +16,8 @@ android {
         applicationId "com.termux"
         minSdkVersion 24
         targetSdkVersion 28
-        versionCode 90
-        versionName "0.90"
+        versionCode 92
+        versionName "0.92"
 
         externalNativeBuild {
             ndkBuild {

From d28939810cba4b1c2f75d84bc88965b293766deb Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Fri, 21 Feb 2020 14:02:53 +0100
Subject: [PATCH 064/912] Update Robolectric from 4.3 to 4.3.1

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 3f3f0b9316..4f7539d9cb 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -72,7 +72,7 @@ android {
 
 dependencies {
     testImplementation 'junit:junit:4.13'
-    testImplementation 'org.robolectric:robolectric:4.3'
+    testImplementation 'org.robolectric:robolectric:4.3.1'
 }
 
 task versionName {

From 2cde9864194556e72e6a6c3eac96139c492a8d06 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Mon, 16 Mar 2020 13:58:34 +0100
Subject: [PATCH 065/912] Update Android gradle plug-in

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index c36378c7f4..e7af5e78d4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.3'
+        classpath 'com.android.tools.build:gradle:3.6.1'
     }
 }
 

From 0e23315c41a864b9b01b294ecf4fccc84f5b6a98 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Fri, 20 Mar 2020 10:44:24 +0100
Subject: [PATCH 066/912] Add android.useAndroidX=true to gradle.properties

---
 gradle.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gradle.properties b/gradle.properties
index dc36254220..e9645a397d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,3 +13,4 @@
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 org.gradle.jvmargs=-Xmx2048M
+android.useAndroidX=true

From 537f2ed97e78bc6bfefb21749ac5d88c2e4deb15 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Fri, 20 Mar 2020 14:42:43 +0100
Subject: [PATCH 067/912] Update gradle wrapper

---
 gradle/wrapper/gradle-wrapper.jar        | Bin 58702 -> 58695 bytes
 gradle/wrapper/gradle-wrapper.properties |   2 +-
 gradlew.bat                              |   3 +++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index cc4fdc293d0e50b0ad9b65c16e7ddd1db2f6025b..f3d88b1c2faf2fc91d853cd5d4242b5547257070 100644
GIT binary patch
delta 12333
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

delta 12451
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

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 94920145f3..a2bf1313b8 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew.bat b/gradlew.bat
index 24467a141f..9109989e3c 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -29,6 +29,9 @@ 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"
 

From 8c8fa961339fb26f07cd13ab8f5c1043383c624c Mon Sep 17 00:00:00 2001
From: Leonid Plyushch <leonid.plyushch@gmail.com>
Date: Sat, 21 Mar 2020 10:35:17 +0200
Subject: [PATCH 068/912] update bootstraps

---
 app/build.gradle | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 4f7539d9cb..d358fff7d8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -132,11 +132,11 @@ clean {
 
 task downloadBootstraps(){
     doLast {
-        def version = 20
-        downloadBootstrap("aarch64", "2ea6aaff12d8316223e5c1f22719d20633fae669d6461a6802b67b4adbe796de", version)
-        downloadBootstrap("arm",     "8a3a7e8adeff8eb769b03cad947f81b8c42b7c4c8edeea37c71a9d7abd9de99c", version)
-        downloadBootstrap("i686",    "b3e1f8e3ccb695d6fab7714c62b2028fbc37187ccfaff0a9f6bd64f738bc5adc", version)
-        downloadBootstrap("x86_64",  "2a9f6adbfb6f5e7c0bd03e022856a140768fa25ada850384d635c25c8e966ea3", version)
+        def version = 21
+        downloadBootstrap("aarch64", "9d362f1396e3a7d6987f09b8c3886c5aad514ab195ec7874a32000dc3b9cecde", version)
+        downloadBootstrap("arm",     "3c2f2ca9424fc984a4df54a3f9b38db3413b635ba39b89dfd8c753418730f719", version)
+        downloadBootstrap("i686",    "87afbd0fe6ebdc3abd9f2e5bc6136dbbf49991e485c9e9b03c4fe0149543ed7d", version)
+        downloadBootstrap("x86_64",  "bc91e5524d516cbe34b2ef082f6ebda1146457c8fa0373d06f7a1bb0c7be41df", version)
     }
 }
 

From 6e224cabcfaef6248d97e8760b6b481db64e2c2a Mon Sep 17 00:00:00 2001
From: Leonid Plyushch <leonid.plyushch@gmail.com>
Date: Sat, 21 Mar 2020 11:19:18 +0200
Subject: [PATCH 069/912] set ndk version in build.gradle

Fixing CI builds.
---
 app/build.gradle               | 1 +
 terminal-emulator/build.gradle | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/build.gradle b/app/build.gradle
index d358fff7d8..4638ed7afc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -4,6 +4,7 @@ plugins {
 
 android {
     compileSdkVersion 28
+    ndkVersion '21.0.6113669'
 
     dependencies {
         implementation "androidx.annotation:annotation:1.1.0"
diff --git a/terminal-emulator/build.gradle b/terminal-emulator/build.gradle
index dd6da0a300..19128a218b 100644
--- a/terminal-emulator/build.gradle
+++ b/terminal-emulator/build.gradle
@@ -18,6 +18,7 @@ ext {
 
 android {
     compileSdkVersion 28
+    ndkVersion '21.0.6113669'
 
     defaultConfig {
         minSdkVersion 21

From 366a61f052b21a87d3fea8c67bc58249798bed3e Mon Sep 17 00:00:00 2001
From: Daniel Lublin <daniel@lublin.se>
Date: Thu, 12 Mar 2020 17:29:51 +0100
Subject: [PATCH 070/912] Grab fragment when extracting URLs for selection

---
 app/src/main/java/com/termux/app/TermuxActivity.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index c0517b673b..ae61b30217 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -733,6 +733,9 @@ static LinkedHashSet<CharSequence> extractUrls(String text) {
         // Resource path with optional query string.
         regex_sb.append("(?:/[a-zA-Z0-9:@%\\-._~!$&()*+,;=?/]*)?");
 
+        // Fragment.
+        regex_sb.append("(?:#[a-zA-Z0-9:@%\\-._~!$&()*+,;=?/]*)?");
+
         // End second matching group.
         regex_sb.append(")");
 

From 1819087ca092f6ea113f188fd853fe682b5b4952 Mon Sep 17 00:00:00 2001
From: Daniel Lublin <daniel@lublin.se>
Date: Thu, 12 Mar 2020 18:00:37 +0100
Subject: [PATCH 071/912] Add tests for URL fragment

---
 app/src/test/java/com/termux/app/TermuxActivityTest.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/src/test/java/com/termux/app/TermuxActivityTest.java b/app/src/test/java/com/termux/app/TermuxActivityTest.java
index 07be4773e1..b4f5251fce 100644
--- a/app/src/test/java/com/termux/app/TermuxActivityTest.java
+++ b/app/src/test/java/com/termux/app/TermuxActivityTest.java
@@ -22,6 +22,9 @@ public void testExtractUrls() {
 
         assertUrlsAre("hello http://example.com world and http://more.example.com with secure https://more.example.com",
             "http://example.com", "http://more.example.com", "https://more.example.com");
+
+        assertUrlsAre("hello https://example.com/#bar https://example.com/foo#bar",
+            "https://example.com/#bar", "https://example.com/foo#bar");
     }
 
 }

From 9b7c7102b2ad0f97381656a3e8a2c99c1859fba1 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Tue, 24 Mar 2020 23:25:49 +0100
Subject: [PATCH 072/912] Bump version to 0.94

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 4638ed7afc..a743e23c3f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -17,8 +17,8 @@ android {
         applicationId "com.termux"
         minSdkVersion 24
         targetSdkVersion 28
-        versionCode 92
-        versionName "0.92"
+        versionCode 94
+        versionName "0.94"
 
         externalNativeBuild {
             ndkBuild {

From 2659c06c5dbf5ad61c87227cff3d0707829c1ee0 Mon Sep 17 00:00:00 2001
From: Leonid Plyushch <leonid.plyushch@gmail.com>
Date: Thu, 30 Apr 2020 14:34:35 +0300
Subject: [PATCH 073/912] Remove irrelevant message from bootstrap installation
 error

Bootstraps are no longer downloaded from the Internet.
---
 app/src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1fffd6621c..42ac4af8ae 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -13,7 +13,7 @@
 
     <string name="bootstrap_installer_body">Installing…</string>
     <string name="bootstrap_error_title">Unable to install</string>
-    <string name="bootstrap_error_body">Termux was unable to install the bootstrap packages.\n\nCheck your network connection and try again.</string>
+    <string name="bootstrap_error_body">Termux 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 can only be installed on the primary user account.</string>

From 6dca19ae0011f9514efa6a5380fb5a097149351c Mon Sep 17 00:00:00 2001
From: Frieder Bluemle <frieder.bluemle@gmail.com>
Date: Wed, 13 May 2020 23:57:16 -0700
Subject: [PATCH 074/912] Update Android Gradle plugin to 3.6.3

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index e7af5e78d4..bc822d6bcd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.1'
+        classpath 'com.android.tools.build:gradle:3.6.3'
     }
 }
 

From 7e13b8aa2e232f17b3962bf174408fb1bc18b5b8 Mon Sep 17 00:00:00 2001
From: Hannes Achleitner <hannes.software@gmx.at>
Date: Sun, 17 May 2020 13:04:31 +0200
Subject: [PATCH 075/912] Verify Gradle

---
 .github/workflows/gradle-wrapper-validation.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 .github/workflows/gradle-wrapper-validation.yml

diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
new file mode 100644
index 0000000000..f552c8dc65
--- /dev/null
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -0,0 +1,10 @@
+name: "Validate Gradle Wrapper"
+on: [push]
+
+jobs:
+  validation:
+    name: "Validation"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: gradle/wrapper-validation-action@v1

From 38a3319ca26c73a29faa6ccb6dd8f906d628d2d2 Mon Sep 17 00:00:00 2001
From: Hannes Achleitner <hannes.software@gmx.at>
Date: Sun, 17 May 2020 13:37:08 +0200
Subject: [PATCH 076/912] show result in pull request

---
 .github/workflows/gradle-wrapper-validation.yml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
index f552c8dc65..13dca3db33 100644
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -1,5 +1,12 @@
 name: "Validate Gradle Wrapper"
-on: [push]
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
 
 jobs:
   validation:

From c4c4912a7e65c5a16bd78b9caf0aa81dd86004aa Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Sun, 24 May 2020 01:22:33 +0200
Subject: [PATCH 077/912] Avoid specifying ndk version

---
 app/build.gradle               | 1 -
 terminal-emulator/build.gradle | 1 -
 2 files changed, 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index a743e23c3f..01061c4f76 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -4,7 +4,6 @@ plugins {
 
 android {
     compileSdkVersion 28
-    ndkVersion '21.0.6113669'
 
     dependencies {
         implementation "androidx.annotation:annotation:1.1.0"
diff --git a/terminal-emulator/build.gradle b/terminal-emulator/build.gradle
index 19128a218b..dd6da0a300 100644
--- a/terminal-emulator/build.gradle
+++ b/terminal-emulator/build.gradle
@@ -18,7 +18,6 @@ ext {
 
 android {
     compileSdkVersion 28
-    ndkVersion '21.0.6113669'
 
     defaultConfig {
         minSdkVersion 21

From c2843897ac7738b27b7423adc34e219d136bdf5d Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Sun, 24 May 2020 01:27:01 +0200
Subject: [PATCH 078/912] Fix build by specifying ndkVersion

---
 app/build.gradle               | 1 +
 terminal-emulator/build.gradle | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/build.gradle b/app/build.gradle
index 01061c4f76..17e9611704 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -4,6 +4,7 @@ plugins {
 
 android {
     compileSdkVersion 28
+    ndkVersion '21.1.6352462'
 
     dependencies {
         implementation "androidx.annotation:annotation:1.1.0"
diff --git a/terminal-emulator/build.gradle b/terminal-emulator/build.gradle
index dd6da0a300..b0baa946ad 100644
--- a/terminal-emulator/build.gradle
+++ b/terminal-emulator/build.gradle
@@ -18,6 +18,7 @@ ext {
 
 android {
     compileSdkVersion 28
+    ndkVersion '21.1.6352462'
 
     defaultConfig {
         minSdkVersion 21

From d212198e307c9f41beffed11fe1230cc94767f76 Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Sun, 24 May 2020 02:44:06 +0300
Subject: [PATCH 079/912] update bootstraps

---
 app/build.gradle | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 17e9611704..9c3c253b7b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -133,11 +133,11 @@ clean {
 
 task downloadBootstraps(){
     doLast {
-        def version = 21
-        downloadBootstrap("aarch64", "9d362f1396e3a7d6987f09b8c3886c5aad514ab195ec7874a32000dc3b9cecde", version)
-        downloadBootstrap("arm",     "3c2f2ca9424fc984a4df54a3f9b38db3413b635ba39b89dfd8c753418730f719", version)
-        downloadBootstrap("i686",    "87afbd0fe6ebdc3abd9f2e5bc6136dbbf49991e485c9e9b03c4fe0149543ed7d", version)
-        downloadBootstrap("x86_64",  "bc91e5524d516cbe34b2ef082f6ebda1146457c8fa0373d06f7a1bb0c7be41df", version)
+        def version = 22
+        downloadBootstrap("aarch64", "d00cd85b773202924e0256af25c521744fcfa845a1120ecffe685a4a0baf44d6", version)
+        downloadBootstrap("arm",     "24e86450e68e4636853d6489c25c6204ffa1cd7f406310ba956e7b1942126226", version)
+        downloadBootstrap("i686",    "bc564abdc8f370c04c67b2da719bf8fa4fe387634ef2e41faf14de615d8852f3", version)
+        downloadBootstrap("x86_64",  "f2cc605ca2399d9a1f0e112f1c3ab964f1118668d66312b53a8d41cfd72fae0b", version)
     }
 }
 

From b6d7831646bb0ea0223946fdac2f5943610e8118 Mon Sep 17 00:00:00 2001
From: hannesa2 <hannes.software@gmx.at>
Date: Sun, 24 May 2020 02:05:24 +0200
Subject: [PATCH 080/912] Fix CI build and see result in pull request (#1565)

---
 .github/workflows/debug_build.yml | 8 +++++++-
 .github/workflows/run_tests.yml   | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/debug_build.yml b/.github/workflows/debug_build.yml
index 52d06aa07a..47ba0edd86 100644
--- a/.github/workflows/debug_build.yml
+++ b/.github/workflows/debug_build.yml
@@ -1,6 +1,12 @@
 name: Build
 
-on: push
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
 
 jobs:
   build:
diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml
index 8d208c160e..87ccc68611 100644
--- a/.github/workflows/run_tests.yml
+++ b/.github/workflows/run_tests.yml
@@ -1,6 +1,12 @@
 name: Unit tests
 
-on: push
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
 
 jobs:
   testing:

From f794bfcadc0fcacdac42d38eae63fb7713f4656f Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Sat, 6 Jun 2020 21:20:05 +0300
Subject: [PATCH 081/912] Handle all exceptions when loading termux.properties
 (#1590)

* Catch all exceptions which can occur.
* Print short description in toast message about occurred exception.
---
 app/src/main/java/com/termux/app/TermuxPreferences.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxPreferences.java b/app/src/main/java/com/termux/app/TermuxPreferences.java
index 1fbac2b70e..a8ffadb147 100644
--- a/app/src/main/java/com/termux/app/TermuxPreferences.java
+++ b/app/src/main/java/com/termux/app/TermuxPreferences.java
@@ -162,8 +162,8 @@ void reloadFromProperties(Context context) {
                     props.load(new InputStreamReader(in, StandardCharsets.UTF_8));
                 }
             }
-        } catch (IOException e) {
-            Toast.makeText(context, "Could not open properties file termux.properties.", Toast.LENGTH_LONG).show();
+        } catch (Exception e) {
+            Toast.makeText(context, "Could not open properties file termux.properties: " + e.getMessage(), Toast.LENGTH_LONG).show();
             Log.e("termux", "Error loading props", e);
         }
 

From 9f438e29124f173d9b5853128393f9f8df229fe5 Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Sat, 6 Jun 2020 22:42:19 +0300
Subject: [PATCH 082/912] update bootstraps

---
 app/build.gradle | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 9c3c253b7b..bee88350a2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -133,11 +133,11 @@ clean {
 
 task downloadBootstraps(){
     doLast {
-        def version = 22
-        downloadBootstrap("aarch64", "d00cd85b773202924e0256af25c521744fcfa845a1120ecffe685a4a0baf44d6", version)
-        downloadBootstrap("arm",     "24e86450e68e4636853d6489c25c6204ffa1cd7f406310ba956e7b1942126226", version)
-        downloadBootstrap("i686",    "bc564abdc8f370c04c67b2da719bf8fa4fe387634ef2e41faf14de615d8852f3", version)
-        downloadBootstrap("x86_64",  "f2cc605ca2399d9a1f0e112f1c3ab964f1118668d66312b53a8d41cfd72fae0b", version)
+        def version = 23
+        downloadBootstrap("aarch64", "e19a965e53aa0a8aac978d67b675720a27aaae0bc9ffe140c2fc022167be3e7a", version)
+        downloadBootstrap("arm",     "a02ed2ddc4602859c3d244f23ac84092dd3f5d0d04a9f0c68957b10666db2374", version)
+        downloadBootstrap("i686",    "77365a6f149797fef1df0e3a3f6eb643c12a45f8111443760557bad7c05f4d50", version)
+        downloadBootstrap("x86_64",  "cbcc590a3fa48dbe7c88ef328feaab3ed3659860377c555276ffeeed25d983b2", version)
     }
 }
 

From 58440bc88d16c48de4c6385dda39f7aa5c4bba8b Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Sun, 7 Jun 2020 03:56:44 +0300
Subject: [PATCH 083/912] update bootstraps again

Added few more packages to bootstraps which are replacements to
some busybox applets.
---
 app/build.gradle | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index bee88350a2..066136d4c9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -133,11 +133,11 @@ clean {
 
 task downloadBootstraps(){
     doLast {
-        def version = 23
-        downloadBootstrap("aarch64", "e19a965e53aa0a8aac978d67b675720a27aaae0bc9ffe140c2fc022167be3e7a", version)
-        downloadBootstrap("arm",     "a02ed2ddc4602859c3d244f23ac84092dd3f5d0d04a9f0c68957b10666db2374", version)
-        downloadBootstrap("i686",    "77365a6f149797fef1df0e3a3f6eb643c12a45f8111443760557bad7c05f4d50", version)
-        downloadBootstrap("x86_64",  "cbcc590a3fa48dbe7c88ef328feaab3ed3659860377c555276ffeeed25d983b2", version)
+        def version = 24
+        downloadBootstrap("aarch64", "2027cc81124d3b7de46e88e5d6a3666e72515820f694c6817bc39ace262fc0a1", version)
+        downloadBootstrap("arm",     "a1a95d0ed28341cb9020e082049807da9ae36fb844a03077d3f7cf08f0a89b05", version)
+        downloadBootstrap("i686",    "b28e4c6da2182d50b70c981cef92dca438f644c7d4f07b9bf10f1fd396f42762", version)
+        downloadBootstrap("x86_64",  "7c9e074a2b0bc655bdefb10312b40e95a8523e4478a3e8c67a9bef8b15cdd8c6", version)
     }
 }
 

From f39f06a540169994e8e53218e188de35a26010c0 Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Sun, 7 Jun 2020 22:36:14 +0300
Subject: [PATCH 084/912] update bootstraps again

* Reduced archive size by using nano as preinstalled text editor instead of vim.
* Updated command-not-found and termux-tools.
---
 app/build.gradle | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 066136d4c9..f6dd7480f7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -133,11 +133,11 @@ clean {
 
 task downloadBootstraps(){
     doLast {
-        def version = 24
-        downloadBootstrap("aarch64", "2027cc81124d3b7de46e88e5d6a3666e72515820f694c6817bc39ace262fc0a1", version)
-        downloadBootstrap("arm",     "a1a95d0ed28341cb9020e082049807da9ae36fb844a03077d3f7cf08f0a89b05", version)
-        downloadBootstrap("i686",    "b28e4c6da2182d50b70c981cef92dca438f644c7d4f07b9bf10f1fd396f42762", version)
-        downloadBootstrap("x86_64",  "7c9e074a2b0bc655bdefb10312b40e95a8523e4478a3e8c67a9bef8b15cdd8c6", version)
+        def version = 25
+        downloadBootstrap("aarch64", "633baa1f7edfd81f6064338a68d1149aa203d4b24cbc4f7c64283aaca109609e", version)
+        downloadBootstrap("arm",     "a581a22e0d79a0e8cef9395b1bd951ba066ac2d688522e17cca0b3e1c0649daa", version)
+        downloadBootstrap("i686",    "8288e13f0a6ddeb2ff9406d8f968a8930a58e9318d09fadb2b7c8970a034cfdc", version)
+        downloadBootstrap("x86_64",  "c99b80a18d6bbb64c24c5a64d6ee6b8d4306729ebd172662b807bcb4a46dd39a", version)
     }
 }
 

From b086270a5a72278b3cc1fe1c1917264f61cff07a Mon Sep 17 00:00:00 2001
From: Trygve Aaberge <trygveaa@gmail.com>
Date: Sat, 29 Feb 2020 07:29:24 +0100
Subject: [PATCH 085/912] Support auto detection of dark theme

By default it uses the system setting. If use-black-ui is set to either
true or false, that overrides it.

Fixes #1351 properly, fixes #1354
---
 .../java/com/termux/app/TermuxPreferences.java  | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxPreferences.java b/app/src/main/java/com/termux/app/TermuxPreferences.java
index a8ffadb147..a23924533d 100644
--- a/app/src/main/java/com/termux/app/TermuxPreferences.java
+++ b/app/src/main/java/com/termux/app/TermuxPreferences.java
@@ -2,6 +2,7 @@
 
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.content.res.Configuration;
 import android.preference.PreferenceManager;
 import android.util.Log;
 import android.util.TypedValue;
@@ -58,7 +59,7 @@ final static class KeyboardShortcut {
     private static final String CURRENT_SESSION_KEY = "current_session";
     private static final String SCREEN_ALWAYS_ON_KEY = "screen_always_on";
 
-    private String mUseDarkUI;
+    private boolean mUseDarkUI;
     private boolean mScreenAlwaysOn;
     private int mFontSize;
 
@@ -129,7 +130,7 @@ boolean isScreenAlwaysOn() {
     }
 
     boolean isUsingBlackUI() {
-        return mUseDarkUI.toLowerCase().equals("true");
+        return mUseDarkUI;
     }
 
     void setScreenAlwaysOn(Context context, boolean newValue) {
@@ -179,7 +180,17 @@ void reloadFromProperties(Context context) {
                 break;
         }
 
-        mUseDarkUI = props.getProperty("use-black-ui", "false");
+        switch (props.getProperty("use-black-ui", "").toLowerCase()) {
+            case "true":
+                mUseDarkUI = true;
+                break;
+            case "false":
+                mUseDarkUI = false;
+                break;
+            default:
+                int nightMode = context.getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
+                mUseDarkUI = nightMode == Configuration.UI_MODE_NIGHT_YES;
+        }
 
         try {
             JSONArray arr = new JSONArray(props.getProperty("extra-keys", "[['ESC', 'TAB', 'CTRL', 'ALT', '-', 'DOWN', 'UP']]"));

From 35842cf4a626ae6d57aadf62a7ace937cb4d18d0 Mon Sep 17 00:00:00 2001
From: Trygve Aaberge <trygveaa@gmail.com>
Date: Tue, 9 Jun 2020 10:59:59 +0200
Subject: [PATCH 086/912] Set orientation of HandleView in show (#1477)

* Place long press menu above selection

Previously, the long press menu would cover the first line of the
selection.

* Flip selection handle at different positions depending on drag direction

When the selection handle changes direction, the selection jumps to the
new point of the handle. When the handle changes direction at the same
place when you come from the left as from the right, that makes it
impossible to select the characters which are at the position where it
changes direction.

With this change the handle remains pointing towards the edge further
into the line when you drag it from the edge and against the center.

* Set orientation of HandleView when showing it

When you hold down on a word that starts or ends at the edge of the
screen, the handle will appear outside of the screen. This happens
because the orientation was only switched when the handle is dragged, so
when it is shown it just used the same orientation as it had for the
last selection.

Relates to #334, but not sure if it fixes it completely.
---
 .../java/com/termux/view/TerminalView.java    | 37 +++++++++----------
 1 file changed, 17 insertions(+), 20 deletions(-)

diff --git a/terminal-view/src/main/java/com/termux/view/TerminalView.java b/terminal-view/src/main/java/com/termux/view/TerminalView.java
index cc3df20e31..702bd2a413 100644
--- a/terminal-view/src/main/java/com/termux/view/TerminalView.java
+++ b/terminal-view/src/main/java/com/termux/view/TerminalView.java
@@ -973,12 +973,12 @@ public boolean isShowing() {
             return mContainer.isShowing();
         }
 
-        private void checkChangedOrientation() {
-            if (!mIsDragging) {
+        private void checkChangedOrientation(int posX, boolean force) {
+            if (!mIsDragging && !force) {
                 return;
             }
             long millis = SystemClock.currentThreadTimeMillis();
-            if (millis - mLastTime < 50) {
+            if (millis - mLastTime < 50 && !force) {
                 return;
             }
             mLastTime = millis;
@@ -1003,10 +1003,7 @@ private void checkChangedOrientation() {
                 return;
             }
 
-            final int[] coords = mTempCoords;
-            hostView.getLocationInWindow(coords);
-            final int posX = coords[0] + mPointX;
-            if (posX < clip.left) {
+            if (posX - mHandleWidth < clip.left) {
                 changeOrientation(RIGHT);
             } else if (posX + mHandleWidth > clip.right) {
                 changeOrientation(LEFT);
@@ -1050,13 +1047,14 @@ private boolean isPositionVisible() {
                 posY >= clip.top && posY <= clip.bottom;
         }
 
-        private void moveTo(int x, int y) {
-            mPointX = x;
+        private void moveTo(int x, int y, boolean forceOrientationCheck) {
+            float oldHotspotX = mHotspotX;
+            checkChangedOrientation(x, forceOrientationCheck);
+            mPointX = (int) (x - (isShowing() ? oldHotspotX : mHotspotX));
             mPointY = y;
-            checkChangedOrientation();
             if (isPositionVisible()) {
                 int[] coords = null;
-                if (mContainer.isShowing()) {
+                if (isShowing()) {
                     coords = mTempCoords;
                     TerminalView.this.getLocationInWindow(coords);
                     int x1 = coords[0] + mPointX;
@@ -1138,10 +1136,10 @@ public boolean isDragging() {
             return mIsDragging;
         }
 
-        void positionAtCursor(final int cx, final int cy) {
-            int left = (int) (getPointX(cx) - mHotspotX);
+        void positionAtCursor(final int cx, final int cy, boolean forceOrientationCheck) {
+            int left = getPointX(cx);
             int bottom = getPointY(cy + 1);
-            moveTo(left, bottom);
+            moveTo(left, bottom, forceOrientationCheck);
         }
     }
 
@@ -1162,9 +1160,8 @@ private class SelectionModifierCursorController implements CursorController {
 
         public void show() {
             mIsShowing = true;
-            updatePosition();
-            mStartHandle.show();
-            mEndHandle.show();
+            mStartHandle.positionAtCursor(mSelX1, mSelY1, true);
+            mEndHandle.positionAtCursor(mSelX2 + 1, mSelY2, true);
 
             final ActionMode.Callback callback = new ActionMode.Callback() {
                 @Override
@@ -1240,7 +1237,7 @@ public void onDestroyActionMode(ActionMode mode) {
                 public void onGetContentRect(ActionMode mode, View view, Rect outRect) {
                     int x1 = Math.round(mSelX1 * mRenderer.mFontWidth);
                     int x2 = Math.round(mSelX2 * mRenderer.mFontWidth);
-                    int y1 = Math.round((mSelY1 - mTopRow) * mRenderer.mFontLineSpacing);
+                    int y1 = Math.round((mSelY1 - 1 - mTopRow) * mRenderer.mFontLineSpacing);
                     int y2 = Math.round((mSelY2 + 1 - mTopRow) * mRenderer.mFontLineSpacing);
 
 
@@ -1395,9 +1392,9 @@ public void updatePosition() {
                 return;
             }
 
-            mStartHandle.positionAtCursor(mSelX1, mSelY1);
+            mStartHandle.positionAtCursor(mSelX1, mSelY1, false);
 
-            mEndHandle.positionAtCursor(mSelX2 + 1, mSelY2); //bug
+            mEndHandle.positionAtCursor(mSelX2 + 1, mSelY2, false);
 
             if (mActionMode != null) {
                 mActionMode.invalidate();

From 669c336e2f8ab90affc5d2844aaea7a45c62d861 Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Tue, 9 Jun 2020 12:02:41 +0300
Subject: [PATCH 087/912] update ndk version

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index f6dd7480f7..53fd0ef8a4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -4,7 +4,7 @@ plugins {
 
 android {
     compileSdkVersion 28
-    ndkVersion '21.1.6352462'
+    ndkVersion '21.2.6472646'
 
     dependencies {
         implementation "androidx.annotation:annotation:1.1.0"

From 9c32935ca28662a90c3754a1d9c7f602b3b8efda Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Tue, 9 Jun 2020 12:08:13 +0300
Subject: [PATCH 088/912] fix ndk version for terminal-emulator module

---
 terminal-emulator/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/terminal-emulator/build.gradle b/terminal-emulator/build.gradle
index b0baa946ad..a69359dcfd 100644
--- a/terminal-emulator/build.gradle
+++ b/terminal-emulator/build.gradle
@@ -18,7 +18,7 @@ ext {
 
 android {
     compileSdkVersion 28
-    ndkVersion '21.1.6352462'
+    ndkVersion '21.2.6472646'
 
     defaultConfig {
         minSdkVersion 21

From 4d9c0c315eb6029cdc99314ae1a34b3f5ee103b9 Mon Sep 17 00:00:00 2001
From: Trygve Aaberge <trygveaa@gmail.com>
Date: Sat, 29 Feb 2020 14:43:46 +0100
Subject: [PATCH 089/912] Update notification icon to match launcher icon

This is the launcher icon with a circle around it. I added the circle
because the icon has a transparent background, so it looks a bit weird
with just the >_.
---
 .../res/drawable/ic_service_notification.xml  | 55 +++++++++++--------
 1 file changed, 31 insertions(+), 24 deletions(-)

diff --git a/app/src/main/res/drawable/ic_service_notification.xml b/app/src/main/res/drawable/ic_service_notification.xml
index 314054d999..0fe78b4cee 100644
--- a/app/src/main/res/drawable/ic_service_notification.xml
+++ b/app/src/main/res/drawable/ic_service_notification.xml
@@ -1,33 +1,40 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="48dp"
-    android:width="48dp"
-    android:viewportWidth="48"
-    android:viewportHeight="48">
+    android:height="108dp"
+    android:width="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
     <!--
         https://material.google.com/style/icons.html
     -->
 
-    <!-- Screen border. -->
-    <path android:fillColor="#00000000"
-          android:strokeColor="#FFF"
-          android:strokeWidth="3"
-          android:pathData="M7,4
-                            l34,0
-                            q3 0,3 3
-                            l0,34
-                            q0 3, -3 3
-                            l-34,0
-                            q-3 0, -3-3
-                            l0 -34
-                            q0 -3, 3 -3"
-          />
+    <!-- A circle as the icon border. -->
+    <path
+        android:fillColor="#00000000"
+        android:strokeColor="#FFF"
+        android:strokeWidth="3"
+        android:pathData="M18,54
+                          A36,36 0 1,1 90,54
+                          A36,36 0 1,1 18,54 Z" />
 
-    <!-- Block cursor. -->
-    <path android:fillColor="#FFF"
-          android:pathData="M14,14
-                            l5,0
-                            l0,10
-                            l-5,0"
+    <!-- Keep in sync with ic_foreground.xml: -->
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M34,38
+                          h6
+                          l12,16
+                          l-12,16
+                          h-6
+                          l12,-16
+                          "
+        />
+
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M56,66
+                          h18
+                          v4
+                          h-18
+                          "
         />
 
 </vector>

From 0af823607ac5d6ff282c4eee175e4a533176196c Mon Sep 17 00:00:00 2001
From: Trygve Aaberge <trygveaa@gmail.com>
Date: Tue, 9 Jun 2020 11:17:07 +0200
Subject: [PATCH 090/912] Improvements to extra keys (#1479)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Make popup keys for extra keys row configurable

This makes the keys you get when swiping up on a key configurable. You
can configure such a key by using an array of strings instead of a
single string in the row. The first entry will be the normal key and the
second will be the extra key.

This is a slightly breaking change, as people that have configured
custom extra keys with "-" or "/" will have to change the config to keep
the popup keys. The default config will remain the same in terms of
functionality, i.e. it includes the same popup key for "-".

* Make popup keys interact well with long press keys

This stops the repeat action when the popup is shown, and makes sure the
popup is closed when you release even if there has been some repeat
actions.

* Support configuring the style of the extra keys

This adds a setting for choosing between the different ways to render
key names that were already present in ExtraKeysView.

The available setting values are "arrows-only", "arrows-all", "all",
"none" and "default". Other values will fallback to "default".

Can be used as a workaround for #1410

* Support using modifier keys with letter keys in extra keys

This allows you to use the modifier keys on the extra keys rows, e.g.
ctrl, together with another button on the extra keys rows, as long as
that button is a normal letter and not a special key. Support for
special keys will come in the next commit.

* Support using modifier keys with special keys in extra keys

This allows you to use the modifier keys on the extra keys rows together
with a special key on the extra keys rows, e.g. CTRL+LEFT.

Fixes #745, fixes most of #895 and possibly #154

* Support mapping extra keys to other actions

This adds a setting called extra-keys-map which allows you to map a key
on the extra keys rows to another action. The value is a json object
where the key is the button text as configured in extra-keys and the
value is the action. Multiple actions can be used, but if they are
special characters (like ESC or LEFT) they have to be separated from the
other characters with a space on each side. If you want an actual space
character, use SPACE.

For example if you want to add a key to go to the next active channel in
weechat, you can use this:
    extra-keys-map = {"weechat next": "ESC a"}
And then add "weechat next" to extra-keys. The name can of course be
whatever you want.

Or if you want the button for the UP arrow to show ⇧ instead of ↑, you
can use this:
    extra-keys-map = {"⇧": "UP"}
And put "⇧" in extra-keys instead of "UP".

Modifier keys (ctrl, alt and shift) can't be used in this map yet.
Support for ctrl and alt will come in the next commit.

I think this fixes #1186

* Support CTRL and ALT in extra keys map

This allows you to use CTRL and ALT in extra-keys-map.

For example if you want a button to exit the terminal, you can use this:

    extra-keys-map = {"exit": "CTRL d"}

And add "exit" to extra-keys.

* Support a KEYBOARD button in extra keys

This toggles showing the keyboard input method.

* Support specifying macro keys in the extra-keys option

Instead of specifying macros in the separate extra-keys-map option by
matching the key name in the two options, you can now use "macro"
instead of "key" in extra-keys, and it will be a macro, i.e. a sequence
of multiple keys separated by space.

* Remove option extra-keys-map

Now that you can specify macro in extra-keys, there is no point in
having this separate option. Instead of specifying the value to display
as key, and the macro to perform in extra-keys-map, you would now
specify the value to display in the display property and the macro to
perform in the macro property.

* Lookup display text when creating ExtraKeyButton

This will make it easier to support key aliases for macros in the next
commit.

* Add support for a key to open the drawer

Fixes (I think) #1325
---
 .../java/com/termux/app/ExtraKeysInfos.java   | 338 ++++++++++++++++++
 .../java/com/termux/app/ExtraKeysView.java    | 283 +++++----------
 .../java/com/termux/app/TermuxActivity.java   |   6 +-
 .../com/termux/app/TermuxPreferences.java     |  32 +-
 .../java/com/termux/view/TerminalView.java    |  14 +-
 5 files changed, 460 insertions(+), 213 deletions(-)
 create mode 100644 app/src/main/java/com/termux/app/ExtraKeysInfos.java

diff --git a/app/src/main/java/com/termux/app/ExtraKeysInfos.java b/app/src/main/java/com/termux/app/ExtraKeysInfos.java
new file mode 100644
index 0000000000..86d97449bc
--- /dev/null
+++ b/app/src/main/java/com/termux/app/ExtraKeysInfos.java
@@ -0,0 +1,338 @@
+package com.termux.app;
+
+import androidx.annotation.Nullable;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+public class ExtraKeysInfos {
+
+    /**
+     * Matrix of buttons displayed
+     */
+    private ExtraKeyButton[][] buttons;
+
+    /**
+     * This corresponds to one of the CharMapDisplay below
+     */
+    private String style = "default";
+
+    public ExtraKeysInfos(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);
+    }
+}
+
+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 String key;
+
+    /**
+     * If the key is a macro, i.e. a sequence of keys separated by space.
+     */
+    private boolean macro;
+
+    /**
+     * The text that will be shown on the button.
+     */
+    private String display;
+
+    /**
+     * The information of the popup (triggered by swipe up).
+     */
+    @Nullable
+    private ExtraKeyButton popup = null;
+
+    public ExtraKeyButton(ExtraKeysInfos.CharDisplayMap charDisplayMap, JSONObject config) throws JSONException {
+        this(charDisplayMap, config, null);
+    }
+
+    public ExtraKeyButton(ExtraKeysInfos.CharDisplayMap charDisplayMap, JSONObject config, 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] = ExtraKeysInfos.replaceAlias(keys[i]);
+        }
+
+        this.key = String.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;
+    }
+}
diff --git a/app/src/main/java/com/termux/app/ExtraKeysView.java b/app/src/main/java/com/termux/app/ExtraKeysView.java
index e2f76dc3eb..018c33c6ff 100644
--- a/app/src/main/java/com/termux/app/ExtraKeysView.java
+++ b/app/src/main/java/com/termux/app/ExtraKeysView.java
@@ -1,5 +1,6 @@
 package com.termux.app;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.os.Build;
 import android.provider.Settings;
@@ -13,19 +14,22 @@
 import java.util.HashMap;
 import java.util.Arrays;
 
+import android.view.Gravity;
 import android.view.HapticFeedbackConstants;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.View;
+import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
 import android.widget.GridLayout;
 import android.widget.PopupWindow;
 import android.widget.ToggleButton;
 
 import com.termux.R;
-import com.termux.terminal.TerminalSession;
 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.
@@ -40,26 +44,9 @@ public final class ExtraKeysView extends GridLayout {
     public ExtraKeysView(Context context, AttributeSet attrs) {
         super(context, attrs);
     }
-    
-    /**
-     * 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 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);
@@ -87,45 +74,79 @@ static class CharDisplayMap extends CleverMap<String, String> {}
         put("F11", KeyEvent.KEYCODE_F11);
         put("F12", KeyEvent.KEYCODE_F12);
     }};
-    
-    static void sendKey(View view, String keyName) {
+
+    private void sendKey(View view, String keyName, boolean forceCtrlDown, boolean forceLeftAltDown) {
         TerminalView terminalView = view.findViewById(R.id.terminal_view);
-        if (keyCodesForString.containsKey(keyName)) {
+        if ("KEYBOARD".equals(keyName)) {
+            InputMethodManager imm = (InputMethodManager) getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
+            imm.toggleSoftInput(0, 0);
+        } else if ("DRAWER".equals(keyName)) {
+            DrawerLayout drawer = view.findViewById(R.id.drawer_layout);
+            drawer.openDrawer(Gravity.LEFT);
+        } else if (keyCodesForString.containsKey(keyName)) {
             int keyCode = keyCodesForString.get(keyName);
-            terminalView.onKeyDown(keyCode, new KeyEvent(KeyEvent.ACTION_UP, keyCode));
-            // view.dispatchKeyEvent(new KeyEvent(KeyEvent.ACTION_UP, keyCode));
+            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
-            TerminalSession session = terminalView.getCurrentSession();
-            if (session != null && keyName.length() > 0)
-                session.write(keyName);
+            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;
         ToggleButton button = null;
     }
-    
+
     private Map<SpecialButton, SpecialButtonState> specialButtons = new HashMap<SpecialButton, SpecialButtonState>() {{
         put(SpecialButton.CTRL, new SpecialButtonState());
         put(SpecialButton.ALT, new SpecialButtonState());
         put(SpecialButton.FN, new SpecialButtonState());
     }};
-    
+
     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)
             return false;
 
@@ -166,145 +187,21 @@ void popup(View view, String text) {
         popupWindow.setFocusable(false);
         popupWindow.showAsDropDown(view, 0, -2 * height);
     }
-    
-    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
-    }};
 
-    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
-    }};
-    
-    /**
-     * Keys are displayed in a natural looking way, like "→" for "RIGHT" or "↲" for ENTER
-     */
-    public static final CharDisplayMap defaultCharDisplay = new CharDisplayMap() {{
-        putAll(classicArrowsDisplay);
-        putAll(wellKnownCharactersDisplay);
-        putAll(nicerLookingDisplay);
-        // all other characters are displayed as themselves
-    }};
-    
-    public static final CharDisplayMap lotsOfArrowsCharDisplay = new CharDisplayMap() {{
-        putAll(classicArrowsDisplay);
-        putAll(wellKnownCharactersDisplay);
-        putAll(lessKnownCharactersDisplay); // NEW
-        putAll(nicerLookingDisplay);
-    }};
-    
-    public static final CharDisplayMap arrowsOnlyCharDisplay = new CharDisplayMap() {{
-        putAll(classicArrowsDisplay);
-        // putAll(wellKnownCharactersDisplay); // REMOVED
-        // putAll(lessKnownCharactersDisplay); // REMOVED
-        putAll(nicerLookingDisplay);
-    }};
-    
-    public 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 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", "'");
-    }};
-    
-    /**
-     * Applies the 'controlCharsAliases' mapping to all the strings in *buttons*
-     * Modifies the array, doesn't return a new one.
-     */
-    void replaceAliases(String[][] buttons) {
-        for(int i = 0; i < buttons.length; i++)
-            for(int j = 0; j < buttons[i].length; j++)
-                buttons[i][j] = controlCharsAliases.get(buttons[i][j], buttons[i][j]);
-    }
-    
     /**
      * General util function to compute the longest column length in a matrix.
      */
-    static int maximumLength(String[][] matrix) {
+    static int maximumLength(Object[][] matrix) {
         int m = 0;
-        for (String[] aMatrix : matrix) m = Math.max(m, aMatrix.length);
+        for (Object[] row : matrix)
+            m = Math.max(m, row.length);
         return m;
     }
-    
+
     /**
      * Reload the view given parameters in termux.properties
      *
-     * @param buttons matrix of String as defined in termux.properties extrakeys
+     * @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
@@ -316,36 +213,36 @@ static int maximumLength(String[][] matrix) {
      * "−" will input a "−" character
      * "-_-" will input the string "-_-"
      */
-    void reload(String[][] buttons, CharDisplayMap charDisplayMap) {
+    @SuppressLint("ClickableViewAccessibility")
+    void reload(ExtraKeysInfos infos) {
+        if(infos == null)
+            return;
+
         for(SpecialButtonState state : specialButtons.values())
             state.button = null;
-            
+
         removeAllViews();
-        
-        replaceAliases(buttons); // modifies the array
 
-        final int rows = buttons.length;
-        final int cols = maximumLength(buttons);
+        ExtraKeyButton[][] buttons = infos.getMatrix();
 
-        setRowCount(rows);
-        setColumnCount(cols);
+        setRowCount(buttons.length);
+        setColumnCount(maximumLength(buttons));
 
-        for (int row = 0; row < rows; row++) {
+        for (int row = 0; row < buttons.length; row++) {
             for (int col = 0; col < buttons[row].length; col++) {
-                final String buttonText = buttons[row][col];
-                
+                final ExtraKeyButton buttonInfo = buttons[row][col];
+
                 Button button;
-                if(Arrays.asList("CTRL", "ALT", "FN").contains(buttonText)) {
-                    SpecialButtonState state = specialButtons.get(SpecialButton.valueOf(buttonText)); // for valueOf: https://stackoverflow.com/a/604426/1980630
+                if(Arrays.asList("CTRL", "ALT", "FN").contains(buttonInfo.getKey())) {
+                    SpecialButtonState state = specialButtons.get(SpecialButton.valueOf(buttonInfo.getKey())); // for valueOf: https://stackoverflow.com/a/604426/1980630
                     state.isOn = true;
                     button = state.button = new ToggleButton(getContext(), null, android.R.attr.buttonBarButtonStyle);
                     button.setClickable(true);
                 } else {
                     button = new Button(getContext(), null, android.R.attr.buttonBarButtonStyle);
                 }
-                
-                final String displayedText = charDisplayMap.get(buttonText, buttonText);
-                button.setText(displayedText);
+
+                button.setText(buttonInfo.getDisplay());
                 button.setTextColor(TEXT_COLOR);
                 button.setPadding(0, 0, 0, 0);
 
@@ -365,12 +262,12 @@ void reload(String[][] buttons, CharDisplayMap charDisplayMap) {
                     }
 
                     View root = getRootView();
-                    if(Arrays.asList("CTRL", "ALT", "FN").contains(buttonText)) {
+                    if (Arrays.asList("CTRL", "ALT", "FN").contains(buttonInfo.getKey())) {
                         ToggleButton self = (ToggleButton) finalButton;
                         self.setChecked(self.isChecked());
                         self.setTextColor(self.isChecked() ? INTERESTING_COLOR : TEXT_COLOR);
                     } else {
-                        sendKey(root, buttonText);
+                        sendKey(root, buttonInfo);
                     }
                 });
 
@@ -380,22 +277,26 @@ void reload(String[][] buttons, CharDisplayMap charDisplayMap) {
                         case MotionEvent.ACTION_DOWN:
                             longPressCount = 0;
                             v.setBackgroundColor(BUTTON_PRESSED_COLOR);
-                            if (Arrays.asList("UP", "DOWN", "LEFT", "RIGHT").contains(buttonText)) {
+                            if (Arrays.asList("UP", "DOWN", "LEFT", "RIGHT", "BKSP", "DEL").contains(buttonInfo.getKey())) {
+                                // autorepeat
                                 scheduledExecutor = Executors.newSingleThreadScheduledExecutor();
                                 scheduledExecutor.scheduleWithFixedDelay(() -> {
                                     longPressCount++;
-                                    sendKey(root, buttonText);
+                                    sendKey(root, buttonInfo);
                                 }, 400, 80, TimeUnit.MILLISECONDS);
                             }
                             return true;
 
                         case MotionEvent.ACTION_MOVE:
-                            // These two keys have a Move-Up button appearing
-                            if (Arrays.asList("/", "-").contains(buttonText)) {
+                            if (buttonInfo.getPopup() != null) {
                                 if (popupWindow == null && event.getY() < 0) {
+                                    if (scheduledExecutor != null) {
+                                        scheduledExecutor.shutdownNow();
+                                        scheduledExecutor = null;
+                                    }
                                     v.setBackgroundColor(BUTTON_COLOR);
-                                    String text = "-".equals(buttonText) ? "|" : "\\";
-                                    popup(v, text);
+                                    String extraButtonDisplayedText = buttonInfo.getPopup().getDisplay();
+                                    popup(v, extraButtonDisplayedText);
                                 }
                                 if (popupWindow != null && event.getY() > 0) {
                                     v.setBackgroundColor(BUTTON_PRESSED_COLOR);
@@ -418,12 +319,14 @@ void reload(String[][] buttons, CharDisplayMap charDisplayMap) {
                                 scheduledExecutor.shutdownNow();
                                 scheduledExecutor = null;
                             }
-                            if (longPressCount == 0) {
-                                if (popupWindow != null && Arrays.asList("/", "-").contains(buttonText)) {
+                            if (longPressCount == 0 || popupWindow != null) {
+                                if (popupWindow != null) {
                                     popupWindow.setContentView(null);
                                     popupWindow.dismiss();
                                     popupWindow = null;
-                                    sendKey(root, "-".equals(buttonText) ? "|" : "\\");
+                                    if (buttonInfo.getPopup() != null) {
+                                        sendKey(root, buttonInfo.getPopup());
+                                    }
                                 } else {
                                     v.performClick();
                                 }
diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index ae61b30217..946d693a3b 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -148,7 +148,7 @@ public void onReceive(Context context, Intent intent) {
                 mSettings.reloadFromProperties(TermuxActivity.this);
 
                 if (mExtraKeysView != null) {
-                    mExtraKeysView.reload(mSettings.mExtraKeys, ExtraKeysView.defaultCharDisplay);
+                    mExtraKeysView.reload(mSettings.mExtraKeys);
                 }
             }
         }
@@ -229,7 +229,7 @@ public void onCreate(Bundle bundle) {
 
 
         ViewGroup.LayoutParams layoutParams = viewPager.getLayoutParams();
-        layoutParams.height = layoutParams.height * mSettings.mExtraKeys.length;
+        layoutParams.height = layoutParams.height * (mSettings.mExtraKeys == null ? 0 : mSettings.mExtraKeys.getMatrix().length);
         viewPager.setLayoutParams(layoutParams);
 
         viewPager.setAdapter(new PagerAdapter() {
@@ -250,7 +250,7 @@ public Object instantiateItem(@NonNull ViewGroup collection, int position) {
                 View layout;
                 if (position == 0) {
                     layout = mExtraKeysView = (ExtraKeysView) inflater.inflate(R.layout.extra_keys_main, collection, false);
-                    mExtraKeysView.reload(mSettings.mExtraKeys, ExtraKeysView.defaultCharDisplay);
+                    mExtraKeysView.reload(mSettings.mExtraKeys);
                 } else {
                     layout = inflater.inflate(R.layout.extra_keys_right, collection, false);
                     final EditText editText = layout.findViewById(R.id.text_input);
diff --git a/app/src/main/java/com/termux/app/TermuxPreferences.java b/app/src/main/java/com/termux/app/TermuxPreferences.java
index a23924533d..3703cd0956 100644
--- a/app/src/main/java/com/termux/app/TermuxPreferences.java
+++ b/app/src/main/java/com/termux/app/TermuxPreferences.java
@@ -10,6 +10,7 @@
 import com.termux.terminal.TerminalSession;
 import org.json.JSONArray;
 import org.json.JSONException;
+import org.json.JSONObject;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -19,7 +20,10 @@
 import java.lang.annotation.RetentionPolicy;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.Properties;
 
 import androidx.annotation.IntDef;
@@ -70,7 +74,7 @@ final static class KeyboardShortcut {
     boolean mDisableVolumeVirtualKeys;
     boolean mShowExtraKeys;
 
-    String[][] mExtraKeys;
+    ExtraKeysInfos mExtraKeys;
 
     final List<KeyboardShortcut> shortcuts = new ArrayList<>();
 
@@ -150,7 +154,7 @@ static TerminalSession getCurrentSession(TermuxActivity context) {
         }
         return null;
     }
-    
+
     void reloadFromProperties(Context context) {
         File propsFile = new File(TermuxService.HOME_PATH + "/.termux/termux.properties");
         if (!propsFile.exists())
@@ -192,21 +196,23 @@ void reloadFromProperties(Context context) {
                 mUseDarkUI = nightMode == Configuration.UI_MODE_NIGHT_YES;
         }
 
+        String defaultExtraKeys = "[[ESC, TAB, CTRL, ALT, {key: '-', popup: '|'}, DOWN, UP]]";
+
         try {
-            JSONArray arr = new JSONArray(props.getProperty("extra-keys", "[['ESC', 'TAB', 'CTRL', 'ALT', '-', 'DOWN', 'UP']]"));
-
-            mExtraKeys = new String[arr.length()][];
-            for (int i = 0; i < arr.length(); i++) {
-                JSONArray line = arr.getJSONArray(i);
-                mExtraKeys[i] = new String[line.length()];
-                for (int j = 0; j < line.length(); j++) {
-                    mExtraKeys[i][j] = line.getString(j);
-                }
-            }
+            String extrakeyProp = props.getProperty("extra-keys", defaultExtraKeys);
+            String extraKeysStyle = props.getProperty("extra-keys-style", "default");
+            mExtraKeys = new ExtraKeysInfos(extrakeyProp, extraKeysStyle);
         } catch (JSONException e) {
             Toast.makeText(context, "Could not load the extra-keys property from the config: " + e.toString(), Toast.LENGTH_LONG).show();
             Log.e("termux", "Error loading props", e);
-            mExtraKeys = new String[0][];
+
+            try {
+                mExtraKeys = new ExtraKeysInfos(defaultExtraKeys, "default");
+            } catch (JSONException e2) {
+                e2.printStackTrace();
+                Toast.makeText(context, "Can't create default extra keys", Toast.LENGTH_LONG).show();
+                mExtraKeys = null;
+            }
         }
 
         mBackIsEscape = "escape".equals(props.getProperty("back-key", "back"));
diff --git a/terminal-view/src/main/java/com/termux/view/TerminalView.java b/terminal-view/src/main/java/com/termux/view/TerminalView.java
index 702bd2a413..76f6380ef8 100644
--- a/terminal-view/src/main/java/com/termux/view/TerminalView.java
+++ b/terminal-view/src/main/java/com/termux/view/TerminalView.java
@@ -558,13 +558,13 @@ public boolean onKeyDown(int keyCode, KeyEvent event) {
         }
 
         final int metaState = event.getMetaState();
-        final boolean controlDownFromEvent = event.isCtrlPressed();
-        final boolean leftAltDownFromEvent = (metaState & KeyEvent.META_ALT_LEFT_ON) != 0;
+        final boolean controlDown = event.isCtrlPressed() || mClient.readControlKey();
+        final boolean leftAltDown = (metaState & KeyEvent.META_ALT_LEFT_ON) != 0 || mClient.readAltKey();
         final boolean rightAltDownFromEvent = (metaState & KeyEvent.META_ALT_RIGHT_ON) != 0;
 
         int keyMod = 0;
-        if (controlDownFromEvent) keyMod |= KeyHandler.KEYMOD_CTRL;
-        if (event.isAltPressed()) keyMod |= KeyHandler.KEYMOD_ALT;
+        if (controlDown) keyMod |= KeyHandler.KEYMOD_CTRL;
+        if (event.isAltPressed() || leftAltDown) keyMod |= KeyHandler.KEYMOD_ALT;
         if (event.isShiftPressed()) keyMod |= KeyHandler.KEYMOD_SHIFT;
         if (!event.isFunctionPressed() && handleKeyCode(keyCode, keyMod)) {
             if (LOG_KEY_EVENTS) Log.i(EmulatorDebug.LOG_TAG, "handleKeyCode() took key event");
@@ -592,7 +592,7 @@ public boolean onKeyDown(int keyCode, KeyEvent event) {
         if ((result & KeyCharacterMap.COMBINING_ACCENT) != 0) {
             // If entered combining accent previously, write it out:
             if (mCombiningAccent != 0)
-                inputCodePoint(mCombiningAccent, controlDownFromEvent, leftAltDownFromEvent);
+                inputCodePoint(mCombiningAccent, controlDown, leftAltDown);
             mCombiningAccent = result & KeyCharacterMap.COMBINING_ACCENT_MASK;
         } else {
             if (mCombiningAccent != 0) {
@@ -600,7 +600,7 @@ public boolean onKeyDown(int keyCode, KeyEvent event) {
                 if (combinedChar > 0) result = combinedChar;
                 mCombiningAccent = 0;
             }
-            inputCodePoint(result, controlDownFromEvent, leftAltDownFromEvent);
+            inputCodePoint(result, controlDown, leftAltDown);
         }
 
         if (mCombiningAccent != oldCombiningAccent) invalidate();
@@ -608,7 +608,7 @@ public boolean onKeyDown(int keyCode, KeyEvent event) {
         return true;
     }
 
-    void inputCodePoint(int codePoint, boolean controlDownFromEvent, boolean leftAltDownFromEvent) {
+    public void inputCodePoint(int codePoint, boolean controlDownFromEvent, boolean leftAltDownFromEvent) {
         if (LOG_KEY_EVENTS) {
             Log.i(EmulatorDebug.LOG_TAG, "inputCodePoint(codePoint=" + codePoint + ", controlDownFromEvent=" + controlDownFromEvent + ", leftAltDownFromEvent="
                 + leftAltDownFromEvent + ")");

From 3e04ea4cb038e15a7ed8575362d332497a6a5291 Mon Sep 17 00:00:00 2001
From: Josh Home <josh.g.garrett@gmail.com>
Date: Wed, 1 Apr 2020 15:03:39 -0400
Subject: [PATCH 091/912] Add Log file to view intent #1497

---
 app/src/main/AndroidManifest.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1fbdab95a9..608d34b884 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -79,6 +79,7 @@
                 <action android:name="android.intent.action.VIEW"/>
                 <category android:name="android.intent.category.DEFAULT" />
                 <data android:mimeType="text/*" />
+                <data android:mimeType="application/*log*" />
                 <data android:mimeType="application/json" />
                 <data android:mimeType="application/*xml*" />
                 <data android:mimeType="application/*latex*" />

From 5f71e3e73ae9c0381650a922f45a241fc75a463a Mon Sep 17 00:00:00 2001
From: Trygve Aaberge <trygveaa@gmail.com>
Date: Fri, 28 Feb 2020 22:26:17 +0100
Subject: [PATCH 092/912] Join lines that fills the width when selecting urls

Some terminal applications, like mutt and weechat, prints a newline at
the end of each line even if text is wrapped. This causes urls which are
wrapped to not be selectable in full.

By ignoring newlines when the text fills the entire width of the screen,
those urls can be selected. Many other terminal emulators do this as
well.

A drawback of this is that if a url happens to fill the width of the
screen, the url selection will include the first word of the next line,
but this doesn't happen that often so I think it's an okay tradeoff.

Fixes #313
---
 app/src/main/java/com/termux/app/TermuxActivity.java  |  2 +-
 .../main/java/com/termux/terminal/TerminalBuffer.java | 11 ++++++++++-
 .../java/com/termux/terminal/ScreenBufferTest.java    |  8 ++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index 946d693a3b..129895394b 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -757,7 +757,7 @@ static LinkedHashSet<CharSequence> extractUrls(String text) {
     }
 
     void showUrlSelection() {
-        String text = getCurrentTermSession().getEmulator().getScreen().getTranscriptText();
+        String text = getCurrentTermSession().getEmulator().getScreen().getTranscriptTextWithFullLinesJoined();
         LinkedHashSet<CharSequence> urlSet = extractUrls(text);
         if (urlSet.isEmpty()) {
             new AlertDialog.Builder(this).setMessage(R.string.select_url_no_found).show();
diff --git a/terminal-emulator/src/main/java/com/termux/terminal/TerminalBuffer.java b/terminal-emulator/src/main/java/com/termux/terminal/TerminalBuffer.java
index 4e6add838f..1e3af9dee5 100644
--- a/terminal-emulator/src/main/java/com/termux/terminal/TerminalBuffer.java
+++ b/terminal-emulator/src/main/java/com/termux/terminal/TerminalBuffer.java
@@ -45,11 +45,19 @@ public String getTranscriptTextWithoutJoinedLines() {
         return getSelectedText(0, -getActiveTranscriptRows(), mColumns, mScreenRows, false).trim();
     }
 
+    public String getTranscriptTextWithFullLinesJoined() {
+        return getSelectedText(0, -getActiveTranscriptRows(), mColumns, mScreenRows, true, true).trim();
+    }
+
     public String getSelectedText(int selX1, int selY1, int selX2, int selY2) {
         return getSelectedText(selX1, selY1, selX2, selY2, true);
     }
 
     public String getSelectedText(int selX1, int selY1, int selX2, int selY2, boolean joinBackLines) {
+        return getSelectedText(selX1, selY1, selX2, selY2, true, false);
+    }
+
+    public String getSelectedText(int selX1, int selY1, int selX2, int selY2, boolean joinBackLines, boolean joinFullLines) {
         final StringBuilder builder = new StringBuilder();
         final int columns = mColumns;
 
@@ -87,7 +95,8 @@ public String getSelectedText(int selX1, int selY1, int selX2, int selY2, boolea
             }
             if (lastPrintingCharIndex != -1)
                 builder.append(line, x1Index, lastPrintingCharIndex - x1Index + 1);
-            if ((!joinBackLines || !rowLineWrap)
+            boolean lineFillsWidth = lastPrintingCharIndex == x2Index - 1;
+            if ((!joinBackLines || !rowLineWrap) && (!joinFullLines || !lineFillsWidth)
                 && row < selY2 && row < mScreenRows - 1) builder.append('\n');
         }
         return builder.toString();
diff --git a/terminal-emulator/src/test/java/com/termux/terminal/ScreenBufferTest.java b/terminal-emulator/src/test/java/com/termux/terminal/ScreenBufferTest.java
index 08de2905c7..23942bf517 100644
--- a/terminal-emulator/src/test/java/com/termux/terminal/ScreenBufferTest.java
+++ b/terminal-emulator/src/test/java/com/termux/terminal/ScreenBufferTest.java
@@ -37,4 +37,12 @@ public void testGetSelectedText() {
 		withTerminalSized(5, 3).enterString("ABCDE\r\nFGHIJ").assertLinesAre("ABCDE", "FGHIJ", "     ");
 		assertEquals("ABCDE\nFG", mTerminal.getSelectedText(0, 0, 1, 1));
 	}
+
+	public void testGetSelectedTextJoinFullLines() {
+		withTerminalSized(5, 3).enterString("ABCDE\r\nFG");
+		assertEquals("ABCDEFG", mTerminal.getScreen().getSelectedText(0, 0, 1, 1, true, true));
+
+		withTerminalSized(5, 3).enterString("ABC\r\nFG");
+		assertEquals("ABC\nFG", mTerminal.getScreen().getSelectedText(0, 0, 1, 1, true, true));
+	}
 }

From db3ff7b24a2cb8c84b00cc5cec083361018569a1 Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Tue, 9 Jun 2020 15:32:22 +0300
Subject: [PATCH 093/912] Provide a service for executing commands by
 third-party applications

Re-implementation of https://github.com/termux/termux-app/pull/1029.

If Termux has property "allow-external-apps" set to "true", a third-party
program will be able to send intents for executing custom commands
within Termux environment.

Third-party program must declare permission "com.termux.permission.RUN_COMMAND".
---
 app/src/main/AndroidManifest.xml              | 15 ++++
 .../main/java/com/termux/app/RunCommand.java  | 88 +++++++++++++++++++
 app/src/main/res/values/strings.xml           |  2 +
 3 files changed, 105 insertions(+)
 create mode 100644 app/src/main/java/com/termux/app/RunCommand.java

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 608d34b884..bb6ced2c89 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -8,6 +8,12 @@
     <uses-feature android:name="android.hardware.touchscreen" android:required="false" />
     <uses-feature android:name="android.software.leanback" android:required="false" />
 
+    <permission android:name="com.termux.permission.RUN_COMMAND"
+        android:label="@string/run_command_permission_label"
+        android:description="@string/run_command_permission_description"
+        android:icon="@drawable/ic_launcher"
+        android:protectionLevel="dangerous" />
+
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
@@ -114,6 +120,15 @@
             android:name="com.termux.app.TermuxService"
             android:exported="false" />
 
+        <service
+            android:name=".app.RunCommand"
+            android:exported="true"
+            android:permission="com.termux.permission.RUN_COMMAND" >
+            <intent-filter>
+                <action android:name="com.termux.RUN_COMMAND" />
+            </intent-filter>
+        </service>
+
         <receiver android:name=".app.TermuxOpenReceiver" />
 
         <provider android:authorities="com.termux.files"
diff --git a/app/src/main/java/com/termux/app/RunCommand.java b/app/src/main/java/com/termux/app/RunCommand.java
new file mode 100644
index 0000000000..a7776190a2
--- /dev/null
+++ b/app/src/main/java/com/termux/app/RunCommand.java
@@ -0,0 +1,88 @@
+package com.termux.app;
+
+import android.app.Service;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Binder;
+import android.os.Build;
+import android.os.IBinder;
+import android.util.Log;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
+import java.util.Properties;
+
+/**
+ * When allow-external-apps property is set to "true", Termux is able to process execute intents
+ * sent by third-party applications.
+ *
+ * Third-party program must declare com.termux.permission.RUN_COMMAND permission.
+ *
+ * Intent expects following configuration:
+ *
+ * Action: com.termux.RUN_COMMAND
+ * Program/script path (string): com.termux.RUN_COMMAND_PATH
+ * Program/script arguments (string): com.termux.RUN_COMMAND_ARGUMENTS
+ * Session working directory (string): com.termux.RUN_COMMAND_WORKDIR
+ *
+ * Sample intent for launching program "top" in equivalent of ADB command:
+ * am startservice -a com.termux.RUN_COMMAND --es com.termux.RUN_COMMAND_PATH /data/data/com.termux/files/usr/bin/top
+ */
+public class RunCommand extends Service {
+
+    public static final String RUN_COMMAND_ACTION = "com.termux.RUN_COMMAND";
+    public static final String RUN_COMMAND_PATH = "com.termux.RUN_COMMAND_PATH";
+    public static final String RUN_COMMAND_ARGUMENTS = "com.termux.RUN_COMMAND_ARGUMENTS";
+    public static final String RUN_COMMAND_WORKDIR = "com.termux.RUN_COMMAND_WORKDIR";
+
+    class LocalBinder extends Binder {
+        public final RunCommand service = RunCommand.this;
+    }
+
+    private final IBinder mBinder = new RunCommand.LocalBinder();
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        return mBinder;
+    }
+
+    public int onStartCommand(Intent intent, int flags, int startId) {
+        if (allowExternalApps() && RUN_COMMAND_ACTION.equals(intent.getAction())) {
+            Uri programUri = new Uri.Builder().scheme("com.termux.file").path(intent.getStringExtra(RUN_COMMAND_PATH)).build();
+
+            Intent execIntent = new Intent(TermuxService.ACTION_EXECUTE, programUri);
+            execIntent.setClass(this, TermuxService.class);
+            execIntent.putExtra(TermuxService.EXTRA_ARGUMENTS, intent.getStringExtra(RUN_COMMAND_ARGUMENTS));
+            execIntent.putExtra(TermuxService.EXTRA_CURRENT_WORKING_DIRECTORY, intent.getStringExtra(RUN_COMMAND_WORKDIR));
+
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                this.startForegroundService(execIntent);
+            } else {
+                this.startService(execIntent);
+            }
+        }
+
+        return Service.START_NOT_STICKY;
+    }
+
+    private boolean allowExternalApps() {
+        File propsFile = new File(TermuxService.HOME_PATH + "/.termux/termux.properties");
+        if (!propsFile.exists())
+            propsFile = new File(TermuxService.HOME_PATH + "/.config/termux/termux.properties");
+
+        Properties props = new Properties();
+        try {
+            if (propsFile.isFile() && propsFile.canRead()) {
+                try (FileInputStream in = new FileInputStream(propsFile)) {
+                    props.load(new InputStreamReader(in, StandardCharsets.UTF_8));
+                }
+            }
+        } catch (Exception e) {
+            Log.e("termux", "Error loading props", e);
+        }
+
+        return props.getProperty("allow-external-apps", "false").equals("true");
+    }
+}
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 42ac4af8ae..d3a16a54ed 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2,6 +2,8 @@
 <resources>
     <string name="application_name">Termux</string>
     <string name="shared_user_label">Termux user</string>
+    <string name="run_command_permission_label">Run commands in Termux environment</string>
+    <string name="run_command_permission_description">Allow third-party applications to execute arbitrary commands within Termux environment.</string>
     <string name="new_session">New session</string>
     <string name="new_session_failsafe">Failsafe</string>
     <string name="toggle_soft_keyboard">Keyboard</string>

From 5b32540635d9243e573f2ef3ca126150424ab712 Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Tue, 9 Jun 2020 15:48:56 +0300
Subject: [PATCH 094/912] minor refactoring: RunCommand => RunCommandService

---
 app/src/main/AndroidManifest.xml                            | 2 +-
 .../termux/app/{RunCommand.java => RunCommandService.java}  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename app/src/main/java/com/termux/app/{RunCommand.java => RunCommandService.java} (94%)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index bb6ced2c89..b293037649 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -121,7 +121,7 @@
             android:exported="false" />
 
         <service
-            android:name=".app.RunCommand"
+            android:name=".app.RunCommandService"
             android:exported="true"
             android:permission="com.termux.permission.RUN_COMMAND" >
             <intent-filter>
diff --git a/app/src/main/java/com/termux/app/RunCommand.java b/app/src/main/java/com/termux/app/RunCommandService.java
similarity index 94%
rename from app/src/main/java/com/termux/app/RunCommand.java
rename to app/src/main/java/com/termux/app/RunCommandService.java
index a7776190a2..d3a601f27d 100644
--- a/app/src/main/java/com/termux/app/RunCommand.java
+++ b/app/src/main/java/com/termux/app/RunCommandService.java
@@ -30,7 +30,7 @@
  * Sample intent for launching program "top" in equivalent of ADB command:
  * am startservice -a com.termux.RUN_COMMAND --es com.termux.RUN_COMMAND_PATH /data/data/com.termux/files/usr/bin/top
  */
-public class RunCommand extends Service {
+public class RunCommandService extends Service {
 
     public static final String RUN_COMMAND_ACTION = "com.termux.RUN_COMMAND";
     public static final String RUN_COMMAND_PATH = "com.termux.RUN_COMMAND_PATH";
@@ -38,10 +38,10 @@ public class RunCommand extends Service {
     public static final String RUN_COMMAND_WORKDIR = "com.termux.RUN_COMMAND_WORKDIR";
 
     class LocalBinder extends Binder {
-        public final RunCommand service = RunCommand.this;
+        public final RunCommandService service = RunCommandService.this;
     }
 
-    private final IBinder mBinder = new RunCommand.LocalBinder();
+    private final IBinder mBinder = new RunCommandService.LocalBinder();
 
     @Override
     public IBinder onBind(Intent intent) {

From 2c5534e2c1fc90ee2cd35099b39151b45d6ebc52 Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Tue, 9 Jun 2020 16:06:56 +0300
Subject: [PATCH 095/912] RunCommandService: update information about usage

---
 .../java/com/termux/app/RunCommandService.java | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/com/termux/app/RunCommandService.java b/app/src/main/java/com/termux/app/RunCommandService.java
index d3a601f27d..42174657f1 100644
--- a/app/src/main/java/com/termux/app/RunCommandService.java
+++ b/app/src/main/java/com/termux/app/RunCommandService.java
@@ -18,17 +18,15 @@
  * When allow-external-apps property is set to "true", Termux is able to process execute intents
  * sent by third-party applications.
  *
- * Third-party program must declare com.termux.permission.RUN_COMMAND permission.
+ * Third-party program must declare com.termux.permission.RUN_COMMAND permission and it should be
+ * granted by user.
  *
- * Intent expects following configuration:
- *
- * Action: com.termux.RUN_COMMAND
- * Program/script path (string): com.termux.RUN_COMMAND_PATH
- * Program/script arguments (string): com.termux.RUN_COMMAND_ARGUMENTS
- * Session working directory (string): com.termux.RUN_COMMAND_WORKDIR
- *
- * Sample intent for launching program "top" in equivalent of ADB command:
- * am startservice -a com.termux.RUN_COMMAND --es com.termux.RUN_COMMAND_PATH /data/data/com.termux/files/usr/bin/top
+ * Sample code to run command "top":
+ *   Intent intent = new Intent();
+ *   intent.setClassName("com.termux", "com.termux.app.RunCommandService");
+ *   intent.setAction("com.termux.RUN_COMMAND");
+ *   intent.putExtra("com.termux.RUN_COMMAND_PATH", "/data/data/com.termux/files/usr/bin/top");
+ *   startService(intent);
  */
 public class RunCommandService extends Service {
 

From 72981fb9816fa39462f88c8bfc382ed3761f4e31 Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Tue, 9 Jun 2020 21:47:11 +0300
Subject: [PATCH 096/912] Use vector drawables for text selection handle

https://github.com/termux/termux-app/issues/1036
---
 .../text_select_handle_left_mtrl_alpha.png      | Bin 2032 -> 0 bytes
 .../text_select_handle_right_mtrl_alpha.png     | Bin 15200 -> 0 bytes
 .../text_select_handle_left_material.xml        |  14 ++++++++++----
 .../text_select_handle_right_material.xml       |  14 ++++++++++----
 4 files changed, 20 insertions(+), 8 deletions(-)
 delete mode 100644 terminal-view/src/main/res/drawable-xxhdpi/text_select_handle_left_mtrl_alpha.png
 delete mode 100644 terminal-view/src/main/res/drawable-xxhdpi/text_select_handle_right_mtrl_alpha.png

diff --git a/terminal-view/src/main/res/drawable-xxhdpi/text_select_handle_left_mtrl_alpha.png b/terminal-view/src/main/res/drawable-xxhdpi/text_select_handle_left_mtrl_alpha.png
deleted file mode 100644
index 39818db88613816bb4d17a85de435af254937567..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2032
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
O0000<MNUMnLSTXqRlEiO

diff --git a/terminal-view/src/main/res/drawable-xxhdpi/text_select_handle_right_mtrl_alpha.png b/terminal-view/src/main/res/drawable-xxhdpi/text_select_handle_right_mtrl_alpha.png
deleted file mode 100644
index 260e090bb2040ba2d59c22b1a7e654dd3eb2a87d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 15200
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
PyaQ{ksJ0B68@K)!N!r*i

diff --git a/terminal-view/src/main/res/drawable/text_select_handle_left_material.xml b/terminal-view/src/main/res/drawable/text_select_handle_left_material.xml
index 89733d5df0..576ff4a968 100644
--- a/terminal-view/src/main/res/drawable/text_select_handle_left_material.xml
+++ b/terminal-view/src/main/res/drawable/text_select_handle_left_material.xml
@@ -1,4 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-        android:src="@drawable/text_select_handle_left_mtrl_alpha"
-        android:tint="#2196F3" />
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="24dp"
+    android:viewportWidth="132"
+    android:viewportHeight="66">
+  <path
+      android:pathData="M52.3,1.6c-5.7,2.1 -12.9,8.6 -16,14.8 -2.2,4.1 -2.8,6.9 -3.1,14.3 -0.6,12.6 1.3,17.8 9.3,25.8 8,8 13.2,9.9 25.8,9.3 11.1,-0.5 17.3,-3.2 23.5,-10.3 6.5,-7.4 7.2,-10.8 7.2,-34.7l0,-20.8 -21.2,0.1c-16.1,-0 -22.3,0.4 -25.5,1.5z"
+      android:fillColor="#2196F3"
+      android:strokeColor="#00000000"/>
+</vector>
diff --git a/terminal-view/src/main/res/drawable/text_select_handle_right_material.xml b/terminal-view/src/main/res/drawable/text_select_handle_right_material.xml
index 21a2cb87d4..d049d3a8a9 100644
--- a/terminal-view/src/main/res/drawable/text_select_handle_right_material.xml
+++ b/terminal-view/src/main/res/drawable/text_select_handle_right_material.xml
@@ -1,4 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-        android:src="@drawable/text_select_handle_right_mtrl_alpha"
-        android:tint="#2196F3" />
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="24dp"
+    android:viewportWidth="132"
+    android:viewportHeight="66">
+  <path
+      android:pathData="M33,20.8c0,23.9 0.7,27.3 7.2,34.7 6.2,7.1 12.4,9.8 23.5,10.3 12.6,0.6 17.8,-1.3 25.8,-9.3 8,-8 9.9,-13.2 9.3,-25.8 -0.5,-11.1 -3.2,-17.3 -10.3,-23.5 -7.4,-6.5 -10.8,-7.2 -34.7,-7.2l-20.8,-0 0,20.8z"
+      android:fillColor="#2196F3"
+      android:strokeColor="#00000000"/>
+</vector>

From 6cf742460c1d99027ab5c8393a3665a919dc684e Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Tue, 9 Jun 2020 22:54:19 +0300
Subject: [PATCH 097/912] extra keys: make popup & pressed button no longer
 transparent

Fixes visual issue when popup overlaps text of upper row.
---
 app/src/main/java/com/termux/app/ExtraKeysView.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/termux/app/ExtraKeysView.java b/app/src/main/java/com/termux/app/ExtraKeysView.java
index 018c33c6ff..b568703333 100644
--- a/app/src/main/java/com/termux/app/ExtraKeysView.java
+++ b/app/src/main/java/com/termux/app/ExtraKeysView.java
@@ -39,7 +39,7 @@ 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 = 0x7FFFFFFF;
+    private static final int BUTTON_PRESSED_COLOR = 0xFF7F7F7F;
 
     public ExtraKeysView(Context context, AttributeSet attrs) {
         super(context, attrs);

From 664ec43f94d3e7f3227b216a65bbae80c889114a Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Tue, 9 Jun 2020 23:08:23 +0300
Subject: [PATCH 098/912] version 0.95

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 53fd0ef8a4..63278dc0d8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -17,8 +17,8 @@ android {
         applicationId "com.termux"
         minSdkVersion 24
         targetSdkVersion 28
-        versionCode 94
-        versionName "0.94"
+        versionCode 95
+        versionName "0.95"
 
         externalNativeBuild {
             ndkBuild {

From 2224d917a331b2e77dd299b9d02c87d8f4ab7610 Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Wed, 17 Jun 2020 14:08:58 +0300
Subject: [PATCH 099/912] update ndk version

---
 app/build.gradle               | 2 +-
 terminal-emulator/build.gradle | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 63278dc0d8..be59ac90ae 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -4,7 +4,7 @@ plugins {
 
 android {
     compileSdkVersion 28
-    ndkVersion '21.2.6472646'
+    ndkVersion '21.3.6528147'
 
     dependencies {
         implementation "androidx.annotation:annotation:1.1.0"
diff --git a/terminal-emulator/build.gradle b/terminal-emulator/build.gradle
index a69359dcfd..d54d185e86 100644
--- a/terminal-emulator/build.gradle
+++ b/terminal-emulator/build.gradle
@@ -18,7 +18,7 @@ ext {
 
 android {
     compileSdkVersion 28
-    ndkVersion '21.2.6472646'
+    ndkVersion '21.3.6528147'
 
     defaultConfig {
         minSdkVersion 21

From 8d302aa9fe03ebb61fa729cc03336fd49fb0db68 Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Fri, 19 Jun 2020 22:13:16 +0300
Subject: [PATCH 100/912] fix am on Android R

---
 app/src/main/java/com/termux/app/BackgroundJob.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/java/com/termux/app/BackgroundJob.java b/app/src/main/java/com/termux/app/BackgroundJob.java
index 2b1888aa04..92735feefb 100644
--- a/app/src/main/java/com/termux/app/BackgroundJob.java
+++ b/app/src/main/java/com/termux/app/BackgroundJob.java
@@ -148,6 +148,8 @@ static String[] buildEnvironment(boolean failSafe, String cwd) {
         // Samsung S7 - see https://plus.google.com/110070148244138185604/posts/gp8Lk3aCGp3.
         environment.add("EXTERNAL_STORAGE=" + System.getenv("EXTERNAL_STORAGE"));
         // ANDROID_RUNTIME_ROOT and ANDROID_TZDATA_ROOT are required for `am` to run on Android Q
+        addToEnvIfPresent(environment, "ANDROID_ART_ROOT");
+        addToEnvIfPresent(environment, "ANDROID_I18N_ROOT");
         addToEnvIfPresent(environment, "ANDROID_RUNTIME_ROOT");
         addToEnvIfPresent(environment, "ANDROID_TZDATA_ROOT");
         if (failSafe) {

From fc04a93990eae1ac8b78d216b853f753b93a7bcf Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Fri, 19 Jun 2020 22:15:57 +0300
Subject: [PATCH 101/912] get rid of Android 5 legacy stuff

We don't need LD_LIBRARY_PATH as of Android 7.0.
---
 .../java/com/termux/app/BackgroundJob.java    | 21 +++----------------
 1 file changed, 3 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/com/termux/app/BackgroundJob.java b/app/src/main/java/com/termux/app/BackgroundJob.java
index 92735feefb..0e16607ccf 100644
--- a/app/src/main/java/com/termux/app/BackgroundJob.java
+++ b/app/src/main/java/com/termux/app/BackgroundJob.java
@@ -147,18 +147,17 @@ static String[] buildEnvironment(boolean failSafe, String cwd) {
         // EXTERNAL_STORAGE is needed for /system/bin/am to work on at least
         // Samsung S7 - see https://plus.google.com/110070148244138185604/posts/gp8Lk3aCGp3.
         environment.add("EXTERNAL_STORAGE=" + System.getenv("EXTERNAL_STORAGE"));
-        // ANDROID_RUNTIME_ROOT and ANDROID_TZDATA_ROOT are required for `am` to run on Android Q
+
+        // These variables are needed if running on Android 10 and higher.
         addToEnvIfPresent(environment, "ANDROID_ART_ROOT");
         addToEnvIfPresent(environment, "ANDROID_I18N_ROOT");
         addToEnvIfPresent(environment, "ANDROID_RUNTIME_ROOT");
         addToEnvIfPresent(environment, "ANDROID_TZDATA_ROOT");
+
         if (failSafe) {
             // Keep the default path so that system binaries can be used in the failsafe session.
             environment.add("PATH= " + System.getenv("PATH"));
         } else {
-            if (shouldAddLdLibraryPath()) {
-                environment.add("LD_LIBRARY_PATH=" + TermuxService.PREFIX_PATH + "/lib");
-            }
             environment.add("LANG=en_US.UTF-8");
             environment.add("PATH=" + TermuxService.PREFIX_PATH + "/bin:" + TermuxService.PREFIX_PATH + "/bin/applets");
             environment.add("PWD=" + cwd);
@@ -168,20 +167,6 @@ static String[] buildEnvironment(boolean failSafe, String cwd) {
         return environment.toArray(new String[0]);
     }
 
-    private static boolean shouldAddLdLibraryPath() {
-        try (BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(TermuxService.PREFIX_PATH + "/etc/apt/sources.list")))) {
-            String line;
-            while ((line = in.readLine()) != null) {
-                if (!line.startsWith("#") && line.contains("//termux.net stable")) {
-                    return true;
-                }
-            }
-        } catch (IOException e) {
-            Log.e(LOG_TAG, "Error trying to read sources.list", e);
-        }
-        return false;
-    }
-
     public static int getPid(Process p) {
         try {
             Field f = p.getClass().getDeclaredField("pid");

From 33def928cf9bada2a6d44101f20ee4d8d4e71085 Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Fri, 19 Jun 2020 22:25:22 +0300
Subject: [PATCH 102/912] add DEX2OATBOOTCLASSPATH environment variable

---
 app/src/main/java/com/termux/app/BackgroundJob.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/com/termux/app/BackgroundJob.java b/app/src/main/java/com/termux/app/BackgroundJob.java
index 0e16607ccf..d4d7b3c8fd 100644
--- a/app/src/main/java/com/termux/app/BackgroundJob.java
+++ b/app/src/main/java/com/termux/app/BackgroundJob.java
@@ -150,6 +150,7 @@ static String[] buildEnvironment(boolean failSafe, String cwd) {
 
         // These variables are needed if running on Android 10 and higher.
         addToEnvIfPresent(environment, "ANDROID_ART_ROOT");
+        addToEnvIfPresent(environment, "DEX2OATBOOTCLASSPATH");
         addToEnvIfPresent(environment, "ANDROID_I18N_ROOT");
         addToEnvIfPresent(environment, "ANDROID_RUNTIME_ROOT");
         addToEnvIfPresent(environment, "ANDROID_TZDATA_ROOT");

From 930029b5d273cfeebbd095c27d0720b78a03fa89 Mon Sep 17 00:00:00 2001
From: "Felix C. Stegerman" <flx@obfusk.net>
Date: Mon, 22 Jun 2020 00:48:36 +0200
Subject: [PATCH 103/912] export COLORTERM=truecolor

---
 app/src/main/java/com/termux/app/BackgroundJob.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/com/termux/app/BackgroundJob.java b/app/src/main/java/com/termux/app/BackgroundJob.java
index d4d7b3c8fd..657cce7df6 100644
--- a/app/src/main/java/com/termux/app/BackgroundJob.java
+++ b/app/src/main/java/com/termux/app/BackgroundJob.java
@@ -139,6 +139,7 @@ static String[] buildEnvironment(boolean failSafe, String cwd) {
         List<String> environment = new ArrayList<>();
 
         environment.add("TERM=xterm-256color");
+        environment.add("COLORTERM=truecolor");
         environment.add("HOME=" + TermuxService.HOME_PATH);
         environment.add("PREFIX=" + TermuxService.PREFIX_PATH);
         environment.add("BOOTCLASSPATH=" + System.getenv("BOOTCLASSPATH"));

From f33ebf810f9fb62931c07eca8134335fcc92ed99 Mon Sep 17 00:00:00 2001
From: Danny Lin <danny@kdrag0n.dev>
Date: Fri, 3 Jul 2020 21:08:36 -0700
Subject: [PATCH 104/912] Fix selection rendering with alternate cursor styles

There is currently a bug where selection rendering is broken if the
active cursor shape is anything other than the default solid box.
Selected text is normally highlighted by effectively rendering a cursor
over all of the characters in the selection region, but if the cursor is
a bar, the resulting selection highlight is too narrow to cover the full
width of the selection. Similarly, if the cursor is an underline, all of
the selected text will be underlined instead of highlighted.

To fix this issue, treat selections different from cursors in the
rendering logic and force the renderer to always use the block cursor
style for rendering selections. That way, we get correct behavior
regardless of what the current cursor shape is.
---
 .../java/com/termux/view/TerminalRenderer.java  | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/terminal-view/src/main/java/com/termux/view/TerminalRenderer.java b/terminal-view/src/main/java/com/termux/view/TerminalRenderer.java
index 8c12ad55d9..7a1824413c 100644
--- a/terminal-view/src/main/java/com/termux/view/TerminalRenderer.java
+++ b/terminal-view/src/main/java/com/termux/view/TerminalRenderer.java
@@ -86,6 +86,7 @@ public final void render(TerminalEmulator mEmulator, Canvas canvas, int topRow,
 
             long lastRunStyle = 0;
             boolean lastRunInsideCursor = false;
+            boolean lastRunInsideSelection = false;
             int lastRunStartColumn = -1;
             int lastRunStartIndex = 0;
             boolean lastRunFontWidthMismatch = false;
@@ -98,7 +99,8 @@ public final void render(TerminalEmulator mEmulator, Canvas canvas, int topRow,
                 final int charsForCodePoint = charIsHighsurrogate ? 2 : 1;
                 final int codePoint = charIsHighsurrogate ? Character.toCodePoint(charAtIndex, line[currentCharIndex + 1]) : charAtIndex;
                 final int codePointWcWidth = WcWidth.width(codePoint);
-                final boolean insideCursor = (column >= selx1 && column <= selx2) || (cursorX == column || (codePointWcWidth == 2 && cursorX == column + 1));
+                final boolean insideCursor = (cursorX == column || (codePointWcWidth == 2 && cursorX == column + 1));
+                final boolean insideSelection = column >= selx1 && column <= selx2;
                 final long style = lineObject.getStyle(column);
 
                 // Check if the measured text width for this code point is not the same as that expected by wcwidth().
@@ -109,20 +111,22 @@ public final void render(TerminalEmulator mEmulator, Canvas canvas, int topRow,
                     currentCharIndex, charsForCodePoint);
                 final boolean fontWidthMismatch = Math.abs(measuredCodePointWidth / mFontWidth - codePointWcWidth) > 0.01;
 
-                if (style != lastRunStyle || insideCursor != lastRunInsideCursor || fontWidthMismatch || lastRunFontWidthMismatch) {
+                if (style != lastRunStyle || insideCursor != lastRunInsideCursor || insideSelection != lastRunInsideSelection || fontWidthMismatch || lastRunFontWidthMismatch) {
                     if (column == 0) {
                         // Skip first column as there is nothing to draw, just record the current style.
                     } else {
                         final int columnWidthSinceLastRun = column - lastRunStartColumn;
                         final int charsSinceLastRun = currentCharIndex - lastRunStartIndex;
-                        int cursorColor = lastRunInsideCursor ? mEmulator.mColors.mCurrentColors[TextStyle.COLOR_INDEX_CURSOR] : 0;
+                        int cursorColor = (lastRunInsideCursor || lastRunInsideSelection) ? mEmulator.mColors.mCurrentColors[TextStyle.COLOR_INDEX_CURSOR] : 0;
+                        int cursorStyle = lastRunInsideSelection ? TerminalEmulator.CURSOR_STYLE_BLOCK : cursorShape;
                         drawTextRun(canvas, line, palette, heightOffset, lastRunStartColumn, columnWidthSinceLastRun,
                             lastRunStartIndex, charsSinceLastRun, measuredWidthForRun,
-                            cursorColor, cursorShape, lastRunStyle, reverseVideo);
+                            cursorColor, cursorStyle, lastRunStyle, reverseVideo);
                     }
                     measuredWidthForRun = 0.f;
                     lastRunStyle = style;
                     lastRunInsideCursor = insideCursor;
+                    lastRunInsideSelection = insideSelection;
                     lastRunStartColumn = column;
                     lastRunStartIndex = currentCharIndex;
                     lastRunFontWidthMismatch = fontWidthMismatch;
@@ -139,9 +143,10 @@ public final void render(TerminalEmulator mEmulator, Canvas canvas, int topRow,
 
             final int columnWidthSinceLastRun = columns - lastRunStartColumn;
             final int charsSinceLastRun = currentCharIndex - lastRunStartIndex;
-            int cursorColor = lastRunInsideCursor ? mEmulator.mColors.mCurrentColors[TextStyle.COLOR_INDEX_CURSOR] : 0;
+            int cursorColor = (lastRunInsideCursor || lastRunInsideSelection) ? mEmulator.mColors.mCurrentColors[TextStyle.COLOR_INDEX_CURSOR] : 0;
+            int cursorStyle = lastRunInsideSelection ? TerminalEmulator.CURSOR_STYLE_BLOCK : cursorShape;
             drawTextRun(canvas, line, palette, heightOffset, lastRunStartColumn, columnWidthSinceLastRun, lastRunStartIndex, charsSinceLastRun,
-                measuredWidthForRun, cursorColor, cursorShape, lastRunStyle, reverseVideo);
+                measuredWidthForRun, cursorColor, cursorStyle, lastRunStyle, reverseVideo);
         }
     }
 

From 0910844896475418dc28ebfd2d3bae43528d5b26 Mon Sep 17 00:00:00 2001
From: Danny Lin <danny@kdrag0n.dev>
Date: Sat, 4 Jul 2020 01:15:14 -0700
Subject: [PATCH 105/912] Invert selected text instead of highlighting

Highlighting text in the terminal often makes it hard to read, which
can be problematic for users who want to adjust or review selections
before copying them. For example, the default theme makes white and
green text hard to read on its light gray selection background, and
there are plenty of other themes where the choice of text and cursor
colors would hinder selection readability.

To fix this issue and make selected text more legible in nearly all
combinations of colors, invert selected text instead of highlighting it.
This is more common among terminal emulators anyway:
    Invert:    xterm, fbcon, kitty, Konsole, Alacritty, Tilix,
               gnome-terminal (7)
    Highlight: Termux, Terminal.app, iTerm2, Windows Terminal (4)
---
 .../main/java/com/termux/view/TerminalRenderer.java    | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/terminal-view/src/main/java/com/termux/view/TerminalRenderer.java b/terminal-view/src/main/java/com/termux/view/TerminalRenderer.java
index 7a1824413c..92df53f895 100644
--- a/terminal-view/src/main/java/com/termux/view/TerminalRenderer.java
+++ b/terminal-view/src/main/java/com/termux/view/TerminalRenderer.java
@@ -117,11 +117,10 @@ public final void render(TerminalEmulator mEmulator, Canvas canvas, int topRow,
                     } else {
                         final int columnWidthSinceLastRun = column - lastRunStartColumn;
                         final int charsSinceLastRun = currentCharIndex - lastRunStartIndex;
-                        int cursorColor = (lastRunInsideCursor || lastRunInsideSelection) ? mEmulator.mColors.mCurrentColors[TextStyle.COLOR_INDEX_CURSOR] : 0;
-                        int cursorStyle = lastRunInsideSelection ? TerminalEmulator.CURSOR_STYLE_BLOCK : cursorShape;
+                        int cursorColor = lastRunInsideCursor ? mEmulator.mColors.mCurrentColors[TextStyle.COLOR_INDEX_CURSOR] : 0;
                         drawTextRun(canvas, line, palette, heightOffset, lastRunStartColumn, columnWidthSinceLastRun,
                             lastRunStartIndex, charsSinceLastRun, measuredWidthForRun,
-                            cursorColor, cursorStyle, lastRunStyle, reverseVideo);
+                            cursorColor, cursorShape, lastRunStyle, reverseVideo || lastRunInsideSelection);
                     }
                     measuredWidthForRun = 0.f;
                     lastRunStyle = style;
@@ -143,10 +142,9 @@ public final void render(TerminalEmulator mEmulator, Canvas canvas, int topRow,
 
             final int columnWidthSinceLastRun = columns - lastRunStartColumn;
             final int charsSinceLastRun = currentCharIndex - lastRunStartIndex;
-            int cursorColor = (lastRunInsideCursor || lastRunInsideSelection) ? mEmulator.mColors.mCurrentColors[TextStyle.COLOR_INDEX_CURSOR] : 0;
-            int cursorStyle = lastRunInsideSelection ? TerminalEmulator.CURSOR_STYLE_BLOCK : cursorShape;
+            int cursorColor = lastRunInsideCursor ? mEmulator.mColors.mCurrentColors[TextStyle.COLOR_INDEX_CURSOR] : 0;
             drawTextRun(canvas, line, palette, heightOffset, lastRunStartColumn, columnWidthSinceLastRun, lastRunStartIndex, charsSinceLastRun,
-                measuredWidthForRun, cursorColor, cursorStyle, lastRunStyle, reverseVideo);
+                measuredWidthForRun, cursorColor, cursorShape, lastRunStyle, reverseVideo || lastRunInsideSelection);
         }
     }
 

From 51370799c765d1774abac61a6f2eedf09156d211 Mon Sep 17 00:00:00 2001
From: Egor Zhdanov <egor.zhd@gmail.com>
Date: Tue, 14 Jul 2020 13:03:17 +0700
Subject: [PATCH 106/912] update notification icon

---
 .../res/drawable/ic_service_notification.xml  | 48 +++++++------------
 1 file changed, 16 insertions(+), 32 deletions(-)

diff --git a/app/src/main/res/drawable/ic_service_notification.xml b/app/src/main/res/drawable/ic_service_notification.xml
index 0fe78b4cee..205dcfc0c3 100644
--- a/app/src/main/res/drawable/ic_service_notification.xml
+++ b/app/src/main/res/drawable/ic_service_notification.xml
@@ -1,40 +1,24 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="108dp"
-    android:width="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <!--
-        https://material.google.com/style/icons.html
+        Updated notification icon compliant with system icons guidelines
+        https://material.io/design/iconography/system-icons.html
     -->
 
-    <!-- A circle as the icon border. -->
-    <path
-        android:fillColor="#00000000"
-        android:strokeColor="#FFF"
-        android:strokeWidth="3"
-        android:pathData="M18,54
-                          A36,36 0 1,1 90,54
-                          A36,36 0 1,1 18,54 Z" />
+    <group>
+        <clip-path
+            android:pathData="M0,0h24v24h-24z"/>
 
-    <!-- Keep in sync with ic_foreground.xml: -->
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M34,38
-                          h6
-                          l12,16
-                          l-12,16
-                          h-6
-                          l12,-16
-                          "
-        />
+        <path
+            android:pathData="M5,4H2L8,12L2,20H5L11,12L5,4Z"
+            android:fillColor="#ffffff"/>
 
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M56,66
-                          h18
-                          v4
-                          h-18
-                          "
-        />
+        <path
+            android:pathData="M13,18H22V20H13V18Z"
+            android:fillColor="#ffffff"/>
 
+    </group>
 </vector>

From 9e7029b76ad63091a5920fbec0d08fe94c1f5785 Mon Sep 17 00:00:00 2001
From: Agnostic Apollo <agnosticapollo@gmail.com>
Date: Thu, 30 Jul 2020 22:42:52 +0500
Subject: [PATCH 107/912] Receive "RUN_COMMAND_ARGUMENTS" extra for
 "RUN_COMMAND_ACTION" intent as a string array extra instead of a string extra
 since TermuxService expects it that way.

Added "RUN_COMMAND_BACKGROUND" boolean extra so that Termux session can be started in background
when running a command.

Updated usage docs.

Check #1029 for details.
---
 .../com/termux/app/RunCommandService.java     | 24 +++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/termux/app/RunCommandService.java b/app/src/main/java/com/termux/app/RunCommandService.java
index 42174657f1..2a57864d89 100644
--- a/app/src/main/java/com/termux/app/RunCommandService.java
+++ b/app/src/main/java/com/termux/app/RunCommandService.java
@@ -15,18 +15,32 @@
 import java.util.Properties;
 
 /**
- * When allow-external-apps property is set to "true", Termux is able to process execute intents
- * sent by third-party applications.
+ * When allow-external-apps property is set to "true" in ~/.termux/termux.properties, Termux 
+ * is able to process execute intents sent by third-party applications.
  *
  * Third-party program must declare com.termux.permission.RUN_COMMAND permission and it should be
  * granted by user.
+ * Full path of command or script must be given in "RUN_COMMAND_PATH" extra.
+ * The "RUN_COMMAND_ARGUMENTS", "RUN_COMMAND_WORKDIR" and "RUN_COMMAND_BACKGROUND" extras are 
+ * optional. The background mode defaults to false.
  *
- * Sample code to run command "top":
+ * Sample code to run command "top" with java:
  *   Intent intent = new Intent();
  *   intent.setClassName("com.termux", "com.termux.app.RunCommandService");
  *   intent.setAction("com.termux.RUN_COMMAND");
  *   intent.putExtra("com.termux.RUN_COMMAND_PATH", "/data/data/com.termux/files/usr/bin/top");
+ *   intent.putExtra("com.termux.RUN_COMMAND_ARGUMENTS", new String[]{"-n", "5"});
+ *   intent.putExtra("com.termux.RUN_COMMAND_WORKDIR", "/data/data/com.termux/files/home");
+ *   intent.putExtra("com.termux.RUN_COMMAND_BACKGROUND", false);
  *   startService(intent);
+ *
+ * Sample code to run command "top" with "am startservice" command:
+ * am startservice --user 0 -n com.termux/com.termux.app.RunCommandService 
+ * -a com.termux.RUN_COMMAND 
+ * --es com.termux.RUN_COMMAND_PATH '/data/data/com.termux/files/usr/bin/top' 
+ * --esa com.termux.RUN_COMMAND_ARGUMENTS '-n,5' 
+ * --es com.termux.RUN_COMMAND_WORKDIR '/data/data/com.termux/files/home'
+ * --ez com.termux.RUN_COMMAND_BACKGROUND 'false'
  */
 public class RunCommandService extends Service {
 
@@ -34,6 +48,7 @@ public class RunCommandService extends Service {
     public static final String RUN_COMMAND_PATH = "com.termux.RUN_COMMAND_PATH";
     public static final String RUN_COMMAND_ARGUMENTS = "com.termux.RUN_COMMAND_ARGUMENTS";
     public static final String RUN_COMMAND_WORKDIR = "com.termux.RUN_COMMAND_WORKDIR";
+    public static final String RUN_COMMAND_BACKGROUND = "com.termux.RUN_COMMAND_BACKGROUND";
 
     class LocalBinder extends Binder {
         public final RunCommandService service = RunCommandService.this;
@@ -52,8 +67,9 @@ public int onStartCommand(Intent intent, int flags, int startId) {
 
             Intent execIntent = new Intent(TermuxService.ACTION_EXECUTE, programUri);
             execIntent.setClass(this, TermuxService.class);
-            execIntent.putExtra(TermuxService.EXTRA_ARGUMENTS, intent.getStringExtra(RUN_COMMAND_ARGUMENTS));
+            execIntent.putExtra(TermuxService.EXTRA_ARGUMENTS, intent.getStringArrayExtra(RUN_COMMAND_ARGUMENTS));
             execIntent.putExtra(TermuxService.EXTRA_CURRENT_WORKING_DIRECTORY, intent.getStringExtra(RUN_COMMAND_WORKDIR));
+            execIntent.putExtra(TermuxService.EXTRA_EXECUTE_IN_BACKGROUND, intent.getBooleanExtra(RUN_COMMAND_BACKGROUND, false));
 
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                 this.startForegroundService(execIntent);

From b2ff0e4051867959de6d615a66df12aa700468d6 Mon Sep 17 00:00:00 2001
From: Agnostic Apollo <agnosticapollo@gmail.com>
Date: Thu, 30 Jul 2020 23:01:08 +0500
Subject: [PATCH 108/912] Changed static string "EXTRA_EXECUTE_IN_BACKGROUND"
 access to public

---
 app/src/main/java/com/termux/app/TermuxService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/termux/app/TermuxService.java b/app/src/main/java/com/termux/app/TermuxService.java
index bbaf87c548..514910b3bf 100644
--- a/app/src/main/java/com/termux/app/TermuxService.java
+++ b/app/src/main/java/com/termux/app/TermuxService.java
@@ -63,7 +63,7 @@ public final class TermuxService extends Service implements SessionChangedCallba
     public static final String EXTRA_ARGUMENTS = "com.termux.execute.arguments";
 
     public static final String EXTRA_CURRENT_WORKING_DIRECTORY = "com.termux.execute.cwd";
-    private static final String EXTRA_EXECUTE_IN_BACKGROUND = "com.termux.execute.background";
+    public static final String EXTRA_EXECUTE_IN_BACKGROUND = "com.termux.execute.background";
 
     /** This service is only bound from inside the same process and never uses IPC. */
     class LocalBinder extends Binder {

From debbe4480945ec9db59ea9fdec88abfbf479e29c Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Thu, 30 Jul 2020 23:47:26 +0300
Subject: [PATCH 109/912] update bootstrap archives

---
 app/build.gradle | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index be59ac90ae..7704727b2a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -133,11 +133,11 @@ clean {
 
 task downloadBootstraps(){
     doLast {
-        def version = 25
-        downloadBootstrap("aarch64", "633baa1f7edfd81f6064338a68d1149aa203d4b24cbc4f7c64283aaca109609e", version)
-        downloadBootstrap("arm",     "a581a22e0d79a0e8cef9395b1bd951ba066ac2d688522e17cca0b3e1c0649daa", version)
-        downloadBootstrap("i686",    "8288e13f0a6ddeb2ff9406d8f968a8930a58e9318d09fadb2b7c8970a034cfdc", version)
-        downloadBootstrap("x86_64",  "c99b80a18d6bbb64c24c5a64d6ee6b8d4306729ebd172662b807bcb4a46dd39a", version)
+        def version = 26
+        downloadBootstrap("aarch64", "c7830de73aa437933aef1957bdea29640afa34ca292fd7e27a6bdd1c9271bfe3", version)
+        downloadBootstrap("arm",     "d6c250d853ef235da6f64ee946018cfaca1ca5a416d2ce0bdd82d97c35972bc5", version)
+        downloadBootstrap("i686",    "d1b272e022a6bbee9d6bff024f1e42d26c58d0d3dfe64ca68846b94b40db352d", version)
+        downloadBootstrap("x86_64",  "866793074541aa1ead0927affc8f1b5279a2cf9d683688a8379e6090754e077e", version)
     }
 }
 

From 6f24628fd221d8aeeddc125d686d27a23894865d Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Thu, 30 Jul 2020 23:56:27 +0300
Subject: [PATCH 110/912] version 0.96

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 7704727b2a..d0781f5ead 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -17,8 +17,8 @@ android {
         applicationId "com.termux"
         minSdkVersion 24
         targetSdkVersion 28
-        versionCode 95
-        versionName "0.95"
+        versionCode 96
+        versionName "0.96"
 
         externalNativeBuild {
             ndkBuild {

From 04268f4c20e4fb87b8c5c0bd44dd5111979635d0 Mon Sep 17 00:00:00 2001
From: cn <cool_navy@qq.com>
Date: Tue, 4 Aug 2020 20:36:14 +0800
Subject: [PATCH 111/912] move sdk version configs to gradle.properties (#1685)

---
 app/build.gradle               | 8 ++++----
 gradle.properties              | 5 +++++
 terminal-emulator/build.gradle | 8 ++++----
 terminal-view/build.gradle     | 6 +++---
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index d0781f5ead..1570764573 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -3,8 +3,8 @@ plugins {
 }
 
 android {
-    compileSdkVersion 28
-    ndkVersion '21.3.6528147'
+    compileSdkVersion project.properties.compileSdkVersion.toInteger()
+    ndkVersion project.properties.ndkVersion
 
     dependencies {
         implementation "androidx.annotation:annotation:1.1.0"
@@ -15,8 +15,8 @@ android {
 
     defaultConfig {
         applicationId "com.termux"
-        minSdkVersion 24
-        targetSdkVersion 28
+        minSdkVersion project.properties.minSdkVersion.toInteger()
+        targetSdkVersion project.properties.targetSdkVersion.toInteger()
         versionCode 96
         versionName "0.96"
 
diff --git a/gradle.properties b/gradle.properties
index e9645a397d..945ab5d248 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -14,3 +14,8 @@
 # org.gradle.parallel=true
 org.gradle.jvmargs=-Xmx2048M
 android.useAndroidX=true
+
+minSdkVersion=24
+targetSdkVersion=28
+ndkVersion=21.3.6528147
+compileSdkVersion=28
diff --git a/terminal-emulator/build.gradle b/terminal-emulator/build.gradle
index d54d185e86..4b37b79226 100644
--- a/terminal-emulator/build.gradle
+++ b/terminal-emulator/build.gradle
@@ -17,12 +17,12 @@ ext {
 }
 
 android {
-    compileSdkVersion 28
-    ndkVersion '21.3.6528147'
+    compileSdkVersion project.properties.compileSdkVersion.toInteger()
+    ndkVersion project.properties.ndkVersion
 
     defaultConfig {
-        minSdkVersion 21
-        targetSdkVersion 28
+        minSdkVersion project.properties.minSdkVersion.toInteger()
+        targetSdkVersion project.properties.targetSdkVersion.toInteger()
 
         externalNativeBuild {
             ndkBuild {
diff --git a/terminal-view/build.gradle b/terminal-view/build.gradle
index 3aad164402..6c672ddbdd 100644
--- a/terminal-view/build.gradle
+++ b/terminal-view/build.gradle
@@ -17,7 +17,7 @@ ext {
 }
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion project.properties.compileSdkVersion.toInteger()
 
     dependencies {
         implementation "androidx.annotation:annotation:1.1.0"
@@ -25,8 +25,8 @@ android {
     }
 
     defaultConfig {
-        minSdkVersion 21
-        targetSdkVersion 28
+        minSdkVersion project.properties.minSdkVersion.toInteger()
+        targetSdkVersion project.properties.targetSdkVersion.toInteger()
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 

From 507527336234adb9146aad40a3d5160f71ea2c91 Mon Sep 17 00:00:00 2001
From: hannesa2 <hannes.software@gmx.at>
Date: Tue, 4 Aug 2020 14:36:41 +0200
Subject: [PATCH 112/912] Android Studio 4.0.1 (#1687)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index bc822d6bcd..d803478dbb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.3'
+        classpath 'com.android.tools.build:gradle:4.0.1'
     }
 }
 

From b68bd107c11f24c70c702bd989844a68a20a8a6c Mon Sep 17 00:00:00 2001
From: hannesa2 <hannes.software@gmx.at>
Date: Tue, 4 Aug 2020 14:37:18 +0200
Subject: [PATCH 113/912] Gradle 6.5.1 (#1686)

---
 gradle/wrapper/gradle-wrapper.jar        | Bin 58695 -> 58910 bytes
 gradle/wrapper/gradle-wrapper.properties |   2 +-
 gradlew                                  |   2 ++
 gradlew.bat                              |   1 +
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index f3d88b1c2faf2fc91d853cd5d4242b5547257070..62d4c053550b91381bbd28b1afc82d634bf73a8a 100644
GIT binary patch
delta 12524
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

delta 12163
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

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a2bf1313b8..bb8b2fc26b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 2fe81a7d95..fbd7c51583 100755
--- a/gradlew
+++ b/gradlew
@@ -82,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -129,6 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
diff --git a/gradlew.bat b/gradlew.bat
index 9109989e3c..a9f778a7a9 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -84,6 +84,7 @@ set CMD_LINE_ARGS=%*
 
 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 %CMD_LINE_ARGS%
 

From bd7ed289811a570601cdfa4e3998996856df37d9 Mon Sep 17 00:00:00 2001
From: lucy phipps <landfillbaby@users.noreply.github.com>
Date: Fri, 7 Aug 2020 06:57:39 +0100
Subject: [PATCH 114/912] update WcWidth.java, add note about c version

---
 .../java/com/termux/terminal/WcWidth.java     | 671 ++++++++++--------
 1 file changed, 364 insertions(+), 307 deletions(-)

diff --git a/terminal-emulator/src/main/java/com/termux/terminal/WcWidth.java b/terminal-emulator/src/main/java/com/termux/terminal/WcWidth.java
index 35410e3e98..25660b30e8 100644
--- a/terminal-emulator/src/main/java/com/termux/terminal/WcWidth.java
+++ b/terminal-emulator/src/main/java/com/termux/terminal/WcWidth.java
@@ -4,212 +4,225 @@
  * Implementation of wcwidth(3) for Unicode 9.
  *
  * Implementation from https://github.com/jquast/wcwidth but we return 0 for unprintable characters.
+ *
+ * IMPORTANT:
+ * Must be kept in sync with the following:
+ * https://github.com/termux/wcwidth
+ * https://github.com/termux/libandroid-support
+ * https://github.com/termux/termux-packages/tree/master/libandroid-support
  */
 public final class WcWidth {
 
     // From https://github.com/jquast/wcwidth/blob/master/wcwidth/table_zero.py
-    // t commit 0d7de112202cc8b2ebe9232ff4a5c954f19d561a (2016-07-02):
+    // at commit b29897e5a1b403a0e36f7fc991614981cbc42475 (2020-07-14):
     private static final int[][] ZERO_WIDTH = {
-        {0x0300, 0x036f},  // Combining Grave Accent  ..Combining Latin Small Le
-        {0x0483, 0x0489},  // Combining Cyrillic Titlo..Combining Cyrillic Milli
-        {0x0591, 0x05bd},  // Hebrew Accent Etnahta   ..Hebrew Point Meteg
-        {0x05bf, 0x05bf},  // Hebrew Point Rafe       ..Hebrew Point Rafe
-        {0x05c1, 0x05c2},  // Hebrew Point Shin Dot   ..Hebrew Point Sin Dot
-        {0x05c4, 0x05c5},  // Hebrew Mark Upper Dot   ..Hebrew Mark Lower Dot
-        {0x05c7, 0x05c7},  // Hebrew Point Qamats Qata..Hebrew Point Qamats Qata
-        {0x0610, 0x061a},  // Arabic Sign Sallallahou ..Arabic Small Kasra
-        {0x064b, 0x065f},  // Arabic Fathatan         ..Arabic Wavy Hamza Below
-        {0x0670, 0x0670},  // Arabic Letter Superscrip..Arabic Letter Superscrip
-        {0x06d6, 0x06dc},  // Arabic Small High Ligatu..Arabic Small High Seen
-        {0x06df, 0x06e4},  // Arabic Small High Rounde..Arabic Small High Madda
-        {0x06e7, 0x06e8},  // Arabic Small High Yeh   ..Arabic Small High Noon
-        {0x06ea, 0x06ed},  // Arabic Empty Centre Low ..Arabic Small Low Meem
-        {0x0711, 0x0711},  // Syriac Letter Superscrip..Syriac Letter Superscrip
-        {0x0730, 0x074a},  // Syriac Pthaha Above     ..Syriac Barrekh
-        {0x07a6, 0x07b0},  // Thaana Abafili          ..Thaana Sukun
-        {0x07eb, 0x07f3},  // Nko Combining Sh||t High..Nko Combining Double Dot
-        {0x0816, 0x0819},  // Samaritan Mark In       ..Samaritan Mark Dagesh
-        {0x081b, 0x0823},  // Samaritan Mark Epentheti..Samaritan Vowel Sign A
-        {0x0825, 0x0827},  // Samaritan Vowel Sign Sho..Samaritan Vowel Sign U
-        {0x0829, 0x082d},  // Samaritan Vowel Sign Lon..Samaritan Mark Nequdaa
-        {0x0859, 0x085b},  // Mandaic Affrication Mark..Mandaic Gemination Mark
-        {0x08d4, 0x08e1},  // (nil)                   ..
-        {0x08e3, 0x0902},  // Arabic Turned Damma Belo..Devanagari Sign Anusvara
-        {0x093a, 0x093a},  // Devanagari Vowel Sign Oe..Devanagari Vowel Sign Oe
-        {0x093c, 0x093c},  // Devanagari Sign Nukta   ..Devanagari Sign Nukta
-        {0x0941, 0x0948},  // Devanagari Vowel Sign U ..Devanagari Vowel Sign Ai
-        {0x094d, 0x094d},  // Devanagari Sign Virama  ..Devanagari Sign Virama
-        {0x0951, 0x0957},  // Devanagari Stress Sign U..Devanagari Vowel Sign Uu
-        {0x0962, 0x0963},  // Devanagari Vowel Sign Vo..Devanagari Vowel Sign Vo
-        {0x0981, 0x0981},  // Bengali Sign Candrabindu..Bengali Sign Candrabindu
-        {0x09bc, 0x09bc},  // Bengali Sign Nukta      ..Bengali Sign Nukta
-        {0x09c1, 0x09c4},  // Bengali Vowel Sign U    ..Bengali Vowel Sign Vocal
-        {0x09cd, 0x09cd},  // Bengali Sign Virama     ..Bengali Sign Virama
-        {0x09e2, 0x09e3},  // Bengali Vowel Sign Vocal..Bengali Vowel Sign Vocal
-        {0x0a01, 0x0a02},  // Gurmukhi Sign Adak Bindi..Gurmukhi Sign Bindi
-        {0x0a3c, 0x0a3c},  // Gurmukhi Sign Nukta     ..Gurmukhi Sign Nukta
-        {0x0a41, 0x0a42},  // Gurmukhi Vowel Sign U   ..Gurmukhi Vowel Sign Uu
-        {0x0a47, 0x0a48},  // Gurmukhi Vowel Sign Ee  ..Gurmukhi Vowel Sign Ai
-        {0x0a4b, 0x0a4d},  // Gurmukhi Vowel Sign Oo  ..Gurmukhi Sign Virama
-        {0x0a51, 0x0a51},  // Gurmukhi Sign Udaat     ..Gurmukhi Sign Udaat
-        {0x0a70, 0x0a71},  // Gurmukhi Tippi          ..Gurmukhi Addak
-        {0x0a75, 0x0a75},  // Gurmukhi Sign Yakash    ..Gurmukhi Sign Yakash
-        {0x0a81, 0x0a82},  // Gujarati Sign Candrabind..Gujarati Sign Anusvara
-        {0x0abc, 0x0abc},  // Gujarati Sign Nukta     ..Gujarati Sign Nukta
-        {0x0ac1, 0x0ac5},  // Gujarati Vowel Sign U   ..Gujarati Vowel Sign Cand
-        {0x0ac7, 0x0ac8},  // Gujarati Vowel Sign E   ..Gujarati Vowel Sign Ai
-        {0x0acd, 0x0acd},  // Gujarati Sign Virama    ..Gujarati Sign Virama
-        {0x0ae2, 0x0ae3},  // Gujarati Vowel Sign Voca..Gujarati Vowel Sign Voca
-        {0x0b01, 0x0b01},  // ||iya Sign Candrabindu  ..||iya Sign Candrabindu
-        {0x0b3c, 0x0b3c},  // ||iya Sign Nukta        ..||iya Sign Nukta
-        {0x0b3f, 0x0b3f},  // ||iya Vowel Sign I      ..||iya Vowel Sign I
-        {0x0b41, 0x0b44},  // ||iya Vowel Sign U      ..||iya Vowel Sign Vocalic
-        {0x0b4d, 0x0b4d},  // ||iya Sign Virama       ..||iya Sign Virama
-        {0x0b56, 0x0b56},  // ||iya Ai Length Mark    ..||iya Ai Length Mark
-        {0x0b62, 0x0b63},  // ||iya Vowel Sign Vocalic..||iya Vowel Sign Vocalic
-        {0x0b82, 0x0b82},  // Tamil Sign Anusvara     ..Tamil Sign Anusvara
-        {0x0bc0, 0x0bc0},  // Tamil Vowel Sign Ii     ..Tamil Vowel Sign Ii
-        {0x0bcd, 0x0bcd},  // Tamil Sign Virama       ..Tamil Sign Virama
-        {0x0c00, 0x0c00},  // Telugu Sign Combining Ca..Telugu Sign Combining Ca
-        {0x0c3e, 0x0c40},  // Telugu Vowel Sign Aa    ..Telugu Vowel Sign Ii
-        {0x0c46, 0x0c48},  // Telugu Vowel Sign E     ..Telugu Vowel Sign Ai
-        {0x0c4a, 0x0c4d},  // Telugu Vowel Sign O     ..Telugu Sign Virama
-        {0x0c55, 0x0c56},  // Telugu Length Mark      ..Telugu Ai Length Mark
-        {0x0c62, 0x0c63},  // Telugu Vowel Sign Vocali..Telugu Vowel Sign Vocali
-        {0x0c81, 0x0c81},  // Kannada Sign Candrabindu..Kannada Sign Candrabindu
-        {0x0cbc, 0x0cbc},  // Kannada Sign Nukta      ..Kannada Sign Nukta
-        {0x0cbf, 0x0cbf},  // Kannada Vowel Sign I    ..Kannada Vowel Sign I
-        {0x0cc6, 0x0cc6},  // Kannada Vowel Sign E    ..Kannada Vowel Sign E
-        {0x0ccc, 0x0ccd},  // Kannada Vowel Sign Au   ..Kannada Sign Virama
-        {0x0ce2, 0x0ce3},  // Kannada Vowel Sign Vocal..Kannada Vowel Sign Vocal
-        {0x0d01, 0x0d01},  // Malayalam Sign Candrabin..Malayalam Sign Candrabin
-        {0x0d41, 0x0d44},  // Malayalam Vowel Sign U  ..Malayalam Vowel Sign Voc
-        {0x0d4d, 0x0d4d},  // Malayalam Sign Virama   ..Malayalam Sign Virama
-        {0x0d62, 0x0d63},  // Malayalam Vowel Sign Voc..Malayalam Vowel Sign Voc
-        {0x0dca, 0x0dca},  // Sinhala Sign Al-lakuna  ..Sinhala Sign Al-lakuna
-        {0x0dd2, 0x0dd4},  // Sinhala Vowel Sign Ketti..Sinhala Vowel Sign Ketti
-        {0x0dd6, 0x0dd6},  // Sinhala Vowel Sign Diga ..Sinhala Vowel Sign Diga
-        {0x0e31, 0x0e31},  // Thai Character Mai Han-a..Thai Character Mai Han-a
-        {0x0e34, 0x0e3a},  // Thai Character Sara I   ..Thai Character Phinthu
-        {0x0e47, 0x0e4e},  // Thai Character Maitaikhu..Thai Character Yamakkan
-        {0x0eb1, 0x0eb1},  // Lao Vowel Sign Mai Kan  ..Lao Vowel Sign Mai Kan
-        {0x0eb4, 0x0eb9},  // Lao Vowel Sign I        ..Lao Vowel Sign Uu
-        {0x0ebb, 0x0ebc},  // Lao Vowel Sign Mai Kon  ..Lao Semivowel Sign Lo
-        {0x0ec8, 0x0ecd},  // Lao Tone Mai Ek         ..Lao Niggahita
-        {0x0f18, 0x0f19},  // Tibetan Astrological Sig..Tibetan Astrological Sig
-        {0x0f35, 0x0f35},  // Tibetan Mark Ngas Bzung ..Tibetan Mark Ngas Bzung
-        {0x0f37, 0x0f37},  // Tibetan Mark Ngas Bzung ..Tibetan Mark Ngas Bzung
-        {0x0f39, 0x0f39},  // Tibetan Mark Tsa -phru  ..Tibetan Mark Tsa -phru
-        {0x0f71, 0x0f7e},  // Tibetan Vowel Sign Aa   ..Tibetan Sign Rjes Su Nga
-        {0x0f80, 0x0f84},  // Tibetan Vowel Sign Rever..Tibetan Mark Halanta
-        {0x0f86, 0x0f87},  // Tibetan Sign Lci Rtags  ..Tibetan Sign Yang Rtags
-        {0x0f8d, 0x0f97},  // Tibetan Subjoined Sign L..Tibetan Subjoined Letter
-        {0x0f99, 0x0fbc},  // Tibetan Subjoined Letter..Tibetan Subjoined Letter
-        {0x0fc6, 0x0fc6},  // Tibetan Symbol Padma Gda..Tibetan Symbol Padma Gda
-        {0x102d, 0x1030},  // Myanmar Vowel Sign I    ..Myanmar Vowel Sign Uu
-        {0x1032, 0x1037},  // Myanmar Vowel Sign Ai   ..Myanmar Sign Dot Below
-        {0x1039, 0x103a},  // Myanmar Sign Virama     ..Myanmar Sign Asat
-        {0x103d, 0x103e},  // Myanmar Consonant Sign M..Myanmar Consonant Sign M
-        {0x1058, 0x1059},  // Myanmar Vowel Sign Vocal..Myanmar Vowel Sign Vocal
-        {0x105e, 0x1060},  // Myanmar Consonant Sign M..Myanmar Consonant Sign M
-        {0x1071, 0x1074},  // Myanmar Vowel Sign Geba ..Myanmar Vowel Sign Kayah
-        {0x1082, 0x1082},  // Myanmar Consonant Sign S..Myanmar Consonant Sign S
-        {0x1085, 0x1086},  // Myanmar Vowel Sign Shan ..Myanmar Vowel Sign Shan
-        {0x108d, 0x108d},  // Myanmar Sign Shan Counci..Myanmar Sign Shan Counci
-        {0x109d, 0x109d},  // Myanmar Vowel Sign Aiton..Myanmar Vowel Sign Aiton
-        {0x135d, 0x135f},  // Ethiopic Combining Gemin..Ethiopic Combining Gemin
-        {0x1712, 0x1714},  // Tagalog Vowel Sign I    ..Tagalog Sign Virama
-        {0x1732, 0x1734},  // Hanunoo Vowel Sign I    ..Hanunoo Sign Pamudpod
-        {0x1752, 0x1753},  // Buhid Vowel Sign I      ..Buhid Vowel Sign U
-        {0x1772, 0x1773},  // Tagbanwa Vowel Sign I   ..Tagbanwa Vowel Sign U
-        {0x17b4, 0x17b5},  // Khmer Vowel Inherent Aq ..Khmer Vowel Inherent Aa
-        {0x17b7, 0x17bd},  // Khmer Vowel Sign I      ..Khmer Vowel Sign Ua
-        {0x17c6, 0x17c6},  // Khmer Sign Nikahit      ..Khmer Sign Nikahit
-        {0x17c9, 0x17d3},  // Khmer Sign Muusikatoan  ..Khmer Sign Bathamasat
-        {0x17dd, 0x17dd},  // Khmer Sign Atthacan     ..Khmer Sign Atthacan
-        {0x180b, 0x180d},  // Mongolian Free Variation..Mongolian Free Variation
-        {0x1885, 0x1886},  // Mongolian Letter Ali Gal..Mongolian Letter Ali Gal
-        {0x18a9, 0x18a9},  // Mongolian Letter Ali Gal..Mongolian Letter Ali Gal
-        {0x1920, 0x1922},  // Limbu Vowel Sign A      ..Limbu Vowel Sign U
-        {0x1927, 0x1928},  // Limbu Vowel Sign E      ..Limbu Vowel Sign O
-        {0x1932, 0x1932},  // Limbu Small Letter Anusv..Limbu Small Letter Anusv
-        {0x1939, 0x193b},  // Limbu Sign Mukphreng    ..Limbu Sign Sa-i
-        {0x1a17, 0x1a18},  // Buginese Vowel Sign I   ..Buginese Vowel Sign U
-        {0x1a1b, 0x1a1b},  // Buginese Vowel Sign Ae  ..Buginese Vowel Sign Ae
-        {0x1a56, 0x1a56},  // Tai Tham Consonant Sign ..Tai Tham Consonant Sign
-        {0x1a58, 0x1a5e},  // Tai Tham Sign Mai Kang L..Tai Tham Consonant Sign
-        {0x1a60, 0x1a60},  // Tai Tham Sign Sakot     ..Tai Tham Sign Sakot
-        {0x1a62, 0x1a62},  // Tai Tham Vowel Sign Mai ..Tai Tham Vowel Sign Mai
-        {0x1a65, 0x1a6c},  // Tai Tham Vowel Sign I   ..Tai Tham Vowel Sign Oa B
-        {0x1a73, 0x1a7c},  // Tai Tham Vowel Sign Oa A..Tai Tham Sign Khuen-lue
-        {0x1a7f, 0x1a7f},  // Tai Tham Combining Crypt..Tai Tham Combining Crypt
-        {0x1ab0, 0x1abe},  // Combining Doubled Circum..Combining Parentheses Ov
-        {0x1b00, 0x1b03},  // Balinese Sign Ulu Ricem ..Balinese Sign Surang
-        {0x1b34, 0x1b34},  // Balinese Sign Rerekan   ..Balinese Sign Rerekan
-        {0x1b36, 0x1b3a},  // Balinese Vowel Sign Ulu ..Balinese Vowel Sign Ra R
-        {0x1b3c, 0x1b3c},  // Balinese Vowel Sign La L..Balinese Vowel Sign La L
-        {0x1b42, 0x1b42},  // Balinese Vowel Sign Pepe..Balinese Vowel Sign Pepe
-        {0x1b6b, 0x1b73},  // Balinese Musical Symbol ..Balinese Musical Symbol
-        {0x1b80, 0x1b81},  // Sundanese Sign Panyecek ..Sundanese Sign Panglayar
-        {0x1ba2, 0x1ba5},  // Sundanese Consonant Sign..Sundanese Vowel Sign Pan
-        {0x1ba8, 0x1ba9},  // Sundanese Vowel Sign Pam..Sundanese Vowel Sign Pan
-        {0x1bab, 0x1bad},  // Sundanese Sign Virama   ..Sundanese Consonant Sign
-        {0x1be6, 0x1be6},  // Batak Sign Tompi        ..Batak Sign Tompi
-        {0x1be8, 0x1be9},  // Batak Vowel Sign Pakpak ..Batak Vowel Sign Ee
-        {0x1bed, 0x1bed},  // Batak Vowel Sign Karo O ..Batak Vowel Sign Karo O
-        {0x1bef, 0x1bf1},  // Batak Vowel Sign U F|| S..Batak Consonant Sign H
-        {0x1c2c, 0x1c33},  // Lepcha Vowel Sign E     ..Lepcha Consonant Sign T
-        {0x1c36, 0x1c37},  // Lepcha Sign Ran         ..Lepcha Sign Nukta
-        {0x1cd0, 0x1cd2},  // Vedic Tone Karshana     ..Vedic Tone Prenkha
-        {0x1cd4, 0x1ce0},  // Vedic Sign Yajurvedic Mi..Vedic Tone Rigvedic Kash
-        {0x1ce2, 0x1ce8},  // Vedic Sign Visarga Svari..Vedic Sign Visarga Anuda
-        {0x1ced, 0x1ced},  // Vedic Sign Tiryak       ..Vedic Sign Tiryak
-        {0x1cf4, 0x1cf4},  // Vedic Tone Candra Above ..Vedic Tone Candra Above
-        {0x1cf8, 0x1cf9},  // Vedic Tone Ring Above   ..Vedic Tone Double Ring A
-        {0x1dc0, 0x1df5},  // Combining Dotted Grave A..Combining Up Tack Above
-        {0x1dfb, 0x1dff},  // (nil)                   ..Combining Right Arrowhea
-        {0x20d0, 0x20f0},  // Combining Left Harpoon A..Combining Asterisk Above
-        {0x2cef, 0x2cf1},  // Coptic Combining Ni Abov..Coptic Combining Spiritu
-        {0x2d7f, 0x2d7f},  // Tifinagh Consonant Joine..Tifinagh Consonant Joine
-        {0x2de0, 0x2dff},  // Combining Cyrillic Lette..Combining Cyrillic Lette
-        {0x302a, 0x302d},  // Ideographic Level Tone M..Ideographic Entering Ton
-        {0x3099, 0x309a},  // Combining Katakana-hirag..Combining Katakana-hirag
-        {0xa66f, 0xa672},  // Combining Cyrillic Vzmet..Combining Cyrillic Thous
-        {0xa674, 0xa67d},  // Combining Cyrillic Lette..Combining Cyrillic Payer
-        {0xa69e, 0xa69f},  // Combining Cyrillic Lette..Combining Cyrillic Lette
-        {0xa6f0, 0xa6f1},  // Bamum Combining Mark Koq..Bamum Combining Mark Tuk
-        {0xa802, 0xa802},  // Syloti Nagri Sign Dvisva..Syloti Nagri Sign Dvisva
-        {0xa806, 0xa806},  // Syloti Nagri Sign Hasant..Syloti Nagri Sign Hasant
-        {0xa80b, 0xa80b},  // Syloti Nagri Sign Anusva..Syloti Nagri Sign Anusva
-        {0xa825, 0xa826},  // Syloti Nagri Vowel Sign ..Syloti Nagri Vowel Sign
-        {0xa8c4, 0xa8c5},  // Saurashtra Sign Virama  ..
-        {0xa8e0, 0xa8f1},  // Combining Devanagari Dig..Combining Devanagari Sig
-        {0xa926, 0xa92d},  // Kayah Li Vowel Ue       ..Kayah Li Tone Calya Plop
-        {0xa947, 0xa951},  // Rejang Vowel Sign I     ..Rejang Consonant Sign R
-        {0xa980, 0xa982},  // Javanese Sign Panyangga ..Javanese Sign Layar
-        {0xa9b3, 0xa9b3},  // Javanese Sign Cecak Telu..Javanese Sign Cecak Telu
-        {0xa9b6, 0xa9b9},  // Javanese Vowel Sign Wulu..Javanese Vowel Sign Suku
-        {0xa9bc, 0xa9bc},  // Javanese Vowel Sign Pepe..Javanese Vowel Sign Pepe
-        {0xa9e5, 0xa9e5},  // Myanmar Sign Shan Saw   ..Myanmar Sign Shan Saw
-        {0xaa29, 0xaa2e},  // Cham Vowel Sign Aa      ..Cham Vowel Sign Oe
-        {0xaa31, 0xaa32},  // Cham Vowel Sign Au      ..Cham Vowel Sign Ue
-        {0xaa35, 0xaa36},  // Cham Consonant Sign La  ..Cham Consonant Sign Wa
-        {0xaa43, 0xaa43},  // Cham Consonant Sign Fina..Cham Consonant Sign Fina
-        {0xaa4c, 0xaa4c},  // Cham Consonant Sign Fina..Cham Consonant Sign Fina
-        {0xaa7c, 0xaa7c},  // Myanmar Sign Tai Laing T..Myanmar Sign Tai Laing T
-        {0xaab0, 0xaab0},  // Tai Viet Mai Kang       ..Tai Viet Mai Kang
-        {0xaab2, 0xaab4},  // Tai Viet Vowel I        ..Tai Viet Vowel U
-        {0xaab7, 0xaab8},  // Tai Viet Mai Khit       ..Tai Viet Vowel Ia
-        {0xaabe, 0xaabf},  // Tai Viet Vowel Am       ..Tai Viet Tone Mai Ek
-        {0xaac1, 0xaac1},  // Tai Viet Tone Mai Tho   ..Tai Viet Tone Mai Tho
-        {0xaaec, 0xaaed},  // Meetei Mayek Vowel Sign ..Meetei Mayek Vowel Sign
-        {0xaaf6, 0xaaf6},  // Meetei Mayek Virama     ..Meetei Mayek Virama
-        {0xabe5, 0xabe5},  // Meetei Mayek Vowel Sign ..Meetei Mayek Vowel Sign
-        {0xabe8, 0xabe8},  // Meetei Mayek Vowel Sign ..Meetei Mayek Vowel Sign
-        {0xabed, 0xabed},  // Meetei Mayek Apun Iyek  ..Meetei Mayek Apun Iyek
-        {0xfb1e, 0xfb1e},  // Hebrew Point Judeo-spani..Hebrew Point Judeo-spani
-        {0xfe00, 0xfe0f},  // Variation Select||-1    ..Variation Select||-16
-        {0xfe20, 0xfe2f},  // Combining Ligature Left ..Combining Cyrillic Titlo
+        {0x00300, 0x0036f},  // Combining Grave Accent  ..Combining Latin Small Le
+        {0x00483, 0x00489},  // Combining Cyrillic Titlo..Combining Cyrillic Milli
+        {0x00591, 0x005bd},  // Hebrew Accent Etnahta   ..Hebrew Point Meteg
+        {0x005bf, 0x005bf},  // Hebrew Point Rafe       ..Hebrew Point Rafe
+        {0x005c1, 0x005c2},  // Hebrew Point Shin Dot   ..Hebrew Point Sin Dot
+        {0x005c4, 0x005c5},  // Hebrew Mark Upper Dot   ..Hebrew Mark Lower Dot
+        {0x005c7, 0x005c7},  // Hebrew Point Qamats Qata..Hebrew Point Qamats Qata
+        {0x00610, 0x0061a},  // Arabic Sign Sallallahou ..Arabic Small Kasra
+        {0x0064b, 0x0065f},  // Arabic Fathatan         ..Arabic Wavy Hamza Below
+        {0x00670, 0x00670},  // Arabic Letter Superscrip..Arabic Letter Superscrip
+        {0x006d6, 0x006dc},  // Arabic Small High Ligatu..Arabic Small High Seen
+        {0x006df, 0x006e4},  // Arabic Small High Rounde..Arabic Small High Madda
+        {0x006e7, 0x006e8},  // Arabic Small High Yeh   ..Arabic Small High Noon
+        {0x006ea, 0x006ed},  // Arabic Empty Centre Low ..Arabic Small Low Meem
+        {0x00711, 0x00711},  // Syriac Letter Superscrip..Syriac Letter Superscrip
+        {0x00730, 0x0074a},  // Syriac Pthaha Above     ..Syriac Barrekh
+        {0x007a6, 0x007b0},  // Thaana Abafili          ..Thaana Sukun
+        {0x007eb, 0x007f3},  // Nko Combining Short High..Nko Combining Double Dot
+        {0x007fd, 0x007fd},  // Nko Dantayalan          ..Nko Dantayalan
+        {0x00816, 0x00819},  // Samaritan Mark In       ..Samaritan Mark Dagesh
+        {0x0081b, 0x00823},  // Samaritan Mark Epentheti..Samaritan Vowel Sign A
+        {0x00825, 0x00827},  // Samaritan Vowel Sign Sho..Samaritan Vowel Sign U
+        {0x00829, 0x0082d},  // Samaritan Vowel Sign Lon..Samaritan Mark Nequdaa
+        {0x00859, 0x0085b},  // Mandaic Affrication Mark..Mandaic Gemination Mark
+        {0x008d3, 0x008e1},  // Arabic Small Low Waw    ..Arabic Small High Sign S
+        {0x008e3, 0x00902},  // Arabic Turned Damma Belo..Devanagari Sign Anusvara
+        {0x0093a, 0x0093a},  // Devanagari Vowel Sign Oe..Devanagari Vowel Sign Oe
+        {0x0093c, 0x0093c},  // Devanagari Sign Nukta   ..Devanagari Sign Nukta
+        {0x00941, 0x00948},  // Devanagari Vowel Sign U ..Devanagari Vowel Sign Ai
+        {0x0094d, 0x0094d},  // Devanagari Sign Virama  ..Devanagari Sign Virama
+        {0x00951, 0x00957},  // Devanagari Stress Sign U..Devanagari Vowel Sign Uu
+        {0x00962, 0x00963},  // Devanagari Vowel Sign Vo..Devanagari Vowel Sign Vo
+        {0x00981, 0x00981},  // Bengali Sign Candrabindu..Bengali Sign Candrabindu
+        {0x009bc, 0x009bc},  // Bengali Sign Nukta      ..Bengali Sign Nukta
+        {0x009c1, 0x009c4},  // Bengali Vowel Sign U    ..Bengali Vowel Sign Vocal
+        {0x009cd, 0x009cd},  // Bengali Sign Virama     ..Bengali Sign Virama
+        {0x009e2, 0x009e3},  // Bengali Vowel Sign Vocal..Bengali Vowel Sign Vocal
+        {0x009fe, 0x009fe},  // Bengali Sandhi Mark     ..Bengali Sandhi Mark
+        {0x00a01, 0x00a02},  // Gurmukhi Sign Adak Bindi..Gurmukhi Sign Bindi
+        {0x00a3c, 0x00a3c},  // Gurmukhi Sign Nukta     ..Gurmukhi Sign Nukta
+        {0x00a41, 0x00a42},  // Gurmukhi Vowel Sign U   ..Gurmukhi Vowel Sign Uu
+        {0x00a47, 0x00a48},  // Gurmukhi Vowel Sign Ee  ..Gurmukhi Vowel Sign Ai
+        {0x00a4b, 0x00a4d},  // Gurmukhi Vowel Sign Oo  ..Gurmukhi Sign Virama
+        {0x00a51, 0x00a51},  // Gurmukhi Sign Udaat     ..Gurmukhi Sign Udaat
+        {0x00a70, 0x00a71},  // Gurmukhi Tippi          ..Gurmukhi Addak
+        {0x00a75, 0x00a75},  // Gurmukhi Sign Yakash    ..Gurmukhi Sign Yakash
+        {0x00a81, 0x00a82},  // Gujarati Sign Candrabind..Gujarati Sign Anusvara
+        {0x00abc, 0x00abc},  // Gujarati Sign Nukta     ..Gujarati Sign Nukta
+        {0x00ac1, 0x00ac5},  // Gujarati Vowel Sign U   ..Gujarati Vowel Sign Cand
+        {0x00ac7, 0x00ac8},  // Gujarati Vowel Sign E   ..Gujarati Vowel Sign Ai
+        {0x00acd, 0x00acd},  // Gujarati Sign Virama    ..Gujarati Sign Virama
+        {0x00ae2, 0x00ae3},  // Gujarati Vowel Sign Voca..Gujarati Vowel Sign Voca
+        {0x00afa, 0x00aff},  // Gujarati Sign Sukun     ..Gujarati Sign Two-circle
+        {0x00b01, 0x00b01},  // Oriya Sign Candrabindu  ..Oriya Sign Candrabindu
+        {0x00b3c, 0x00b3c},  // Oriya Sign Nukta        ..Oriya Sign Nukta
+        {0x00b3f, 0x00b3f},  // Oriya Vowel Sign I      ..Oriya Vowel Sign I
+        {0x00b41, 0x00b44},  // Oriya Vowel Sign U      ..Oriya Vowel Sign Vocalic
+        {0x00b4d, 0x00b4d},  // Oriya Sign Virama       ..Oriya Sign Virama
+        {0x00b55, 0x00b56},  // (nil)                   ..Oriya Ai Length Mark
+        {0x00b62, 0x00b63},  // Oriya Vowel Sign Vocalic..Oriya Vowel Sign Vocalic
+        {0x00b82, 0x00b82},  // Tamil Sign Anusvara     ..Tamil Sign Anusvara
+        {0x00bc0, 0x00bc0},  // Tamil Vowel Sign Ii     ..Tamil Vowel Sign Ii
+        {0x00bcd, 0x00bcd},  // Tamil Sign Virama       ..Tamil Sign Virama
+        {0x00c00, 0x00c00},  // Telugu Sign Combining Ca..Telugu Sign Combining Ca
+        {0x00c04, 0x00c04},  // Telugu Sign Combining An..Telugu Sign Combining An
+        {0x00c3e, 0x00c40},  // Telugu Vowel Sign Aa    ..Telugu Vowel Sign Ii
+        {0x00c46, 0x00c48},  // Telugu Vowel Sign E     ..Telugu Vowel Sign Ai
+        {0x00c4a, 0x00c4d},  // Telugu Vowel Sign O     ..Telugu Sign Virama
+        {0x00c55, 0x00c56},  // Telugu Length Mark      ..Telugu Ai Length Mark
+        {0x00c62, 0x00c63},  // Telugu Vowel Sign Vocali..Telugu Vowel Sign Vocali
+        {0x00c81, 0x00c81},  // Kannada Sign Candrabindu..Kannada Sign Candrabindu
+        {0x00cbc, 0x00cbc},  // Kannada Sign Nukta      ..Kannada Sign Nukta
+        {0x00cbf, 0x00cbf},  // Kannada Vowel Sign I    ..Kannada Vowel Sign I
+        {0x00cc6, 0x00cc6},  // Kannada Vowel Sign E    ..Kannada Vowel Sign E
+        {0x00ccc, 0x00ccd},  // Kannada Vowel Sign Au   ..Kannada Sign Virama
+        {0x00ce2, 0x00ce3},  // Kannada Vowel Sign Vocal..Kannada Vowel Sign Vocal
+        {0x00d00, 0x00d01},  // Malayalam Sign Combining..Malayalam Sign Candrabin
+        {0x00d3b, 0x00d3c},  // Malayalam Sign Vertical ..Malayalam Sign Circular
+        {0x00d41, 0x00d44},  // Malayalam Vowel Sign U  ..Malayalam Vowel Sign Voc
+        {0x00d4d, 0x00d4d},  // Malayalam Sign Virama   ..Malayalam Sign Virama
+        {0x00d62, 0x00d63},  // Malayalam Vowel Sign Voc..Malayalam Vowel Sign Voc
+        {0x00d81, 0x00d81},  // (nil)                   ..(nil)
+        {0x00dca, 0x00dca},  // Sinhala Sign Al-lakuna  ..Sinhala Sign Al-lakuna
+        {0x00dd2, 0x00dd4},  // Sinhala Vowel Sign Ketti..Sinhala Vowel Sign Ketti
+        {0x00dd6, 0x00dd6},  // Sinhala Vowel Sign Diga ..Sinhala Vowel Sign Diga
+        {0x00e31, 0x00e31},  // Thai Character Mai Han-a..Thai Character Mai Han-a
+        {0x00e34, 0x00e3a},  // Thai Character Sara I   ..Thai Character Phinthu
+        {0x00e47, 0x00e4e},  // Thai Character Maitaikhu..Thai Character Yamakkan
+        {0x00eb1, 0x00eb1},  // Lao Vowel Sign Mai Kan  ..Lao Vowel Sign Mai Kan
+        {0x00eb4, 0x00ebc},  // Lao Vowel Sign I        ..Lao Semivowel Sign Lo
+        {0x00ec8, 0x00ecd},  // Lao Tone Mai Ek         ..Lao Niggahita
+        {0x00f18, 0x00f19},  // Tibetan Astrological Sig..Tibetan Astrological Sig
+        {0x00f35, 0x00f35},  // Tibetan Mark Ngas Bzung ..Tibetan Mark Ngas Bzung
+        {0x00f37, 0x00f37},  // Tibetan Mark Ngas Bzung ..Tibetan Mark Ngas Bzung
+        {0x00f39, 0x00f39},  // Tibetan Mark Tsa -phru  ..Tibetan Mark Tsa -phru
+        {0x00f71, 0x00f7e},  // Tibetan Vowel Sign Aa   ..Tibetan Sign Rjes Su Nga
+        {0x00f80, 0x00f84},  // Tibetan Vowel Sign Rever..Tibetan Mark Halanta
+        {0x00f86, 0x00f87},  // Tibetan Sign Lci Rtags  ..Tibetan Sign Yang Rtags
+        {0x00f8d, 0x00f97},  // Tibetan Subjoined Sign L..Tibetan Subjoined Letter
+        {0x00f99, 0x00fbc},  // Tibetan Subjoined Letter..Tibetan Subjoined Letter
+        {0x00fc6, 0x00fc6},  // Tibetan Symbol Padma Gda..Tibetan Symbol Padma Gda
+        {0x0102d, 0x01030},  // Myanmar Vowel Sign I    ..Myanmar Vowel Sign Uu
+        {0x01032, 0x01037},  // Myanmar Vowel Sign Ai   ..Myanmar Sign Dot Below
+        {0x01039, 0x0103a},  // Myanmar Sign Virama     ..Myanmar Sign Asat
+        {0x0103d, 0x0103e},  // Myanmar Consonant Sign M..Myanmar Consonant Sign M
+        {0x01058, 0x01059},  // Myanmar Vowel Sign Vocal..Myanmar Vowel Sign Vocal
+        {0x0105e, 0x01060},  // Myanmar Consonant Sign M..Myanmar Consonant Sign M
+        {0x01071, 0x01074},  // Myanmar Vowel Sign Geba ..Myanmar Vowel Sign Kayah
+        {0x01082, 0x01082},  // Myanmar Consonant Sign S..Myanmar Consonant Sign S
+        {0x01085, 0x01086},  // Myanmar Vowel Sign Shan ..Myanmar Vowel Sign Shan
+        {0x0108d, 0x0108d},  // Myanmar Sign Shan Counci..Myanmar Sign Shan Counci
+        {0x0109d, 0x0109d},  // Myanmar Vowel Sign Aiton..Myanmar Vowel Sign Aiton
+        {0x0135d, 0x0135f},  // Ethiopic Combining Gemin..Ethiopic Combining Gemin
+        {0x01712, 0x01714},  // Tagalog Vowel Sign I    ..Tagalog Sign Virama
+        {0x01732, 0x01734},  // Hanunoo Vowel Sign I    ..Hanunoo Sign Pamudpod
+        {0x01752, 0x01753},  // Buhid Vowel Sign I      ..Buhid Vowel Sign U
+        {0x01772, 0x01773},  // Tagbanwa Vowel Sign I   ..Tagbanwa Vowel Sign U
+        {0x017b4, 0x017b5},  // Khmer Vowel Inherent Aq ..Khmer Vowel Inherent Aa
+        {0x017b7, 0x017bd},  // Khmer Vowel Sign I      ..Khmer Vowel Sign Ua
+        {0x017c6, 0x017c6},  // Khmer Sign Nikahit      ..Khmer Sign Nikahit
+        {0x017c9, 0x017d3},  // Khmer Sign Muusikatoan  ..Khmer Sign Bathamasat
+        {0x017dd, 0x017dd},  // Khmer Sign Atthacan     ..Khmer Sign Atthacan
+        {0x0180b, 0x0180d},  // Mongolian Free Variation..Mongolian Free Variation
+        {0x01885, 0x01886},  // Mongolian Letter Ali Gal..Mongolian Letter Ali Gal
+        {0x018a9, 0x018a9},  // Mongolian Letter Ali Gal..Mongolian Letter Ali Gal
+        {0x01920, 0x01922},  // Limbu Vowel Sign A      ..Limbu Vowel Sign U
+        {0x01927, 0x01928},  // Limbu Vowel Sign E      ..Limbu Vowel Sign O
+        {0x01932, 0x01932},  // Limbu Small Letter Anusv..Limbu Small Letter Anusv
+        {0x01939, 0x0193b},  // Limbu Sign Mukphreng    ..Limbu Sign Sa-i
+        {0x01a17, 0x01a18},  // Buginese Vowel Sign I   ..Buginese Vowel Sign U
+        {0x01a1b, 0x01a1b},  // Buginese Vowel Sign Ae  ..Buginese Vowel Sign Ae
+        {0x01a56, 0x01a56},  // Tai Tham Consonant Sign ..Tai Tham Consonant Sign
+        {0x01a58, 0x01a5e},  // Tai Tham Sign Mai Kang L..Tai Tham Consonant Sign
+        {0x01a60, 0x01a60},  // Tai Tham Sign Sakot     ..Tai Tham Sign Sakot
+        {0x01a62, 0x01a62},  // Tai Tham Vowel Sign Mai ..Tai Tham Vowel Sign Mai
+        {0x01a65, 0x01a6c},  // Tai Tham Vowel Sign I   ..Tai Tham Vowel Sign Oa B
+        {0x01a73, 0x01a7c},  // Tai Tham Vowel Sign Oa A..Tai Tham Sign Khuen-lue
+        {0x01a7f, 0x01a7f},  // Tai Tham Combining Crypt..Tai Tham Combining Crypt
+        {0x01ab0, 0x01ac0},  // Combining Doubled Circum..(nil)
+        {0x01b00, 0x01b03},  // Balinese Sign Ulu Ricem ..Balinese Sign Surang
+        {0x01b34, 0x01b34},  // Balinese Sign Rerekan   ..Balinese Sign Rerekan
+        {0x01b36, 0x01b3a},  // Balinese Vowel Sign Ulu ..Balinese Vowel Sign Ra R
+        {0x01b3c, 0x01b3c},  // Balinese Vowel Sign La L..Balinese Vowel Sign La L
+        {0x01b42, 0x01b42},  // Balinese Vowel Sign Pepe..Balinese Vowel Sign Pepe
+        {0x01b6b, 0x01b73},  // Balinese Musical Symbol ..Balinese Musical Symbol
+        {0x01b80, 0x01b81},  // Sundanese Sign Panyecek ..Sundanese Sign Panglayar
+        {0x01ba2, 0x01ba5},  // Sundanese Consonant Sign..Sundanese Vowel Sign Pan
+        {0x01ba8, 0x01ba9},  // Sundanese Vowel Sign Pam..Sundanese Vowel Sign Pan
+        {0x01bab, 0x01bad},  // Sundanese Sign Virama   ..Sundanese Consonant Sign
+        {0x01be6, 0x01be6},  // Batak Sign Tompi        ..Batak Sign Tompi
+        {0x01be8, 0x01be9},  // Batak Vowel Sign Pakpak ..Batak Vowel Sign Ee
+        {0x01bed, 0x01bed},  // Batak Vowel Sign Karo O ..Batak Vowel Sign Karo O
+        {0x01bef, 0x01bf1},  // Batak Vowel Sign U For S..Batak Consonant Sign H
+        {0x01c2c, 0x01c33},  // Lepcha Vowel Sign E     ..Lepcha Consonant Sign T
+        {0x01c36, 0x01c37},  // Lepcha Sign Ran         ..Lepcha Sign Nukta
+        {0x01cd0, 0x01cd2},  // Vedic Tone Karshana     ..Vedic Tone Prenkha
+        {0x01cd4, 0x01ce0},  // Vedic Sign Yajurvedic Mi..Vedic Tone Rigvedic Kash
+        {0x01ce2, 0x01ce8},  // Vedic Sign Visarga Svari..Vedic Sign Visarga Anuda
+        {0x01ced, 0x01ced},  // Vedic Sign Tiryak       ..Vedic Sign Tiryak
+        {0x01cf4, 0x01cf4},  // Vedic Tone Candra Above ..Vedic Tone Candra Above
+        {0x01cf8, 0x01cf9},  // Vedic Tone Ring Above   ..Vedic Tone Double Ring A
+        {0x01dc0, 0x01df9},  // Combining Dotted Grave A..Combining Wide Inverted
+        {0x01dfb, 0x01dff},  // Combining Deletion Mark ..Combining Right Arrowhea
+        {0x020d0, 0x020f0},  // Combining Left Harpoon A..Combining Asterisk Above
+        {0x02cef, 0x02cf1},  // Coptic Combining Ni Abov..Coptic Combining Spiritu
+        {0x02d7f, 0x02d7f},  // Tifinagh Consonant Joine..Tifinagh Consonant Joine
+        {0x02de0, 0x02dff},  // Combining Cyrillic Lette..Combining Cyrillic Lette
+        {0x0302a, 0x0302d},  // Ideographic Level Tone M..Ideographic Entering Ton
+        {0x03099, 0x0309a},  // Combining Katakana-hirag..Combining Katakana-hirag
+        {0x0a66f, 0x0a672},  // Combining Cyrillic Vzmet..Combining Cyrillic Thous
+        {0x0a674, 0x0a67d},  // Combining Cyrillic Lette..Combining Cyrillic Payer
+        {0x0a69e, 0x0a69f},  // Combining Cyrillic Lette..Combining Cyrillic Lette
+        {0x0a6f0, 0x0a6f1},  // Bamum Combining Mark Koq..Bamum Combining Mark Tuk
+        {0x0a802, 0x0a802},  // Syloti Nagri Sign Dvisva..Syloti Nagri Sign Dvisva
+        {0x0a806, 0x0a806},  // Syloti Nagri Sign Hasant..Syloti Nagri Sign Hasant
+        {0x0a80b, 0x0a80b},  // Syloti Nagri Sign Anusva..Syloti Nagri Sign Anusva
+        {0x0a825, 0x0a826},  // Syloti Nagri Vowel Sign ..Syloti Nagri Vowel Sign
+        {0x0a82c, 0x0a82c},  // (nil)                   ..(nil)
+        {0x0a8c4, 0x0a8c5},  // Saurashtra Sign Virama  ..Saurashtra Sign Candrabi
+        {0x0a8e0, 0x0a8f1},  // Combining Devanagari Dig..Combining Devanagari Sig
+        {0x0a8ff, 0x0a8ff},  // Devanagari Vowel Sign Ay..Devanagari Vowel Sign Ay
+        {0x0a926, 0x0a92d},  // Kayah Li Vowel Ue       ..Kayah Li Tone Calya Plop
+        {0x0a947, 0x0a951},  // Rejang Vowel Sign I     ..Rejang Consonant Sign R
+        {0x0a980, 0x0a982},  // Javanese Sign Panyangga ..Javanese Sign Layar
+        {0x0a9b3, 0x0a9b3},  // Javanese Sign Cecak Telu..Javanese Sign Cecak Telu
+        {0x0a9b6, 0x0a9b9},  // Javanese Vowel Sign Wulu..Javanese Vowel Sign Suku
+        {0x0a9bc, 0x0a9bd},  // Javanese Vowel Sign Pepe..Javanese Consonant Sign
+        {0x0a9e5, 0x0a9e5},  // Myanmar Sign Shan Saw   ..Myanmar Sign Shan Saw
+        {0x0aa29, 0x0aa2e},  // Cham Vowel Sign Aa      ..Cham Vowel Sign Oe
+        {0x0aa31, 0x0aa32},  // Cham Vowel Sign Au      ..Cham Vowel Sign Ue
+        {0x0aa35, 0x0aa36},  // Cham Consonant Sign La  ..Cham Consonant Sign Wa
+        {0x0aa43, 0x0aa43},  // Cham Consonant Sign Fina..Cham Consonant Sign Fina
+        {0x0aa4c, 0x0aa4c},  // Cham Consonant Sign Fina..Cham Consonant Sign Fina
+        {0x0aa7c, 0x0aa7c},  // Myanmar Sign Tai Laing T..Myanmar Sign Tai Laing T
+        {0x0aab0, 0x0aab0},  // Tai Viet Mai Kang       ..Tai Viet Mai Kang
+        {0x0aab2, 0x0aab4},  // Tai Viet Vowel I        ..Tai Viet Vowel U
+        {0x0aab7, 0x0aab8},  // Tai Viet Mai Khit       ..Tai Viet Vowel Ia
+        {0x0aabe, 0x0aabf},  // Tai Viet Vowel Am       ..Tai Viet Tone Mai Ek
+        {0x0aac1, 0x0aac1},  // Tai Viet Tone Mai Tho   ..Tai Viet Tone Mai Tho
+        {0x0aaec, 0x0aaed},  // Meetei Mayek Vowel Sign ..Meetei Mayek Vowel Sign
+        {0x0aaf6, 0x0aaf6},  // Meetei Mayek Virama     ..Meetei Mayek Virama
+        {0x0abe5, 0x0abe5},  // Meetei Mayek Vowel Sign ..Meetei Mayek Vowel Sign
+        {0x0abe8, 0x0abe8},  // Meetei Mayek Vowel Sign ..Meetei Mayek Vowel Sign
+        {0x0abed, 0x0abed},  // Meetei Mayek Apun Iyek  ..Meetei Mayek Apun Iyek
+        {0x0fb1e, 0x0fb1e},  // Hebrew Point Judeo-spani..Hebrew Point Judeo-spani
+        {0x0fe00, 0x0fe0f},  // Variation Selector-1    ..Variation Selector-16
+        {0x0fe20, 0x0fe2f},  // Combining Ligature Left ..Combining Cyrillic Titlo
         {0x101fd, 0x101fd},  // Phaistos Disc Sign Combi..Phaistos Disc Sign Combi
         {0x102e0, 0x102e0},  // Coptic Epact Thousands M..Coptic Epact Thousands M
         {0x10376, 0x1037a},  // Combining Old Permic Let..Combining Old Permic Let
@@ -219,6 +232,9 @@ public final class WcWidth {
         {0x10a38, 0x10a3a},  // Kharoshthi Sign Bar Abov..Kharoshthi Sign Dot Belo
         {0x10a3f, 0x10a3f},  // Kharoshthi Virama       ..Kharoshthi Virama
         {0x10ae5, 0x10ae6},  // Manichaean Abbreviation ..Manichaean Abbreviation
+        {0x10d24, 0x10d27},  // Hanifi Rohingya Sign Har..Hanifi Rohingya Sign Tas
+        {0x10eab, 0x10eac},  // (nil)                   ..(nil)
+        {0x10f46, 0x10f50},  // Sogdian Combining Dot Be..Sogdian Combining Stroke
         {0x11001, 0x11001},  // Brahmi Sign Anusvara    ..Brahmi Sign Anusvara
         {0x11038, 0x11046},  // Brahmi Vowel Sign Aa    ..Brahmi Virama
         {0x1107f, 0x11081},  // Brahmi Number Joiner    ..Kaithi Sign Anusvara
@@ -230,23 +246,25 @@ public final class WcWidth {
         {0x11173, 0x11173},  // Mahajani Sign Nukta     ..Mahajani Sign Nukta
         {0x11180, 0x11181},  // Sharada Sign Candrabindu..Sharada Sign Anusvara
         {0x111b6, 0x111be},  // Sharada Vowel Sign U    ..Sharada Vowel Sign O
-        {0x111ca, 0x111cc},  // Sharada Sign Nukta      ..Sharada Extra Sh||t Vowe
+        {0x111c9, 0x111cc},  // Sharada Sandhi Mark     ..Sharada Extra Short Vowe
+        {0x111cf, 0x111cf},  // (nil)                   ..(nil)
         {0x1122f, 0x11231},  // Khojki Vowel Sign U     ..Khojki Vowel Sign Ai
         {0x11234, 0x11234},  // Khojki Sign Anusvara    ..Khojki Sign Anusvara
         {0x11236, 0x11237},  // Khojki Sign Nukta       ..Khojki Sign Shadda
-        {0x1123e, 0x1123e},  // (nil)                   ..
+        {0x1123e, 0x1123e},  // Khojki Sign Sukun       ..Khojki Sign Sukun
         {0x112df, 0x112df},  // Khudawadi Sign Anusvara ..Khudawadi Sign Anusvara
         {0x112e3, 0x112ea},  // Khudawadi Vowel Sign U  ..Khudawadi Sign Virama
         {0x11300, 0x11301},  // Grantha Sign Combining A..Grantha Sign Candrabindu
-        {0x1133c, 0x1133c},  // Grantha Sign Nukta      ..Grantha Sign Nukta
+        {0x1133b, 0x1133c},  // Combining Bindu Below   ..Grantha Sign Nukta
         {0x11340, 0x11340},  // Grantha Vowel Sign Ii   ..Grantha Vowel Sign Ii
         {0x11366, 0x1136c},  // Combining Grantha Digit ..Combining Grantha Digit
         {0x11370, 0x11374},  // Combining Grantha Letter..Combining Grantha Letter
-        {0x11438, 0x1143f},  // (nil)                   ..
-        {0x11442, 0x11444},  // (nil)                   ..
-        {0x11446, 0x11446},  // (nil)                   ..
+        {0x11438, 0x1143f},  // Newa Vowel Sign U       ..Newa Vowel Sign Ai
+        {0x11442, 0x11444},  // Newa Sign Virama        ..Newa Sign Anusvara
+        {0x11446, 0x11446},  // Newa Sign Nukta         ..Newa Sign Nukta
+        {0x1145e, 0x1145e},  // Newa Sandhi Mark        ..Newa Sandhi Mark
         {0x114b3, 0x114b8},  // Tirhuta Vowel Sign U    ..Tirhuta Vowel Sign Vocal
-        {0x114ba, 0x114ba},  // Tirhuta Vowel Sign Sh||t..Tirhuta Vowel Sign Sh||t
+        {0x114ba, 0x114ba},  // Tirhuta Vowel Sign Short..Tirhuta Vowel Sign Short
         {0x114bf, 0x114c0},  // Tirhuta Sign Candrabindu..Tirhuta Sign Anusvara
         {0x114c2, 0x114c3},  // Tirhuta Sign Virama     ..Tirhuta Sign Nukta
         {0x115b2, 0x115b5},  // Siddham Vowel Sign U    ..Siddham Vowel Sign Vocal
@@ -263,16 +281,43 @@ public final class WcWidth {
         {0x1171d, 0x1171f},  // Ahom Consonant Sign Medi..Ahom Consonant Sign Medi
         {0x11722, 0x11725},  // Ahom Vowel Sign I       ..Ahom Vowel Sign Uu
         {0x11727, 0x1172b},  // Ahom Vowel Sign Aw      ..Ahom Sign Killer
-        {0x11c30, 0x11c36},  // (nil)                   ..
-        {0x11c38, 0x11c3d},  // (nil)                   ..
-        {0x11c3f, 0x11c3f},  // (nil)                   ..
-        {0x11c92, 0x11ca7},  // (nil)                   ..
-        {0x11caa, 0x11cb0},  // (nil)                   ..
-        {0x11cb2, 0x11cb3},  // (nil)                   ..
-        {0x11cb5, 0x11cb6},  // (nil)                   ..
+        {0x1182f, 0x11837},  // Dogra Vowel Sign U      ..Dogra Sign Anusvara
+        {0x11839, 0x1183a},  // Dogra Sign Virama       ..Dogra Sign Nukta
+        {0x1193b, 0x1193c},  // (nil)                   ..(nil)
+        {0x1193e, 0x1193e},  // (nil)                   ..(nil)
+        {0x11943, 0x11943},  // (nil)                   ..(nil)
+        {0x119d4, 0x119d7},  // Nandinagari Vowel Sign U..Nandinagari Vowel Sign V
+        {0x119da, 0x119db},  // Nandinagari Vowel Sign E..Nandinagari Vowel Sign A
+        {0x119e0, 0x119e0},  // Nandinagari Sign Virama ..Nandinagari Sign Virama
+        {0x11a01, 0x11a0a},  // Zanabazar Square Vowel S..Zanabazar Square Vowel L
+        {0x11a33, 0x11a38},  // Zanabazar Square Final C..Zanabazar Square Sign An
+        {0x11a3b, 0x11a3e},  // Zanabazar Square Cluster..Zanabazar Square Cluster
+        {0x11a47, 0x11a47},  // Zanabazar Square Subjoin..Zanabazar Square Subjoin
+        {0x11a51, 0x11a56},  // Soyombo Vowel Sign I    ..Soyombo Vowel Sign Oe
+        {0x11a59, 0x11a5b},  // Soyombo Vowel Sign Vocal..Soyombo Vowel Length Mar
+        {0x11a8a, 0x11a96},  // Soyombo Final Consonant ..Soyombo Sign Anusvara
+        {0x11a98, 0x11a99},  // Soyombo Gemination Mark ..Soyombo Subjoiner
+        {0x11c30, 0x11c36},  // Bhaiksuki Vowel Sign I  ..Bhaiksuki Vowel Sign Voc
+        {0x11c38, 0x11c3d},  // Bhaiksuki Vowel Sign E  ..Bhaiksuki Sign Anusvara
+        {0x11c3f, 0x11c3f},  // Bhaiksuki Sign Virama   ..Bhaiksuki Sign Virama
+        {0x11c92, 0x11ca7},  // Marchen Subjoined Letter..Marchen Subjoined Letter
+        {0x11caa, 0x11cb0},  // Marchen Subjoined Letter..Marchen Vowel Sign Aa
+        {0x11cb2, 0x11cb3},  // Marchen Vowel Sign U    ..Marchen Vowel Sign E
+        {0x11cb5, 0x11cb6},  // Marchen Sign Anusvara   ..Marchen Sign Candrabindu
+        {0x11d31, 0x11d36},  // Masaram Gondi Vowel Sign..Masaram Gondi Vowel Sign
+        {0x11d3a, 0x11d3a},  // Masaram Gondi Vowel Sign..Masaram Gondi Vowel Sign
+        {0x11d3c, 0x11d3d},  // Masaram Gondi Vowel Sign..Masaram Gondi Vowel Sign
+        {0x11d3f, 0x11d45},  // Masaram Gondi Vowel Sign..Masaram Gondi Virama
+        {0x11d47, 0x11d47},  // Masaram Gondi Ra-kara   ..Masaram Gondi Ra-kara
+        {0x11d90, 0x11d91},  // Gunjala Gondi Vowel Sign..Gunjala Gondi Vowel Sign
+        {0x11d95, 0x11d95},  // Gunjala Gondi Sign Anusv..Gunjala Gondi Sign Anusv
+        {0x11d97, 0x11d97},  // Gunjala Gondi Virama    ..Gunjala Gondi Virama
+        {0x11ef3, 0x11ef4},  // Makasar Vowel Sign I    ..Makasar Vowel Sign U
         {0x16af0, 0x16af4},  // Bassa Vah Combining High..Bassa Vah Combining High
         {0x16b30, 0x16b36},  // Pahawh Hmong Mark Cim Tu..Pahawh Hmong Mark Cim Ta
+        {0x16f4f, 0x16f4f},  // Miao Sign Consonant Modi..Miao Sign Consonant Modi
         {0x16f8f, 0x16f92},  // Miao Tone Right         ..Miao Tone Below
+        {0x16fe4, 0x16fe4},  // (nil)                   ..(nil)
         {0x1bc9d, 0x1bc9e},  // Duployan Thick Letter Se..Duployan Double Mark
         {0x1d167, 0x1d169},  // Musical Symbol Combining..Musical Symbol Combining
         {0x1d17b, 0x1d182},  // Musical Symbol Combining..Musical Symbol Combining
@@ -285,97 +330,103 @@ public final class WcWidth {
         {0x1da84, 0x1da84},  // Signwriting Location Hea..Signwriting Location Hea
         {0x1da9b, 0x1da9f},  // Signwriting Fill Modifie..Signwriting Fill Modifie
         {0x1daa1, 0x1daaf},  // Signwriting Rotation Mod..Signwriting Rotation Mod
-        {0x1e000, 0x1e006},  // (nil)                   ..
-        {0x1e008, 0x1e018},  // (nil)                   ..
-        {0x1e01b, 0x1e021},  // (nil)                   ..
-        {0x1e023, 0x1e024},  // (nil)                   ..
-        {0x1e026, 0x1e02a},  // (nil)                   ..
+        {0x1e000, 0x1e006},  // Combining Glagolitic Let..Combining Glagolitic Let
+        {0x1e008, 0x1e018},  // Combining Glagolitic Let..Combining Glagolitic Let
+        {0x1e01b, 0x1e021},  // Combining Glagolitic Let..Combining Glagolitic Let
+        {0x1e023, 0x1e024},  // Combining Glagolitic Let..Combining Glagolitic Let
+        {0x1e026, 0x1e02a},  // Combining Glagolitic Let..Combining Glagolitic Let
+        {0x1e130, 0x1e136},  // Nyiakeng Puachue Hmong T..Nyiakeng Puachue Hmong T
+        {0x1e2ec, 0x1e2ef},  // Wancho Tone Tup         ..Wancho Tone Koini
         {0x1e8d0, 0x1e8d6},  // Mende Kikakui Combining ..Mende Kikakui Combining
-        {0x1e944, 0x1e94a},  // (nil)                   ..
-        {0xe0100, 0xe01ef},  // Variation Select||-17   ..Variation Select||-256
+        {0x1e944, 0x1e94a},  // Adlam Alif Lengthener   ..Adlam Nukta
+        {0xe0100, 0xe01ef},  // Variation Selector-17   ..Variation Selector-256
     };
 
     // https://github.com/jquast/wcwidth/blob/master/wcwidth/table_wide.py
-    // at commit 0d7de112202cc8b2ebe9232ff4a5c954f19d561a (2016-07-02):
+    // at commit b29897e5a1b403a0e36f7fc991614981cbc42475 (2020-07-14):
     private static final int[][] WIDE_EASTASIAN = {
-        {0x1100, 0x115f},  // Hangul Choseong Kiyeok  ..Hangul Choseong Filler
-        {0x231a, 0x231b},  // Watch                   ..Hourglass
-        {0x2329, 0x232a},  // Left-pointing Angle Brac..Right-pointing Angle Bra
-        {0x23e9, 0x23ec},  // Black Right-pointing Dou..Black Down-pointing Doub
-        {0x23f0, 0x23f0},  // Alarm Clock             ..Alarm Clock
-        {0x23f3, 0x23f3},  // Hourglass With Flowing S..Hourglass With Flowing S
-        {0x25fd, 0x25fe},  // White Medium Small Squar..Black Medium Small Squar
-        {0x2614, 0x2615},  // Umbrella With Rain Drops..Hot Beverage
-        {0x2648, 0x2653},  // Aries                   ..Pisces
-        {0x267f, 0x267f},  // Wheelchair Symbol       ..Wheelchair Symbol
-        {0x2693, 0x2693},  // Anch||                  ..Anch||
-        {0x26a1, 0x26a1},  // High Voltage Sign       ..High Voltage Sign
-        {0x26aa, 0x26ab},  // Medium White Circle     ..Medium Black Circle
-        {0x26bd, 0x26be},  // Soccer Ball             ..Baseball
-        {0x26c4, 0x26c5},  // Snowman Without Snow    ..Sun Behind Cloud
-        {0x26ce, 0x26ce},  // Ophiuchus               ..Ophiuchus
-        {0x26d4, 0x26d4},  // No Entry                ..No Entry
-        {0x26ea, 0x26ea},  // Church                  ..Church
-        {0x26f2, 0x26f3},  // Fountain                ..Flag In Hole
-        {0x26f5, 0x26f5},  // Sailboat                ..Sailboat
-        {0x26fa, 0x26fa},  // Tent                    ..Tent
-        {0x26fd, 0x26fd},  // Fuel Pump               ..Fuel Pump
-        {0x2705, 0x2705},  // White Heavy Check Mark  ..White Heavy Check Mark
-        {0x270a, 0x270b},  // Raised Fist             ..Raised Hand
-        {0x2728, 0x2728},  // Sparkles                ..Sparkles
-        {0x274c, 0x274c},  // Cross Mark              ..Cross Mark
-        {0x274e, 0x274e},  // Negative Squared Cross M..Negative Squared Cross M
-        {0x2753, 0x2755},  // Black Question Mark ||na..White Exclamation Mark O
-        {0x2757, 0x2757},  // Heavy Exclamation Mark S..Heavy Exclamation Mark S
-        {0x2795, 0x2797},  // Heavy Plus Sign         ..Heavy Division Sign
-        {0x27b0, 0x27b0},  // Curly Loop              ..Curly Loop
-        {0x27bf, 0x27bf},  // Double Curly Loop       ..Double Curly Loop
-        {0x2b1b, 0x2b1c},  // Black Large Square      ..White Large Square
-        {0x2b50, 0x2b50},  // White Medium Star       ..White Medium Star
-        {0x2b55, 0x2b55},  // Heavy Large Circle      ..Heavy Large Circle
-        {0x2e80, 0x2e99},  // Cjk Radical Repeat      ..Cjk Radical Rap
-        {0x2e9b, 0x2ef3},  // Cjk Radical Choke       ..Cjk Radical C-simplified
-        {0x2f00, 0x2fd5},  // Kangxi Radical One      ..Kangxi Radical Flute
-        {0x2ff0, 0x2ffb},  // Ideographic Description ..Ideographic Description
-        {0x3000, 0x303e},  // Ideographic Space       ..Ideographic Variation In
-        {0x3041, 0x3096},  // Hiragana Letter Small A ..Hiragana Letter Small Ke
-        {0x3099, 0x30ff},  // Combining Katakana-hirag..Katakana Digraph Koto
-        {0x3105, 0x312d},  // Bopomofo Letter B       ..Bopomofo Letter Ih
-        {0x3131, 0x318e},  // Hangul Letter Kiyeok    ..Hangul Letter Araeae
-        {0x3190, 0x31ba},  // Ideographic Annotation L..Bopomofo Letter Zy
-        {0x31c0, 0x31e3},  // Cjk Stroke T            ..Cjk Stroke Q
-        {0x31f0, 0x321e},  // Katakana Letter Small Ku..Parenthesized K||ean Cha
-        {0x3220, 0x3247},  // Parenthesized Ideograph ..Circled Ideograph Koto
-        {0x3250, 0x32fe},  // Partnership Sign        ..Circled Katakana Wo
-        {0x3300, 0x4dbf},  // Square Apaato           ..
-        {0x4e00, 0xa48c},  // Cjk Unified Ideograph-4e..Yi Syllable Yyr
-        {0xa490, 0xa4c6},  // Yi Radical Qot          ..Yi Radical Ke
-        {0xa960, 0xa97c},  // Hangul Choseong Tikeut-m..Hangul Choseong Ssangyeo
-        {0xac00, 0xd7a3},  // Hangul Syllable Ga      ..Hangul Syllable Hih
-        {0xf900, 0xfaff},  // Cjk Compatibility Ideogr..
-        {0xfe10, 0xfe19},  // Presentation F||m F|| Ve..Presentation F||m F|| Ve
-        {0xfe30, 0xfe52},  // Presentation F||m F|| Ve..Small Full Stop
-        {0xfe54, 0xfe66},  // Small Semicolon         ..Small Equals Sign
-        {0xfe68, 0xfe6b},  // Small Reverse Solidus   ..Small Commercial At
-        {0xff01, 0xff60},  // Fullwidth Exclamation Ma..Fullwidth Right White Pa
-        {0xffe0, 0xffe6},  // Fullwidth Cent Sign     ..Fullwidth Won Sign
-        {0x16fe0, 0x16fe0},  // (nil)                   ..
-        {0x17000, 0x187ec},  // (nil)                   ..
-        {0x18800, 0x18af2},  // (nil)                   ..
-        {0x1b000, 0x1b001},  // Katakana Letter Archaic ..Hiragana Letter Archaic
+        {0x01100, 0x0115f},  // Hangul Choseong Kiyeok  ..Hangul Choseong Filler
+        {0x0231a, 0x0231b},  // Watch                   ..Hourglass
+        {0x02329, 0x0232a},  // Left-pointing Angle Brac..Right-pointing Angle Bra
+        {0x023e9, 0x023ec},  // Black Right-pointing Dou..Black Down-pointing Doub
+        {0x023f0, 0x023f0},  // Alarm Clock             ..Alarm Clock
+        {0x023f3, 0x023f3},  // Hourglass With Flowing S..Hourglass With Flowing S
+        {0x025fd, 0x025fe},  // White Medium Small Squar..Black Medium Small Squar
+        {0x02614, 0x02615},  // Umbrella With Rain Drops..Hot Beverage
+        {0x02648, 0x02653},  // Aries                   ..Pisces
+        {0x0267f, 0x0267f},  // Wheelchair Symbol       ..Wheelchair Symbol
+        {0x02693, 0x02693},  // Anchor                  ..Anchor
+        {0x026a1, 0x026a1},  // High Voltage Sign       ..High Voltage Sign
+        {0x026aa, 0x026ab},  // Medium White Circle     ..Medium Black Circle
+        {0x026bd, 0x026be},  // Soccer Ball             ..Baseball
+        {0x026c4, 0x026c5},  // Snowman Without Snow    ..Sun Behind Cloud
+        {0x026ce, 0x026ce},  // Ophiuchus               ..Ophiuchus
+        {0x026d4, 0x026d4},  // No Entry                ..No Entry
+        {0x026ea, 0x026ea},  // Church                  ..Church
+        {0x026f2, 0x026f3},  // Fountain                ..Flag In Hole
+        {0x026f5, 0x026f5},  // Sailboat                ..Sailboat
+        {0x026fa, 0x026fa},  // Tent                    ..Tent
+        {0x026fd, 0x026fd},  // Fuel Pump               ..Fuel Pump
+        {0x02705, 0x02705},  // White Heavy Check Mark  ..White Heavy Check Mark
+        {0x0270a, 0x0270b},  // Raised Fist             ..Raised Hand
+        {0x02728, 0x02728},  // Sparkles                ..Sparkles
+        {0x0274c, 0x0274c},  // Cross Mark              ..Cross Mark
+        {0x0274e, 0x0274e},  // Negative Squared Cross M..Negative Squared Cross M
+        {0x02753, 0x02755},  // Black Question Mark Orna..White Exclamation Mark O
+        {0x02757, 0x02757},  // Heavy Exclamation Mark S..Heavy Exclamation Mark S
+        {0x02795, 0x02797},  // Heavy Plus Sign         ..Heavy Division Sign
+        {0x027b0, 0x027b0},  // Curly Loop              ..Curly Loop
+        {0x027bf, 0x027bf},  // Double Curly Loop       ..Double Curly Loop
+        {0x02b1b, 0x02b1c},  // Black Large Square      ..White Large Square
+        {0x02b50, 0x02b50},  // White Medium Star       ..White Medium Star
+        {0x02b55, 0x02b55},  // Heavy Large Circle      ..Heavy Large Circle
+        {0x02e80, 0x02e99},  // Cjk Radical Repeat      ..Cjk Radical Rap
+        {0x02e9b, 0x02ef3},  // Cjk Radical Choke       ..Cjk Radical C-simplified
+        {0x02f00, 0x02fd5},  // Kangxi Radical One      ..Kangxi Radical Flute
+        {0x02ff0, 0x02ffb},  // Ideographic Description ..Ideographic Description
+        {0x03000, 0x0303e},  // Ideographic Space       ..Ideographic Variation In
+        {0x03041, 0x03096},  // Hiragana Letter Small A ..Hiragana Letter Small Ke
+        {0x03099, 0x030ff},  // Combining Katakana-hirag..Katakana Digraph Koto
+        {0x03105, 0x0312f},  // Bopomofo Letter B       ..Bopomofo Letter Nn
+        {0x03131, 0x0318e},  // Hangul Letter Kiyeok    ..Hangul Letter Araeae
+        {0x03190, 0x031e3},  // Ideographic Annotation L..Cjk Stroke Q
+        {0x031f0, 0x0321e},  // Katakana Letter Small Ku..Parenthesized Korean Cha
+        {0x03220, 0x03247},  // Parenthesized Ideograph ..Circled Ideograph Koto
+        {0x03250, 0x04dbf},  // Partnership Sign        ..(nil)
+        {0x04e00, 0x0a48c},  // Cjk Unified Ideograph-4e..Yi Syllable Yyr
+        {0x0a490, 0x0a4c6},  // Yi Radical Qot          ..Yi Radical Ke
+        {0x0a960, 0x0a97c},  // Hangul Choseong Tikeut-m..Hangul Choseong Ssangyeo
+        {0x0ac00, 0x0d7a3},  // Hangul Syllable Ga      ..Hangul Syllable Hih
+        {0x0f900, 0x0faff},  // Cjk Compatibility Ideogr..(nil)
+        {0x0fe10, 0x0fe19},  // Presentation Form For Ve..Presentation Form For Ve
+        {0x0fe30, 0x0fe52},  // Presentation Form For Ve..Small Full Stop
+        {0x0fe54, 0x0fe66},  // Small Semicolon         ..Small Equals Sign
+        {0x0fe68, 0x0fe6b},  // Small Reverse Solidus   ..Small Commercial At
+        {0x0ff01, 0x0ff60},  // Fullwidth Exclamation Ma..Fullwidth Right White Pa
+        {0x0ffe0, 0x0ffe6},  // Fullwidth Cent Sign     ..Fullwidth Won Sign
+        {0x16fe0, 0x16fe4},  // Tangut Iteration Mark   ..(nil)
+        {0x16ff0, 0x16ff1},  // (nil)                   ..(nil)
+        {0x17000, 0x187f7},  // (nil)                   ..(nil)
+        {0x18800, 0x18cd5},  // Tangut Component-001    ..(nil)
+        {0x18d00, 0x18d08},  // (nil)                   ..(nil)
+        {0x1b000, 0x1b11e},  // Katakana Letter Archaic ..Hentaigana Letter N-mu-m
+        {0x1b150, 0x1b152},  // Hiragana Letter Small Wi..Hiragana Letter Small Wo
+        {0x1b164, 0x1b167},  // Katakana Letter Small Wi..Katakana Letter Small N
+        {0x1b170, 0x1b2fb},  // Nushu Character-1b170   ..Nushu Character-1b2fb
         {0x1f004, 0x1f004},  // Mahjong Tile Red Dragon ..Mahjong Tile Red Dragon
         {0x1f0cf, 0x1f0cf},  // Playing Card Black Joker..Playing Card Black Joker
         {0x1f18e, 0x1f18e},  // Negative Squared Ab     ..Negative Squared Ab
         {0x1f191, 0x1f19a},  // Squared Cl              ..Squared Vs
         {0x1f200, 0x1f202},  // Square Hiragana Hoka    ..Squared Katakana Sa
-        {0x1f210, 0x1f23b},  // Squared Cjk Unified Ideo..
-        {0x1f240, 0x1f248},  // T||toise Shell Bracketed..T||toise Shell Bracketed
+        {0x1f210, 0x1f23b},  // Squared Cjk Unified Ideo..Squared Cjk Unified Ideo
+        {0x1f240, 0x1f248},  // Tortoise Shell Bracketed..Tortoise Shell Bracketed
         {0x1f250, 0x1f251},  // Circled Ideograph Advant..Circled Ideograph Accept
+        {0x1f260, 0x1f265},  // Rounded Symbol For Fu   ..Rounded Symbol For Cai
         {0x1f300, 0x1f320},  // Cyclone                 ..Shooting Star
         {0x1f32d, 0x1f335},  // Hot Dog                 ..Cactus
         {0x1f337, 0x1f37c},  // Tulip                   ..Baby Bottle
-        {0x1f37e, 0x1f393},  // Bottle With Popping C||k..Graduation Cap
-        {0x1f3a0, 0x1f3ca},  // Carousel H||se          ..Swimmer
+        {0x1f37e, 0x1f393},  // Bottle With Popping Cork..Graduation Cap
+        {0x1f3a0, 0x1f3ca},  // Carousel Horse          ..Swimmer
         {0x1f3cf, 0x1f3d3},  // Cricket Bat And Ball    ..Table Tennis Paddle And
         {0x1f3e0, 0x1f3f0},  // House Building          ..European Castle
         {0x1f3f4, 0x1f3f4},  // Waving Black Flag       ..Waving Black Flag
@@ -383,27 +434,33 @@ public final class WcWidth {
         {0x1f440, 0x1f440},  // Eyes                    ..Eyes
         {0x1f442, 0x1f4fc},  // Ear                     ..Videocassette
         {0x1f4ff, 0x1f53d},  // Prayer Beads            ..Down-pointing Small Red
-        {0x1f54b, 0x1f54e},  // Kaaba                   ..Men||ah With Nine Branch
+        {0x1f54b, 0x1f54e},  // Kaaba                   ..Menorah With Nine Branch
         {0x1f550, 0x1f567},  // Clock Face One Oclock   ..Clock Face Twelve-thirty
-        {0x1f57a, 0x1f57a},  // (nil)                   ..
+        {0x1f57a, 0x1f57a},  // Man Dancing             ..Man Dancing
         {0x1f595, 0x1f596},  // Reversed Hand With Middl..Raised Hand With Part Be
-        {0x1f5a4, 0x1f5a4},  // (nil)                   ..
+        {0x1f5a4, 0x1f5a4},  // Black Heart             ..Black Heart
         {0x1f5fb, 0x1f64f},  // Mount Fuji              ..Person With Folded Hands
         {0x1f680, 0x1f6c5},  // Rocket                  ..Left Luggage
         {0x1f6cc, 0x1f6cc},  // Sleeping Accommodation  ..Sleeping Accommodation
-        {0x1f6d0, 0x1f6d2},  // Place Of W||ship        ..
+        {0x1f6d0, 0x1f6d2},  // Place Of Worship        ..Shopping Trolley
+        {0x1f6d5, 0x1f6d7},  // Hindu Temple            ..(nil)
         {0x1f6eb, 0x1f6ec},  // Airplane Departure      ..Airplane Arriving
-        {0x1f6f4, 0x1f6f6},  // (nil)                   ..
-        {0x1f910, 0x1f91e},  // Zipper-mouth Face       ..
-        {0x1f920, 0x1f927},  // (nil)                   ..
-        {0x1f930, 0x1f930},  // (nil)                   ..
-        {0x1f933, 0x1f93e},  // (nil)                   ..
-        {0x1f940, 0x1f94b},  // (nil)                   ..
-        {0x1f950, 0x1f95e},  // (nil)                   ..
-        {0x1f980, 0x1f991},  // Crab                    ..
-        {0x1f9c0, 0x1f9c0},  // Cheese Wedge            ..Cheese Wedge
-        {0x20000, 0x2fffd},  // Cjk Unified Ideograph-20..
-        {0x30000, 0x3fffd},  // (nil)                   ..
+        {0x1f6f4, 0x1f6fc},  // Scooter                 ..(nil)
+        {0x1f7e0, 0x1f7eb},  // Large Orange Circle     ..Large Brown Square
+        {0x1f90c, 0x1f93a},  // (nil)                   ..Fencer
+        {0x1f93c, 0x1f945},  // Wrestlers               ..Goal Net
+        {0x1f947, 0x1f978},  // First Place Medal       ..(nil)
+        {0x1f97a, 0x1f9cb},  // Face With Pleading Eyes ..(nil)
+        {0x1f9cd, 0x1f9ff},  // Standing Person         ..Nazar Amulet
+        {0x1fa70, 0x1fa74},  // Ballet Shoes            ..(nil)
+        {0x1fa78, 0x1fa7a},  // Drop Of Blood           ..Stethoscope
+        {0x1fa80, 0x1fa86},  // Yo-yo                   ..(nil)
+        {0x1fa90, 0x1faa8},  // Ringed Planet           ..(nil)
+        {0x1fab0, 0x1fab6},  // (nil)                   ..(nil)
+        {0x1fac0, 0x1fac2},  // (nil)                   ..(nil)
+        {0x1fad0, 0x1fad6},  // (nil)                   ..(nil)
+        {0x20000, 0x2fffd},  // Cjk Unified Ideograph-20..(nil)
+        {0x30000, 0x3fffd},  // (nil)                   ..(nil)
     };
 
 

From 70580abd50aa6e7bdc541d7bac6025c82947c749 Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Fri, 7 Aug 2020 15:39:11 +0300
Subject: [PATCH 115/912] update bootstrap archives

---
 app/build.gradle | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 1570764573..a732b907cc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -133,11 +133,11 @@ clean {
 
 task downloadBootstraps(){
     doLast {
-        def version = 26
-        downloadBootstrap("aarch64", "c7830de73aa437933aef1957bdea29640afa34ca292fd7e27a6bdd1c9271bfe3", version)
-        downloadBootstrap("arm",     "d6c250d853ef235da6f64ee946018cfaca1ca5a416d2ce0bdd82d97c35972bc5", version)
-        downloadBootstrap("i686",    "d1b272e022a6bbee9d6bff024f1e42d26c58d0d3dfe64ca68846b94b40db352d", version)
-        downloadBootstrap("x86_64",  "866793074541aa1ead0927affc8f1b5279a2cf9d683688a8379e6090754e077e", version)
+        def version = 27
+        downloadBootstrap("aarch64", "517fb3aa215f7b96961f9377822d7f1b5e86c831efb4ab096ed65d0b1cdf02e9", version)
+        downloadBootstrap("arm",     "94d17183afdd017cf8ab885b9103a370b16bec1d3cb641884511d545ee009b90", version)
+        downloadBootstrap("i686",    "7f27723d2f0afbe7e90f203b3ca2e80871a8dfa08b136229476aa5e7ba3e988f", version)
+        downloadBootstrap("x86_64",  "b19b2721bae5fb3a3fb0754c49611ce4721221e1e7997e7fd98940776ad88c3d", version)
     }
 }
 

From 619552ec5c1a6fd1dfb0eb735b67d645c5dc19ff Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Fri, 7 Aug 2020 15:39:44 +0300
Subject: [PATCH 116/912] version 0.98 (v0.97 is non-release, so updating from
 0.96 to 0.98)

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index a732b907cc..112bd108bd 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -17,8 +17,8 @@ android {
         applicationId "com.termux"
         minSdkVersion project.properties.minSdkVersion.toInteger()
         targetSdkVersion project.properties.targetSdkVersion.toInteger()
-        versionCode 96
-        versionName "0.96"
+        versionCode 98
+        versionName "0.98"
 
         externalNativeBuild {
             ndkBuild {

From 5a70be152346958009fda0419d77502c6e52391b Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Sat, 8 Aug 2020 02:15:14 +0300
Subject: [PATCH 117/912] terminal emulator: flush remaining process output
 data when terminating session

---
 .../java/com/termux/terminal/TerminalSession.java  | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/terminal-emulator/src/main/java/com/termux/terminal/TerminalSession.java b/terminal-emulator/src/main/java/com/termux/terminal/TerminalSession.java
index a8c08a8d2b..a0c5b855b6 100644
--- a/terminal-emulator/src/main/java/com/termux/terminal/TerminalSession.java
+++ b/terminal-emulator/src/main/java/com/termux/terminal/TerminalSession.java
@@ -110,13 +110,13 @@ private static FileDescriptor wrapFileDescriptor(int fileDescriptor) {
 
         @Override
         public void handleMessage(Message msg) {
-            if (msg.what == MSG_NEW_INPUT && isRunning()) {
-                int bytesRead = mProcessToTerminalIOQueue.read(mReceiveBuffer, false);
-                if (bytesRead > 0) {
-                    mEmulator.append(mReceiveBuffer, bytesRead);
-                    notifyScreenUpdate();
-                }
-            } else if (msg.what == MSG_PROCESS_EXITED) {
+            int bytesRead = mProcessToTerminalIOQueue.read(mReceiveBuffer, false);
+            if (bytesRead > 0) {
+                mEmulator.append(mReceiveBuffer, bytesRead);
+                notifyScreenUpdate();
+            }
+
+            if (msg.what == MSG_PROCESS_EXITED) {
                 int exitCode = (Integer) msg.obj;
                 cleanupResources(exitCode);
                 mChangeCallback.onSessionFinished(TerminalSession.this);

From 332f1104a3e35123a8f9500b367072adb9c48c3a Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Sun, 9 Aug 2020 00:07:35 +0200
Subject: [PATCH 118/912] Update drawerlayout library

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 112bd108bd..7ad7cb9a57 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,7 +9,7 @@ android {
     dependencies {
         implementation "androidx.annotation:annotation:1.1.0"
         implementation "androidx.viewpager:viewpager:1.0.0"
-        implementation "androidx.drawerlayout:drawerlayout:1.0.0"
+        implementation "androidx.drawerlayout:drawerlayout:1.1.0"
         implementation project(":terminal-view")
     }
 

From b486d29d2342583dbaad42787ae47cd7a8d499b4 Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Fri, 14 Aug 2020 14:50:34 +0300
Subject: [PATCH 119/912] fix RUN_COMMAND permission description

See https://github.com/termux/termux-app/issues/1713.
---
 app/src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d3a16a54ed..ff6fcc203e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -3,7 +3,7 @@
     <string name="application_name">Termux</string>
     <string name="shared_user_label">Termux user</string>
     <string name="run_command_permission_label">Run commands in Termux environment</string>
-    <string name="run_command_permission_description">Allow third-party applications to execute arbitrary commands within Termux environment.</string>
+    <string name="run_command_permission_description">execute arbitrary commands within Termux environment</string>
     <string name="new_session">New session</string>
     <string name="new_session_failsafe">Failsafe</string>
     <string name="toggle_soft_keyboard">Keyboard</string>

From 784affe39cf609bf1d062e6163be8b39e6ed2aa9 Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Fri, 14 Aug 2020 15:03:14 +0300
Subject: [PATCH 120/912] linter: fix wakelock log tag

See https://github.com/termux/termux-app/issues/1670.
---
 app/src/main/java/com/termux/app/TermuxService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/termux/app/TermuxService.java b/app/src/main/java/com/termux/app/TermuxService.java
index 514910b3bf..955ce8656b 100644
--- a/app/src/main/java/com/termux/app/TermuxService.java
+++ b/app/src/main/java/com/termux/app/TermuxService.java
@@ -106,7 +106,7 @@ public int onStartCommand(Intent intent, int flags, int startId) {
         } else if (ACTION_LOCK_WAKE.equals(action)) {
             if (mWakeLock == null) {
                 PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
-                mWakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, EmulatorDebug.LOG_TAG);
+                mWakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, EmulatorDebug.LOG_TAG + ":service-wakelock");
                 mWakeLock.acquire();
 
                 // http://tools.android.com/tech-docs/lint-in-studio-2-3#TOC-WifiManager-Leak

From db2f50c76e61b25d5ff17168407d17f3c05aec71 Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Fri, 14 Aug 2020 15:08:32 +0300
Subject: [PATCH 121/912] extra keys: use TextUtils.join instead of String.join

String.join() is available only on Android API 26+ but our current
minimal is 24.

See https://github.com/termux/termux-app/issues/1670.
---
 app/src/main/java/com/termux/app/ExtraKeysInfos.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/termux/app/ExtraKeysInfos.java b/app/src/main/java/com/termux/app/ExtraKeysInfos.java
index 86d97449bc..1274c22441 100644
--- a/app/src/main/java/com/termux/app/ExtraKeysInfos.java
+++ b/app/src/main/java/com/termux/app/ExtraKeysInfos.java
@@ -1,5 +1,7 @@
 package com.termux.app;
 
+import android.text.TextUtils;
+
 import androidx.annotation.Nullable;
 
 import org.json.JSONArray;
@@ -305,7 +307,7 @@ public ExtraKeyButton(ExtraKeysInfos.CharDisplayMap charDisplayMap, JSONObject c
             keys[i] = ExtraKeysInfos.replaceAlias(keys[i]);
         }
 
-        this.key = String.join(" ", keys);
+        this.key = TextUtils.join(" ", keys);
 
         String displayFromConfig = config.optString("display", null);
         if (displayFromConfig != null) {

From 531c32f3c91b9ea9edf1c84a0867fbc5de31948e Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Sun, 16 Aug 2020 22:56:55 +0300
Subject: [PATCH 122/912] CI: do builds for android-10 branch

---
 .github/workflows/debug_build.yml               | 2 ++
 .github/workflows/gradle-wrapper-validation.yml | 2 ++
 .github/workflows/run_tests.yml                 | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/.github/workflows/debug_build.yml b/.github/workflows/debug_build.yml
index 47ba0edd86..0aa761a713 100644
--- a/.github/workflows/debug_build.yml
+++ b/.github/workflows/debug_build.yml
@@ -4,9 +4,11 @@ on:
   push:
     branches:
       - master
+      - android-10
   pull_request:
     branches:
       - master
+      - android-10
 
 jobs:
   build:
diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
index 13dca3db33..7c8edafc63 100644
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -4,9 +4,11 @@ on:
   push:
     branches:
       - master
+      - android-10
   pull_request:
     branches:
       - master
+      - android-10
 
 jobs:
   validation:
diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml
index 87ccc68611..2647499554 100644
--- a/.github/workflows/run_tests.yml
+++ b/.github/workflows/run_tests.yml
@@ -4,9 +4,11 @@ on:
   push:
     branches:
       - master
+      - android-10
   pull_request:
     branches:
       - master
+      - android-10
 
 jobs:
   testing:

From ba9c118b5029895b5aa36c3aec96be0dab68f638 Mon Sep 17 00:00:00 2001
From: blackcat-917 <53786619+blackcat-917@users.noreply.github.com>
Date: Fri, 21 Aug 2020 23:17:45 +0200
Subject: [PATCH 123/912] readme: fix a copy-paste typo (#1720)

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f1db39db24..3cf831b390 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ terminal emulation). For the packages installable inside the app, see
 
 ## Installation
 
-Termux:Widget application can be obtained from:
+Termux application can be obtained from:
 
 - [Google Play](https://play.google.com/store/apps/details?id=com.termux)
 - [F-Droid](https://f-droid.org/en/packages/com.termux/)

From 382da7e8f7374d9c073abe0a6ad94c0174830074 Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Wed, 26 Aug 2020 20:04:17 +0300
Subject: [PATCH 124/912] terminal view: provide a workaroud for issue with
 some keyboards

Issue https://github.com/termux/termux-app/issues/686.

Note that there can be a better workaround which I don't know...
---
 .../java/com/termux/view/TerminalView.java    | 44 +++++++++++++++----
 1 file changed, 36 insertions(+), 8 deletions(-)

diff --git a/terminal-view/src/main/java/com/termux/view/TerminalView.java b/terminal-view/src/main/java/com/termux/view/TerminalView.java
index 76f6380ef8..b612c5107c 100644
--- a/terminal-view/src/main/java/com/termux/view/TerminalView.java
+++ b/terminal-view/src/main/java/com/termux/view/TerminalView.java
@@ -44,6 +44,12 @@
 import com.termux.terminal.TerminalSession;
 import com.termux.terminal.WcWidth;
 
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
+import java.util.Properties;
+
 /** View displaying and interacting with a {@link TerminalSession}. */
 public final class TerminalView extends View {
 
@@ -246,14 +252,36 @@ public boolean attachSession(TerminalSession session) {
 
     @Override
     public InputConnection onCreateInputConnection(EditorInfo outAttrs) {
-        // Using InputType.NULL is the most correct input type and avoids issues with other hacks.
-        //
-        // Previous keyboard issues:
-        // https://github.com/termux/termux-packages/issues/25
-        // https://github.com/termux/termux-app/issues/87.
-        // https://github.com/termux/termux-app/issues/126.
-        // https://github.com/termux/termux-app/issues/137 (japanese chars and TYPE_NULL).
-        outAttrs.inputType = InputType.TYPE_NULL;
+        File propsFile = new File(getContext().getFilesDir() + "/home/.termux/termux.properties");
+        if (!propsFile.exists())
+            propsFile = new File(getContext().getFilesDir() + "/home/.config/termux/termux.properties");
+
+        Properties props = new Properties();
+        try {
+            if (propsFile.isFile() && propsFile.canRead()) {
+                try (FileInputStream in = new FileInputStream(propsFile)) {
+                    props.load(new InputStreamReader(in, StandardCharsets.UTF_8));
+                }
+            }
+        } catch (Exception e) {
+            Log.e("termux", "Error loading props", e);
+        }
+
+        if (props.getProperty("enforce-char-based-input", "false").equals("true")) {
+            // Some keyboards seems do not reset the internal state on TYPE_NULL.
+            // Affects mostly Samsung stock keyboards.
+            // https://github.com/termux/termux-app/issues/686
+            outAttrs.inputType = InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD | InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS;
+        } else {
+            // Using InputType.NULL is the most correct input type and avoids issues with other hacks.
+            //
+            // Previous keyboard issues:
+            // https://github.com/termux/termux-packages/issues/25
+            // https://github.com/termux/termux-app/issues/87.
+            // https://github.com/termux/termux-app/issues/126.
+            // https://github.com/termux/termux-app/issues/137 (japanese chars and TYPE_NULL).
+            outAttrs.inputType = InputType.TYPE_NULL;
+        }
 
         // Note that IME_ACTION_NONE cannot be used as that makes it impossible to input newlines using the on-screen
         // keyboard on Android TV (see https://github.com/termux/termux-app/issues/221).

From b95823d7a8ff5a48751eacdcd3c4f0f9cb503af7 Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Wed, 26 Aug 2020 20:27:47 +0300
Subject: [PATCH 125/912] update bootstrap archives

---
 app/build.gradle | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 7ad7cb9a57..a3bb45e2f8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -133,11 +133,11 @@ clean {
 
 task downloadBootstraps(){
     doLast {
-        def version = 27
-        downloadBootstrap("aarch64", "517fb3aa215f7b96961f9377822d7f1b5e86c831efb4ab096ed65d0b1cdf02e9", version)
-        downloadBootstrap("arm",     "94d17183afdd017cf8ab885b9103a370b16bec1d3cb641884511d545ee009b90", version)
-        downloadBootstrap("i686",    "7f27723d2f0afbe7e90f203b3ca2e80871a8dfa08b136229476aa5e7ba3e988f", version)
-        downloadBootstrap("x86_64",  "b19b2721bae5fb3a3fb0754c49611ce4721221e1e7997e7fd98940776ad88c3d", version)
+        def version = 28
+        downloadBootstrap("aarch64", "8f8c8af1d6c50bd0d6ecd5a1df8d5b0c3122a945b6febd0de0308504b4075ed0", version)
+        downloadBootstrap("arm",     "179465f403a73fec6534363b11cb38eed3b6b3d8e9d922d8e55dc8a06813240d", version)
+        downloadBootstrap("i686",    "2100ebf36befde73b08efaa7e3ccc9c218a8b5e7d69db06e16e364ab8b7dfbd5", version)
+        downloadBootstrap("x86_64",  "3f5192f63595426370aa69f102fac07ae00c12154878eddec24e8406e640a67f", version)
     }
 }
 

From a108b2bd6b9cfdf58be80326003d6fbd59e82bce Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Wed, 26 Aug 2020 20:40:29 +0300
Subject: [PATCH 126/912] gradle 6.6.1

---
 gradle/wrapper/gradle-wrapper.jar        | Bin 58910 -> 59203 bytes
 gradle/wrapper/gradle-wrapper.properties |   2 +-
 gradlew                                  |   2 +-
 gradlew.bat                              |  21 +++------------------
 4 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 62d4c053550b91381bbd28b1afc82d634bf73a8a..e708b1c023ec8b20f512888fe07c5bd3ff77bb8f 100644
GIT binary patch
delta 6656
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
Yte!%o?r4GTrVtxD61Ym!|5fq-1K$0e!T<mO

delta 6475
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

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index bb8b2fc26b..12d38de6a4 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index fbd7c51583..4f906e0c81 100755
--- a/gradlew
+++ b/gradlew
@@ -130,7 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
diff --git a/gradlew.bat b/gradlew.bat
index a9f778a7a9..ac1b06f938 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,21 +64,6 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
@@ -86,7 +71,7 @@ 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 %CMD_LINE_ARGS%
+"%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

From 850faa25ddad64c82a5768ff921c2cc1bb71bc34 Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Wed, 26 Aug 2020 20:51:05 +0300
Subject: [PATCH 127/912] version 0.99

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index a3bb45e2f8..b23556e12a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -17,8 +17,8 @@ android {
         applicationId "com.termux"
         minSdkVersion project.properties.minSdkVersion.toInteger()
         targetSdkVersion project.properties.targetSdkVersion.toInteger()
-        versionCode 98
-        versionName "0.98"
+        versionCode 99
+        versionName "0.99"
 
         externalNativeBuild {
             ndkBuild {

From cba80b6c0b29525536b52bdddd02845833d6cf15 Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Tue, 1 Sep 2020 03:38:53 +0300
Subject: [PATCH 128/912] add gradle distribution sha256

---
 gradle/wrapper/gradle-wrapper.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 12d38de6a4..590ccdcb9a 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
+distributionSha256Sum=7873ed5287f47ca03549ab8dcb6dc877ac7f0e3d7b1eb12685161d10080910ac
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From 216cc10f3c679335dbe4c4a2e09bb4e85e395370 Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Sat, 12 Sep 2020 19:05:46 +0000
Subject: [PATCH 129/912] Revert "add gradle distribution sha256"

Was initially added to try fix F-Droid builds but appears missing
distribution sha256 is not a cause of the issue.

F-Droid maintains own set of Gradle SHA-256 checksums.

This reverts commit cba80b6c0b29525536b52bdddd02845833d6cf15.
---
 gradle/wrapper/gradle-wrapper.properties | 1 -
 1 file changed, 1 deletion(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 590ccdcb9a..12d38de6a4 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
-distributionSha256Sum=7873ed5287f47ca03549ab8dcb6dc877ac7f0e3d7b1eb12685161d10080910ac
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From 8faa5b21515851cd2d8dfcae109abace80b49701 Mon Sep 17 00:00:00 2001
From: Henrik Grimler <henrik@grimler.se>
Date: Sat, 12 Sep 2020 21:23:33 +0200
Subject: [PATCH 130/912] TerminalEmulator: fix bug in DECRQM handling

Reported in https://github.com/termux/termux-app/issues/1752
---
 .../src/main/java/com/termux/terminal/TerminalEmulator.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java b/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
index 4e74b9e5f5..6aae59a319 100644
--- a/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
+++ b/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
@@ -748,7 +748,7 @@ public void processCodePoint(int b) {
                                 value = (mScreen == mAltBuffer) ? 1 : 2;
                             } else {
                                 int internalBit = mapDecSetBitToInternalBit(mode);
-                                if (internalBit == -1) {
+                                if (internalBit != -1) {
                                     value = isDecsetInternalBitSet(internalBit) ? 1 : 2; // 1=set, 2=reset.
                                 } else {
                                     Log.e(EmulatorDebug.LOG_TAG, "Got DECRQM for unrecognized private DEC mode=" + mode);

From f91168eff44d528e82588b7e6d9f786a1ba0a1bc Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Fri, 18 Sep 2020 22:20:23 +0500
Subject: [PATCH 131/912] Fix issue where termux crashes occasionally in
 android >= 8 because "startForeground()" function is not being called before
 running "startForegroundService()" in RunCommandService.

---
 .../com/termux/app/RunCommandService.java     | 64 +++++++++++++++++++
 1 file changed, 64 insertions(+)

diff --git a/app/src/main/java/com/termux/app/RunCommandService.java b/app/src/main/java/com/termux/app/RunCommandService.java
index 2a57864d89..d4af178b27 100644
--- a/app/src/main/java/com/termux/app/RunCommandService.java
+++ b/app/src/main/java/com/termux/app/RunCommandService.java
@@ -1,6 +1,10 @@
 package com.termux.app;
 
+import android.app.Notification;
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
 import android.app.Service;
+import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Binder;
@@ -8,6 +12,8 @@
 import android.os.IBinder;
 import android.util.Log;
 
+import com.termux.R;
+
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.InputStreamReader;
@@ -50,6 +56,9 @@ public class RunCommandService extends Service {
     public static final String RUN_COMMAND_WORKDIR = "com.termux.RUN_COMMAND_WORKDIR";
     public static final String RUN_COMMAND_BACKGROUND = "com.termux.RUN_COMMAND_BACKGROUND";
 
+    private static final String NOTIFICATION_CHANNEL_ID = "termux_run_command_notification_channel";
+    private static final int NOTIFICATION_ID = 1338;
+
     class LocalBinder extends Binder {
         public final RunCommandService service = RunCommandService.this;
     }
@@ -61,7 +70,15 @@ public IBinder onBind(Intent intent) {
         return mBinder;
     }
 
+    @Override
+    public void onCreate() {
+        runStartForeground();
+    }
+
     public int onStartCommand(Intent intent, int flags, int startId) {
+        // Run again in case service is already started and onCreate() is not called
+        runStartForeground();
+
         if (allowExternalApps() && RUN_COMMAND_ACTION.equals(intent.getAction())) {
             Uri programUri = new Uri.Builder().scheme("com.termux.file").path(intent.getStringExtra(RUN_COMMAND_PATH)).build();
 
@@ -78,9 +95,56 @@ public int onStartCommand(Intent intent, int flags, int startId) {
             }
         }
 
+        runStopForeground();
+
         return Service.START_NOT_STICKY;
     }
 
+    private void runStartForeground() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            setupNotificationChannel();
+            startForeground(NOTIFICATION_ID, buildNotification());
+        }
+    }
+
+    private void runStopForeground() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            stopForeground(true);
+        }
+    }
+
+    private Notification buildNotification() {
+        Notification.Builder builder = new Notification.Builder(this);
+        builder.setContentTitle(getText(R.string.application_name) + " Run Command");
+        builder.setSmallIcon(R.drawable.ic_service_notification);
+
+        // Use a low priority:
+        builder.setPriority(Notification.PRIORITY_LOW);
+
+        // No need to show a timestamp:
+        builder.setShowWhen(false);
+
+        // Background color for small notification icon:
+        builder.setColor(0xFF607D8B);
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            builder.setChannelId(NOTIFICATION_CHANNEL_ID);
+        }
+
+        return builder.build();
+    }
+
+    private void setupNotificationChannel() {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) return;
+
+        String channelName = "Termux Run Command";
+        int importance = NotificationManager.IMPORTANCE_LOW;
+
+        NotificationChannel channel = new NotificationChannel(NOTIFICATION_CHANNEL_ID, channelName, importance);
+        NotificationManager manager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+        manager.createNotificationChannel(channel);
+    }
+
     private boolean allowExternalApps() {
         File propsFile = new File(TermuxService.HOME_PATH + "/.termux/termux.properties");
         if (!propsFile.exists())

From 52ce6cc94bbe59dc8d95cae00e83a2c663963ee3 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Fri, 18 Sep 2020 22:21:31 +0500
Subject: [PATCH 132/912] Add support for "$PREFIX/" and "~/" prefix in
 "RUN_COMMAND" intent extras for paths.

---
 .../java/com/termux/app/RunCommandService.java     | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/termux/app/RunCommandService.java b/app/src/main/java/com/termux/app/RunCommandService.java
index d4af178b27..e0e9b55d99 100644
--- a/app/src/main/java/com/termux/app/RunCommandService.java
+++ b/app/src/main/java/com/termux/app/RunCommandService.java
@@ -80,12 +80,12 @@ public int onStartCommand(Intent intent, int flags, int startId) {
         runStartForeground();
 
         if (allowExternalApps() && RUN_COMMAND_ACTION.equals(intent.getAction())) {
-            Uri programUri = new Uri.Builder().scheme("com.termux.file").path(intent.getStringExtra(RUN_COMMAND_PATH)).build();
+            Uri programUri = new Uri.Builder().scheme("com.termux.file").path(parsePath(intent.getStringExtra(RUN_COMMAND_PATH))).build();
 
             Intent execIntent = new Intent(TermuxService.ACTION_EXECUTE, programUri);
             execIntent.setClass(this, TermuxService.class);
             execIntent.putExtra(TermuxService.EXTRA_ARGUMENTS, intent.getStringArrayExtra(RUN_COMMAND_ARGUMENTS));
-            execIntent.putExtra(TermuxService.EXTRA_CURRENT_WORKING_DIRECTORY, intent.getStringExtra(RUN_COMMAND_WORKDIR));
+            execIntent.putExtra(TermuxService.EXTRA_CURRENT_WORKING_DIRECTORY, parsePath(intent.getStringExtra(RUN_COMMAND_WORKDIR)));
             execIntent.putExtra(TermuxService.EXTRA_EXECUTE_IN_BACKGROUND, intent.getBooleanExtra(RUN_COMMAND_BACKGROUND, false));
 
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
@@ -163,4 +163,14 @@ private boolean allowExternalApps() {
 
         return props.getProperty("allow-external-apps", "false").equals("true");
     }
+
+    /** Replace "$PREFIX/" or "~/" prefix with termux absolute paths */
+    private String parsePath(String path) {
+        if(path != null && !path.isEmpty()) {
+            path = path.replaceAll("^\\$PREFIX\\/", TermuxService.PREFIX_PATH + "/");
+            path = path.replaceAll("^~\\/", TermuxService.HOME_PATH + "/");
+        }
+
+        return path;
+    }
 }

From 9aae665bfca0ea401ef4582165c3686d347ef9d7 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Fri, 18 Sep 2020 22:21:58 +0500
Subject: [PATCH 133/912] Fix issue where termux session does not come to
 foreground automatically in android >= 10 unless user manually clicks termux
 notification for "RUN_COMMAND" intents and "Termux:Tasker" plugin actions
 that have background mode "false" because of new restrictions of starting
 activities from background. This is done by adding
 "android.permission.SYSTEM_ALERT_WINDOW" permission in AndroidManifest.xml so
 that the user may optionally grant "Draw Over Apps" permission to termux to
 fix the issue.

---
 app/src/main/AndroidManifest.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b293037649..2347586652 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"/>
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
 
     <application
         android:extractNativeLibs="true"

From 6e02b99ff6fe9091eb16e19ac97982ed8884f070 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Fri, 18 Sep 2020 22:22:35 +0500
Subject: [PATCH 134/912] Update RunCommandService docs.

---
 .../java/com/termux/app/RunCommandService.java   | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/termux/app/RunCommandService.java b/app/src/main/java/com/termux/app/RunCommandService.java
index e0e9b55d99..4ade0fdcd1 100644
--- a/app/src/main/java/com/termux/app/RunCommandService.java
+++ b/app/src/main/java/com/termux/app/RunCommandService.java
@@ -26,9 +26,21 @@
  *
  * Third-party program must declare com.termux.permission.RUN_COMMAND permission and it should be
  * granted by user.
- * Full path of command or script must be given in "RUN_COMMAND_PATH" extra.
+ *
+ * Absolute path of command or script must be given in "RUN_COMMAND_PATH" extra.
  * The "RUN_COMMAND_ARGUMENTS", "RUN_COMMAND_WORKDIR" and "RUN_COMMAND_BACKGROUND" extras are 
- * optional. The background mode defaults to false.
+ * optional. The workdir defaults to termux home. The background mode defaults to "false".
+ * The command path and workdir can optionally be prefixed with "$PREFIX/" or "~/" if an absolute
+ * path is not to be given.
+ *
+ * To automatically bring to foreground and start termux commands that were started with
+ * background mode "false" in android >= 10 without user having to click the notification manually,
+ * requires termux to be granted draw over apps permission due to new restrictions
+ * of starting activities from the background, this also applies to Termux:Tasker plugin.
+ *
+ * To reduce the chance of termux being killed by android even further due to violation of not
+ * being able to call startForeground() within ~5s of service start in android >= 8, the user
+ * may disable battery optimizations for termux.
  *
  * Sample code to run command "top" with java:
  *   Intent intent = new Intent();

From 7063a3a9da3cc1534c190b79ecf40b144fd6663f Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Fri, 18 Sep 2020 22:25:05 +0500
Subject: [PATCH 135/912] Add @override annotation to onStartCommand() function
 of RunCommandService.

---
 app/src/main/java/com/termux/app/RunCommandService.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/com/termux/app/RunCommandService.java b/app/src/main/java/com/termux/app/RunCommandService.java
index 4ade0fdcd1..8079091a85 100644
--- a/app/src/main/java/com/termux/app/RunCommandService.java
+++ b/app/src/main/java/com/termux/app/RunCommandService.java
@@ -87,6 +87,7 @@ public void onCreate() {
         runStartForeground();
     }
 
+    @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
         // Run again in case service is already started and onCreate() is not called
         runStartForeground();

From 665adb68950d9490e2927068798d6650ff1566a2 Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Mon, 28 Sep 2020 00:46:38 +0300
Subject: [PATCH 136/912] update bootstrap archives

---
 app/build.gradle | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index b23556e12a..0ee0a0b405 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -133,11 +133,11 @@ clean {
 
 task downloadBootstraps(){
     doLast {
-        def version = 28
-        downloadBootstrap("aarch64", "8f8c8af1d6c50bd0d6ecd5a1df8d5b0c3122a945b6febd0de0308504b4075ed0", version)
-        downloadBootstrap("arm",     "179465f403a73fec6534363b11cb38eed3b6b3d8e9d922d8e55dc8a06813240d", version)
-        downloadBootstrap("i686",    "2100ebf36befde73b08efaa7e3ccc9c218a8b5e7d69db06e16e364ab8b7dfbd5", version)
-        downloadBootstrap("x86_64",  "3f5192f63595426370aa69f102fac07ae00c12154878eddec24e8406e640a67f", version)
+        def version = 29
+        downloadBootstrap("aarch64", "1b67ba2302efc20952c00d607a3a169e86cf8ecb66b0c6e16bee9997289119e1", version)
+        downloadBootstrap("arm",     "0dd87a5902b6b7ee4d4499a10da99a3ea605ba020ad1cc77cad16b3267ac13c2", version)
+        downloadBootstrap("i686",    "66cf79273a2ee87730010febe258bec02abf4c4d4c6f89b1b174619baa3c5a0e", version)
+        downloadBootstrap("x86_64",  "e9541c02e4e7df4860d76098e4f477e09952ae65323216f692d668425842bf00", version)
     }
 }
 

From 25523ae2248541c355096022e17690bda83ca2cd Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Mon, 28 Sep 2020 00:52:44 +0300
Subject: [PATCH 137/912] fix bootstrap archive checksum for arm

Due to leading zero issues, SHA-256 checksum for ARM variant will
have 63 characters instead of correct 64...
---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 0ee0a0b405..f3f14ba4aa 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -135,7 +135,7 @@ task downloadBootstraps(){
     doLast {
         def version = 29
         downloadBootstrap("aarch64", "1b67ba2302efc20952c00d607a3a169e86cf8ecb66b0c6e16bee9997289119e1", version)
-        downloadBootstrap("arm",     "0dd87a5902b6b7ee4d4499a10da99a3ea605ba020ad1cc77cad16b3267ac13c2", version)
+        downloadBootstrap("arm",     "dd87a5902b6b7ee4d4499a10da99a3ea605ba020ad1cc77cad16b3267ac13c2", version)
         downloadBootstrap("i686",    "66cf79273a2ee87730010febe258bec02abf4c4d4c6f89b1b174619baa3c5a0e", version)
         downloadBootstrap("x86_64",  "e9541c02e4e7df4860d76098e4f477e09952ae65323216f692d668425842bf00", version)
     }

From af95a99854247da901c3b8170aed7257e5285ae0 Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Mon, 28 Sep 2020 00:59:52 +0300
Subject: [PATCH 138/912] version 0.100

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index f3f14ba4aa..c38b79dce5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -17,8 +17,8 @@ android {
         applicationId "com.termux"
         minSdkVersion project.properties.minSdkVersion.toInteger()
         targetSdkVersion project.properties.targetSdkVersion.toInteger()
-        versionCode 99
-        versionName "0.99"
+        versionCode 100
+        versionName "0.100"
 
         externalNativeBuild {
             ndkBuild {

From 63bfe9584883f792d933304fe8cb35c2cd96560a Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Mon, 28 Sep 2020 03:28:49 +0300
Subject: [PATCH 139/912] update bootstrap archives again

Fixes faulty dpkg https://github.com/termux/termux-packages/issues/5858.
---
 app/build.gradle | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index c38b79dce5..92ed30fa2f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -133,11 +133,11 @@ clean {
 
 task downloadBootstraps(){
     doLast {
-        def version = 29
-        downloadBootstrap("aarch64", "1b67ba2302efc20952c00d607a3a169e86cf8ecb66b0c6e16bee9997289119e1", version)
-        downloadBootstrap("arm",     "dd87a5902b6b7ee4d4499a10da99a3ea605ba020ad1cc77cad16b3267ac13c2", version)
-        downloadBootstrap("i686",    "66cf79273a2ee87730010febe258bec02abf4c4d4c6f89b1b174619baa3c5a0e", version)
-        downloadBootstrap("x86_64",  "e9541c02e4e7df4860d76098e4f477e09952ae65323216f692d668425842bf00", version)
+        def version = 30
+        downloadBootstrap("aarch64", "7a90034285c614d23fa450547a5e2aec77d4242c9891ad662bf0c6fd3bd7ef4e", version)
+        downloadBootstrap("arm",     "f030869ce9a43f84d88560d7ac5153ee4f7e517bca0b37ab01df3e1acba0fe37", version)
+        downloadBootstrap("i686",    "1ea9b63f21602231140d58a5545cfbc6bc2ded56ef2b3c31cba2759d913eef00", version)
+        downloadBootstrap("x86_64",  "a50eb8a4dd02b7898bbd4a9653a25c14b56c1737409ce7f64110fd33c2c69382", version)
     }
 }
 

From 5b6fd9b88c3bebb68b88a187e8a5d31012037088 Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Mon, 28 Sep 2020 03:30:21 +0300
Subject: [PATCH 140/912] version 0.101

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 92ed30fa2f..a27be57c0a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -17,8 +17,8 @@ android {
         applicationId "com.termux"
         minSdkVersion project.properties.minSdkVersion.toInteger()
         targetSdkVersion project.properties.targetSdkVersion.toInteger()
-        versionCode 100
-        versionName "0.100"
+        versionCode 101
+        versionName "0.101"
 
         externalNativeBuild {
             ndkBuild {

From 564079c7e939b356ed0347661e3333e76f2baaae Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Thu, 1 Oct 2020 01:08:39 +0300
Subject: [PATCH 141/912] update .gitattributes

---
 .gitattributes | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index f74a80db47..21c2769ab9 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,3 +1,5 @@
-*       text=auto
-*.bat   eol=crlf
-*.sh    eol=lf
+*           text=auto
+*.bat       eol=crlf
+*.gradle    eol=lf
+*.mk        eol=lf
+*.sh        eol=lf

From 8c80efb904b023cfafab23083df8d5881f201dd3 Mon Sep 17 00:00:00 2001
From: Fabian Henneke <fabian@henneke.me>
Date: Tue, 21 Jul 2020 12:28:48 +0200
Subject: [PATCH 142/912] Add an "Autofill password" context menu action

---
 .../java/com/termux/app/TermuxActivity.java   | 16 +++++++++++++
 app/src/main/res/layout/drawer_layout.xml     |  4 +++-
 app/src/main/res/values/strings.xml           |  1 +
 .../java/com/termux/view/TerminalView.java    | 23 +++++++++++++++++++
 4 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index 129895394b..593c7726b5 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -38,6 +38,7 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowManager;
+import android.view.autofill.AutofillManager;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.ArrayAdapter;
 import android.widget.EditText;
@@ -92,6 +93,7 @@ public final class TermuxActivity extends Activity implements ServiceConnection
     private static final int CONTEXTMENU_STYLING_ID = 6;
     private static final int CONTEXTMENU_HELP_ID = 8;
     private static final int CONTEXTMENU_TOGGLE_KEEP_SCREEN_ON = 9;
+    private static final int CONTEXTMENU_AUTOFILL_ID = 10;
 
     private static final int MAX_SESSIONS = 8;
 
@@ -655,6 +657,12 @@ public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuIn
 
         menu.add(Menu.NONE, CONTEXTMENU_SELECT_URL_ID, Menu.NONE, R.string.select_url);
         menu.add(Menu.NONE, CONTEXTMENU_SHARE_TRANSCRIPT_ID, Menu.NONE, R.string.select_all_and_share);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            AutofillManager autofillManager = getSystemService(AutofillManager.class);
+            if (autofillManager != null && autofillManager.isEnabled()) {
+                menu.add(Menu.NONE, CONTEXTMENU_AUTOFILL_ID, Menu.NONE, R.string.autofill_password);
+            }
+        }
         menu.add(Menu.NONE, CONTEXTMENU_RESET_TERMINAL_ID, Menu.NONE, R.string.reset_terminal);
         menu.add(Menu.NONE, CONTEXTMENU_KILL_PROCESS_ID, Menu.NONE, getResources().getString(R.string.kill_process, getCurrentTermSession().getPid())).setEnabled(currentSession.isRunning());
         menu.add(Menu.NONE, CONTEXTMENU_STYLING_ID, Menu.NONE, R.string.style_terminal);
@@ -870,6 +878,14 @@ public boolean onContextItemSelected(MenuItem item) {
                 }
                 return true;
             }
+            case CONTEXTMENU_AUTOFILL_ID: {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                    AutofillManager autofillManager = getSystemService(AutofillManager.class);
+                    if (autofillManager != null && autofillManager.isEnabled()) {
+                        autofillManager.requestAutofill(mTerminalView);
+                    }
+                }
+            }
             default:
                 return super.onContextItemSelected(item);
         }
diff --git a/app/src/main/res/layout/drawer_layout.xml b/app/src/main/res/layout/drawer_layout.xml
index c5117f14db..71d36996da 100644
--- a/app/src/main/res/layout/drawer_layout.xml
+++ b/app/src/main/res/layout/drawer_layout.xml
@@ -19,7 +19,9 @@
             android:layout_marginLeft="3dp"
             android:focusableInTouchMode="true"
             android:scrollbarThumbVertical="@drawable/terminal_scroll_shape"
-            android:scrollbars="vertical" />
+            android:scrollbars="vertical"
+            android:importantForAutofill="no"
+            android:autofillHints="password" />
 
         <LinearLayout
             android:id="@+id/left_drawer"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ff6fcc203e..50e0283efe 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -12,6 +12,7 @@
     <string name="share_transcript_title">Terminal transcript</string>
     <string name="help">Help</string>
     <string name="toggle_keep_screen_on">Keep screen on</string>
+    <string name="autofill_password">Autofill password</string>
 
     <string name="bootstrap_installer_body">Installing…</string>
     <string name="bootstrap_error_title">Unable to install</string>
diff --git a/terminal-view/src/main/java/com/termux/view/TerminalView.java b/terminal-view/src/main/java/com/termux/view/TerminalView.java
index b612c5107c..301f33fe3b 100644
--- a/terminal-view/src/main/java/com/termux/view/TerminalView.java
+++ b/terminal-view/src/main/java/com/termux/view/TerminalView.java
@@ -31,12 +31,15 @@
 import android.view.ViewTreeObserver;
 import android.view.WindowManager;
 import android.view.accessibility.AccessibilityManager;
+import android.view.autofill.AutofillValue;
 import android.view.inputmethod.BaseInputConnection;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputConnection;
 import android.widget.PopupWindow;
 import android.widget.Scroller;
 
+import androidx.annotation.RequiresApi;
+
 import com.termux.terminal.EmulatorDebug;
 import com.termux.terminal.KeyHandler;
 import com.termux.terminal.TerminalBuffer;
@@ -1540,4 +1543,24 @@ private void updateFloatingToolbarVisibility(MotionEvent event) {
             }
         }
     }
+
+    @RequiresApi(api = Build.VERSION_CODES.O)
+    @Override
+    public void autofill(AutofillValue value) {
+        if (value.isText()) {
+            mTermSession.write(value.getTextValue().toString());
+        }
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.O)
+    @Override
+    public int getAutofillType() {
+        return AUTOFILL_TYPE_TEXT;
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.O)
+    @Override
+    public AutofillValue getAutofillValue() {
+        return AutofillValue.forText("");
+    }
 }

From dfc4595ec53139bd32ead2069850a8e7064e6cec Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Fri, 2 Oct 2020 10:30:18 +0200
Subject: [PATCH 143/912] version 0.102

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index a27be57c0a..52a6c8d714 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -17,8 +17,8 @@ android {
         applicationId "com.termux"
         minSdkVersion project.properties.minSdkVersion.toInteger()
         targetSdkVersion project.properties.targetSdkVersion.toInteger()
-        versionCode 101
-        versionName "0.101"
+        versionCode 102
+        versionName "0.102"
 
         externalNativeBuild {
             ndkBuild {

From ad64dd7c3dcec93d94c135fee4bab5e90965a72b Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Mon, 12 Oct 2020 20:39:28 +0300
Subject: [PATCH 144/912] update bootstrap archives

---
 app/build.gradle | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 52a6c8d714..ac5df08627 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -133,11 +133,11 @@ clean {
 
 task downloadBootstraps(){
     doLast {
-        def version = 30
-        downloadBootstrap("aarch64", "7a90034285c614d23fa450547a5e2aec77d4242c9891ad662bf0c6fd3bd7ef4e", version)
-        downloadBootstrap("arm",     "f030869ce9a43f84d88560d7ac5153ee4f7e517bca0b37ab01df3e1acba0fe37", version)
-        downloadBootstrap("i686",    "1ea9b63f21602231140d58a5545cfbc6bc2ded56ef2b3c31cba2759d913eef00", version)
-        downloadBootstrap("x86_64",  "a50eb8a4dd02b7898bbd4a9653a25c14b56c1737409ce7f64110fd33c2c69382", version)
+        def version = 31
+        downloadBootstrap("aarch64", "e9149cb01735f04b180434093dfb8e703015f8a66044acaead7cbff1e536a990", version)
+        downloadBootstrap("arm",     "8e5776074c58b3e94b1336f2ec0e840057fce9c089faee6683ae5c136441da7b", version)
+        downloadBootstrap("i686",    "f89be9d0197fb9c6b498922ff0f95562fd17b63c934617858f959b8e452ade27", version)
+        downloadBootstrap("x86_64",  "9aa97647afc085fae4e8485458a7d15f23db6e1e3601727f014af8b8eb4519a9", version)
     }
 }
 

From 2f04a6186b105d88e8f315cab110162ca3590343 Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Tue, 17 Nov 2020 20:03:10 +0200
Subject: [PATCH 145/912] add READ_LOGS permission

* https://github.com/termux/termux-app/issues/873
* https://github.com/termux/termux-app/issues/1821
---
 app/src/main/AndroidManifest.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 2347586652..51147f14a1 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -22,6 +22,7 @@
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"/>
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
+    <uses-permission android:name="android.permission.READ_LOGS" />
 
     <application
         android:extractNativeLibs="true"

From 3a8f53a54c4b9a402fc787304b85dc6687804b22 Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Tue, 17 Nov 2020 20:07:24 +0200
Subject: [PATCH 146/912] add permission WRITE_SECURE_SETTINGS

https://github.com/termux/termux-api/issues/211
---
 app/src/main/AndroidManifest.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 51147f14a1..33d0ede61f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -23,6 +23,7 @@
     <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"/>
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
     <uses-permission android:name="android.permission.READ_LOGS" />
+    <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />
 
     <application
         android:extractNativeLibs="true"

From 4479de4b9bb8217517d2d9d1ef7677f451057eb1 Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Tue, 17 Nov 2020 20:35:55 +0200
Subject: [PATCH 147/912] update bootstrap archives

---
 app/build.gradle | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index ac5df08627..8fa1fc96f1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -133,11 +133,11 @@ clean {
 
 task downloadBootstraps(){
     doLast {
-        def version = 31
-        downloadBootstrap("aarch64", "e9149cb01735f04b180434093dfb8e703015f8a66044acaead7cbff1e536a990", version)
-        downloadBootstrap("arm",     "8e5776074c58b3e94b1336f2ec0e840057fce9c089faee6683ae5c136441da7b", version)
-        downloadBootstrap("i686",    "f89be9d0197fb9c6b498922ff0f95562fd17b63c934617858f959b8e452ade27", version)
-        downloadBootstrap("x86_64",  "9aa97647afc085fae4e8485458a7d15f23db6e1e3601727f014af8b8eb4519a9", version)
+        def version = 32
+        downloadBootstrap("aarch64", "8cce8a916a3a8db38f7d1880b697708662fb9b555b35098c8c3b8ee1639a847b", version)
+        downloadBootstrap("arm",     "f313b819e90c7bedf3b45941d8a64c0cec73e2c2b8030a00565306d3011f25cc", version)
+        downloadBootstrap("i686",    "89ff9d63f9bccfbc1406b70fe1c9a18b124456772ebb3fe0078ecdb2bc21acae", version)
+        downloadBootstrap("x86_64",  "37e07f73592adbab5bfe2a5185f56b29f9e331aa172d13f0d57bdb2c0ef62d69", version)
     }
 }
 

From e1f799f9a1f9e4dd8eaab4c8b3205b73c7455424 Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Tue, 17 Nov 2020 20:40:40 +0200
Subject: [PATCH 148/912] version 0.103

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 8fa1fc96f1..09aee06c90 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -17,8 +17,8 @@ android {
         applicationId "com.termux"
         minSdkVersion project.properties.minSdkVersion.toInteger()
         targetSdkVersion project.properties.targetSdkVersion.toInteger()
-        versionCode 102
-        versionName "0.102"
+        versionCode 103
+        versionName "0.103"
 
         externalNativeBuild {
             ndkBuild {

From 20aac6aa72e958b9ef61eb6d8e58ca81e7793551 Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Wed, 18 Nov 2020 03:04:38 +0200
Subject: [PATCH 149/912] copy FUNDING.yml from termux-packages repo

---
 .github/FUNDING.yml | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 .github/FUNDING.yml

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 0000000000..7871554d6e
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1,2 @@
+patreon: termux
+custom: https://paypal.me/fornwall

From 4066c5df4214e14b256af7d989b3edd43371a684 Mon Sep 17 00:00:00 2001
From: Lucy Phipps <landfillbaby@users.noreply.github.com>
Date: Tue, 24 Nov 2020 19:01:02 +0000
Subject: [PATCH 150/912] don't add $PREFIX/bin/applets to $PATH

busybox doesn't use that folder anymore, and is deprecated anyway
---
 app/src/main/java/com/termux/app/BackgroundJob.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/termux/app/BackgroundJob.java b/app/src/main/java/com/termux/app/BackgroundJob.java
index 657cce7df6..3df100260d 100644
--- a/app/src/main/java/com/termux/app/BackgroundJob.java
+++ b/app/src/main/java/com/termux/app/BackgroundJob.java
@@ -161,7 +161,7 @@ static String[] buildEnvironment(boolean failSafe, String cwd) {
             environment.add("PATH= " + System.getenv("PATH"));
         } else {
             environment.add("LANG=en_US.UTF-8");
-            environment.add("PATH=" + TermuxService.PREFIX_PATH + "/bin:" + TermuxService.PREFIX_PATH + "/bin/applets");
+            environment.add("PATH=" + TermuxService.PREFIX_PATH + "/bin");
             environment.add("PWD=" + cwd);
             environment.add("TMPDIR=" + TermuxService.PREFIX_PATH + "/tmp");
         }

From 8925ae67bb0fe4b6f96aff94a95ca0dbb80d3835 Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Fri, 11 Dec 2020 17:35:28 +0200
Subject: [PATCH 151/912] update readme

---
 README.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/README.md b/README.md
index 3cf831b390..291a96c6e6 100644
--- a/README.md
+++ b/README.md
@@ -14,6 +14,15 @@ Note that this repository is for the app itself (the user interface and the
 terminal emulation). For the packages installable inside the app, see
 [termux/termux-packages](https://github.com/termux/termux-packages)
 
+***
+
+**@termux is looking for Termux Application maintainer 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.
+
+***
+
 ## Installation
 
 Termux application can be obtained from:

From 2820f6a7b8b8ca9e28306f5de01ef745cda61bc1 Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Fri, 11 Dec 2020 17:36:14 +0200
Subject: [PATCH 152/912] update readme

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 291a96c6e6..8f43c191e4 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ terminal emulation). For the packages installable inside the app, see
 
 ***
 
-**@termux is looking for Termux Application maintainer for implementing new features
+**@termux is looking for Termux Application maintainer 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.

From 1b3283bd69610b509733aac49ef0c758c4e9a73c Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Fri, 11 Dec 2020 20:07:40 +0200
Subject: [PATCH 153/912] update bootstrap archives

---
 app/build.gradle | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 09aee06c90..063ec219e4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -133,11 +133,11 @@ clean {
 
 task downloadBootstraps(){
     doLast {
-        def version = 32
-        downloadBootstrap("aarch64", "8cce8a916a3a8db38f7d1880b697708662fb9b555b35098c8c3b8ee1639a847b", version)
-        downloadBootstrap("arm",     "f313b819e90c7bedf3b45941d8a64c0cec73e2c2b8030a00565306d3011f25cc", version)
-        downloadBootstrap("i686",    "89ff9d63f9bccfbc1406b70fe1c9a18b124456772ebb3fe0078ecdb2bc21acae", version)
-        downloadBootstrap("x86_64",  "37e07f73592adbab5bfe2a5185f56b29f9e331aa172d13f0d57bdb2c0ef62d69", version)
+        def version = 33
+        downloadBootstrap("aarch64", "e8dbab424774db8d6cb3d85836dd910855aaef15bbd50e6a0fae6dc6587f7e66", version)
+        downloadBootstrap("arm",     "19c496bc9a867d8b6fac536d4bd518ff288dd381fa89544136051710f7651db3", version)
+        downloadBootstrap("i686",    "109fd6ca643a54480233152a7b8f42ed8f9ae5adf6fc4da6db4966632df3a180", version)
+        downloadBootstrap("x86_64",  "e1182fd8d3d423ea351b93baf3bc853a25185df002da42725b9a5e09a30dfda1", version)
     }
 }
 

From 6b0d531758358b70cc5235488ef6ee7d2d3ea657 Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Thu, 17 Dec 2020 20:27:20 +0200
Subject: [PATCH 154/912] Revert "update readme"

---
 README.md | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/README.md b/README.md
index 8f43c191e4..3cf831b390 100644
--- a/README.md
+++ b/README.md
@@ -14,15 +14,6 @@ Note that this repository is for the app itself (the user interface and the
 terminal emulation). For the packages installable inside the app, see
 [termux/termux-packages](https://github.com/termux/termux-packages)
 
-***
-
-**@termux is looking for Termux Application maintainer 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.
-
-***
-
 ## Installation
 
 Termux application can be obtained from:

From 5ca67dd8851b5631703ea24866fde97e24781874 Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Tue, 29 Dec 2020 13:40:25 +0200
Subject: [PATCH 155/912] update bootstrap archives

---
 app/build.gradle | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 063ec219e4..1199864127 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -133,11 +133,11 @@ clean {
 
 task downloadBootstraps(){
     doLast {
-        def version = 33
-        downloadBootstrap("aarch64", "e8dbab424774db8d6cb3d85836dd910855aaef15bbd50e6a0fae6dc6587f7e66", version)
-        downloadBootstrap("arm",     "19c496bc9a867d8b6fac536d4bd518ff288dd381fa89544136051710f7651db3", version)
-        downloadBootstrap("i686",    "109fd6ca643a54480233152a7b8f42ed8f9ae5adf6fc4da6db4966632df3a180", version)
-        downloadBootstrap("x86_64",  "e1182fd8d3d423ea351b93baf3bc853a25185df002da42725b9a5e09a30dfda1", version)
+        def version = 34
+        downloadBootstrap("aarch64", "7f56e8ee5573a8351925ff4010c6dea240cd56194ba0b9a686c3d8289859a05", version)
+        downloadBootstrap("arm",     "fa41377fb07cac2e4c15f32f3e7ea8116d60efadc1261176acb42646a71637f0", version)
+        downloadBootstrap("i686",    "61dcae560e706f808e524b8c3b234c47ea0e2bf6c6b0d5edebe53e6fdb956fe1", version)
+        downloadBootstrap("x86_64",  "1b616a4d591809874a06b06f309441320a0b9781e8ef5c148123530303b2533d", version)
     }
 }
 

From d267843e36cf6a8039f3f1c50fec2113f4a8a260 Mon Sep 17 00:00:00 2001
From: Kevin LeBlanc <kevin.canadian@gmail.com>
Date: Sun, 20 Dec 2020 23:35:32 +0100
Subject: [PATCH 156/912] Don't exclude hidden files from document provider
 (#1220)

Credit to @johnmellor for requesting the document provider in the
first place via #79, mentioning this limitation in a comment on
that issue, and creating a commit like this one to address it.
---
 .../com/termux/filepicker/TermuxDocumentsProvider.java     | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/termux/filepicker/TermuxDocumentsProvider.java b/app/src/main/java/com/termux/filepicker/TermuxDocumentsProvider.java
index 6a84904033..cbecfd705e 100644
--- a/app/src/main/java/com/termux/filepicker/TermuxDocumentsProvider.java
+++ b/app/src/main/java/com/termux/filepicker/TermuxDocumentsProvider.java
@@ -91,9 +91,7 @@ public Cursor queryChildDocuments(String parentDocumentId, String[] projection,
         final MatrixCursor result = new MatrixCursor(projection != null ? projection : DEFAULT_DOCUMENT_PROJECTION);
         final File parent = getFileForDocId(parentDocumentId);
         for (File file : parent.listFiles()) {
-            if (!file.getName().startsWith(".")) {
-                includeFile(result, null, file);
-            }
+            includeFile(result, null, file);
         }
         return result;
     }
@@ -177,8 +175,7 @@ public Cursor querySearchDocuments(String rootId, String query, String[] project
             } catch (IOException e) {
                 isInsideHome = true;
             }
-            final boolean isHidden = file.getName().startsWith(".");
-            if (isInsideHome && !isHidden) {
+            if (isInsideHome) {
                 if (file.isDirectory()) {
                     Collections.addAll(pending, file.listFiles());
                 } else {

From cb13a5a5314f1093a6f828a930aecc448453657c Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Tue, 29 Dec 2020 13:45:18 +0200
Subject: [PATCH 157/912] version 0.104

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 1199864127..f503e02c73 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -17,8 +17,8 @@ android {
         applicationId "com.termux"
         minSdkVersion project.properties.minSdkVersion.toInteger()
         targetSdkVersion project.properties.targetSdkVersion.toInteger()
-        versionCode 103
-        versionName "0.103"
+        versionCode 104
+        versionName "0.104"
 
         externalNativeBuild {
             ndkBuild {

From eaea0f74a511c8f54ce636d4e7d53f5f36ae6d78 Mon Sep 17 00:00:00 2001
From: Henrik Grimler <henrik@grimler.se>
Date: Fri, 1 Jan 2021 16:59:59 +0100
Subject: [PATCH 158/912] Fix github links for terminal-{emulator,view} jcenter
 packages

---
 terminal-emulator/build.gradle | 4 ++--
 terminal-view/build.gradle     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/terminal-emulator/build.gradle b/terminal-emulator/build.gradle
index 4b37b79226..cadd7e5a71 100644
--- a/terminal-emulator/build.gradle
+++ b/terminal-emulator/build.gradle
@@ -11,8 +11,8 @@ ext {
     libraryName = 'TerminalEmulator'
     artifact = 'terminal-emulator'
     libraryDescription = 'The terminal emulator used in Termux'
-    siteUrl = 'https://github.com/termux/termux'
-    gitUrl = 'https://github.com/termux/termux.git'
+    siteUrl = 'https://github.com/termux/termux-app'
+    gitUrl = 'https://github.com/termux/termux-app.git'
     libraryVersion = '0.52'
 }
 
diff --git a/terminal-view/build.gradle b/terminal-view/build.gradle
index 6c672ddbdd..791f2f9fdb 100644
--- a/terminal-view/build.gradle
+++ b/terminal-view/build.gradle
@@ -11,8 +11,8 @@ ext {
     libraryName = 'TerminalView'
     artifact = 'terminal-view'
     libraryDescription = 'The terminal view used in Termux'
-    siteUrl = 'https://github.com/termux/termux'
-    gitUrl = 'https://github.com/termux/termux.git'
+    siteUrl = 'https://github.com/termux/termux-app'
+    gitUrl = 'https://github.com/termux/termux-app.git'
     libraryVersion = '0.50'
 }
 

From 43bbef9a11a483a106dbfab2daf45bd6c62837f2 Mon Sep 17 00:00:00 2001
From: Henrik Grimler <henrik@grimler.se>
Date: Fri, 1 Jan 2021 17:14:04 +0100
Subject: [PATCH 159/912] Update plugins and gradle to latest versions

---
 app/build.gradle                         | 6 +++---
 build.gradle                             | 2 +-
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 terminal-emulator/build.gradle           | 6 +++---
 terminal-view/build.gradle               | 6 +++---
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index f503e02c73..b41d0fa255 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,7 +9,7 @@ android {
     dependencies {
         implementation "androidx.annotation:annotation:1.1.0"
         implementation "androidx.viewpager:viewpager:1.0.0"
-        implementation "androidx.drawerlayout:drawerlayout:1.1.0"
+        implementation "androidx.drawerlayout:drawerlayout:1.1.1"
         implementation project(":terminal-view")
     }
 
@@ -72,8 +72,8 @@ android {
 }
 
 dependencies {
-    testImplementation 'junit:junit:4.13'
-    testImplementation 'org.robolectric:robolectric:4.3.1'
+    testImplementation 'junit:junit:4.13.1'
+    testImplementation 'org.robolectric:robolectric:4.4'
 }
 
 task versionName {
diff --git a/build.gradle b/build.gradle
index d803478dbb..82454a202b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.1'
+        classpath 'com.android.tools.build:gradle:4.1.1'
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 12d38de6a4..4d9ca16491 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/terminal-emulator/build.gradle b/terminal-emulator/build.gradle
index cadd7e5a71..4673ab3e90 100644
--- a/terminal-emulator/build.gradle
+++ b/terminal-emulator/build.gradle
@@ -1,6 +1,6 @@
 plugins {
-    id "com.jfrog.bintray" version "1.7.3"
-    id "com.github.dcendents.android-maven" version "2.0"
+    id "com.jfrog.bintray" version "1.8.5"
+    id "com.github.dcendents.android-maven" version "2.1"
 }
 
 apply plugin: 'com.android.library'
@@ -61,7 +61,7 @@ tasks.withType(Test) {
 }
 
 dependencies {
-    testImplementation 'junit:junit:4.13'
+    testImplementation 'junit:junit:4.13.1'
 }
 
 apply from: '../scripts/bintray-publish.gradle'
diff --git a/terminal-view/build.gradle b/terminal-view/build.gradle
index 791f2f9fdb..35a78ad7fb 100644
--- a/terminal-view/build.gradle
+++ b/terminal-view/build.gradle
@@ -1,6 +1,6 @@
 plugins {
-    id "com.jfrog.bintray" version "1.7.3"
-    id "com.github.dcendents.android-maven" version "2.0"
+    id "com.jfrog.bintray" version "1.8.5"
+    id "com.github.dcendents.android-maven" version "2.1"
 }
 
 apply plugin: 'com.android.library'
@@ -44,7 +44,7 @@ android {
 }
 
 dependencies {
-    testImplementation 'junit:junit:4.13'
+    testImplementation 'junit:junit:4.13.1'
 }
 
 apply from: '../scripts/bintray-publish.gradle'

From 7fe5bd32c8fbca2dae8a99dc43197c329ce748ac Mon Sep 17 00:00:00 2001
From: Henrik Grimler <henrik@grimler.se>
Date: Fri, 1 Jan 2021 17:14:26 +0100
Subject: [PATCH 160/912] Update ndk to r22

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 945ab5d248..4cb3411fac 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -17,5 +17,5 @@ android.useAndroidX=true
 
 minSdkVersion=24
 targetSdkVersion=28
-ndkVersion=21.3.6528147
+ndkVersion=22.0.7026061
 compileSdkVersion=28

From b1d4c0c7fedcd073623d61aae05ab1340fe4fbb4 Mon Sep 17 00:00:00 2001
From: Henrik Grimler <henrik@grimler.se>
Date: Fri, 1 Jan 2021 17:41:18 +0100
Subject: [PATCH 161/912] app: disable test for "ProtectedPermissions"

Needed for tests to pass after READ_LOGS and WRITE_SECURE_SETTINGS
were added to AndroidManifest.xml.
---
 app/build.gradle | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/build.gradle b/app/build.gradle
index b41d0fa255..cc2d6098fd 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -64,6 +64,10 @@ android {
         }
     }
 
+    lintOptions {
+        disable 'ProtectedPermissions'
+    }
+
     testOptions {
         unitTests {
             includeAndroidResources = true

From fc30eba2477fbe7bf37ad6369d3e8a5b23ff9fb7 Mon Sep 17 00:00:00 2001
From: Henrik Grimler <henrik@grimler.se>
Date: Fri, 1 Jan 2021 17:47:15 +0100
Subject: [PATCH 162/912] terminal-view: silence warning from use of
 SHOW_AS_ACTION_ALWAYS

```
Prefer "SHOW_AS_ACTION_IF_ROOM" instead of "SHOW_AS_ACTION_ALWAYS"
```
---
 terminal-view/src/main/java/com/termux/view/TerminalView.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/terminal-view/src/main/java/com/termux/view/TerminalView.java b/terminal-view/src/main/java/com/termux/view/TerminalView.java
index 301f33fe3b..b9df06f946 100644
--- a/terminal-view/src/main/java/com/termux/view/TerminalView.java
+++ b/terminal-view/src/main/java/com/termux/view/TerminalView.java
@@ -1197,7 +1197,7 @@ public void show() {
             final ActionMode.Callback callback = new ActionMode.Callback() {
                 @Override
                 public boolean onCreateActionMode(ActionMode mode, Menu menu) {
-                    int show = MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT;
+                    int show = MenuItem.SHOW_AS_ACTION_IF_ROOM | MenuItem.SHOW_AS_ACTION_WITH_TEXT;
 
                     ClipboardManager clipboard = (ClipboardManager) getContext().getSystemService(Context.CLIPBOARD_SERVICE);
                     menu.add(Menu.NONE, 1, Menu.NONE, R.string.copy_text).setShowAsAction(show);

From b895cbbb1e2367a918a1d95c7c341664f1b2f5ba Mon Sep 17 00:00:00 2001
From: Henrik Grimler <henrik@grimler.se>
Date: Fri, 1 Jan 2021 18:10:09 +0100
Subject: [PATCH 163/912] app: set importantForAutofill="no" for extra keys
 input field

Fixes warning "extra_keys_right.xml:2: Missing autofillHints attribute".
---
 app/src/main/res/layout/extra_keys_right.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/layout/extra_keys_right.xml b/app/src/main/res/layout/extra_keys_right.xml
index c2513bf990..ef01c71a18 100644
--- a/app/src/main/res/layout/extra_keys_right.xml
+++ b/app/src/main/res/layout/extra_keys_right.xml
@@ -7,6 +7,7 @@
     android:imeOptions="actionSend|flagNoFullscreen"
     android:maxLines="1"
     android:inputType="text"
+    android:importantForAutofill="no"
     android:textColor="@android:color/white"
     android:textColorHighlight="@android:color/darker_gray"
     android:paddingTop="0dp"

From b467b68f7b47a2c65fc4530221223f07bcd9a37d Mon Sep 17 00:00:00 2001
From: Henrik Grimler <henrik@grimler.se>
Date: Fri, 1 Jan 2021 17:27:05 +0100
Subject: [PATCH 164/912] terminal-view: mv code to get properties to its own
 function

---
 .../java/com/termux/view/TerminalView.java    | 43 +++++++++++++------
 1 file changed, 29 insertions(+), 14 deletions(-)

diff --git a/terminal-view/src/main/java/com/termux/view/TerminalView.java b/terminal-view/src/main/java/com/termux/view/TerminalView.java
index b9df06f946..84285bcad0 100644
--- a/terminal-view/src/main/java/com/termux/view/TerminalView.java
+++ b/terminal-view/src/main/java/com/termux/view/TerminalView.java
@@ -255,20 +255,7 @@ public boolean attachSession(TerminalSession session) {
 
     @Override
     public InputConnection onCreateInputConnection(EditorInfo outAttrs) {
-        File propsFile = new File(getContext().getFilesDir() + "/home/.termux/termux.properties");
-        if (!propsFile.exists())
-            propsFile = new File(getContext().getFilesDir() + "/home/.config/termux/termux.properties");
-
-        Properties props = new Properties();
-        try {
-            if (propsFile.isFile() && propsFile.canRead()) {
-                try (FileInputStream in = new FileInputStream(propsFile)) {
-                    props.load(new InputStreamReader(in, StandardCharsets.UTF_8));
-                }
-            }
-        } catch (Exception e) {
-            Log.e("termux", "Error loading props", e);
-        }
+        Properties props = getProperties();
 
         if (props.getProperty("enforce-char-based-input", "false").equals("true")) {
             // Some keyboards seems do not reset the internal state on TYPE_NULL.
@@ -1544,6 +1531,34 @@ private void updateFloatingToolbarVisibility(MotionEvent event) {
         }
     }
 
+    private Properties getProperties() {
+        File propsFile;
+        Properties props = new Properties();
+        String possiblePropLocations[] = {
+            getContext().getFilesDir() + "/home/.termux/termux.properties",
+            getContext().getFilesDir() + "/home/.config/termux/termux.properties"
+        };
+
+        propsFile = new File(possiblePropLocations[0]);
+        int i = 1;
+        while (!propsFile.exists() && i <= possiblePropLocations.length) {
+            propsFile = new File(possiblePropLocations[i]);
+            i += 1;
+        }
+
+        try {
+            if (propsFile.isFile() && propsFile.canRead()) {
+                try (FileInputStream in = new FileInputStream(propsFile)) {
+                    props.load(new InputStreamReader(in, StandardCharsets.UTF_8));
+                }
+            }
+        } catch (Exception e) {
+            Log.e("termux", "Error loading props", e);
+        }
+
+        return props;
+    }
+
     @RequiresApi(api = Build.VERSION_CODES.O)
     @Override
     public void autofill(AutofillValue value) {

From f1e973f0d2000957a21387a8ee2f65bd08c776fb Mon Sep 17 00:00:00 2001
From: Henrik Grimler <henrik@grimler.se>
Date: Tue, 7 Jul 2020 18:04:47 +0200
Subject: [PATCH 165/912] terminal-view: add "ctrl-space-workaround" property

Makes it possible to run ctrl+space with hardware keyboards on
devices/ROMs where it otherwise is broken. On devices where it already
works this workaround breaks ctrl+space though.

Where to add this fix was investigated and found by @5bodnar.
---
 .../src/main/java/com/termux/view/TerminalView.java        | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/terminal-view/src/main/java/com/termux/view/TerminalView.java b/terminal-view/src/main/java/com/termux/view/TerminalView.java
index 84285bcad0..433925239d 100644
--- a/terminal-view/src/main/java/com/termux/view/TerminalView.java
+++ b/terminal-view/src/main/java/com/termux/view/TerminalView.java
@@ -539,6 +539,8 @@ public boolean onTouchEvent(MotionEvent ev) {
 
     @Override
     public boolean onKeyPreIme(int keyCode, KeyEvent event) {
+        Properties props = getProperties();
+
         if (LOG_KEY_EVENTS)
             Log.i(EmulatorDebug.LOG_TAG, "onKeyPreIme(keyCode=" + keyCode + ", event=" + event + ")");
         if (keyCode == KeyEvent.KEYCODE_BACK) {
@@ -554,6 +556,11 @@ public boolean onKeyPreIme(int keyCode, KeyEvent event) {
                         return onKeyUp(keyCode, event);
                 }
             }
+        } else if (props.getProperty("ctrl-space-workaround", "false").equals("true") &&
+                   keyCode == KeyEvent.KEYCODE_SPACE && event.isCtrlPressed()) {
+            /* ctrl + space does not work on some ROMs without this workaround.
+               However, this breaks it on devices where it works out of the box. */
+            return onKeyDown(keyCode, event);
         }
         return super.onKeyPreIme(keyCode, event);
     }

From 538a1d5cdf286bb11ba46285217524cd41d52448 Mon Sep 17 00:00:00 2001
From: Lucy Phipps <landfillbaby@users.noreply.github.com>
Date: Wed, 30 Dec 2020 01:35:45 +0000
Subject: [PATCH 166/912] F-Droid URL for Termux:Styling

---
 app/src/main/java/com/termux/app/TermuxActivity.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index 593c7726b5..e7a87dc5ba 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -861,7 +861,7 @@ public boolean onContextItemSelected(MenuItem item) {
                     // The startActivity() call is not documented to throw IllegalArgumentException.
                     // However, crash reporting shows that it sometimes does, so catch it here.
                     new AlertDialog.Builder(this).setMessage(R.string.styling_not_installed)
-                        .setPositiveButton(R.string.styling_install, (dialog, which) -> startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("http://play.google.com/store/apps/details?id=com.termux.styling")))).setNegativeButton(android.R.string.cancel, null).show();
+                        .setPositiveButton(R.string.styling_install, (dialog, which) -> startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://f-droid.org/en/packages/com.termux.styling/")))).setNegativeButton(android.R.string.cancel, null).show();
                 }
                 return true;
             }

From a0298285e3897f53f632f1c1435064bf5b97efc6 Mon Sep 17 00:00:00 2001
From: Henrik Grimler <henrik@grimler.se>
Date: Sat, 2 Jan 2021 08:57:48 +0100
Subject: [PATCH 167/912] terminal-emulator: tests: avoid error about methods
 not being mocked

unitTests.returnDefaultValues = true fixes it.
More info: http://g.co/androidstudio/not-mocked
---
 terminal-emulator/build.gradle | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/terminal-emulator/build.gradle b/terminal-emulator/build.gradle
index 4673ab3e90..87fa1e563e 100644
--- a/terminal-emulator/build.gradle
+++ b/terminal-emulator/build.gradle
@@ -52,6 +52,10 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+
+    testOptions {
+        unitTests.returnDefaultValues = true
+    }
 }
 
 tasks.withType(Test) {

From 7d31b7f480ad0df5b27d9415e603cfbe166fbc0e Mon Sep 17 00:00:00 2001
From: Henrik Grimler <henrik@grimler.se>
Date: Sat, 2 Jan 2021 09:01:28 +0100
Subject: [PATCH 168/912] terminal-emulator: tests: change spaces to tabs for
 consistency

---
 .../com/termux/terminal/ByteQueueTest.java    |  6 +-
 .../ControlSequenceIntroducerTest.java        | 46 ++++++-------
 .../termux/terminal/CursorAndScreenTest.java  | 30 ++++-----
 .../com/termux/terminal/KeyHandlerTest.java   | 26 ++++----
 .../java/com/termux/terminal/ResizeTest.java  |  4 +-
 .../com/termux/terminal/ScrollRegionTest.java | 40 ++++++------
 .../com/termux/terminal/TerminalTest.java     | 64 +++++++++----------
 .../com/termux/terminal/TerminalTestCase.java | 20 +++---
 .../com/termux/terminal/TextStyleTest.java    | 34 +++++-----
 .../java/com/termux/terminal/WcWidthTest.java | 46 ++++++-------
 10 files changed, 158 insertions(+), 158 deletions(-)

diff --git a/terminal-emulator/src/test/java/com/termux/terminal/ByteQueueTest.java b/terminal-emulator/src/test/java/com/termux/terminal/ByteQueueTest.java
index 1eb0278bf5..44a605bddc 100644
--- a/terminal-emulator/src/test/java/com/termux/terminal/ByteQueueTest.java
+++ b/terminal-emulator/src/test/java/com/termux/terminal/ByteQueueTest.java
@@ -17,13 +17,13 @@ private static void assertArrayEquals(byte[] expected, byte[] actual) {
 
 	public void testCompleteWrites() throws Exception {
 		ByteQueue q = new ByteQueue(10);
-        assertTrue(q.write(new byte[]{1, 2, 3}, 0, 3));
+		assertTrue(q.write(new byte[]{1, 2, 3}, 0, 3));
 
 		byte[] arr = new byte[10];
 		assertEquals(3, q.read(arr, true));
 		assertArrayEquals(new byte[]{1, 2, 3}, new byte[]{arr[0], arr[1], arr[2]});
 
-        assertTrue(q.write(new byte[]{1, 2, 3, 4, 5, 6, 7, 8, 9, 10}, 0, 10));
+		assertTrue(q.write(new byte[]{1, 2, 3, 4, 5, 6, 7, 8, 9, 10}, 0, 10));
 		assertEquals(10, q.read(arr, true));
 		assertArrayEquals(new byte[]{1, 2, 3, 4, 5, 6, 7, 8, 9, 10}, arr);
 	}
@@ -43,7 +43,7 @@ public void testQueueWraparound() throws Exception {
 	public void testWriteNotesClosing() throws Exception {
 		ByteQueue q = new ByteQueue(10);
 		q.close();
-        assertFalse(q.write(new byte[]{1, 2, 3}, 0, 3));
+		assertFalse(q.write(new byte[]{1, 2, 3}, 0, 3));
 	}
 
 	public void testReadNonBlocking() throws Exception {
diff --git a/terminal-emulator/src/test/java/com/termux/terminal/ControlSequenceIntroducerTest.java b/terminal-emulator/src/test/java/com/termux/terminal/ControlSequenceIntroducerTest.java
index 62e898c06b..5a12edd749 100644
--- a/terminal-emulator/src/test/java/com/termux/terminal/ControlSequenceIntroducerTest.java
+++ b/terminal-emulator/src/test/java/com/termux/terminal/ControlSequenceIntroducerTest.java
@@ -35,31 +35,31 @@ public void testCsiSGRParameters() {
 		withTerminalSized(3, 2).enterString("\033[0;38;2;255;255;255;48;2;0;0;0;1;2;3;4;5;7;8;9mabc").assertLinesAre("abc", "   ");
 	}
 
-    /** CSI Ps b  Repeat the preceding graphic character Ps times (REP). */
-    public void testRepeat() {
-        withTerminalSized(3, 2).enterString("a\033[b").assertLinesAre("aa ", "   ");
-        withTerminalSized(3, 2).enterString("a\033[2b").assertLinesAre("aaa", "   ");
-        // When no char has been output we ignore REP:
-        withTerminalSized(3, 2).enterString("\033[b").assertLinesAre("   ", "   ");
-        // This shows that REP outputs the last emitted code point and not the one relative to the
-        // current cursor position:
-        withTerminalSized(5, 2).enterString("abcde\033[2G\033[2b\n").assertLinesAre("aeede", "     ");
-    }
+	/** CSI Ps b  Repeat the preceding graphic character Ps times (REP). */
+	public void testRepeat() {
+		withTerminalSized(3, 2).enterString("a\033[b").assertLinesAre("aa ", "   ");
+		withTerminalSized(3, 2).enterString("a\033[2b").assertLinesAre("aaa", "   ");
+		// When no char has been output we ignore REP:
+		withTerminalSized(3, 2).enterString("\033[b").assertLinesAre("   ", "   ");
+		// This shows that REP outputs the last emitted code point and not the one relative to the
+		// current cursor position:
+		withTerminalSized(5, 2).enterString("abcde\033[2G\033[2b\n").assertLinesAre("aeede", "     ");
+	}
 
-    /** CSI 3 J  Clear scrollback (xterm, libvte; non-standard). */
-    public void testCsi3J() {
-        withTerminalSized(3, 2).enterString("a\r\nb\r\nc\r\nd");
-        assertEquals("a\nb\nc\nd", mTerminal.getScreen().getTranscriptText());
-        enterString("\033[3J");
-        assertEquals("c\nd", mTerminal.getScreen().getTranscriptText());
+	/** CSI 3 J  Clear scrollback (xterm, libvte; non-standard). */
+	public void testCsi3J() {
+		withTerminalSized(3, 2).enterString("a\r\nb\r\nc\r\nd");
+		assertEquals("a\nb\nc\nd", mTerminal.getScreen().getTranscriptText());
+		enterString("\033[3J");
+		assertEquals("c\nd", mTerminal.getScreen().getTranscriptText());
 
-        withTerminalSized(3, 2).enterString("Lorem_ipsum");
-        assertEquals("Lorem_ipsum", mTerminal.getScreen().getTranscriptText());
-        enterString("\033[3J");
-        assertEquals("ipsum", mTerminal.getScreen().getTranscriptText());
+		withTerminalSized(3, 2).enterString("Lorem_ipsum");
+		assertEquals("Lorem_ipsum", mTerminal.getScreen().getTranscriptText());
+		enterString("\033[3J");
+		assertEquals("ipsum", mTerminal.getScreen().getTranscriptText());
 
-        withTerminalSized(3, 2).enterString("w\r\nx\r\ny\r\nz\033[?1049h\033[3J\033[?1049l");
-        assertEquals("y\nz", mTerminal.getScreen().getTranscriptText());
-    }
+		withTerminalSized(3, 2).enterString("w\r\nx\r\ny\r\nz\033[?1049h\033[3J\033[?1049l");
+		assertEquals("y\nz", mTerminal.getScreen().getTranscriptText());
+	}
 
 }
diff --git a/terminal-emulator/src/test/java/com/termux/terminal/CursorAndScreenTest.java b/terminal-emulator/src/test/java/com/termux/terminal/CursorAndScreenTest.java
index 121cb22318..8a65e66d00 100644
--- a/terminal-emulator/src/test/java/com/termux/terminal/CursorAndScreenTest.java
+++ b/terminal-emulator/src/test/java/com/termux/terminal/CursorAndScreenTest.java
@@ -18,7 +18,7 @@ public void testDeleteLinesKeepsStyles() {
 		assertLinesAre("ABCDE", "FGHIJ", "KLMNO", "PQRST", "UVWXY");
 		for (int row = 0; row < 5; row++) {
 			for (int col = 0; col < 5; col++) {
-                long s = getStyleAt(row, col);
+				long s = getStyleAt(row, col);
 				Assert.assertEquals(col, TextStyle.decodeForeColor(s));
 				Assert.assertEquals(row, TextStyle.decodeBackColor(s));
 			}
@@ -43,7 +43,7 @@ public void testDeleteLinesKeepsStyles() {
 			for (int col = 0; col < 5; col++) {
 				int wantedForeground = (row == 1 || row == 2) ? 98 : col;
 				int wantedBackground = (row == 1 || row == 2) ? 99 : (row == 0 ? 2 : row);
-                long s = getStyleAt(row, col);
+				long s = getStyleAt(row, col);
 				Assert.assertEquals(wantedForeground, TextStyle.decodeForeColor(s));
 				Assert.assertEquals(wantedBackground, TextStyle.decodeBackColor(s));
 			}
@@ -159,11 +159,11 @@ public void testReportCursorPosition() {
 		}
 	}
 
-    /**
-     * See comments on horizontal tab handling in TerminalEmulator.java.
-     *
-     * We do not want to color already written cells when tabbing over them.
-     */
+	/**
+	 * See comments on horizontal tab handling in TerminalEmulator.java.
+	 * <p/>
+	 * We do not want to color already written cells when tabbing over them.
+	 */
 	public void DISABLED_testHorizontalTabColorsBackground() {
 		withTerminalSized(10, 3).enterString("\033[48;5;15m").enterString("\t");
 		assertCursorAt(0, 8);
@@ -214,14 +214,14 @@ public void testClearingOfAutowrap() {
 				"              -");
 	}
 
-    public void testBackspaceAcrossWrappedLines() {
-        // Backspace should not go to previous line if not auto-wrapped:
-        withTerminalSized(3, 3).enterString("hi\r\n\b\byou").assertLinesAre("hi ", "you", "   ");
-        // Backspace should go to previous line if auto-wrapped:
-        withTerminalSized(3, 3).enterString("hi y").assertLinesAre("hi ", "y  ", "   ").enterString("\b\b#").assertLinesAre("hi#", "y  ", "   ");
-        // Initial backspace should do nothing:
-        withTerminalSized(3, 3).enterString("\b\b\b\bhi").assertLinesAre("hi ", "   ", "   ");
-    }
+	public void testBackspaceAcrossWrappedLines() {
+		// Backspace should not go to previous line if not auto-wrapped:
+		withTerminalSized(3, 3).enterString("hi\r\n\b\byou").assertLinesAre("hi ", "you", "   ");
+		// Backspace should go to previous line if auto-wrapped:
+		withTerminalSized(3, 3).enterString("hi y").assertLinesAre("hi ", "y  ", "   ").enterString("\b\b#").assertLinesAre("hi#", "y  ", "   ");
+		// Initial backspace should do nothing:
+		withTerminalSized(3, 3).enterString("\b\b\b\bhi").assertLinesAre("hi ", "   ", "   ");
+	}
 
 	public void testCursorSaveRestoreLocation() {
 		// DEC save/restore
diff --git a/terminal-emulator/src/test/java/com/termux/terminal/KeyHandlerTest.java b/terminal-emulator/src/test/java/com/termux/terminal/KeyHandlerTest.java
index 9e3ee02691..0826c7fc07 100644
--- a/terminal-emulator/src/test/java/com/termux/terminal/KeyHandlerTest.java
+++ b/terminal-emulator/src/test/java/com/termux/terminal/KeyHandlerTest.java
@@ -174,18 +174,18 @@ public void testKeyCodes() {
 		assertKeysEquals("\033[23;2~", KeyHandler.getCode(KeyEvent.KEYCODE_F11, KeyHandler.KEYMOD_SHIFT, false, false));
 		assertKeysEquals("\033[24;2~", KeyHandler.getCode(KeyEvent.KEYCODE_F12, KeyHandler.KEYMOD_SHIFT, false, false));
 
-        assertKeysEquals("0", KeyHandler.getCode(KeyEvent.KEYCODE_NUMPAD_0, 0, false, false));
-        assertKeysEquals("1", KeyHandler.getCode(KeyEvent.KEYCODE_NUMPAD_1, 0, false, false));
-        assertKeysEquals("2", KeyHandler.getCode(KeyEvent.KEYCODE_NUMPAD_2, 0, false, false));
-        assertKeysEquals("3", KeyHandler.getCode(KeyEvent.KEYCODE_NUMPAD_3, 0, false, false));
-        assertKeysEquals("4", KeyHandler.getCode(KeyEvent.KEYCODE_NUMPAD_4, 0, false, false));
-        assertKeysEquals("5", KeyHandler.getCode(KeyEvent.KEYCODE_NUMPAD_5, 0, false, false));
-        assertKeysEquals("6", KeyHandler.getCode(KeyEvent.KEYCODE_NUMPAD_6, 0, false, false));
-        assertKeysEquals("7", KeyHandler.getCode(KeyEvent.KEYCODE_NUMPAD_7, 0, false, false));
-        assertKeysEquals("8", KeyHandler.getCode(KeyEvent.KEYCODE_NUMPAD_8, 0, false, false));
-        assertKeysEquals("9", KeyHandler.getCode(KeyEvent.KEYCODE_NUMPAD_9, 0, false, false));
-        assertKeysEquals(",", KeyHandler.getCode(KeyEvent.KEYCODE_NUMPAD_COMMA, 0, false, false));
-        assertKeysEquals(".", KeyHandler.getCode(KeyEvent.KEYCODE_NUMPAD_DOT, 0, false, false));
-    }
+		assertKeysEquals("0", KeyHandler.getCode(KeyEvent.KEYCODE_NUMPAD_0, 0, false, false));
+		assertKeysEquals("1", KeyHandler.getCode(KeyEvent.KEYCODE_NUMPAD_1, 0, false, false));
+		assertKeysEquals("2", KeyHandler.getCode(KeyEvent.KEYCODE_NUMPAD_2, 0, false, false));
+		assertKeysEquals("3", KeyHandler.getCode(KeyEvent.KEYCODE_NUMPAD_3, 0, false, false));
+		assertKeysEquals("4", KeyHandler.getCode(KeyEvent.KEYCODE_NUMPAD_4, 0, false, false));
+		assertKeysEquals("5", KeyHandler.getCode(KeyEvent.KEYCODE_NUMPAD_5, 0, false, false));
+		assertKeysEquals("6", KeyHandler.getCode(KeyEvent.KEYCODE_NUMPAD_6, 0, false, false));
+		assertKeysEquals("7", KeyHandler.getCode(KeyEvent.KEYCODE_NUMPAD_7, 0, false, false));
+		assertKeysEquals("8", KeyHandler.getCode(KeyEvent.KEYCODE_NUMPAD_8, 0, false, false));
+		assertKeysEquals("9", KeyHandler.getCode(KeyEvent.KEYCODE_NUMPAD_9, 0, false, false));
+		assertKeysEquals(",", KeyHandler.getCode(KeyEvent.KEYCODE_NUMPAD_COMMA, 0, false, false));
+		assertKeysEquals(".", KeyHandler.getCode(KeyEvent.KEYCODE_NUMPAD_DOT, 0, false, false));
+	}
 
 }
diff --git a/terminal-emulator/src/test/java/com/termux/terminal/ResizeTest.java b/terminal-emulator/src/test/java/com/termux/terminal/ResizeTest.java
index d0251da8f6..fa4a702473 100644
--- a/terminal-emulator/src/test/java/com/termux/terminal/ResizeTest.java
+++ b/terminal-emulator/src/test/java/com/termux/terminal/ResizeTest.java
@@ -93,7 +93,7 @@ public void testVerticalResize() {
 		enterString("\033[2J");
 		for (int r = 0; r < rows; r++) {
 			for (int c = 0; c < cols; c++) {
-                long style = getStyleAt(r, c);
+				long style = getStyleAt(r, c);
 				assertEquals(119, TextStyle.decodeForeColor(style));
 				assertEquals(129, TextStyle.decodeBackColor(style));
 			}
@@ -105,7 +105,7 @@ public void testVerticalResize() {
 		// After resize, screen should still be same color:
 		for (int r = 0; r < rows - 2; r++) {
 			for (int c = 0; c < cols; c++) {
-                long style = getStyleAt(r, c);
+				long style = getStyleAt(r, c);
 				assertEquals(119, TextStyle.decodeForeColor(style));
 				assertEquals(129, TextStyle.decodeBackColor(style));
 			}
diff --git a/terminal-emulator/src/test/java/com/termux/terminal/ScrollRegionTest.java b/terminal-emulator/src/test/java/com/termux/terminal/ScrollRegionTest.java
index bbb5e7ac73..cc01c0454b 100644
--- a/terminal-emulator/src/test/java/com/termux/terminal/ScrollRegionTest.java
+++ b/terminal-emulator/src/test/java/com/termux/terminal/ScrollRegionTest.java
@@ -107,24 +107,24 @@ public void testScrollDownBelowScrollRegion() {
 		assertLinesAre("1 ", "2 ", "3 ", "QQ", "YY");
 	}
 
-    /** See https://github.com/termux/termux-app/issues/1340 */
-    public void testScrollRegionDoesNotLimitCursorMovement() {
-        withTerminalSized(6, 4)
-            .enterString("\033[4;7r\033[3;1Haaa\033[Axxx")
-            .assertLinesAre(
-                "      ",
-                "   xxx",
-                "aaa   ",
-                "      "
-            );
-
-        withTerminalSized(6, 4)
-            .enterString("\033[1;3r\033[3;1Haaa\033[Bxxx")
-            .assertLinesAre(
-                "      ",
-                "      ",
-                "aaa   ",
-                "   xxx"
-            );
-    }
+	/** See https://github.com/termux/termux-app/issues/1340 */
+	public void testScrollRegionDoesNotLimitCursorMovement() {
+		withTerminalSized(6, 4)
+			.enterString("\033[4;7r\033[3;1Haaa\033[Axxx")
+			.assertLinesAre(
+				"      ",
+				"   xxx",
+				"aaa   ",
+				"      "
+			);
+
+		withTerminalSized(6, 4)
+			.enterString("\033[1;3r\033[3;1Haaa\033[Bxxx")
+			.assertLinesAre(
+				"      ",
+				"      ",
+				"aaa   ",
+				"   xxx"
+			);
+	}
 }
diff --git a/terminal-emulator/src/test/java/com/termux/terminal/TerminalTest.java b/terminal-emulator/src/test/java/com/termux/terminal/TerminalTest.java
index 8c11497999..af63fda104 100644
--- a/terminal-emulator/src/test/java/com/termux/terminal/TerminalTest.java
+++ b/terminal-emulator/src/test/java/com/termux/terminal/TerminalTest.java
@@ -159,7 +159,7 @@ public void testSelectGraphics() {
 		assertEquals(119, mTerminal.mForeColor);
 		assertEquals(129, mTerminal.mBackColor);
 
-        // Invalid parameter:
+		// Invalid parameter:
 		enterString("\033[48;8;129m");
 		assertEquals(119, mTerminal.mForeColor);
 		assertEquals(129, mTerminal.mBackColor);
@@ -169,30 +169,30 @@ public void testSelectGraphics() {
 		assertEquals(178, mTerminal.mForeColor);
 		assertEquals(179, mTerminal.mBackColor);
 
-        // 24 bit colors:
-        enterString(("\033[0m")); // Reset fg and bg colors.
-        enterString("\033[38;2;255;127;2m");
-        int expectedForeground = 0xff000000 | (255 << 16) | (127 << 8) | 2;
-        assertEquals(expectedForeground, mTerminal.mForeColor);
-        assertEquals(TextStyle.COLOR_INDEX_BACKGROUND, mTerminal.mBackColor);
-        enterString("\033[48;2;1;2;254m");
-        int expectedBackground = 0xff000000 | (1 << 16) | (2 << 8) | 254;
-        assertEquals(expectedForeground, mTerminal.mForeColor);
-        assertEquals(expectedBackground, mTerminal.mBackColor);
-
-        // 24 bit colors, set fg and bg at once:
-        enterString(("\033[0m")); // Reset fg and bg colors.
-        assertEquals(TextStyle.COLOR_INDEX_FOREGROUND, mTerminal.mForeColor);
-        assertEquals(TextStyle.COLOR_INDEX_BACKGROUND, mTerminal.mBackColor);
-        enterString("\033[38;2;255;127;2;48;2;1;2;254m");
-        assertEquals(expectedForeground, mTerminal.mForeColor);
-        assertEquals(expectedBackground, mTerminal.mBackColor);
-
-        // 24 bit colors, invalid input:
-        enterString("\033[38;2;300;127;2;48;2;1;300;254m");
-        assertEquals(expectedForeground, mTerminal.mForeColor);
-        assertEquals(expectedBackground, mTerminal.mBackColor);
-    }
+		// 24 bit colors:
+		enterString(("\033[0m")); // Reset fg and bg colors.
+		enterString("\033[38;2;255;127;2m");
+		int expectedForeground = 0xff000000 | (255 << 16) | (127 << 8) | 2;
+		assertEquals(expectedForeground, mTerminal.mForeColor);
+		assertEquals(TextStyle.COLOR_INDEX_BACKGROUND, mTerminal.mBackColor);
+		enterString("\033[48;2;1;2;254m");
+		int expectedBackground = 0xff000000 | (1 << 16) | (2 << 8) | 254;
+		assertEquals(expectedForeground, mTerminal.mForeColor);
+		assertEquals(expectedBackground, mTerminal.mBackColor);
+
+		// 24 bit colors, set fg and bg at once:
+		enterString(("\033[0m")); // Reset fg and bg colors.
+		assertEquals(TextStyle.COLOR_INDEX_FOREGROUND, mTerminal.mForeColor);
+		assertEquals(TextStyle.COLOR_INDEX_BACKGROUND, mTerminal.mBackColor);
+		enterString("\033[38;2;255;127;2;48;2;1;2;254m");
+		assertEquals(expectedForeground, mTerminal.mForeColor);
+		assertEquals(expectedBackground, mTerminal.mBackColor);
+
+		// 24 bit colors, invalid input:
+		enterString("\033[38;2;300;127;2;48;2;1;300;254m");
+		assertEquals(expectedForeground, mTerminal.mForeColor);
+		assertEquals(expectedBackground, mTerminal.mBackColor);
+	}
 
 	public void testBackgroundColorErase() {
 		final int rows = 3;
@@ -200,7 +200,7 @@ public void testBackgroundColorErase() {
 		withTerminalSized(cols, rows);
 		for (int r = 0; r < rows; r++) {
 			for (int c = 0; c < cols; c++) {
-                long style = getStyleAt(r, c);
+				long style = getStyleAt(r, c);
 				assertEquals(TextStyle.COLOR_INDEX_FOREGROUND, TextStyle.decodeForeColor(style));
 				assertEquals(TextStyle.COLOR_INDEX_BACKGROUND, TextStyle.decodeBackColor(style));
 			}
@@ -213,7 +213,7 @@ public void testBackgroundColorErase() {
 		enterString("\033[2J");
 		for (int r = 0; r < rows; r++) {
 			for (int c = 0; c < cols; c++) {
-                long style = getStyleAt(r, c);
+				long style = getStyleAt(r, c);
 				assertEquals(119, TextStyle.decodeForeColor(style));
 				assertEquals(129, TextStyle.decodeBackColor(style));
 			}
@@ -224,7 +224,7 @@ public void testBackgroundColorErase() {
 		enterString("\033[2L");
 		for (int r = 0; r < rows; r++) {
 			for (int c = 0; c < cols; c++) {
-                long style = getStyleAt(r, c);
+				long style = getStyleAt(r, c);
 				assertEquals((r == 0 || r == 1) ? 139 : 129, TextStyle.decodeBackColor(style));
 			}
 		}
@@ -289,9 +289,9 @@ public void testAutomargins() throws UnsupportedEncodingException {
 		withTerminalSized(3, 3).enterString("abc\r ").assertLinesAre(" bc", "   ", "   ").assertCursorAt(0, 1);
 	}
 
-    public void testTab() {
-        withTerminalSized(11, 2).enterString("01234567890\r\tXX").assertLinesAre("01234567XX0", "           ");
-        withTerminalSized(11, 2).enterString("01234567890\033[44m\r\tXX").assertLinesAre("01234567XX0", "           ");
-    }
+	public void testTab() {
+		withTerminalSized(11, 2).enterString("01234567890\r\tXX").assertLinesAre("01234567XX0", "           ");
+		withTerminalSized(11, 2).enterString("01234567890\033[44m\r\tXX").assertLinesAre("01234567XX0", "           ");
+	}
 
 }
diff --git a/terminal-emulator/src/test/java/com/termux/terminal/TerminalTestCase.java b/terminal-emulator/src/test/java/com/termux/terminal/TerminalTestCase.java
index 12c8befec3..5e5bde92f6 100644
--- a/terminal-emulator/src/test/java/com/termux/terminal/TerminalTestCase.java
+++ b/terminal-emulator/src/test/java/com/termux/terminal/TerminalTestCase.java
@@ -18,7 +18,7 @@ public static class MockTerminalOutput extends TerminalOutput {
 		public final List<ChangedTitle> titleChanges = new ArrayList<>();
 		public final List<String> clipboardPuts = new ArrayList<>();
 		public int bellsRung = 0;
-        public int colorsChanged = 0;
+		public int colorsChanged = 0;
 
 		@Override
 		public void write(byte[] data, int offset, int count) {
@@ -26,10 +26,10 @@ public void write(byte[] data, int offset, int count) {
 		}
 
 		public String getOutputAndClear() {
-            String result = new String(baos.toByteArray(), StandardCharsets.UTF_8);
-            baos.reset();
-            return result;
-        }
+			String result = new String(baos.toByteArray(), StandardCharsets.UTF_8);
+			baos.reset();
+			return result;
+		}
 
 		@Override
 		public void titleChanged(String oldTitle, String newTitle) {
@@ -46,11 +46,11 @@ public void onBell() {
 			bellsRung++;
 		}
 
-        @Override
-        public void onColorsChanged() {
-            colorsChanged++;
-        }
-    }
+		@Override
+		public void onColorsChanged() {
+			colorsChanged++;
+		}
+	}
 
 	public TerminalEmulator mTerminal;
 	public MockTerminalOutput mOutput;
diff --git a/terminal-emulator/src/test/java/com/termux/terminal/TextStyleTest.java b/terminal-emulator/src/test/java/com/termux/terminal/TextStyleTest.java
index 153458e04d..6ec7a34e3d 100644
--- a/terminal-emulator/src/test/java/com/termux/terminal/TextStyleTest.java
+++ b/terminal-emulator/src/test/java/com/termux/terminal/TextStyleTest.java
@@ -22,23 +22,23 @@ public void testEncodingSingle() {
 		}
 	}
 
-    public void testEncoding24Bit() {
-        int[] values = {255, 240, 127, 1, 0};
-        for (int red : values) {
-            for (int green : values) {
-                for (int blue : values) {
-                    int argb = 0xFF000000 | (red << 16) | (green << 8) | blue;
-                    long encoded = TextStyle.encode(argb, 0, 0);
-                    assertEquals(argb, TextStyle.decodeForeColor(encoded));
-                    encoded = TextStyle.encode(0, argb, 0);
-                    assertEquals(argb, TextStyle.decodeBackColor(encoded));
-                }
-            }
-        }
-    }
+	public void testEncoding24Bit() {
+		int[] values = {255, 240, 127, 1, 0};
+		for (int red : values) {
+			for (int green : values) {
+				for (int blue : values) {
+					int argb = 0xFF000000 | (red << 16) | (green << 8) | blue;
+					long encoded = TextStyle.encode(argb, 0, 0);
+					assertEquals(argb, TextStyle.decodeForeColor(encoded));
+					encoded = TextStyle.encode(0, argb, 0);
+					assertEquals(argb, TextStyle.decodeBackColor(encoded));
+				}
+			}
+		}
+	}
 
 
-    public void testEncodingCombinations() {
+	public void testEncodingCombinations() {
 		for (int f1 : ALL_EFFECTS) {
 			for (int f2 : ALL_EFFECTS) {
 				int combined = f1 | f2;
@@ -54,9 +54,9 @@ public void testEncodingStrikeThrough() {
 	}
 
 	public void testEncodingProtected() {
-        long encoded = TextStyle.encode(TextStyle.COLOR_INDEX_FOREGROUND, TextStyle.COLOR_INDEX_BACKGROUND,
+		long encoded = TextStyle.encode(TextStyle.COLOR_INDEX_FOREGROUND, TextStyle.COLOR_INDEX_BACKGROUND,
 				TextStyle.CHARACTER_ATTRIBUTE_STRIKETHROUGH);
-        assertEquals(0, (TextStyle.decodeEffect(encoded) & TextStyle.CHARACTER_ATTRIBUTE_PROTECTED));
+		assertEquals(0, (TextStyle.decodeEffect(encoded) & TextStyle.CHARACTER_ATTRIBUTE_PROTECTED));
 		encoded = TextStyle.encode(TextStyle.COLOR_INDEX_FOREGROUND, TextStyle.COLOR_INDEX_BACKGROUND,
 				TextStyle.CHARACTER_ATTRIBUTE_STRIKETHROUGH | TextStyle.CHARACTER_ATTRIBUTE_PROTECTED);
 		assertTrue((TextStyle.decodeEffect(encoded) & TextStyle.CHARACTER_ATTRIBUTE_PROTECTED) != 0);
diff --git a/terminal-emulator/src/test/java/com/termux/terminal/WcWidthTest.java b/terminal-emulator/src/test/java/com/termux/terminal/WcWidthTest.java
index 60e4ace410..c0d9a0bcad 100644
--- a/terminal-emulator/src/test/java/com/termux/terminal/WcWidthTest.java
+++ b/terminal-emulator/src/test/java/com/termux/terminal/WcWidthTest.java
@@ -15,12 +15,12 @@ public void testPrintableAscii() {
 		}
 	}
 
-    public void testSomeWidthOne() {
-        assertWidthIs(1, 'å');
-        assertWidthIs(1, 'ä');
-        assertWidthIs(1, 'ö');
-        assertWidthIs(1, 0x23F2);
-    }
+	public void testSomeWidthOne() {
+		assertWidthIs(1, 'å');
+		assertWidthIs(1, 'ä');
+		assertWidthIs(1, 'ö');
+		assertWidthIs(1, 0x23F2);
+	}
 
 	public void testSomeWide() {
 		assertWidthIs(2, 'Ａ');
@@ -44,18 +44,18 @@ public void testSomeNonWide() {
 	}
 
 	public void testCombining() {
-        assertWidthIs(0, 0x0302);
-        assertWidthIs(0, 0x0308);
-        assertWidthIs(0, 0xFE0F);
-    }
-
-    public void testWordJoiner() {
-        // https://en.wikipedia.org/wiki/Word_joiner
-        // The word joiner (WJ) is a code point in Unicode used to separate words when using scripts
-        // that do not use explicit spacing. It is encoded since Unicode version 3.2
-        // (released in 2002) as U+2060 WORD JOINER (HTML &#8288;).
-        // The word joiner does not produce any space, and prohibits a line break at its position.
-        assertWidthIs(0, 0x2060);
+		assertWidthIs(0, 0x0302);
+		assertWidthIs(0, 0x0308);
+		assertWidthIs(0, 0xFE0F);
+	}
+
+	public void testWordJoiner() {
+		// https://en.wikipedia.org/wiki/Word_joiner
+		// The word joiner (WJ) is a code point in Unicode used to separate words when using scripts
+		// that do not use explicit spacing. It is encoded since Unicode version 3.2
+		// (released in 2002) as U+2060 WORD JOINER (HTML &#8288;).
+		// The word joiner does not produce any space, and prohibits a line break at its position.
+		assertWidthIs(0, 0x2060);
 	}
 
 	public void testSofthyphen() {
@@ -72,10 +72,10 @@ public void testHangul() {
 		assertWidthIs(1, 0x11A3);
 	}
 
-    public void testEmojis() {
-        assertWidthIs(2, 0x1F428); // KOALA.
-        assertWidthIs(2, 0x231a);  // WATCH.
-        assertWidthIs(2, 0x1F643); // UPSIDE-DOWN FACE (Unicode 8).
-    }
+	public void testEmojis() {
+		assertWidthIs(2, 0x1F428); // KOALA.
+		assertWidthIs(2, 0x231a);  // WATCH.
+		assertWidthIs(2, 0x1F643); // UPSIDE-DOWN FACE (Unicode 8).
+	}
 
 }

From 38114784f1a8f88f4477e2109bb944b5e4979ceb Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Wed, 6 Jan 2021 14:23:15 +0200
Subject: [PATCH 169/912] update bootstrap archives

---
 app/build.gradle | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index cc2d6098fd..c24c580be0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -137,11 +137,11 @@ clean {
 
 task downloadBootstraps(){
     doLast {
-        def version = 34
-        downloadBootstrap("aarch64", "7f56e8ee5573a8351925ff4010c6dea240cd56194ba0b9a686c3d8289859a05", version)
-        downloadBootstrap("arm",     "fa41377fb07cac2e4c15f32f3e7ea8116d60efadc1261176acb42646a71637f0", version)
-        downloadBootstrap("i686",    "61dcae560e706f808e524b8c3b234c47ea0e2bf6c6b0d5edebe53e6fdb956fe1", version)
-        downloadBootstrap("x86_64",  "1b616a4d591809874a06b06f309441320a0b9781e8ef5c148123530303b2533d", version)
+        def version = 35
+        downloadBootstrap("aarch64", "6707cc641cde13dc2f24e819cd8ca3f1a9a003577523c25beff72690588594f5", version)
+        downloadBootstrap("arm",     "eadc9afb52900dc744fdb39ed0c3dbb87ad8ce6190b27946467df7aeab353fa7", version)
+        downloadBootstrap("i686",    "b674ef43c8388dd19e0d25b024b5792c8532ee0ddcc49f90c0716042724fa905", version)
+        downloadBootstrap("x86_64",  "86043eb76efededbdf5644686a899f4d762703fe18e23fb906a2482d593d7549", version)
     }
 }
 

From 922898263275776b3a7e8e8870d5c88de78a3409 Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Wed, 6 Jan 2021 14:28:28 +0200
Subject: [PATCH 170/912] remove restrictions from viewable file types

Fixes https://github.com/termux/termux-app/issues/1872 and
similar issues.
---
 app/src/main/AndroidManifest.xml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 33d0ede61f..455f5c39e6 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -83,16 +83,15 @@
                 <data android:mimeType="text/*" />
                 <data android:mimeType="video/*" />
             </intent-filter>
-            <!-- Be more restrictive for viewing files, restricting ourselves to text files. -->
+            <!-- Accept multiple file types to let Termux be usable as generic file viewer. -->
             <intent-filter tools:ignore="AppLinkUrlError">
                 <action android:name="android.intent.action.VIEW"/>
                 <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="application/*" />
+                <data android:mimeType="audio/*" />
+                <data android:mimeType="image/*" />
                 <data android:mimeType="text/*" />
-                <data android:mimeType="application/*log*" />
-                <data android:mimeType="application/json" />
-                <data android:mimeType="application/*xml*" />
-                <data android:mimeType="application/*latex*" />
-                <data android:mimeType="application/javascript" />
+                <data android:mimeType="video/*" />
             </intent-filter>
         </activity>
 

From a56cba68432e5147f11faa70e8c34b647bc1996d Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Wed, 6 Jan 2021 14:31:56 +0200
Subject: [PATCH 171/912] version 0.105

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index c24c580be0..7eaad4173e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -17,8 +17,8 @@ android {
         applicationId "com.termux"
         minSdkVersion project.properties.minSdkVersion.toInteger()
         targetSdkVersion project.properties.targetSdkVersion.toInteger()
-        versionCode 104
-        versionName "0.104"
+        versionCode 105
+        versionName "0.105"
 
         externalNativeBuild {
             ndkBuild {

From 7b4a69f839fa5fc65821a1ca55bba80ac4356522 Mon Sep 17 00:00:00 2001
From: rakslice <rakslice@gmail.com>
Date: Sat, 16 Jan 2021 19:22:01 -0800
Subject: [PATCH 172/912] when num lock is off, have numpad keys works as their
 numlock-off functions (arrows/home/end/pgup/pgdn/insert/delete)

---
 .../java/com/termux/terminal/KeyHandler.java  | 77 ++++++++++++++++---
 .../com/termux/terminal/KeyHandlerTest.java   | 36 ++++++---
 .../java/com/termux/view/TerminalView.java    |  1 +
 3 files changed, 92 insertions(+), 22 deletions(-)

diff --git a/terminal-emulator/src/main/java/com/termux/terminal/KeyHandler.java b/terminal-emulator/src/main/java/com/termux/terminal/KeyHandler.java
index a4d0f1ac87..97e2637f14 100644
--- a/terminal-emulator/src/main/java/com/termux/terminal/KeyHandler.java
+++ b/terminal-emulator/src/main/java/com/termux/terminal/KeyHandler.java
@@ -59,6 +59,7 @@ public final class KeyHandler {
     public static final int KEYMOD_ALT = 0x80000000;
     public static final int KEYMOD_CTRL = 0x40000000;
     public static final int KEYMOD_SHIFT = 0x20000000;
+    public static final int KEYMOD_NUM_LOCK = 0x10000000;
 
     private static final Map<String, Integer> TERMCAP_TO_KEYCODE = new HashMap<>();
 
@@ -145,10 +146,16 @@ static String getCodeFromTermcap(String termcap, boolean cursorKeysApplication,
             keyMod |= KEYMOD_ALT;
             keyCode &= ~KEYMOD_ALT;
         }
+        if ((keyCode & KEYMOD_NUM_LOCK) != 0) {
+            keyMod |= KEYMOD_NUM_LOCK;
+            keyCode &= ~KEYMOD_NUM_LOCK;
+        }
         return getCode(keyCode, keyMod, cursorKeysApplication, keypadApplication);
     }
 
     public static String getCode(int keyCode, int keyMode, boolean cursorApp, boolean keypadApplication) {
+        boolean numLockOn = (keyMode & KEYMOD_NUM_LOCK) != 0;
+        keyMode &= ~KEYMOD_NUM_LOCK;
         switch (keyCode) {
             case KEYCODE_DPAD_CENTER:
                 return "\015";
@@ -249,31 +256,81 @@ public static String getCode(int keyCode, int keyMode, boolean cursorApp, boolea
             case KEYCODE_NUMPAD_COMMA:
                 return ",";
             case KEYCODE_NUMPAD_DOT:
-                return keypadApplication ? "\033On" : ".";
+                if (numLockOn) {
+                    return keypadApplication ? "\033On" : ".";
+                } else {
+                    // DELETE
+                    return transformForModifiers("\033[3", keyMode, '~');
+                }
             case KEYCODE_NUMPAD_SUBTRACT:
                 return keypadApplication ? transformForModifiers("\033O", keyMode, 'm') : "-";
             case KEYCODE_NUMPAD_DIVIDE:
                 return keypadApplication ? transformForModifiers("\033O", keyMode, 'o') : "/";
             case KEYCODE_NUMPAD_0:
-                return keypadApplication ? transformForModifiers("\033O", keyMode, 'p') : "0";
+                if (numLockOn) {
+                    return keypadApplication ? transformForModifiers("\033O", keyMode, 'p') : "0";
+                } else {
+                    // INSERT
+                    return transformForModifiers("\033[2", keyMode, '~');
+                }
             case KEYCODE_NUMPAD_1:
-                return keypadApplication ? transformForModifiers("\033O", keyMode, 'q') : "1";
+                if (numLockOn) {
+                    return keypadApplication ? transformForModifiers("\033O", keyMode, 'q') : "1";
+                } else {
+                    // END
+                    return (keyMode == 0) ? (cursorApp ? "\033OF" : "\033[F") : transformForModifiers("\033[1", keyMode, 'F');
+                }
             case KEYCODE_NUMPAD_2:
-                return keypadApplication ? transformForModifiers("\033O", keyMode, 'r') : "2";
+                if (numLockOn) {
+                    return keypadApplication ? transformForModifiers("\033O", keyMode, 'r') : "2";
+                } else {
+                    // DOWN
+                    return (keyMode == 0) ? (cursorApp ? "\033OB" : "\033[B") : transformForModifiers("\033[1", keyMode, 'B');
+                }
             case KEYCODE_NUMPAD_3:
-                return keypadApplication ? transformForModifiers("\033O", keyMode, 's') : "3";
+                if (numLockOn) {
+                    return keypadApplication ? transformForModifiers("\033O", keyMode, 's') : "3";
+                } else {
+                    // PGDN
+                    return "\033[6~";
+                }
             case KEYCODE_NUMPAD_4:
-                return keypadApplication ? transformForModifiers("\033O", keyMode, 't') : "4";
+                if (numLockOn) {
+                    return keypadApplication ? transformForModifiers("\033O", keyMode, 't') : "4";
+                } else {
+                    // LEFT
+                    return (keyMode == 0) ? (cursorApp ? "\033OD" : "\033[D") : transformForModifiers("\033[1", keyMode, 'D');
+                }
             case KEYCODE_NUMPAD_5:
                 return keypadApplication ? transformForModifiers("\033O", keyMode, 'u') : "5";
             case KEYCODE_NUMPAD_6:
-                return keypadApplication ? transformForModifiers("\033O", keyMode, 'v') : "6";
+                if (numLockOn) {
+                    return keypadApplication ? transformForModifiers("\033O", keyMode, 'v') : "6";
+                } else {
+                    // RIGHT
+                    return (keyMode == 0) ? (cursorApp ? "\033OC" : "\033[C") : transformForModifiers("\033[1", keyMode, 'C');
+                }
             case KEYCODE_NUMPAD_7:
-                return keypadApplication ? transformForModifiers("\033O", keyMode, 'w') : "7";
+                if (numLockOn) {
+                    return keypadApplication ? transformForModifiers("\033O", keyMode, 'w') : "7";
+                } else {
+                    // HOME
+                    return (keyMode == 0) ? (cursorApp ? "\033OH" : "\033[H") : transformForModifiers("\033[1", keyMode, 'H');
+                }
             case KEYCODE_NUMPAD_8:
-                return keypadApplication ? transformForModifiers("\033O", keyMode, 'x') : "8";
+                if (numLockOn) {
+                    return keypadApplication ? transformForModifiers("\033O", keyMode, 'x') : "8";
+                } else {
+                    // UP
+                    return (keyMode == 0) ? (cursorApp ? "\033OA" : "\033[A") : transformForModifiers("\033[1", keyMode, 'A');
+                }
             case KEYCODE_NUMPAD_9:
-                return keypadApplication ? transformForModifiers("\033O", keyMode, 'y') : "9";
+                if (numLockOn) {
+                    return keypadApplication ? transformForModifiers("\033O", keyMode, 'y') : "9";
+                } else {
+                    // PGUP
+                    return "\033[5~";
+                }
             case KEYCODE_NUMPAD_EQUALS:
                 return keypadApplication ? transformForModifiers("\033O", keyMode, 'X') : "=";
         }
diff --git a/terminal-emulator/src/test/java/com/termux/terminal/KeyHandlerTest.java b/terminal-emulator/src/test/java/com/termux/terminal/KeyHandlerTest.java
index 0826c7fc07..15b23761a8 100644
--- a/terminal-emulator/src/test/java/com/termux/terminal/KeyHandlerTest.java
+++ b/terminal-emulator/src/test/java/com/termux/terminal/KeyHandlerTest.java
@@ -174,18 +174,30 @@ public void testKeyCodes() {
 		assertKeysEquals("\033[23;2~", KeyHandler.getCode(KeyEvent.KEYCODE_F11, KeyHandler.KEYMOD_SHIFT, false, false));
 		assertKeysEquals("\033[24;2~", KeyHandler.getCode(KeyEvent.KEYCODE_F12, KeyHandler.KEYMOD_SHIFT, false, false));
 
-		assertKeysEquals("0", KeyHandler.getCode(KeyEvent.KEYCODE_NUMPAD_0, 0, false, false));
-		assertKeysEquals("1", KeyHandler.getCode(KeyEvent.KEYCODE_NUMPAD_1, 0, false, false));
-		assertKeysEquals("2", KeyHandler.getCode(KeyEvent.KEYCODE_NUMPAD_2, 0, false, false));
-		assertKeysEquals("3", KeyHandler.getCode(KeyEvent.KEYCODE_NUMPAD_3, 0, false, false));
-		assertKeysEquals("4", KeyHandler.getCode(KeyEvent.KEYCODE_NUMPAD_4, 0, false, false));
-		assertKeysEquals("5", KeyHandler.getCode(KeyEvent.KEYCODE_NUMPAD_5, 0, false, false));
-		assertKeysEquals("6", KeyHandler.getCode(KeyEvent.KEYCODE_NUMPAD_6, 0, false, false));
-		assertKeysEquals("7", KeyHandler.getCode(KeyEvent.KEYCODE_NUMPAD_7, 0, false, false));
-		assertKeysEquals("8", KeyHandler.getCode(KeyEvent.KEYCODE_NUMPAD_8, 0, false, false));
-		assertKeysEquals("9", KeyHandler.getCode(KeyEvent.KEYCODE_NUMPAD_9, 0, false, false));
-		assertKeysEquals(",", KeyHandler.getCode(KeyEvent.KEYCODE_NUMPAD_COMMA, 0, false, false));
-		assertKeysEquals(".", KeyHandler.getCode(KeyEvent.KEYCODE_NUMPAD_DOT, 0, false, false));
+		assertKeysEquals("0", KeyHandler.getCode(KeyEvent.KEYCODE_NUMPAD_0, KeyHandler.KEYMOD_NUM_LOCK, false, false));
+		assertKeysEquals("1", KeyHandler.getCode(KeyEvent.KEYCODE_NUMPAD_1, KeyHandler.KEYMOD_NUM_LOCK, false, false));
+		assertKeysEquals("2", KeyHandler.getCode(KeyEvent.KEYCODE_NUMPAD_2, KeyHandler.KEYMOD_NUM_LOCK, false, false));
+		assertKeysEquals("3", KeyHandler.getCode(KeyEvent.KEYCODE_NUMPAD_3, KeyHandler.KEYMOD_NUM_LOCK, false, false));
+		assertKeysEquals("4", KeyHandler.getCode(KeyEvent.KEYCODE_NUMPAD_4, KeyHandler.KEYMOD_NUM_LOCK, false, false));
+		assertKeysEquals("5", KeyHandler.getCode(KeyEvent.KEYCODE_NUMPAD_5, KeyHandler.KEYMOD_NUM_LOCK, false, false));
+		assertKeysEquals("6", KeyHandler.getCode(KeyEvent.KEYCODE_NUMPAD_6, KeyHandler.KEYMOD_NUM_LOCK, false, false));
+		assertKeysEquals("7", KeyHandler.getCode(KeyEvent.KEYCODE_NUMPAD_7, KeyHandler.KEYMOD_NUM_LOCK, false, false));
+		assertKeysEquals("8", KeyHandler.getCode(KeyEvent.KEYCODE_NUMPAD_8, KeyHandler.KEYMOD_NUM_LOCK, false, false));
+		assertKeysEquals("9", KeyHandler.getCode(KeyEvent.KEYCODE_NUMPAD_9, KeyHandler.KEYMOD_NUM_LOCK, false, false));
+		assertKeysEquals(",", KeyHandler.getCode(KeyEvent.KEYCODE_NUMPAD_COMMA, KeyHandler.KEYMOD_NUM_LOCK, false, false));
+		assertKeysEquals(".", KeyHandler.getCode(KeyEvent.KEYCODE_NUMPAD_DOT, KeyHandler.KEYMOD_NUM_LOCK, false, false));
+
+        assertKeysEquals("\033[2~", KeyHandler.getCode(KeyEvent.KEYCODE_NUMPAD_0, 0, false, false));
+        assertKeysEquals("\033[F", KeyHandler.getCode(KeyEvent.KEYCODE_NUMPAD_1, 0, false, false));
+        assertKeysEquals("\033[B", KeyHandler.getCode(KeyEvent.KEYCODE_NUMPAD_2, 0, false, false));
+        assertKeysEquals("\033[6~", KeyHandler.getCode(KeyEvent.KEYCODE_NUMPAD_3, 0, false, false));
+        assertKeysEquals("\033[D", KeyHandler.getCode(KeyEvent.KEYCODE_NUMPAD_4, 0, false, false));
+        assertKeysEquals("5", KeyHandler.getCode(KeyEvent.KEYCODE_NUMPAD_5, 0, false, false));
+        assertKeysEquals("\033[C", KeyHandler.getCode(KeyEvent.KEYCODE_NUMPAD_6, 0, false, false));
+        assertKeysEquals("\033[H", KeyHandler.getCode(KeyEvent.KEYCODE_NUMPAD_7, 0, false, false));
+        assertKeysEquals("\033[A", KeyHandler.getCode(KeyEvent.KEYCODE_NUMPAD_8, 0, false, false));
+        assertKeysEquals("\033[5~", KeyHandler.getCode(KeyEvent.KEYCODE_NUMPAD_9, 0, false, false));
+        assertKeysEquals("\033[3~", KeyHandler.getCode(KeyEvent.KEYCODE_NUMPAD_DOT, 0, false, false));
 	}
 
 }
diff --git a/terminal-view/src/main/java/com/termux/view/TerminalView.java b/terminal-view/src/main/java/com/termux/view/TerminalView.java
index 433925239d..c8bc82072e 100644
--- a/terminal-view/src/main/java/com/termux/view/TerminalView.java
+++ b/terminal-view/src/main/java/com/termux/view/TerminalView.java
@@ -591,6 +591,7 @@ public boolean onKeyDown(int keyCode, KeyEvent event) {
         if (controlDown) keyMod |= KeyHandler.KEYMOD_CTRL;
         if (event.isAltPressed() || leftAltDown) keyMod |= KeyHandler.KEYMOD_ALT;
         if (event.isShiftPressed()) keyMod |= KeyHandler.KEYMOD_SHIFT;
+        if (event.isNumLockOn()) keyMod |= KeyHandler.KEYMOD_NUM_LOCK;
         if (!event.isFunctionPressed() && handleKeyCode(keyCode, keyMod)) {
             if (LOG_KEY_EVENTS) Log.i(EmulatorDebug.LOG_TAG, "handleKeyCode() took key event");
             return true;

From 78cdaef6d249833905868a2d64257691b6dbbdb4 Mon Sep 17 00:00:00 2001
From: rakslice <rakslice@gmail.com>
Date: Sat, 16 Jan 2021 19:53:22 -0800
Subject: [PATCH 173/912] only send PF1 for num lock when in application mode

---
 .../src/main/java/com/termux/terminal/KeyHandler.java      | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/terminal-emulator/src/main/java/com/termux/terminal/KeyHandler.java b/terminal-emulator/src/main/java/com/termux/terminal/KeyHandler.java
index 97e2637f14..254f5e3a7c 100644
--- a/terminal-emulator/src/main/java/com/termux/terminal/KeyHandler.java
+++ b/terminal-emulator/src/main/java/com/termux/terminal/KeyHandler.java
@@ -235,8 +235,11 @@ public static String getCode(int keyCode, int keyMode, boolean cursorApp, boolea
                 // Just do what xterm and gnome-terminal does:
                 return prefix + (((keyMode & KEYMOD_CTRL) == 0) ? "\u007F" : "\u0008");
             case KEYCODE_NUM_LOCK:
-                return "\033OP";
-
+                if (keypadApplication) {
+                    return "\033OP";
+                } else {
+                    return null;
+                }
             case KEYCODE_SPACE:
                 // If ctrl is not down, return null so that it goes through normal input processing (which may e.g. cause a
                 // combining accent to be written):

From fe584940e121a7ae500d9ea1f126aa13bf6d8527 Mon Sep 17 00:00:00 2001
From: rakslice <rakslice@gmail.com>
Date: Sat, 16 Jan 2021 19:54:11 -0800
Subject: [PATCH 174/912] fix TerminalView possiblePropLocations IOBE

---
 terminal-view/src/main/java/com/termux/view/TerminalView.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/terminal-view/src/main/java/com/termux/view/TerminalView.java b/terminal-view/src/main/java/com/termux/view/TerminalView.java
index c8bc82072e..cd9663234c 100644
--- a/terminal-view/src/main/java/com/termux/view/TerminalView.java
+++ b/terminal-view/src/main/java/com/termux/view/TerminalView.java
@@ -1549,7 +1549,7 @@ private Properties getProperties() {
 
         propsFile = new File(possiblePropLocations[0]);
         int i = 1;
-        while (!propsFile.exists() && i <= possiblePropLocations.length) {
+        while (!propsFile.exists() && i < possiblePropLocations.length) {
             propsFile = new File(possiblePropLocations[i]);
             i += 1;
         }

From 05bb399893994d6cd596687fa7b4fedc294ef2b4 Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Sun, 17 Jan 2021 19:40:29 +0200
Subject: [PATCH 175/912] terminal-view: fix array indexing

---
 terminal-view/src/main/java/com/termux/view/TerminalView.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/terminal-view/src/main/java/com/termux/view/TerminalView.java b/terminal-view/src/main/java/com/termux/view/TerminalView.java
index 433925239d..41fe31dafc 100644
--- a/terminal-view/src/main/java/com/termux/view/TerminalView.java
+++ b/terminal-view/src/main/java/com/termux/view/TerminalView.java
@@ -1547,8 +1547,8 @@ private Properties getProperties() {
         };
 
         propsFile = new File(possiblePropLocations[0]);
-        int i = 1;
-        while (!propsFile.exists() && i <= possiblePropLocations.length) {
+        int i = 0;
+        while (!propsFile.exists() && i < possiblePropLocations.length) {
             propsFile = new File(possiblePropLocations[i]);
             i += 1;
         }

From 92570bee06fc86573354d5c1f0e3eb61d7f0d864 Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Sun, 17 Jan 2021 19:45:19 +0200
Subject: [PATCH 176/912] version 0.106

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 7eaad4173e..591d83ea2b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -17,8 +17,8 @@ android {
         applicationId "com.termux"
         minSdkVersion project.properties.minSdkVersion.toInteger()
         targetSdkVersion project.properties.targetSdkVersion.toInteger()
-        versionCode 105
-        versionName "0.105"
+        versionCode 106
+        versionName "0.106"
 
         externalNativeBuild {
             ndkBuild {

From 32c3ffd57b3a9042d2083e030af1c583c77a2180 Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Sun, 17 Jan 2021 20:01:05 +0200
Subject: [PATCH 177/912] readme: still need to clarify that app is "not
 maintained"

Please note that I do not review changes made by project collaborators.
Before submitting changes to branch 'master' ensure they are working
properly. I may not find the issue and fix it in time, like in case
with v0.105 release.
---
 README.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/README.md b/README.md
index 3cf831b390..8f43c191e4 100644
--- a/README.md
+++ b/README.md
@@ -14,6 +14,15 @@ Note that this repository is for the app itself (the user interface and the
 terminal emulation). For the packages installable inside the app, see
 [termux/termux-packages](https://github.com/termux/termux-packages)
 
+***
+
+**@termux is looking for Termux Application maintainer 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.
+
+***
+
 ## Installation
 
 Termux application can be obtained from:

From b5d491a54ca20f1e46f470c29b95c380f36dde5d Mon Sep 17 00:00:00 2001
From: David Kramer <daveskypilot@gmail.com>
Date: Wed, 27 Jan 2021 18:37:06 -0600
Subject: [PATCH 178/912] Implement full screen and add FullScreenWorkAround to
 fix ExtraKeysView not displaying properly and inconsistently between various
 devices

---
 .../com/termux/app/FullScreenWorkAround.java  | 136 ++++++++++++++++++
 .../java/com/termux/app/TermuxActivity.java   |  10 ++
 .../com/termux/app/TermuxPreferences.java     |  45 ++++++
 3 files changed, 191 insertions(+)
 create mode 100644 app/src/main/java/com/termux/app/FullScreenWorkAround.java

diff --git a/app/src/main/java/com/termux/app/FullScreenWorkAround.java b/app/src/main/java/com/termux/app/FullScreenWorkAround.java
new file mode 100644
index 0000000000..3f282cd42b
--- /dev/null
+++ b/app/src/main/java/com/termux/app/FullScreenWorkAround.java
@@ -0,0 +1,136 @@
+package com.termux.app;
+
+import android.content.Context;
+import android.graphics.Rect;
+import android.util.Log;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.ViewTreeObserver;
+
+import static com.termux.terminal.EmulatorDebug.LOG_TAG;
+
+/**
+ * Work around for fullscreen mode in Termux to fix ExtraKeysView not being visible.
+ * This class is derived from:
+ * https://stackoverflow.com/questions/7417123/android-how-to-adjust-layout-in-full-screen-mode-when-softkeyboard-is-visible
+ * and has some additional tweaks
+ * ---
+ * For more information, see https://issuetracker.google.com/issues/36911528
+ */
+public class FullScreenWorkAround {
+    /**
+     * TODO add documentation so user can know available options and know they may need to experiment
+     * for their specific device
+     */
+    private static final int WORK_AROUND_METHOD_1 = 1;
+    private static final int WORK_AROUND_METHOD_2 = 2;
+    private static final int WORK_AROUND_METHOD_3 = 3;
+
+    private int mWorkAroundMethod;
+
+    private View mChildOfContent;
+    private int mUsableHeightPrevious;
+    private ViewGroup.LayoutParams mViewGroupLayoutParams;
+
+    private int mStatusBarHeight;
+    private int mExtraKeysHeight;
+
+
+    public static void apply(TermuxActivity activity, ExtraKeysView view, int workAroundMethod) {
+        new FullScreenWorkAround(activity, view, workAroundMethod);
+    }
+
+    private FullScreenWorkAround(TermuxActivity activity, ExtraKeysView view, int workAroundMethod) {
+        ViewGroup content = activity.findViewById(android.R.id.content);
+        mChildOfContent = content.getChildAt(0);
+        mViewGroupLayoutParams = mChildOfContent.getLayoutParams();
+        mStatusBarHeight = lookupStatusBarHeight(activity);
+        mWorkAroundMethod = workAroundMethod;
+
+        // ExtraKeysView height is 0 at this point, so we need this to get actual size
+        view.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
+            @Override
+            public void onGlobalLayout() {
+                mExtraKeysHeight = view.getMeasuredHeight();
+
+                // only needed one time so we can remove
+                view.getViewTreeObserver().removeOnGlobalLayoutListener(this);
+
+                // now that we have ExtraKeysView height, we can apply this work-around so that we can see ExtraKeysView when keyboard
+                // is shown and dismissed
+                mChildOfContent.getViewTreeObserver().addOnGlobalLayoutListener(FullScreenWorkAround.this::possiblyResizeChildOfContent);
+            }
+        });
+    }
+
+    private void possiblyResizeChildOfContent() {
+        int usableHeightNow = computeUsableHeight();
+        if (usableHeightNow != mUsableHeightPrevious) {
+            int usableHeightSansKeyboard = mChildOfContent.getRootView().getHeight();
+            int heightDifference = usableHeightSansKeyboard - usableHeightNow;
+            if (heightDifference > (usableHeightSansKeyboard / 4)) {
+                // keyboard probably just became visible
+
+                // ensures that usable layout space does not extend behind the
+                // soft keyboard, causing the extra keys to not be visible
+                int adjustedHeight = mViewGroupLayoutParams.height;
+
+                // height adjustment does not behave consistently between devices so you may need to do
+                // a bit of trial and error to see if one of these works for your device
+                int workAroundMethod = getWorkAroundMethod();
+
+                switch (workAroundMethod) {
+                    case WORK_AROUND_METHOD_1:
+                        // tested w/ Pixel (emulator)
+                        adjustedHeight = (usableHeightSansKeyboard - heightDifference) + getExtraKeysHeight() + (getStatusBarHeight() / 2);
+                        break;
+                    case WORK_AROUND_METHOD_2:
+                        // tested w/ Samsung S7 and OnePlus 6T
+                        adjustedHeight = (usableHeightSansKeyboard - heightDifference);
+                        break;
+                    case WORK_AROUND_METHOD_3:
+                        // tested w/ Sony Xperia XZ
+                        adjustedHeight = (usableHeightSansKeyboard - heightDifference) + getExtraKeysHeight();
+                        break;
+                    default:
+                        Log.w(LOG_TAG, "Unknown / Unsupported workAroundMethod for height offset: [" + workAroundMethod + "]");
+                    // TODO may need to add more cases for other devices as they're tested..
+                }
+                mViewGroupLayoutParams.height = adjustedHeight;
+            } else {
+                // keyboard probably just became hidden
+                mViewGroupLayoutParams.height = usableHeightSansKeyboard;
+            }
+            mChildOfContent.requestLayout();
+            mUsableHeightPrevious = usableHeightNow;
+        }
+    }
+
+    private int computeUsableHeight() {
+        Rect r = new Rect();
+        mChildOfContent.getWindowVisibleDisplayFrame(r);
+        return (r.bottom - r.top);
+    }
+
+    private int getExtraKeysHeight() {
+        return mExtraKeysHeight;
+    }
+
+    private int getStatusBarHeight() {
+        return mStatusBarHeight;
+    }
+
+    private int lookupStatusBarHeight(Context context) {
+        int height = 0;
+        int resourceId = context.getResources().getIdentifier("status_bar_height", "dimen", "android");
+        if (resourceId > 0) {
+            height = context.getResources().getDimensionPixelSize(resourceId);
+        }
+        return height;
+    }
+
+    private int getWorkAroundMethod() {
+        return mWorkAroundMethod;
+    }
+}
+
diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index d46a2da219..77ef1d8c40 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -222,6 +222,10 @@ public void onCreate(Bundle bundle) {
             );
         }
 
+        if (mSettings.isUsingFullScreen()) {
+            getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
+        }
+
         mTerminalView = findViewById(R.id.terminal_view);
         mTerminalView.setOnKeyListener(new TermuxViewClient(this));
 
@@ -256,6 +260,12 @@ public Object instantiateItem(@NonNull ViewGroup collection, int position) {
                 if (position == 0) {
                     layout = mExtraKeysView = (ExtraKeysView) inflater.inflate(R.layout.extra_keys_main, collection, false);
                     mExtraKeysView.reload(mSettings.mExtraKeys);
+
+                    // apply extra keys fix if enabled in prefs
+                    if (mSettings.isUsingFullScreen() && mSettings.isUsingFullScreenWorkAround()) {
+                        FullScreenWorkAround.apply(TermuxActivity.this, mExtraKeysView, mSettings.getFullScreenWorkAroundMethod());
+                    }
+
                 } else {
                     layout = inflater.inflate(R.layout.extra_keys_right, collection, false);
                     final EditText editText = layout.findViewById(R.id.text_input);
diff --git a/app/src/main/java/com/termux/app/TermuxPreferences.java b/app/src/main/java/com/termux/app/TermuxPreferences.java
index 3703cd0956..e1d68333f3 100644
--- a/app/src/main/java/com/termux/app/TermuxPreferences.java
+++ b/app/src/main/java/com/termux/app/TermuxPreferences.java
@@ -28,6 +28,8 @@
 
 import androidx.annotation.IntDef;
 
+import static com.termux.terminal.EmulatorDebug.LOG_TAG;
+
 final class TermuxPreferences {
 
     @IntDef({BELL_VIBRATE, BELL_BEEP, BELL_IGNORE})
@@ -67,6 +69,10 @@ final static class KeyboardShortcut {
     private boolean mScreenAlwaysOn;
     private int mFontSize;
 
+    private boolean mUseFullScreen;
+    private boolean mUseFullScreenWorkAround;
+    private int mFullScreenWorkAroundMethod;
+
     @AsciiBellBehaviour
     int mBellBehaviour = BELL_VIBRATE;
 
@@ -137,6 +143,18 @@ boolean isUsingBlackUI() {
         return mUseDarkUI;
     }
 
+    boolean isUsingFullScreen() {
+        return mUseFullScreen;
+    }
+
+    boolean isUsingFullScreenWorkAround() {
+        return mUseFullScreenWorkAround;
+    }
+
+    int getFullScreenWorkAroundMethod() {
+        return mFullScreenWorkAroundMethod;
+    }
+
     void setScreenAlwaysOn(Context context, boolean newValue) {
         mScreenAlwaysOn = newValue;
         PreferenceManager.getDefaultSharedPreferences(context).edit().putBoolean(SCREEN_ALWAYS_ON_KEY, newValue).apply();
@@ -196,6 +214,33 @@ void reloadFromProperties(Context context) {
                 mUseDarkUI = nightMode == Configuration.UI_MODE_NIGHT_YES;
         }
 
+        switch (props.getProperty("fullscreen", "").toLowerCase()) {
+            case "true":
+                mUseFullScreen = true;
+                break;
+            case "false":
+            default:
+                mUseFullScreen = false;
+        }
+
+        switch (props.getProperty("use-fullscreen-workaround", "").toLowerCase()) {
+            case "true":
+                mUseFullScreenWorkAround = true;
+                break;
+            case "false":
+            default:
+                mUseFullScreenWorkAround = false;
+        }
+
+        String workAroundMethodStr = props.getProperty("fullscreen-workaround-method", "");
+        if (workAroundMethodStr != null && !workAroundMethodStr.isEmpty()) {
+            try {
+                mFullScreenWorkAroundMethod = Integer.parseInt(workAroundMethodStr);
+            } catch (Exception ex) {
+                Log.e(LOG_TAG, "fullscreen-workaround-method error: " + ex.getMessage());
+            }
+        }
+
         String defaultExtraKeys = "[[ESC, TAB, CTRL, ALT, {key: '-', popup: '|'}, DOWN, UP]]";
 
         try {

From 096dedffb1dbc028be7818c4fbe47caecf33b73a Mon Sep 17 00:00:00 2001
From: David Kramer <daveskypilot@gmail.com>
Date: Thu, 28 Jan 2021 06:51:23 -0600
Subject: [PATCH 179/912] Remove height offset workarounds / config     * Use
 WindowInsetsListener to get nav bar height and use that       instead for
 calculating adjusted height for extra keys view

---
 .../com/termux/app/FullScreenWorkAround.java  | 92 +++----------------
 .../java/com/termux/app/TermuxActivity.java   | 23 ++++-
 .../com/termux/app/TermuxPreferences.java     | 14 ---
 3 files changed, 29 insertions(+), 100 deletions(-)

diff --git a/app/src/main/java/com/termux/app/FullScreenWorkAround.java b/app/src/main/java/com/termux/app/FullScreenWorkAround.java
index 3f282cd42b..006918ee0f 100644
--- a/app/src/main/java/com/termux/app/FullScreenWorkAround.java
+++ b/app/src/main/java/com/termux/app/FullScreenWorkAround.java
@@ -1,13 +1,8 @@
 package com.termux.app;
 
-import android.content.Context;
 import android.graphics.Rect;
-import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.ViewTreeObserver;
-
-import static com.termux.terminal.EmulatorDebug.LOG_TAG;
 
 /**
  * Work around for fullscreen mode in Termux to fix ExtraKeysView not being visible.
@@ -18,49 +13,23 @@
  * For more information, see https://issuetracker.google.com/issues/36911528
  */
 public class FullScreenWorkAround {
-    /**
-     * TODO add documentation so user can know available options and know they may need to experiment
-     * for their specific device
-     */
-    private static final int WORK_AROUND_METHOD_1 = 1;
-    private static final int WORK_AROUND_METHOD_2 = 2;
-    private static final int WORK_AROUND_METHOD_3 = 3;
-
-    private int mWorkAroundMethod;
-
     private View mChildOfContent;
     private int mUsableHeightPrevious;
     private ViewGroup.LayoutParams mViewGroupLayoutParams;
 
-    private int mStatusBarHeight;
-    private int mExtraKeysHeight;
+    private int mNavBarHeight;
 
 
-    public static void apply(TermuxActivity activity, ExtraKeysView view, int workAroundMethod) {
-        new FullScreenWorkAround(activity, view, workAroundMethod);
+    public static void apply(TermuxActivity activity) {
+        new FullScreenWorkAround(activity);
     }
 
-    private FullScreenWorkAround(TermuxActivity activity, ExtraKeysView view, int workAroundMethod) {
+    private FullScreenWorkAround(TermuxActivity activity) {
         ViewGroup content = activity.findViewById(android.R.id.content);
         mChildOfContent = content.getChildAt(0);
         mViewGroupLayoutParams = mChildOfContent.getLayoutParams();
-        mStatusBarHeight = lookupStatusBarHeight(activity);
-        mWorkAroundMethod = workAroundMethod;
-
-        // ExtraKeysView height is 0 at this point, so we need this to get actual size
-        view.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
-            @Override
-            public void onGlobalLayout() {
-                mExtraKeysHeight = view.getMeasuredHeight();
-
-                // only needed one time so we can remove
-                view.getViewTreeObserver().removeOnGlobalLayoutListener(this);
-
-                // now that we have ExtraKeysView height, we can apply this work-around so that we can see ExtraKeysView when keyboard
-                // is shown and dismissed
-                mChildOfContent.getViewTreeObserver().addOnGlobalLayoutListener(FullScreenWorkAround.this::possiblyResizeChildOfContent);
-            }
-        });
+        mNavBarHeight = activity.getNavBarHeight();
+        mChildOfContent.getViewTreeObserver().addOnGlobalLayoutListener(this::possiblyResizeChildOfContent);
     }
 
     private void possiblyResizeChildOfContent() {
@@ -73,30 +42,7 @@ private void possiblyResizeChildOfContent() {
 
                 // ensures that usable layout space does not extend behind the
                 // soft keyboard, causing the extra keys to not be visible
-                int adjustedHeight = mViewGroupLayoutParams.height;
-
-                // height adjustment does not behave consistently between devices so you may need to do
-                // a bit of trial and error to see if one of these works for your device
-                int workAroundMethod = getWorkAroundMethod();
-
-                switch (workAroundMethod) {
-                    case WORK_AROUND_METHOD_1:
-                        // tested w/ Pixel (emulator)
-                        adjustedHeight = (usableHeightSansKeyboard - heightDifference) + getExtraKeysHeight() + (getStatusBarHeight() / 2);
-                        break;
-                    case WORK_AROUND_METHOD_2:
-                        // tested w/ Samsung S7 and OnePlus 6T
-                        adjustedHeight = (usableHeightSansKeyboard - heightDifference);
-                        break;
-                    case WORK_AROUND_METHOD_3:
-                        // tested w/ Sony Xperia XZ
-                        adjustedHeight = (usableHeightSansKeyboard - heightDifference) + getExtraKeysHeight();
-                        break;
-                    default:
-                        Log.w(LOG_TAG, "Unknown / Unsupported workAroundMethod for height offset: [" + workAroundMethod + "]");
-                    // TODO may need to add more cases for other devices as they're tested..
-                }
-                mViewGroupLayoutParams.height = adjustedHeight;
+                mViewGroupLayoutParams.height = (usableHeightSansKeyboard - heightDifference) + getNavBarHeight();
             } else {
                 // keyboard probably just became hidden
                 mViewGroupLayoutParams.height = usableHeightSansKeyboard;
@@ -106,31 +52,15 @@ private void possiblyResizeChildOfContent() {
         }
     }
 
+    private int getNavBarHeight() {
+        return mNavBarHeight;
+    }
+
     private int computeUsableHeight() {
         Rect r = new Rect();
         mChildOfContent.getWindowVisibleDisplayFrame(r);
         return (r.bottom - r.top);
     }
 
-    private int getExtraKeysHeight() {
-        return mExtraKeysHeight;
-    }
-
-    private int getStatusBarHeight() {
-        return mStatusBarHeight;
-    }
-
-    private int lookupStatusBarHeight(Context context) {
-        int height = 0;
-        int resourceId = context.getResources().getIdentifier("status_bar_height", "dimen", "android");
-        if (resourceId > 0) {
-            height = context.getResources().getDimensionPixelSize(resourceId);
-        }
-        return height;
-    }
-
-    private int getWorkAroundMethod() {
-        return mWorkAroundMethod;
-    }
 }
 
diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index 77ef1d8c40..5839d10a56 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -134,6 +134,8 @@ public final class TermuxActivity extends Activity implements ServiceConnection
 
     boolean mIsUsingBlackUI;
 
+    int mNavBarHeight;
+
     final SoundPool mBellSoundPool = new SoundPool.Builder().setMaxStreams(1).setAudioAttributes(
         new AudioAttributes.Builder().setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
             .setUsage(AudioAttributes.USAGE_ASSISTANCE_SONIFICATION).build()).build();
@@ -214,18 +216,25 @@ public void onCreate(Bundle bundle) {
 
         super.onCreate(bundle);
 
+
         setContentView(R.layout.drawer_layout);
 
+        View content = findViewById(android.R.id.content);
+        content.setOnApplyWindowInsetsListener((v, insets) -> {
+            mNavBarHeight = insets.getSystemWindowInsetBottom();
+            return insets;
+        });
+
+        if (mSettings.isUsingFullScreen()) {
+            getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
+        }
+
         if (mIsUsingBlackUI) {
             findViewById(R.id.left_drawer).setBackgroundColor(
                 getResources().getColor(android.R.color.background_dark)
             );
         }
 
-        if (mSettings.isUsingFullScreen()) {
-            getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
-        }
-
         mTerminalView = findViewById(R.id.terminal_view);
         mTerminalView.setOnKeyListener(new TermuxViewClient(this));
 
@@ -263,7 +272,7 @@ public Object instantiateItem(@NonNull ViewGroup collection, int position) {
 
                     // apply extra keys fix if enabled in prefs
                     if (mSettings.isUsingFullScreen() && mSettings.isUsingFullScreenWorkAround()) {
-                        FullScreenWorkAround.apply(TermuxActivity.this, mExtraKeysView, mSettings.getFullScreenWorkAroundMethod());
+                        FullScreenWorkAround.apply(TermuxActivity.this);
                     }
 
                 } else {
@@ -341,6 +350,10 @@ public void onPageSelected(int position) {
         sendOpenedBroadcast();
     }
 
+    public int getNavBarHeight() {
+        return mNavBarHeight;
+    }
+
     /**
      * Send a broadcast notifying Termux app has been opened
      */
diff --git a/app/src/main/java/com/termux/app/TermuxPreferences.java b/app/src/main/java/com/termux/app/TermuxPreferences.java
index e1d68333f3..1d85b72780 100644
--- a/app/src/main/java/com/termux/app/TermuxPreferences.java
+++ b/app/src/main/java/com/termux/app/TermuxPreferences.java
@@ -71,7 +71,6 @@ final static class KeyboardShortcut {
 
     private boolean mUseFullScreen;
     private boolean mUseFullScreenWorkAround;
-    private int mFullScreenWorkAroundMethod;
 
     @AsciiBellBehaviour
     int mBellBehaviour = BELL_VIBRATE;
@@ -151,10 +150,6 @@ boolean isUsingFullScreenWorkAround() {
         return mUseFullScreenWorkAround;
     }
 
-    int getFullScreenWorkAroundMethod() {
-        return mFullScreenWorkAroundMethod;
-    }
-
     void setScreenAlwaysOn(Context context, boolean newValue) {
         mScreenAlwaysOn = newValue;
         PreferenceManager.getDefaultSharedPreferences(context).edit().putBoolean(SCREEN_ALWAYS_ON_KEY, newValue).apply();
@@ -232,15 +227,6 @@ void reloadFromProperties(Context context) {
                 mUseFullScreenWorkAround = false;
         }
 
-        String workAroundMethodStr = props.getProperty("fullscreen-workaround-method", "");
-        if (workAroundMethodStr != null && !workAroundMethodStr.isEmpty()) {
-            try {
-                mFullScreenWorkAroundMethod = Integer.parseInt(workAroundMethodStr);
-            } catch (Exception ex) {
-                Log.e(LOG_TAG, "fullscreen-workaround-method error: " + ex.getMessage());
-            }
-        }
-
         String defaultExtraKeys = "[[ESC, TAB, CTRL, ALT, {key: '-', popup: '|'}, DOWN, UP]]";
 
         try {

From 0e94d520940679e54644e602b487369d6bed891a Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Wed, 3 Feb 2021 02:56:53 +0200
Subject: [PATCH 180/912] readme: remove links to Google Play and Nethunter
 stores

Both offer outdated builds.
---
 README.md | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 8f43c191e4..0eecba0068 100644
--- a/README.md
+++ b/README.md
@@ -25,11 +25,7 @@ Issue https://github.com/termux/termux-app/issues/1072 needs extra attention.
 
 ## Installation
 
-Termux application can be obtained from:
-
-- [Google Play](https://play.google.com/store/apps/details?id=com.termux)
-- [F-Droid](https://f-droid.org/en/packages/com.termux/)
-- [Kali Nethunter Store](https://store.nethunter.com/en/packages/com.termux/)
+Termux application can be obtained from [F-Droid](https://f-droid.org/en/packages/com.termux/).
 
 Additionally we provide per-commit debug builds for those who want to try
 out the latest features or test their pull request. This build can be obtained

From 7be1fe5555d0673a5b17ad6bb34bc18627de7684 Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Wed, 3 Feb 2021 15:49:03 +0200
Subject: [PATCH 181/912] icon: add regular png icon for compatibility with
 some launchers

See https://github.com/termux/termux-app/issues/991.

Adaptive icon will continue to be automatically used if supported.
---
 app/src/main/AndroidManifest.xml              |   5 +--
 app/src/main/res/drawable/ic_launcher.xml     |  34 ------------------
 .../ic_launcher.xml                           |   0
 .../mipmap-anydpi-v26/ic_launcher_round.xml   |   5 +++
 app/src/main/res/mipmap-hdpi/ic_launcher.png  | Bin 0 -> 1454 bytes
 .../res/mipmap-hdpi/ic_launcher_round.png     | Bin 0 -> 1609 bytes
 app/src/main/res/mipmap-mdpi/ic_launcher.png  | Bin 0 -> 1122 bytes
 .../res/mipmap-mdpi/ic_launcher_round.png     | Bin 0 -> 1199 bytes
 app/src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 0 -> 1847 bytes
 .../res/mipmap-xhdpi/ic_launcher_round.png    | Bin 0 -> 2108 bytes
 .../main/res/mipmap-xxhdpi/ic_launcher.png    | Bin 0 -> 3238 bytes
 .../res/mipmap-xxhdpi/ic_launcher_round.png   | Bin 0 -> 3748 bytes
 .../main/res/mipmap-xxxhdpi/ic_launcher.png   | Bin 0 -> 3556 bytes
 .../res/mipmap-xxxhdpi/ic_launcher_round.png  | Bin 0 -> 4497 bytes
 art/ic_launcher2.png                          | Bin 0 -> 10167 bytes
 art/ic_launcher2_round.png                    | Bin 0 -> 13356 bytes
 16 files changed, 8 insertions(+), 36 deletions(-)
 delete mode 100644 app/src/main/res/drawable/ic_launcher.xml
 rename app/src/main/res/{drawable-anydpi-v26 => mipmap-anydpi-v26}/ic_launcher.xml (100%)
 create mode 100644 app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
 create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher.png
 create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_round.png
 create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher.png
 create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher_round.png
 create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher.png
 create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
 create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher.png
 create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
 create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
 create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
 create mode 100644 art/ic_launcher2.png
 create mode 100644 art/ic_launcher2_round.png

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 455f5c39e6..035fc8dafa 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -11,7 +11,7 @@
     <permission android:name="com.termux.permission.RUN_COMMAND"
         android:label="@string/run_command_permission_label"
         android:description="@string/run_command_permission_description"
-        android:icon="@drawable/ic_launcher"
+        android:icon="@mipmap/ic_launcher"
         android:protectionLevel="dangerous" />
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@@ -28,7 +28,8 @@
     <application
         android:extractNativeLibs="true"
         android:allowBackup="false"
-        android:icon="@drawable/ic_launcher"
+        android:icon="@mipmap/ic_launcher"
+        android:roundIcon="@mipmap/ic_launcher_round"
         android:banner="@drawable/banner"
         android:label="@string/application_name"
         android:theme="@style/Theme.Termux"
diff --git a/app/src/main/res/drawable/ic_launcher.xml b/app/src/main/res/drawable/ic_launcher.xml
deleted file mode 100644
index 749a55bc5d..0000000000
--- a/app/src/main/res/drawable/ic_launcher.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="108dp"
-    android:width="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-
-    <path
-        android:fillColor="#000000"
-        android:pathData="M18,54
-                          A36,36 0 1,1 90,54
-                          A36,36 0 1,1 18,54 Z" />
-
-    <!-- Keep in sync with adaptive ic_foreground.xml: -->
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M34,38
-                          h6
-                          l12,16
-                          l-12,16
-                          h-6
-                          l12,-16
-                          "
-        />
-
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M56,66
-                          h18
-                          v4
-                          h-18
-                          "
-        />
-
-</vector>
diff --git a/app/src/main/res/drawable-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi-v26/ic_launcher.xml
rename to app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
new file mode 100644
index 0000000000..6192469fc4
--- /dev/null
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@android:color/black"/>
+    <foreground android:drawable="@drawable/ic_foreground"/>
+</adaptive-icon>
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..afdebcef32eba155be9570a357e5a6a8b85820e3
GIT binary patch
literal 1454
zcmV;f1yTBmP)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!0004dX+uL$X=7~w
z04R}tkv&MmKpe$iQ$>*$2MdZgWT;LSM2k3T6^c+H)C#RSm|Xe=O&XFE7e~Rh;NZt%
z)xpJCR|i)?5c~jfb8}L3krMxx6k5c1aNLh~_a1le0HIM~n$<M{Xu55tlL;}KTNQg=
zAs~n_1`(H;Wz0!Z3clm(9s$1I#dwzgxj#o(&07ozh{UtZFm2)u;^|G>;Ji;9VI^55
zJ|`YG>4L<MTvt4P<6LxE;F%FKlb$Dz5R1hQRyvrKOpQ2B991=)@`bF&D(5ZETBXKX
z_v9}O<@J?iuG1Vr5{p=Z1Q7~qD5C-!F<Ny}ETm~a;o~26{Svtpa+Sfzv4AQx$gUs!
z4}N!R6{aS=q)-CresP?SQJ`lRXx1I)``B@sCqVESxYFDHY6F=0B)#6&qDMggHgIv>
z)|5Tqat9cCGGtSBr65hAPypV~=$mrDz%9_X=JnRv$LRx*p{`Olz`-FfR;288pLh3m
z_V(|YR)0TKlX9Dx7F>1!000JJOGiWi{{a60|De66lK=n!32;bRa{vGh*8l(w*8xH(
zn|J^K1II~3K~#9!?Oab!;y@gI?Us;T35gpKIqbn8C%=IwI2q#6KNk*u4x@YrW6+aF
zz4!$d<JD*ouNw~=4jW*JD4;01P}=UHB`Y{BP}`jW<|Qv7Gz{~5%)HJF{rv<Ck1&8Z
zfF%Hn0KNh61Nda4EjOV6r~}9Y_yOPoz;^&SH@-{)kN|KAKn0+UC{-hdgb|Y?hy%D`
zAULOaW5i|~QveR34^`U1xJAW?acWp`LIAQ11n|F@HDVrEoN=5|gG{-;B27)$$RUj+
z%jtH=KqqPQ&`g{-#@mnwr2@j;O~PdQj+GyEt&<WAbc!`5-U@WdK!;f4B>)J}_f|iR
z*Bt+#0f>mu4T+2M9s+>42z^)1LB^5@{m6oYj70%J6~Hv@o-m4<0H6)_4!c-^B0zWR
zq2c%YUqhi#gLEyI%T2f2?XeNv);b{=3^odd!lR~XYA^Tp_DXi!Wsvqi9F0b6vMe{X
z9w>^^-q_eEGY}kIfdFXR+uLPh<aD7{t3A)p&p$H|AYFk(QB>0D^u0#F_4Rex>-EYE
z1W8XI09qgrcr6x-b&^P9;786h6pco!vMjeu{OFc}K<NquKuac*w<JHRR;!JLg@s23
zf~6~vAP8zYoxUSYwX3VEdymJ{W*}gC0s*=o6$*tXl1K*!2frBzn65wov{)=wX|-DK
z{76+*d3AMl)YeDtG@MK(&DKYaNF*{!e&kNWf*`1;r>8_e%49N?5n3O)*ZA!0?2CyX
zsi{<IRMtoCenBi2t2UcWndC=nYioB52tZdL0NT#Z&aH_bJw+msIs+om6$pTOc6L@K
z`B65Tz4v;(Ee3?3Dv&laGh@16+uhw|_SP?gqc8XrqdmpANn4QL<}Jt<iWcNsjXva?
zRcqhj#~o(m2WEYIhab6G`wl;}H{-be?c+#FP#_Tab9{U(Ns{F0y|%x<e|K_nGB<3S
zD=RC%d_G^>iT<6RpU)MG#i0{cI{1*nZvFL~&*$5kL)hHhwEc|0hj;T^TU(Xo<>jxv
z?>{^|G}hPGzciao#}e0Q;Um7|+T$;*j3C>;ZZH^pIXXHL4d2n;UbE{vCO@20gTNM;
zeFQHY4p$^eQk_tzR4V!E_4;SK0`Z49&7p|UQ>Qt|sEg3^$~nl$i_nwqImq}SLa#``
zLB<77hcbr-BONLSAVa%13?c&{*V$^MX!nLebZNqqdb{~9sTbgB;T;mw!aLxF1uO~+
z0K7Cs-_jHSFK#jrczK)wzzZx52wtLV08DI=H#_^Ui7FHL7vj)T+@mUjcmMzZ07*qo
IM6N<$f~19wPyhe`

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 0000000000000000000000000000000000000000..7f5bcc560229c7c522b5769f29442ae0568c985c
GIT binary patch
literal 1609
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
Hu0mjfpQ7)=

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..584b4238787e092e2ed481777cec680849aaab95
GIT binary patch
literal 1122
zcmV-o1fBbdP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0004dX+uL$X=7~w
z04R}tkv&MmKpe$iQ$>*$2MdZgWT;LSM2k3T6^c+H)C#RSm|Xe=O&XFE7e~Rh;NZt%
z)xpJCR|i)?5c~jfb8}L3krMxx6k5c1aNLh~_a1le0HIM~n$<M{Xu55tlL;}KTNQg=
zAs~n_1`(H;Wz0!Z3clm(9s$1I#dwzgxj#o(&07ozh{UtZFm2)u;^|G>;Ji;9VI^55
zJ|`YG>4L<MTvt4P<6LxE;F%FKlb$Dz5R1hQRyvrKOpQ2B991=)@`bF&D(5ZETBXKX
z_v9}O<@J?iuG1Vr5{p=Z1Q7~qD5C-!F<Ny}ETm~a;o~26{Svtpa+Sfzv4AQx$gUs!
z4}N!R6{aS=q)-CresP?SQJ`lRXx1I)``B@sCqVESxYFDHY6F=0B)#6&qDMggHgIv>
z)|5Tqat9cCGGtSBr65hAPypV~=$mrDz%9_X=JnRv$LRx*p{`Olz`-FfR;288pLh3m
z_V(|YR)0TKlX9Dx7F>1!000JJOGiWi{{a60|De66lK=n!32;bRa{vGh*8l(w*8xH(
zn|J^K0((hBK~!ko<(j{4+E5h6e>PQ`SPb=0DP^KdWmM$}GB5z*1(327o*`4`h`a#|
zS(4oquaE@xY(|k#g~V2bGL%0}A@#ow#*&*f^b$(&Z9nM@w(hz9KHq!px%RmVi}4mX
z0CK>4;5G1q^}+#efNS6a_yqKp?IaDDfDQN?Hhaz`ElU0aFpdH7`!=3)TZoT<7Xz}7
znK$S7=$nr-`KX8oBax2jv{^Kr(oq3s3`i|&CV)b)RDNdt%j4gM1H4lS)_K{;Gv|Du
z5+o^EkyC&#z?)4oc_R7>L8g;&3IR9@K}0WvuItlErD8|#nWnit7!0;HtpEg<t+TVU
zp&!BJ<>e@mNI0VYYc#Qjnx@&7W!*+a9334Er4a!5hG9%6lgV8uz;#_apU+RE5dip=
zN@e7Eo)?Pf_xsaSDm9fx0N|gVo{sLvgQ}{oGy-;Zb{@n-wOaiujR3&UWHR5Q@!&X)
zQz#TRv7>#ubGcj|`@a86JnZi7&ZH6WyLf1|TEl0Kht)dJH0?*b-Tt=0cv!s?!!Yj0
zgPqIeo+Ur1`~&#Er;yY^EcG%fbt02~D<Sn}E^gatp>N_4hGEREuCCN%GPwodd7e`&
z7H8+@=gCEWrBZ3MzrQ~feGWjaR(sX!^|nRY3MpOXlk()`#Pyd%Hk%b1RpCrruh(z)
z_V%>!y4h@wkB^U&qW<fG(ElJ^*Qb_cDTjxL<M5ton%l1HCPe%jjmBN4)3HU`hUj*?
zFGbo(|6@xfD5%Mb8<n6MC@Zd2f>NfexRAcU5nf1JVhWK)@**EdUS<s;b)h>t5^<bP
oLPrfkq><#Xhw=v@u|IC}6Y!|(=rW~j1poj507*qoM6N<$f_L@{*Z=?k

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 0000000000000000000000000000000000000000..e5f6fa3a54e27154d3a7a2274284d0b7c5c1c932
GIT binary patch
literal 1199
zcmV;g1W@~lP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0004dX+uL$X=7~w
z04R}tkv&MmKpe$iQ$>*$2MdZgWT;LSM2k3T6^c+H)C#RSm|Xe=O&XFE7e~Rh;NZt%
z)xpJCR|i)?5c~jfb8}L3krMxx6k5c1aNLh~_a1le0HIM~n$<M{Xu55tlL;}KTNQg=
zAs~n_1`(H;Wz0!Z3clm(9s$1I#dwzgxj#o(&07ozh{UtZFm2)u;^|G>;Ji;9VI^55
zJ|`YG>4L<MTvt4P<6LxE;F%FKlb$Dz5R1hQRyvrKOpQ2B991=)@`bF&D(5ZETBXKX
z_v9}O<@J?iuG1Vr5{p=Z1Q7~qD5C-!F<Ny}ETm~a;o~26{Svtpa+Sfzv4AQx$gUs!
z4}N!R6{aS=q)-CresP?SQJ`lRXx1I)``B@sCqVESxYFDHY6F=0B)#6&qDMggHgIv>
z)|5Tqat9cCGGtSBr65hAPypV~=$mrDz%9_X=JnRv$LRx*p{`Olz`-FfR;288pLh3m
z_V(|YR)0TKlX9Dx7F>1!000JJOGiWi{{a60|De66lK=n!32;bRa{vGh*8l(w*8xH(
zn|J^K0?0{3K~!ko-I~8n+fWq7e-0G{w?h%Cgu>FPGN>8bg@Fpl6TpU&H>i|73xX$r
zC}IJzAqHN7Br^+A!c+;-B|)gFO8zypv7Iiy)VRTMoW$n#la3U}KKFi~ug|^5=UQPj
zm<K)qAA$G4Ti^}w(mLM)z5!o>OW+(R0+kW<?+dd)+9G2B-2u(8eA8B2fguKDfu;}A
zPg&DyGd51*lR##~#Cr+JSbdEYi@?Pgi97AW>T@Jm2O0sA7uK-)9txiUJp}T?bc=&;
z@@9zSg_(XttcQH(dyRzW$7zvpo_Q}Z(KoOs33j&eGdsCXv6*K;vY%z_gcaNG81RL^
z`O5=lW@g%{RH|eD@8skpdV702@&(5OTEIJ?>O7HkQ+{}Oc-OTdpU>AOCMLoP^sJNo
zEPYZ0RaHBsQmJJZv9+~z7m|P`js!66#Zl9=cB9ewB?K6T(OFwt3v0$o+Xb9^bxfsF
zHPbXrA>!udrX7pL+93!y7v$#|FrPm-IH)<}ArguBc_$dg42wIPgE~)7PyZ7S+uPee
zLKuZjfL%Y%3kwTB?eU=Nx}HcR>H!Pb1vvBDKr)%Ece~w3@h~?xcORgDGk~jM8ga%$
zu~@tdFdnV|h8lKNRezVu<z`6nPzQe%g-51onlm0ctE;O)tPe(n{{YfILedAZ^wX&H
z3z_t(g!IWANSsc;uml_fALs*3)9!P*TvSmM1;8{-J(*1E)oS&Xo8QL9Mr~<nsok%A
zJNEYWUSD5dM_n#CwjYf3m2!W7-{=mA<>h6!QGIx&6f5y};K=QcWV6{;JRVoYaiLJC
z@9gZj-uW@&$l@GKS!HEqr5%sQJ6^68I6Xa`s#GddJx)DYRsjhMTTVz{S_H|9y8=>|
z*9D~B;INC3c8f_s>P<cYskd1Lq~7SZL)uRboOl)=dnkS#9SH4nn?EMag{<Um$n5|C
N002ovPDHLkV1kK#AMyYI

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..38d0f3a80955ea72a2b36f49cd3c502e95e826b2
GIT binary patch
literal 1847
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
new file mode 100644
index 0000000000000000000000000000000000000000..4b8226e698e4fb1baee32abfb82a2fdde17a2469
GIT binary patch
literal 2108
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..ad567ceef939f80151a0dfb4b5bdb81679367b6e
GIT binary patch
literal 3238
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
Sf<*?u1sLm_>*4RhAN>#Hur-VT

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000000000000000000000000000000000000..d6c7fab15426171d85f596c0d7ce9326178e84df
GIT binary patch
literal 3748
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
O0000<MNUMnLSTYy^cDXA

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..e3ce8bcf07de165b0dab766c0c3af84b1499028d
GIT binary patch
literal 3556
zcmcgvi#wC;AAhzn%z4QqjX9?>icn@Oa>#^~^C6OR=Bz0;@xD1VLd>b<kPe76mK>&t
zkRs8`(oi&uL`!n|&HMWoe%J4MuKW2s*XMJ8uIqc>-|zFipC`@U&QcsE4+8)|+}g_A
zk&n!sAq?f;9a*75002q|I&s22$S({4G;^-zV60x4Ds+3FvB;4X5=}R}aL-QGJi{<}
zce*`l1Xg>j(BqFFUjC*G!m^XjX7~8M@9cJU7IHR|+5jS=q8y`h;M)Z<Ze8&N7A0;K
z8TTEy<8Z#{y*?<gCG2jlh;Fg_?gTHC(sdoEbOF_Wz}gYkKEp+V+9$i?Z*4!tTDrV;
z7ZbkT)i|INHZ4BQ!B4PTPb-{Pb5%3ZKpJq8yC@#c#)&f?(XMQ&^pV^$jT=%K-4f@H
z73SM!8QLkF)h}I6t?AL4J2dE4_0nziGg|BmFW<lJoq`!W!zEcj8WyZs0p6?Y7UOuZ
zG6*|0qZqphe<~B1-`U$h($ed#Q{0eDj0@R)SG}#$9{e>iqJ-i=3qS;p?wecx5K*LI
zy0nKeJh2rFDO^)+n;b2-G~GT*i1;{~hhaww$q^4<I1^i?gui1COuqSA9LZ!JdfPn9
z8y)ZAK(g=DIT|oKQ99=;zs1~+TaEqo>pS&a64og<vY0CC5zEg8)c2I7Ik3HR(b}qW
z`HTp`$~B6gxUro9!f6)A1AyqJwYiy7{P;p?cxe8YJuj0mGL#Teap41WYUe(DzEL-p
z8o}t2yEZ80S0nNYKCSG@ta-IzIxV!u{+n7DRG#r#N1{~s@CI;DeO(!KEflUQA%{El
z5Ca>GEYj(^<@l$dQS!}1UF>Gm;N||Ox1-9q1s)>%=So;_ir0^QPncXKmQ{nX)_}Mv
zj3LO_|0fPpuiyf90*wK?N4ueRvT{%;Nt9`%1gRuz(^US%84$W#KHUF3Y@E-8u}ypq
z5zvDGoeAbnn;(2h@+tvIKoZC&OeJ-KJxl1Id9pfNgstuIB4fE4VF>#Mik%sh>$DfF
zftUc$h-&-&9^xn4>b2*y9{cOo?=h6flv9j;h0QW=YcQJ6e~c2*gM=X!F5K4}k>%MA
z)4b=h1eq14&xC}WwD5FGj8mim?i~2|Tm5z!?`sa|+JnB^vbNxOcwB$~AExz}s>OTF
za0~9Nu`4vR=i>z3#KrM)u-<%wzr{SKBuL-}8%cCgRK4G-FUxcDb2xTf2nimHC-_v>
zN2||c&XhgJyl*s-b1a<CBG&uB+S>AfGUyiI)U)68x|}N6lJK;A#_-H%i#yPG`9Q%s
zx(Qf0UMm9BCq_8<$pGO?swRBe2u_?5ol*ZSAE(|+z4DGGIW?T%pZ{LU|AeBpXDfQl
z;Ikj;q{ppwDAxg|E9yNp2rYfuYB*LM+)u(*%p$g;Aa%}BM3-Cr;Us~j1oqsA(==&i
z#5@7|`#=<HPhU5HXNE^zsg*LZ2eHT*XPe*fp8w+_q99P$jLeY|B*?lzO3FBbjaMI{
znIE~^_j#Hrn%Nf2)rd3N)on6G3zkbS82ySU8>+eo`gFf-fvGj?4Bfr<A;K4FD992K
z!*5ckgTP+<m5k-7a~`L+72lPDWM^cx-TXc2QY%)+FHO<gUnP|+iY<wbY?N=fq;eO&
z>+r<vQ`diWd~9(;)q!tM4}u{xNrgmcywuh8jAj4bbv+t|!6fgg@+w@ON<IU5+h<wL
z9<!vT)-GQl6{RD<vU;NQ{qqsiUBQVCTdLHbq&OCk&rs`26((z3*XH$z*Mpl)I;2np
zMBSW*7(sEo1ebE+(9U!HXp1r`eZY+XwPOGJ3|CfN6ok(_(>?0qtYV%M1jxe~3zjjP
zXk3M?l^S7vDY*TSFu$4(iLlg1a4Eg`nF3Q>ij@|*9}tmN=85<`joFQpYcK{KY^cKt
ztK3r6Tv_0x7N$Ocv0-j2XHu-2lEF>+(&ZjYvG2~K(#c~hNvq#KZA<8CaGIN%v_G~b
zG$Vhd?P-{tk36ZbuYWahZTZVqsBw$q{SjAggVkhTE6J5NTO5w;z1XM{p+K1KO3UT(
zcyl#9%9r=AfG?gsOjR(7{q|v~Fn~PNJW1qU=eek&{k@naHdT&PTlL(upyZ4<*zJu^
zwS0%h3OI83F1~on=<wm?u!BM#t?{w1i}V*p{c>7wUIrP3Of-evzR>v3kfFL^%=}2s
z{QSJxP87YZq>{6qo|yWi?XAJW0-W>Y)zy!bofuSBz{`$)elrLJ+RL^lg4x?^wcYr}
zWIb&sj0;|-lWrY}R|Ad~XYmqz0t3IUIBD^+_)-)VVV~`lxb~$f^yqPg9s#QDtm2qw
zoaZCHwnr)a{pjeg+lCR-gn>_xisNyM#(B2tXm^U`P0;c=PtT84p-0z)Y<K;<#A5uY
z+;Py9_M=q=!vK3PD;Nvt6SX$m3*;egf(-yoK7Z-|!9PYbo%%!t(JSDAs#g2AhtW*Y
z{b-q*0nw$Ce43xC)|_RWSzjygsIt|bz?YBn<vhOZ$d~!M*qXPD>+Ed>!uf6~z8qq4
z`HpCWEv+@X!$!%RUHI&+GY76IOhvG(eySMC?O^m?y&Ww5sdP}2kNGmG!gjNQ@hYiP
z$$6JSlU5O5mHfR(h~bn%A3i?SQ#%|;Mfhmp(<QxT1q*HZ%LR6#txRpG^bx0(P-JRA
zc`G@|M@f+;j`dLcK}*;u(6?sQDQ{||xIYl0Ij15R0(`mhznGj}VPjL+($Yfqd=~2o
zec*S+);lU{#phV5ohv1vq^PJUe6f9fQG$DH_F7q4*_YDNQUmuf-Cb%Sr1A0bQ|rGL
zLLiCo8NZj4N!y#hRwom}>AZOLl@ETD2EU#g$98O6TU+fG8M3Ygx+;8Et$TCX(}kvq
z#mtpG7!2lbH#fISit_R;qeSCeR|ety?)s6I8*8+?cV`c9<u6vKt_r(%ByI+{H-!cP
zva)~nym;}#bM;fwHf8WOw&MfQ`1y^SM@;!uUog=e{zxELbTe~kXz0`%%qpvy6HQFx
z#itxn^C$7&p8oLGA1|%&_}7yBHO9^jmTnUl=wpiwNJ@QmrPxy6fk#g;OH4?^;%Ibq
zv_irxHDF`|tcikzjz8g8@wenPGZ}}i=;*+{W3e{cP8DdY)%K`t&{V~;ZK{Y~@l&aP
z_4V~7KUybm6?hTvbJ?BOn%yXtzpt%At<-ZXp2aTo)wneHT4Yl8B&;tqV-tRKBa$v+
zkW+}sy=>l?H<m%<%`5h-W#(#}jt%|T!h>=fgtwQ*0X!b>x%X%&<L`LMZ^IPq*6(3k
z^~M4I!m+K1aMtkf@=%XrQmfWrz!QEG!&krKjrzU%o1ZFCAqfRTKhGZHA<_7RU$si<
zDKKeeFK@6&1l^i;gd|)L3YKfyX_SBMVv=?`r*1Z&?c$6|kw(CoMqI5FooNqn@4p09
zAp75$!y>f)78ok?s|~P^Ss0^+lcDO;{5IhC##-c2>9*)0HTyVK6s~;lS3AI&^kVeA
zu)_rji1W)AgoN6M(&fG1Qn#zjB=39zDJu{oFxc}XB>P^>S)5E-1*7b?4pXzfr$q~u
z-i7pdb4Hg#;V}zHqXW`k2BZio4g!J8ne}2zcVc329{wg59Jj*e^LnxHQu!3k6DK1u
zCY?@@4e`L{I>+k|&5!^0!~*#g$K>NY)S7htp%=RK&~BN}EagKmNR)BKK8EDi;*B28
zEej6Bi(Yr``sLZPclEHgNl+l}z)v|^ex8L90mj%BC;IdFz!RNOse1nw17Qc>f${#v
zTCr7B{X`29<@>nUwJiMXz>nE{rWu>abr5y{0?7JI4%JI%Y@Ak2{zTiKTmDn-1#gk_
zk5^uQqWeCkB<cOY)t6Gwh3bIsK!@KAdU#aWSAPcg-m@A@b#n;?K_qnR$e8HL+R5;)
z*X2KA8zCstBNE*-KpQ<6kVLZcQF&)<EA@QW9|ET6%*u(agvCU1#!Zvtxrqa5Y&n5M
z@eQ@x2D=|~enzmOAJcmUo=ZZ>vh34q?G0}|$0##{0*A@<7b92Z+9n+CKzpYj<Gdk~
z<w1GR|1x3upEi4q^)?nLNrPoq`f_YX61?6DD|BM6Hk#--UJf}pPk*@<$ikt?cO#L_
zBVC8t5>GZCFpgzTl`U<-e>cbIzRLm1x(*o!Z{kt;1uYemT50I9e5M2o9nFPk<TpVp
zyxd&7wn`DQ0A+gC*G<v<zTSHz@9h=O2gTU}MdYKB68D_sgENSCYc4%PLyyiN%d_GM
z*=iknaNf(=d(M5gw0!n0f&OGEJw^UjnooP+Yf!-xC?L{A;=u-Ev{44qfnQbBO$@{6
z*~Nsj?t6VoY<vVSO_kG`ZKjYxDYZ?AmCj!wzb~<x%o8F+AMx0o$DXvy`DlrhfE<~J
znE0U%F8K=+&f+Y~Q+lLeu0C?jpV@+Jg~h#?tchzaJKxcl9+W$8AY9?xG1dBqVE*3$
NU~OS%UWfBZ{tuW+dw>7{

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000000000000000000000000000000000000..981c54053c7f6c8026a6c54fe7009d4b7db3079a
GIT binary patch
literal 4497
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
KO$bJaxc>upK!|$)

literal 0
HcmV?d00001

diff --git a/art/ic_launcher2.png b/art/ic_launcher2.png
new file mode 100644
index 0000000000000000000000000000000000000000..40affe360860c40791c1966e0195fd8c783822bf
GIT binary patch
literal 10167
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
GJNRE^O=u<n

literal 0
HcmV?d00001

diff --git a/art/ic_launcher2_round.png b/art/ic_launcher2_round.png
new file mode 100644
index 0000000000000000000000000000000000000000..3e3aa46b3033ee3ce58e24623b4451e857ef0b40
GIT binary patch
literal 13356
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

literal 0
HcmV?d00001


From 6e2a2ed94637c98ad8035e37742595395d436cd1 Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Wed, 3 Feb 2021 15:56:38 +0200
Subject: [PATCH 182/912] documents provider: fix application icon reference

---
 .../java/com/termux/filepicker/TermuxDocumentsProvider.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/termux/filepicker/TermuxDocumentsProvider.java b/app/src/main/java/com/termux/filepicker/TermuxDocumentsProvider.java
index cbecfd705e..b72442ac27 100644
--- a/app/src/main/java/com/termux/filepicker/TermuxDocumentsProvider.java
+++ b/app/src/main/java/com/termux/filepicker/TermuxDocumentsProvider.java
@@ -75,7 +75,7 @@ public Cursor queryRoots(String[] projection) throws FileNotFoundException {
         row.add(Root.COLUMN_TITLE, applicationName);
         row.add(Root.COLUMN_MIME_TYPES, ALL_MIME_TYPES);
         row.add(Root.COLUMN_AVAILABLE_BYTES, BASE_DIR.getFreeSpace());
-        row.add(Root.COLUMN_ICON, R.drawable.ic_launcher);
+        row.add(Root.COLUMN_ICON, R.mipmap.ic_launcher);
         return result;
     }
 
@@ -262,7 +262,7 @@ private void includeFile(MatrixCursor result, String docId, File file)
         row.add(Document.COLUMN_MIME_TYPE, mimeType);
         row.add(Document.COLUMN_LAST_MODIFIED, file.lastModified());
         row.add(Document.COLUMN_FLAGS, flags);
-        row.add(Document.COLUMN_ICON, R.drawable.ic_launcher);
+        row.add(Document.COLUMN_ICON, R.mipmap.ic_launcher);
     }
 
 }

From 58b7a26b33c654a0e40504d79aec552519ee5887 Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Wed, 3 Feb 2021 16:43:17 +0200
Subject: [PATCH 183/912] add basic metadata for F-Droid.

Fixes https://github.com/termux/termux-app/issues/622.
---
 .../android/en-US/full_description.txt         |  13 +++++++++++++
 .../metadata/android/en-US/images/icon.png     | Bin 0 -> 3556 bytes
 .../en-US/images/phoneScreenshots/1.jpg        | Bin 0 -> 141057 bytes
 .../en-US/images/phoneScreenshots/2.jpg        | Bin 0 -> 120386 bytes
 .../en-US/images/phoneScreenshots/3.jpg        | Bin 0 -> 98625 bytes
 .../en-US/images/phoneScreenshots/4.jpg        | Bin 0 -> 162046 bytes
 .../android/en-US/short_description.txt        |   1 +
 7 files changed, 14 insertions(+)
 create mode 100644 fastlane/metadata/android/en-US/full_description.txt
 create mode 100644 fastlane/metadata/android/en-US/images/icon.png
 create mode 100644 fastlane/metadata/android/en-US/images/phoneScreenshots/1.jpg
 create mode 100644 fastlane/metadata/android/en-US/images/phoneScreenshots/2.jpg
 create mode 100644 fastlane/metadata/android/en-US/images/phoneScreenshots/3.jpg
 create mode 100644 fastlane/metadata/android/en-US/images/phoneScreenshots/4.jpg
 create mode 100644 fastlane/metadata/android/en-US/short_description.txt

diff --git a/fastlane/metadata/android/en-US/full_description.txt b/fastlane/metadata/android/en-US/full_description.txt
new file mode 100644
index 0000000000..beb4173995
--- /dev/null
+++ b/fastlane/metadata/android/en-US/full_description.txt
@@ -0,0 +1,13 @@
+Termux is a terminal emulator application enhanced with a large set of command line utilities ported to Android OS. The main goal is to bring a Linux command line experience to users of mobile devices with no rooting or other special setup required.
+
+* Enjoy the Bash and Zsh shells.
+* Edit files with nano and vim.
+* Access servers over SSH.
+* Compile C/C++ code with clang.
+* Use the Python console as a pocket calculator.
+* Check out projects with Git and Subversion.
+* Run text-based games with frotz.
+
+At first start a small base system is being configured. The GNU Bash, Coreutils, Findutils and other core utilities are available out-of-box. Additionally, we provide more than 1000 other packages installable by using the 'pkg' utility which currently is a frontend for the 'apt' package manager. All provided software has been patched and compiled with Android NDK to provide max compatibility with Android OS.
+
+To learn more about application usage tips and tricks, long-press anywhere on the terminal and select the Help menu option to access Termux Wiki. This resource is also accessible directly in a web browser: https://wiki.termux.com/wiki/Main_Page.
diff --git a/fastlane/metadata/android/en-US/images/icon.png b/fastlane/metadata/android/en-US/images/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..e3ce8bcf07de165b0dab766c0c3af84b1499028d
GIT binary patch
literal 3556
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
NU~OS%UWfBZ{tuW+dw>7{

literal 0
HcmV?d00001

diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/1.jpg b/fastlane/metadata/android/en-US/images/phoneScreenshots/1.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..ac0d54b5c98ad50d8a4f8d179d537c79a3cf65ab
GIT binary patch
literal 141057
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

literal 0
HcmV?d00001

diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/2.jpg b/fastlane/metadata/android/en-US/images/phoneScreenshots/2.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..68f9c7ae6beba5720575b33823a1e93f36f27d3a
GIT binary patch
literal 120386
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
z%0D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

literal 0
HcmV?d00001

diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/3.jpg b/fastlane/metadata/android/en-US/images/phoneScreenshots/3.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..7a00fa75a58b94f3b324add78c008b6511253051
GIT binary patch
literal 98625
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%0AoX{|ot-mW(P^oUUJqKXfj9_%(8IQS
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

literal 0
HcmV?d00001

diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/4.jpg b/fastlane/metadata/android/en-US/images/phoneScreenshots/4.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..c76a52beec7075ebedc57b74dddc4df79ad3cb98
GIT binary patch
literal 162046
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
NLzwwLIjO95{SVCwrBDC>

literal 0
HcmV?d00001

diff --git a/fastlane/metadata/android/en-US/short_description.txt b/fastlane/metadata/android/en-US/short_description.txt
new file mode 100644
index 0000000000..85f80a0dba
--- /dev/null
+++ b/fastlane/metadata/android/en-US/short_description.txt
@@ -0,0 +1 @@
+Terminal emulator app with a large set of command line utilities

From 2ef45c85b2b52550c7294ca16579211f3b10e037 Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Wed, 3 Feb 2021 16:59:34 +0200
Subject: [PATCH 184/912] terminal-emulator: bump library version

Needs to be updated on Bintray: https://bintray.com/termux/maven/terminal-emulator
---
 terminal-emulator/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/terminal-emulator/build.gradle b/terminal-emulator/build.gradle
index 87fa1e563e..1e27cf64c8 100644
--- a/terminal-emulator/build.gradle
+++ b/terminal-emulator/build.gradle
@@ -13,7 +13,7 @@ ext {
     libraryDescription = 'The terminal emulator used in Termux'
     siteUrl = 'https://github.com/termux/termux-app'
     gitUrl = 'https://github.com/termux/termux-app.git'
-    libraryVersion = '0.52'
+    libraryVersion = '0.106'
 }
 
 android {

From fa5117a098c982d7fbaf21c5f3ce36c3d3941cae Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Wed, 3 Feb 2021 17:02:29 +0200
Subject: [PATCH 185/912] terminal-view: bump library version

Needs to be updated on Bintray: https://bintray.com/termux/maven/terminal-view
---
 terminal-view/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/terminal-view/build.gradle b/terminal-view/build.gradle
index 35a78ad7fb..338563f723 100644
--- a/terminal-view/build.gradle
+++ b/terminal-view/build.gradle
@@ -13,7 +13,7 @@ ext {
     libraryDescription = 'The terminal view used in Termux'
     siteUrl = 'https://github.com/termux/termux-app'
     gitUrl = 'https://github.com/termux/termux-app.git'
-    libraryVersion = '0.50'
+    libraryVersion = '0.106'
 }
 
 android {

From a7eb17317837868f4ac8962dd48459c608ee3653 Mon Sep 17 00:00:00 2001
From: Emil Velikov <emil.l.velikov@gmail.com>
Date: Sat, 23 Jan 2021 20:05:07 +0000
Subject: [PATCH 186/912] app: enable split apk builds

Currently we build a single APK which handles the four supported ABIs.

Therefore each user, downloads 50-75% more than they need - adding
towards both client/server-side network as well as device storage.

Use a split APK approach - it costs nothing from build and server-side
storage POV.

Note: We're removing ndk:abiFilters - they're incompatible/superseded by
the splits:abi:include list.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
---
 app/build.gradle | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 591d83ea2b..7d90f98cdd 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -25,9 +25,14 @@ android {
                 cFlags "-std=c11", "-Wall", "-Wextra", "-Werror", "-Os", "-fno-stack-protector", "-Wl,--gc-sections"
             }
         }
+    }
+
+    splits {
+        abi {
+            enable true
 
-        ndk {
-            abiFilters 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a'
+            reset ()
+            include 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a'
         }
 
     }

From 5b084f08512e5507e9831e35ba00ff8915492b13 Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Wed, 3 Feb 2021 17:53:08 +0200
Subject: [PATCH 187/912] github actions: include split apks to artifact
 archive

---
 .github/workflows/debug_build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/debug_build.yml b/.github/workflows/debug_build.yml
index 0aa761a713..97b313bb9b 100644
--- a/.github/workflows/debug_build.yml
+++ b/.github/workflows/debug_build.yml
@@ -23,4 +23,4 @@ jobs:
       uses: actions/upload-artifact@v1
       with:
         name: termux-app
-        path: ./app/build/outputs/apk/debug/app-debug.apk
+        path: ./app/build/outputs/apk/debug/app-*-debug.apk

From f3a3a89f93f5347b7110d9e2f13b64f205790878 Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Wed, 3 Feb 2021 18:15:03 +0200
Subject: [PATCH 188/912] github actions: use hardcoded list of debug apks

---
 .github/workflows/debug_build.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/debug_build.yml b/.github/workflows/debug_build.yml
index 97b313bb9b..d79848680e 100644
--- a/.github/workflows/debug_build.yml
+++ b/.github/workflows/debug_build.yml
@@ -23,4 +23,8 @@ jobs:
       uses: actions/upload-artifact@v1
       with:
         name: termux-app
-        path: ./app/build/outputs/apk/debug/app-*-debug.apk
+        path: |
+          app/build/outputs/apk/debug/app-armeabi-v7a-debug.apk
+          app/build/outputs/apk/debug/app-x86_64-debug.apk
+          app/build/outputs/apk/debug/app-x86-debug.apk
+          app/build/outputs/apk/debug/app-arm64-v8a-debug.apk

From fec61d315f575853a2f9d966e7b603013b04c71e Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Wed, 3 Feb 2021 18:59:22 +0200
Subject: [PATCH 189/912] github actions: debug_build.yml is fixed now?

---
 .github/workflows/debug_build.yml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/.github/workflows/debug_build.yml b/.github/workflows/debug_build.yml
index d79848680e..6818a7d2e2 100644
--- a/.github/workflows/debug_build.yml
+++ b/.github/workflows/debug_build.yml
@@ -23,8 +23,4 @@ jobs:
       uses: actions/upload-artifact@v1
       with:
         name: termux-app
-        path: |
-          app/build/outputs/apk/debug/app-armeabi-v7a-debug.apk
-          app/build/outputs/apk/debug/app-x86_64-debug.apk
-          app/build/outputs/apk/debug/app-x86-debug.apk
-          app/build/outputs/apk/debug/app-arm64-v8a-debug.apk
+        path: ./app/build/outputs/apk/debug

From 407e4e003ad64fd9fae4631323e4eed3ca420774 Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Wed, 3 Feb 2021 19:05:19 +0200
Subject: [PATCH 190/912] github actions: update actions/upload-artifact to v2

---
 .github/workflows/debug_build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/debug_build.yml b/.github/workflows/debug_build.yml
index 6818a7d2e2..0439523ebf 100644
--- a/.github/workflows/debug_build.yml
+++ b/.github/workflows/debug_build.yml
@@ -20,7 +20,7 @@ jobs:
       run: |
         ./gradlew assembleDebug
     - name: Store generated APK file
-      uses: actions/upload-artifact@v1
+      uses: actions/upload-artifact@v2
       with:
         name: termux-app
         path: ./app/build/outputs/apk/debug

From 496da3f877c5f8f3ea52429b36719de6de95211d Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Wed, 3 Feb 2021 20:22:38 +0200
Subject: [PATCH 191/912] introduce a property for configuring default working
 directory

Issue https://github.com/termux/termux-app/issues/1192.
---
 app/src/main/java/com/termux/app/TermuxActivity.java  |  9 ++++++++-
 .../main/java/com/termux/app/TermuxPreferences.java   | 11 ++++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index 5839d10a56..280d93782a 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -652,7 +652,14 @@ void addNewSession(boolean failSafe, String sessionName) {
                 .setPositiveButton(android.R.string.ok, null).show();
         } else {
             TerminalSession currentSession = getCurrentTermSession();
-            String workingDirectory = (currentSession == null) ? null : currentSession.getCwd();
+
+            String workingDirectory;
+            if (currentSession == null) {
+                workingDirectory = mSettings.mDefaultWorkingDir;
+            } else {
+                workingDirectory = currentSession.getCwd();
+            }
+
             TerminalSession newSession = mTermService.createTermSession(null, null, workingDirectory, failSafe);
             if (sessionName != null) {
                 newSession.mSessionName = sessionName;
diff --git a/app/src/main/java/com/termux/app/TermuxPreferences.java b/app/src/main/java/com/termux/app/TermuxPreferences.java
index 1d85b72780..bb2a417eed 100644
--- a/app/src/main/java/com/termux/app/TermuxPreferences.java
+++ b/app/src/main/java/com/termux/app/TermuxPreferences.java
@@ -78,6 +78,7 @@ final static class KeyboardShortcut {
     boolean mBackIsEscape;
     boolean mDisableVolumeVirtualKeys;
     boolean mShowExtraKeys;
+    String mDefaultWorkingDir;
 
     ExtraKeysInfos mExtraKeys;
 
@@ -113,7 +114,7 @@ static int clamp(int value, int min, int max) {
         } catch (NumberFormatException | ClassCastException e) {
             mFontSize = defaultFontSize;
         }
-        mFontSize = clamp(mFontSize, MIN_FONTSIZE, MAX_FONTSIZE); 
+        mFontSize = clamp(mFontSize, MIN_FONTSIZE, MAX_FONTSIZE);
     }
 
     boolean toggleShowExtraKeys(Context context) {
@@ -227,6 +228,14 @@ void reloadFromProperties(Context context) {
                 mUseFullScreenWorkAround = false;
         }
 
+        mDefaultWorkingDir = props.getProperty("default-working-directory", TermuxService.HOME_PATH);
+        File workDir = new File(mDefaultWorkingDir);
+        if (!workDir.exists() || !workDir.isDirectory()) {
+            // Fallback to home directory if user configured working directory is not exist
+            // or is a regular file.
+            mDefaultWorkingDir = TermuxService.HOME_PATH;
+        }
+
         String defaultExtraKeys = "[[ESC, TAB, CTRL, ALT, {key: '-', popup: '|'}, DOWN, UP]]";
 
         try {

From 01929397cf4f4a990a7616ccf672ae054f2dd4f7 Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Wed, 3 Feb 2021 20:27:13 +0200
Subject: [PATCH 192/912] TermuxPreferences: get rid of unnecessary switch()'es

---
 .../com/termux/app/TermuxPreferences.java     | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxPreferences.java b/app/src/main/java/com/termux/app/TermuxPreferences.java
index bb2a417eed..d3df7fc335 100644
--- a/app/src/main/java/com/termux/app/TermuxPreferences.java
+++ b/app/src/main/java/com/termux/app/TermuxPreferences.java
@@ -210,23 +210,8 @@ void reloadFromProperties(Context context) {
                 mUseDarkUI = nightMode == Configuration.UI_MODE_NIGHT_YES;
         }
 
-        switch (props.getProperty("fullscreen", "").toLowerCase()) {
-            case "true":
-                mUseFullScreen = true;
-                break;
-            case "false":
-            default:
-                mUseFullScreen = false;
-        }
-
-        switch (props.getProperty("use-fullscreen-workaround", "").toLowerCase()) {
-            case "true":
-                mUseFullScreenWorkAround = true;
-                break;
-            case "false":
-            default:
-                mUseFullScreenWorkAround = false;
-        }
+        mUseFullScreen = "true".equals(props.getProperty("fullscreen", "false").toLowerCase());
+        mUseFullScreenWorkAround = "true".equals(props.getProperty("use-fullscreen-workaround", "false").toLowerCase());
 
         mDefaultWorkingDir = props.getProperty("default-working-directory", TermuxService.HOME_PATH);
         File workDir = new File(mDefaultWorkingDir);

From e03858f0659c108f12d44b5c162586a66d351765 Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Wed, 3 Feb 2021 22:39:13 +0200
Subject: [PATCH 193/912] export app version in environment variable

---
 app/src/main/java/com/termux/app/BackgroundJob.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/src/main/java/com/termux/app/BackgroundJob.java b/app/src/main/java/com/termux/app/BackgroundJob.java
index 3df100260d..cfb11cd4c6 100644
--- a/app/src/main/java/com/termux/app/BackgroundJob.java
+++ b/app/src/main/java/com/termux/app/BackgroundJob.java
@@ -6,6 +6,8 @@
 import android.os.Bundle;
 import android.util.Log;
 
+import com.termux.BuildConfig;
+
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
@@ -138,6 +140,7 @@ static String[] buildEnvironment(boolean failSafe, String cwd) {
 
         List<String> environment = new ArrayList<>();
 
+        environment.add("TERMUX_VERSION=" + BuildConfig.VERSION_NAME);
         environment.add("TERM=xterm-256color");
         environment.add("COLORTERM=truecolor");
         environment.add("HOME=" + TermuxService.HOME_PATH);

From 6d1b0efd3b245145d9444386aa9e9f56080df600 Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Wed, 3 Feb 2021 23:15:26 +0200
Subject: [PATCH 194/912] update bootstrap archives

---
 app/build.gradle | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 7d90f98cdd..e18adcc6d0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -142,11 +142,11 @@ clean {
 
 task downloadBootstraps(){
     doLast {
-        def version = 35
-        downloadBootstrap("aarch64", "6707cc641cde13dc2f24e819cd8ca3f1a9a003577523c25beff72690588594f5", version)
-        downloadBootstrap("arm",     "eadc9afb52900dc744fdb39ed0c3dbb87ad8ce6190b27946467df7aeab353fa7", version)
-        downloadBootstrap("i686",    "b674ef43c8388dd19e0d25b024b5792c8532ee0ddcc49f90c0716042724fa905", version)
-        downloadBootstrap("x86_64",  "86043eb76efededbdf5644686a899f4d762703fe18e23fb906a2482d593d7549", version)
+        def version = 36
+        downloadBootstrap("aarch64", "9b1ee77b3e66bbb5e0ec9d766894aa9c1441f68b2bd4152e3ea54101de3c76d5", version)
+        downloadBootstrap("arm",     "eac7c2b322a1217f28a2b540afe4f994147abee571e9fed330d5430b08d6707b", version)
+        downloadBootstrap("i686",    "990dd1aaf5b6499bee5ed473dd5a0e18ecbc0493646b299238ac0dd0d9963396", version)
+        downloadBootstrap("x86_64",  "a321eba39c4bb0fb2aa35f17ccff57bf8fcf0e973b0a0569f6d24bd02314e4ed", version)
     }
 }
 

From 2b6e9ade075d9365ae5bc4092ee51e2845f8c8c5 Mon Sep 17 00:00:00 2001
From: Vincent Deville <vincent.deville@viseo.com>
Date: Wed, 13 Jan 2021 17:08:35 +0100
Subject: [PATCH 195/912] ExtraKeysView: Handle multiple and popup
 SpecialButtons

---
 .../java/com/termux/app/ExtraKeysView.java    | 83 +++++++++++++------
 1 file changed, 56 insertions(+), 27 deletions(-)

diff --git a/app/src/main/java/com/termux/app/ExtraKeysView.java b/app/src/main/java/com/termux/app/ExtraKeysView.java
index b568703333..7b875f75c2 100644
--- a/app/src/main/java/com/termux/app/ExtraKeysView.java
+++ b/app/src/main/java/com/termux/app/ExtraKeysView.java
@@ -6,6 +6,8 @@
 import android.provider.Settings;
 import android.util.AttributeSet;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.ScheduledExecutorService;
@@ -13,6 +15,7 @@
 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;
@@ -129,15 +132,30 @@ public enum SpecialButton {
 
     private static class SpecialButtonState {
         boolean isOn = false;
-        ToggleButton button = null;
+        boolean isActive = false;
+        List<ToggleButton> buttons = new ArrayList<>();
+
+        void toggle(boolean value) {
+            isActive = value;
+            buttons.forEach(button -> {
+                button.setChecked(value);
+                button.setTextColor(value ? INTERESTING_COLOR : TEXT_COLOR);
+            });
+        }
     }
 
-    private Map<SpecialButton, SpecialButtonState> specialButtons = new HashMap<SpecialButton, SpecialButtonState>() {{
+    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 List<String> specialButtonsKeys = specialButtons.keySet().stream().map(Enum::name).collect(Collectors.toList());
+
+    private boolean isSpecialButton(ExtraKeyButton button) {
+        return specialButtonsKeys.contains(button.getKey());
+    }
+
     private ScheduledExecutorService scheduledExecutor;
     private PopupWindow popupWindow;
     private int longPressCount;
@@ -147,30 +165,40 @@ public boolean readSpecialButton(SpecialButton name) {
         if (state == null)
             throw new RuntimeException("Must be a valid special button (see source)");
 
-        if (! state.isOn)
+        if (!state.isOn)
             return false;
 
-        if (state.button == null) {
+        if (!state.isActive) {
             return false;
         }
 
-        if (state.button.isPressed())
-            return true;
-
-        if (! state.button.isChecked())
-            return false;
+        state.toggle(false);
 
-        state.button.setChecked(false);
-        state.button.setTextColor(TEXT_COLOR);
         return true;
     }
 
-    void popup(View view, String text) {
+    private ToggleButton createSpecialButton(String buttonKey, boolean needUpdate) {
+        SpecialButtonState state = specialButtons.get(SpecialButton.valueOf(buttonKey));
+        state.isOn = true;
+        ToggleButton toggleButton = new ToggleButton(getContext(), null, android.R.attr.buttonBarButtonStyle);
+        toggleButton.setTextColor(state.isActive ? INTERESTING_COLOR : TEXT_COLOR);
+        if (needUpdate) {
+            state.buttons.add(toggleButton);
+        }
+        return toggleButton;
+    }
+
+    void popup(View view, ExtraKeyButton extraButton) {
         int width = view.getMeasuredWidth();
         int height = view.getMeasuredHeight();
-        Button button = new Button(getContext(), null, android.R.attr.buttonBarButtonStyle);
-        button.setText(text);
-        button.setTextColor(TEXT_COLOR);
+        Button button;
+        if(isSpecialButton(extraButton)) {
+            button = createSpecialButton(extraButton.getKey(), false);
+        } 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);
@@ -219,7 +247,7 @@ void reload(ExtraKeysInfos infos) {
             return;
 
         for(SpecialButtonState state : specialButtons.values())
-            state.button = null;
+            state.buttons = new ArrayList<>();
 
         removeAllViews();
 
@@ -233,10 +261,8 @@ void reload(ExtraKeysInfos infos) {
                 final ExtraKeyButton buttonInfo = buttons[row][col];
 
                 Button button;
-                if(Arrays.asList("CTRL", "ALT", "FN").contains(buttonInfo.getKey())) {
-                    SpecialButtonState state = specialButtons.get(SpecialButton.valueOf(buttonInfo.getKey())); // for valueOf: https://stackoverflow.com/a/604426/1980630
-                    state.isOn = true;
-                    button = state.button = new ToggleButton(getContext(), null, android.R.attr.buttonBarButtonStyle);
+                if(isSpecialButton(buttonInfo)) {
+                    button = createSpecialButton(buttonInfo.getKey(), true);
                     button.setClickable(true);
                 } else {
                     button = new Button(getContext(), null, android.R.attr.buttonBarButtonStyle);
@@ -262,10 +288,9 @@ void reload(ExtraKeysInfos infos) {
                     }
 
                     View root = getRootView();
-                    if (Arrays.asList("CTRL", "ALT", "FN").contains(buttonInfo.getKey())) {
-                        ToggleButton self = (ToggleButton) finalButton;
-                        self.setChecked(self.isChecked());
-                        self.setTextColor(self.isChecked() ? INTERESTING_COLOR : TEXT_COLOR);
+                    if (isSpecialButton(buttonInfo)) {
+                        SpecialButtonState state = specialButtons.get(SpecialButton.valueOf(buttonInfo.getKey()));
+                        state.toggle(!state.isActive);
                     } else {
                         sendKey(root, buttonInfo);
                     }
@@ -295,8 +320,7 @@ void reload(ExtraKeysInfos infos) {
                                         scheduledExecutor = null;
                                     }
                                     v.setBackgroundColor(BUTTON_COLOR);
-                                    String extraButtonDisplayedText = buttonInfo.getPopup().getDisplay();
-                                    popup(v, extraButtonDisplayedText);
+                                    popup(v, buttonInfo.getPopup());
                                 }
                                 if (popupWindow != null && event.getY() > 0) {
                                     v.setBackgroundColor(BUTTON_PRESSED_COLOR);
@@ -325,7 +349,12 @@ void reload(ExtraKeysInfos infos) {
                                     popupWindow.dismiss();
                                     popupWindow = null;
                                     if (buttonInfo.getPopup() != null) {
-                                        sendKey(root, buttonInfo.getPopup());
+                                        if (isSpecialButton(buttonInfo.getPopup())) {
+                                            SpecialButtonState state = specialButtons.get(SpecialButton.valueOf(buttonInfo.getPopup().getKey()));
+                                            state.toggle(!state.isActive);
+                                        } else {
+                                            sendKey(root, buttonInfo.getPopup());
+                                        }
                                     }
                                 } else {
                                     v.performClick();

From 866da75fa943172012f9b1b863b774c8bbc88ca1 Mon Sep 17 00:00:00 2001
From: Vincent Deville <vincent.deville@viseo.com>
Date: Thu, 14 Jan 2021 10:05:44 +0100
Subject: [PATCH 196/912] ExtraKeysView: Use Set instead of List for special
 buttons keys

---
 app/src/main/java/com/termux/app/ExtraKeysView.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/termux/app/ExtraKeysView.java b/app/src/main/java/com/termux/app/ExtraKeysView.java
index 7b875f75c2..480b0123cc 100644
--- a/app/src/main/java/com/termux/app/ExtraKeysView.java
+++ b/app/src/main/java/com/termux/app/ExtraKeysView.java
@@ -8,6 +8,7 @@
 
 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;
@@ -150,7 +151,7 @@ void toggle(boolean value) {
         put(SpecialButton.FN, new SpecialButtonState());
     }};
 
-    private final List<String> specialButtonsKeys = specialButtons.keySet().stream().map(Enum::name).collect(Collectors.toList());
+    private final Set<String> specialButtonsKeys = specialButtons.keySet().stream().map(Enum::name).collect(Collectors.toSet());
 
     private boolean isSpecialButton(ExtraKeyButton button) {
         return specialButtonsKeys.contains(button.getKey());

From a4381b78272b206c5ec369d487f52a27f00ff5b4 Mon Sep 17 00:00:00 2001
From: Vincent Deville <vincent.deville@viseo.com>
Date: Thu, 14 Jan 2021 15:54:01 +0100
Subject: [PATCH 197/912] ExtraKeysView: SpecialButtons use Button instead of
 ToggleButton

---
 .../java/com/termux/app/ExtraKeysView.java    | 33 +++++++------------
 1 file changed, 12 insertions(+), 21 deletions(-)

diff --git a/app/src/main/java/com/termux/app/ExtraKeysView.java b/app/src/main/java/com/termux/app/ExtraKeysView.java
index 480b0123cc..e475e32a14 100644
--- a/app/src/main/java/com/termux/app/ExtraKeysView.java
+++ b/app/src/main/java/com/termux/app/ExtraKeysView.java
@@ -27,7 +27,6 @@
 import android.widget.Button;
 import android.widget.GridLayout;
 import android.widget.PopupWindow;
-import android.widget.ToggleButton;
 
 import com.termux.R;
 import com.termux.view.TerminalView;
@@ -134,14 +133,11 @@ public enum SpecialButton {
     private static class SpecialButtonState {
         boolean isOn = false;
         boolean isActive = false;
-        List<ToggleButton> buttons = new ArrayList<>();
+        List<Button> buttons = new ArrayList<>();
 
-        void toggle(boolean value) {
+        void setIsActive(boolean value) {
             isActive = value;
-            buttons.forEach(button -> {
-                button.setChecked(value);
-                button.setTextColor(value ? INTERESTING_COLOR : TEXT_COLOR);
-            });
+            buttons.forEach(button -> button.setTextColor(value ? INTERESTING_COLOR : TEXT_COLOR));
         }
     }
 
@@ -166,27 +162,23 @@ public boolean readSpecialButton(SpecialButton name) {
         if (state == null)
             throw new RuntimeException("Must be a valid special button (see source)");
 
-        if (!state.isOn)
-            return false;
-
-        if (!state.isActive) {
+        if (!state.isOn || !state.isActive)
             return false;
-        }
 
-        state.toggle(false);
+        state.setIsActive(false);
 
         return true;
     }
 
-    private ToggleButton createSpecialButton(String buttonKey, boolean needUpdate) {
+    private Button createSpecialButton(String buttonKey, boolean needUpdate) {
         SpecialButtonState state = specialButtons.get(SpecialButton.valueOf(buttonKey));
         state.isOn = true;
-        ToggleButton toggleButton = new ToggleButton(getContext(), null, android.R.attr.buttonBarButtonStyle);
-        toggleButton.setTextColor(state.isActive ? INTERESTING_COLOR : TEXT_COLOR);
+        Button button = new Button(getContext(), null, android.R.attr.buttonBarButtonStyle);
+        button.setTextColor(state.isActive ? INTERESTING_COLOR : TEXT_COLOR);
         if (needUpdate) {
-            state.buttons.add(toggleButton);
+            state.buttons.add(button);
         }
-        return toggleButton;
+        return button;
     }
 
     void popup(View view, ExtraKeyButton extraButton) {
@@ -264,7 +256,6 @@ void reload(ExtraKeysInfos infos) {
                 Button button;
                 if(isSpecialButton(buttonInfo)) {
                     button = createSpecialButton(buttonInfo.getKey(), true);
-                    button.setClickable(true);
                 } else {
                     button = new Button(getContext(), null, android.R.attr.buttonBarButtonStyle);
                 }
@@ -291,7 +282,7 @@ void reload(ExtraKeysInfos infos) {
                     View root = getRootView();
                     if (isSpecialButton(buttonInfo)) {
                         SpecialButtonState state = specialButtons.get(SpecialButton.valueOf(buttonInfo.getKey()));
-                        state.toggle(!state.isActive);
+                        state.setIsActive(!state.isActive);
                     } else {
                         sendKey(root, buttonInfo);
                     }
@@ -352,7 +343,7 @@ void reload(ExtraKeysInfos infos) {
                                     if (buttonInfo.getPopup() != null) {
                                         if (isSpecialButton(buttonInfo.getPopup())) {
                                             SpecialButtonState state = specialButtons.get(SpecialButton.valueOf(buttonInfo.getPopup().getKey()));
-                                            state.toggle(!state.isActive);
+                                            state.setIsActive(!state.isActive);
                                         } else {
                                             sendKey(root, buttonInfo.getPopup());
                                         }

From 4139bf94243d1f593ee668a633d5dc75c298d39d Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Wed, 3 Feb 2021 23:46:53 +0200
Subject: [PATCH 198/912] version 0.107

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index e18adcc6d0..f5ee5c4a52 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -17,8 +17,8 @@ android {
         applicationId "com.termux"
         minSdkVersion project.properties.minSdkVersion.toInteger()
         targetSdkVersion project.properties.targetSdkVersion.toInteger()
-        versionCode 106
-        versionName "0.106"
+        versionCode 107
+        versionName "0.107"
 
         externalNativeBuild {
             ndkBuild {

From 8baf53b09afc13e45b9880fcc5f319ddc782f264 Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Thu, 11 Feb 2021 17:51:46 +0200
Subject: [PATCH 199/912] update bootstrap archives

---
 app/build.gradle | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index f5ee5c4a52..7f72471409 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -91,7 +91,7 @@ task versionName {
   }
 }
 
-def downloadBootstrap(String arch, String expectedChecksum, int version) {
+def downloadBootstrap(String arch, String expectedChecksum, String version) {
     def digest = java.security.MessageDigest.getInstance("SHA-256")
 
     def localUrl = "src/main/cpp/bootstrap-" + arch + ".zip"
@@ -113,7 +113,7 @@ def downloadBootstrap(String arch, String expectedChecksum, int version) {
         }
     }
 
-    def remoteUrl = "https://bintray.com/termux/bootstrap/download_file?file_path=bootstrap-" + arch + "-v" + version + ".zip"
+    def remoteUrl = "https://github.com/termux/termux-packages/releases/download/bootstrap-" + version + "/bootstrap-" + arch + ".zip"
     logger.quiet("Downloading " + remoteUrl + " ...")
 
     file.parentFile.mkdirs()
@@ -142,11 +142,11 @@ clean {
 
 task downloadBootstraps(){
     doLast {
-        def version = 36
-        downloadBootstrap("aarch64", "9b1ee77b3e66bbb5e0ec9d766894aa9c1441f68b2bd4152e3ea54101de3c76d5", version)
-        downloadBootstrap("arm",     "eac7c2b322a1217f28a2b540afe4f994147abee571e9fed330d5430b08d6707b", version)
-        downloadBootstrap("i686",    "990dd1aaf5b6499bee5ed473dd5a0e18ecbc0493646b299238ac0dd0d9963396", version)
-        downloadBootstrap("x86_64",  "a321eba39c4bb0fb2aa35f17ccff57bf8fcf0e973b0a0569f6d24bd02314e4ed", version)
+        def version = "2021.02.11-r1"
+        downloadBootstrap("aarch64", "8913a0f6304b497a8e237a7a38cef17da39a8f39836fd63aa2ff7d9e4ae128a3", version)
+        downloadBootstrap("arm",     "c253fdbe7086ad1ae1826779465c30ca8bda6564536f4d00735b26ea3f6c1b7e", version)
+        downloadBootstrap("i686",    "931dc7ed8d208eae0a7445959356d761dc1644e2cc1ebb1f33688540f8c1c68a", version)
+        downloadBootstrap("x86_64",  "ac7e3809bc919a81b903bb22693e09afcbe126e6604883648cbeda48e6ba9665", version)
     }
 }
 

From 397a78f24803fd4bb11142d8dddea36ccf6fbb2d Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Thu, 11 Feb 2021 22:45:21 +0200
Subject: [PATCH 200/912] publish termux-view and terminal-emulator on Github
 Packages

Moving from Bintray.
---
 scripts/bintray-publish.gradle | 77 ----------------------------------
 terminal-emulator/build.gradle | 41 ++++++++++--------
 terminal-view/build.gradle     | 40 ++++++++++--------
 3 files changed, 47 insertions(+), 111 deletions(-)
 delete mode 100644 scripts/bintray-publish.gradle

diff --git a/scripts/bintray-publish.gradle b/scripts/bintray-publish.gradle
deleted file mode 100644
index 6707b915f1..0000000000
--- a/scripts/bintray-publish.gradle
+++ /dev/null
@@ -1,77 +0,0 @@
-// Start https://raw.githubusercontent.com/nuuneoi/JCenter/master/installv1.gradle
-group = publishedGroupId // Maven Group ID for the artifact
-install {
-    repositories.mavenInstaller {
-        pom {
-            project {
-                packaging 'aar'
-                groupId publishedGroupId
-                artifactId artifact
-
-                name libraryName
-                description libraryDescription
-                url siteUrl
-
-                licenses {
-                    license {
-                        name 'GNU General Public License version 3'
-                        url 'https://opensource.org/licenses/gpl-3.0.html'
-                    }
-                }
-
-                developers {
-                    developer {
-                        id 'fornwall'
-                        name 'Fredrik Fornwall'
-                        email 'fredrik@fornwall.net'
-                    }
-                }
-                scm {
-                    connection gitUrl
-                    developerConnection gitUrl
-                    url siteUrl
-                }
-            }
-        }
-    }
-}
-// End https://raw.githubusercontent.com/nuuneoi/JCenter/master/installv1.gradle
-
-// Start https://raw.githubusercontent.com/nuuneoi/JCenter/master/bintrayv1.gradle
-apply plugin: 'com.jfrog.bintray'
-
-version = libraryVersion
-
-task sourcesJar(type: Jar) {
-	classifier = 'sources'
-	from android.sourceSets.main.java.srcDirs
-}
-
-artifacts {
-	archives sourcesJar
-}
-
-bintray {
-	user = System.getenv('BINTRAY_USER')
-	key = System.getenv('BINTRAY_API_KEY')
-
-	configurations = ['archives']
-	pkg {
-		repo = 'maven'
-		name = bintrayName
-		userOrg = 'termux'
-		desc = libraryDescription
-		websiteUrl = siteUrl
-		vcsUrl = gitUrl
-		licenses = ['GPL-3.0']
-		publish = true
-		publicDownloadNumbers = true
-		version {
-			desc = libraryDescription
-			gpg {
-				sign = false //Determines whether to GPG sign the files. The default is false
-				// passphrase = properties.getProperty("bintray.gpg.password")
-			}
-		}
-	}
-}
diff --git a/terminal-emulator/build.gradle b/terminal-emulator/build.gradle
index 1e27cf64c8..442492585c 100644
--- a/terminal-emulator/build.gradle
+++ b/terminal-emulator/build.gradle
@@ -1,20 +1,5 @@
-plugins {
-    id "com.jfrog.bintray" version "1.8.5"
-    id "com.github.dcendents.android-maven" version "2.1"
-}
-
 apply plugin: 'com.android.library'
-
-ext {
-    bintrayName = 'terminal-emulator'
-    publishedGroupId = 'com.termux'
-    libraryName = 'TerminalEmulator'
-    artifact = 'terminal-emulator'
-    libraryDescription = 'The terminal emulator used in Termux'
-    siteUrl = 'https://github.com/termux/termux-app'
-    gitUrl = 'https://github.com/termux/termux-app.git'
-    libraryVersion = '0.106'
-}
+apply plugin: 'maven-publish'
 
 android {
     compileSdkVersion project.properties.compileSdkVersion.toInteger()
@@ -68,4 +53,26 @@ dependencies {
     testImplementation 'junit:junit:4.13.1'
 }
 
-apply from: '../scripts/bintray-publish.gradle'
+
+publishing {
+    publications {
+        bar(MavenPublication) {
+            groupId 'com.termux'
+            artifactId 'terminal-emulator'
+            version '0.106'
+            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")
+            }
+        }
+    }
+}
diff --git a/terminal-view/build.gradle b/terminal-view/build.gradle
index 338563f723..1ab1369777 100644
--- a/terminal-view/build.gradle
+++ b/terminal-view/build.gradle
@@ -1,20 +1,5 @@
-plugins {
-    id "com.jfrog.bintray" version "1.8.5"
-    id "com.github.dcendents.android-maven" version "2.1"
-}
-
 apply plugin: 'com.android.library'
-
-ext {
-    bintrayName = 'terminal-view'
-    publishedGroupId = 'com.termux'
-    libraryName = 'TerminalView'
-    artifact = 'terminal-view'
-    libraryDescription = 'The terminal view used in Termux'
-    siteUrl = 'https://github.com/termux/termux-app'
-    gitUrl = 'https://github.com/termux/termux-app.git'
-    libraryVersion = '0.106'
-}
+apply plugin: 'maven-publish'
 
 android {
     compileSdkVersion project.properties.compileSdkVersion.toInteger()
@@ -47,4 +32,25 @@ dependencies {
     testImplementation 'junit:junit:4.13.1'
 }
 
-apply from: '../scripts/bintray-publish.gradle'
+publishing {
+    publications {
+        bar(MavenPublication) {
+            groupId 'com.termux'
+            artifactId 'terminal-view'
+            version '0.106'
+            artifact("$buildDir/outputs/aar/terminal-view-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")
+            }
+        }
+    }
+}

From d8fcc1f221e1e7857d2cc0bdacafdf7232323a11 Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Thu, 11 Feb 2021 23:08:15 +0200
Subject: [PATCH 201/912] github actions: add workflow for publishing
 terminal-view/terminal-emulator on Github Packages

---
 .github/workflows/publish_libraries.yml | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 .github/workflows/publish_libraries.yml

diff --git a/.github/workflows/publish_libraries.yml b/.github/workflows/publish_libraries.yml
new file mode 100644
index 0000000000..41d76af4e0
--- /dev/null
+++ b/.github/workflows/publish_libraries.yml
@@ -0,0 +1,25 @@
+name: Publish library packages
+
+on:
+  push:
+    branches:
+    - master
+    paths:
+    - 'terminal-emulator/build.gradle'
+    - 'terminal-view/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

From 7884cb3bea6fd6f431eecd7df3716ea46e28848a Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Thu, 11 Feb 2021 23:10:44 +0200
Subject: [PATCH 202/912] github actions: test run for publishing maven
 packages

---
 terminal-emulator/build.gradle | 2 +-
 terminal-view/build.gradle     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/terminal-emulator/build.gradle b/terminal-emulator/build.gradle
index 442492585c..e92d24aeec 100644
--- a/terminal-emulator/build.gradle
+++ b/terminal-emulator/build.gradle
@@ -59,7 +59,7 @@ publishing {
         bar(MavenPublication) {
             groupId 'com.termux'
             artifactId 'terminal-emulator'
-            version '0.106'
+            version '0.106.1'
             artifact("$buildDir/outputs/aar/terminal-emulator-release.aar")
         }
     }
diff --git a/terminal-view/build.gradle b/terminal-view/build.gradle
index 1ab1369777..b196e223f4 100644
--- a/terminal-view/build.gradle
+++ b/terminal-view/build.gradle
@@ -37,7 +37,7 @@ publishing {
         bar(MavenPublication) {
             groupId 'com.termux'
             artifactId 'terminal-view'
-            version '0.106'
+            version '0.106.1'
             artifact("$buildDir/outputs/aar/terminal-view-release.aar")
         }
     }

From ce5e9a90421da9aaae06c6e150afe3e6c09df944 Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Fri, 19 Feb 2021 01:45:39 +0200
Subject: [PATCH 203/912] Revert "app: enable split apk builds"

Not compatible with F-Droid.

If you can fix F-Droid builds, send pull requests. For now I'm disabling this.

This reverts commit a7eb17317837868f4ac8962dd48459c608ee3653.
---
 app/build.gradle | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 7f72471409..e270eb476c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -25,14 +25,9 @@ android {
                 cFlags "-std=c11", "-Wall", "-Wextra", "-Werror", "-Os", "-fno-stack-protector", "-Wl,--gc-sections"
             }
         }
-    }
-
-    splits {
-        abi {
-            enable true
 
-            reset ()
-            include 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a'
+        ndk {
+            abiFilters 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a'
         }
 
     }

From fcfd131ccdf5720d5886eb6349eb1bc7beecb863 Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Fri, 19 Feb 2021 01:54:26 +0200
Subject: [PATCH 204/912] update bootstrap archives

---
 app/build.gradle | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index e270eb476c..db56776738 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -137,11 +137,11 @@ clean {
 
 task downloadBootstraps(){
     doLast {
-        def version = "2021.02.11-r1"
-        downloadBootstrap("aarch64", "8913a0f6304b497a8e237a7a38cef17da39a8f39836fd63aa2ff7d9e4ae128a3", version)
-        downloadBootstrap("arm",     "c253fdbe7086ad1ae1826779465c30ca8bda6564536f4d00735b26ea3f6c1b7e", version)
-        downloadBootstrap("i686",    "931dc7ed8d208eae0a7445959356d761dc1644e2cc1ebb1f33688540f8c1c68a", version)
-        downloadBootstrap("x86_64",  "ac7e3809bc919a81b903bb22693e09afcbe126e6604883648cbeda48e6ba9665", version)
+        def version = "2021.02.19-r1"
+        downloadBootstrap("aarch64", "1e3d80bd8cc8771715845ab4a1e67fc125d84c4deda3a1a435116fe4d1f86160", version)
+        downloadBootstrap("arm",     "317a987cab3d4da6f9d42f024a5f25e3aaf8557b8ec68eaf80411fde6b8ea78d", version)
+        downloadBootstrap("i686",    "dd4632350474058fe5dec14b7bd882798bb3e9fe738b2de8c84a51a0b6395f4b", version)
+        downloadBootstrap("x86_64",  "5458119186c3ea631420833e59730461dc2a5faf17b8fad239823c88aa4569ae", version)
     }
 }
 

From edcebf13365a66da96b88e7d929f63fd652a555f Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Fri, 19 Feb 2021 01:54:46 +0200
Subject: [PATCH 205/912] version 0.108

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index db56776738..0cbce7936d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -17,8 +17,8 @@ android {
         applicationId "com.termux"
         minSdkVersion project.properties.minSdkVersion.toInteger()
         targetSdkVersion project.properties.targetSdkVersion.toInteger()
-        versionCode 107
-        versionName "0.107"
+        versionCode 108
+        versionName "0.108"
 
         externalNativeBuild {
             ndkBuild {

From f50d15d353aad36b043b16c6b7efef3058fd2a6f Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Fri, 26 Feb 2021 17:09:04 +0500
Subject: [PATCH 206/912] Fix "Duplicate finish request for ActivityRecord"
 errors

---
 .../java/com/termux/app/TermuxActivity.java     | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index 280d93782a..b5d876815e 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -414,7 +414,7 @@ public void onTitleChanged(TerminalSession updatedSession) {
             public void onSessionFinished(final TerminalSession finishedSession) {
                 if (mTermService.mWantsToStop) {
                     // The service wants to stop as soon as possible.
-                    finish();
+                    finishActivityIfNotFinishing();
                     return;
                 }
                 if (mIsVisible && finishedSession != getCurrentTermSession()) {
@@ -550,7 +550,7 @@ public View getView(int position, View convertView, @NonNull ViewGroup parent) {
                 });
             } else {
                 // The service connected while not in foreground - just bail out.
-                finish();
+                finishActivityIfNotFinishing();
             }
         } else {
             Intent i = getIntent();
@@ -586,7 +586,14 @@ void renameSession(final TerminalSession sessionToRename) {
     @Override
     public void onServiceDisconnected(ComponentName name) {
         // Respect being stopped from the TermuxService notification action.
-        finish();
+        finishActivityIfNotFinishing();
+    }
+
+    public void finishActivityIfNotFinishing() {
+        // prevent duplicate calls to finish() if called from multiple places
+        if (!TermuxActivity.this.isFinishing()) {
+            finish();
+        }
     }
 
     @Nullable
@@ -627,7 +634,7 @@ public void onBackPressed() {
         if (getDrawer().isDrawerOpen(Gravity.LEFT)) {
             getDrawer().closeDrawers();
         } else {
-            finish();
+            finishActivityIfNotFinishing();
         }
     }
 
@@ -989,7 +996,7 @@ public void removeFinishedSession(TerminalSession finishedSession) {
         mListViewAdapter.notifyDataSetChanged();
         if (mTermService.getSessions().isEmpty()) {
             // There are no sessions to show, so finish the activity.
-            finish();
+            finishActivityIfNotFinishing();
         } else {
             if (index >= service.getSessions().size()) {
                 index = service.getSessions().size() - 1;

From 00194ebb902230c2f238c886c0a864f852cfc191 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 27 Feb 2021 13:07:07 +0500
Subject: [PATCH 207/912] Add logcat errors in RunCommandService

This commit adds `logcat` errors if an invalid intent action is passed or if `allow-external-apps` is not set to `true` while sending an intent to `RunCommandService`, so that users can detect issues.
---
 .../com/termux/app/RunCommandService.java     | 38 ++++++++++++-------
 1 file changed, 24 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/com/termux/app/RunCommandService.java b/app/src/main/java/com/termux/app/RunCommandService.java
index 8079091a85..df07325c95 100644
--- a/app/src/main/java/com/termux/app/RunCommandService.java
+++ b/app/src/main/java/com/termux/app/RunCommandService.java
@@ -92,20 +92,30 @@ public int onStartCommand(Intent intent, int flags, int startId) {
         // Run again in case service is already started and onCreate() is not called
         runStartForeground();
 
-        if (allowExternalApps() && RUN_COMMAND_ACTION.equals(intent.getAction())) {
-            Uri programUri = new Uri.Builder().scheme("com.termux.file").path(parsePath(intent.getStringExtra(RUN_COMMAND_PATH))).build();
-
-            Intent execIntent = new Intent(TermuxService.ACTION_EXECUTE, programUri);
-            execIntent.setClass(this, TermuxService.class);
-            execIntent.putExtra(TermuxService.EXTRA_ARGUMENTS, intent.getStringArrayExtra(RUN_COMMAND_ARGUMENTS));
-            execIntent.putExtra(TermuxService.EXTRA_CURRENT_WORKING_DIRECTORY, parsePath(intent.getStringExtra(RUN_COMMAND_WORKDIR)));
-            execIntent.putExtra(TermuxService.EXTRA_EXECUTE_IN_BACKGROUND, intent.getBooleanExtra(RUN_COMMAND_BACKGROUND, false));
-
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                this.startForegroundService(execIntent);
-            } else {
-                this.startService(execIntent);
-            }
+        // If wrong action passed, then just return
+        if (!RUN_COMMAND_ACTION.equals(intent.getAction())) {
+            Log.e("termux", "Unexpected intent action to RunCommandService: " + intent.getAction());
+            return Service.START_NOT_STICKY;
+        }
+
+        // If allow-external-apps property to not set to "true"
+        if (!allowExternalApps()) {
+            Log.e("termux", "RunCommandService requires allow-external-apps property to be set to \"true\" in ~/.termux/termux.properties file.");
+            return Service.START_NOT_STICKY;
+        }
+
+         Uri programUri = new Uri.Builder().scheme("com.termux.file").path(parsePath(intent.getStringExtra(RUN_COMMAND_PATH))).build();
+
+        Intent execIntent = new Intent(TermuxService.ACTION_EXECUTE, programUri);
+        execIntent.setClass(this, TermuxService.class);
+        execIntent.putExtra(TermuxService.EXTRA_ARGUMENTS, intent.getStringArrayExtra(RUN_COMMAND_ARGUMENTS));
+        execIntent.putExtra(TermuxService.EXTRA_CURRENT_WORKING_DIRECTORY, parsePath(intent.getStringExtra(RUN_COMMAND_WORKDIR)));
+        execIntent.putExtra(TermuxService.EXTRA_EXECUTE_IN_BACKGROUND, intent.getBooleanExtra(RUN_COMMAND_BACKGROUND, false));
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            this.startForegroundService(execIntent);
+        } else {
+            this.startService(execIntent);
         }
 
         runStopForeground();

From 80858bab6b4194cce0371d7181ee65e531c0d72e Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 27 Feb 2021 13:10:57 +0500
Subject: [PATCH 208/912] Fix path expansion in RunCommandService

This commit fixes `getExpandedTermuxPath()` (previously `parsePath()`) not expanding path if exactly `$PREFIX` is passed and addition of extra trailing slashes in some cases.
---
 .../main/java/com/termux/app/RunCommandService.java  | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/termux/app/RunCommandService.java b/app/src/main/java/com/termux/app/RunCommandService.java
index df07325c95..0cee3be6af 100644
--- a/app/src/main/java/com/termux/app/RunCommandService.java
+++ b/app/src/main/java/com/termux/app/RunCommandService.java
@@ -104,12 +104,12 @@ public int onStartCommand(Intent intent, int flags, int startId) {
             return Service.START_NOT_STICKY;
         }
 
-         Uri programUri = new Uri.Builder().scheme("com.termux.file").path(parsePath(intent.getStringExtra(RUN_COMMAND_PATH))).build();
+         Uri programUri = new Uri.Builder().scheme("com.termux.file").path(getExpandedTermuxPath(intent.getStringExtra(RUN_COMMAND_PATH))).build();
 
         Intent execIntent = new Intent(TermuxService.ACTION_EXECUTE, programUri);
         execIntent.setClass(this, TermuxService.class);
         execIntent.putExtra(TermuxService.EXTRA_ARGUMENTS, intent.getStringArrayExtra(RUN_COMMAND_ARGUMENTS));
-        execIntent.putExtra(TermuxService.EXTRA_CURRENT_WORKING_DIRECTORY, parsePath(intent.getStringExtra(RUN_COMMAND_WORKDIR)));
+        execIntent.putExtra(TermuxService.EXTRA_CURRENT_WORKING_DIRECTORY, getExpandedTermuxPath(intent.getStringExtra(RUN_COMMAND_WORKDIR)));
         execIntent.putExtra(TermuxService.EXTRA_EXECUTE_IN_BACKGROUND, intent.getBooleanExtra(RUN_COMMAND_BACKGROUND, false));
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
@@ -188,10 +188,12 @@ private boolean allowExternalApps() {
     }
 
     /** Replace "$PREFIX/" or "~/" prefix with termux absolute paths */
-    private String parsePath(String path) {
+    public static String getExpandedTermuxPath(String path) {
         if(path != null && !path.isEmpty()) {
-            path = path.replaceAll("^\\$PREFIX\\/", TermuxService.PREFIX_PATH + "/");
-            path = path.replaceAll("^~\\/", TermuxService.HOME_PATH + "/");
+            path = path.replaceAll("^\\$PREFIX$", TermuxService.PREFIX_PATH);
+            path = path.replaceAll("^\\$PREFIX/", TermuxService.PREFIX_PATH + "/");
+            path = path.replaceAll("^~/$", TermuxService.HOME_PATH);
+            path = path.replaceAll("^~/", TermuxService.HOME_PATH + "/");
         }
 
         return path;

From 108e4cb3916895c4e9a8702b5cd59617796e43a0 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 27 Feb 2021 13:14:13 +0500
Subject: [PATCH 209/912] Fix workdir logic in RunCommandService

This commit fixes the workdir logic to not send `EXTRA_CURRENT_WORKING_DIRECTORY` extra to `TermuxService` if workdir is empty, since that will raise `No such file or directory` exceptions if `cwd` is empty when targeting sdk `29`.
---
 app/src/main/java/com/termux/app/RunCommandService.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/termux/app/RunCommandService.java b/app/src/main/java/com/termux/app/RunCommandService.java
index 0cee3be6af..4b01d6606e 100644
--- a/app/src/main/java/com/termux/app/RunCommandService.java
+++ b/app/src/main/java/com/termux/app/RunCommandService.java
@@ -104,14 +104,18 @@ public int onStartCommand(Intent intent, int flags, int startId) {
             return Service.START_NOT_STICKY;
         }
 
-         Uri programUri = new Uri.Builder().scheme("com.termux.file").path(getExpandedTermuxPath(intent.getStringExtra(RUN_COMMAND_PATH))).build();
+        Uri programUri = new Uri.Builder().scheme("com.termux.file").path(getExpandedTermuxPath(intent.getStringExtra(RUN_COMMAND_PATH))).build();
 
         Intent execIntent = new Intent(TermuxService.ACTION_EXECUTE, programUri);
         execIntent.setClass(this, TermuxService.class);
         execIntent.putExtra(TermuxService.EXTRA_ARGUMENTS, intent.getStringArrayExtra(RUN_COMMAND_ARGUMENTS));
-        execIntent.putExtra(TermuxService.EXTRA_CURRENT_WORKING_DIRECTORY, getExpandedTermuxPath(intent.getStringExtra(RUN_COMMAND_WORKDIR)));
         execIntent.putExtra(TermuxService.EXTRA_EXECUTE_IN_BACKGROUND, intent.getBooleanExtra(RUN_COMMAND_BACKGROUND, false));
 
+        String workingDirectory = intent.getStringExtra(RUN_COMMAND_WORKDIR);
+        if (workingDirectory != null && !workingDirectory.isEmpty()) {
+            execIntent.putExtra(TermuxService.EXTRA_CURRENT_WORKING_DIRECTORY, getExpandedTermuxPath(workingDirectory));
+        }
+
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             this.startForegroundService(execIntent);
         } else {

From 85b2c44ac74818d659ca106a151edb1a20190845 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 27 Feb 2021 13:22:09 +0500
Subject: [PATCH 210/912] Fix current working directory default value

This commit fixes the issue when `cwd` is empty and is passed to `Runtime.getRuntime().exec(progArray, env, new File(cwd));`, it raises the `No such file or directory` exceptions when targeting sdk `29`.
---
 app/src/main/java/com/termux/app/BackgroundJob.java | 4 ++--
 app/src/main/java/com/termux/app/TermuxService.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/termux/app/BackgroundJob.java b/app/src/main/java/com/termux/app/BackgroundJob.java
index cfb11cd4c6..faf0089bcc 100644
--- a/app/src/main/java/com/termux/app/BackgroundJob.java
+++ b/app/src/main/java/com/termux/app/BackgroundJob.java
@@ -36,7 +36,7 @@ public BackgroundJob(String cwd, String fileToExecute, final String[] args, fina
 
     public BackgroundJob(String cwd, String fileToExecute, final String[] args, final TermuxService service, PendingIntent pendingIntent) {
         String[] env = buildEnvironment(false, cwd);
-        if (cwd == null) cwd = TermuxService.HOME_PATH;
+        if (cwd == null || cwd.isEmpty()) cwd = TermuxService.HOME_PATH;
 
         final String[] progArray = setupProcessArgs(fileToExecute, args);
         final String processDescription = Arrays.toString(progArray);
@@ -136,7 +136,7 @@ private static void addToEnvIfPresent(List<String> environment, String name) {
     static String[] buildEnvironment(boolean failSafe, String cwd) {
         new File(TermuxService.HOME_PATH).mkdirs();
 
-        if (cwd == null) cwd = TermuxService.HOME_PATH;
+        if (cwd == null || cwd.isEmpty()) cwd = TermuxService.HOME_PATH;
 
         List<String> environment = new ArrayList<>();
 
diff --git a/app/src/main/java/com/termux/app/TermuxService.java b/app/src/main/java/com/termux/app/TermuxService.java
index 955ce8656b..3cb714fa18 100644
--- a/app/src/main/java/com/termux/app/TermuxService.java
+++ b/app/src/main/java/com/termux/app/TermuxService.java
@@ -282,7 +282,7 @@ public List<TerminalSession> getSessions() {
     TerminalSession createTermSession(String executablePath, String[] arguments, String cwd, boolean failSafe) {
         new File(HOME_PATH).mkdirs();
 
-        if (cwd == null) cwd = HOME_PATH;
+        if (cwd == null || cwd.isEmpty()) cwd = HOME_PATH;
 
         String[] env = BackgroundJob.buildEnvironment(failSafe, cwd);
         boolean isLoginShell = false;

From 5a960750256398f4de762023b9c253e96d47ef2d Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 27 Feb 2021 13:23:37 +0500
Subject: [PATCH 211/912] Update RunCommandService documentation

---
 .../com/termux/app/RunCommandService.java     | 43 +++++++++++++------
 1 file changed, 29 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/com/termux/app/RunCommandService.java b/app/src/main/java/com/termux/app/RunCommandService.java
index 4b01d6606e..93b43cf606 100644
--- a/app/src/main/java/com/termux/app/RunCommandService.java
+++ b/app/src/main/java/com/termux/app/RunCommandService.java
@@ -21,23 +21,32 @@
 import java.util.Properties;
 
 /**
- * When allow-external-apps property is set to "true" in ~/.termux/termux.properties, Termux 
- * is able to process execute intents sent by third-party applications.
+ * Third-party apps that are not part of termux world can run commands in termux context by either
+ * sending an intent to RunCommandService or becoming a plugin host for the termux-tasker plugin
+ * client.
  *
- * Third-party program must declare com.termux.permission.RUN_COMMAND permission and it should be
- * granted by user.
+ * For the RunCommandService intent to work, there are 2 main requirements:
+ * 1. The `allow-external-apps` property must be set to "true" in ~/.termux/termux.properties in
+ * termux app, regardless of if the executable path is inside or outside the `~/.termux/tasker/`
+ * directory.
+ * 2. The intent sender/third-party app must request the `com.termux.permission.RUN_COMMAND`
+ * permission in its `AndroidManifest.xml` and it should be granted by user to the app through the
+ * app's App Info permissions page in android settings, likely under Additional Permissions.
  *
- * Absolute path of command or script must be given in "RUN_COMMAND_PATH" extra.
- * The "RUN_COMMAND_ARGUMENTS", "RUN_COMMAND_WORKDIR" and "RUN_COMMAND_BACKGROUND" extras are 
+ * The absolute path of executable or script must be given in "RUN_COMMAND_PATH" extra.
+ * The "RUN_COMMAND_ARGUMENTS", "RUN_COMMAND_WORKDIR" and "RUN_COMMAND_BACKGROUND" extras are
  * optional. The workdir defaults to termux home. The background mode defaults to "false".
  * The command path and workdir can optionally be prefixed with "$PREFIX/" or "~/" if an absolute
  * path is not to be given.
  *
- * To automatically bring to foreground and start termux commands that were started with
- * background mode "false" in android >= 10 without user having to click the notification manually,
- * requires termux to be granted draw over apps permission due to new restrictions
+ * To automatically bring termux session to foreground and start termux commands that were started
+ * with background mode "false" in android >= 10 without user having to click the notification
+ * manually requires termux to be granted draw over apps permission due to new restrictions
  * of starting activities from the background, this also applies to Termux:Tasker plugin.
  *
+ * Check https://github.com/termux/termux-tasker for more details on allow-external-apps and draw
+ * over apps and other limitations.
+ *
  * To reduce the chance of termux being killed by android even further due to violation of not
  * being able to call startForeground() within ~5s of service start in android >= 8, the user
  * may disable battery optimizations for termux.
@@ -53,12 +62,18 @@
  *   startService(intent);
  *
  * Sample code to run command "top" with "am startservice" command:
- * am startservice --user 0 -n com.termux/com.termux.app.RunCommandService 
- * -a com.termux.RUN_COMMAND 
- * --es com.termux.RUN_COMMAND_PATH '/data/data/com.termux/files/usr/bin/top' 
- * --esa com.termux.RUN_COMMAND_ARGUMENTS '-n,5' 
- * --es com.termux.RUN_COMMAND_WORKDIR '/data/data/com.termux/files/home'
+ * am startservice --user 0 -n com.termux/com.termux.app.RunCommandService \
+ * -a com.termux.RUN_COMMAND \
+ * --es com.termux.RUN_COMMAND_PATH '/data/data/com.termux/files/usr/bin/top' \
+ * --esa com.termux.RUN_COMMAND_ARGUMENTS '-n,5' \
+ * --es com.termux.RUN_COMMAND_WORKDIR '/data/data/com.termux/files/home' \
  * --ez com.termux.RUN_COMMAND_BACKGROUND 'false'
+ *
+ * If your third-party app is targeting sdk 30 (android 11), then it needs to add `com.termux`
+ * package to the `queries` element or request `QUERY_ALL_PACKAGES` permission in its
+ * `AndroidManifest.xml`. Otherwise it will get `PackageSetting{...... com.termux/......} BLOCKED`
+ * errors in logcat and `RUN_COMMAND` won't work.
+ * https://developer.android.com/training/basics/intents/package-visibility#package-name
  */
 public class RunCommandService extends Service {
 

From 9fd2cf9834eb9faf56011669be3fa91c52fc038e Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 27 Feb 2021 13:30:11 +0500
Subject: [PATCH 212/912] Fix NoClassDefFoundError exceptions for
 TermuxActivity

This commit fixes the non-crashing exception `Rejecting re-init on previously-failed class java.lang.Class<androidx.core.view.ViewCompat$2>: java.lang.NoClassDefFoundError: Failed resolution of: Landroid/view/View$OnUnhandledKeyEventListener;` on termux startup due to `setContentView()` call by `TermuxActivity.onCreate()`. The recommended solution seems to be to add `androidx.core:core` dependency, which has solved the issue.

https://issuetracker.google.com/issues/117685087
---
 app/build.gradle | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/build.gradle b/app/build.gradle
index 0cbce7936d..24b5882580 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,6 +10,7 @@ android {
         implementation "androidx.annotation:annotation:1.1.0"
         implementation "androidx.viewpager:viewpager:1.0.0"
         implementation "androidx.drawerlayout:drawerlayout:1.1.1"
+        implementation 'androidx.core:core:1.5.0-beta02'
         implementation project(":terminal-view")
     }
 

From 356a442c6fc06582a4e24c6461fb30e37f4340d5 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Mon, 1 Mar 2021 12:40:04 +0500
Subject: [PATCH 213/912] Request android.permission.DUMP permission

This will allow users to run `dumpsys` command after running `adb shell pm grant com.termux android.permission.DUMP`.

https://developer.android.com/studio/command-line/dumpsys
---
 app/src/main/AndroidManifest.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 035fc8dafa..0ca607b5b6 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -23,6 +23,7 @@
     <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"/>
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
     <uses-permission android:name="android.permission.READ_LOGS" />
+    <uses-permission android:name="android.permission.DUMP" />
     <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />
 
     <application

From 93a5bf8d2905e227fac07630b30fb4a6da4e1145 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Tue, 2 Mar 2021 16:48:15 +0500
Subject: [PATCH 214/912] Request android.permission.REQUEST_INSTALL_PACKAGES
 permission

This will allow users to access `Android/obb` on android 11 after explicitly granting Termux the permission by going to Termux `App Info` in Android `Settings` -> `Advance` -> `Install unknown apps`.

https://medium.com/androiddevelopers/android-11-storage-faq-78cefea52b7c
---
 app/src/main/AndroidManifest.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0ca607b5b6..59324ec799 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -25,6 +25,7 @@
     <uses-permission android:name="android.permission.READ_LOGS" />
     <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" />
 
     <application
         android:extractNativeLibs="true"

From ada5087f677cc15dea446d66343294c96a7fbaf8 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 6 Mar 2021 18:25:10 +0500
Subject: [PATCH 215/912] Partial refactor of the mess that is TerminalView

- Decouple the `CursorController`, `TextSelectionCursorController`(previously `SelectionModifierCursorController`) and `TextSelectionHandleView` (previously `HandleView`) from `TerminalView` by moving them to their own class files.
- Fixes #1501 which caused the `java.lang.IllegalStateException: The specified child already has a parent. You must call removeView() on the child's parent first.` exception to be thrown when long pressing the down key while simultaneously long pressing the terminal view for text selection.
---
 .../com/termux/view/TerminalRenderer.java     |   8 +
 .../java/com/termux/view/TerminalView.java    | 921 ++++--------------
 .../view/textselection/CursorController.java  |  55 ++
 .../TextSelectionCursorController.java        | 382 ++++++++
 .../TextSelectionHandleView.java              | 345 +++++++
 5 files changed, 954 insertions(+), 757 deletions(-)
 create mode 100644 terminal-view/src/main/java/com/termux/view/textselection/CursorController.java
 create mode 100644 terminal-view/src/main/java/com/termux/view/textselection/TextSelectionCursorController.java
 create mode 100644 terminal-view/src/main/java/com/termux/view/textselection/TextSelectionHandleView.java

diff --git a/terminal-view/src/main/java/com/termux/view/TerminalRenderer.java b/terminal-view/src/main/java/com/termux/view/TerminalRenderer.java
index 92df53f895..5c9caf1c6d 100644
--- a/terminal-view/src/main/java/com/termux/view/TerminalRenderer.java
+++ b/terminal-view/src/main/java/com/termux/view/TerminalRenderer.java
@@ -230,4 +230,12 @@ private void drawTextRun(Canvas canvas, char[] text, int[] palette, float y, int
 
         if (savedMatrix) canvas.restore();
     }
+
+    public float getFontWidth() {
+        return mFontWidth;
+    }
+
+    public int getFontLineSpacing() {
+        return mFontLineSpacing;
+    }
 }
diff --git a/terminal-view/src/main/java/com/termux/view/TerminalView.java b/terminal-view/src/main/java/com/termux/view/TerminalView.java
index 5f2b594996..5522efbc3e 100644
--- a/terminal-view/src/main/java/com/termux/view/TerminalView.java
+++ b/terminal-view/src/main/java/com/termux/view/TerminalView.java
@@ -6,11 +6,8 @@
 import android.content.ClipboardManager;
 import android.content.Context;
 import android.graphics.Canvas;
-import android.graphics.Rect;
 import android.graphics.Typeface;
-import android.graphics.drawable.Drawable;
 import android.os.Build;
-import android.os.SystemClock;
 import android.text.Editable;
 import android.text.InputType;
 import android.text.TextUtils;
@@ -21,31 +18,24 @@
 import android.view.InputDevice;
 import android.view.KeyCharacterMap;
 import android.view.KeyEvent;
-import android.view.Menu;
-import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewConfiguration;
-import android.view.ViewGroup;
-import android.view.ViewParent;
 import android.view.ViewTreeObserver;
-import android.view.WindowManager;
 import android.view.accessibility.AccessibilityManager;
 import android.view.autofill.AutofillValue;
 import android.view.inputmethod.BaseInputConnection;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputConnection;
-import android.widget.PopupWindow;
 import android.widget.Scroller;
 
 import androidx.annotation.RequiresApi;
 
 import com.termux.terminal.EmulatorDebug;
 import com.termux.terminal.KeyHandler;
-import com.termux.terminal.TerminalBuffer;
 import com.termux.terminal.TerminalEmulator;
 import com.termux.terminal.TerminalSession;
-import com.termux.terminal.WcWidth;
+import com.termux.view.textselection.TextSelectionCursorController;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -57,28 +47,22 @@
 public final class TerminalView extends View {
 
     /** Log view key and IME events. */
-    private static final boolean LOG_KEY_EVENTS = false;
+    private static final boolean LOG_KEY_EVENTS = true;
 
     /** The currently displayed terminal session, whose emulator is {@link #mEmulator}. */
-    TerminalSession mTermSession;
+    public TerminalSession mTermSession;
     /** Our terminal emulator whose session is {@link #mTermSession}. */
-    TerminalEmulator mEmulator;
+    public TerminalEmulator mEmulator;
 
-    TerminalRenderer mRenderer;
+    public TerminalRenderer mRenderer;
 
-    TerminalViewClient mClient;
+    public TerminalViewClient mClient;
+
+    private TextSelectionCursorController mTextSelectionCursorController;
 
     /** The top row of text to display. Ranges from -activeTranscriptRows to 0. */
     int mTopRow;
-
-    boolean mIsSelectingText = false;
-    int mSelX1 = -1, mSelX2 = -1, mSelY1 = -1, mSelY2 = -1;
-    private ActionMode mActionMode;
-    Drawable mSelectHandleLeft;
-    Drawable mSelectHandleRight;
-    final int[] mTempCoords = new int[2];
-    Rect mTempRect;
-    private SelectionModifierCursorController mSelectionModifierCursorController;
+    int[] mDefaultSelectors = new int[]{-1,-1,-1,-1};
 
     float mScaleFactor = 1.f;
     final GestureAndScaleRecognizer mGestureRecognizer;
@@ -96,7 +80,7 @@ public final class TerminalView extends View {
     /** If non-zero, this is the last unicode code point received if that was a combining character. */
     int mCombiningAccent;
 
-    private boolean mAccessibilityEnabled;
+    private final boolean mAccessibilityEnabled;
 
     public TerminalView(Context context, AttributeSet attributes) { // NO_UCD (unused code)
         super(context, attributes);
@@ -105,13 +89,13 @@ public TerminalView(Context context, AttributeSet attributes) { // NO_UCD (unuse
             boolean scrolledWithFinger;
 
             @Override
-            public boolean onUp(MotionEvent e) {
+            public boolean onUp(MotionEvent event) {
                 mScrollRemainder = 0.0f;
-                if (mEmulator != null && mEmulator.isMouseTrackingActive() && !mIsSelectingText && !scrolledWithFinger) {
+                if (mEmulator != null && mEmulator.isMouseTrackingActive() && !isSelectingText() && !scrolledWithFinger) {
                     // Quick event processing when mouse tracking is active - do not wait for check of double tapping
                     // for zooming.
-                    sendMouseEventCode(e, TerminalEmulator.MOUSE_LEFT_BUTTON, true);
-                    sendMouseEventCode(e, TerminalEmulator.MOUSE_LEFT_BUTTON, false);
+                    sendMouseEventCode(event, TerminalEmulator.MOUSE_LEFT_BUTTON, true);
+                    sendMouseEventCode(event, TerminalEmulator.MOUSE_LEFT_BUTTON, false);
                     return true;
                 }
                 scrolledWithFinger = false;
@@ -119,16 +103,17 @@ public boolean onUp(MotionEvent e) {
             }
 
             @Override
-            public boolean onSingleTapUp(MotionEvent e) {
+            public boolean onSingleTapUp(MotionEvent event) {
                 if (mEmulator == null) return true;
-                if (mIsSelectingText) {
+
+                if (isSelectingText()) {
                     stopTextSelectionMode();
                     return true;
                 }
                 requestFocus();
                 if (!mEmulator.isMouseTrackingActive()) {
-                    if (!e.isFromSource(InputDevice.SOURCE_MOUSE)) {
-                        mClient.onSingleTapUp(e);
+                    if (!event.isFromSource(InputDevice.SOURCE_MOUSE)) {
+                        mClient.onSingleTapUp(event);
                         return true;
                     }
                 }
@@ -156,7 +141,7 @@ public boolean onScroll(MotionEvent e, float distanceX, float distanceY) {
 
             @Override
             public boolean onScale(float focusX, float focusY, float scale) {
-                if (mEmulator == null || mIsSelectingText) return true;
+                if (mEmulator == null || isSelectingText()) return true;
                 mScaleFactor *= scale;
                 mScaleFactor = mClient.onScale(mScaleFactor);
                 return true;
@@ -200,22 +185,28 @@ public void run() {
 
             @Override
             public boolean onDown(float x, float y) {
+                // Why is true not returned here?
+                // https://developer.android.com/training/gestures/detector.html#detect-a-subset-of-supported-gestures
+                // Although setting this to true still does not solve the following errors when long pressing in terminal view text area
+                // ViewDragHelper: Ignoring pointerId=0 because ACTION_DOWN was not received for this pointer before ACTION_MOVE
+                // Commenting out the call to mGestureDetector.onTouchEvent(event) in GestureAndScaleRecognizer#onTouchEvent() removes
+                // the error logging, so issue is related to GestureDetector
                 return false;
             }
 
             @Override
-            public boolean onDoubleTap(MotionEvent e) {
+            public boolean onDoubleTap(MotionEvent event) {
                 // Do not treat is as a single confirmed tap - it may be followed by zoom.
                 return false;
             }
 
             @Override
-            public void onLongPress(MotionEvent e) {
+            public void onLongPress(MotionEvent event) {
                 if (mGestureRecognizer.isInProgress()) return;
-                if (mClient.onLongPress(e)) return;
-                if (!mIsSelectingText) {
+                if (mClient.onLongPress(event)) return;
+                if (!isSelectingText()) {
                     performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);
-                    startSelectingText(e);
+                    startTextSelectionMode(event);
                 }
             }
         });
@@ -392,7 +383,7 @@ public void onScreenUpdated() {
         if (mTopRow < -rowsInHistory) mTopRow = -rowsInHistory;
 
         boolean skipScrolling = false;
-        if (mIsSelectingText) {
+        if (isSelectingText()) {
             // Do not scroll when selecting text.
             int rowShift = mEmulator.getScrollCounter();
             if (-mTopRow + rowShift > rowsInHistory) {
@@ -402,8 +393,7 @@ public void onScreenUpdated() {
             } else {
                 skipScrolling = true;
                 mTopRow -= rowShift;
-                mSelY1 -= rowShift;
-                mSelY2 -= rowShift;
+                decrementYTextSelectionCursors(rowShift);
             }
         }
 
@@ -500,19 +490,19 @@ public boolean onGenericMotionEvent(MotionEvent event) {
     @SuppressLint("ClickableViewAccessibility")
     @Override
     @TargetApi(23)
-    public boolean onTouchEvent(MotionEvent ev) {
+    public boolean onTouchEvent(MotionEvent event) {
         if (mEmulator == null) return true;
-        final int action = ev.getAction();
+        final int action = event.getAction();
 
-        if (mIsSelectingText) {
-            updateFloatingToolbarVisibility(ev);
-            mGestureRecognizer.onTouchEvent(ev);
+        if (isSelectingText()) {
+            updateFloatingToolbarVisibility(event);
+            mGestureRecognizer.onTouchEvent(event);
             return true;
-        } else if (ev.isFromSource(InputDevice.SOURCE_MOUSE)) {
-            if (ev.isButtonPressed(MotionEvent.BUTTON_SECONDARY)) {
+        } else if (event.isFromSource(InputDevice.SOURCE_MOUSE)) {
+            if (event.isButtonPressed(MotionEvent.BUTTON_SECONDARY)) {
                 if (action == MotionEvent.ACTION_DOWN) showContextMenu();
                 return true;
-            } else if (ev.isButtonPressed(MotionEvent.BUTTON_TERTIARY)) {
+            } else if (event.isButtonPressed(MotionEvent.BUTTON_TERTIARY)) {
                 ClipboardManager clipboard = (ClipboardManager) getContext().getSystemService(Context.CLIPBOARD_SERVICE);
                 ClipData clipData = clipboard.getPrimaryClip();
                 if (clipData != null) {
@@ -520,20 +510,20 @@ public boolean onTouchEvent(MotionEvent ev) {
                     if (!TextUtils.isEmpty(paste)) mEmulator.paste(paste.toString());
                 }
             } else if (mEmulator.isMouseTrackingActive()) { // BUTTON_PRIMARY.
-                switch (ev.getAction()) {
+                switch (event.getAction()) {
                     case MotionEvent.ACTION_DOWN:
                     case MotionEvent.ACTION_UP:
-                        sendMouseEventCode(ev, TerminalEmulator.MOUSE_LEFT_BUTTON, ev.getAction() == MotionEvent.ACTION_DOWN);
+                        sendMouseEventCode(event, TerminalEmulator.MOUSE_LEFT_BUTTON, event.getAction() == MotionEvent.ACTION_DOWN);
                         break;
                     case MotionEvent.ACTION_MOVE:
-                        sendMouseEventCode(ev, TerminalEmulator.MOUSE_LEFT_BUTTON_MOVED, true);
+                        sendMouseEventCode(event, TerminalEmulator.MOUSE_LEFT_BUTTON_MOVED, true);
                         break;
                 }
                 return true;
             }
         }
 
-        mGestureRecognizer.onTouchEvent(ev);
+        mGestureRecognizer.onTouchEvent(event);
         return true;
     }
 
@@ -544,7 +534,7 @@ public boolean onKeyPreIme(int keyCode, KeyEvent event) {
         if (LOG_KEY_EVENTS)
             Log.i(EmulatorDebug.LOG_TAG, "onKeyPreIme(keyCode=" + keyCode + ", event=" + event + ")");
         if (keyCode == KeyEvent.KEYCODE_BACK) {
-            if (mIsSelectingText) {
+            if (isSelectingText()) {
                 stopTextSelectionMode();
                 return true;
             } else if (mClient.shouldBackButtonBeMappedToEscape()) {
@@ -570,7 +560,9 @@ public boolean onKeyDown(int keyCode, KeyEvent event) {
         if (LOG_KEY_EVENTS)
             Log.i(EmulatorDebug.LOG_TAG, "onKeyDown(keyCode=" + keyCode + ", isSystem()=" + event.isSystem() + ", event=" + event + ")");
         if (mEmulator == null) return true;
-        stopTextSelectionMode();
+        if (isSelectingText()) {
+            stopTextSelectionMode();
+        }
 
         if (mClient.onKeyDown(keyCode, event, mTermSession)) {
             invalidate();
@@ -759,39 +751,16 @@ protected void onDraw(Canvas canvas) {
         if (mEmulator == null) {
             canvas.drawColor(0XFF000000);
         } else {
-            mRenderer.render(mEmulator, canvas, mTopRow, mSelY1, mSelY2, mSelX1, mSelX2);
-
-
-            SelectionModifierCursorController selectionController = getSelectionController();
-            if (selectionController != null && selectionController.isActive()) {
-                selectionController.updatePosition();
+            // render the terminal view and highlight any selected text
+            int[] sel = mDefaultSelectors;
+            if (mTextSelectionCursorController != null) {
+                mTextSelectionCursorController.getSelectors(sel);
             }
-        }
-    }
+            mRenderer.render(mEmulator, canvas, mTopRow, sel[0], sel[1], sel[2], sel[3]);
 
-    /** Toggle text selection mode in the view. */
-    @TargetApi(23)
-    public void startSelectingText(MotionEvent ev) {
-        int cx = (int) (ev.getX() / mRenderer.mFontWidth);
-        final boolean eventFromMouse = ev.isFromSource(InputDevice.SOURCE_MOUSE);
-        // Offset for finger:
-        final int SELECT_TEXT_OFFSET_Y = eventFromMouse ? 0 : -40;
-        int cy = (int) ((ev.getY() + SELECT_TEXT_OFFSET_Y) / mRenderer.mFontLineSpacing) + mTopRow;
-
-        mSelX1 = mSelX2 = cx;
-        mSelY1 = mSelY2 = cy;
-
-        TerminalBuffer screen = mEmulator.getScreen();
-        if (!" ".equals(screen.getSelectedText(mSelX1, mSelY1, mSelX1, mSelY1))) {
-            // Selecting something other than whitespace. Expand to word.
-            while (mSelX1 > 0 && !"".equals(screen.getSelectedText(mSelX1 - 1, mSelY1, mSelX1 - 1, mSelY1))) {
-                mSelX1--;
-            }
-            while (mSelX2 < mEmulator.mColumns - 1 && !"".equals(screen.getSelectedText(mSelX2 + 1, mSelY1, mSelX2 + 1, mSelY1))) {
-                mSelX2++;
-            }
+            // render the text selection handles
+            renderTextSelection();
         }
-        startTextSelectionMode();
     }
 
     public TerminalSession getCurrentSession() {
@@ -802,735 +771,188 @@ private CharSequence getText() {
         return mEmulator.getScreen().getSelectedText(0, mTopRow, mEmulator.mColumns, mTopRow + mEmulator.mRows);
     }
 
-    @Override
-    protected void onAttachedToWindow() {
-        super.onAttachedToWindow();
-
-        if (mSelectionModifierCursorController != null) {
-            getViewTreeObserver().addOnTouchModeChangeListener(mSelectionModifierCursorController);
-        }
-    }
-
-    @Override
-    protected void onDetachedFromWindow() {
-        super.onDetachedFromWindow();
-
-        if (mSelectionModifierCursorController != null) {
-            getViewTreeObserver().removeOnTouchModeChangeListener(mSelectionModifierCursorController);
-            mSelectionModifierCursorController.onDetached();
-        }
-    }
-
-
-    private int getCursorX(float x) {
+    public int getCursorX(float x) {
         return (int) (x / mRenderer.mFontWidth);
     }
 
-    private int getCursorY(float y) {
+    public int getCursorY(float y) {
         return (int) (((y - 40) / mRenderer.mFontLineSpacing) + mTopRow);
     }
 
-    private int getPointX(int cx) {
+    public int getPointX(int cx) {
         if (cx > mEmulator.mColumns) {
             cx = mEmulator.mColumns;
         }
         return Math.round(cx * mRenderer.mFontWidth);
     }
 
-    private int getPointY(int cy) {
+    public int getPointY(int cy) {
         return Math.round((cy - mTopRow) * mRenderer.mFontLineSpacing);
     }
 
-    /**
-     * A CursorController instance can be used to control a cursor in the text.
-     * It is not used outside of {@link TerminalView}.
-     */
-    private interface CursorController extends ViewTreeObserver.OnTouchModeChangeListener {
-        /**
-         * Makes the cursor controller visible on screen. Will be drawn by {@link #draw(Canvas)}.
-         * See also {@link #hide()}.
-         */
-        void show();
-
-        /**
-         * Hide the cursor controller from screen.
-         * See also {@link #show()}.
-         */
-        void hide();
-
-        /**
-         * @return true if the CursorController is currently visible
-         */
-        boolean isActive();
-
-        /**
-         * Update the controller's position.
-         */
-        void updatePosition(HandleView handle, int x, int y);
-
-        void updatePosition();
-
-        /**
-         * This method is called by {@link #onTouchEvent(MotionEvent)} and gives the controller
-         * a chance to become active and/or visible.
-         *
-         * @param event The touch event
-         */
-        boolean onTouchEvent(MotionEvent event);
-
-        /**
-         * Called when the view is detached from window. Perform house keeping task, such as
-         * stopping Runnable thread that would otherwise keep a reference on the context, thus
-         * preventing the activity to be recycled.
-         */
-        void onDetached();
+    public int getTopRow() {
+        return mTopRow;
     }
 
-    private class HandleView extends View {
-        private Drawable mDrawable;
-        private PopupWindow mContainer;
-        private int mPointX;
-        private int mPointY;
-        private CursorController mController;
-        private boolean mIsDragging;
-        private float mTouchToWindowOffsetX;
-        private float mTouchToWindowOffsetY;
-        private float mHotspotX;
-        private float mHotspotY;
-        private float mTouchOffsetY;
-        private int mLastParentX;
-        private int mLastParentY;
-
-        int mHandleWidth;
-        private final int mOrigOrient;
-        private int mOrientation;
-
-
-        public static final int LEFT = 0;
-        public static final int RIGHT = 2;
-        private int mHandleHeight;
-
-        private long mLastTime;
-
-        public HandleView(CursorController controller, int orientation) {
-            super(TerminalView.this.getContext());
-            mController = controller;
-            mContainer = new PopupWindow(TerminalView.this.getContext(), null,
-                android.R.attr.textSelectHandleWindowStyle);
-            mContainer.setSplitTouchEnabled(true);
-            mContainer.setClippingEnabled(false);
-            mContainer.setWindowLayoutType(WindowManager.LayoutParams.TYPE_APPLICATION_SUB_PANEL);
-            mContainer.setWidth(ViewGroup.LayoutParams.WRAP_CONTENT);
-            mContainer.setHeight(ViewGroup.LayoutParams.WRAP_CONTENT);
-
-            this.mOrigOrient = orientation;
-            setOrientation(orientation);
-        }
-
-        public void setOrientation(int orientation) {
-            mOrientation = orientation;
-            int handleWidth = 0;
-            switch (orientation) {
-                case LEFT: {
-                    if (mSelectHandleLeft == null) {
-
-                            mSelectHandleLeft = getContext().getDrawable(
-                                R.drawable.text_select_handle_left_material);
-                    }
-                    //
-                    mDrawable = mSelectHandleLeft;
-                    handleWidth = mDrawable.getIntrinsicWidth();
-                    mHotspotX = (handleWidth * 3) / 4;
-                    break;
-                }
-
-                case RIGHT: {
-                    if (mSelectHandleRight == null) {
-                            mSelectHandleRight = getContext().getDrawable(
-                                R.drawable.text_select_handle_right_material);
-                    }
-                    mDrawable = mSelectHandleRight;
-                    handleWidth = mDrawable.getIntrinsicWidth();
-                    mHotspotX = handleWidth / 4;
-                    break;
-                }
-
-            }
-
-            mHandleHeight = mDrawable.getIntrinsicHeight();
-
-            mHandleWidth = handleWidth;
-            mTouchOffsetY = -mHandleHeight * 0.3f;
-            mHotspotY = 0;
-            invalidate();
-        }
-
-        public void changeOrientation(int orientation) {
-            if (mOrientation != orientation) {
-                setOrientation(orientation);
-            }
-        }
-
-        @Override
-        public void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-            setMeasuredDimension(mDrawable.getIntrinsicWidth(),
-                mDrawable.getIntrinsicHeight());
-        }
-
-        public void show() {
-            if (!isPositionVisible()) {
-                hide();
-                return;
-            }
-            mContainer.setContentView(this);
-            final int[] coords = mTempCoords;
-            TerminalView.this.getLocationInWindow(coords);
-            coords[0] += mPointX;
-            coords[1] += mPointY;
-            mContainer.showAtLocation(TerminalView.this, 0, coords[0], coords[1]);
-        }
-
-        public void hide() {
-            mIsDragging = false;
-            mContainer.dismiss();
-        }
-
-        public boolean isShowing() {
-            return mContainer.isShowing();
-        }
-
-        private void checkChangedOrientation(int posX, boolean force) {
-            if (!mIsDragging && !force) {
-                return;
-            }
-            long millis = SystemClock.currentThreadTimeMillis();
-            if (millis - mLastTime < 50 && !force) {
-                return;
-            }
-            mLastTime = millis;
-
-            final TerminalView hostView = TerminalView.this;
-            final int left = hostView.getLeft();
-            final int right = hostView.getWidth();
-            final int top = hostView.getTop();
-            final int bottom = hostView.getHeight();
-
-            if (mTempRect == null) {
-                mTempRect = new Rect();
-            }
-            final Rect clip = mTempRect;
-            clip.left = left + TerminalView.this.getPaddingLeft();
-            clip.top = top + TerminalView.this.getPaddingTop();
-            clip.right = right - TerminalView.this.getPaddingRight();
-            clip.bottom = bottom - TerminalView.this.getPaddingBottom();
-
-            final ViewParent parent = hostView.getParent();
-            if (parent == null || !parent.getChildVisibleRect(hostView, clip, null)) {
-                return;
-            }
-
-            if (posX - mHandleWidth < clip.left) {
-                changeOrientation(RIGHT);
-            } else if (posX + mHandleWidth > clip.right) {
-                changeOrientation(LEFT);
-            } else {
-                changeOrientation(mOrigOrient);
-            }
-        }
-
-        private boolean isPositionVisible() {
-            // Always show a dragging handle.
-            if (mIsDragging) {
-                return true;
-            }
-
-            final TerminalView hostView = TerminalView.this;
-            final int left = 0;
-            final int right = hostView.getWidth();
-            final int top = 0;
-            final int bottom = hostView.getHeight();
-
-            if (mTempRect == null) {
-                mTempRect = new Rect();
-            }
-            final Rect clip = mTempRect;
-            clip.left = left + TerminalView.this.getPaddingLeft();
-            clip.top = top + TerminalView.this.getPaddingTop();
-            clip.right = right - TerminalView.this.getPaddingRight();
-            clip.bottom = bottom - TerminalView.this.getPaddingBottom();
-
-            final ViewParent parent = hostView.getParent();
-            if (parent == null || !parent.getChildVisibleRect(hostView, clip, null)) {
-                return false;
-            }
-
-            final int[] coords = mTempCoords;
-            hostView.getLocationInWindow(coords);
-            final int posX = coords[0] + mPointX + (int) mHotspotX;
-            final int posY = coords[1] + mPointY + (int) mHotspotY;
-
-            return posX >= clip.left && posX <= clip.right &&
-                posY >= clip.top && posY <= clip.bottom;
-        }
-
-        private void moveTo(int x, int y, boolean forceOrientationCheck) {
-            float oldHotspotX = mHotspotX;
-            checkChangedOrientation(x, forceOrientationCheck);
-            mPointX = (int) (x - (isShowing() ? oldHotspotX : mHotspotX));
-            mPointY = y;
-            if (isPositionVisible()) {
-                int[] coords = null;
-                if (isShowing()) {
-                    coords = mTempCoords;
-                    TerminalView.this.getLocationInWindow(coords);
-                    int x1 = coords[0] + mPointX;
-                    int y1 = coords[1] + mPointY;
-                    mContainer.update(x1, y1,
-                        getWidth(), getHeight());
-                } else {
-                    show();
-                }
-
-                if (mIsDragging) {
-                    if (coords == null) {
-                        coords = mTempCoords;
-                        TerminalView.this.getLocationInWindow(coords);
-                    }
-                    if (coords[0] != mLastParentX || coords[1] != mLastParentY) {
-                        mTouchToWindowOffsetX += coords[0] - mLastParentX;
-                        mTouchToWindowOffsetY += coords[1] - mLastParentY;
-                        mLastParentX = coords[0];
-                        mLastParentY = coords[1];
-                    }
-                }
-            } else {
-                if (isShowing()) {
-                    hide();
-                }
-            }
-        }
-
-        @Override
-        public void onDraw(Canvas c) {
-            final int drawWidth = mDrawable.getIntrinsicWidth();
-            int height = mDrawable.getIntrinsicHeight();
-            mDrawable.setBounds(0, 0, drawWidth, height);
-            mDrawable.draw(c);
-
-        }
-
-        @SuppressLint("ClickableViewAccessibility")
-        @Override
-        public boolean onTouchEvent(MotionEvent ev) {
-            updateFloatingToolbarVisibility(ev);
-            switch (ev.getActionMasked()) {
-                case MotionEvent.ACTION_DOWN: {
-                    final float rawX = ev.getRawX();
-                    final float rawY = ev.getRawY();
-                    mTouchToWindowOffsetX = rawX - mPointX;
-                    mTouchToWindowOffsetY = rawY - mPointY;
-                    final int[] coords = mTempCoords;
-                    TerminalView.this.getLocationInWindow(coords);
-                    mLastParentX = coords[0];
-                    mLastParentY = coords[1];
-                    mIsDragging = true;
-                    break;
-                }
-
-                case MotionEvent.ACTION_MOVE: {
-                    final float rawX = ev.getRawX();
-                    final float rawY = ev.getRawY();
-
-                    final float newPosX = rawX - mTouchToWindowOffsetX + mHotspotX;
-                    final float newPosY = rawY - mTouchToWindowOffsetY + mHotspotY + mTouchOffsetY;
-
-                    mController.updatePosition(this, Math.round(newPosX), Math.round(newPosY));
-
-
-                    break;
-                }
-
-                case MotionEvent.ACTION_UP:
-                case MotionEvent.ACTION_CANCEL:
-                    mIsDragging = false;
-            }
-            return true;
-        }
-
-
-        public boolean isDragging() {
-            return mIsDragging;
-        }
-
-        void positionAtCursor(final int cx, final int cy, boolean forceOrientationCheck) {
-            int left = getPointX(cx);
-            int bottom = getPointY(cy + 1);
-            moveTo(left, bottom, forceOrientationCheck);
-        }
+    public void setTopRow(int mTopRow) {
+        this.mTopRow = mTopRow;
     }
 
 
-    private class SelectionModifierCursorController implements CursorController {
-        private final int mHandleHeight;
-        // The cursor controller images
-        private HandleView mStartHandle, mEndHandle;
-        // Whether selection anchors are active
-        private boolean mIsShowing;
-
-        SelectionModifierCursorController() {
-            mStartHandle = new HandleView(this, HandleView.LEFT);
-            mEndHandle = new HandleView(this, HandleView.RIGHT);
-
-            mHandleHeight = Math.max(mStartHandle.mHandleHeight, mEndHandle.mHandleHeight);
-        }
-
-        public void show() {
-            mIsShowing = true;
-            mStartHandle.positionAtCursor(mSelX1, mSelY1, true);
-            mEndHandle.positionAtCursor(mSelX2 + 1, mSelY2, true);
-
-            final ActionMode.Callback callback = new ActionMode.Callback() {
-                @Override
-                public boolean onCreateActionMode(ActionMode mode, Menu menu) {
-                    int show = MenuItem.SHOW_AS_ACTION_IF_ROOM | MenuItem.SHOW_AS_ACTION_WITH_TEXT;
 
-                    ClipboardManager clipboard = (ClipboardManager) getContext().getSystemService(Context.CLIPBOARD_SERVICE);
-                    menu.add(Menu.NONE, 1, Menu.NONE, R.string.copy_text).setShowAsAction(show);
-                    menu.add(Menu.NONE, 2, Menu.NONE, R.string.paste_text).setEnabled(clipboard.hasPrimaryClip()).setShowAsAction(show);
-                    menu.add(Menu.NONE, 3, Menu.NONE, R.string.text_selection_more);
-                    return true;
-                }
-
-                @Override
-                public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
-                    return false;
-                }
-
-                @Override
-                public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
-                    if (!mIsSelectingText) {
-                        // Fix issue where the dialog is pressed while being dismissed.
-                        return true;
-                    }
-                    switch (item.getItemId()) {
-                        case 1:
-                            String selectedText = mEmulator.getSelectedText(mSelX1, mSelY1, mSelX2, mSelY2).trim();
-                            mTermSession.clipboardText(selectedText);
-                            break;
-                        case 2:
-                            ClipboardManager clipboard = (ClipboardManager) getContext().getSystemService(Context.CLIPBOARD_SERVICE);
-                            ClipData clipData = clipboard.getPrimaryClip();
-                            if (clipData != null) {
-                                CharSequence paste = clipData.getItemAt(0).coerceToText(getContext());
-                                if (!TextUtils.isEmpty(paste)) mEmulator.paste(paste.toString());
-                            }
-                            break;
-                        case 3:
-                            showContextMenu();
-                            break;
-                    }
-                    stopTextSelectionMode();
-                    return true;
-                }
-
-                @Override
-                public void onDestroyActionMode(ActionMode mode) {
-                }
-
-            };
-            mActionMode = startActionMode(new ActionMode.Callback2() {
-                @Override
-                public boolean onCreateActionMode(ActionMode mode, Menu menu) {
-                    return callback.onCreateActionMode(mode, menu);
-                }
-
-                @Override
-                public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
-                    return false;
-                }
-
-                @Override
-                public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
-                    return callback.onActionItemClicked(mode, item);
-                }
-
-                @Override
-                public void onDestroyActionMode(ActionMode mode) {
-                    // Ignore.
-                }
-
-                @Override
-                public void onGetContentRect(ActionMode mode, View view, Rect outRect) {
-                    int x1 = Math.round(mSelX1 * mRenderer.mFontWidth);
-                    int x2 = Math.round(mSelX2 * mRenderer.mFontWidth);
-                    int y1 = Math.round((mSelY1 - 1 - mTopRow) * mRenderer.mFontLineSpacing);
-                    int y2 = Math.round((mSelY2 + 1 - mTopRow) * mRenderer.mFontLineSpacing);
-
-
-                    if (x1 > x2) {
-                        int tmp = x1;
-                        x1 = x2;
-                        x2 = tmp;
-                    }
-
-                    outRect.set(x1, y1 + mHandleHeight, x2, y2 + mHandleHeight);
-                }
-            }, ActionMode.TYPE_FLOATING);
 
+    /**
+     * Define functions required for AutoFill API
+     */
+    @RequiresApi(api = Build.VERSION_CODES.O)
+    @Override
+    public void autofill(AutofillValue value) {
+        if (value.isText()) {
+            mTermSession.write(value.getTextValue().toString());
         }
+    }
 
-        public void hide() {
-            mStartHandle.hide();
-            mEndHandle.hide();
-            mIsShowing = false;
-            if (mActionMode != null) {
-                // This will hide the mSelectionModifierCursorController
-                mActionMode.finish();
-            }
-
-        }
-
-        public boolean isActive() {
-            return mIsShowing;
-        }
-
-
-        public void updatePosition(HandleView handle, int x, int y) {
-
-            TerminalBuffer screen = mEmulator.getScreen();
-            final int scrollRows = screen.getActiveRows() - mEmulator.mRows;
-            if (handle == mStartHandle) {
-                mSelX1 = getCursorX(x);
-                mSelY1 = getCursorY(y);
-                if (mSelX1 < 0) {
-                    mSelX1 = 0;
-                }
-
-                if (mSelY1 < -scrollRows) {
-                    mSelY1 = -scrollRows;
-
-                } else if (mSelY1 > mEmulator.mRows - 1) {
-                    mSelY1 = mEmulator.mRows - 1;
-
-                }
-
-
-                if (mSelY1 > mSelY2) {
-                    mSelY1 = mSelY2;
-                }
-                if (mSelY1 == mSelY2 && mSelX1 > mSelX2) {
-                    mSelX1 = mSelX2;
-                }
-
-                if (!mEmulator.isAlternateBufferActive()) {
-                    if (mSelY1 <= mTopRow) {
-                        mTopRow--;
-                        if (mTopRow < -scrollRows) {
-                            mTopRow = -scrollRows;
-                        }
-                    } else if (mSelY1 >= mTopRow + mEmulator.mRows) {
-                        mTopRow++;
-                        if (mTopRow > 0) {
-                            mTopRow = 0;
-                        }
-                    }
-                }
-
-
-                mSelX1 = getValidCurX(screen, mSelY1, mSelX1);
-
-            } else {
-                mSelX2 = getCursorX(x);
-                mSelY2 = getCursorY(y);
-                if (mSelX2 < 0) {
-                    mSelX2 = 0;
-                }
-
-
-                if (mSelY2 < -scrollRows) {
-                    mSelY2 = -scrollRows;
-                } else if (mSelY2 > mEmulator.mRows - 1) {
-                    mSelY2 = mEmulator.mRows - 1;
-                }
-
-                if (mSelY1 > mSelY2) {
-                    mSelY2 = mSelY1;
-                }
-                if (mSelY1 == mSelY2 && mSelX1 > mSelX2) {
-                    mSelX2 = mSelX1;
-                }
-
-                if (!mEmulator.isAlternateBufferActive()) {
-                    if (mSelY2 <= mTopRow) {
-                        mTopRow--;
-                        if (mTopRow < -scrollRows) {
-                            mTopRow = -scrollRows;
-                        }
-                    } else if (mSelY2 >= mTopRow + mEmulator.mRows) {
-                        mTopRow++;
-                        if (mTopRow > 0) {
-                            mTopRow = 0;
-                        }
-                    }
-                }
-
-                mSelX2 = getValidCurX(screen, mSelY2, mSelX2);
-            }
+    @RequiresApi(api = Build.VERSION_CODES.O)
+    @Override
+    public int getAutofillType() {
+        return AUTOFILL_TYPE_TEXT;
+    }
 
-            invalidate();
-        }
+    @RequiresApi(api = Build.VERSION_CODES.O)
+    @Override
+    public AutofillValue getAutofillValue() {
+        return AutofillValue.forText("");
+    }
 
 
-        private int getValidCurX(TerminalBuffer screen, int cy, int cx) {
-            String line = screen.getSelectedText(0, cy, cx, cy);
-            if (!TextUtils.isEmpty(line)) {
-                int col = 0;
-                for (int i = 0, len = line.length(); i < len; i++) {
-                    char ch1 = line.charAt(i);
-                    if (ch1 == 0) {
-                        break;
-                    }
 
 
-                    int wc;
-                    if (Character.isHighSurrogate(ch1) && i + 1 < len) {
-                        char ch2 = line.charAt(++i);
-                        wc = WcWidth.width(Character.toCodePoint(ch1, ch2));
-                    } else {
-                        wc = WcWidth.width(ch1);
-                    }
+    /**
+     * Define functions required for text selection and its handles.
+     */
+    TextSelectionCursorController getTextSelectionCursorController() {
+        if (mTextSelectionCursorController == null) {
+            mTextSelectionCursorController = new TextSelectionCursorController(this);
 
-                    final int cend = col + wc;
-                    if (cx > col && cx < cend) {
-                        return cend;
-                    }
-                    if (cend == col) {
-                        return col;
-                    }
-                    col = cend;
-                }
+            final ViewTreeObserver observer = getViewTreeObserver();
+            if (observer != null) {
+                observer.addOnTouchModeChangeListener(mTextSelectionCursorController);
             }
-            return cx;
         }
 
-        public void updatePosition() {
-            if (!isActive()) {
-                return;
-            }
-
-            mStartHandle.positionAtCursor(mSelX1, mSelY1, false);
-
-            mEndHandle.positionAtCursor(mSelX2 + 1, mSelY2, false);
+        return mTextSelectionCursorController;
+    }
 
-            if (mActionMode != null) {
-                mActionMode.invalidate();
-            }
+    private void showTextSelectionCursors(MotionEvent event) {
+        getTextSelectionCursorController().show(event);
+    }
 
-        }
+    private boolean hideTextSelectionCursors() {
+        return getTextSelectionCursorController().hide();
+    }
 
-        public boolean onTouchEvent(MotionEvent event) {
+    private void renderTextSelection() {
+        if (mTextSelectionCursorController != null)
+            mTextSelectionCursorController.render();
+    }
 
+    public boolean isSelectingText() {
+        if (mTextSelectionCursorController != null) {
+            return mTextSelectionCursorController.isActive();
+        } else {
             return false;
         }
+    }
 
-
-        /**
-         * @return true iff this controller is currently used to move the selection start.
-         */
-        public boolean isSelectionStartDragged() {
-            return mStartHandle.isDragging();
+    private ActionMode getTextSelectionActionMode() {
+        if (mTextSelectionCursorController != null) {
+            return mTextSelectionCursorController.getActionMode();
+        } else {
+            return null;
         }
+    }
 
-        public boolean isSelectionEndDragged() {
-            return mEndHandle.isDragging();
+    public void startTextSelectionMode(MotionEvent event) {
+        if (!requestFocus()) {
+            return;
         }
 
-        public void onTouchModeChanged(boolean isInTouchMode) {
-            if (!isInTouchMode) {
-                hide();
-            }
-        }
+        showTextSelectionCursors(event);
+        mClient.copyModeChanged(isSelectingText());
 
-        @Override
-        public void onDetached() {
-        }
+        invalidate();
     }
 
-    SelectionModifierCursorController getSelectionController() {
-        if (mSelectionModifierCursorController == null) {
-            mSelectionModifierCursorController = new SelectionModifierCursorController();
-
-            final ViewTreeObserver observer = getViewTreeObserver();
-            if (observer != null) {
-                observer.addOnTouchModeChangeListener(mSelectionModifierCursorController);
-            }
+    public void stopTextSelectionMode() {
+        if (hideTextSelectionCursors()) {
+            mClient.copyModeChanged(isSelectingText());
+            invalidate();
         }
-
-        return mSelectionModifierCursorController;
     }
 
-    private void hideSelectionModifierCursorController() {
-        if (mSelectionModifierCursorController != null && mSelectionModifierCursorController.isActive()) {
-            mSelectionModifierCursorController.hide();
+    private void decrementYTextSelectionCursors(int decrement) {
+        if (mTextSelectionCursorController != null) {
+            mTextSelectionCursorController.decrementYTextSelectionCursors(decrement);
         }
     }
 
+    @Override
+    protected void onAttachedToWindow() {
+        super.onAttachedToWindow();
 
-    private void startTextSelectionMode() {
-        if (!requestFocus()) {
-            return;
+        if (mTextSelectionCursorController != null) {
+            getViewTreeObserver().addOnTouchModeChangeListener(mTextSelectionCursorController);
         }
-
-        getSelectionController().show();
-
-        mIsSelectingText = true;
-
-        mClient.copyModeChanged(mIsSelectingText);
-
-        invalidate();
     }
 
-    private void stopTextSelectionMode() {
-        if (mIsSelectingText) {
-            hideSelectionModifierCursorController();
-            mSelX1 = mSelY1 = mSelX2 = mSelY2 = -1;
-            mIsSelectingText = false;
+    @Override
+    protected void onDetachedFromWindow() {
+        super.onDetachedFromWindow();
 
-            mClient.copyModeChanged(mIsSelectingText);
+        if (mTextSelectionCursorController != null) {
+            // Might solve the following exception
+            // android.view.WindowLeaked: Activity com.termux.app.TermuxActivity has leaked window android.widget.PopupWindow
+            stopTextSelectionMode();
 
-            invalidate();
+            getViewTreeObserver().removeOnTouchModeChangeListener(mTextSelectionCursorController);
+            mTextSelectionCursorController.onDetached();
         }
     }
 
 
+
+
+    /**
+     * Define functions required for long hold toolbar.
+     */
     private final Runnable mShowFloatingToolbar = new Runnable() {
         @Override
         public void run() {
-            if (mActionMode != null) {
-                mActionMode.hide(0);  // hide off.
+            if (getTextSelectionActionMode() != null) {
+                getTextSelectionActionMode().hide(0);  // hide off.
             }
         }
     };
 
-    void hideFloatingToolbar(int duration) {
-        if (mActionMode != null) {
-            removeCallbacks(mShowFloatingToolbar);
-            mActionMode.hide(duration);
-        }
-    }
-
     private void showFloatingToolbar() {
-        if (mActionMode != null) {
+        if (getTextSelectionActionMode() != null) {
             int delay = ViewConfiguration.getDoubleTapTimeout();
             postDelayed(mShowFloatingToolbar, delay);
         }
     }
 
-    private void updateFloatingToolbarVisibility(MotionEvent event) {
-        if (mActionMode != null) {
+    void hideFloatingToolbar() {
+        if (getTextSelectionActionMode() != null) {
+            removeCallbacks(mShowFloatingToolbar);
+            getTextSelectionActionMode().hide(-1);
+        }
+    }
+
+    public void updateFloatingToolbarVisibility(MotionEvent event) {
+        if (getTextSelectionActionMode() != null) {
             switch (event.getActionMasked()) {
                 case MotionEvent.ACTION_MOVE:
-                    hideFloatingToolbar(-1);
+                    hideFloatingToolbar();
                     break;
                 case MotionEvent.ACTION_UP:  // fall through
                 case MotionEvent.ACTION_CANCEL:
@@ -1539,6 +961,10 @@ private void updateFloatingToolbarVisibility(MotionEvent event) {
         }
     }
 
+
+
+
+
     private Properties getProperties() {
         File propsFile;
         Properties props = new Properties();
@@ -1567,23 +993,4 @@ private Properties getProperties() {
         return props;
     }
 
-    @RequiresApi(api = Build.VERSION_CODES.O)
-    @Override
-    public void autofill(AutofillValue value) {
-        if (value.isText()) {
-            mTermSession.write(value.getTextValue().toString());
-        }
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.O)
-    @Override
-    public int getAutofillType() {
-        return AUTOFILL_TYPE_TEXT;
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.O)
-    @Override
-    public AutofillValue getAutofillValue() {
-        return AutofillValue.forText("");
-    }
 }
diff --git a/terminal-view/src/main/java/com/termux/view/textselection/CursorController.java b/terminal-view/src/main/java/com/termux/view/textselection/CursorController.java
new file mode 100644
index 0000000000..f0e1cc5e45
--- /dev/null
+++ b/terminal-view/src/main/java/com/termux/view/textselection/CursorController.java
@@ -0,0 +1,55 @@
+package com.termux.view.textselection;
+
+import android.view.MotionEvent;
+import android.view.ViewTreeObserver;
+
+import com.termux.view.TerminalView;
+
+/**
+ * A CursorController instance can be used to control cursors in the text.
+ * It is not used outside of {@link TerminalView}.
+ */
+public interface CursorController extends ViewTreeObserver.OnTouchModeChangeListener {
+    /**
+     * Show the cursors on screen. Will be drawn by {@link #render()} by a call during onDraw.
+     * See also {@link #hide()}.
+     */
+    void show(MotionEvent event);
+
+    /**
+     * Hide the cursors from screen.
+     * See also {@link #show(MotionEvent event)}.
+     */
+    boolean hide();
+
+    /**
+     * Render the cursors.
+     */
+    void render();
+
+    /**
+     * Update the cursor positions.
+     */
+    void updatePosition(TextSelectionHandleView handle, int x, int y);
+
+    /**
+     * This method is called by {@link #onTouchEvent(MotionEvent)} and gives the cursors
+     * a chance to become active and/or visible.
+     *
+     * @param event The touch event
+     */
+    boolean onTouchEvent(MotionEvent event);
+
+    /**
+     * Called when the view is detached from window. Perform house keeping task, such as
+     * stopping Runnable thread that would otherwise keep a reference on the context, thus
+     * preventing the activity to be recycled.
+     */
+    void onDetached();
+
+    /**
+     * @return true if the cursors are currently active.
+     */
+    boolean isActive();
+
+}
diff --git a/terminal-view/src/main/java/com/termux/view/textselection/TextSelectionCursorController.java b/terminal-view/src/main/java/com/termux/view/textselection/TextSelectionCursorController.java
new file mode 100644
index 0000000000..8ff36b7fe8
--- /dev/null
+++ b/terminal-view/src/main/java/com/termux/view/textselection/TextSelectionCursorController.java
@@ -0,0 +1,382 @@
+package com.termux.view.textselection;
+
+import android.content.ClipData;
+import android.content.ClipboardManager;
+import android.content.Context;
+import android.graphics.Rect;
+import android.text.TextUtils;
+import android.view.ActionMode;
+import android.view.InputDevice;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.MotionEvent;
+import android.view.View;
+
+import com.termux.terminal.TerminalBuffer;
+import com.termux.terminal.WcWidth;
+import com.termux.view.R;
+import com.termux.view.TerminalView;
+
+public class TextSelectionCursorController implements CursorController {
+
+    private final TerminalView terminalView;
+    private final TextSelectionHandleView mStartHandle, mEndHandle;
+    private boolean mIsSelectingText = false;
+    private long mShowStartTime = System.currentTimeMillis();
+
+    private final int mHandleHeight;
+    private int mSelX1 = -1, mSelX2 = -1, mSelY1 = -1, mSelY2 = -1;
+
+    private ActionMode mActionMode;
+    private final int ACTION_COPY = 1;
+    private final int ACTION_PASTE = 2;
+    private final int ACTION_MORE = 3;
+
+    public TextSelectionCursorController(TerminalView terminalView) {
+        this.terminalView = terminalView;
+        mStartHandle = new TextSelectionHandleView(terminalView, this, TextSelectionHandleView.LEFT);
+        mEndHandle = new TextSelectionHandleView(terminalView, this, TextSelectionHandleView.RIGHT);
+
+        mHandleHeight = Math.max(mStartHandle.getHandleHeight(), mEndHandle.getHandleHeight());
+    }
+
+    @Override
+    public void show(MotionEvent event) {
+        setInitialTextSelectionPosition(event);
+        mStartHandle.positionAtCursor(mSelX1, mSelY1, true);
+        mEndHandle.positionAtCursor(mSelX2 + 1, mSelY2, true);
+
+        setActionModeCallBacks();
+        mShowStartTime = System.currentTimeMillis();
+        mIsSelectingText = true;
+    }
+
+    @Override
+    public boolean hide() {
+        if (!isActive()) return false;
+
+        // prevent hide calls right after a show call, like long pressing the down key
+        // 300ms seems long enough that it wouldn't cause hide problems if action button
+        // is quickly clicked after the show, otherwise decrease it
+        if (System.currentTimeMillis() - mShowStartTime < 300) {
+            return false;
+        }
+
+        mStartHandle.hide();
+        mEndHandle.hide();
+
+        if (mActionMode != null) {
+            // This will hide the TextSelectionCursorController
+            mActionMode.finish();
+        }
+
+        mSelX1 = mSelY1 = mSelX2 = mSelY2 = -1;
+        mIsSelectingText = false;
+
+        return true;
+    }
+
+    @Override
+    public void render() {
+        if (!isActive()) return;
+
+        mStartHandle.positionAtCursor(mSelX1, mSelY1, false);
+        mEndHandle.positionAtCursor(mSelX2 + 1, mSelY2, false);
+
+        if (mActionMode != null) {
+            mActionMode.invalidate();
+        }
+    }
+
+    public void setInitialTextSelectionPosition(MotionEvent event) {
+        int cx = (int) (event.getX() / terminalView.mRenderer.getFontWidth());
+        final boolean eventFromMouse = event.isFromSource(InputDevice.SOURCE_MOUSE);
+        // Offset for finger:
+        final int SELECT_TEXT_OFFSET_Y = eventFromMouse ? 0 : -40;
+        int cy = (int) ((event.getY() + SELECT_TEXT_OFFSET_Y) / terminalView.mRenderer.getFontLineSpacing()) + terminalView.getTopRow();
+
+        mSelX1 = mSelX2 = cx;
+        mSelY1 = mSelY2 = cy;
+
+        TerminalBuffer screen = terminalView.mEmulator.getScreen();
+        if (!" ".equals(screen.getSelectedText(mSelX1, mSelY1, mSelX1, mSelY1))) {
+            // Selecting something other than whitespace. Expand to word.
+            while (mSelX1 > 0 && !"".equals(screen.getSelectedText(mSelX1 - 1, mSelY1, mSelX1 - 1, mSelY1))) {
+                mSelX1--;
+            }
+            while (mSelX2 < terminalView.mEmulator.mColumns - 1 && !"".equals(screen.getSelectedText(mSelX2 + 1, mSelY1, mSelX2 + 1, mSelY1))) {
+                mSelX2++;
+            }
+        }
+    }
+    
+    public void setActionModeCallBacks() {
+        final ActionMode.Callback callback = new ActionMode.Callback() {
+            @Override
+            public boolean onCreateActionMode(ActionMode mode, Menu menu) {
+                int show = MenuItem.SHOW_AS_ACTION_IF_ROOM | MenuItem.SHOW_AS_ACTION_WITH_TEXT;
+
+                ClipboardManager clipboard = (ClipboardManager) terminalView.getContext().getSystemService(Context.CLIPBOARD_SERVICE);
+                menu.add(Menu.NONE, ACTION_COPY, Menu.NONE, R.string.copy_text).setShowAsAction(show);
+                menu.add(Menu.NONE, ACTION_PASTE, Menu.NONE, R.string.paste_text).setEnabled(clipboard.hasPrimaryClip()).setShowAsAction(show);
+                menu.add(Menu.NONE, ACTION_MORE, Menu.NONE, R.string.text_selection_more);
+                return true;
+            }
+
+            @Override
+            public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
+                return false;
+            }
+
+            @Override
+            public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
+                if (!isActive()) {
+                    // Fix issue where the dialog is pressed while being dismissed.
+                    return true;
+                }
+
+                switch (item.getItemId()) {
+                    case ACTION_COPY:
+                        String selectedText = terminalView.mEmulator.getSelectedText(mSelX1, mSelY1, mSelX2, mSelY2).trim();
+                        terminalView.mTermSession.clipboardText(selectedText);
+                        terminalView.stopTextSelectionMode();
+                        break;
+                    case ACTION_PASTE:
+                        terminalView.stopTextSelectionMode();
+                        ClipboardManager clipboard = (ClipboardManager) terminalView.getContext().getSystemService(Context.CLIPBOARD_SERVICE);
+                        ClipData clipData = clipboard.getPrimaryClip();
+                        if (clipData != null) {
+                            CharSequence paste = clipData.getItemAt(0).coerceToText(terminalView.getContext());
+                            if (!TextUtils.isEmpty(paste)) terminalView.mEmulator.paste(paste.toString());
+                        }
+                        break;
+                    case ACTION_MORE:
+                        terminalView.stopTextSelectionMode(); //we stop text selection first, otherwise handles will show above popup
+                        terminalView.showContextMenu();
+                        break;
+                }
+
+                return true;
+            }
+
+            @Override
+            public void onDestroyActionMode(ActionMode mode) {
+            }
+
+        };
+
+        mActionMode = terminalView.startActionMode(new ActionMode.Callback2() {
+            @Override
+            public boolean onCreateActionMode(ActionMode mode, Menu menu) {
+                return callback.onCreateActionMode(mode, menu);
+            }
+
+            @Override
+            public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
+                return false;
+            }
+
+            @Override
+            public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
+                return callback.onActionItemClicked(mode, item);
+            }
+
+            @Override
+            public void onDestroyActionMode(ActionMode mode) {
+                // Ignore.
+            }
+
+            @Override
+            public void onGetContentRect(ActionMode mode, View view, Rect outRect) {
+                int x1 = Math.round(mSelX1 * terminalView.mRenderer.getFontWidth());
+                int x2 = Math.round(mSelX2 * terminalView.mRenderer.getFontWidth());
+                int y1 = Math.round((mSelY1 - 1 - terminalView.getTopRow()) * terminalView.mRenderer.getFontLineSpacing());
+                int y2 = Math.round((mSelY2 + 1 - terminalView.getTopRow()) * terminalView.mRenderer.getFontLineSpacing());
+
+
+                if (x1 > x2) {
+                    int tmp = x1;
+                    x1 = x2;
+                    x2 = tmp;
+                }
+
+                outRect.set(x1, y1 + mHandleHeight, x2, y2 + mHandleHeight);
+            }
+        }, ActionMode.TYPE_FLOATING);
+    }
+
+    @Override
+    public void updatePosition(TextSelectionHandleView handle, int x, int y) {
+        TerminalBuffer screen = terminalView.mEmulator.getScreen();
+        final int scrollRows = screen.getActiveRows() - terminalView.mEmulator.mRows;
+        if (handle == mStartHandle) {
+            mSelX1 = terminalView.getCursorX(x);
+            mSelY1 = terminalView.getCursorY(y);
+            if (mSelX1 < 0) {
+                mSelX1 = 0;
+            }
+
+            if (mSelY1 < -scrollRows) {
+                mSelY1 = -scrollRows;
+
+            } else if (mSelY1 > terminalView.mEmulator.mRows - 1) {
+                mSelY1 = terminalView.mEmulator.mRows - 1;
+
+            }
+
+            if (mSelY1 > mSelY2) {
+                mSelY1 = mSelY2;
+            }
+            if (mSelY1 == mSelY2 && mSelX1 > mSelX2) {
+                mSelX1 = mSelX2;
+            }
+
+            if (!terminalView.mEmulator.isAlternateBufferActive()) {
+                int topRow = terminalView.getTopRow();
+
+                if (mSelY1 <= topRow) {
+                    topRow--;
+                    if (topRow < -scrollRows) {
+                        topRow = -scrollRows;
+                    }
+                } else if (mSelY1 >= topRow + terminalView.mEmulator.mRows) {
+                    topRow++;
+                    if (topRow > 0) {
+                        topRow = 0;
+                    }
+                }
+
+                terminalView.setTopRow(topRow);
+            }
+
+            mSelX1 = getValidCurX(screen, mSelY1, mSelX1);
+
+        } else {
+            mSelX2 = terminalView.getCursorX(x);
+            mSelY2 = terminalView.getCursorY(y);
+            if (mSelX2 < 0) {
+                mSelX2 = 0;
+            }
+
+            if (mSelY2 < -scrollRows) {
+                mSelY2 = -scrollRows;
+            } else if (mSelY2 > terminalView.mEmulator.mRows - 1) {
+                mSelY2 = terminalView.mEmulator.mRows - 1;
+            }
+
+            if (mSelY1 > mSelY2) {
+                mSelY2 = mSelY1;
+            }
+            if (mSelY1 == mSelY2 && mSelX1 > mSelX2) {
+                mSelX2 = mSelX1;
+            }
+
+            if (!terminalView.mEmulator.isAlternateBufferActive()) {
+                int topRow = terminalView.getTopRow();
+
+                if (mSelY2 <= topRow) {
+                    topRow--;
+                    if (topRow < -scrollRows) {
+                        topRow = -scrollRows;
+                    }
+                } else if (mSelY2 >= topRow + terminalView.mEmulator.mRows) {
+                    topRow++;
+                    if (topRow > 0) {
+                        topRow = 0;
+                    }
+                }
+
+                terminalView.setTopRow(topRow);
+            }
+
+            mSelX2 = getValidCurX(screen, mSelY2, mSelX2);
+        }
+
+        terminalView.invalidate();
+    }
+
+    private int getValidCurX(TerminalBuffer screen, int cy, int cx) {
+        String line = screen.getSelectedText(0, cy, cx, cy);
+        if (!TextUtils.isEmpty(line)) {
+            int col = 0;
+            for (int i = 0, len = line.length(); i < len; i++) {
+                char ch1 = line.charAt(i);
+                if (ch1 == 0) {
+                    break;
+                }
+
+                int wc;
+                if (Character.isHighSurrogate(ch1) && i + 1 < len) {
+                    char ch2 = line.charAt(++i);
+                    wc = WcWidth.width(Character.toCodePoint(ch1, ch2));
+                } else {
+                    wc = WcWidth.width(ch1);
+                }
+
+                final int cend = col + wc;
+                if (cx > col && cx < cend) {
+                    return cend;
+                }
+                if (cend == col) {
+                    return col;
+                }
+                col = cend;
+            }
+        }
+        return cx;
+    }
+
+    public void decrementYTextSelectionCursors(int decrement) {
+        mSelY1 -= decrement;
+        mSelY2 -= decrement;
+    }
+
+    public boolean onTouchEvent(MotionEvent event) {
+        return false;
+    }
+
+    public void onTouchModeChanged(boolean isInTouchMode) {
+        if (!isInTouchMode) {
+            terminalView.stopTextSelectionMode();
+        }
+    }
+
+    @Override
+    public void onDetached() {
+    }
+
+    @Override
+    public boolean isActive() {
+        return mIsSelectingText;
+    }
+
+    public void getSelectors(int[] sel) {
+        if (sel == null || sel.length != 4) {
+            return;
+        }
+
+        sel[0] = mSelY1;
+        sel[1] = mSelY2;
+        sel[2] = mSelX1;
+        sel[3] = mSelX2;
+    }
+
+    public ActionMode getActionMode() {
+        return mActionMode;
+    }
+
+    /**
+     * @return true if this controller is currently used to move the start selection.
+     */
+    public boolean isSelectionStartDragged() {
+        return mStartHandle.isDragging();
+    }
+
+    /**
+     * @return true if this controller is currently used to move the end selection.
+     */
+    public boolean isSelectionEndDragged() {
+        return mEndHandle.isDragging();
+    }
+
+}
diff --git a/terminal-view/src/main/java/com/termux/view/textselection/TextSelectionHandleView.java b/terminal-view/src/main/java/com/termux/view/textselection/TextSelectionHandleView.java
new file mode 100644
index 0000000000..74634be244
--- /dev/null
+++ b/terminal-view/src/main/java/com/termux/view/textselection/TextSelectionHandleView.java
@@ -0,0 +1,345 @@
+package com.termux.view.textselection;
+
+import android.annotation.SuppressLint;
+import android.graphics.Canvas;
+import android.graphics.Rect;
+import android.graphics.drawable.Drawable;
+import android.os.SystemClock;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.ViewParent;
+import android.view.WindowManager;
+import android.widget.PopupWindow;
+
+import com.termux.view.R;
+import com.termux.view.TerminalView;
+
+@SuppressLint("ViewConstructor")
+public class TextSelectionHandleView extends View {
+    private final TerminalView terminalView;
+    private PopupWindow mHandle;
+    private final CursorController mCursorController;
+
+    private final Drawable mHandleLeftDrawable;
+    private final Drawable mHandleRightDrawable;
+    private Drawable mHandleDrawable;
+
+    private boolean mIsDragging;
+
+    final int[] mTempCoords = new int[2];
+    Rect mTempRect;
+
+    private int mPointX;
+    private int mPointY;
+    private float mTouchToWindowOffsetX;
+    private float mTouchToWindowOffsetY;
+    private float mHotspotX;
+    private float mHotspotY;
+    private float mTouchOffsetY;
+    private int mLastParentX;
+    private int mLastParentY;
+
+    private int mHandleHeight;
+    private int mHandleWidth;
+
+    private final int mInitialOrientation;
+    private int mOrientation;
+
+    public static final int LEFT = 0;
+    public static final int RIGHT = 2;
+
+    private long mLastTime;
+
+    public TextSelectionHandleView(TerminalView terminalView, CursorController cursorController, int initialOrientation) {
+        super(terminalView.getContext());
+        this.terminalView = terminalView;
+        mCursorController = cursorController;
+        mInitialOrientation = initialOrientation;
+
+        mHandleLeftDrawable = getContext().getDrawable(R.drawable.text_select_handle_left_material);
+        mHandleRightDrawable = getContext().getDrawable(R.drawable.text_select_handle_right_material);
+
+        setOrientation(mInitialOrientation);
+    }
+
+    private void initHandle() {
+        mHandle = new PopupWindow(terminalView.getContext(), null,
+            android.R.attr.textSelectHandleWindowStyle);
+        mHandle.setSplitTouchEnabled(true);
+        mHandle.setClippingEnabled(false);
+        mHandle.setWindowLayoutType(WindowManager.LayoutParams.TYPE_APPLICATION_SUB_PANEL);
+        mHandle.setWidth(ViewGroup.LayoutParams.WRAP_CONTENT);
+        mHandle.setHeight(ViewGroup.LayoutParams.WRAP_CONTENT);
+        mHandle.setBackgroundDrawable(null);
+        mHandle.setAnimationStyle(0);
+        mHandle.setEnterTransition(null);
+        mHandle.setExitTransition(null);
+        mHandle.setContentView(this);
+    }
+
+    public void setOrientation(int orientation) {
+        mOrientation = orientation;
+        int handleWidth = 0;
+        switch (orientation) {
+            case LEFT: {
+                mHandleDrawable = mHandleLeftDrawable;
+                handleWidth = mHandleDrawable.getIntrinsicWidth();
+                mHotspotX = (handleWidth * 3) / (float) 4;
+                break;
+            }
+
+            case RIGHT: {
+                mHandleDrawable = mHandleRightDrawable;
+                handleWidth = mHandleDrawable.getIntrinsicWidth();
+                mHotspotX = handleWidth / (float) 4;
+                break;
+            }
+        }
+
+        mHandleHeight = mHandleDrawable.getIntrinsicHeight();
+
+        mHandleWidth = handleWidth;
+        mTouchOffsetY = -mHandleHeight * 0.3f;
+        mHotspotY = 0;
+        invalidate();
+    }
+
+    public void show() {
+        if (!isPositionVisible()) {
+            hide();
+            return;
+        }
+
+        // We remove handle from its parent first otherwise the following exception may be thrown
+        // java.lang.IllegalStateException: The specified child already has a parent. You must call removeView() on the child's parent first.
+        removeFromParent();
+
+        initHandle(); // init the handle
+        invalidate(); // invalidate to make sure onDraw is called
+
+        final int[] coords = mTempCoords;
+        terminalView.getLocationInWindow(coords);
+        coords[0] += mPointX;
+        coords[1] += mPointY;
+
+        if(mHandle != null)
+            mHandle.showAtLocation(terminalView, 0, coords[0], coords[1]);
+    }
+
+    public void hide() {
+        mIsDragging = false;
+
+        if(mHandle != null) {
+            mHandle.dismiss();
+
+            // We remove handle from its parent, otherwise it may still be shown in some cases even after the dismiss call
+            removeFromParent();
+            mHandle = null;  // garbage collect the handle
+        }
+        invalidate();
+    }
+
+    public void removeFromParent() {
+        if(!isParentNull()) {
+            ((ViewGroup)this.getParent()).removeView(this);
+        }
+    }
+
+    public void positionAtCursor(final int cx, final int cy, boolean forceOrientationCheck) {
+        int x = terminalView.getPointX(cx);
+        int y = terminalView.getPointY(cy + 1);
+        moveTo(x, y, forceOrientationCheck);
+    }
+
+    private void moveTo(int x, int y, boolean forceOrientationCheck) {
+        float oldHotspotX = mHotspotX;
+        checkChangedOrientation(x, forceOrientationCheck);
+        mPointX = (int) (x - (isShowing() ? oldHotspotX : mHotspotX));
+        mPointY = y;
+
+        if (isPositionVisible()) {
+            int[] coords = null;
+
+            if (isShowing()) {
+                coords = mTempCoords;
+                terminalView.getLocationInWindow(coords);
+                int x1 = coords[0] + mPointX;
+                int y1 = coords[1] + mPointY;
+                if (mHandle != null)
+                    mHandle.update(x1, y1, getWidth(), getHeight());
+            } else {
+                show();
+            }
+
+            if (mIsDragging) {
+                if (coords == null) {
+                    coords = mTempCoords;
+                    terminalView.getLocationInWindow(coords);
+                }
+                if (coords[0] != mLastParentX || coords[1] != mLastParentY) {
+                    mTouchToWindowOffsetX += coords[0] - mLastParentX;
+                    mTouchToWindowOffsetY += coords[1] - mLastParentY;
+                    mLastParentX = coords[0];
+                    mLastParentY = coords[1];
+                }
+            }
+        } else {
+            hide();
+        }
+    }
+
+    public void changeOrientation(int orientation) {
+        if (mOrientation != orientation) {
+            setOrientation(orientation);
+        }
+    }
+
+    private void checkChangedOrientation(int posX, boolean force) {
+        if (!mIsDragging && !force) {
+            return;
+        }
+        long millis = SystemClock.currentThreadTimeMillis();
+        if (millis - mLastTime < 50 && !force) {
+            return;
+        }
+        mLastTime = millis;
+
+        final TerminalView hostView = terminalView;
+        final int left = hostView.getLeft();
+        final int right = hostView.getWidth();
+        final int top = hostView.getTop();
+        final int bottom = hostView.getHeight();
+
+        if (mTempRect == null) {
+            mTempRect = new Rect();
+        }
+        final Rect clip = mTempRect;
+        clip.left = left + terminalView.getPaddingLeft();
+        clip.top = top + terminalView.getPaddingTop();
+        clip.right = right - terminalView.getPaddingRight();
+        clip.bottom = bottom - terminalView.getPaddingBottom();
+
+        final ViewParent parent = hostView.getParent();
+        if (parent == null || !parent.getChildVisibleRect(hostView, clip, null)) {
+            return;
+        }
+
+        if (posX - mHandleWidth < clip.left) {
+            changeOrientation(RIGHT);
+        } else if (posX + mHandleWidth > clip.right) {
+            changeOrientation(LEFT);
+        } else {
+            changeOrientation(mInitialOrientation);
+        }
+    }
+
+    private boolean isPositionVisible() {
+        // Always show a dragging handle.
+        if (mIsDragging) {
+            return true;
+        }
+
+        final TerminalView hostView = terminalView;
+        final int left = 0;
+        final int right = hostView.getWidth();
+        final int top = 0;
+        final int bottom = hostView.getHeight();
+
+        if (mTempRect == null) {
+            mTempRect = new Rect();
+        }
+        final Rect clip = mTempRect;
+        clip.left = left + terminalView.getPaddingLeft();
+        clip.top = top + terminalView.getPaddingTop();
+        clip.right = right - terminalView.getPaddingRight();
+        clip.bottom = bottom - terminalView.getPaddingBottom();
+
+        final ViewParent parent = hostView.getParent();
+        if (parent == null || !parent.getChildVisibleRect(hostView, clip, null)) {
+            return false;
+        }
+
+        final int[] coords = mTempCoords;
+        hostView.getLocationInWindow(coords);
+        final int posX = coords[0] + mPointX + (int) mHotspotX;
+        final int posY = coords[1] + mPointY + (int) mHotspotY;
+
+        return posX >= clip.left && posX <= clip.right &&
+            posY >= clip.top && posY <= clip.bottom;
+    }
+
+    @Override
+    public void onDraw(Canvas c) {
+        final int width = mHandleDrawable.getIntrinsicWidth();
+        int height = mHandleDrawable.getIntrinsicHeight();
+        mHandleDrawable.setBounds(0, 0, width, height);
+        mHandleDrawable.draw(c);
+    }
+
+    @SuppressLint("ClickableViewAccessibility")
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+        terminalView.updateFloatingToolbarVisibility(event);
+        switch (event.getActionMasked()) {
+            case MotionEvent.ACTION_DOWN: {
+                final float rawX = event.getRawX();
+                final float rawY = event.getRawY();
+                mTouchToWindowOffsetX = rawX - mPointX;
+                mTouchToWindowOffsetY = rawY - mPointY;
+                final int[] coords = mTempCoords;
+                terminalView.getLocationInWindow(coords);
+                mLastParentX = coords[0];
+                mLastParentY = coords[1];
+                mIsDragging = true;
+                break;
+            }
+
+            case MotionEvent.ACTION_MOVE: {
+                final float rawX = event.getRawX();
+                final float rawY = event.getRawY();
+
+                final float newPosX = rawX - mTouchToWindowOffsetX + mHotspotX;
+                final float newPosY = rawY - mTouchToWindowOffsetY + mHotspotY + mTouchOffsetY;
+
+                mCursorController.updatePosition(this, Math.round(newPosX), Math.round(newPosY));
+                break;
+            }
+
+            case MotionEvent.ACTION_UP:
+            case MotionEvent.ACTION_CANCEL:
+                mIsDragging = false;
+        }
+        return true;
+    }
+
+    @Override
+    public void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        setMeasuredDimension(mHandleDrawable.getIntrinsicWidth(),
+            mHandleDrawable.getIntrinsicHeight());
+    }
+
+    public int getHandleHeight() {
+        return mHandleHeight;
+    }
+
+    public int getHandleWidth() {
+        return mHandleWidth;
+    }
+
+    public boolean isShowing() {
+        if (mHandle != null)
+            return mHandle.isShowing();
+        else
+            return false;
+    }
+
+    public boolean isParentNull() {
+        return this.getParent() == null;
+    }
+
+    public boolean isDragging() {
+        return mIsDragging;
+    }
+
+}

From 395759cc0aea9a6c2f89142cbfcb18bbf2ee3503 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 6 Mar 2021 18:27:57 +0500
Subject: [PATCH 216/912] Restore keyboard input into terminal view when
 toggling extra-keys slider input with VOL_UP+q

Check #1420 for details.
---
 app/src/main/java/com/termux/app/TermuxViewClient.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/com/termux/app/TermuxViewClient.java b/app/src/main/java/com/termux/app/TermuxViewClient.java
index 3dcc406c77..ec962a888d 100644
--- a/app/src/main/java/com/termux/app/TermuxViewClient.java
+++ b/app/src/main/java/com/termux/app/TermuxViewClient.java
@@ -212,6 +212,7 @@ public boolean onCodePoint(final int codePoint, boolean ctrlDown, TerminalSessio
                 case 'q':
                 case 'k':
                     mActivity.toggleShowExtraKeys();
+                    mVirtualFnKeyDown=false; // force disable fn key down to restore keyboard input into terminal view, fixes termux/termux-app#1420
                     break;
             }
 

From 14c49867f706c12b27d007ccede1c799041e857f Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Mon, 8 Mar 2021 15:09:22 +0500
Subject: [PATCH 217/912] Define `TermuxConstants` class to store all shared
 constants of Termux app and its plugins

This commit removes almost all hardcoded paths in Termux app and moves the references to the `TermuxConstants` class.

The `TermuxConstants` class should be imported by other termux plugin apps instead of copying and defining their own constants. The 3rd party apps can also import it for interacting with termux apps. App and sub class specific constants are defined in their own nested classes to keep them segregated from each other and for better readability.
---
 app/build.gradle                              |   9 +
 app/src/main/AndroidManifest.xml              |  33 +--
 .../java/com/termux/app/BackgroundJob.java    |  18 +-
 .../com/termux/app/RunCommandService.java     |  34 ++-
 .../java/com/termux/app/TermuxActivity.java   |  25 +-
 .../java/com/termux/app/TermuxConstants.java  | 232 ++++++++++++++++++
 .../java/com/termux/app/TermuxInstaller.java  |   6 +-
 .../com/termux/app/TermuxOpenReceiver.java    |   2 +-
 .../com/termux/app/TermuxPreferences.java     |   8 +-
 .../java/com/termux/app/TermuxService.java    |  54 ++--
 .../filepicker/TermuxDocumentsProvider.java   |   6 +-
 .../TermuxFileReceiverActivity.java           |  20 +-
 app/src/main/res/values/strings.xml           |  26 +-
 app/src/main/res/xml/shortcuts.xml            |   8 +
 14 files changed, 361 insertions(+), 120 deletions(-)
 create mode 100644 app/src/main/java/com/termux/app/TermuxConstants.java

diff --git a/app/build.gradle b/app/build.gradle
index 24b5882580..3d519ffa27 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -21,6 +21,15 @@ android {
         versionCode 108
         versionName "0.108"
 
+        manifestPlaceholders.TERMUX_PACKAGE_NAME = "com.termux"
+        manifestPlaceholders.TERMUX_APP_NAME = "Termux"
+        manifestPlaceholders.TERMUX_API_APP_NAME = "Termux:API"
+        manifestPlaceholders.TERMUX_BOOT_APP_NAME = "Termux:Boot"
+        manifestPlaceholders.TERMUX_FLOAT_APP_NAME = "Termux:Float"
+        manifestPlaceholders.TERMUX_STYLING_APP_NAME = "Termux:Styling"
+        manifestPlaceholders.TERMUX_TASKER_APP_NAME = "Termux:Tasker"
+        manifestPlaceholders.TERMUX_WIDGET_APP_NAME = "Termux:Widget"
+
         externalNativeBuild {
             ndkBuild {
                 cFlags "-std=c11", "-Wall", "-Wextra", "-Werror", "-Os", "-fno-stack-protector", "-Wl,--gc-sections"
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 59324ec799..0a2e70a616 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,13 +2,13 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.termux"
     android:installLocation="internalOnly"
-    android:sharedUserId="com.termux"
+    android:sharedUserId="${TERMUX_PACKAGE_NAME}"
     android:sharedUserLabel="@string/shared_user_label" >
 
     <uses-feature android:name="android.hardware.touchscreen" android:required="false" />
     <uses-feature android:name="android.software.leanback" android:required="false" />
 
-    <permission android:name="com.termux.permission.RUN_COMMAND"
+    <permission android:name="${TERMUX_PACKAGE_NAME}.permission.RUN_COMMAND"
         android:label="@string/run_command_permission_label"
         android:description="@string/run_command_permission_description"
         android:icon="@mipmap/ic_launcher"
@@ -28,13 +28,14 @@
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
 
     <application
-        android:extractNativeLibs="true"
-        android:allowBackup="false"
+        android:label="@string/application_name"
         android:icon="@mipmap/ic_launcher"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:banner="@drawable/banner"
-        android:label="@string/application_name"
         android:theme="@style/Theme.Termux"
+
+        android:extractNativeLibs="true"
+        android:allowBackup="false"
         android:supportsRtl="false" >
 
         <!-- This (or rather, value 2.1 or higher) is needed to make the Samsung Galaxy S8
@@ -42,7 +43,7 @@
         <meta-data android:name="android.max_aspect" android:value="10.0" />
 
         <activity
-            android:name="com.termux.app.TermuxActivity"
+            android:name=".app.TermuxActivity"
 	    android:label="@string/application_name"
 	    android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation"
             android:launchMode="singleTask"
@@ -60,7 +61,7 @@
         </activity>
 
         <activity
-            android:name="com.termux.app.TermuxHelpActivity"
+            android:name=".app.TermuxHelpActivity"
             android:exported="false"
             android:theme="@android:style/Theme.Material.Light.DarkActionBar"
             android:parentActivityName=".app.TermuxActivity"
@@ -68,9 +69,9 @@
             android:label="@string/application_name" />
 
         <activity
-            android:name="com.termux.filepicker.TermuxFileReceiverActivity"
+            android:name=".filepicker.TermuxFileReceiverActivity"
             android:label="@string/application_name"
-            android:taskAffinity="com.termux.filereceiver"
+            android:taskAffinity="${TERMUX_PACKAGE_NAME}.filereceiver"
             android:excludeFromRecents="true"
             android:resizeableActivity="true"
             android:noHistory="true">
@@ -100,7 +101,7 @@
 
         <activity-alias
             android:name=".HomeActivity"
-            android:targetActivity="com.termux.app.TermuxActivity">
+            android:targetActivity=".app.TermuxActivity">
 
             <!-- Launch activity automatically on boot on Android Things devices -->
             <intent-filter>
@@ -112,7 +113,7 @@
 
         <provider
             android:name=".filepicker.TermuxDocumentsProvider"
-            android:authorities="com.termux.documents"
+            android:authorities="${TERMUX_PACKAGE_NAME}.documents"
             android:grantUriPermissions="true"
             android:exported="true"
             android:permission="android.permission.MANAGE_DOCUMENTS">
@@ -122,25 +123,25 @@
         </provider>
 
         <service
-            android:name="com.termux.app.TermuxService"
+            android:name=".app.TermuxService"
             android:exported="false" />
 
         <service
             android:name=".app.RunCommandService"
             android:exported="true"
-            android:permission="com.termux.permission.RUN_COMMAND" >
+            android:permission="${TERMUX_PACKAGE_NAME}.permission.RUN_COMMAND" >
             <intent-filter>
-                <action android:name="com.termux.RUN_COMMAND" />
+                <action android:name="${TERMUX_PACKAGE_NAME}.RUN_COMMAND" />
             </intent-filter>
         </service>
 
         <receiver android:name=".app.TermuxOpenReceiver" />
 
-        <provider android:authorities="com.termux.files"
+        <provider android:authorities="${TERMUX_PACKAGE_NAME}.files"
                   android:readPermission="android.permission.permRead"
                   android:exported="true"
                   android:grantUriPermissions="true"
-                  android:name="com.termux.app.TermuxOpenReceiver$ContentProvider" />
+                  android:name=".app.TermuxOpenReceiver$ContentProvider" />
 	<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>
diff --git a/app/src/main/java/com/termux/app/BackgroundJob.java b/app/src/main/java/com/termux/app/BackgroundJob.java
index faf0089bcc..bb4e19a828 100644
--- a/app/src/main/java/com/termux/app/BackgroundJob.java
+++ b/app/src/main/java/com/termux/app/BackgroundJob.java
@@ -36,7 +36,7 @@ public BackgroundJob(String cwd, String fileToExecute, final String[] args, fina
 
     public BackgroundJob(String cwd, String fileToExecute, final String[] args, final TermuxService service, PendingIntent pendingIntent) {
         String[] env = buildEnvironment(false, cwd);
-        if (cwd == null || cwd.isEmpty()) cwd = TermuxService.HOME_PATH;
+        if (cwd == null || cwd.isEmpty()) cwd = TermuxConstants.HOME_PATH;
 
         final String[] progArray = setupProcessArgs(fileToExecute, args);
         final String processDescription = Arrays.toString(progArray);
@@ -134,17 +134,17 @@ private static void addToEnvIfPresent(List<String> environment, String name) {
     }
 
     static String[] buildEnvironment(boolean failSafe, String cwd) {
-        new File(TermuxService.HOME_PATH).mkdirs();
+        new File(TermuxConstants.HOME_PATH).mkdirs();
 
-        if (cwd == null || cwd.isEmpty()) cwd = TermuxService.HOME_PATH;
+        if (cwd == null || cwd.isEmpty()) cwd = TermuxConstants.HOME_PATH;
 
         List<String> environment = new ArrayList<>();
 
         environment.add("TERMUX_VERSION=" + BuildConfig.VERSION_NAME);
         environment.add("TERM=xterm-256color");
         environment.add("COLORTERM=truecolor");
-        environment.add("HOME=" + TermuxService.HOME_PATH);
-        environment.add("PREFIX=" + TermuxService.PREFIX_PATH);
+        environment.add("HOME=" + TermuxConstants.HOME_PATH);
+        environment.add("PREFIX=" + TermuxConstants.PREFIX_PATH);
         environment.add("BOOTCLASSPATH=" + System.getenv("BOOTCLASSPATH"));
         environment.add("ANDROID_ROOT=" + System.getenv("ANDROID_ROOT"));
         environment.add("ANDROID_DATA=" + System.getenv("ANDROID_DATA"));
@@ -164,9 +164,9 @@ static String[] buildEnvironment(boolean failSafe, String cwd) {
             environment.add("PATH= " + System.getenv("PATH"));
         } else {
             environment.add("LANG=en_US.UTF-8");
-            environment.add("PATH=" + TermuxService.PREFIX_PATH + "/bin");
+            environment.add("PATH=" + TermuxConstants.PREFIX_PATH + "/bin");
             environment.add("PWD=" + cwd);
-            environment.add("TMPDIR=" + TermuxService.PREFIX_PATH + "/tmp");
+            environment.add("TMPDIR=" + TermuxConstants.PREFIX_PATH + "/tmp");
         }
 
         return environment.toArray(new String[0]);
@@ -215,7 +215,7 @@ static String[] setupProcessArgs(String fileToExecute, String[] args) {
                                     if (executable.startsWith("/usr") || executable.startsWith("/bin")) {
                                         String[] parts = executable.split("/");
                                         String binary = parts[parts.length - 1];
-                                        interpreter = TermuxService.PREFIX_PATH + "/bin/" + binary;
+                                        interpreter = TermuxConstants.PREFIX_PATH + "/bin/" + binary;
                                     }
                                     break;
                                 }
@@ -225,7 +225,7 @@ static String[] setupProcessArgs(String fileToExecute, String[] args) {
                         }
                     } else {
                         // No shebang and no ELF, use standard shell.
-                        interpreter = TermuxService.PREFIX_PATH + "/bin/sh";
+                        interpreter = TermuxConstants.PREFIX_PATH + "/bin/sh";
                     }
                 }
             }
diff --git a/app/src/main/java/com/termux/app/RunCommandService.java b/app/src/main/java/com/termux/app/RunCommandService.java
index 93b43cf606..eb6efc216a 100644
--- a/app/src/main/java/com/termux/app/RunCommandService.java
+++ b/app/src/main/java/com/termux/app/RunCommandService.java
@@ -13,6 +13,8 @@
 import android.util.Log;
 
 import com.termux.R;
+import com.termux.app.TermuxConstants.TERMUX_APP.RUN_COMMAND_SERVICE;
+import com.termux.app.TermuxConstants.TERMUX_APP.TERMUX_SERVICE;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -77,12 +79,6 @@
  */
 public class RunCommandService extends Service {
 
-    public static final String RUN_COMMAND_ACTION = "com.termux.RUN_COMMAND";
-    public static final String RUN_COMMAND_PATH = "com.termux.RUN_COMMAND_PATH";
-    public static final String RUN_COMMAND_ARGUMENTS = "com.termux.RUN_COMMAND_ARGUMENTS";
-    public static final String RUN_COMMAND_WORKDIR = "com.termux.RUN_COMMAND_WORKDIR";
-    public static final String RUN_COMMAND_BACKGROUND = "com.termux.RUN_COMMAND_BACKGROUND";
-
     private static final String NOTIFICATION_CHANNEL_ID = "termux_run_command_notification_channel";
     private static final int NOTIFICATION_ID = 1338;
 
@@ -108,7 +104,7 @@ public int onStartCommand(Intent intent, int flags, int startId) {
         runStartForeground();
 
         // If wrong action passed, then just return
-        if (!RUN_COMMAND_ACTION.equals(intent.getAction())) {
+        if (!RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND.equals(intent.getAction())) {
             Log.e("termux", "Unexpected intent action to RunCommandService: " + intent.getAction());
             return Service.START_NOT_STICKY;
         }
@@ -119,16 +115,16 @@ public int onStartCommand(Intent intent, int flags, int startId) {
             return Service.START_NOT_STICKY;
         }
 
-        Uri programUri = new Uri.Builder().scheme("com.termux.file").path(getExpandedTermuxPath(intent.getStringExtra(RUN_COMMAND_PATH))).build();
+        Uri programUri = new Uri.Builder().scheme(TERMUX_SERVICE.URI_SCHEME_SERVICE_EXECUTE).path(getExpandedTermuxPath(intent.getStringExtra(RUN_COMMAND_SERVICE.EXTRA_COMMAND_PATH))).build();
 
-        Intent execIntent = new Intent(TermuxService.ACTION_EXECUTE, programUri);
+        Intent execIntent = new Intent(TERMUX_SERVICE.ACTION_SERVICE_EXECUTE, programUri);
         execIntent.setClass(this, TermuxService.class);
-        execIntent.putExtra(TermuxService.EXTRA_ARGUMENTS, intent.getStringArrayExtra(RUN_COMMAND_ARGUMENTS));
-        execIntent.putExtra(TermuxService.EXTRA_EXECUTE_IN_BACKGROUND, intent.getBooleanExtra(RUN_COMMAND_BACKGROUND, false));
+        execIntent.putExtra(TERMUX_SERVICE.EXTRA_ARGUMENTS, intent.getStringArrayExtra(RUN_COMMAND_SERVICE.EXTRA_ARGUMENTS));
+        execIntent.putExtra(TERMUX_SERVICE.EXTRA_BACKGROUND, intent.getBooleanExtra(RUN_COMMAND_SERVICE.EXTRA_BACKGROUND, false));
 
-        String workingDirectory = intent.getStringExtra(RUN_COMMAND_WORKDIR);
+        String workingDirectory = intent.getStringExtra(RUN_COMMAND_SERVICE.EXTRA_WORKDIR);
         if (workingDirectory != null && !workingDirectory.isEmpty()) {
-            execIntent.putExtra(TermuxService.EXTRA_CURRENT_WORKING_DIRECTORY, getExpandedTermuxPath(workingDirectory));
+            execIntent.putExtra(TERMUX_SERVICE.EXTRA_WORKDIR, getExpandedTermuxPath(workingDirectory));
         }
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
@@ -188,9 +184,9 @@ private void setupNotificationChannel() {
     }
 
     private boolean allowExternalApps() {
-        File propsFile = new File(TermuxService.HOME_PATH + "/.termux/termux.properties");
+        File propsFile = new File(TermuxConstants.TERMUX_PROPERTIES_PRIMARY_PATH);
         if (!propsFile.exists())
-            propsFile = new File(TermuxService.HOME_PATH + "/.config/termux/termux.properties");
+            propsFile = new File(TermuxConstants.TERMUX_PROPERTIES_SECONDARY_PATH);
 
         Properties props = new Properties();
         try {
@@ -209,10 +205,10 @@ private boolean allowExternalApps() {
     /** Replace "$PREFIX/" or "~/" prefix with termux absolute paths */
     public static String getExpandedTermuxPath(String path) {
         if(path != null && !path.isEmpty()) {
-            path = path.replaceAll("^\\$PREFIX$", TermuxService.PREFIX_PATH);
-            path = path.replaceAll("^\\$PREFIX/", TermuxService.PREFIX_PATH + "/");
-            path = path.replaceAll("^~/$", TermuxService.HOME_PATH);
-            path = path.replaceAll("^~/", TermuxService.HOME_PATH + "/");
+            path = path.replaceAll("^\\$PREFIX$", TermuxConstants.PREFIX_PATH);
+            path = path.replaceAll("^\\$PREFIX/", TermuxConstants.PREFIX_PATH + "/");
+            path = path.replaceAll("^~/$", TermuxConstants.HOME_PATH);
+            path = path.replaceAll("^~/", TermuxConstants.HOME_PATH + "/");
         }
 
         return path;
diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index b5d876815e..a6e1d985ea 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -2,7 +2,6 @@
 
 import android.Manifest;
 import android.annotation.SuppressLint;
-import android.annotation.TargetApi;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.ActivityNotFoundException;
@@ -48,6 +47,7 @@
 import android.widget.Toast;
 
 import com.termux.R;
+import com.termux.app.TermuxConstants.TERMUX_APP.TERMUX_ACTIVITY;
 import com.termux.terminal.EmulatorDebug;
 import com.termux.terminal.TerminalColors;
 import com.termux.terminal.TerminalSession;
@@ -84,8 +84,6 @@
  */
 public final class TermuxActivity extends Activity implements ServiceConnection {
 
-    public static final String TERMUX_FAILSAFE_SESSION_ACTION = "com.termux.app.failsafe_session";
-
     private static final int CONTEXTMENU_SELECT_URL_ID = 0;
     private static final int CONTEXTMENU_SHARE_TRANSCRIPT_ID = 1;
     private static final int CONTEXTMENU_PASTE_ID = 3;
@@ -100,9 +98,8 @@ public final class TermuxActivity extends Activity implements ServiceConnection
 
     private static final int REQUESTCODE_PERMISSION_STORAGE = 1234;
 
-    private static final String RELOAD_STYLE_ACTION = "com.termux.app.reload_style";
 
-    private static final String BROADCAST_TERMUX_OPENED = "com.termux.app.OPENED";
+    private static final String BROADCAST_TERMUX_OPENED = TermuxConstants.TERMUX_PACKAGE_NAME + ".app.OPENED";
 
     /** The main view of the activity showing the terminal. Initialized in onCreate(). */
     @SuppressWarnings("NullableProblems")
@@ -145,7 +142,7 @@ public final class TermuxActivity extends Activity implements ServiceConnection
         @Override
         public void onReceive(Context context, Intent intent) {
             if (mIsVisible) {
-                String whatToReload = intent.getStringExtra(RELOAD_STYLE_ACTION);
+                String whatToReload = intent.getStringExtra(TERMUX_ACTIVITY.EXTRA_RELOAD_STYLE);
                 if ("storage".equals(whatToReload)) {
                     if (ensureStoragePermissionGranted())
                         TermuxInstaller.setupStorageSymlinks(TermuxActivity.this);
@@ -163,8 +160,8 @@ public void onReceive(Context context, Intent intent) {
 
     void checkForFontAndColors() {
         try {
-            @SuppressLint("SdCardPath") File fontFile = new File("/data/data/com.termux/files/home/.termux/font.ttf");
-            @SuppressLint("SdCardPath") File colorsFile = new File("/data/data/com.termux/files/home/.termux/colors.properties");
+            File colorsFile = new File(TermuxConstants.COLOR_PROPERTIES_PATH);
+            File fontFile = new File(TermuxConstants.FONT_PATH);
 
             final Properties props = new Properties();
             if (colorsFile.isFile()) {
@@ -541,7 +538,7 @@ public View getView(int position, View convertView, @NonNull ViewGroup parent) {
                         Bundle bundle = getIntent().getExtras();
                         boolean launchFailsafe = false;
                         if (bundle != null) {
-                            launchFailsafe = bundle.getBoolean(TERMUX_FAILSAFE_SESSION_ACTION, false);
+                            launchFailsafe = bundle.getBoolean(TERMUX_ACTIVITY.ACTION_FAILSAFE_SESSION, false);
                         }
                         addNewSession(launchFailsafe, null);
                     } catch (WindowManager.BadTokenException e) {
@@ -556,7 +553,7 @@ public View getView(int position, View convertView, @NonNull ViewGroup parent) {
             Intent i = getIntent();
             if (i != null && Intent.ACTION_RUN.equals(i.getAction())) {
                 // Android 7.1 app shortcut from res/xml/shortcuts.xml.
-                boolean failSafe = i.getBooleanExtra(TERMUX_FAILSAFE_SESSION_ACTION, false);
+                boolean failSafe = i.getBooleanExtra(TERMUX_ACTIVITY.ACTION_FAILSAFE_SESSION, false);
                 addNewSession(failSafe, null);
             } else {
                 switchToSession(getStoredCurrentSessionOrLast());
@@ -612,7 +609,7 @@ public void onStart() {
             mListViewAdapter.notifyDataSetChanged();
         }
 
-        registerReceiver(mBroadcastReceiever, new IntentFilter(RELOAD_STYLE_ACTION));
+        registerReceiver(mBroadcastReceiever, new IntentFilter(TERMUX_ACTIVITY.ACTION_RELOAD_STYLE));
 
         // The current terminal session may have changed while being away, force
         // a refresh of the displayed terminal:
@@ -914,14 +911,14 @@ public boolean onContextItemSelected(MenuItem item) {
             }
             case CONTEXTMENU_STYLING_ID: {
                 Intent stylingIntent = new Intent();
-                stylingIntent.setClassName("com.termux.styling", "com.termux.styling.TermuxStyleActivity");
+                stylingIntent.setClassName(TermuxConstants.TERMUX_STYLING_PACKAGE_NAME, TermuxConstants.TERMUX_STYLING.TERMUX_STYLING_ACTIVITY_NAME);
                 try {
                     startActivity(stylingIntent);
                 } catch (ActivityNotFoundException | IllegalArgumentException e) {
                     // The startActivity() call is not documented to throw IllegalArgumentException.
                     // However, crash reporting shows that it sometimes does, so catch it here.
-                    new AlertDialog.Builder(this).setMessage(R.string.styling_not_installed)
-                        .setPositiveButton(R.string.styling_install, (dialog, which) -> startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://f-droid.org/en/packages/com.termux.styling/")))).setNegativeButton(android.R.string.cancel, null).show();
+                    new AlertDialog.Builder(this).setMessage(getString(R.string.styling_not_installed))
+                        .setPositiveButton(R.string.styling_install, (dialog, which) -> startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://f-droid.org/en/packages/" + TermuxConstants.TERMUX_STYLING_PACKAGE_NAME + " /")))).setNegativeButton(android.R.string.cancel, null).show();
                 }
                 return true;
             }
diff --git a/app/src/main/java/com/termux/app/TermuxConstants.java b/app/src/main/java/com/termux/app/TermuxConstants.java
new file mode 100644
index 0000000000..cf4da908d1
--- /dev/null
+++ b/app/src/main/java/com/termux/app/TermuxConstants.java
@@ -0,0 +1,232 @@
+package com.termux.app;
+
+import android.annotation.SuppressLint;
+
+import java.io.File;
+
+// Version: v0.1.0
+
+/**
+ * A class that defines shared constants of the Termux app and its plugins.
+ * This class will be hosted by termux-app and should be imported by other termux plugin apps as is
+ * instead of copying constants to random classes. The 3rd party apps can also import it for
+ * interacting with termux apps.
+ *
+ * Termux app default package name is "com.termux" and is used in PREFIX_PATH.
+ * The binaries compiled for termux have PREFIX_PATH hardcoded in them but it can be changed during
+ * compilation.
+ *
+ * The TERMUX_PACKAGE_NAME must be the same as the applicationId of termux-app build.gradle since
+ * its also used by FILES_PATH.
+ * If TERMUX_PACKAGE_NAME is changed, then binaries, specially used in bootstrap need to be compiled
+ * appropriately. Check https://github.com/termux/termux-packages/wiki/Building-packages for more info.
+ *
+ * Ideally the only places where changes should be required if changing package name are the following:
+ * - The TERMUX_PACKAGE_NAME in TermuxConstants.
+ * - The "applicationId" in "build.gradle". This is package name that android and app stores will
+ *       use and is also the final package name stored in "AndroidManifest.xml".
+ * - The "manifestPlaceholders" values for TERMUX_PACKAGE_NAME and *_APP_NAME in "build.gradle".
+ * - The "ENTITY" values for TERMUX_PACKAGE_NAME and *_APP_NAME in "strings.xml".
+ * - The "shortcut.xml" files like in termux-app since dynamic variables don't work in it.
+ * - Optionally the "package" in "AndroidManifest.xml" if modifying project structure. This is
+ *      package name for java classes project structure and is prefixed if activity and service
+ *      names use dot (.) notation.
+ * - Optionally the *_PATH variables in TermuxConstants containing the string "termux".
+ *
+ * Check https://developer.android.com/studio/build/application-id for info on "package" in
+ * "AndroidManifest.xml" and "applicationId" in "build.gradle".
+ *
+ * TERMUX_PACKAGE_NAME must be used in source code of Termux app and its plugins instead of hardcoded
+ * "com.termux" paths.
+ */
+
+public final class TermuxConstants {
+
+    /**
+     * Termux app and plugin app and package names.
+     */
+
+    public static final String TERMUX_APP_NAME = "Termux"; // Default: "Termux"
+    public static final String TERMUX_PACKAGE_NAME = "com.termux"; // Default: "com.termux"
+
+    public static final String TERMUX_API_APP_NAME = "Termux:API"; // Default: "Termux:API"
+    public static final String TERMUX_API_PACKAGE_NAME = TERMUX_PACKAGE_NAME + ".api"; // Default: "com.termux.api"
+
+    public static final String TERMUX_BOOT_APP_NAME = "Termux:Boot"; // Default: "Termux:Boot"
+    public static final String TERMUX_BOOT_PACKAGE_NAME = TERMUX_PACKAGE_NAME + ".boot"; // Default: "com.termux.boot"
+
+    public static final String TERMUX_FLOAT_APP_NAME = "Termux:Float"; // Default: "Termux:Float"
+    public static final String TERMUX_FLOAT_PACKAGE_NAME = TERMUX_PACKAGE_NAME + ".window"; // Default: "com.termux.window"
+
+    public static final String TERMUX_STYLING_APP_NAME = "Termux:Styling"; // Default: "Termux:Styling"
+    public static final String TERMUX_STYLING_PACKAGE_NAME = TERMUX_PACKAGE_NAME + ".styling"; // Default: "com.termux.styling"
+
+    public static final String TERMUX_TASKER_APP_NAME = "Termux:Tasker"; // Default: "Termux:Tasker"
+    public static final String TERMUX_TASKER_PACKAGE_NAME = TERMUX_PACKAGE_NAME + ".tasker"; // Default: "com.termux.tasker"
+
+    public static final String TERMUX_WIDGET_APP_NAME = "Termux:Widget"; // Default: "Termux:Widget"
+    public static final String TERMUX_WIDGET_PACKAGE_NAME = TERMUX_PACKAGE_NAME + ".widget"; // Default: "com.termux.widget"
+
+
+
+    /**
+     * Termux app core paths.
+     */
+
+    @SuppressLint("SdCardPath")
+    public static final String FILES_PATH = "/data/data/" + TERMUX_PACKAGE_NAME + "/files"; // Default: "/data/data/com.termux/files"
+    public static final String PREFIX_PATH = FILES_PATH + "/usr"; // Termux $PREFIX path. Default: "/data/data/com.termux/files/usr"
+    public static final String HOME_PATH = FILES_PATH + "/home"; // Termux $HOME path. Default: "/data/data/com.termux/files/home"
+    public static final String DATA_HOME_PATH = HOME_PATH + "/.termux"; // Default: "/data/data/com.termux/files/home/.termux"
+    public static final String CONFIG_HOME_PATH = HOME_PATH + "/.config/termux"; // Default: "/data/data/com.termux/files/home/.config/termux"
+
+
+
+    /**
+     * Termux app plugin specific paths.
+     */
+
+    // Path to store scripts to be run at boot by Termux:Boot
+    public static final String BOOT_SCRIPTS_PATH = DATA_HOME_PATH + "/boot"; // Default: "/data/data/com.termux/files/home/.termux/boot"
+
+    // Path to store foreground scripts that can be run by the termux launcher widget provided by Termux:Widget
+    public static final String SHORTCUT_SCRIPTS_PATH = DATA_HOME_PATH + "/shortcuts"; // Default: "/data/data/com.termux/files/home/.termux/shortcuts"
+
+    // Path to store background scripts that can be run by the termux launcher widget provided by Termux:Widget
+    public static final String SHORTCUT_TASKS_SCRIPTS_PATH = DATA_HOME_PATH + "/shortcuts/tasks"; // Default: "/data/data/com.termux/files/home/.termux/shortcuts/tasks"
+
+    // Path to store scripts to be run by 3rd party twofortyfouram locale plugin host apps like Tasker app via the Termux:Tasker plugin client
+    public static final String TASKER_SCRIPTS_PATH = DATA_HOME_PATH + "/tasker"; // Default: "/data/data/com.termux/files/home/.termux/tasker"
+
+    // Termux app termux.properties primary path
+    public static final String TERMUX_PROPERTIES_PRIMARY_PATH = DATA_HOME_PATH + "/termux.properties"; // Default: "/data/data/com.termux/files/home/.termux/termux.properties"
+
+    // Termux app termux.properties secondary path
+    public static final String TERMUX_PROPERTIES_SECONDARY_PATH = CONFIG_HOME_PATH + "/termux.properties"; // Default: "/data/data/com.termux/files/home/.config/termux/termux.properties"
+
+    // Termux app and Termux:Styling colors.properties path
+    public static final String COLOR_PROPERTIES_PATH = DATA_HOME_PATH + "/colors.properties"; // Default: "/data/data/com.termux/files/home/.termux/colors.properties"
+
+    // Termux app and Termux:Styling font.ttf path
+    public static final String FONT_PATH = DATA_HOME_PATH + "/font.ttf"; // Default: "/data/data/com.termux/files/home/.termux/font.ttf"
+
+
+
+    /**
+     * Termux app plugin specific path File objects.
+     */
+
+    public static final File FILES_DIR = new File(FILES_PATH);
+    public static final File PREFIX_DIR = new File(PREFIX_PATH);
+    public static final File HOME_DIR = new File(HOME_PATH);
+    public static final File DATA_HOME_DIR = new File(DATA_HOME_PATH);
+    public static final File CONFIG_HOME_DIR = new File(CONFIG_HOME_PATH);
+    public static final File BOOT_SCRIPTS_DIR = new File(BOOT_SCRIPTS_PATH);
+    public static final File SHORTCUT_SCRIPTS_DIR = new File(SHORTCUT_SCRIPTS_PATH);
+    public static final File SHORTCUT_TASKS_SCRIPTS_DIR = new File(SHORTCUT_TASKS_SCRIPTS_PATH);
+    public static final File TASKER_SCRIPTS_DIR = new File(TASKER_SCRIPTS_PATH);
+
+
+
+    // Android OS permission declared by Termux app in AndroidManifest.xml which can be requested by 3rd party apps to run various commands in Termux app context
+    public static final String PERMISSION_RUN_COMMAND = TERMUX_PACKAGE_NAME + ".permission.RUN_COMMAND"; // Default: "com.termux.permission.RUN_COMMAND"
+
+    // Termux property defined in termux.properties file as a secondary check to PERMISSION_RUN_COMMAND to allow 3rd party apps to run various commands in Termux app context
+    public static final String PROP_ALLOW_EXTERNAL_APPS = "allow-external-apps"; // Default: "allow-external-apps"
+    public static final String PROP_DEFAULT_VALUE_ALLOW_EXTERNAL_APPS = "false"; // Default: "false"
+
+
+    /**
+     * Termux app constants.
+     */
+
+    public static final class TERMUX_APP {
+
+        /**
+         * Termux app core activity.
+         */
+
+        public static final String TERMUX_ACTIVITY_NAME = TERMUX_PACKAGE_NAME + ".app.TermuxActivity"; // Default: "com.termux.app.TermuxActivity"
+        public static final class TERMUX_ACTIVITY {
+
+            // Intent action to start termux failsafe session
+            public static final String ACTION_FAILSAFE_SESSION = TermuxConstants.TERMUX_PACKAGE_NAME + ".app.failsafe_session"; // Default: "com.termux.app.failsafe_session"
+
+            // Intent action to make termux reload its termux session styling
+            public static final String ACTION_RELOAD_STYLE = TermuxConstants.TERMUX_PACKAGE_NAME + ".app.reload_style"; // Default: "com.termux.app.reload_style"
+            // Intent extra for what to reload for the TERMUX_ACTIVITY.ACTION_RELOAD_STYLE intent
+            public static final String EXTRA_RELOAD_STYLE = TermuxConstants.TERMUX_PACKAGE_NAME + ".app.reload_style"; // Default: "com.termux.app.reload_style"
+
+        }
+
+
+
+        /**
+         * Termux app core service.
+         */
+
+        public static final String TERMUX_SERVICE_NAME = TERMUX_PACKAGE_NAME + ".app.TermuxService"; // Default: "com.termux.app.TermuxService"
+        public static final class TERMUX_SERVICE {
+
+            // Intent action to stop TERMUX_SERVICE
+            public static final String ACTION_STOP_SERVICE = TERMUX_PACKAGE_NAME + ".service_stop"; // Default: "com.termux.service_stop"
+
+            // Intent action to make TERMUX_SERVICE acquire a wakelock
+            public static final String ACTION_WAKE_LOCK = TERMUX_PACKAGE_NAME + ".service_wake_lock"; // Default: "com.termux.service_wake_lock"
+
+            // Intent action to make TERMUX_SERVICE release wakelock
+            public static final String ACTION_WAKE_UNLOCK = TERMUX_PACKAGE_NAME + ".service_wake_unlock"; // Default: "com.termux.service_wake_unlock"
+
+            // Intent action to execute command with TERMUX_SERVICE
+            public static final String ACTION_SERVICE_EXECUTE = TERMUX_PACKAGE_NAME + ".service_execute"; // Default: "com.termux.service_execute"
+            // Uri scheme for paths sent via intent to TERMUX_SERVICE
+            public static final String URI_SCHEME_SERVICE_EXECUTE = TERMUX_PACKAGE_NAME + ".file"; // Default: "com.termux.file"
+            // Intent extra for command arguments for the TERMUX_SERVICE.ACTION_SERVICE_EXECUTE intent
+            public static final String EXTRA_ARGUMENTS = TERMUX_PACKAGE_NAME + ".execute.arguments"; // Default: "com.termux.execute.arguments"
+            // Intent extra for command current working directory for the TERMUX_SERVICE.ACTION_SERVICE_EXECUTE intent
+            public static final String EXTRA_WORKDIR = TERMUX_PACKAGE_NAME + ".execute.cwd"; // Default: "com.termux.execute.cwd"
+            // Intent extra for command background mode for the TERMUX_SERVICE.ACTION_SERVICE_EXECUTE intent
+            public static final String EXTRA_BACKGROUND = TERMUX_PACKAGE_NAME + ".execute.background"; // Default: "com.termux.execute.background"
+
+        }
+
+
+
+        /**
+         * Termux app service to receive commands sent by 3rd party apps.
+         */
+
+        public static final String RUN_COMMAND_SERVICE_NAME = TERMUX_PACKAGE_NAME + ".app.RunCommandService"; // Termux app service to receive commands from 3rd party apps "com.termux.app.RunCommandService"
+        public static final class RUN_COMMAND_SERVICE {
+
+            // Intent action to execute command with RUN_COMMAND_SERVICE
+            public static final String ACTION_RUN_COMMAND = TERMUX_PACKAGE_NAME + ".RUN_COMMAND"; // Default: "com.termux.RUN_COMMAND"
+            // Intent extra for command path for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent
+            public static final String EXTRA_COMMAND_PATH = TERMUX_PACKAGE_NAME + ".RUN_COMMAND_PATH"; // Default: "com.termux.RUN_COMMAND_PATH"
+            // Intent extra for command arguments for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent
+            public static final String EXTRA_ARGUMENTS = TERMUX_PACKAGE_NAME + ".RUN_COMMAND_ARGUMENTS"; // Default: "com.termux.RUN_COMMAND_ARGUMENTS"
+            // Intent extra for command current working directory for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent
+            public static final String EXTRA_WORKDIR = TERMUX_PACKAGE_NAME + ".RUN_COMMAND_WORKDIR"; // Default: "com.termux.RUN_COMMAND_WORKDIR"
+            // Intent extra for command background mode for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent
+            public static final String EXTRA_BACKGROUND = TERMUX_PACKAGE_NAME + ".RUN_COMMAND_BACKGROUND"; // Default: "com.termux.RUN_COMMAND_BACKGROUND"
+
+        }
+    }
+
+
+
+    /**
+     * Termux:Styling app constants.
+     */
+
+    public static final class TERMUX_STYLING {
+
+        /**
+         * Termux:Styling app core activity constants.
+         */
+
+        public static final String TERMUX_STYLING_ACTIVITY_NAME = TERMUX_STYLING_PACKAGE_NAME + ".TermuxStyleActivity"; // Default: "com.termux.styling.TermuxStyleActivity"
+
+    }
+
+}
diff --git a/app/src/main/java/com/termux/app/TermuxInstaller.java b/app/src/main/java/com/termux/app/TermuxInstaller.java
index 6e50b22dd6..390eff1208 100644
--- a/app/src/main/java/com/termux/app/TermuxInstaller.java
+++ b/app/src/main/java/com/termux/app/TermuxInstaller.java
@@ -58,7 +58,7 @@ static void setupIfNeeded(final Activity activity, final Runnable whenDone) {
             return;
         }
 
-        final File PREFIX_FILE = new File(TermuxService.PREFIX_PATH);
+        final File PREFIX_FILE = new File(TermuxConstants.PREFIX_PATH);
         if (PREFIX_FILE.isDirectory()) {
             whenDone.run();
             return;
@@ -69,7 +69,7 @@ static void setupIfNeeded(final Activity activity, final Runnable whenDone) {
             @Override
             public void run() {
                 try {
-                    final String STAGING_PREFIX_PATH = TermuxService.FILES_PATH + "/usr-staging";
+                    final String STAGING_PREFIX_PATH = TermuxConstants.FILES_PATH + "/usr-staging";
                     final File STAGING_PREFIX_FILE = new File(STAGING_PREFIX_PATH);
 
                     if (STAGING_PREFIX_FILE.exists()) {
@@ -194,7 +194,7 @@ static void setupStorageSymlinks(final Context context) {
         new Thread() {
             public void run() {
                 try {
-                    File storageDir = new File(TermuxService.HOME_PATH, "storage");
+                    File storageDir = new File(TermuxConstants.HOME_PATH, "storage");
 
                     if (storageDir.exists()) {
                         try {
diff --git a/app/src/main/java/com/termux/app/TermuxOpenReceiver.java b/app/src/main/java/com/termux/app/TermuxOpenReceiver.java
index 6b8bf227b6..26f5fec98b 100644
--- a/app/src/main/java/com/termux/app/TermuxOpenReceiver.java
+++ b/app/src/main/java/com/termux/app/TermuxOpenReceiver.java
@@ -178,7 +178,7 @@ public ParcelFileDescriptor openFile(@NonNull Uri uri, @NonNull String mode) thr
                 String path = file.getCanonicalPath();
                 String storagePath = Environment.getExternalStorageDirectory().getCanonicalPath();
                 // See https://support.google.com/faqs/answer/7496913:
-                if (!(path.startsWith(TermuxService.FILES_PATH) || path.startsWith(storagePath))) {
+                if (!(path.startsWith(TermuxConstants.FILES_PATH) || path.startsWith(storagePath))) {
                     throw new IllegalArgumentException("Invalid path: " + path);
                 }
             } catch (IOException e) {
diff --git a/app/src/main/java/com/termux/app/TermuxPreferences.java b/app/src/main/java/com/termux/app/TermuxPreferences.java
index d3df7fc335..f4187eef79 100644
--- a/app/src/main/java/com/termux/app/TermuxPreferences.java
+++ b/app/src/main/java/com/termux/app/TermuxPreferences.java
@@ -170,9 +170,9 @@ static TerminalSession getCurrentSession(TermuxActivity context) {
     }
 
     void reloadFromProperties(Context context) {
-        File propsFile = new File(TermuxService.HOME_PATH + "/.termux/termux.properties");
+        File propsFile = new File(TermuxConstants.TERMUX_PROPERTIES_PRIMARY_PATH);
         if (!propsFile.exists())
-            propsFile = new File(TermuxService.HOME_PATH + "/.config/termux/termux.properties");
+            propsFile = new File(TermuxConstants.TERMUX_PROPERTIES_SECONDARY_PATH);
 
         Properties props = new Properties();
         try {
@@ -213,12 +213,12 @@ void reloadFromProperties(Context context) {
         mUseFullScreen = "true".equals(props.getProperty("fullscreen", "false").toLowerCase());
         mUseFullScreenWorkAround = "true".equals(props.getProperty("use-fullscreen-workaround", "false").toLowerCase());
 
-        mDefaultWorkingDir = props.getProperty("default-working-directory", TermuxService.HOME_PATH);
+        mDefaultWorkingDir = props.getProperty("default-working-directory", TermuxConstants.HOME_PATH);
         File workDir = new File(mDefaultWorkingDir);
         if (!workDir.exists() || !workDir.isDirectory()) {
             // Fallback to home directory if user configured working directory is not exist
             // or is a regular file.
-            mDefaultWorkingDir = TermuxService.HOME_PATH;
+            mDefaultWorkingDir = TermuxConstants.HOME_PATH;
         }
 
         String defaultExtraKeys = "[[ESC, TAB, CTRL, ALT, {key: '-', popup: '|'}, DOWN, UP]]";
diff --git a/app/src/main/java/com/termux/app/TermuxService.java b/app/src/main/java/com/termux/app/TermuxService.java
index 3cb714fa18..854659dca4 100644
--- a/app/src/main/java/com/termux/app/TermuxService.java
+++ b/app/src/main/java/com/termux/app/TermuxService.java
@@ -22,6 +22,8 @@
 import android.widget.ArrayAdapter;
 
 import com.termux.R;
+import com.termux.app.TermuxConstants.TERMUX_APP.TERMUX_ACTIVITY;
+import com.termux.app.TermuxConstants.TERMUX_APP.TERMUX_SERVICE;
 import com.termux.terminal.EmulatorDebug;
 import com.termux.terminal.TerminalSession;
 import com.termux.terminal.TerminalSession.SessionChangedCallback;
@@ -45,26 +47,8 @@
 public final class TermuxService extends Service implements SessionChangedCallback {
 
     private static final String NOTIFICATION_CHANNEL_ID = "termux_notification_channel";
-
-    /** Note that this is a symlink on the Android M preview. */
-    @SuppressLint("SdCardPath")
-    public static final String FILES_PATH = "/data/data/com.termux/files";
-    public static final String PREFIX_PATH = FILES_PATH + "/usr";
-    public static final String HOME_PATH = FILES_PATH + "/home";
-
     private static final int NOTIFICATION_ID = 1337;
 
-    private static final String ACTION_STOP_SERVICE = "com.termux.service_stop";
-    private static final String ACTION_LOCK_WAKE = "com.termux.service_wake_lock";
-    private static final String ACTION_UNLOCK_WAKE = "com.termux.service_wake_unlock";
-    /** Intent action to launch a new terminal session. Executed from TermuxWidgetProvider. */
-    public static final String ACTION_EXECUTE = "com.termux.service_execute";
-
-    public static final String EXTRA_ARGUMENTS = "com.termux.execute.arguments";
-
-    public static final String EXTRA_CURRENT_WORKING_DIRECTORY = "com.termux.execute.cwd";
-    public static final String EXTRA_EXECUTE_IN_BACKGROUND = "com.termux.execute.background";
-
     /** This service is only bound from inside the same process and never uses IPC. */
     class LocalBinder extends Binder {
         public final TermuxService service = TermuxService.this;
@@ -91,19 +75,19 @@ class LocalBinder extends Binder {
     private PowerManager.WakeLock mWakeLock;
     private WifiManager.WifiLock mWifiLock;
 
-    /** If the user has executed the {@link #ACTION_STOP_SERVICE} intent. */
+    /** If the user has executed the {@link TermuxConstants.TERMUX_APP.TERMUX_SERVICE#ACTION_STOP_SERVICE} intent. */
     boolean mWantsToStop = false;
 
     @SuppressLint("Wakelock")
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
         String action = intent.getAction();
-        if (ACTION_STOP_SERVICE.equals(action)) {
+        if (TERMUX_SERVICE.ACTION_STOP_SERVICE.equals(action)) {
             mWantsToStop = true;
             for (int i = 0; i < mTerminalSessions.size(); i++)
                 mTerminalSessions.get(i).finishIfRunning();
             stopSelf();
-        } else if (ACTION_LOCK_WAKE.equals(action)) {
+        } else if (TERMUX_SERVICE.ACTION_WAKE_LOCK.equals(action)) {
             if (mWakeLock == null) {
                 PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
                 mWakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, EmulatorDebug.LOG_TAG + ":service-wakelock");
@@ -130,7 +114,7 @@ public int onStartCommand(Intent intent, int flags, int startId) {
 
                 updateNotification();
             }
-        } else if (ACTION_UNLOCK_WAKE.equals(action)) {
+        } else if (TERMUX_SERVICE.ACTION_WAKE_UNLOCK.equals(action)) {
             if (mWakeLock != null) {
                 mWakeLock.release();
                 mWakeLock = null;
@@ -140,19 +124,19 @@ public int onStartCommand(Intent intent, int flags, int startId) {
 
                 updateNotification();
             }
-        } else if (ACTION_EXECUTE.equals(action)) {
+        } else if (TERMUX_SERVICE.ACTION_SERVICE_EXECUTE.equals(action)) {
             Uri executableUri = intent.getData();
             String executablePath = (executableUri == null ? null : executableUri.getPath());
 
-            String[] arguments = (executableUri == null ? null : intent.getStringArrayExtra(EXTRA_ARGUMENTS));
-            String cwd = intent.getStringExtra(EXTRA_CURRENT_WORKING_DIRECTORY);
+            String[] arguments = (executableUri == null ? null : intent.getStringArrayExtra(TERMUX_SERVICE.EXTRA_ARGUMENTS));
+            String cwd = intent.getStringExtra(TERMUX_SERVICE.EXTRA_WORKDIR);
 
-            if (intent.getBooleanExtra(EXTRA_EXECUTE_IN_BACKGROUND, false)) {
+            if (intent.getBooleanExtra(TERMUX_SERVICE.EXTRA_BACKGROUND, false)) {
                 BackgroundJob task = new BackgroundJob(cwd, executablePath, arguments, this, intent.getParcelableExtra("pendingIntent"));
                 mBackgroundTasks.add(task);
                 updateNotification();
             } else {
-                boolean failsafe = intent.getBooleanExtra(TermuxActivity.TERMUX_FAILSAFE_SESSION_ACTION, false);
+                boolean failsafe = intent.getBooleanExtra(TERMUX_ACTIVITY.ACTION_FAILSAFE_SESSION, false);
                 TerminalSession newSession = createTermSession(executablePath, arguments, cwd, failsafe);
 
                 // Transform executable path to session name, e.g. "/bin/do-something.sh" => "do something.sh".
@@ -238,10 +222,10 @@ private Notification buildNotification() {
         }
 
         Resources res = getResources();
-        Intent exitIntent = new Intent(this, TermuxService.class).setAction(ACTION_STOP_SERVICE);
+        Intent exitIntent = new Intent(this, TermuxService.class).setAction(TERMUX_SERVICE.ACTION_STOP_SERVICE);
         builder.addAction(android.R.drawable.ic_delete, res.getString(R.string.notification_action_exit), PendingIntent.getService(this, 0, exitIntent, 0));
 
-        String newWakeAction = wakeLockHeld ? ACTION_UNLOCK_WAKE : ACTION_LOCK_WAKE;
+        String newWakeAction = wakeLockHeld ? TERMUX_SERVICE.ACTION_WAKE_UNLOCK : TERMUX_SERVICE.ACTION_WAKE_LOCK;
         Intent toggleWakeLockIntent = new Intent(this, TermuxService.class).setAction(newWakeAction);
         String actionTitle = res.getString(wakeLockHeld ?
             R.string.notification_action_wake_unlock :
@@ -254,7 +238,7 @@ private Notification buildNotification() {
 
     @Override
     public void onDestroy() {
-        File termuxTmpDir = new File(TermuxService.PREFIX_PATH + "/tmp");
+        File termuxTmpDir = new File(TermuxConstants.PREFIX_PATH + "/tmp");
 
         if (termuxTmpDir.exists()) {
             try {
@@ -280,9 +264,9 @@ public List<TerminalSession> getSessions() {
     }
 
     TerminalSession createTermSession(String executablePath, String[] arguments, String cwd, boolean failSafe) {
-        new File(HOME_PATH).mkdirs();
+        new File(TermuxConstants.HOME_PATH).mkdirs();
 
-        if (cwd == null || cwd.isEmpty()) cwd = HOME_PATH;
+        if (cwd == null || cwd.isEmpty()) cwd = TermuxConstants.HOME_PATH;
 
         String[] env = BackgroundJob.buildEnvironment(failSafe, cwd);
         boolean isLoginShell = false;
@@ -290,7 +274,7 @@ TerminalSession createTermSession(String executablePath, String[] arguments, Str
         if (executablePath == null) {
             if (!failSafe) {
                 for (String shellBinary : new String[]{"login", "bash", "zsh"}) {
-                    File shellFile = new File(PREFIX_PATH + "/bin/" + shellBinary);
+                    File shellFile = new File(TermuxConstants.PREFIX_PATH + "/bin/" + shellBinary);
                     if (shellFile.canExecute()) {
                         executablePath = shellFile.getAbsolutePath();
                         break;
@@ -320,8 +304,8 @@ TerminalSession createTermSession(String executablePath, String[] arguments, Str
         updateNotification();
 
         // Make sure that terminal styling is always applied.
-        Intent stylingIntent = new Intent("com.termux.app.reload_style");
-        stylingIntent.putExtra("com.termux.app.reload_style", "styling");
+        Intent stylingIntent = new Intent(TERMUX_ACTIVITY.ACTION_RELOAD_STYLE);
+        stylingIntent.putExtra(TERMUX_ACTIVITY.EXTRA_RELOAD_STYLE, "styling");
         sendBroadcast(stylingIntent);
 
         return session;
diff --git a/app/src/main/java/com/termux/filepicker/TermuxDocumentsProvider.java b/app/src/main/java/com/termux/filepicker/TermuxDocumentsProvider.java
index b72442ac27..1a314e8ced 100644
--- a/app/src/main/java/com/termux/filepicker/TermuxDocumentsProvider.java
+++ b/app/src/main/java/com/termux/filepicker/TermuxDocumentsProvider.java
@@ -12,7 +12,7 @@
 import android.webkit.MimeTypeMap;
 
 import com.termux.R;
-import com.termux.app.TermuxService;
+import com.termux.app.TermuxConstants;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -35,7 +35,7 @@ public class TermuxDocumentsProvider extends DocumentsProvider {
 
     private static final String ALL_MIME_TYPES = "*/*";
 
-    private static final File BASE_DIR = new File(TermuxService.HOME_PATH);
+    private static final File BASE_DIR = new File(TermuxConstants.HOME_PATH);
 
 
     // The default columns to return information about a root if no specific
@@ -171,7 +171,7 @@ public Cursor querySearchDocuments(String rootId, String query, String[] project
             // through the whole SD card).
             boolean isInsideHome;
             try {
-                isInsideHome = file.getCanonicalPath().startsWith(TermuxService.HOME_PATH);
+                isInsideHome = file.getCanonicalPath().startsWith(TermuxConstants.HOME_PATH);
             } catch (IOException e) {
                 isInsideHome = true;
             }
diff --git a/app/src/main/java/com/termux/filepicker/TermuxFileReceiverActivity.java b/app/src/main/java/com/termux/filepicker/TermuxFileReceiverActivity.java
index e1ef5d423f..c5493ae75f 100644
--- a/app/src/main/java/com/termux/filepicker/TermuxFileReceiverActivity.java
+++ b/app/src/main/java/com/termux/filepicker/TermuxFileReceiverActivity.java
@@ -11,6 +11,8 @@
 
 import com.termux.R;
 import com.termux.app.DialogUtils;
+import com.termux.app.TermuxConstants;
+import com.termux.app.TermuxConstants.TERMUX_APP.TERMUX_SERVICE;
 import com.termux.app.TermuxService;
 
 import java.io.ByteArrayInputStream;
@@ -25,9 +27,9 @@
 
 public class TermuxFileReceiverActivity extends Activity {
 
-    static final String TERMUX_RECEIVEDIR = TermuxService.FILES_PATH + "/home/downloads";
-    static final String EDITOR_PROGRAM = TermuxService.HOME_PATH + "/bin/termux-file-editor";
-    static final String URL_OPENER_PROGRAM = TermuxService.HOME_PATH + "/bin/termux-url-opener";
+    static final String TERMUX_RECEIVEDIR = TermuxConstants.FILES_PATH + "/home/downloads";
+    static final String EDITOR_PROGRAM = TermuxConstants.HOME_PATH + "/bin/termux-file-editor";
+    static final String URL_OPENER_PROGRAM = TermuxConstants.HOME_PATH + "/bin/termux-url-opener";
 
     /**
      * If the activity should be finished when the name input dialog is dismissed. This is disabled
@@ -131,17 +133,17 @@ void promptNameAndSave(final InputStream in, final String attachmentFileName) {
 
             final Uri scriptUri = new Uri.Builder().scheme("file").path(EDITOR_PROGRAM).build();
 
-            Intent executeIntent = new Intent(TermuxService.ACTION_EXECUTE, scriptUri);
+            Intent executeIntent = new Intent(TERMUX_SERVICE.ACTION_SERVICE_EXECUTE, scriptUri);
             executeIntent.setClass(TermuxFileReceiverActivity.this, TermuxService.class);
-            executeIntent.putExtra(TermuxService.EXTRA_ARGUMENTS, new String[]{outFile.getAbsolutePath()});
+            executeIntent.putExtra(TERMUX_SERVICE.EXTRA_ARGUMENTS, new String[]{outFile.getAbsolutePath()});
             startService(executeIntent);
             finish();
         },
             R.string.file_received_open_folder_button, text -> {
                 if (saveStreamWithName(in, text) == null) return;
 
-                Intent executeIntent = new Intent(TermuxService.ACTION_EXECUTE);
-                executeIntent.putExtra(TermuxService.EXTRA_CURRENT_WORKING_DIRECTORY, TERMUX_RECEIVEDIR);
+                Intent executeIntent = new Intent(TERMUX_SERVICE.ACTION_SERVICE_EXECUTE);
+                executeIntent.putExtra(TERMUX_SERVICE.EXTRA_WORKDIR, TERMUX_RECEIVEDIR);
                 executeIntent.setClass(TermuxFileReceiverActivity.this, TermuxService.class);
                 startService(executeIntent);
                 finish();
@@ -188,9 +190,9 @@ void handleUrlAndFinish(final String url) {
 
         final Uri urlOpenerProgramUri = new Uri.Builder().scheme("file").path(URL_OPENER_PROGRAM).build();
 
-        Intent executeIntent = new Intent(TermuxService.ACTION_EXECUTE, urlOpenerProgramUri);
+        Intent executeIntent = new Intent(TERMUX_SERVICE.ACTION_SERVICE_EXECUTE, urlOpenerProgramUri);
         executeIntent.setClass(TermuxFileReceiverActivity.this, TermuxService.class);
-        executeIntent.putExtra(TermuxService.EXTRA_ARGUMENTS, new String[]{url});
+        executeIntent.putExtra(TERMUX_SERVICE.EXTRA_ARGUMENTS, new String[]{url});
         startService(executeIntent);
         finish();
     }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 50e0283efe..a34c5d110d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,9 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE resources [
+    <!ENTITY TERMUX_PACKAGE_NAME "com.termux">
+    <!ENTITY TERMUX_APP_NAME "Termux">
+    <!ENTITY TERMUX_API_APP_NAME "Termux:API">
+    <!ENTITY TERMUX_BOOT_APP_NAME "Termux:Boot">
+    <!ENTITY TERMUX_FLOAT_APP_NAME "Termux:Float">
+    <!ENTITY TERMUX_STYLING_APP_NAME "Termux:Styling">
+    <!ENTITY TERMUX_TASKER_APP_NAME "Termux:Tasker">
+    <!ENTITY TERMUX_WIDGET_APP_NAME "Termux:Widget">
+    ]>
+
 <resources>
-    <string name="application_name">Termux</string>
-    <string name="shared_user_label">Termux user</string>
-    <string name="run_command_permission_label">Run commands in Termux environment</string>
-    <string name="run_command_permission_description">execute arbitrary commands within Termux environment</string>
+    <string name="application_name">&TERMUX_APP_NAME;</string>
+    <string name="shared_user_label">&TERMUX_APP_NAME; user</string>
+    <string name="run_command_permission_label">Run commands in &TERMUX_APP_NAME; environment</string>
+    <string name="run_command_permission_description">execute arbitrary commands within &TERMUX_APP_NAME; environment</string>
     <string name="new_session">New session</string>
     <string name="new_session_failsafe">Failsafe</string>
     <string name="toggle_soft_keyboard">Keyboard</string>
@@ -16,10 +28,10 @@
 
     <string name="bootstrap_installer_body">Installing…</string>
     <string name="bootstrap_error_title">Unable to install</string>
-    <string name="bootstrap_error_body">Termux was unable to install the bootstrap packages.</string>
+    <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 can only be installed on the primary user account.</string>
+    <string name="bootstrap_error_not_primary_user_message">&TERMUX_APP_NAME; can only be installed on the primary user account.</string>
 
     <string name="max_terminals_reached_title">Max terminals reached</string>
     <string name="max_terminals_reached_message">Close down existing ones before creating new.</string>
@@ -41,7 +53,7 @@
     <string name="session_new_named_title">New named session</string>
     <string name="session_new_named_positive_button">Create</string>
 
-    <string name="styling_not_installed">The Termux:Style add-on is not installed.</string>
+    <string name="styling_not_installed">The &TERMUX_STYLING_APP_NAME; Plugin App is not installed.</string>
     <string name="styling_install">Install</string>
 
     <string name="notification_action_exit">Exit</string>
diff --git a/app/src/main/res/xml/shortcuts.xml b/app/src/main/res/xml/shortcuts.xml
index ae2e42f100..dfdab62a91 100644
--- a/app/src/main/res/xml/shortcuts.xml
+++ b/app/src/main/res/xml/shortcuts.xml
@@ -1,6 +1,14 @@
 <shortcuts xmlns:tools="http://schemas.android.com/tools"
            xmlns:android="http://schemas.android.com/apk/res/android">
 
+    <!--
+        For shortcut.xml:
+        If applicationId in build.gradle is changed from "com.termux", then targetPackage will
+        need to be manually patched since ${applicationId} variable or resource string does not work.
+        If package name in AndroidManifest is changed from "com.termux", then targetClass will
+        need to be manually patched since dot (.) prefix does not work to automatically prefix the
+        package name.
+    -->
     <shortcut
         android:shortcutId="new_session"
         android:enabled="true"

From 324a69f7fa4e7c81892086d3819da49f2deb905f Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 10 Mar 2021 02:32:33 +0500
Subject: [PATCH 218/912] Move terminal input related classed to
 com.termux.app.input package

---
 .../java/com/termux/app/TermuxActivity.java   |  5 +-
 .../java/com/termux/app/TermuxViewClient.java |  1 +
 .../{BellUtil.java => input/BellHandler.java} | 12 +--
 .../app/{ => input}/FullScreenWorkAround.java | 10 +-
 .../termux/app/input/KeyboardShortcut.java    | 13 +++
 .../app/input/extrakeys/ExtraKeyButton.java   | 92 ++++++++++++++++++
 .../extrakeys/ExtraKeysInfo.java}             | 97 +------------------
 .../{ => input/extrakeys}/ExtraKeysView.java  | 13 ++-
 app/src/main/res/layout/extra_keys_main.xml   |  2 +-
 9 files changed, 138 insertions(+), 107 deletions(-)
 rename app/src/main/java/com/termux/app/{BellUtil.java => input/BellHandler.java} (81%)
 rename app/src/main/java/com/termux/app/{ => input}/FullScreenWorkAround.java (91%)
 create mode 100644 app/src/main/java/com/termux/app/input/KeyboardShortcut.java
 create mode 100644 app/src/main/java/com/termux/app/input/extrakeys/ExtraKeyButton.java
 rename app/src/main/java/com/termux/app/{ExtraKeysInfos.java => input/extrakeys/ExtraKeysInfo.java} (77%)
 rename app/src/main/java/com/termux/app/{ => input/extrakeys}/ExtraKeysView.java (96%)

diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index a6e1d985ea..292cdf9ede 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -48,6 +48,9 @@
 
 import com.termux.R;
 import com.termux.app.TermuxConstants.TERMUX_APP.TERMUX_ACTIVITY;
+import com.termux.app.input.BellHandler;
+import com.termux.app.input.extrakeys.ExtraKeysView;
+import com.termux.app.input.FullScreenWorkAround;
 import com.termux.terminal.EmulatorDebug;
 import com.termux.terminal.TerminalColors;
 import com.termux.terminal.TerminalSession;
@@ -455,7 +458,7 @@ public void onBell(TerminalSession session) {
                         mBellSoundPool.play(mBellSoundId, 1.f, 1.f, 1, 0, 1.f);
                         break;
                     case TermuxPreferences.BELL_VIBRATE:
-                        BellUtil.getInstance(TermuxActivity.this).doBell();
+                        BellHandler.getInstance(TermuxActivity.this).doBell();
                         break;
                     case TermuxPreferences.BELL_IGNORE:
                         // Ignore the bell character.
diff --git a/app/src/main/java/com/termux/app/TermuxViewClient.java b/app/src/main/java/com/termux/app/TermuxViewClient.java
index ec962a888d..3e92c933d5 100644
--- a/app/src/main/java/com/termux/app/TermuxViewClient.java
+++ b/app/src/main/java/com/termux/app/TermuxViewClient.java
@@ -8,6 +8,7 @@
 import android.view.MotionEvent;
 import android.view.inputmethod.InputMethodManager;
 
+import com.termux.app.input.extrakeys.ExtraKeysView;
 import com.termux.terminal.KeyHandler;
 import com.termux.terminal.TerminalEmulator;
 import com.termux.terminal.TerminalSession;
diff --git a/app/src/main/java/com/termux/app/BellUtil.java b/app/src/main/java/com/termux/app/input/BellHandler.java
similarity index 81%
rename from app/src/main/java/com/termux/app/BellUtil.java
rename to app/src/main/java/com/termux/app/input/BellHandler.java
index 666124ceb7..0610971ecd 100644
--- a/app/src/main/java/com/termux/app/BellUtil.java
+++ b/app/src/main/java/com/termux/app/input/BellHandler.java
@@ -1,4 +1,4 @@
-package com.termux.app;
+package com.termux.app.input;
 
 import android.content.Context;
 import android.os.Handler;
@@ -6,15 +6,15 @@
 import android.os.SystemClock;
 import android.os.Vibrator;
 
-public class BellUtil {
-    private static BellUtil instance = null;
+public class BellHandler {
+    private static BellHandler instance = null;
     private static final Object lock = new Object();
 
-    public static BellUtil getInstance(Context context) {
+    public static BellHandler getInstance(Context context) {
         if (instance == null) {
             synchronized (lock) {
                 if (instance == null) {
-                    instance = new BellUtil((Vibrator) context.getApplicationContext().getSystemService(Context.VIBRATOR_SERVICE));
+                    instance = new BellHandler((Vibrator) context.getApplicationContext().getSystemService(Context.VIBRATOR_SERVICE));
                 }
             }
         }
@@ -29,7 +29,7 @@ public static BellUtil getInstance(Context context) {
     private long lastBell = 0;
     private final Runnable bellRunnable;
 
-    private BellUtil(final Vibrator vibrator) {
+    private BellHandler(final Vibrator vibrator) {
         bellRunnable = new Runnable() {
             @Override
             public void run() {
diff --git a/app/src/main/java/com/termux/app/FullScreenWorkAround.java b/app/src/main/java/com/termux/app/input/FullScreenWorkAround.java
similarity index 91%
rename from app/src/main/java/com/termux/app/FullScreenWorkAround.java
rename to app/src/main/java/com/termux/app/input/FullScreenWorkAround.java
index 006918ee0f..6002f8c897 100644
--- a/app/src/main/java/com/termux/app/FullScreenWorkAround.java
+++ b/app/src/main/java/com/termux/app/input/FullScreenWorkAround.java
@@ -1,9 +1,11 @@
-package com.termux.app;
+package com.termux.app.input;
 
 import android.graphics.Rect;
 import android.view.View;
 import android.view.ViewGroup;
 
+import com.termux.app.TermuxActivity;
+
 /**
  * Work around for fullscreen mode in Termux to fix ExtraKeysView not being visible.
  * This class is derived from:
@@ -13,11 +15,11 @@
  * For more information, see https://issuetracker.google.com/issues/36911528
  */
 public class FullScreenWorkAround {
-    private View mChildOfContent;
+    private final View mChildOfContent;
     private int mUsableHeightPrevious;
-    private ViewGroup.LayoutParams mViewGroupLayoutParams;
+    private final ViewGroup.LayoutParams mViewGroupLayoutParams;
 
-    private int mNavBarHeight;
+    private final int mNavBarHeight;
 
 
     public static void apply(TermuxActivity activity) {
diff --git a/app/src/main/java/com/termux/app/input/KeyboardShortcut.java b/app/src/main/java/com/termux/app/input/KeyboardShortcut.java
new file mode 100644
index 0000000000..7308c94c8a
--- /dev/null
+++ b/app/src/main/java/com/termux/app/input/KeyboardShortcut.java
@@ -0,0 +1,13 @@
+package com.termux.app.input;
+
+public class KeyboardShortcut {
+
+    public final int codePoint;
+    public final int shortcutAction;
+
+    public KeyboardShortcut(int codePoint, int shortcutAction) {
+        this.codePoint = codePoint;
+        this.shortcutAction = shortcutAction;
+    }
+
+}
diff --git a/app/src/main/java/com/termux/app/input/extrakeys/ExtraKeyButton.java b/app/src/main/java/com/termux/app/input/extrakeys/ExtraKeyButton.java
new file mode 100644
index 0000000000..1218ef7812
--- /dev/null
+++ b/app/src/main/java/com/termux/app/input/extrakeys/ExtraKeyButton.java
@@ -0,0 +1,92 @@
+package com.termux.app.input.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 = null;
+
+    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;
+    }
+}
diff --git a/app/src/main/java/com/termux/app/ExtraKeysInfos.java b/app/src/main/java/com/termux/app/input/extrakeys/ExtraKeysInfo.java
similarity index 77%
rename from app/src/main/java/com/termux/app/ExtraKeysInfos.java
rename to app/src/main/java/com/termux/app/input/extrakeys/ExtraKeysInfo.java
index 1274c22441..c71f3b1f40 100644
--- a/app/src/main/java/com/termux/app/ExtraKeysInfos.java
+++ b/app/src/main/java/com/termux/app/input/extrakeys/ExtraKeysInfo.java
@@ -1,31 +1,24 @@
-package com.termux.app;
-
-import android.text.TextUtils;
-
-import androidx.annotation.Nullable;
+package com.termux.app.input.extrakeys;
 
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import java.util.Arrays;
 import java.util.HashMap;
-import java.util.Map;
-import java.util.stream.Collectors;
 
-public class ExtraKeysInfos {
+public class ExtraKeysInfo {
 
     /**
      * Matrix of buttons displayed
      */
-    private ExtraKeyButton[][] buttons;
+    private final ExtraKeyButton[][] buttons;
 
     /**
      * This corresponds to one of the CharMapDisplay below
      */
     private String style = "default";
 
-    public ExtraKeysInfos(String propertiesInfo, String style) throws JSONException {
+    public ExtraKeysInfo(String propertiesInfo, String style) throws JSONException {
         this.style = style;
 
         // Convert String propertiesInfo to Array of Arrays
@@ -151,7 +144,7 @@ static class CharDisplayMap extends CleverMap<String, String> {}
         put("-", "―"); // U+2015 ― HORIZONTAL BAR
     }};
 
-    /**
+    /*
      * Multiple maps are available to quickly change
      * the style of the keys.
      */
@@ -258,83 +251,3 @@ public static String replaceAlias(String key) {
     }
 }
 
-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 String key;
-
-    /**
-     * If the key is a macro, i.e. a sequence of keys separated by space.
-     */
-    private boolean macro;
-
-    /**
-     * The text that will be shown on the button.
-     */
-    private String display;
-
-    /**
-     * The information of the popup (triggered by swipe up).
-     */
-    @Nullable
-    private ExtraKeyButton popup = null;
-
-    public ExtraKeyButton(ExtraKeysInfos.CharDisplayMap charDisplayMap, JSONObject config) throws JSONException {
-        this(charDisplayMap, config, null);
-    }
-
-    public ExtraKeyButton(ExtraKeysInfos.CharDisplayMap charDisplayMap, JSONObject config, 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] = ExtraKeysInfos.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;
-    }
-}
diff --git a/app/src/main/java/com/termux/app/ExtraKeysView.java b/app/src/main/java/com/termux/app/input/extrakeys/ExtraKeysView.java
similarity index 96%
rename from app/src/main/java/com/termux/app/ExtraKeysView.java
rename to app/src/main/java/com/termux/app/input/extrakeys/ExtraKeysView.java
index e475e32a14..92e1c37021 100644
--- a/app/src/main/java/com/termux/app/ExtraKeysView.java
+++ b/app/src/main/java/com/termux/app/input/extrakeys/ExtraKeysView.java
@@ -1,4 +1,4 @@
-package com.termux.app;
+package com.termux.app.input.extrakeys;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -78,6 +78,7 @@ public ExtraKeysView(Context context, AttributeSet attrs) {
         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)) {
@@ -87,7 +88,8 @@ private void sendKey(View view, String keyName, boolean forceCtrlDown, boolean f
             DrawerLayout drawer = view.findViewById(R.id.drawer_layout);
             drawer.openDrawer(Gravity.LEFT);
         } else if (keyCodesForString.containsKey(keyName)) {
-            int keyCode = keyCodesForString.get(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;
@@ -172,6 +174,7 @@ public boolean readSpecialButton(SpecialButton name) {
 
     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);
@@ -187,6 +190,7 @@ void popup(View view, ExtraKeyButton extraButton) {
         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);
@@ -235,7 +239,7 @@ static int maximumLength(Object[][] matrix) {
      * "-_-" will input the string "-_-"
      */
     @SuppressLint("ClickableViewAccessibility")
-    void reload(ExtraKeysInfos infos) {
+    public void reload(ExtraKeysInfo infos) {
         if(infos == null)
             return;
 
@@ -256,6 +260,7 @@ void reload(ExtraKeysInfos infos) {
                 Button button;
                 if(isSpecialButton(buttonInfo)) {
                     button = createSpecialButton(buttonInfo.getKey(), true);
+                    if (button == null) return;
                 } else {
                     button = new Button(getContext(), null, android.R.attr.buttonBarButtonStyle);
                 }
@@ -282,6 +287,7 @@ void reload(ExtraKeysInfos infos) {
                     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);
@@ -343,6 +349,7 @@ void reload(ExtraKeysInfos infos) {
                                     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());
diff --git a/app/src/main/res/layout/extra_keys_main.xml b/app/src/main/res/layout/extra_keys_main.xml
index 45dfab6c03..90584317d2 100644
--- a/app/src/main/res/layout/extra_keys_main.xml
+++ b/app/src/main/res/layout/extra_keys_main.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.termux.app.ExtraKeysView xmlns:android="http://schemas.android.com/apk/res/android"
+<com.termux.app.input.extrakeys.ExtraKeysView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/extra_keys"
     style="?android:attr/buttonBarStyle"
     android:layout_width="match_parent"

From dbf84773d4c6d67dbf2bba005c97d02bd0c7adb5 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 10 Mar 2021 02:33:45 +0500
Subject: [PATCH 219/912] Fix potential null exceptions

---
 .../java/com/termux/app/TermuxActivity.java   | 27 +++++++++++++------
 .../com/termux/terminal/TerminalOutput.java   |  1 +
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index 292cdf9ede..c4b983479c 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -105,8 +105,6 @@ public final class TermuxActivity extends Activity implements ServiceConnection
     private static final String BROADCAST_TERMUX_OPENED = TermuxConstants.TERMUX_PACKAGE_NAME + ".app.OPENED";
 
     /** The main view of the activity showing the terminal. Initialized in onCreate(). */
-    @SuppressWarnings("NullableProblems")
-    @NonNull
     TerminalView mTerminalView;
 
     ExtraKeysView mExtraKeysView;
@@ -366,7 +364,7 @@ void sendOpenedBroadcast() {
         for (ResolveInfo info : matches) {
             Intent explicitBroadcast = new Intent(broadcast);
             ComponentName cname = new ComponentName(info.activityInfo.applicationInfo.packageName,
-                                                    info.activityInfo.name);
+                info.activityInfo.name);
             explicitBroadcast.setComponent(cname);
             sendBroadcast(explicitBroadcast);
         }
@@ -488,7 +486,10 @@ public View getView(int position, View convertView, @NonNull ViewGroup parent) {
                 }
 
                 TerminalSession sessionAtRow = getItem(position);
-                boolean sessionRunning = sessionAtRow.isRunning();
+                if (sessionAtRow == null) return row;
+
+                boolean sessionRunning = false;
+                sessionRunning = sessionAtRow.isRunning();
 
                 TextView firstLineView = row.findViewById(R.id.row_line);
                 if (mIsUsingBlackUI) {
@@ -577,6 +578,7 @@ public void switchToSession(boolean forward) {
 
     @SuppressLint("InflateParams")
     void renameSession(final TerminalSession sessionToRename) {
+        if (sessionToRename == null) return;
         DialogUtils.textInput(this, R.string.session_rename_title, sessionToRename.mSessionName, R.string.session_rename_positive_button, text -> {
             sessionToRename.mSessionName = text;
             mListViewAdapter.notifyDataSetChanged();
@@ -629,6 +631,7 @@ protected void onStop() {
         getDrawer().closeDrawers();
     }
 
+    @SuppressLint("RtlHardcoded")
     @Override
     public void onBackPressed() {
         if (getDrawer().isDrawerOpen(Gravity.LEFT)) {
@@ -825,7 +828,10 @@ static LinkedHashSet<CharSequence> extractUrls(String text) {
     }
 
     void showUrlSelection() {
-        String text = getCurrentTermSession().getEmulator().getScreen().getTranscriptTextWithFullLinesJoined();
+        String text = null;
+        if (getCurrentTermSession() != null) {
+            text = getCurrentTermSession().getEmulator().getScreen().getTranscriptTextWithFullLinesJoined();
+        }
         LinkedHashSet<CharSequence> urlSet = extractUrls(text);
         if (urlSet.isEmpty()) {
             new AlertDialog.Builder(this).setMessage(R.string.select_url_no_found).show();
@@ -896,11 +902,14 @@ public boolean onContextItemSelected(MenuItem item) {
                 return true;
             case CONTEXTMENU_KILL_PROCESS_ID:
                 final AlertDialog.Builder b = new AlertDialog.Builder(this);
+                final TerminalSession terminalSession = getCurrentTermSession();
+                if (terminalSession == null) return true;
+
                 b.setIcon(android.R.drawable.ic_dialog_alert);
                 b.setMessage(R.string.confirm_kill_process);
                 b.setPositiveButton(android.R.string.yes, (dialog, id) -> {
                     dialog.dismiss();
-                    getCurrentTermSession().finishIfRunning();
+                    terminalSession.finishIfRunning();
                 });
                 b.setNegativeButton(android.R.string.no, null);
                 b.show();
@@ -952,7 +961,7 @@ public boolean onContextItemSelected(MenuItem item) {
     }
 
     @Override
-    public void onRequestPermissionsResult(int requestCode, @NonNull String permissions[], @NonNull int[] grantResults) {
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
         if (requestCode == REQUESTCODE_PERMISSION_STORAGE && grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
             TermuxInstaller.setupStorageSymlinks(this);
         }
@@ -969,7 +978,9 @@ void doPaste() {
         if (clipData == null) return;
         CharSequence paste = clipData.getItemAt(0).coerceToText(this);
         if (!TextUtils.isEmpty(paste))
-            getCurrentTermSession().getEmulator().paste(paste.toString());
+            if (getCurrentTermSession() != null) {
+                getCurrentTermSession().getEmulator().paste(paste.toString());
+            }
     }
 
     /** The current session as stored or the last one if that does not exist. */
diff --git a/terminal-emulator/src/main/java/com/termux/terminal/TerminalOutput.java b/terminal-emulator/src/main/java/com/termux/terminal/TerminalOutput.java
index f1c7d03ef9..cec0282b7c 100644
--- a/terminal-emulator/src/main/java/com/termux/terminal/TerminalOutput.java
+++ b/terminal-emulator/src/main/java/com/termux/terminal/TerminalOutput.java
@@ -7,6 +7,7 @@ public abstract class TerminalOutput {
 
     /** Write a string using the UTF-8 encoding to the terminal client. */
     public final void write(String data) {
+        if (data == null) return;
         byte[] bytes = data.getBytes(StandardCharsets.UTF_8);
         write(bytes, 0, bytes.length);
     }

From 7b4acb53c9da03c31960979313ccb0a7d5f045e5 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 11 Mar 2021 18:22:11 +0500
Subject: [PATCH 220/912] Move Termux Properties to
 com.termux.app.settings.properties package

The termux properties handling was mixed in with termux preferences. They are now moved out of into a separate sub package, the following classes are added:

- `SharedProperties` class which is an implementation similar to android's `SharedPreferences` interface for reading from ".properties" files which also maintains an in-memory cache for the key/value pairs. Two types of in-memory cache maps are maintained, one for the literal `String` values found in the file for the keys and an additional one that stores (near) primitive `Object` values for internal use by the caller. Write support is currently not implemented, but may be added if we provide users a GUI to modify the properties. We cannot just overwrite the ".properties" files, since comments also exits, so in-place editing would be required.
- `SharedPropertiesParser` interface that the caller of `SharedProperties` must implement. It is currently only used to map `String` values to internal `Object` values.
- `TermuxPropertyConstants` class that defines shared constants of the properties used by Termux app and its plugins. This class should be imported by other termux plugin apps instead of copying and defining their own constants.
- `TermuxSharedProperties` class that acts as manager for handling termux properties. It implements the `SharedPropertiesParser` interface and acts as the wrapper for the `SharedProperties` class.
---
 app/build.gradle                              |   1 +
 .../java/com/termux/app/TermuxActivity.java   |  36 +-
 .../com/termux/app/TermuxPreferences.java     | 192 +-----
 .../java/com/termux/app/TermuxViewClient.java |  22 +-
 .../settings/properties/SharedProperties.java | 312 ++++++++++
 .../properties/SharedPropertiesParser.java    |  23 +
 .../properties/TermuxPropertyConstants.java   | 228 +++++++
 .../properties/TermuxSharedProperties.java    | 569 ++++++++++++++++++
 8 files changed, 1173 insertions(+), 210 deletions(-)
 create mode 100644 app/src/main/java/com/termux/app/settings/properties/SharedProperties.java
 create mode 100644 app/src/main/java/com/termux/app/settings/properties/SharedPropertiesParser.java
 create mode 100644 app/src/main/java/com/termux/app/settings/properties/TermuxPropertyConstants.java
 create mode 100644 app/src/main/java/com/termux/app/settings/properties/TermuxSharedProperties.java

diff --git a/app/build.gradle b/app/build.gradle
index 3d519ffa27..c1f0c6dfd9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -11,6 +11,7 @@ android {
         implementation "androidx.viewpager:viewpager:1.0.0"
         implementation "androidx.drawerlayout:drawerlayout:1.1.1"
         implementation 'androidx.core:core:1.5.0-beta02'
+        implementation 'com.google.guava:guava:24.1-jre'
         implementation project(":terminal-view")
     }
 
diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index c4b983479c..e3396ab08d 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -51,6 +51,8 @@
 import com.termux.app.input.BellHandler;
 import com.termux.app.input.extrakeys.ExtraKeysView;
 import com.termux.app.input.FullScreenWorkAround;
+import com.termux.app.settings.properties.TermuxPropertyConstants;
+import com.termux.app.settings.properties.TermuxSharedProperties;
 import com.termux.terminal.EmulatorDebug;
 import com.termux.terminal.TerminalColors;
 import com.termux.terminal.TerminalSession;
@@ -110,6 +112,7 @@ public final class TermuxActivity extends Activity implements ServiceConnection
     ExtraKeysView mExtraKeysView;
 
     TermuxPreferences mSettings;
+    TermuxSharedProperties mProperties;
 
     /**
      * The connection to the {@link TermuxService}. Requested in {@link #onCreate(Bundle)} with a call to
@@ -144,16 +147,19 @@ public final class TermuxActivity extends Activity implements ServiceConnection
         public void onReceive(Context context, Intent intent) {
             if (mIsVisible) {
                 String whatToReload = intent.getStringExtra(TERMUX_ACTIVITY.EXTRA_RELOAD_STYLE);
+                Log.d("termux", "Reloading termux style for: " + whatToReload);
                 if ("storage".equals(whatToReload)) {
                     if (ensureStoragePermissionGranted())
                         TermuxInstaller.setupStorageSymlinks(TermuxActivity.this);
                     return;
                 }
+
                 checkForFontAndColors();
-                mSettings.reloadFromProperties(TermuxActivity.this);
+
+                mProperties.loadTermuxPropertiesFromDisk();
 
                 if (mExtraKeysView != null) {
-                    mExtraKeysView.reload(mSettings.mExtraKeys);
+                    mExtraKeysView.reload(mProperties.getExtraKeysInfo());
                 }
             }
         }
@@ -205,7 +211,9 @@ public boolean ensureStoragePermissionGranted() {
     @Override
     public void onCreate(Bundle bundle) {
         mSettings = new TermuxPreferences(this);
-        mIsUsingBlackUI = mSettings.isUsingBlackUI();
+        mProperties = new TermuxSharedProperties(this);
+
+        mIsUsingBlackUI = mProperties.isUsingBlackUI();
         if (mIsUsingBlackUI) {
             this.setTheme(R.style.Theme_Termux_Black);
         } else {
@@ -223,7 +231,7 @@ public void onCreate(Bundle bundle) {
             return insets;
         });
 
-        if (mSettings.isUsingFullScreen()) {
+        if (mProperties.isUsingFullScreen()) {
             getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
         }
 
@@ -245,7 +253,7 @@ public void onCreate(Bundle bundle) {
 
 
         ViewGroup.LayoutParams layoutParams = viewPager.getLayoutParams();
-        layoutParams.height = layoutParams.height * (mSettings.mExtraKeys == null ? 0 : mSettings.mExtraKeys.getMatrix().length);
+        layoutParams.height = layoutParams.height * (mProperties.getExtraKeysInfo() == null ? 0 : mProperties.getExtraKeysInfo().getMatrix().length);
         viewPager.setLayoutParams(layoutParams);
 
         viewPager.setAdapter(new PagerAdapter() {
@@ -266,10 +274,10 @@ public Object instantiateItem(@NonNull ViewGroup collection, int position) {
                 View layout;
                 if (position == 0) {
                     layout = mExtraKeysView = (ExtraKeysView) inflater.inflate(R.layout.extra_keys_main, collection, false);
-                    mExtraKeysView.reload(mSettings.mExtraKeys);
+                    mExtraKeysView.reload(mProperties.getExtraKeysInfo());
 
                     // apply extra keys fix if enabled in prefs
-                    if (mSettings.isUsingFullScreen() && mSettings.isUsingFullScreenWorkAround()) {
+                    if (mProperties.isUsingFullScreen() && mProperties.isUsingFullScreenWorkAround()) {
                         FullScreenWorkAround.apply(TermuxActivity.this);
                     }
 
@@ -451,14 +459,14 @@ public void onClipboardText(TerminalSession session, String text) {
             public void onBell(TerminalSession session) {
                 if (!mIsVisible) return;
 
-                switch (mSettings.mBellBehaviour) {
-                    case TermuxPreferences.BELL_BEEP:
-                        mBellSoundPool.play(mBellSoundId, 1.f, 1.f, 1, 0, 1.f);
-                        break;
-                    case TermuxPreferences.BELL_VIBRATE:
+                switch (mProperties.getBellBehaviour()) {
+                    case TermuxPropertyConstants.IVALUE_BELL_BEHAVIOUR_VIBRATE:
                         BellHandler.getInstance(TermuxActivity.this).doBell();
                         break;
-                    case TermuxPreferences.BELL_IGNORE:
+                    case TermuxPropertyConstants.IVALUE_BELL_BEHAVIOUR_BEEP:
+                        mBellSoundPool.play(mBellSoundId, 1.f, 1.f, 1, 0, 1.f);
+                        break;
+                    case TermuxPropertyConstants.IVALUE_BELL_BEHAVIOUR_IGNORE:
                         // Ignore the bell character.
                         break;
                 }
@@ -665,7 +673,7 @@ void addNewSession(boolean failSafe, String sessionName) {
 
             String workingDirectory;
             if (currentSession == null) {
-                workingDirectory = mSettings.mDefaultWorkingDir;
+                workingDirectory = mProperties.getDefaultWorkingDirectory();
             } else {
                 workingDirectory = currentSession.getCwd();
             }
diff --git a/app/src/main/java/com/termux/app/TermuxPreferences.java b/app/src/main/java/com/termux/app/TermuxPreferences.java
index f4187eef79..5567439dee 100644
--- a/app/src/main/java/com/termux/app/TermuxPreferences.java
+++ b/app/src/main/java/com/termux/app/TermuxPreferences.java
@@ -2,61 +2,13 @@
 
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.content.res.Configuration;
 import android.preference.PreferenceManager;
-import android.util.Log;
 import android.util.TypedValue;
-import android.widget.Toast;
-import com.termux.terminal.TerminalSession;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
 
-import androidx.annotation.IntDef;
-
-import static com.termux.terminal.EmulatorDebug.LOG_TAG;
+import com.termux.terminal.TerminalSession;
 
 final class TermuxPreferences {
 
-    @IntDef({BELL_VIBRATE, BELL_BEEP, BELL_IGNORE})
-    @Retention(RetentionPolicy.SOURCE)
-    @interface AsciiBellBehaviour {
-    }
-
-    final static class KeyboardShortcut {
-
-        KeyboardShortcut(int codePoint, int shortcutAction) {
-            this.codePoint = codePoint;
-            this.shortcutAction = shortcutAction;
-        }
-
-        final int codePoint;
-        final int shortcutAction;
-    }
-
-    static final int SHORTCUT_ACTION_CREATE_SESSION = 1;
-    static final int SHORTCUT_ACTION_NEXT_SESSION = 2;
-    static final int SHORTCUT_ACTION_PREVIOUS_SESSION = 3;
-    static final int SHORTCUT_ACTION_RENAME_SESSION = 4;
-
-    static final int BELL_VIBRATE = 1;
-    static final int BELL_BEEP = 2;
-    static final int BELL_IGNORE = 3;
-
     private final int MIN_FONTSIZE;
     private static final int MAX_FONTSIZE = 256;
 
@@ -65,34 +17,11 @@ final static class KeyboardShortcut {
     private static final String CURRENT_SESSION_KEY = "current_session";
     private static final String SCREEN_ALWAYS_ON_KEY = "screen_always_on";
 
-    private boolean mUseDarkUI;
     private boolean mScreenAlwaysOn;
     private int mFontSize;
-
-    private boolean mUseFullScreen;
-    private boolean mUseFullScreenWorkAround;
-
-    @AsciiBellBehaviour
-    int mBellBehaviour = BELL_VIBRATE;
-
-    boolean mBackIsEscape;
-    boolean mDisableVolumeVirtualKeys;
     boolean mShowExtraKeys;
-    String mDefaultWorkingDir;
-
-    ExtraKeysInfos mExtraKeys;
-
-    final List<KeyboardShortcut> shortcuts = new ArrayList<>();
-
-    /**
-     * If value is not in the range [min, max], set it to either min or max.
-     */
-    static int clamp(int value, int min, int max) {
-        return Math.min(Math.max(value, min), max);
-    }
 
     TermuxPreferences(Context context) {
-        reloadFromProperties(context);
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
 
         float dipInPixels = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 1, context.getResources().getDisplayMetrics());
@@ -139,18 +68,6 @@ boolean isScreenAlwaysOn() {
         return mScreenAlwaysOn;
     }
 
-    boolean isUsingBlackUI() {
-        return mUseDarkUI;
-    }
-
-    boolean isUsingFullScreen() {
-        return mUseFullScreen;
-    }
-
-    boolean isUsingFullScreenWorkAround() {
-        return mUseFullScreenWorkAround;
-    }
-
     void setScreenAlwaysOn(Context context, boolean newValue) {
         mScreenAlwaysOn = newValue;
         PreferenceManager.getDefaultSharedPreferences(context).edit().putBoolean(SCREEN_ALWAYS_ON_KEY, newValue).apply();
@@ -169,108 +86,11 @@ static TerminalSession getCurrentSession(TermuxActivity context) {
         return null;
     }
 
-    void reloadFromProperties(Context context) {
-        File propsFile = new File(TermuxConstants.TERMUX_PROPERTIES_PRIMARY_PATH);
-        if (!propsFile.exists())
-            propsFile = new File(TermuxConstants.TERMUX_PROPERTIES_SECONDARY_PATH);
-
-        Properties props = new Properties();
-        try {
-            if (propsFile.isFile() && propsFile.canRead()) {
-                try (FileInputStream in = new FileInputStream(propsFile)) {
-                    props.load(new InputStreamReader(in, StandardCharsets.UTF_8));
-                }
-            }
-        } catch (Exception e) {
-            Toast.makeText(context, "Could not open properties file termux.properties: " + e.getMessage(), Toast.LENGTH_LONG).show();
-            Log.e("termux", "Error loading props", e);
-        }
-
-        switch (props.getProperty("bell-character", "vibrate")) {
-            case "beep":
-                mBellBehaviour = BELL_BEEP;
-                break;
-            case "ignore":
-                mBellBehaviour = BELL_IGNORE;
-                break;
-            default: // "vibrate".
-                mBellBehaviour = BELL_VIBRATE;
-                break;
-        }
-
-        switch (props.getProperty("use-black-ui", "").toLowerCase()) {
-            case "true":
-                mUseDarkUI = true;
-                break;
-            case "false":
-                mUseDarkUI = false;
-                break;
-            default:
-                int nightMode = context.getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
-                mUseDarkUI = nightMode == Configuration.UI_MODE_NIGHT_YES;
-        }
-
-        mUseFullScreen = "true".equals(props.getProperty("fullscreen", "false").toLowerCase());
-        mUseFullScreenWorkAround = "true".equals(props.getProperty("use-fullscreen-workaround", "false").toLowerCase());
-
-        mDefaultWorkingDir = props.getProperty("default-working-directory", TermuxConstants.HOME_PATH);
-        File workDir = new File(mDefaultWorkingDir);
-        if (!workDir.exists() || !workDir.isDirectory()) {
-            // Fallback to home directory if user configured working directory is not exist
-            // or is a regular file.
-            mDefaultWorkingDir = TermuxConstants.HOME_PATH;
-        }
-
-        String defaultExtraKeys = "[[ESC, TAB, CTRL, ALT, {key: '-', popup: '|'}, DOWN, UP]]";
-
-        try {
-            String extrakeyProp = props.getProperty("extra-keys", defaultExtraKeys);
-            String extraKeysStyle = props.getProperty("extra-keys-style", "default");
-            mExtraKeys = new ExtraKeysInfos(extrakeyProp, extraKeysStyle);
-        } catch (JSONException e) {
-            Toast.makeText(context, "Could not load the extra-keys property from the config: " + e.toString(), Toast.LENGTH_LONG).show();
-            Log.e("termux", "Error loading props", e);
-
-            try {
-                mExtraKeys = new ExtraKeysInfos(defaultExtraKeys, "default");
-            } catch (JSONException e2) {
-                e2.printStackTrace();
-                Toast.makeText(context, "Can't create default extra keys", Toast.LENGTH_LONG).show();
-                mExtraKeys = null;
-            }
-        }
-
-        mBackIsEscape = "escape".equals(props.getProperty("back-key", "back"));
-        mDisableVolumeVirtualKeys = "volume".equals(props.getProperty("volume-keys", "virtual"));
-
-        shortcuts.clear();
-        parseAction("shortcut.create-session", SHORTCUT_ACTION_CREATE_SESSION, props);
-        parseAction("shortcut.next-session", SHORTCUT_ACTION_NEXT_SESSION, props);
-        parseAction("shortcut.previous-session", SHORTCUT_ACTION_PREVIOUS_SESSION, props);
-        parseAction("shortcut.rename-session", SHORTCUT_ACTION_RENAME_SESSION, props);
-    }
-
-    private void parseAction(String name, int shortcutAction, Properties props) {
-        String value = props.getProperty(name);
-        if (value == null) return;
-        String[] parts = value.toLowerCase().trim().split("\\+");
-        String input = parts.length == 2 ? parts[1].trim() : null;
-        if (!(parts.length == 2 && parts[0].trim().equals("ctrl")) || input.isEmpty() || input.length() > 2) {
-            Log.e("termux", "Keyboard shortcut '" + name + "' is not Ctrl+<something>");
-            return;
-        }
-
-        char c = input.charAt(0);
-        int codePoint = c;
-        if (Character.isLowSurrogate(c)) {
-            if (input.length() != 2 || Character.isHighSurrogate(input.charAt(1))) {
-                Log.e("termux", "Keyboard shortcut '" + name + "' is not Ctrl+<something>");
-                return;
-            } else {
-                codePoint = Character.toCodePoint(input.charAt(1), c);
-            }
-        }
-        shortcuts.add(new KeyboardShortcut(codePoint, shortcutAction));
+    /**
+     * If value is not in the range [min, max], set it to either min or max.
+     */
+    static int clamp(int value, int min, int max) {
+        return Math.min(Math.max(value, min), max);
     }
 
 }
diff --git a/app/src/main/java/com/termux/app/TermuxViewClient.java b/app/src/main/java/com/termux/app/TermuxViewClient.java
index 3e92c933d5..b6eea4d3f8 100644
--- a/app/src/main/java/com/termux/app/TermuxViewClient.java
+++ b/app/src/main/java/com/termux/app/TermuxViewClient.java
@@ -8,7 +8,9 @@
 import android.view.MotionEvent;
 import android.view.inputmethod.InputMethodManager;
 
+import com.termux.app.input.KeyboardShortcut;
 import com.termux.app.input.extrakeys.ExtraKeysView;
+import com.termux.app.settings.properties.TermuxPropertyConstants;
 import com.termux.terminal.KeyHandler;
 import com.termux.terminal.TerminalEmulator;
 import com.termux.terminal.TerminalSession;
@@ -47,7 +49,7 @@ public void onSingleTapUp(MotionEvent e) {
 
     @Override
     public boolean shouldBackButtonBeMappedToEscape() {
-        return mActivity.mSettings.mBackIsEscape;
+        return mActivity.mProperties.isBackKeyTheEscapeKey();
     }
 
     @Override
@@ -230,23 +232,23 @@ public boolean onCodePoint(final int codePoint, boolean ctrlDown, TerminalSessio
                 return true;
             }
 
-            List<TermuxPreferences.KeyboardShortcut> shortcuts = mActivity.mSettings.shortcuts;
+            List<KeyboardShortcut> shortcuts = mActivity.mProperties.getSessionShortcuts();
             if (!shortcuts.isEmpty()) {
                 int codePointLowerCase = Character.toLowerCase(codePoint);
                 for (int i = shortcuts.size() - 1; i >= 0; i--) {
-                    TermuxPreferences.KeyboardShortcut shortcut = shortcuts.get(i);
+                    KeyboardShortcut shortcut = shortcuts.get(i);
                     if (codePointLowerCase == shortcut.codePoint) {
                         switch (shortcut.shortcutAction) {
-                            case TermuxPreferences.SHORTCUT_ACTION_CREATE_SESSION:
+                            case TermuxPropertyConstants.ACTION_SHORTCUT_CREATE_SESSION:
                                 mActivity.addNewSession(false, null);
                                 return true;
-                            case TermuxPreferences.SHORTCUT_ACTION_PREVIOUS_SESSION:
-                                mActivity.switchToSession(false);
-                                return true;
-                            case TermuxPreferences.SHORTCUT_ACTION_NEXT_SESSION:
+                            case TermuxPropertyConstants.ACTION_SHORTCUT_NEXT_SESSION:
                                 mActivity.switchToSession(true);
                                 return true;
-                            case TermuxPreferences.SHORTCUT_ACTION_RENAME_SESSION:
+                            case TermuxPropertyConstants.ACTION_SHORTCUT_PREVIOUS_SESSION:
+                                mActivity.switchToSession(false);
+                                return true;
+                            case TermuxPropertyConstants.ACTION_SHORTCUT_RENAME_SESSION:
                                 mActivity.renameSession(mActivity.getCurrentTermSession());
                                 return true;
                         }
@@ -266,7 +268,7 @@ public boolean onLongPress(MotionEvent event) {
     /** Handle dedicated volume buttons as virtual keys if applicable. */
     private boolean handleVirtualKeys(int keyCode, KeyEvent event, boolean down) {
         InputDevice inputDevice = event.getDevice();
-        if (mActivity.mSettings.mDisableVolumeVirtualKeys) {
+        if (mActivity.mProperties.areVirtualVolumeKeysDisabled()) {
             return false;
         } else if (inputDevice != null && inputDevice.getKeyboardType() == InputDevice.KEYBOARD_TYPE_ALPHABETIC) {
             // Do not steal dedicated buttons from a full external keyboard.
diff --git a/app/src/main/java/com/termux/app/settings/properties/SharedProperties.java b/app/src/main/java/com/termux/app/settings/properties/SharedProperties.java
new file mode 100644
index 0000000000..db6eb637dd
--- /dev/null
+++ b/app/src/main/java/com/termux/app/settings/properties/SharedProperties.java
@@ -0,0 +1,312 @@
+package com.termux.app.settings.properties;
+
+import android.content.Context;
+import android.util.Log;
+import android.widget.Toast;
+
+import com.google.common.primitives.Primitives;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+/**
+ * An implementation similar to android's {@link android.content.SharedPreferences} interface for
+ * reading and writing to and from ".properties" files which also maintains an in-memory cache for
+ * the key/value pairs. Operations are does under synchronization locks and should be thread safe.
+ *
+ * Two types of in-memory cache maps are maintained, one for the literal {@link String} values found
+ * in the file for the keys and an additional one that stores (near) primitive {@link Object} values for
+ * internal use by the caller.
+ *
+ * This currently only has read support, write support can/will be added later if needed. Check android's
+ * SharedPreferencesImpl class for reference implementation.
+ *
+ * https://cs.android.com/android/platform/superproject/+/android-11.0.0_r3:frameworks/base/core/java/android/app/SharedPreferencesImpl.java
+ */
+public class SharedProperties {
+
+    /**
+     * The {@link Properties} object that maintains an in-memory cache of values loaded from the
+     * {@link #mPropertiesFile} file. The key/value pairs are of any keys defined by
+     * {@link #mPropertiesList} that are found in the file against their literal values in the file.
+     */
+    private Properties mProperties;
+
+    /**
+     * The {@link HashMap<>} object that maintains an in-memory cache of internal values for the values
+     * loaded from the {@link #mPropertiesFile} file. The key/value pairs are of any keys defined by
+     * {@link #mPropertiesList} that are found in the file against their internal {@link Object} values
+     * returned by the call to
+     * {@link SharedPropertiesParser#getInternalPropertyValueFromValue(Context, String, String)} interface.
+     */
+    private Map<String, Object> mMap;
+
+    private final Context mContext;
+    private final File mPropertiesFile;
+    private final Set<String> mPropertiesList;
+    private final SharedPropertiesParser mSharedPropertiesParser;
+
+    private final Object mLock = new Object();
+
+    /**
+     * Constructor for the SharedProperties class.
+     *
+     * @param context The Context for operations.
+     * @param propertiesFile The {@link File} object to load properties from.
+     * @param propertiesList The {@link Set<String>} object that defined which properties to load.
+     * @param sharedPropertiesParser that implements the {@link SharedPropertiesParser} interface.
+     */
+    public SharedProperties(@Nonnull Context context, @Nullable File propertiesFile, @Nonnull Set<String> propertiesList, @Nonnull SharedPropertiesParser sharedPropertiesParser) {
+        mContext = context;
+        mPropertiesFile = propertiesFile;
+        mPropertiesList = propertiesList;
+        mSharedPropertiesParser = sharedPropertiesParser;
+
+        mProperties = new Properties();
+        mMap = new HashMap<String, Object>();
+    }
+
+    /**
+     * Load the properties defined by {@link #mPropertiesList} from the {@link #mPropertiesFile} file
+     * to update the {@link #mProperties} and {@link #mMap} in-memory cache.
+     * Properties are not loading automatically when constructor is called and must be manually called.
+     */
+    public void loadPropertiesFromDisk() {
+        synchronized (mLock) {
+            // Get properties from mPropertiesFile
+            Properties properties = getProperties(false);
+
+            // We still need to load default values into mMap, so we assume no properties defined if
+            // reading from mPropertiesFile failed
+            if (properties == null)
+                properties = new Properties();
+
+            HashMap<String, Object> map = new HashMap<String, Object>();
+            Properties newProperties = new Properties();
+
+            String value;
+            Object internalValue;
+            for (String key : mPropertiesList) {
+                value = properties.getProperty(key); // value will be null if key does not exist in propertiesFile
+                Log.d("termux", key + " : " + value);
+
+                // Call the {@link SharedPropertiesParser#getInternalPropertyValueFromValue(Context,String,String)}
+                // interface method to get the internal value to store in the  {@link #mMap}.
+                internalValue = mSharedPropertiesParser.getInternalPropertyValueFromValue(mContext, key, value);
+
+                // If the internal value was successfully added to map, then also add value to newProperties
+                // We only store values in-memory defined by {@link #mPropertiesList}
+                if (putToMap(map, key, internalValue)) { // null internalValue will be put into map
+                    putToProperties(newProperties, key, value); // null value will **not** be into properties
+                }
+            }
+
+            mMap = map;
+            mProperties = newProperties;
+        }
+    }
+
+    /**
+     * Put a value in a {@link #mMap}.
+     * The key cannot be {@code null}.
+     * Only {@code null}, primitive or their wrapper classes or String class objects are allowed to be added to
+     * the map, although this limitation may be changed.
+     *
+     * @param map The {@link Map} object to add value to.
+     * @param key The key for which to add the value to the map.
+     * @param value The {@link Object} to add to the map.
+     * @return Returns {@code true} if value was successfully added, otherwise {@code false}.
+     */
+    public static boolean putToMap(HashMap<String, Object> map, String key, Object value) {
+
+        if (map == null) {
+            Log.e("termux", "Map passed to SharedProperties.putToProperties() is null");
+            return false;
+        }
+
+        // null keys are not allowed to be stored in mMap
+        if (key == null) {
+            Log.e("termux", "Cannot put a null key into properties map");
+            return false;
+        }
+
+        boolean put = false;
+        if (value != null) {
+            Class<?> clazz = value.getClass();
+            if (clazz.isPrimitive() || Primitives.isWrapperType(clazz) || value instanceof String) {
+                put = true;
+            }
+        } else {
+            put = true;
+        }
+
+        if (put) {
+            map.put(key, value);
+            return true;
+        } else {
+            Log.e("termux", "Cannot put a non-primitive value for the key \"" + key + "\" into properties map");
+            return false;
+        }
+    }
+
+    /**
+     * Put a value in a {@link Map}.
+     * The key cannot be {@code null}.
+     * Passing {@code null} as the value argument is equivalent to removing the key from the
+     * properties.
+     *
+     * @param properties The {@link Properties} object to add value to.
+     * @param key The key for which to add the value to the properties.
+     * @param value The {@link String} to add to the properties.
+     * @return Returns {@code true} if value was successfully added, otherwise {@code false}.
+     */
+    public static boolean putToProperties(Properties properties, String key, String value) {
+
+        if (properties == null) {
+            Log.e("termux", "Properties passed to SharedProperties.putToProperties() is null");
+            return false;
+        }
+
+        // null keys are not allowed to be stored in mMap
+        if (key == null) {
+            Log.e("termux", "Cannot put a null key into properties");
+            return false;
+        }
+
+        if (value != null) {
+            properties.put(key, value);
+            return true;
+        } else {
+            properties.remove(key);
+        }
+
+        return true;
+    }
+
+    /**
+     * A static function to get the {@link Properties} object for the propertiesFile. A lock is not
+     * taken when this function is called.
+     *
+     * @param context The {@link Context} to use to show a flash if an exception is raised while
+     *                reading the file. If context is {@code null}, then flash will not be shown.
+     * @param propertiesFile The {@link File} to read the {@link Properties} from.
+     * @return Returns the {@link Properties} object. It will be {@code null} if an exception is
+     * raised while reading the file.
+     */
+    public static Properties getPropertiesFromFile(Context context, File propertiesFile) {
+        Properties properties = new Properties();
+
+        if (propertiesFile == null) {
+            Log.e("termux", "Not loading properties since file is null");
+            return properties;
+        }
+
+        try {
+            try (FileInputStream in = new FileInputStream(propertiesFile)) {
+                Log.v("termux", "Loading properties from \"" + propertiesFile.getAbsolutePath() + "\" file");
+                properties.load(new InputStreamReader(in, StandardCharsets.UTF_8));
+            }
+        } catch (Exception e) {
+            if(context != null)
+                Toast.makeText(context, "Could not open properties file \"" + propertiesFile.getAbsolutePath() + "\": " + e.getMessage(), Toast.LENGTH_LONG).show();
+            Log.e("termux", "Error loading properties file \"" + propertiesFile.getAbsolutePath() + "\"", e);
+            return null;
+        }
+
+        return properties;
+    }
+
+    /**
+     * Get the {@link Properties} object for the {@link #mPropertiesFile}. The {@link Properties}
+     * object will also contain properties not defined by the {@link #mPropertiesList} if cache
+     * value is {@code false}.
+     *
+     * @param cached If {@code true}, then the {@link #mProperties} in-memory cache is returned. Otherwise
+     *               the {@link Properties} object is directly read from the {@link #mPropertiesFile}.
+     * @return Returns the {@link Properties} object if read from file, otherwise a copy of {@link #mProperties}.
+     */
+    public Properties getProperties(boolean cached) {
+        synchronized (mLock) {
+            if (cached) {
+                if (mProperties == null) mProperties = new Properties();
+                return getPropertiesCopy(mProperties);
+            } else {
+                return getPropertiesFromFile(mContext, mPropertiesFile);
+            }
+        }
+    }
+
+    /**
+     * Get the {@link String} value for the key passed from the {@link #mPropertiesFile}.
+     *
+     * @param key The key to read from the {@link Properties} object.
+     * @param cached If {@code true}, then the value is returned from the {@link #mProperties} in-memory cache.
+     *               Otherwise the {@link Properties} object is read directly from the {@link #mPropertiesFile}
+     *               and value is returned from it against the key.
+     * @return Returns the {@link String} object. This will be {@code null} if key is not found.
+     */
+    public String getProperty(String key, boolean cached) {
+        synchronized (mLock) {
+            return (String) getProperties(cached).get(key);
+        }
+    }
+
+    /**
+     * Get the {@link #mMap} object for the {@link #mPropertiesFile}. A call to
+     * {@link #loadPropertiesFromDisk()} must be made before this.
+     *
+     * @return Returns a copy of {@link #mMap} object.
+     */
+    public Map<String, Object> getInternalProperties() {
+        synchronized (mLock) {
+            if (mMap == null) mMap = new HashMap<String, Object>();
+            return getMapCopy(mMap);
+        }
+    }
+
+    /**
+     * Get the internal {@link Object} value for the key passed from the {@link #mPropertiesFile}.
+     * The value is returned from the {@link #mMap} in-memory cache, so a call to
+     * {@link #loadPropertiesFromDisk()} must be made before this.
+     *
+     * @param key The key to read from the {@link #mMap} object.
+     * @return Returns the {@link Object} object. This will be {@code null} if key is not found or
+     * if object was {@code null}. Use {@link HashMap#containsKey(Object)} to detect the later.
+     * situation.
+     */
+    public Object getInternalProperty(String key) {
+        synchronized (mLock) {
+            // null keys are not allowed to be stored in mMap
+            if (key != null)
+                return getInternalProperties().get(key);
+            else
+                return null;
+        }
+    }
+
+    public static Properties getPropertiesCopy(Properties inputProperties) {
+        if(inputProperties == null) return null;
+
+        Properties outputProperties = new Properties();
+        for (String key : inputProperties.stringPropertyNames()) {
+            outputProperties.put(key, inputProperties.get(key));
+        }
+
+        return outputProperties;
+    }
+
+    public static Map<String, Object> getMapCopy(Map<String, Object> map) {
+        if(map == null) return null;
+        return new HashMap<String, Object>(map);
+    }
+
+}
diff --git a/app/src/main/java/com/termux/app/settings/properties/SharedPropertiesParser.java b/app/src/main/java/com/termux/app/settings/properties/SharedPropertiesParser.java
new file mode 100644
index 0000000000..a82141bf90
--- /dev/null
+++ b/app/src/main/java/com/termux/app/settings/properties/SharedPropertiesParser.java
@@ -0,0 +1,23 @@
+package com.termux.app.settings.properties;
+
+import android.content.Context;
+
+import java.util.HashMap;
+
+/**
+ * An interface that must be defined by the caller of the {@link SharedProperties} class.
+ */
+public interface SharedPropertiesParser {
+
+    /**
+     * A function that should return the internal {@link Object} to be stored for a key/value pair
+     * read from properties file in the {@link HashMap <>} in-memory cache.
+     *
+     * @param context The context for operations.
+     * @param key The key for which the internal object is required.
+     * @param value The literal value for the property found is the properties file.
+     * @return Returns the {@link Object} object to store in the {@link HashMap <>} in-memory cache.
+     */
+    public Object getInternalPropertyValueFromValue(Context context, String key, String value);
+
+}
diff --git a/app/src/main/java/com/termux/app/settings/properties/TermuxPropertyConstants.java b/app/src/main/java/com/termux/app/settings/properties/TermuxPropertyConstants.java
new file mode 100644
index 0000000000..21a06ad8ba
--- /dev/null
+++ b/app/src/main/java/com/termux/app/settings/properties/TermuxPropertyConstants.java
@@ -0,0 +1,228 @@
+package com.termux.app.settings.properties;
+
+import android.util.Log;
+
+import com.google.common.collect.ImmutableBiMap;
+import com.termux.app.TermuxConstants;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Properties;
+import java.util.Set;
+
+/*
+ * Version: v0.1.0
+ *
+ * Changelog
+ *
+ * - 0.1.0 (2021-03-08)
+ *      - Initial Release
+ *
+ */
+
+/**
+ * A class that defines shared constants of the properties used by Termux app and its plugins.
+ * This class will be hosted by termux-app and should be imported by other termux plugin apps as is
+ * instead of copying constants to random classes. The 3rd party apps can also import it for
+ * interacting with termux apps. If changes are made to this file, increment the version number
+ *  * and add an entry in the Changelog section above.
+ *
+ * The properties are loaded from the first file found at
+ * {@link TermuxConstants#TERMUX_PROPERTIES_PRIMARY_PATH} or
+ * {@link TermuxConstants#TERMUX_PROPERTIES_SECONDARY_PATH}
+ */
+public final class TermuxPropertyConstants {
+
+    /** Defines the bidirectional map for boolean values and their internal values  */
+    public static final ImmutableBiMap<String, Boolean> MAP_GENERIC_BOOLEAN =
+        new ImmutableBiMap.Builder<String, Boolean>()
+            .put("true", true)
+            .put("false", false)
+            .build();
+
+    /** Defines the bidirectional map for inverted boolean values and their internal values  */
+    public static final ImmutableBiMap<String, Boolean> MAP_GENERIC_INVERTED_BOOLEAN =
+        new ImmutableBiMap.Builder<String, Boolean>()
+            .put("true", false)
+            .put("false", true)
+            .build();
+
+
+
+    /** Defines the key for whether to use back key as the escape key */
+    public static final String KEY_USE_BACK_KEY_AS_ESCAPE_KEY =  "back-key"; // Default: "back-key"
+
+    public static final String VALUE_BACK_KEY_BEHAVIOUR_BACK = "back";
+    public static final String VALUE_BACK_KEY_BEHAVIOUR_ESCAPE = "escape";
+
+
+
+    /** Defines the key for whether to use black UI */
+    public static final String KEY_USE_BLACK_UI =  "use-black-ui"; // Default: "use-black-ui"
+
+
+
+    /** Defines the key for whether to use fullscreen */
+    public static final String KEY_USE_FULLSCREEN =  "fullscreen"; // Default: "fullscreen"
+
+
+
+    /** Defines the key for whether to use fullscreen workaround */
+    public static final String KEY_USE_FULLSCREEN_WORKAROUND =  "use-fullscreen-workaround"; // Default: "use-fullscreen-workaround"
+
+
+
+    /** Defines the key for whether virtual volume keys are disabled */
+    public static final String KEY_VIRTUAL_VOLUME_KEYS_DISABLED =  "volume-keys"; // Default: "volume-keys"
+
+    public static final String VALUE_VOLUME_KEY_BEHAVIOUR_VOLUME = "volume";
+    public static final String VALUE_VOLUME_KEY_BEHAVIOUR_VIRTUAL = "virtual";
+
+
+
+    /** Defines the key for the bell behaviour */
+    public static final String KEY_BELL_BEHAVIOUR =  "bell-character"; // Default: "bell-character"
+
+    public static final String VALUE_BELL_BEHAVIOUR_VIBRATE = "vibrate";
+    public static final String VALUE_BELL_BEHAVIOUR_BEEP = "beep";
+    public static final String VALUE_BELL_BEHAVIOUR_IGNORE = "ignore";
+    public static final String DEFAULT_VALUE_BELL_BEHAVIOUR = VALUE_BELL_BEHAVIOUR_VIBRATE;
+
+    public static final int IVALUE_BELL_BEHAVIOUR_VIBRATE = 1;
+    public static final int IVALUE_BELL_BEHAVIOUR_BEEP = 2;
+    public static final int IVALUE_BELL_BEHAVIOUR_IGNORE = 3;
+    public static final int DEFAULT_IVALUE_BELL_BEHAVIOUR = IVALUE_BELL_BEHAVIOUR_VIBRATE;
+
+    /** Defines the bidirectional map for bell behaviour values and their internal values */
+    public static final ImmutableBiMap<String, Integer> MAP_BELL_BEHAVIOUR =
+        new ImmutableBiMap.Builder<String, Integer>()
+            .put(VALUE_BELL_BEHAVIOUR_VIBRATE, IVALUE_BELL_BEHAVIOUR_VIBRATE)
+            .put(VALUE_BELL_BEHAVIOUR_BEEP, IVALUE_BELL_BEHAVIOUR_BEEP)
+            .put(VALUE_BELL_BEHAVIOUR_IGNORE, IVALUE_BELL_BEHAVIOUR_IGNORE)
+            .build();
+
+
+
+    /** Defines the key for create session shortcut */
+    public static final String KEY_SHORTCUT_CREATE_SESSION =  "shortcut.create-session"; // Default: "shortcut.create-session"
+    /** Defines the key for next session shortcut */
+    public static final String KEY_SHORTCUT_NEXT_SESSION =  "shortcut.next-session"; // Default: "shortcut.next-session"
+    /** Defines the key for previous session shortcut */
+    public static final String KEY_SHORTCUT_PREVIOUS_SESSION =  "shortcut.previous-session"; // Default: "shortcut.previous-session"
+    /** Defines the key for rename session shortcut */
+    public static final String KEY_SHORTCUT_RENAME_SESSION =  "shortcut.rename-session"; // Default: "shortcut.rename-session"
+
+    public static final int ACTION_SHORTCUT_CREATE_SESSION = 1;
+    public static final int ACTION_SHORTCUT_NEXT_SESSION = 2;
+    public static final int ACTION_SHORTCUT_PREVIOUS_SESSION = 3;
+    public static final int ACTION_SHORTCUT_RENAME_SESSION = 4;
+
+    /** Defines the bidirectional map for session shortcut values and their internal actions */
+    public static final ImmutableBiMap<String, Integer> MAP_SESSION_SHORTCUTS =
+        new ImmutableBiMap.Builder<String, Integer>()
+            .put(KEY_SHORTCUT_CREATE_SESSION, ACTION_SHORTCUT_CREATE_SESSION)
+            .put(KEY_SHORTCUT_NEXT_SESSION, ACTION_SHORTCUT_NEXT_SESSION)
+            .put(KEY_SHORTCUT_PREVIOUS_SESSION, ACTION_SHORTCUT_PREVIOUS_SESSION)
+            .put(KEY_SHORTCUT_RENAME_SESSION, ACTION_SHORTCUT_RENAME_SESSION)
+            .build();
+
+
+
+    /** Defines the key for the default working directory */
+    public static final String KEY_DEFAULT_WORKING_DIRECTORY =  "default-working-directory"; // Default: "default-working-directory"
+    /** Defines the default working directory */
+    public static final String DEFAULT_IVALUE_DEFAULT_WORKING_DIRECTORY = TermuxConstants.HOME_PATH;
+
+
+
+    /** Defines the key for extra keys */
+    public static final String KEY_EXTRA_KEYS =  "extra-keys"; // Default: "extra-keys"
+    /** Defines the key for extra keys style */
+    public static final String KEY_EXTRA_KEYS_STYLE =  "extra-keys-style"; // Default: "extra-keys-style"
+    public static final String DEFAULT_IVALUE_EXTRA_KEYS = "[[ESC, TAB, CTRL, ALT, {key: '-', popup: '|'}, DOWN, UP]]";
+    public static final String DEFAULT_IVALUE_EXTRA_KEYS_STYLE = "default";
+
+
+
+
+
+    /** Defines the set for keys loaded by termux
+     * Setting this to {@code null} will make {@link SharedProperties} throw an exception.
+     * */
+    public static final Set<String> TERMUX_PROPERTIES_LIST = new HashSet<>(Arrays.asList(
+        // boolean
+        KEY_USE_BACK_KEY_AS_ESCAPE_KEY,
+        KEY_USE_BLACK_UI,
+        KEY_USE_FULLSCREEN,
+        KEY_USE_FULLSCREEN_WORKAROUND,
+        KEY_VIRTUAL_VOLUME_KEYS_DISABLED,
+        TermuxConstants.PROP_ALLOW_EXTERNAL_APPS,
+
+        // int
+        KEY_BELL_BEHAVIOUR,
+
+        // Integer
+        KEY_SHORTCUT_CREATE_SESSION,
+        KEY_SHORTCUT_NEXT_SESSION,
+        KEY_SHORTCUT_PREVIOUS_SESSION,
+        KEY_SHORTCUT_RENAME_SESSION,
+
+        // String
+        KEY_DEFAULT_WORKING_DIRECTORY,
+        KEY_EXTRA_KEYS,
+        KEY_EXTRA_KEYS_STYLE
+    ));
+
+    /** Defines the set for keys loaded by termux that have default boolean behaviour
+     * "true" -> true
+     * "false" -> false
+     * default: false
+     * */
+    public static final Set<String> TERMUX_DEFAULT_BOOLEAN_BEHAVIOUR_PROPERTIES_LIST = new HashSet<>(Arrays.asList(
+        KEY_USE_FULLSCREEN,
+        KEY_USE_FULLSCREEN_WORKAROUND,
+        TermuxConstants.PROP_ALLOW_EXTERNAL_APPS
+    ));
+
+    /** Defines the set for keys loaded by termux that have default inverted boolean behaviour
+     * "false" -> true
+     * "true" -> false
+     * default: true
+     * */
+    public static final Set<String> TERMUX_DEFAULT_INVERETED_BOOLEAN_BEHAVIOUR_PROPERTIES_LIST = new HashSet<>(Arrays.asList(
+    ));
+
+
+
+
+    /** Returns the first {@link File} found at
+     * {@link TermuxConstants#TERMUX_PROPERTIES_PRIMARY_PATH} or
+     * {@link TermuxConstants#TERMUX_PROPERTIES_SECONDARY_PATH}
+     * from which termux properties can be loaded.
+     * If the {@link File} found is not a regular file or is not readable then null is returned.
+     *
+     * @return Returns the {@link File} object for termux properties.
+     */
+    public static File getTermuxPropertiesFile() {
+        String[] possiblePropertiesFileLocations = {
+            TermuxConstants.TERMUX_PROPERTIES_PRIMARY_PATH,
+            TermuxConstants.TERMUX_PROPERTIES_SECONDARY_PATH
+        };
+
+        File propertiesFile = new File(possiblePropertiesFileLocations[0]);
+        int i = 0;
+        while (!propertiesFile.exists() && i < possiblePropertiesFileLocations.length) {
+            propertiesFile = new File(possiblePropertiesFileLocations[i]);
+            i += 1;
+        }
+
+        if (propertiesFile.isFile() && propertiesFile.canRead()) {
+            return propertiesFile;
+        } else {
+            Log.d("termux", "No readable termux.properties file found");
+            return null;
+        }
+    }
+
+}
diff --git a/app/src/main/java/com/termux/app/settings/properties/TermuxSharedProperties.java b/app/src/main/java/com/termux/app/settings/properties/TermuxSharedProperties.java
new file mode 100644
index 0000000000..4e2e9c7dfd
--- /dev/null
+++ b/app/src/main/java/com/termux/app/settings/properties/TermuxSharedProperties.java
@@ -0,0 +1,569 @@
+package com.termux.app.settings.properties;
+
+import android.content.Context;
+import android.content.res.Configuration;
+import android.util.Log;
+import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.termux.app.input.extrakeys.ExtraKeysInfo;
+import com.termux.app.input.KeyboardShortcut;
+
+import org.json.JSONException;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
+import javax.annotation.Nonnull;
+
+public class TermuxSharedProperties implements SharedPropertiesParser {
+
+    private final Context mContext;
+    private final SharedProperties mSharedProperties;
+    private final File mPropertiesFile;
+
+    private ExtraKeysInfo mExtraKeysInfo;
+    private final List<KeyboardShortcut> mSessionShortcuts = new ArrayList<>();
+
+    public TermuxSharedProperties(@Nonnull Context context) {
+        mContext = context;
+        mPropertiesFile = TermuxPropertyConstants.getTermuxPropertiesFile();
+        mSharedProperties = new SharedProperties(context, mPropertiesFile, TermuxPropertyConstants.TERMUX_PROPERTIES_LIST, this);
+        loadTermuxPropertiesFromDisk();
+    }
+
+
+
+
+    /**
+     * Reload the termux properties from disk into an in-memory cache.
+     */
+    public void loadTermuxPropertiesFromDisk() {
+        mSharedProperties.loadPropertiesFromDisk();
+        dumpPropertiesToLog();
+        dumpInternalPropertiesToLog();
+        setExtraKeys();
+        setSessionShortcuts();
+    }
+
+    /**
+     * Set the terminal extra keys and style.
+     */
+    private void setExtraKeys() {
+        mExtraKeysInfo = null;
+
+        try {
+            // The mMap stores the extra key and style string values while loading properties
+            // Check {@link #getExtraKeysInternalPropertyValueFromValue(String)} and
+            // {@link #getExtraKeysStyleInternalPropertyValueFromValue(String)}
+            String extrakeys = (String) getInternalPropertyValue(TermuxPropertyConstants.KEY_EXTRA_KEYS, true);
+            String extraKeysStyle = (String) getInternalPropertyValue(TermuxPropertyConstants.KEY_EXTRA_KEYS_STYLE, true);
+            mExtraKeysInfo = new ExtraKeysInfo(extrakeys, extraKeysStyle);
+        } catch (JSONException e) {
+            Toast.makeText(mContext, "Could not load and set the \"" + TermuxPropertyConstants.KEY_EXTRA_KEYS + "\" property from the properties file: " + e.toString(), Toast.LENGTH_LONG).show();
+            Log.e("termux", "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);
+            } catch (JSONException e2) {
+                Toast.makeText(mContext, "Can't create default extra keys", Toast.LENGTH_LONG).show();
+                Log.e("termux", "Could create default extra keys: ", e);
+                mExtraKeysInfo = null;
+            }
+        }
+    }
+
+    /**
+     * Set the terminal sessions shortcuts.
+     */
+    private void setSessionShortcuts() {
+        mSessionShortcuts.clear();
+        // The {@link TermuxPropertyConstants#MAP_SESSION_SHORTCUTS} stores the session shortcut key and action pair
+        for (Map.Entry<String, Integer> entry : TermuxPropertyConstants.MAP_SESSION_SHORTCUTS.entrySet()) {
+            // The mMap stores the code points for the session shortcuts while loading properties
+            Integer codePoint = (Integer) getInternalPropertyValue(entry.getKey(), true);
+            // If codePoint is null, then session shortcut did not exist in properties or was invalid
+            // as parsed by {@link #getCodePointForSessionShortcuts(String,String)}
+            // If codePoint is not null, then get the action for the MAP_SESSION_SHORTCUTS key and
+            // add the code point to sessionShortcuts
+            if (codePoint != null)
+                mSessionShortcuts.add(new KeyboardShortcut(codePoint, entry.getValue()));
+        }
+    }
+
+
+
+
+
+    /**
+     * A static function to get the {@link Properties} from the propertiesFile file.
+     *
+     * @param context The {@link Context} for the {@link SharedProperties#getPropertiesFromFile(Context,File)} call.
+     * @param propertiesFile The {@link File} to read the {@link Properties} from.
+     * @return Returns the {@link Properties} object. It will be {@code null} if an exception is
+     * raised while reading the file.
+     */
+    public static Properties getPropertiesFromFile(Context context, File propertiesFile) {
+        return SharedProperties.getPropertiesFromFile(context, propertiesFile);
+    }
+
+    /**
+     * A static function to get the {@link String} value for the {@link Properties} key read from
+     * the propertiesFile file.
+     *
+     * @param context The {@link Context} for the {@link SharedProperties#getPropertiesFromFile(Context,File)} call.
+     * @param propertiesFile The {@link File} to read the {@link Properties} from.
+     * @param key The key to read.
+     * @param def The default value.
+     * @return Returns the {@link String} object. This will be {@code null} if key is not found.
+     */
+    public static String getPropertyValue(Context context, File propertiesFile, String key, String def) {
+        return (String) getDefaultIfNull(getDefaultIfNull(getPropertiesFromFile(context, propertiesFile), new Properties()).get(key), def);
+    }
+
+    /**
+     * A static function to check if the value is {@code true} for {@link Properties} key read from
+     * the propertiesFile file.
+     *
+     * @param context The {@link Context} for the {@link SharedProperties#getPropertiesFromFile(Context,File)}call.
+     * @param propertiesFile The {@link File} to read the {@link Properties} from.
+     * @param key The key to read.
+     * @return Returns the {@code true} if the {@link Properties} key {@link String} value equals "true",
+     * regardless of case. If the key does not exist in the file or does not equal "true", then
+     * {@code false} will be returned.
+     */
+    public static boolean isPropertyValueTrue(Context context, File propertiesFile, String key) {
+        return (boolean) getBooleanValueForStringValue((String) getPropertyValue(context, propertiesFile, key, null), false);
+    }
+
+    /**
+     * A static function to check if the value is {@code false} for {@link Properties} key read from
+     * the propertiesFile file.
+     *
+     * @param context The {@link Context} for the {@link SharedProperties#getPropertiesFromFile(Context,File)} call.
+     * @param propertiesFile The {@link File} to read the {@link Properties} from.
+     * @param key The key to read.
+     * @return Returns the {@code true} if the {@link Properties} key {@link String} value equals "false",
+     * regardless of case. If the key does not exist in the file or does not equal "false", then
+     * {@code true} will be returned.
+     */
+    public static boolean isPropertyValueFalse(Context context, File propertiesFile, String key) {
+        return (boolean) getInvertedBooleanValueForStringValue((String) getPropertyValue(context, propertiesFile, key, null), true);
+    }
+
+
+
+
+
+    /**
+     * Get the {@link Properties} from the {@link #mPropertiesFile} file.
+     *
+     * @param cached If {@code true}, then the {@link Properties} in-memory cache is returned.
+     *               Otherwise the {@link Properties} object is read directly from the
+     *               {@link #mPropertiesFile} file.
+     * @return Returns the {@link Properties} object. It will be {@code null} if an exception is
+     * raised while reading the file.
+     */
+    public Properties getProperties(boolean cached) {
+        return mSharedProperties.getProperties(cached);
+    }
+
+    /**
+     * Get the {@link String} value for the key passed from the {@link #mPropertiesFile} file.
+     *
+     * @param key The key to read.
+     * @param def The default value.
+     * @param cached If {@code true}, then the value is returned from the the {@link Properties} in-memory cache.
+     *               Otherwise the {@link Properties} object is read directly from the file
+     *               and value is returned from it against the key.
+     * @return Returns the {@link String} object. This will be {@code null} if key is not found.
+     */
+    public String getPropertyValue(String key, String def, boolean cached) {
+        return getDefaultIfNull(mSharedProperties.getProperty(key, cached), def);
+    }
+
+    /**
+     * A function to check if the value is {@code true} for {@link Properties} key read from
+     * the {@link #mPropertiesFile} file.
+     *
+     * @param key The key to read.
+     * @param cached If {@code true}, then the value is checked from the the {@link Properties} in-memory cache.
+     *               Otherwise the {@link Properties} object is read directly from the file
+     *               and value is checked from it.
+     * @return Returns the {@code true} if the {@link Properties} key {@link String} value equals "true",
+     * regardless of case. If the key does not exist in the file or does not equal "true", then
+     * {@code false} will be returned.
+     */
+    public boolean isPropertyValueTrue(String key, boolean cached) {
+        return (boolean) getBooleanValueForStringValue((String) getPropertyValue(key, null, cached), false);
+    }
+
+    /**
+     * A function to check if the value is {@code false} for {@link Properties} key read from
+     * the {@link #mPropertiesFile} file.
+     *
+     * @param key The key to read.
+     * @param cached If {@code true}, then the value is checked from the the {@link Properties} in-memory cache.
+     *               Otherwise the {@link Properties} object is read directly from the file
+     *               and value is checked from it.
+     * @return Returns {@code true} if the {@link Properties} key {@link String} value equals "false",
+     * regardless of case. If the key does not exist in the file or does not equal "false", then
+     * {@code true} will be returned.
+     */
+    public boolean isPropertyValueFalse(String key, boolean cached) {
+        return (boolean) getInvertedBooleanValueForStringValue((String) getPropertyValue(key, null, cached), true);
+    }
+
+
+
+
+
+    /**
+     * Get the internal value {@link Object} {@link HashMap <>} in-memory cache for the
+     * {@link #mPropertiesFile} file. A call to {@link #loadTermuxPropertiesFromDisk()} must be made
+     * before this.
+     *
+     * @return Returns a copy of {@link Map} object.
+     */
+    public Map<String, Object> getInternalProperties() {
+        return mSharedProperties.getInternalProperties();
+    }
+
+    /**
+     * Get the internal {@link Object} value for the key passed from the {@link #mPropertiesFile} file.
+     * If cache is {@code true}, then value is returned from the {@link HashMap <>} in-memory cache,
+     * so a call to {@link #loadTermuxPropertiesFromDisk()} must be made before this.
+     *
+     * @param key The key to read from the {@link HashMap<>} in-memory cache.
+     * @param cached If {@code true}, then the value is returned from the the {@link HashMap <>} in-memory cache,
+     *               but if the value is null, then an attempt is made to return the default value.
+     *               If {@code false}, then the {@link Properties} object is read directly from the file
+     *               and internal value is returned for the property value against the key.
+     * @return Returns the {@link Object} object. This will be {@code null} if key is not found or
+     * the object stored against the key is {@code null}.
+     */
+    public Object getInternalPropertyValue(String key, boolean cached) {
+        Object value;
+        if (cached) {
+            value = mSharedProperties.getInternalProperty(key);
+            // If the value is not null since key was found or if the value was null since the
+            // object stored for the key was itself null, we detect the later by checking if the key
+            // exists in the map.
+            if (value != null || mSharedProperties.getInternalProperties().containsKey(key)) {
+                return value;
+            } else {
+                // This should not happen normally unless mMap was modified after the
+                // {@link #loadTermuxPropertiesFromDisk()} call
+                // A null value can still be returned by
+                // {@link #getInternalPropertyValueFromValue(Context,String,String)} for some keys
+                value = getInternalPropertyValueFromValue(mContext, key, null);
+                Log.w("termux", "The value for \"" + key + "\" not found in SharedProperties cahce, force returning default value: `" + value +  "`");
+                return value;
+            }
+        } else {
+            // We get the property value directly from file and return its internal value
+            return getInternalPropertyValueFromValue(mContext, key, mSharedProperties.getProperty(key, false));
+        }
+    }
+
+    /**
+     * Override the
+     * {@link SharedPropertiesParser#getInternalPropertyValueFromValue(Context,String,String)}
+     * interface function.
+     */
+    @Override
+    public Object getInternalPropertyValueFromValue(Context context, String key, String value) {
+        return getInternalTermuxPropertyValueFromValue(context, key, value);
+    }
+
+    /**
+     * A static function that should return the internal termux {@link Object} for a key/value pair
+     * read from properties file.
+     *
+     * @param context The context for operations.
+     * @param key The key for which the internal object is required.
+     * @param value The literal value for the property found is the properties file.
+     * @return Returns the internal termux {@link Object} object.
+     */
+    public static Object getInternalTermuxPropertyValueFromValue(Context context, String key, String value) {
+        if(key == null) return null;
+        /*
+          For keys where a MAP_* is checked by respective functions. Note that value to this function
+          would actually be the key for the MAP_*:
+          - If the value is currently null, then searching MAP_* should also return null and internal default value will be used.
+          - If the value is not null and does not exist in MAP_*, then internal default value will be used.
+          - If the value is not null and does exist in MAP_*, then internal value returned by map will be used.
+         */
+        switch (key) {
+            // boolean
+            case TermuxPropertyConstants.KEY_USE_BACK_KEY_AS_ESCAPE_KEY:
+                return (boolean) getUseBackKeyAsEscapeKeyInternalPropertyValueFromValue(value);
+            case TermuxPropertyConstants.KEY_USE_BLACK_UI:
+                return (boolean) getUseBlackUIInternalPropertyValueFromValue(context, value);
+            case TermuxPropertyConstants.KEY_VIRTUAL_VOLUME_KEYS_DISABLED:
+                return (boolean) getVolumeKeysDisabledInternalPropertyValueFromValue(value);
+
+            // int
+            case TermuxPropertyConstants.KEY_BELL_BEHAVIOUR:
+                return (int) getBellBehaviourInternalPropertyValueFromValue(value);
+
+            // Integer (may be null)
+            case TermuxPropertyConstants.KEY_SHORTCUT_CREATE_SESSION:
+            case TermuxPropertyConstants.KEY_SHORTCUT_NEXT_SESSION:
+            case TermuxPropertyConstants.KEY_SHORTCUT_PREVIOUS_SESSION:
+            case TermuxPropertyConstants.KEY_SHORTCUT_RENAME_SESSION:
+                return (Integer) getCodePointForSessionShortcuts(key, value);
+
+            // String (may be null)
+            case TermuxPropertyConstants.KEY_DEFAULT_WORKING_DIRECTORY:
+                return (String) getDefaultWorkingDirectoryInternalPropertyValueFromValue(value);
+            case TermuxPropertyConstants.KEY_EXTRA_KEYS:
+                return (String) getExtraKeysInternalPropertyValueFromValue(value);
+            case TermuxPropertyConstants.KEY_EXTRA_KEYS_STYLE:
+                return (String) getExtraKeysStyleInternalPropertyValueFromValue(value);
+            default:
+                // default boolean behaviour
+                if(TermuxPropertyConstants.TERMUX_DEFAULT_BOOLEAN_BEHAVIOUR_PROPERTIES_LIST.contains(key))
+                    return (boolean) getBooleanValueForStringValue(value, false);
+                // default inverted boolean behaviour
+                else if(TermuxPropertyConstants.TERMUX_DEFAULT_INVERETED_BOOLEAN_BEHAVIOUR_PROPERTIES_LIST.contains(key))
+                    return (boolean) getInvertedBooleanValueForStringValue(value, true);
+                // just use String object as is (may be null)
+                else
+                    return value;
+        }
+    }
+
+
+
+
+
+    /**
+     * Get the boolean value for the {@link String} value.
+     *
+     * @param value The {@link String} value to convert.
+     * @param def The default {@link boolean} value to return.
+     * @return Returns {@code true} or {@code false} if value is the literal string "true" or "false" respectively,
+     * regardless of case. Otherwise returns default value.
+     */
+    public static boolean getBooleanValueForStringValue(String value, boolean def) {
+        return (boolean) getDefaultIfNull(TermuxPropertyConstants.MAP_GENERIC_BOOLEAN.get(toLowerCase(value)), def);
+    }
+
+    /**
+     * Get the inverted boolean value for the {@link String} value.
+     *
+     * @param value The {@link String} value to convert.
+     * @param def The default {@link boolean} value to return.
+     * @return Returns {@code true} or {@code false} if value is the literal string "false" or "true" respectively,
+     * regardless of case. Otherwise returns default value.
+     */
+    public static boolean getInvertedBooleanValueForStringValue(String value, boolean def) {
+        return (boolean) getDefaultIfNull(TermuxPropertyConstants.MAP_GENERIC_INVERTED_BOOLEAN.get(toLowerCase(value)), def);
+    }
+
+    /**
+     * Returns {@code true} if value is not {@code null} and equals {@link TermuxPropertyConstants#VALUE_BACK_KEY_BEHAVIOUR_ESCAPE}, otherwise false.
+     *
+     * @param value The {@link String} value to convert.
+     * @return Returns the internal value for value.
+     */
+    public static boolean getUseBackKeyAsEscapeKeyInternalPropertyValueFromValue(String value) {
+        return getDefaultIfNull(value, TermuxPropertyConstants.VALUE_BACK_KEY_BEHAVIOUR_BACK).equals(TermuxPropertyConstants.VALUE_BACK_KEY_BEHAVIOUR_ESCAPE);
+    }
+
+    /**
+     * Returns {@code true} or {@code false} if value is the literal string "true" or "false" respectively regardless of case.
+     * Otherwise returns {@code true} if the night mode is currently enabled in the system.
+     *
+     * @param value The {@link String} value to convert.
+     * @return Returns the internal value for value.
+     */
+    public static boolean getUseBlackUIInternalPropertyValueFromValue(Context context, String value) {
+        int nightMode = context.getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
+        return getBooleanValueForStringValue(value, nightMode == Configuration.UI_MODE_NIGHT_YES);
+    }
+
+    /**
+     * Returns {@code true} if value is not {@code null} and equals {@link TermuxPropertyConstants#VALUE_VOLUME_KEY_BEHAVIOUR_VOLUME}, otherwise {@code false}.
+     *
+     * @param value The {@link String} value to convert.
+     * @return Returns the internal value for value.
+     */
+    public static boolean getVolumeKeysDisabledInternalPropertyValueFromValue(String value) {
+        return getDefaultIfNull(value, TermuxPropertyConstants.VALUE_VOLUME_KEY_BEHAVIOUR_VIRTUAL).equals(TermuxPropertyConstants.VALUE_VOLUME_KEY_BEHAVIOUR_VOLUME);
+    }
+
+    /**
+     * Returns {@code true} if value is not {@code null} and equals {@link TermuxPropertyConstants#VALUE_BACK_KEY_BEHAVIOUR_ESCAPE}, otherwise {@code false}.
+     *
+     * @param value The {@link String} value to convert.
+     * @return Returns the internal value for value.
+     */
+    public static int getBellBehaviourInternalPropertyValueFromValue(String value) {
+        return getDefaultIfNull(TermuxPropertyConstants.MAP_BELL_BEHAVIOUR.get(toLowerCase(value)), TermuxPropertyConstants.DEFAULT_IVALUE_BELL_BEHAVIOUR);
+    }
+
+    /**
+     * Returns the code point for the value if key is not {@code null} and value is not {@code null} and is valid,
+     * otherwise returns {@code null}.
+     *
+     * @param key The key for session shortcut.
+     * @param value The {@link String} value to convert.
+     * @return Returns the internal value for value.
+     */
+    public static Integer getCodePointForSessionShortcuts(String key, String value) {
+        if (key == null) return null;
+        if (value == null) return null;
+        String[] parts = value.toLowerCase().trim().split("\\+");
+        String input = parts.length == 2 ? parts[1].trim() : null;
+        if (!(parts.length == 2 && parts[0].trim().equals("ctrl")) || input.isEmpty() || input.length() > 2) {
+            Log.e("termux", "Keyboard shortcut '" + key + "' is not Ctrl+<something>");
+            return null;
+        }
+
+        char c = input.charAt(0);
+        int codePoint = c;
+        if (Character.isLowSurrogate(c)) {
+            if (input.length() != 2 || Character.isHighSurrogate(input.charAt(1))) {
+                Log.e("termux", "Keyboard shortcut '" + key + "' is not Ctrl+<something>");
+                return null;
+            } else {
+                codePoint = Character.toCodePoint(input.charAt(1), c);
+            }
+        }
+
+        return codePoint;
+    }
+
+    /**
+     * Returns the path itself if a directory exists at it and is readable, otherwise returns
+     *  {@link TermuxPropertyConstants#DEFAULT_IVALUE_DEFAULT_WORKING_DIRECTORY}.
+     *
+     * @param path The {@link String} path to check.
+     * @return Returns the internal value for value.
+     */
+    public static String getDefaultWorkingDirectoryInternalPropertyValueFromValue(String path) {
+        if (path == null || path.isEmpty()) return TermuxPropertyConstants.DEFAULT_IVALUE_DEFAULT_WORKING_DIRECTORY;
+        File workDir = new File(path);
+        if (!workDir.exists() || !workDir.isDirectory() || !workDir.canRead()) {
+            // Fallback to default directory if user configured working directory does not exist
+            // or is not a directory or is not readable.
+            return TermuxPropertyConstants.DEFAULT_IVALUE_DEFAULT_WORKING_DIRECTORY;
+        } else {
+            return path;
+        }
+    }
+
+    /**
+     * Returns the value itself if it is not {@code null}, otherwise returns {@link TermuxPropertyConstants#DEFAULT_IVALUE_EXTRA_KEYS}.
+     *
+     * @param value The {@link String} value to convert.
+     * @return Returns the internal value for value.
+     */
+    public static String getExtraKeysInternalPropertyValueFromValue(String value) {
+        return getDefaultIfNull(value, TermuxPropertyConstants.DEFAULT_IVALUE_EXTRA_KEYS);
+    }
+
+    /**
+     * Returns the value itself if it is not {@code null}, otherwise returns {@link TermuxPropertyConstants#DEFAULT_IVALUE_EXTRA_KEYS_STYLE}.
+     *
+     * @param value {@link String} value to convert.
+     * @return Returns the internal value for value.
+     */
+    public static String getExtraKeysStyleInternalPropertyValueFromValue(String value) {
+        return getDefaultIfNull(value, TermuxPropertyConstants.DEFAULT_IVALUE_EXTRA_KEYS_STYLE);
+    }
+
+
+
+
+
+    public boolean isBackKeyTheEscapeKey() {
+        return (boolean) getInternalPropertyValue(TermuxPropertyConstants.KEY_USE_BACK_KEY_AS_ESCAPE_KEY, true);
+    }
+
+    public boolean isUsingBlackUI() {
+        return (boolean) getInternalPropertyValue(TermuxPropertyConstants.KEY_USE_BLACK_UI, true);
+    }
+
+    public boolean isUsingFullScreen() {
+        return (boolean) getInternalPropertyValue(TermuxPropertyConstants.KEY_USE_FULLSCREEN, true);
+    }
+
+    public boolean isUsingFullScreenWorkAround() {
+        return (boolean) getInternalPropertyValue(TermuxPropertyConstants.KEY_USE_FULLSCREEN_WORKAROUND, true);
+    }
+
+    public boolean areVirtualVolumeKeysDisabled() {
+        return (boolean) getInternalPropertyValue(TermuxPropertyConstants.KEY_VIRTUAL_VOLUME_KEYS_DISABLED, true);
+    }
+
+    public int getBellBehaviour() {
+        return (int) getInternalPropertyValue(TermuxPropertyConstants.KEY_BELL_BEHAVIOUR, true);
+    }
+
+    public List<KeyboardShortcut> getSessionShortcuts() {
+        return mSessionShortcuts;
+    }
+
+    public String getDefaultWorkingDirectory() {
+        return (String) getInternalPropertyValue(TermuxPropertyConstants.KEY_DEFAULT_WORKING_DIRECTORY, true);
+    }
+
+    public ExtraKeysInfo getExtraKeysInfo() {
+        return mExtraKeysInfo;
+    }
+
+
+
+
+
+    public static <T> T getDefaultIfNull(@Nullable T object, @Nullable T def) {
+        return (object == null) ? def : object;
+    }
+
+    private static String toLowerCase(String value) {
+        if (value == null) return null; else return value.toLowerCase();
+    }
+
+
+
+
+    public void dumpPropertiesToLog() {
+        Properties properties = getProperties(true);
+        StringBuilder propertiesDump = new StringBuilder();
+
+        propertiesDump.append("Termux Properties:");
+        if (properties != null) {
+            for (String key : properties.stringPropertyNames()) {
+                propertiesDump.append("\n").append(key).append(": `").append(properties.get(key)).append("`");
+            }
+        } else {
+            propertiesDump.append(" null");
+        }
+
+        Log.d("termux", propertiesDump.toString());
+    }
+
+    public void dumpInternalPropertiesToLog() {
+        HashMap<String, Object> internalProperties = (HashMap<String, Object>) getInternalProperties();
+        StringBuilder internalPropertiesDump = new StringBuilder();
+
+        internalPropertiesDump.append("Termux Internal Properties:");
+        if (internalProperties != null) {
+            for (String key : internalProperties.keySet()) {
+                internalPropertiesDump.append("\n").append(key).append(": `").append(internalProperties.get(key)).append("`");
+            }
+        }
+
+        Log.d("termux", internalPropertiesDump.toString());
+    }
+
+}

From ef9e40630002829fae66f189be53301ce33d792f Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 11 Mar 2021 20:11:59 +0500
Subject: [PATCH 221/912] Update TermuxConstants

The `TermuxConstants` and `TermuxPropertyConstants` classes have both been updated to `v0.2.0`. Check their Changelog sections for info on changes.
Some other hardcoded termux paths have been removed as well and are now referenced from `TermuxConstants` class.
---
 .../java/com/termux/app/BackgroundJob.java    |  18 +-
 .../com/termux/app/RunCommandService.java     |  12 +-
 .../java/com/termux/app/TermuxActivity.java   |   4 +-
 .../java/com/termux/app/TermuxConstants.java  | 335 ++++++++++++++----
 .../java/com/termux/app/TermuxInstaller.java  |   6 +-
 .../com/termux/app/TermuxOpenReceiver.java    |   2 +-
 .../java/com/termux/app/TermuxService.java    |   8 +-
 .../properties/TermuxPropertyConstants.java   |  25 +-
 .../filepicker/TermuxDocumentsProvider.java   |   4 +-
 .../TermuxFileReceiverActivity.java           |   6 +-
 10 files changed, 307 insertions(+), 113 deletions(-)

diff --git a/app/src/main/java/com/termux/app/BackgroundJob.java b/app/src/main/java/com/termux/app/BackgroundJob.java
index bb4e19a828..3f502d16e6 100644
--- a/app/src/main/java/com/termux/app/BackgroundJob.java
+++ b/app/src/main/java/com/termux/app/BackgroundJob.java
@@ -36,7 +36,7 @@ public BackgroundJob(String cwd, String fileToExecute, final String[] args, fina
 
     public BackgroundJob(String cwd, String fileToExecute, final String[] args, final TermuxService service, PendingIntent pendingIntent) {
         String[] env = buildEnvironment(false, cwd);
-        if (cwd == null || cwd.isEmpty()) cwd = TermuxConstants.HOME_PATH;
+        if (cwd == null || cwd.isEmpty()) cwd = TermuxConstants.TERMUX_HOME_DIR_PATH;
 
         final String[] progArray = setupProcessArgs(fileToExecute, args);
         final String processDescription = Arrays.toString(progArray);
@@ -134,17 +134,17 @@ private static void addToEnvIfPresent(List<String> environment, String name) {
     }
 
     static String[] buildEnvironment(boolean failSafe, String cwd) {
-        new File(TermuxConstants.HOME_PATH).mkdirs();
+        TermuxConstants.TERMUX_HOME_DIR.mkdirs();
 
-        if (cwd == null || cwd.isEmpty()) cwd = TermuxConstants.HOME_PATH;
+        if (cwd == null || cwd.isEmpty()) cwd = TermuxConstants.TERMUX_HOME_DIR_PATH;
 
         List<String> environment = new ArrayList<>();
 
         environment.add("TERMUX_VERSION=" + BuildConfig.VERSION_NAME);
         environment.add("TERM=xterm-256color");
         environment.add("COLORTERM=truecolor");
-        environment.add("HOME=" + TermuxConstants.HOME_PATH);
-        environment.add("PREFIX=" + TermuxConstants.PREFIX_PATH);
+        environment.add("HOME=" + TermuxConstants.TERMUX_HOME_DIR_PATH);
+        environment.add("PREFIX=" + TermuxConstants.TERMUX_PREFIX_DIR_PATH);
         environment.add("BOOTCLASSPATH=" + System.getenv("BOOTCLASSPATH"));
         environment.add("ANDROID_ROOT=" + System.getenv("ANDROID_ROOT"));
         environment.add("ANDROID_DATA=" + System.getenv("ANDROID_DATA"));
@@ -164,9 +164,9 @@ static String[] buildEnvironment(boolean failSafe, String cwd) {
             environment.add("PATH= " + System.getenv("PATH"));
         } else {
             environment.add("LANG=en_US.UTF-8");
-            environment.add("PATH=" + TermuxConstants.PREFIX_PATH + "/bin");
+            environment.add("PATH=" + TermuxConstants.TERMUX_BIN_PREFIX_DIR_PATH);
             environment.add("PWD=" + cwd);
-            environment.add("TMPDIR=" + TermuxConstants.PREFIX_PATH + "/tmp");
+            environment.add("TMPDIR=" + TermuxConstants.TERMUX_TMP_PREFIX_DIR_PATH);
         }
 
         return environment.toArray(new String[0]);
@@ -215,7 +215,7 @@ static String[] setupProcessArgs(String fileToExecute, String[] args) {
                                     if (executable.startsWith("/usr") || executable.startsWith("/bin")) {
                                         String[] parts = executable.split("/");
                                         String binary = parts[parts.length - 1];
-                                        interpreter = TermuxConstants.PREFIX_PATH + "/bin/" + binary;
+                                        interpreter = TermuxConstants.TERMUX_BIN_PREFIX_DIR_PATH + "/" + binary;
                                     }
                                     break;
                                 }
@@ -225,7 +225,7 @@ static String[] setupProcessArgs(String fileToExecute, String[] args) {
                         }
                     } else {
                         // No shebang and no ELF, use standard shell.
-                        interpreter = TermuxConstants.PREFIX_PATH + "/bin/sh";
+                        interpreter = TermuxConstants.TERMUX_BIN_PREFIX_DIR_PATH + "/sh";
                     }
                 }
             }
diff --git a/app/src/main/java/com/termux/app/RunCommandService.java b/app/src/main/java/com/termux/app/RunCommandService.java
index eb6efc216a..d1c523eebe 100644
--- a/app/src/main/java/com/termux/app/RunCommandService.java
+++ b/app/src/main/java/com/termux/app/RunCommandService.java
@@ -184,9 +184,9 @@ private void setupNotificationChannel() {
     }
 
     private boolean allowExternalApps() {
-        File propsFile = new File(TermuxConstants.TERMUX_PROPERTIES_PRIMARY_PATH);
+        File propsFile = new File(TermuxConstants.TERMUX_PROPERTIES_PRIMARY_FILE_PATH);
         if (!propsFile.exists())
-            propsFile = new File(TermuxConstants.TERMUX_PROPERTIES_SECONDARY_PATH);
+            propsFile = new File(TermuxConstants.TERMUX_PROPERTIES_SECONDARY_FILE_PATH);
 
         Properties props = new Properties();
         try {
@@ -205,10 +205,10 @@ private boolean allowExternalApps() {
     /** Replace "$PREFIX/" or "~/" prefix with termux absolute paths */
     public static String getExpandedTermuxPath(String path) {
         if(path != null && !path.isEmpty()) {
-            path = path.replaceAll("^\\$PREFIX$", TermuxConstants.PREFIX_PATH);
-            path = path.replaceAll("^\\$PREFIX/", TermuxConstants.PREFIX_PATH + "/");
-            path = path.replaceAll("^~/$", TermuxConstants.HOME_PATH);
-            path = path.replaceAll("^~/", TermuxConstants.HOME_PATH + "/");
+            path = path.replaceAll("^\\$PREFIX$", TermuxConstants.TERMUX_PREFIX_DIR_PATH);
+            path = path.replaceAll("^\\$PREFIX/", TermuxConstants.TERMUX_PREFIX_DIR_PATH + "/");
+            path = path.replaceAll("^~/$", TermuxConstants.TERMUX_HOME_DIR_PATH);
+            path = path.replaceAll("^~/", TermuxConstants.TERMUX_HOME_DIR_PATH + "/");
         }
 
         return path;
diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index e3396ab08d..2c50350e20 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -167,8 +167,8 @@ public void onReceive(Context context, Intent intent) {
 
     void checkForFontAndColors() {
         try {
-            File colorsFile = new File(TermuxConstants.COLOR_PROPERTIES_PATH);
-            File fontFile = new File(TermuxConstants.FONT_PATH);
+            File colorsFile = TermuxConstants.TERMUX_COLOR_PROPERTIES_FILE;
+            File fontFile = TermuxConstants.TERMUX_FONT_FILE;
 
             final Properties props = new Properties();
             if (colorsFile.isFile()) {
diff --git a/app/src/main/java/com/termux/app/TermuxConstants.java b/app/src/main/java/com/termux/app/TermuxConstants.java
index cf4da908d1..d1c3acb600 100644
--- a/app/src/main/java/com/termux/app/TermuxConstants.java
+++ b/app/src/main/java/com/termux/app/TermuxConstants.java
@@ -4,13 +4,33 @@
 
 import java.io.File;
 
-// Version: v0.1.0
+/*
+ * Version: v0.2.0
+ *
+ * Changelog
+ *
+ * - 0.1.0 (2021-03-08)
+ *      - Initial Release.
+ *
+ * - 0.2.0 (2021-03-11)
+ *      - Added `_DIR` and `_FILE` substrings to paths.
+ *      - Add INTERNAL_PRIVATE_APP_DATA_DIR*, TERMUX_CACHE_DIR*, TERMUX_DATABASES_DIR*,
+ *          TERMUX_SHARED_PREFERENCES_DIR*, TERMUX_BIN_PREFIX_DIR*, TERMUX_ETC_DIR*, TERMUX_INCLUDE_DIR*,
+ *          TERMUX_LIB_DIR*, TERMUX_LIBEXEC_DIR*, TERMUX_SHARE_DIR*, TERMUX_TMP_DIR*, TERMUX_VAR_DIR*,
+ *          TERMUX_STAGING_PREFIX_DIR*, TERMUX_STORAGE_HOME_DIR*, TERMUX_DEFAULT_PREFERENCES_FILE_BASENAME*,
+ *          TERMUX_DEFAULT_PREFERENCES_FILE
+ *      - Renamed `DATA_HOME_PATH` to `TERMUX_DATA_HOME_DIR_PATH`.
+ *      - Renamed `CONFIG_HOME_PATH` to `TERMUX_CONFIG_HOME_DIR_PATH`.
+ *      - Updated javadocs and spacing.
+ *
+ */
 
 /**
  * A class that defines shared constants of the Termux app and its plugins.
  * This class will be hosted by termux-app and should be imported by other termux plugin apps as is
  * instead of copying constants to random classes. The 3rd party apps can also import it for
- * interacting with termux apps.
+ * interacting with termux apps. If changes are made to this file, increment the version number
+ * and add an entry in the Changelog section above.
  *
  * Termux app default package name is "com.termux" and is used in PREFIX_PATH.
  * The binaries compiled for termux have PREFIX_PATH hardcoded in them but it can be changed during
@@ -39,175 +59,348 @@
  * TERMUX_PACKAGE_NAME must be used in source code of Termux app and its plugins instead of hardcoded
  * "com.termux" paths.
  */
-
 public final class TermuxConstants {
 
-    /**
-     * Termux app and plugin app and package names.
+    /*
+     * Termux and its plugin app and package names.
      */
 
+    /** Termux app name */
     public static final String TERMUX_APP_NAME = "Termux"; // Default: "Termux"
+    /** Termux app package name */
     public static final String TERMUX_PACKAGE_NAME = "com.termux"; // Default: "com.termux"
 
+
+    /** Termux API app name */
     public static final String TERMUX_API_APP_NAME = "Termux:API"; // Default: "Termux:API"
+    /** Termux API app package name */
     public static final String TERMUX_API_PACKAGE_NAME = TERMUX_PACKAGE_NAME + ".api"; // Default: "com.termux.api"
 
+
+    /** Termux Boot app name */
     public static final String TERMUX_BOOT_APP_NAME = "Termux:Boot"; // Default: "Termux:Boot"
+    /** Termux Boot app package name */
     public static final String TERMUX_BOOT_PACKAGE_NAME = TERMUX_PACKAGE_NAME + ".boot"; // Default: "com.termux.boot"
 
+
+    /** Termux Float app name */
     public static final String TERMUX_FLOAT_APP_NAME = "Termux:Float"; // Default: "Termux:Float"
+    /** Termux Float app package name */
     public static final String TERMUX_FLOAT_PACKAGE_NAME = TERMUX_PACKAGE_NAME + ".window"; // Default: "com.termux.window"
 
+
+    /** Termux Styling app name */
     public static final String TERMUX_STYLING_APP_NAME = "Termux:Styling"; // Default: "Termux:Styling"
+    /** Termux Styling app package name */
     public static final String TERMUX_STYLING_PACKAGE_NAME = TERMUX_PACKAGE_NAME + ".styling"; // Default: "com.termux.styling"
 
+
+    /** Termux Plugin app name */
     public static final String TERMUX_TASKER_APP_NAME = "Termux:Tasker"; // Default: "Termux:Tasker"
+    /** Termux Plugin app package name */
     public static final String TERMUX_TASKER_PACKAGE_NAME = TERMUX_PACKAGE_NAME + ".tasker"; // Default: "com.termux.tasker"
 
+
+    /** Termux Widget app name */
     public static final String TERMUX_WIDGET_APP_NAME = "Termux:Widget"; // Default: "Termux:Widget"
+    /** Termux Widget app package name */
     public static final String TERMUX_WIDGET_PACKAGE_NAME = TERMUX_PACKAGE_NAME + ".widget"; // Default: "com.termux.widget"
 
 
 
-    /**
-     * Termux app core paths.
+
+
+    /*
+     * Termux app core directory paths.
      */
 
+    /** Termux app internal private app data directory path */
     @SuppressLint("SdCardPath")
-    public static final String FILES_PATH = "/data/data/" + TERMUX_PACKAGE_NAME + "/files"; // Default: "/data/data/com.termux/files"
-    public static final String PREFIX_PATH = FILES_PATH + "/usr"; // Termux $PREFIX path. Default: "/data/data/com.termux/files/usr"
-    public static final String HOME_PATH = FILES_PATH + "/home"; // Termux $HOME path. Default: "/data/data/com.termux/files/home"
-    public static final String DATA_HOME_PATH = HOME_PATH + "/.termux"; // Default: "/data/data/com.termux/files/home/.termux"
-    public static final String CONFIG_HOME_PATH = HOME_PATH + "/.config/termux"; // Default: "/data/data/com.termux/files/home/.config/termux"
+    public static final String INTERNAL_PRIVATE_APP_DATA_DIR_PATH = "/data/data/" + TERMUX_PACKAGE_NAME; // Default: "/data/data/com.termux"
+    /** Termux app internal private app data directory */
+    public static final File INTERNAL_PRIVATE_APP_DATA_DIR = new File(INTERNAL_PRIVATE_APP_DATA_DIR_PATH);
 
 
+    /** Termux app cache directory path */
+    public static final String TERMUX_CACHE_DIR_PATH = INTERNAL_PRIVATE_APP_DATA_DIR_PATH + "/cache"; // Default: "/data/data/com.termux/cache"
+    /** Termux app cache directory */
+    public static final File TERMUX_CACHE_DIR = new File(TERMUX_CACHE_DIR_PATH);
 
-    /**
-     * Termux app plugin specific paths.
+
+    /** Termux app database directory path */
+    public static final String TERMUX_DATABASES_DIR_PATH = INTERNAL_PRIVATE_APP_DATA_DIR_PATH + "/databases"; // Default: "/data/data/com.termux/databases"
+    /** Termux app database directory */
+    public static final File TERMUX_DATABASES_DIR = new File(TERMUX_DATABASES_DIR_PATH);
+
+
+    /** Termux app shared preferences directory path */
+    public static final String TERMUX_SHARED_PREFERENCES_DIR_PATH = INTERNAL_PRIVATE_APP_DATA_DIR_PATH + "/shared_prefs"; // Default: "/data/data/com.termux/shared_prefs"
+    /** Termux app shared preferences directory */
+    public static final File TERMUX_SHARED_PREFERENCES_DIR = new File(TERMUX_SHARED_PREFERENCES_DIR_PATH);
+
+
+    /** Termux app Files directory path */
+    public static final String TERMUX_FILES_DIR_PATH = INTERNAL_PRIVATE_APP_DATA_DIR_PATH + "/files"; // Default: "/data/data/com.termux/files"
+    /** Termux app Files directory */
+    public static final File TERMUX_FILES_DIR = new File(TERMUX_FILES_DIR_PATH);
+
+
+
+    /** Termux app $PREFIX directory path */
+    public static final String TERMUX_PREFIX_DIR_PATH = TERMUX_FILES_DIR_PATH + "/usr"; // Default: "/data/data/com.termux/files/usr"
+    /** Termux app $PREFIX directory */
+    public static final File TERMUX_PREFIX_DIR = new File(TERMUX_PREFIX_DIR_PATH);
+
+
+    /** Termux app $PREFIX/bin directory path */
+    public static final String TERMUX_BIN_PREFIX_DIR_PATH = TERMUX_PREFIX_DIR_PATH + "/bin"; // Default: "/data/data/com.termux/files/usr/bin"
+    /** Termux app $PREFIX/bin directory */
+    public static final File TERMUX_BIN_PREFIX_DIR = new File(TERMUX_BIN_PREFIX_DIR_PATH);
+
+
+    /** Termux app $PREFIX/etc directory path */
+    public static final String TERMUX_ETC_PREFIX_DIR_PATH = TERMUX_PREFIX_DIR_PATH + "/etc"; // Default: "/data/data/com.termux/files/usr/etc"
+    /** Termux app $PREFIX/etc directory */
+    public static final File TERMUX_ETC_DIR = new File(TERMUX_ETC_PREFIX_DIR_PATH);
+
+
+    /** Termux app $PREFIX/include directory path */
+    public static final String TERMUX_INCLUDE_PREFIX_DIR_PATH = TERMUX_PREFIX_DIR_PATH + "/include"; // Default: "/data/data/com.termux/files/usr/include"
+    /** Termux app $PREFIX/include directory */
+    public static final File TERMUX_INCLUDE_DIR = new File(TERMUX_INCLUDE_PREFIX_DIR_PATH);
+
+
+    /** Termux app $PREFIX/lib directory path */
+    public static final String TERMUX_LIB_PREFIX_DIR_PATH = TERMUX_PREFIX_DIR_PATH + "/lib"; // Default: "/data/data/com.termux/files/usr/lib"
+    /** Termux app $PREFIX/lib directory */
+    public static final File TERMUX_LIB_DIR = new File(TERMUX_LIB_PREFIX_DIR_PATH);
+
+
+    /** Termux app $PREFIX/libexec directory path */
+    public static final String TERMUX_LIBEXEC_PREFIX_DIR_PATH = TERMUX_PREFIX_DIR_PATH + "/libexec"; // Default: "/data/data/com.termux/files/usr/libexec"
+    /** Termux app $PREFIX/libexec directory */
+    public static final File TERMUX_LIBEXEC_DIR = new File(TERMUX_LIBEXEC_PREFIX_DIR_PATH);
+
+
+    /** Termux app $PREFIX/share directory path */
+    public static final String TERMUX_SHARE_PREFIX_DIR_PATH = TERMUX_PREFIX_DIR_PATH + "/share"; // Default: "/data/data/com.termux/files/usr/share"
+    /** Termux app $PREFIX/share directory */
+    public static final File TERMUX_SHARE_DIR = new File(TERMUX_SHARE_PREFIX_DIR_PATH);
+
+
+    /** Termux app $PREFIX/tmp and $TMP directory path */
+    public static final String TERMUX_TMP_PREFIX_DIR_PATH = TERMUX_PREFIX_DIR_PATH + "/tmp"; // Default: "/data/data/com.termux/files/usr/tmp"
+    /** Termux app $PREFIX/tmp and $TMP directory */
+    public static final File TERMUX_TMP_DIR = new File(TERMUX_TMP_PREFIX_DIR_PATH);
+
+
+    /** Termux app $PREFIX/var directory path */
+    public static final String TERMUX_VAR_PREFIX_DIR_PATH = TERMUX_PREFIX_DIR_PATH + "/var"; // Default: "/data/data/com.termux/files/usr/var"
+    /** Termux app $PREFIX/var directory */
+    public static final File TERMUX_VAR_DIR = new File(TERMUX_VAR_PREFIX_DIR_PATH);
+
+
+
+    /** Termux app usr-staging directory path */
+    public static final String TERMUX_STAGING_PREFIX_DIR_PATH = TERMUX_FILES_DIR_PATH + "/usr-staging"; // Default: "/data/data/com.termux/files/usr-staging"
+    /** Termux app usr-staging directory */
+    public static final File TERMUX_STAGING_PREFIX_DIR = new File(TERMUX_STAGING_PREFIX_DIR_PATH);
+
+
+
+    /** Termux app $HOME directory path */
+    public static final String TERMUX_HOME_DIR_PATH = TERMUX_FILES_DIR_PATH + "/home"; // Default: "/data/data/com.termux/files/home"
+    /** Termux app $HOME directory */
+    public static final File TERMUX_HOME_DIR = new File(TERMUX_HOME_DIR_PATH);
+
+
+    /** Termux app config home directory path */
+    public static final String TERMUX_CONFIG_HOME_DIR_PATH = TERMUX_HOME_DIR_PATH + "/.config/termux"; // Default: "/data/data/com.termux/files/home/.config/termux"
+    /** Termux app config home directory */
+    public static final File TERMUX_CONFIG_HOME_DIR = new File(TERMUX_CONFIG_HOME_DIR_PATH);
+
+
+    /** Termux app data home directory path */
+    public static final String TERMUX_DATA_HOME_DIR_PATH = TERMUX_HOME_DIR_PATH + "/.termux"; // Default: "/data/data/com.termux/files/home/.termux"
+    /** Termux app data home directory */
+    public static final File TERMUX_DATA_HOME_DIR = new File(TERMUX_DATA_HOME_DIR_PATH);
+
+
+    /** Termux app storage home directory path */
+    public static final String TERMUX_STORAGE_HOME_DIR_PATH = TERMUX_HOME_DIR_PATH + "/storage"; // Default: "/data/data/com.termux/files/home/storage"
+    /** Termux app storage home directory */
+    public static final File TERMUX_STORAGE_HOME_DIR = new File(TERMUX_STORAGE_HOME_DIR_PATH);
+
+
+
+
+
+    /*
+     * Termux app core file paths.
      */
 
-    // Path to store scripts to be run at boot by Termux:Boot
-    public static final String BOOT_SCRIPTS_PATH = DATA_HOME_PATH + "/boot"; // Default: "/data/data/com.termux/files/home/.termux/boot"
+    /* Termux app default SharedPreferences file basename */
+    public static final String TERMUX_DEFAULT_PREFERENCES_FILE_BASENAME = TERMUX_PACKAGE_NAME + "_preferences.xml"; // Default: "com.termux_preferences.xml"
 
-    // Path to store foreground scripts that can be run by the termux launcher widget provided by Termux:Widget
-    public static final String SHORTCUT_SCRIPTS_PATH = DATA_HOME_PATH + "/shortcuts"; // Default: "/data/data/com.termux/files/home/.termux/shortcuts"
+    /* Termux app default SharedPreferences file path */
+    public static final String TERMUX_DEFAULT_PREFERENCES_FILE_PATH = TERMUX_SHARED_PREFERENCES_DIR_PATH + "/" + TERMUX_DEFAULT_PREFERENCES_FILE_BASENAME; // Default: "/data/data/com.termux/shared_prefs/com.termux_preferences.xml"
+    /* Termux app default SharedPreferences file */
+    public static final File TERMUX_DEFAULT_PREFERENCES_FILE = new File(TERMUX_DEFAULT_PREFERENCES_FILE_PATH);
 
-    // Path to store background scripts that can be run by the termux launcher widget provided by Termux:Widget
-    public static final String SHORTCUT_TASKS_SCRIPTS_PATH = DATA_HOME_PATH + "/shortcuts/tasks"; // Default: "/data/data/com.termux/files/home/.termux/shortcuts/tasks"
+    /* Termux app termux.properties primary file path */
+    public static final String TERMUX_PROPERTIES_PRIMARY_FILE_PATH = TERMUX_DATA_HOME_DIR_PATH + "/termux.properties"; // Default: "/data/data/com.termux/files/home/.termux/termux.properties"
+    /* Termux app termux.properties primary file */
+    public static final File TERMUX_PROPERTIES_PRIMARY_FILE = new File(TERMUX_PROPERTIES_PRIMARY_FILE_PATH);
 
-    // Path to store scripts to be run by 3rd party twofortyfouram locale plugin host apps like Tasker app via the Termux:Tasker plugin client
-    public static final String TASKER_SCRIPTS_PATH = DATA_HOME_PATH + "/tasker"; // Default: "/data/data/com.termux/files/home/.termux/tasker"
+    /* Termux app termux.properties secondary file path */
+    public static final String TERMUX_PROPERTIES_SECONDARY_FILE_PATH = TERMUX_CONFIG_HOME_DIR_PATH + "/termux.properties"; // Default: "/data/data/com.termux/files/home/.config/termux/termux.properties"
+    /* Termux app termux.properties secondary file */
+    public static final File TERMUX_PROPERTIES_SECONDARY_FILE = new File(TERMUX_PROPERTIES_SECONDARY_FILE_PATH);
 
-    // Termux app termux.properties primary path
-    public static final String TERMUX_PROPERTIES_PRIMARY_PATH = DATA_HOME_PATH + "/termux.properties"; // Default: "/data/data/com.termux/files/home/.termux/termux.properties"
+    /* Termux app and Termux:Styling colors.properties file path */
+    public static final String TERMUX_COLOR_PROPERTIES_FILE_PATH = TERMUX_DATA_HOME_DIR_PATH + "/colors.properties"; // Default: "/data/data/com.termux/files/home/.termux/colors.properties"
+    /* Termux app and Termux:Styling colors.properties file */
+    public static final File TERMUX_COLOR_PROPERTIES_FILE = new File(TERMUX_COLOR_PROPERTIES_FILE_PATH);
 
-    // Termux app termux.properties secondary path
-    public static final String TERMUX_PROPERTIES_SECONDARY_PATH = CONFIG_HOME_PATH + "/termux.properties"; // Default: "/data/data/com.termux/files/home/.config/termux/termux.properties"
+    /* Termux app and Termux:Styling font.ttf file path */
+    public static final String TERMUX_FONT_FILE_PATH = TERMUX_DATA_HOME_DIR_PATH + "/font.ttf"; // Default: "/data/data/com.termux/files/home/.termux/font.ttf"
+    /* Termux app and Termux:Styling font.ttf file */
+    public static final File TERMUX_FONT_FILE = new File(TERMUX_FONT_FILE_PATH);
 
-    // Termux app and Termux:Styling colors.properties path
-    public static final String COLOR_PROPERTIES_PATH = DATA_HOME_PATH + "/colors.properties"; // Default: "/data/data/com.termux/files/home/.termux/colors.properties"
 
-    // Termux app and Termux:Styling font.ttf path
-    public static final String FONT_PATH = DATA_HOME_PATH + "/font.ttf"; // Default: "/data/data/com.termux/files/home/.termux/font.ttf"
 
 
 
-    /**
-     * Termux app plugin specific path File objects.
+    /*
+     * Termux app plugin specific paths.
      */
 
-    public static final File FILES_DIR = new File(FILES_PATH);
-    public static final File PREFIX_DIR = new File(PREFIX_PATH);
-    public static final File HOME_DIR = new File(HOME_PATH);
-    public static final File DATA_HOME_DIR = new File(DATA_HOME_PATH);
-    public static final File CONFIG_HOME_DIR = new File(CONFIG_HOME_PATH);
-    public static final File BOOT_SCRIPTS_DIR = new File(BOOT_SCRIPTS_PATH);
-    public static final File SHORTCUT_SCRIPTS_DIR = new File(SHORTCUT_SCRIPTS_PATH);
-    public static final File SHORTCUT_TASKS_SCRIPTS_DIR = new File(SHORTCUT_TASKS_SCRIPTS_PATH);
-    public static final File TASKER_SCRIPTS_DIR = new File(TASKER_SCRIPTS_PATH);
+     /* Termux app directory path to store scripts to be run at boot by Termux:Boot */
+    public static final String TERMUX_BOOT_SCRIPTS_DIR_PATH = TERMUX_DATA_HOME_DIR_PATH + "/boot"; // Default: "/data/data/com.termux/files/home/.termux/boot"
+    /* Termux app directory to store scripts to be run at boot by Termux:Boot */
+    public static final File TERMUX_BOOT_SCRIPTS_DIR = new File(TERMUX_BOOT_SCRIPTS_DIR_PATH);
+
+
+    /* Termux app directory path to store foreground scripts that can be run by the termux launcher widget provided by Termux:Widget */
+    public static final String TERMUX_SHORTCUT_SCRIPTS_DIR_PATH = TERMUX_DATA_HOME_DIR_PATH + "/shortcuts"; // Default: "/data/data/com.termux/files/home/.termux/shortcuts"
+    /* Termux app directory to store foreground scripts that can be run by the termux launcher widget provided by Termux:Widget */
+    public static final File TERMUX_SHORTCUT_SCRIPTS_DIR = new File(TERMUX_SHORTCUT_SCRIPTS_DIR_PATH);
+
 
+     /* Termux app directory path to store background scripts that can be run by the termux launcher widget provided by Termux:Widget */
+    public static final String TERMUX_SHORTCUT_TASKS_SCRIPTS_DIR_PATH = TERMUX_DATA_HOME_DIR_PATH + "/shortcuts/tasks"; // Default: "/data/data/com.termux/files/home/.termux/shortcuts/tasks"
+    /* Termux app directory to store background scripts that can be run by the termux launcher widget provided by Termux:Widget */
+    public static final File TERMUX_SHORTCUT_TASKS_SCRIPTS_DIR = new File(TERMUX_SHORTCUT_TASKS_SCRIPTS_DIR_PATH);
 
 
-    // Android OS permission declared by Termux app in AndroidManifest.xml which can be requested by 3rd party apps to run various commands in Termux app context
+    /* Termux app directory path to store scripts to be run by 3rd party twofortyfouram locale plugin host apps like Tasker app via the Termux:Tasker plugin client */
+    public static final String TERMUX_TASKER_SCRIPTS_DIR_PATH = TERMUX_DATA_HOME_DIR_PATH + "/tasker"; // Default: "/data/data/com.termux/files/home/.termux/tasker"
+    /* Termux app directory to store scripts to be run by 3rd party twofortyfouram locale plugin host apps like Tasker app via the Termux:Tasker plugin client */
+    public static final File TERMUX_TASKER_SCRIPTS_DIR = new File(TERMUX_TASKER_SCRIPTS_DIR_PATH);
+
+
+
+
+
+    /*
+     * Termux app and plugins miscellaneous variables.
+     */
+
+     /* Android OS permission declared by Termux app in AndroidManifest.xml which can be requested by 3rd party apps to run various commands in Termux app context */
     public static final String PERMISSION_RUN_COMMAND = TERMUX_PACKAGE_NAME + ".permission.RUN_COMMAND"; // Default: "com.termux.permission.RUN_COMMAND"
 
-    // Termux property defined in termux.properties file as a secondary check to PERMISSION_RUN_COMMAND to allow 3rd party apps to run various commands in Termux app context
+     /* Termux property defined in termux.properties file as a secondary check to PERMISSION_RUN_COMMAND to allow 3rd party apps to run various commands in Termux app context */
     public static final String PROP_ALLOW_EXTERNAL_APPS = "allow-external-apps"; // Default: "allow-external-apps"
+    /* Default value for {@link #PROP_ALLOW_EXTERNAL_APPS} */
     public static final String PROP_DEFAULT_VALUE_ALLOW_EXTERNAL_APPS = "false"; // Default: "false"
 
 
+
+
+
+
     /**
      * Termux app constants.
      */
-
     public static final class TERMUX_APP {
 
+        /** Termux app core activity name. */
+        public static final String TERMUX_ACTIVITY_NAME = TERMUX_PACKAGE_NAME + ".app.TermuxActivity"; // Default: "com.termux.app.TermuxActivity"
+
         /**
          * Termux app core activity.
          */
-
-        public static final String TERMUX_ACTIVITY_NAME = TERMUX_PACKAGE_NAME + ".app.TermuxActivity"; // Default: "com.termux.app.TermuxActivity"
         public static final class TERMUX_ACTIVITY {
 
-            // Intent action to start termux failsafe session
+            /* Intent action to start termux failsafe session */
             public static final String ACTION_FAILSAFE_SESSION = TermuxConstants.TERMUX_PACKAGE_NAME + ".app.failsafe_session"; // Default: "com.termux.app.failsafe_session"
 
-            // Intent action to make termux reload its termux session styling
+
+            /* Intent action to make termux reload its termux session styling */
             public static final String ACTION_RELOAD_STYLE = TermuxConstants.TERMUX_PACKAGE_NAME + ".app.reload_style"; // Default: "com.termux.app.reload_style"
-            // Intent extra for what to reload for the TERMUX_ACTIVITY.ACTION_RELOAD_STYLE intent
+            /* Intent extra for what to reload for the TERMUX_ACTIVITY.ACTION_RELOAD_STYLE intent */
             public static final String EXTRA_RELOAD_STYLE = TermuxConstants.TERMUX_PACKAGE_NAME + ".app.reload_style"; // Default: "com.termux.app.reload_style"
 
         }
 
 
 
+
+
+        /** Termux app core service name. */
+        public static final String TERMUX_SERVICE_NAME = TERMUX_PACKAGE_NAME + ".app.TermuxService"; // Default: "com.termux.app.TermuxService"
+
         /**
          * Termux app core service.
          */
-
-        public static final String TERMUX_SERVICE_NAME = TERMUX_PACKAGE_NAME + ".app.TermuxService"; // Default: "com.termux.app.TermuxService"
         public static final class TERMUX_SERVICE {
 
-            // Intent action to stop TERMUX_SERVICE
+            /* Intent action to stop TERMUX_SERVICE */
             public static final String ACTION_STOP_SERVICE = TERMUX_PACKAGE_NAME + ".service_stop"; // Default: "com.termux.service_stop"
 
-            // Intent action to make TERMUX_SERVICE acquire a wakelock
+
+            /* Intent action to make TERMUX_SERVICE acquire a wakelock */
             public static final String ACTION_WAKE_LOCK = TERMUX_PACKAGE_NAME + ".service_wake_lock"; // Default: "com.termux.service_wake_lock"
 
-            // Intent action to make TERMUX_SERVICE release wakelock
+
+            /* Intent action to make TERMUX_SERVICE release wakelock */
             public static final String ACTION_WAKE_UNLOCK = TERMUX_PACKAGE_NAME + ".service_wake_unlock"; // Default: "com.termux.service_wake_unlock"
 
-            // Intent action to execute command with TERMUX_SERVICE
+
+            /* Intent action to execute command with TERMUX_SERVICE */
             public static final String ACTION_SERVICE_EXECUTE = TERMUX_PACKAGE_NAME + ".service_execute"; // Default: "com.termux.service_execute"
-            // Uri scheme for paths sent via intent to TERMUX_SERVICE
+            /* Uri scheme for paths sent via intent to TERMUX_SERVICE */
             public static final String URI_SCHEME_SERVICE_EXECUTE = TERMUX_PACKAGE_NAME + ".file"; // Default: "com.termux.file"
-            // Intent extra for command arguments for the TERMUX_SERVICE.ACTION_SERVICE_EXECUTE intent
+            /* Intent extra for command arguments for the TERMUX_SERVICE.ACTION_SERVICE_EXECUTE intent */
             public static final String EXTRA_ARGUMENTS = TERMUX_PACKAGE_NAME + ".execute.arguments"; // Default: "com.termux.execute.arguments"
-            // Intent extra for command current working directory for the TERMUX_SERVICE.ACTION_SERVICE_EXECUTE intent
+            /* Intent extra for command current working directory for the TERMUX_SERVICE.ACTION_SERVICE_EXECUTE intent */
             public static final String EXTRA_WORKDIR = TERMUX_PACKAGE_NAME + ".execute.cwd"; // Default: "com.termux.execute.cwd"
-            // Intent extra for command background mode for the TERMUX_SERVICE.ACTION_SERVICE_EXECUTE intent
+            /* Intent extra for command background mode for the TERMUX_SERVICE.ACTION_SERVICE_EXECUTE intent */
             public static final String EXTRA_BACKGROUND = TERMUX_PACKAGE_NAME + ".execute.background"; // Default: "com.termux.execute.background"
 
         }
 
 
 
-        /**
-         * Termux app service to receive commands sent by 3rd party apps.
-         */
 
+
+        /** Termux app run command service name. */
         public static final String RUN_COMMAND_SERVICE_NAME = TERMUX_PACKAGE_NAME + ".app.RunCommandService"; // Termux app service to receive commands from 3rd party apps "com.termux.app.RunCommandService"
+
+        /**
+         * Termux app run command service to receive commands sent by 3rd party apps.
+         */
         public static final class RUN_COMMAND_SERVICE {
 
-            // Intent action to execute command with RUN_COMMAND_SERVICE
+            /* Intent action to execute command with RUN_COMMAND_SERVICE */
             public static final String ACTION_RUN_COMMAND = TERMUX_PACKAGE_NAME + ".RUN_COMMAND"; // Default: "com.termux.RUN_COMMAND"
-            // Intent extra for command path for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent
+            /* Intent extra for command path for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent */
             public static final String EXTRA_COMMAND_PATH = TERMUX_PACKAGE_NAME + ".RUN_COMMAND_PATH"; // Default: "com.termux.RUN_COMMAND_PATH"
-            // Intent extra for command arguments for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent
+            /* Intent extra for command arguments for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent */
             public static final String EXTRA_ARGUMENTS = TERMUX_PACKAGE_NAME + ".RUN_COMMAND_ARGUMENTS"; // Default: "com.termux.RUN_COMMAND_ARGUMENTS"
-            // Intent extra for command current working directory for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent
+            /* Intent extra for command current working directory for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent */
             public static final String EXTRA_WORKDIR = TERMUX_PACKAGE_NAME + ".RUN_COMMAND_WORKDIR"; // Default: "com.termux.RUN_COMMAND_WORKDIR"
-            // Intent extra for command background mode for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent
+            /* Intent extra for command background mode for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent */
             public static final String EXTRA_BACKGROUND = TERMUX_PACKAGE_NAME + ".RUN_COMMAND_BACKGROUND"; // Default: "com.termux.RUN_COMMAND_BACKGROUND"
 
         }
@@ -215,16 +408,14 @@ public static final class RUN_COMMAND_SERVICE {
 
 
 
+
+
     /**
      * Termux:Styling app constants.
      */
-
     public static final class TERMUX_STYLING {
 
-        /**
-         * Termux:Styling app core activity constants.
-         */
-
+        /** Termux:Styling app core activity name. */
         public static final String TERMUX_STYLING_ACTIVITY_NAME = TERMUX_STYLING_PACKAGE_NAME + ".TermuxStyleActivity"; // Default: "com.termux.styling.TermuxStyleActivity"
 
     }
diff --git a/app/src/main/java/com/termux/app/TermuxInstaller.java b/app/src/main/java/com/termux/app/TermuxInstaller.java
index 390eff1208..c5bf3d1726 100644
--- a/app/src/main/java/com/termux/app/TermuxInstaller.java
+++ b/app/src/main/java/com/termux/app/TermuxInstaller.java
@@ -58,7 +58,7 @@ static void setupIfNeeded(final Activity activity, final Runnable whenDone) {
             return;
         }
 
-        final File PREFIX_FILE = new File(TermuxConstants.PREFIX_PATH);
+        final File PREFIX_FILE = TermuxConstants.TERMUX_PREFIX_DIR;
         if (PREFIX_FILE.isDirectory()) {
             whenDone.run();
             return;
@@ -69,7 +69,7 @@ static void setupIfNeeded(final Activity activity, final Runnable whenDone) {
             @Override
             public void run() {
                 try {
-                    final String STAGING_PREFIX_PATH = TermuxConstants.FILES_PATH + "/usr-staging";
+                    final String STAGING_PREFIX_PATH = TermuxConstants.TERMUX_STAGING_PREFIX_DIR_PATH;
                     final File STAGING_PREFIX_FILE = new File(STAGING_PREFIX_PATH);
 
                     if (STAGING_PREFIX_FILE.exists()) {
@@ -194,7 +194,7 @@ static void setupStorageSymlinks(final Context context) {
         new Thread() {
             public void run() {
                 try {
-                    File storageDir = new File(TermuxConstants.HOME_PATH, "storage");
+                    File storageDir = TermuxConstants.TERMUX_STORAGE_HOME_DIR;
 
                     if (storageDir.exists()) {
                         try {
diff --git a/app/src/main/java/com/termux/app/TermuxOpenReceiver.java b/app/src/main/java/com/termux/app/TermuxOpenReceiver.java
index 26f5fec98b..960ab8e57d 100644
--- a/app/src/main/java/com/termux/app/TermuxOpenReceiver.java
+++ b/app/src/main/java/com/termux/app/TermuxOpenReceiver.java
@@ -178,7 +178,7 @@ public ParcelFileDescriptor openFile(@NonNull Uri uri, @NonNull String mode) thr
                 String path = file.getCanonicalPath();
                 String storagePath = Environment.getExternalStorageDirectory().getCanonicalPath();
                 // See https://support.google.com/faqs/answer/7496913:
-                if (!(path.startsWith(TermuxConstants.FILES_PATH) || path.startsWith(storagePath))) {
+                if (!(path.startsWith(TermuxConstants.TERMUX_FILES_DIR_PATH) || path.startsWith(storagePath))) {
                     throw new IllegalArgumentException("Invalid path: " + path);
                 }
             } catch (IOException e) {
diff --git a/app/src/main/java/com/termux/app/TermuxService.java b/app/src/main/java/com/termux/app/TermuxService.java
index 854659dca4..0f4dd46567 100644
--- a/app/src/main/java/com/termux/app/TermuxService.java
+++ b/app/src/main/java/com/termux/app/TermuxService.java
@@ -238,7 +238,7 @@ private Notification buildNotification() {
 
     @Override
     public void onDestroy() {
-        File termuxTmpDir = new File(TermuxConstants.PREFIX_PATH + "/tmp");
+        File termuxTmpDir = TermuxConstants.TERMUX_TMP_DIR;
 
         if (termuxTmpDir.exists()) {
             try {
@@ -264,9 +264,9 @@ public List<TerminalSession> getSessions() {
     }
 
     TerminalSession createTermSession(String executablePath, String[] arguments, String cwd, boolean failSafe) {
-        new File(TermuxConstants.HOME_PATH).mkdirs();
+        TermuxConstants.TERMUX_HOME_DIR.mkdirs();
 
-        if (cwd == null || cwd.isEmpty()) cwd = TermuxConstants.HOME_PATH;
+        if (cwd == null || cwd.isEmpty()) cwd = TermuxConstants.TERMUX_HOME_DIR_PATH;
 
         String[] env = BackgroundJob.buildEnvironment(failSafe, cwd);
         boolean isLoginShell = false;
@@ -274,7 +274,7 @@ TerminalSession createTermSession(String executablePath, String[] arguments, Str
         if (executablePath == null) {
             if (!failSafe) {
                 for (String shellBinary : new String[]{"login", "bash", "zsh"}) {
-                    File shellFile = new File(TermuxConstants.PREFIX_PATH + "/bin/" + shellBinary);
+                    File shellFile = new File(TermuxConstants.TERMUX_BIN_PREFIX_DIR_PATH, shellBinary);
                     if (shellFile.canExecute()) {
                         executablePath = shellFile.getAbsolutePath();
                         break;
diff --git a/app/src/main/java/com/termux/app/settings/properties/TermuxPropertyConstants.java b/app/src/main/java/com/termux/app/settings/properties/TermuxPropertyConstants.java
index 21a06ad8ba..859eeb5f03 100644
--- a/app/src/main/java/com/termux/app/settings/properties/TermuxPropertyConstants.java
+++ b/app/src/main/java/com/termux/app/settings/properties/TermuxPropertyConstants.java
@@ -8,16 +8,19 @@
 import java.io.File;
 import java.util.Arrays;
 import java.util.HashSet;
-import java.util.Properties;
 import java.util.Set;
 
 /*
- * Version: v0.1.0
+ * Version: v0.2.0
  *
  * Changelog
  *
- * - 0.1.0 (2021-03-08)
- *      - Initial Release
+ * - 0.1.0 (2021-03-11)
+ *      - Initial Release.
+ * - 0.2.0 (2021-03-11)
+ *      - Renamed `HOME_PATH` to `TERMUX_HOME_DIR_PATH`
+ *      - Renamed `TERMUX_PROPERTIES_PRIMARY_PATH` to `TERMUX_PROPERTIES_PRIMARY_FILE_PATH`
+ *      - Renamed `TERMUX_PROPERTIES_SECONDARY_FILE_PATH` to `TERMUX_PROPERTIES_SECONDARY_FILE_PATH`
  *
  */
 
@@ -29,8 +32,8 @@
  *  * and add an entry in the Changelog section above.
  *
  * The properties are loaded from the first file found at
- * {@link TermuxConstants#TERMUX_PROPERTIES_PRIMARY_PATH} or
- * {@link TermuxConstants#TERMUX_PROPERTIES_SECONDARY_PATH}
+ * {@link TermuxConstants#TERMUX_PROPERTIES_PRIMARY_FILE_PATH} or
+ * {@link TermuxConstants#TERMUX_PROPERTIES_SECONDARY_FILE_PATH}
  */
 public final class TermuxPropertyConstants {
 
@@ -132,7 +135,7 @@ public final class TermuxPropertyConstants {
     /** Defines the key for the default working directory */
     public static final String KEY_DEFAULT_WORKING_DIRECTORY =  "default-working-directory"; // Default: "default-working-directory"
     /** Defines the default working directory */
-    public static final String DEFAULT_IVALUE_DEFAULT_WORKING_DIRECTORY = TermuxConstants.HOME_PATH;
+    public static final String DEFAULT_IVALUE_DEFAULT_WORKING_DIRECTORY = TermuxConstants.TERMUX_HOME_DIR_PATH;
 
 
 
@@ -197,8 +200,8 @@ public final class TermuxPropertyConstants {
 
 
     /** Returns the first {@link File} found at
-     * {@link TermuxConstants#TERMUX_PROPERTIES_PRIMARY_PATH} or
-     * {@link TermuxConstants#TERMUX_PROPERTIES_SECONDARY_PATH}
+     * {@link TermuxConstants#TERMUX_PROPERTIES_PRIMARY_FILE_PATH} or
+     * {@link TermuxConstants#TERMUX_PROPERTIES_SECONDARY_FILE_PATH}
      * from which termux properties can be loaded.
      * If the {@link File} found is not a regular file or is not readable then null is returned.
      *
@@ -206,8 +209,8 @@ public final class TermuxPropertyConstants {
      */
     public static File getTermuxPropertiesFile() {
         String[] possiblePropertiesFileLocations = {
-            TermuxConstants.TERMUX_PROPERTIES_PRIMARY_PATH,
-            TermuxConstants.TERMUX_PROPERTIES_SECONDARY_PATH
+            TermuxConstants.TERMUX_PROPERTIES_PRIMARY_FILE_PATH,
+            TermuxConstants.TERMUX_PROPERTIES_SECONDARY_FILE_PATH
         };
 
         File propertiesFile = new File(possiblePropertiesFileLocations[0]);
diff --git a/app/src/main/java/com/termux/filepicker/TermuxDocumentsProvider.java b/app/src/main/java/com/termux/filepicker/TermuxDocumentsProvider.java
index 1a314e8ced..3bb1433423 100644
--- a/app/src/main/java/com/termux/filepicker/TermuxDocumentsProvider.java
+++ b/app/src/main/java/com/termux/filepicker/TermuxDocumentsProvider.java
@@ -35,7 +35,7 @@ public class TermuxDocumentsProvider extends DocumentsProvider {
 
     private static final String ALL_MIME_TYPES = "*/*";
 
-    private static final File BASE_DIR = new File(TermuxConstants.HOME_PATH);
+    private static final File BASE_DIR = TermuxConstants.TERMUX_HOME_DIR;
 
 
     // The default columns to return information about a root if no specific
@@ -171,7 +171,7 @@ public Cursor querySearchDocuments(String rootId, String query, String[] project
             // through the whole SD card).
             boolean isInsideHome;
             try {
-                isInsideHome = file.getCanonicalPath().startsWith(TermuxConstants.HOME_PATH);
+                isInsideHome = file.getCanonicalPath().startsWith(TermuxConstants.TERMUX_HOME_DIR_PATH);
             } catch (IOException e) {
                 isInsideHome = true;
             }
diff --git a/app/src/main/java/com/termux/filepicker/TermuxFileReceiverActivity.java b/app/src/main/java/com/termux/filepicker/TermuxFileReceiverActivity.java
index c5493ae75f..2367bdf0a9 100644
--- a/app/src/main/java/com/termux/filepicker/TermuxFileReceiverActivity.java
+++ b/app/src/main/java/com/termux/filepicker/TermuxFileReceiverActivity.java
@@ -27,9 +27,9 @@
 
 public class TermuxFileReceiverActivity extends Activity {
 
-    static final String TERMUX_RECEIVEDIR = TermuxConstants.FILES_PATH + "/home/downloads";
-    static final String EDITOR_PROGRAM = TermuxConstants.HOME_PATH + "/bin/termux-file-editor";
-    static final String URL_OPENER_PROGRAM = TermuxConstants.HOME_PATH + "/bin/termux-url-opener";
+    static final String TERMUX_RECEIVEDIR = TermuxConstants.TERMUX_FILES_DIR_PATH + "/home/downloads";
+    static final String EDITOR_PROGRAM = TermuxConstants.TERMUX_HOME_DIR_PATH + "/bin/termux-file-editor";
+    static final String URL_OPENER_PROGRAM = TermuxConstants.TERMUX_HOME_DIR_PATH + "/bin/termux-url-opener";
 
     /**
      * If the activity should be finished when the name input dialog is dismissed. This is disabled

From 36be41d0deb175f47b2bbbfca43427cfdc38b43e Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 11 Mar 2021 20:30:16 +0500
Subject: [PATCH 222/912] Remove function that reads the "termux.properties"
 files from RunCommandService

The `RunCommandService` will now call the `TermuxSharedProperties` for getting current value of `allow-external-apps`, instead of using its own duplicated function to read "termux.properties" files.
---
 .../com/termux/app/RunCommandService.java     | 27 ++++---------------
 1 file changed, 5 insertions(+), 22 deletions(-)

diff --git a/app/src/main/java/com/termux/app/RunCommandService.java b/app/src/main/java/com/termux/app/RunCommandService.java
index d1c523eebe..f186e5b2cf 100644
--- a/app/src/main/java/com/termux/app/RunCommandService.java
+++ b/app/src/main/java/com/termux/app/RunCommandService.java
@@ -15,6 +15,8 @@
 import com.termux.R;
 import com.termux.app.TermuxConstants.TERMUX_APP.RUN_COMMAND_SERVICE;
 import com.termux.app.TermuxConstants.TERMUX_APP.TERMUX_SERVICE;
+import com.termux.app.settings.properties.TermuxPropertyConstants;
+import com.termux.app.settings.properties.TermuxSharedProperties;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -109,9 +111,9 @@ public int onStartCommand(Intent intent, int flags, int startId) {
             return Service.START_NOT_STICKY;
         }
 
-        // If allow-external-apps property to not set to "true"
-        if (!allowExternalApps()) {
-            Log.e("termux", "RunCommandService requires allow-external-apps property to be set to \"true\" in ~/.termux/termux.properties file.");
+        // If allow-external-apps property is not set to "true"
+        if (!TermuxSharedProperties.isPropertyValueTrue(this, TermuxPropertyConstants.getTermuxPropertiesFile(), TermuxConstants.PROP_ALLOW_EXTERNAL_APPS)) {
+            Log.e("termux", "RunCommandService requires allow-external-apps property to be set to \"true\" in \"" + TermuxConstants.TERMUX_PROPERTIES_PRIMARY_FILE_PATH + "\" file");
             return Service.START_NOT_STICKY;
         }
 
@@ -183,25 +185,6 @@ private void setupNotificationChannel() {
         manager.createNotificationChannel(channel);
     }
 
-    private boolean allowExternalApps() {
-        File propsFile = new File(TermuxConstants.TERMUX_PROPERTIES_PRIMARY_FILE_PATH);
-        if (!propsFile.exists())
-            propsFile = new File(TermuxConstants.TERMUX_PROPERTIES_SECONDARY_FILE_PATH);
-
-        Properties props = new Properties();
-        try {
-            if (propsFile.isFile() && propsFile.canRead()) {
-                try (FileInputStream in = new FileInputStream(propsFile)) {
-                    props.load(new InputStreamReader(in, StandardCharsets.UTF_8));
-                }
-            }
-        } catch (Exception e) {
-            Log.e("termux", "Error loading props", e);
-        }
-
-        return props.getProperty("allow-external-apps", "false").equals("true");
-    }
-
     /** Replace "$PREFIX/" or "~/" prefix with termux absolute paths */
     public static String getExpandedTermuxPath(String path) {
         if(path != null && !path.isEmpty()) {

From 319446fc15e81bf7456235d03d92716c356fd66d Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 11 Mar 2021 20:30:52 +0500
Subject: [PATCH 223/912] Disable TerminalView logging.

---
 terminal-view/src/main/java/com/termux/view/TerminalView.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/terminal-view/src/main/java/com/termux/view/TerminalView.java b/terminal-view/src/main/java/com/termux/view/TerminalView.java
index 5522efbc3e..383e3bf68c 100644
--- a/terminal-view/src/main/java/com/termux/view/TerminalView.java
+++ b/terminal-view/src/main/java/com/termux/view/TerminalView.java
@@ -47,7 +47,7 @@
 public final class TerminalView extends View {
 
     /** Log view key and IME events. */
-    private static final boolean LOG_KEY_EVENTS = true;
+    private static final boolean LOG_KEY_EVENTS = false;
 
     /** The currently displayed terminal session, whose emulator is {@link #mEmulator}. */
     public TerminalSession mTermSession;

From 10d6eaa5d1969180f81ca25255a16a481aeecf6a Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 11 Mar 2021 21:06:42 +0500
Subject: [PATCH 224/912] Make TerminalView agnostic of "termux.properties"
 files.

`TerminalView` will use the `TerminalViewClient` interface implemented by `TermuxViewClient` in termux-app to get "enforce-char-based-input" and "ctrl-space-workaround" property values. It will also not read the file every time it needs to get the property value and will get it from the in-memory cache of `TermuxSharedProperties`.
---
 .../java/com/termux/app/TermuxViewClient.java | 10 ++++
 .../properties/TermuxPropertyConstants.java   | 15 ++++++
 .../properties/TermuxSharedProperties.java    |  8 ++++
 .../java/com/termux/view/TerminalView.java    | 48 ++-----------------
 .../com/termux/view/TerminalViewClient.java   |  4 ++
 5 files changed, 40 insertions(+), 45 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxViewClient.java b/app/src/main/java/com/termux/app/TermuxViewClient.java
index b6eea4d3f8..1af1622eb9 100644
--- a/app/src/main/java/com/termux/app/TermuxViewClient.java
+++ b/app/src/main/java/com/termux/app/TermuxViewClient.java
@@ -52,6 +52,16 @@ public boolean shouldBackButtonBeMappedToEscape() {
         return mActivity.mProperties.isBackKeyTheEscapeKey();
     }
 
+    @Override
+    public boolean shouldEnforeCharBasedInput() {
+        return mActivity.mProperties.isEnforcingCharBasedInput();
+    }
+
+    @Override
+    public boolean shouldUseCtrlSpaceWorkaround() {
+        return mActivity.mProperties.isUsingCtrlSpaceWorkaround();
+    }
+
     @Override
     public void copyModeChanged(boolean copyMode) {
         // Disable drawer while copying.
diff --git a/app/src/main/java/com/termux/app/settings/properties/TermuxPropertyConstants.java b/app/src/main/java/com/termux/app/settings/properties/TermuxPropertyConstants.java
index 859eeb5f03..9b8731a66e 100644
--- a/app/src/main/java/com/termux/app/settings/properties/TermuxPropertyConstants.java
+++ b/app/src/main/java/com/termux/app/settings/properties/TermuxPropertyConstants.java
@@ -61,11 +61,22 @@ public final class TermuxPropertyConstants {
 
 
 
+    /** Defines the key for whether to enforce character based input to fix the issue where for some devices like Samsung, the letters might not appear until enter is pressed */
+    public static final String KEY_ENFORCE_CHAR_BASED_INPUT =  "enforce-char-based-input"; // Default: "enforce-char-based-input"
+
+
+
+
     /** Defines the key for whether to use black UI */
     public static final String KEY_USE_BLACK_UI =  "use-black-ui"; // Default: "use-black-ui"
 
 
 
+    /** Defines the key for whether to use ctrl space workaround to fix the issue where ctrl+space does not work on some ROMs */
+    public static final String KEY_USE_CTRL_SPACE_WORKAROUND =  "ctrl-space-workaround"; // Default: "ctrl-space-workaround"
+
+
+
     /** Defines the key for whether to use fullscreen */
     public static final String KEY_USE_FULLSCREEN =  "fullscreen"; // Default: "fullscreen"
 
@@ -155,8 +166,10 @@ public final class TermuxPropertyConstants {
      * */
     public static final Set<String> TERMUX_PROPERTIES_LIST = new HashSet<>(Arrays.asList(
         // boolean
+        KEY_ENFORCE_CHAR_BASED_INPUT,
         KEY_USE_BACK_KEY_AS_ESCAPE_KEY,
         KEY_USE_BLACK_UI,
+        KEY_USE_CTRL_SPACE_WORKAROUND,
         KEY_USE_FULLSCREEN,
         KEY_USE_FULLSCREEN_WORKAROUND,
         KEY_VIRTUAL_VOLUME_KEYS_DISABLED,
@@ -183,6 +196,8 @@ public final class TermuxPropertyConstants {
      * default: false
      * */
     public static final Set<String> TERMUX_DEFAULT_BOOLEAN_BEHAVIOUR_PROPERTIES_LIST = new HashSet<>(Arrays.asList(
+        KEY_ENFORCE_CHAR_BASED_INPUT,
+        KEY_USE_CTRL_SPACE_WORKAROUND,
         KEY_USE_FULLSCREEN,
         KEY_USE_FULLSCREEN_WORKAROUND,
         TermuxConstants.PROP_ALLOW_EXTERNAL_APPS
diff --git a/app/src/main/java/com/termux/app/settings/properties/TermuxSharedProperties.java b/app/src/main/java/com/termux/app/settings/properties/TermuxSharedProperties.java
index 4e2e9c7dfd..7e8ccdd8b7 100644
--- a/app/src/main/java/com/termux/app/settings/properties/TermuxSharedProperties.java
+++ b/app/src/main/java/com/termux/app/settings/properties/TermuxSharedProperties.java
@@ -485,6 +485,10 @@ public static String getExtraKeysStyleInternalPropertyValueFromValue(String valu
 
 
 
+    public boolean isEnforcingCharBasedInput() {
+        return (boolean) getInternalPropertyValue(TermuxPropertyConstants.KEY_ENFORCE_CHAR_BASED_INPUT, true);
+    }
+
     public boolean isBackKeyTheEscapeKey() {
         return (boolean) getInternalPropertyValue(TermuxPropertyConstants.KEY_USE_BACK_KEY_AS_ESCAPE_KEY, true);
     }
@@ -493,6 +497,10 @@ public boolean isUsingBlackUI() {
         return (boolean) getInternalPropertyValue(TermuxPropertyConstants.KEY_USE_BLACK_UI, true);
     }
 
+    public boolean isUsingCtrlSpaceWorkaround() {
+        return (boolean) getInternalPropertyValue(TermuxPropertyConstants.KEY_USE_CTRL_SPACE_WORKAROUND, true);
+    }
+
     public boolean isUsingFullScreen() {
         return (boolean) getInternalPropertyValue(TermuxPropertyConstants.KEY_USE_FULLSCREEN, true);
     }
diff --git a/terminal-view/src/main/java/com/termux/view/TerminalView.java b/terminal-view/src/main/java/com/termux/view/TerminalView.java
index 383e3bf68c..b9d18e69c7 100644
--- a/terminal-view/src/main/java/com/termux/view/TerminalView.java
+++ b/terminal-view/src/main/java/com/termux/view/TerminalView.java
@@ -37,12 +37,6 @@
 import com.termux.terminal.TerminalSession;
 import com.termux.view.textselection.TextSelectionCursorController;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStreamReader;
-import java.nio.charset.StandardCharsets;
-import java.util.Properties;
-
 /** View displaying and interacting with a {@link TerminalSession}. */
 public final class TerminalView extends View {
 
@@ -246,9 +240,7 @@ public boolean attachSession(TerminalSession session) {
 
     @Override
     public InputConnection onCreateInputConnection(EditorInfo outAttrs) {
-        Properties props = getProperties();
-
-        if (props.getProperty("enforce-char-based-input", "false").equals("true")) {
+        if (mClient.shouldEnforeCharBasedInput()) {
             // Some keyboards seems do not reset the internal state on TYPE_NULL.
             // Affects mostly Samsung stock keyboards.
             // https://github.com/termux/termux-app/issues/686
@@ -529,8 +521,6 @@ public boolean onTouchEvent(MotionEvent event) {
 
     @Override
     public boolean onKeyPreIme(int keyCode, KeyEvent event) {
-        Properties props = getProperties();
-
         if (LOG_KEY_EVENTS)
             Log.i(EmulatorDebug.LOG_TAG, "onKeyPreIme(keyCode=" + keyCode + ", event=" + event + ")");
         if (keyCode == KeyEvent.KEYCODE_BACK) {
@@ -546,9 +536,9 @@ public boolean onKeyPreIme(int keyCode, KeyEvent event) {
                         return onKeyUp(keyCode, event);
                 }
             }
-        } else if (props.getProperty("ctrl-space-workaround", "false").equals("true") &&
+        } else if (mClient.shouldUseCtrlSpaceWorkaround() &&
                    keyCode == KeyEvent.KEYCODE_SPACE && event.isCtrlPressed()) {
-            /* ctrl + space does not work on some ROMs without this workaround.
+            /* ctrl+space does not work on some ROMs without this workaround.
                However, this breaks it on devices where it works out of the box. */
             return onKeyDown(keyCode, event);
         }
@@ -961,36 +951,4 @@ public void updateFloatingToolbarVisibility(MotionEvent event) {
         }
     }
 
-
-
-
-
-    private Properties getProperties() {
-        File propsFile;
-        Properties props = new Properties();
-        String possiblePropLocations[] = {
-            getContext().getFilesDir() + "/home/.termux/termux.properties",
-            getContext().getFilesDir() + "/home/.config/termux/termux.properties"
-        };
-
-        propsFile = new File(possiblePropLocations[0]);
-        int i = 0;
-        while (!propsFile.exists() && i < possiblePropLocations.length) {
-            propsFile = new File(possiblePropLocations[i]);
-            i += 1;
-        }
-
-        try {
-            if (propsFile.isFile() && propsFile.canRead()) {
-                try (FileInputStream in = new FileInputStream(propsFile)) {
-                    props.load(new InputStreamReader(in, StandardCharsets.UTF_8));
-                }
-            }
-        } catch (Exception e) {
-            Log.e("termux", "Error loading props", e);
-        }
-
-        return props;
-    }
-
 }
diff --git a/terminal-view/src/main/java/com/termux/view/TerminalViewClient.java b/terminal-view/src/main/java/com/termux/view/TerminalViewClient.java
index d2b62fa1c9..390e9157ea 100644
--- a/terminal-view/src/main/java/com/termux/view/TerminalViewClient.java
+++ b/terminal-view/src/main/java/com/termux/view/TerminalViewClient.java
@@ -25,6 +25,10 @@ public interface TerminalViewClient {
 
     boolean shouldBackButtonBeMappedToEscape();
 
+    boolean shouldEnforeCharBasedInput();
+
+    boolean shouldUseCtrlSpaceWorkaround();
+
     void copyModeChanged(boolean copyMode);
 
     boolean onKeyDown(int keyCode, KeyEvent e, TerminalSession session);

From 5fd91b4f921eafe4b40222b74ad825821206eb5a Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Fri, 12 Mar 2021 00:07:35 +0500
Subject: [PATCH 225/912] Rename com.termux.app.input package to
 com.termux.app.terminal

Also moves `TermuxViewClient` into com.termux.app.terminal package
---
 .../java/com/termux/app/TermuxActivity.java   | 55 ++++++++++++-------
 .../properties/TermuxSharedProperties.java    |  5 +-
 .../app/{input => terminal}/BellHandler.java  |  2 +-
 .../FullScreenWorkAround.java                 |  2 +-
 .../{input => terminal}/KeyboardShortcut.java |  2 +-
 .../app/{ => terminal}/TermuxViewClient.java  | 30 +++++-----
 .../extrakeys/ExtraKeyButton.java             |  2 +-
 .../extrakeys/ExtraKeysInfo.java              |  2 +-
 .../extrakeys/ExtraKeysView.java              |  2 +-
 app/src/main/res/layout/extra_keys_main.xml   |  2 +-
 10 files changed, 61 insertions(+), 43 deletions(-)
 rename app/src/main/java/com/termux/app/{input => terminal}/BellHandler.java (98%)
 rename app/src/main/java/com/termux/app/{input => terminal}/FullScreenWorkAround.java (98%)
 rename app/src/main/java/com/termux/app/{input => terminal}/KeyboardShortcut.java (88%)
 rename app/src/main/java/com/termux/app/{ => terminal}/TermuxViewClient.java (90%)
 rename app/src/main/java/com/termux/app/{input => terminal}/extrakeys/ExtraKeyButton.java (98%)
 rename app/src/main/java/com/termux/app/{input => terminal}/extrakeys/ExtraKeysInfo.java (99%)
 rename app/src/main/java/com/termux/app/{input => terminal}/extrakeys/ExtraKeysView.java (99%)

diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index 2c50350e20..f5df773d4b 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -48,9 +48,10 @@
 
 import com.termux.R;
 import com.termux.app.TermuxConstants.TERMUX_APP.TERMUX_ACTIVITY;
-import com.termux.app.input.BellHandler;
-import com.termux.app.input.extrakeys.ExtraKeysView;
-import com.termux.app.input.FullScreenWorkAround;
+import com.termux.app.terminal.BellHandler;
+import com.termux.app.terminal.TermuxViewClient;
+import com.termux.app.terminal.extrakeys.ExtraKeysView;
+import com.termux.app.terminal.FullScreenWorkAround;
 import com.termux.app.settings.properties.TermuxPropertyConstants;
 import com.termux.app.settings.properties.TermuxSharedProperties;
 import com.termux.terminal.EmulatorDebug;
@@ -106,20 +107,21 @@ public final class TermuxActivity extends Activity implements ServiceConnection
 
     private static final String BROADCAST_TERMUX_OPENED = TermuxConstants.TERMUX_PACKAGE_NAME + ".app.OPENED";
 
+    /**
+     * 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
+     * {@link #onServiceConnected(ComponentName, IBinder)}.
+     */
+    TermuxService mTermService;
+
     /** The main view of the activity showing the terminal. Initialized in onCreate(). */
     TerminalView mTerminalView;
 
     ExtraKeysView mExtraKeysView;
 
     TermuxPreferences mSettings;
-    TermuxSharedProperties mProperties;
 
-    /**
-     * 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
-     * {@link #onServiceConnected(ComponentName, IBinder)}.
-     */
-    TermuxService mTermService;
+    TermuxSharedProperties mProperties;
 
     /** Initialized in {@link #onServiceConnected(ComponentName, IBinder)}. */
     ArrayAdapter<TerminalSession> mListViewAdapter;
@@ -378,7 +380,7 @@ void sendOpenedBroadcast() {
         }
     }
 
-    void toggleShowExtraKeys() {
+    public void toggleShowExtraKeys() {
         final ViewPager viewPager = findViewById(R.id.viewpager);
         final boolean showNow = mSettings.toggleShowExtraKeys(TermuxActivity.this);
         viewPager.setVisibility(showNow ? View.VISIBLE : View.GONE);
@@ -585,7 +587,7 @@ public void switchToSession(boolean forward) {
     }
 
     @SuppressLint("InflateParams")
-    void renameSession(final TerminalSession sessionToRename) {
+    public void renameSession(final TerminalSession sessionToRename) {
         if (sessionToRename == null) return;
         DialogUtils.textInput(this, R.string.session_rename_title, sessionToRename.mSessionName, R.string.session_rename_positive_button, text -> {
             sessionToRename.mSessionName = text;
@@ -607,7 +609,7 @@ public void finishActivityIfNotFinishing() {
     }
 
     @Nullable
-    TerminalSession getCurrentTermSession() {
+    public TerminalSession getCurrentTermSession() {
         return mTerminalView.getCurrentSession();
     }
 
@@ -660,11 +662,11 @@ public void onDestroy() {
         unbindService(this);
     }
 
-    DrawerLayout getDrawer() {
+    public DrawerLayout getDrawer() {
         return (DrawerLayout) findViewById(R.id.drawer_layout);
     }
 
-    void addNewSession(boolean failSafe, String sessionName) {
+    public void addNewSession(boolean failSafe, String sessionName) {
         if (mTermService.getSessions().size() >= MAX_SESSIONS) {
             new AlertDialog.Builder(this).setTitle(R.string.max_terminals_reached_title).setMessage(R.string.max_terminals_reached_message)
                 .setPositiveButton(android.R.string.ok, null).show();
@@ -688,7 +690,7 @@ void addNewSession(boolean failSafe, String sessionName) {
     }
 
     /** Try switching to session and note about it, but do nothing if already displaying the session. */
-    void switchToSession(TerminalSession session) {
+    public void switchToSession(TerminalSession session) {
         if (mTerminalView.attachSession(session)) {
             noteSessionInfo();
             updateBackgroundColor();
@@ -835,7 +837,7 @@ static LinkedHashSet<CharSequence> extractUrls(String text) {
         return urlSet;
     }
 
-    void showUrlSelection() {
+    public void showUrlSelection() {
         String text = null;
         if (getCurrentTermSession() != null) {
             text = getCurrentTermSession().getEmulator().getScreen().getTranscriptTextWithFullLinesJoined();
@@ -975,12 +977,12 @@ public void onRequestPermissionsResult(int requestCode, @NonNull String[] permis
         }
     }
 
-    void changeFontSize(boolean increase) {
+    public void changeFontSize(boolean increase) {
         mSettings.changeFontSize(this, increase);
         mTerminalView.setTextSize(mSettings.getFontSize());
     }
 
-    void doPaste() {
+    public void doPaste() {
         ClipboardManager clipboard = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
         ClipData clipData = clipboard.getPrimaryClip();
         if (clipData == null) return;
@@ -1024,4 +1026,19 @@ public void removeFinishedSession(TerminalSession finishedSession) {
         }
     }
 
+    public TermuxService getTermService() {
+        return mTermService;
+    }
+
+    public TerminalView getTerminalView() {
+        return mTerminalView;
+    }
+
+    public ExtraKeysView getExtraKeysView() {
+        return mExtraKeysView;
+    }
+    public TermuxSharedProperties getProperties() {
+        return mProperties;
+    }
+
 }
diff --git a/app/src/main/java/com/termux/app/settings/properties/TermuxSharedProperties.java b/app/src/main/java/com/termux/app/settings/properties/TermuxSharedProperties.java
index 7e8ccdd8b7..70a3dc3ecb 100644
--- a/app/src/main/java/com/termux/app/settings/properties/TermuxSharedProperties.java
+++ b/app/src/main/java/com/termux/app/settings/properties/TermuxSharedProperties.java
@@ -5,11 +5,10 @@
 import android.util.Log;
 import android.widget.Toast;
 
-import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import com.termux.app.input.extrakeys.ExtraKeysInfo;
-import com.termux.app.input.KeyboardShortcut;
+import com.termux.app.terminal.extrakeys.ExtraKeysInfo;
+import com.termux.app.terminal.KeyboardShortcut;
 
 import org.json.JSONException;
 
diff --git a/app/src/main/java/com/termux/app/input/BellHandler.java b/app/src/main/java/com/termux/app/terminal/BellHandler.java
similarity index 98%
rename from app/src/main/java/com/termux/app/input/BellHandler.java
rename to app/src/main/java/com/termux/app/terminal/BellHandler.java
index 0610971ecd..207f7e7818 100644
--- a/app/src/main/java/com/termux/app/input/BellHandler.java
+++ b/app/src/main/java/com/termux/app/terminal/BellHandler.java
@@ -1,4 +1,4 @@
-package com.termux.app.input;
+package com.termux.app.terminal;
 
 import android.content.Context;
 import android.os.Handler;
diff --git a/app/src/main/java/com/termux/app/input/FullScreenWorkAround.java b/app/src/main/java/com/termux/app/terminal/FullScreenWorkAround.java
similarity index 98%
rename from app/src/main/java/com/termux/app/input/FullScreenWorkAround.java
rename to app/src/main/java/com/termux/app/terminal/FullScreenWorkAround.java
index 6002f8c897..c37c870cfb 100644
--- a/app/src/main/java/com/termux/app/input/FullScreenWorkAround.java
+++ b/app/src/main/java/com/termux/app/terminal/FullScreenWorkAround.java
@@ -1,4 +1,4 @@
-package com.termux.app.input;
+package com.termux.app.terminal;
 
 import android.graphics.Rect;
 import android.view.View;
diff --git a/app/src/main/java/com/termux/app/input/KeyboardShortcut.java b/app/src/main/java/com/termux/app/terminal/KeyboardShortcut.java
similarity index 88%
rename from app/src/main/java/com/termux/app/input/KeyboardShortcut.java
rename to app/src/main/java/com/termux/app/terminal/KeyboardShortcut.java
index 7308c94c8a..5db41bec30 100644
--- a/app/src/main/java/com/termux/app/input/KeyboardShortcut.java
+++ b/app/src/main/java/com/termux/app/terminal/KeyboardShortcut.java
@@ -1,4 +1,4 @@
-package com.termux.app.input;
+package com.termux.app.terminal;
 
 public class KeyboardShortcut {
 
diff --git a/app/src/main/java/com/termux/app/TermuxViewClient.java b/app/src/main/java/com/termux/app/terminal/TermuxViewClient.java
similarity index 90%
rename from app/src/main/java/com/termux/app/TermuxViewClient.java
rename to app/src/main/java/com/termux/app/terminal/TermuxViewClient.java
index 1af1622eb9..567ebef8de 100644
--- a/app/src/main/java/com/termux/app/TermuxViewClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxViewClient.java
@@ -1,5 +1,6 @@
-package com.termux.app;
+package com.termux.app.terminal;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.media.AudioManager;
 import android.view.Gravity;
@@ -8,8 +9,9 @@
 import android.view.MotionEvent;
 import android.view.inputmethod.InputMethodManager;
 
-import com.termux.app.input.KeyboardShortcut;
-import com.termux.app.input.extrakeys.ExtraKeysView;
+import com.termux.app.TermuxActivity;
+import com.termux.app.TermuxService;
+import com.termux.app.terminal.extrakeys.ExtraKeysView;
 import com.termux.app.settings.properties.TermuxPropertyConstants;
 import com.termux.terminal.KeyHandler;
 import com.termux.terminal.TerminalEmulator;
@@ -44,22 +46,22 @@ public float onScale(float scale) {
     @Override
     public void onSingleTapUp(MotionEvent e) {
         InputMethodManager mgr = (InputMethodManager) mActivity.getSystemService(Context.INPUT_METHOD_SERVICE);
-        mgr.showSoftInput(mActivity.mTerminalView, InputMethodManager.SHOW_IMPLICIT);
+        mgr.showSoftInput(mActivity.getTerminalView(), InputMethodManager.SHOW_IMPLICIT);
     }
 
     @Override
     public boolean shouldBackButtonBeMappedToEscape() {
-        return mActivity.mProperties.isBackKeyTheEscapeKey();
+        return mActivity.getProperties().isBackKeyTheEscapeKey();
     }
 
     @Override
     public boolean shouldEnforeCharBasedInput() {
-        return mActivity.mProperties.isEnforcingCharBasedInput();
+        return mActivity.getProperties().isEnforcingCharBasedInput();
     }
 
     @Override
     public boolean shouldUseCtrlSpaceWorkaround() {
-        return mActivity.mProperties.isUsingCtrlSpaceWorkaround();
+        return mActivity.getProperties().isUsingCtrlSpaceWorkaround();
     }
 
     @Override
@@ -68,6 +70,7 @@ public void copyModeChanged(boolean copyMode) {
         mActivity.getDrawer().setDrawerLockMode(copyMode ? DrawerLayout.LOCK_MODE_LOCKED_CLOSED : DrawerLayout.LOCK_MODE_UNLOCKED);
     }
 
+    @SuppressLint("RtlHardcoded")
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent e, TerminalSession currentSession) {
         if (handleVirtualKeys(keyCode, e, true)) return true;
@@ -91,7 +94,7 @@ public boolean onKeyDown(int keyCode, KeyEvent e, TerminalSession currentSession
                 InputMethodManager imm = (InputMethodManager) mActivity.getSystemService(Context.INPUT_METHOD_SERVICE);
                 imm.toggleSoftInput(InputMethodManager.SHOW_FORCED, 0);
             } else if (unicodeChar == 'm'/* menu */) {
-                mActivity.mTerminalView.showContextMenu();
+                mActivity.getTerminalView().showContextMenu();
             } else if (unicodeChar == 'r'/* rename */) {
                 mActivity.renameSession(currentSession);
             } else if (unicodeChar == 'c'/* create */) {
@@ -108,7 +111,7 @@ public boolean onKeyDown(int keyCode, KeyEvent e, TerminalSession currentSession
                 mActivity.changeFontSize(false);
             } else if (unicodeChar >= '1' && unicodeChar <= '9') {
                 int num = unicodeChar - '1';
-                TermuxService service = mActivity.mTermService;
+                TermuxService service = mActivity.getTermService();
                 if (service.getSessions().size() > num)
                     mActivity.switchToSession(service.getSessions().get(num));
             }
@@ -126,12 +129,12 @@ public boolean onKeyUp(int keyCode, KeyEvent e) {
 
     @Override
     public boolean readControlKey() {
-        return (mActivity.mExtraKeysView != null && mActivity.mExtraKeysView.readSpecialButton(ExtraKeysView.SpecialButton.CTRL)) || mVirtualControlKeyDown;
+        return (mActivity.getExtraKeysView() != null && mActivity.getExtraKeysView().readSpecialButton(ExtraKeysView.SpecialButton.CTRL)) || mVirtualControlKeyDown;
     }
 
     @Override
     public boolean readAltKey() {
-        return (mActivity.mExtraKeysView != null && mActivity.mExtraKeysView.readSpecialButton(ExtraKeysView.SpecialButton.ALT));
+        return (mActivity.getExtraKeysView() != null && mActivity.getExtraKeysView().readSpecialButton(ExtraKeysView.SpecialButton.ALT));
     }
 
     @Override
@@ -242,7 +245,7 @@ public boolean onCodePoint(final int codePoint, boolean ctrlDown, TerminalSessio
                 return true;
             }
 
-            List<KeyboardShortcut> shortcuts = mActivity.mProperties.getSessionShortcuts();
+            List<KeyboardShortcut> shortcuts = mActivity.getProperties().getSessionShortcuts();
             if (!shortcuts.isEmpty()) {
                 int codePointLowerCase = Character.toLowerCase(codePoint);
                 for (int i = shortcuts.size() - 1; i >= 0; i--) {
@@ -278,7 +281,7 @@ public boolean onLongPress(MotionEvent event) {
     /** Handle dedicated volume buttons as virtual keys if applicable. */
     private boolean handleVirtualKeys(int keyCode, KeyEvent event, boolean down) {
         InputDevice inputDevice = event.getDevice();
-        if (mActivity.mProperties.areVirtualVolumeKeysDisabled()) {
+        if (mActivity.getProperties().areVirtualVolumeKeysDisabled()) {
             return false;
         } else if (inputDevice != null && inputDevice.getKeyboardType() == InputDevice.KEYBOARD_TYPE_ALPHABETIC) {
             // Do not steal dedicated buttons from a full external keyboard.
@@ -293,5 +296,4 @@ private boolean handleVirtualKeys(int keyCode, KeyEvent event, boolean down) {
         return false;
     }
 
-
 }
diff --git a/app/src/main/java/com/termux/app/input/extrakeys/ExtraKeyButton.java b/app/src/main/java/com/termux/app/terminal/extrakeys/ExtraKeyButton.java
similarity index 98%
rename from app/src/main/java/com/termux/app/input/extrakeys/ExtraKeyButton.java
rename to app/src/main/java/com/termux/app/terminal/extrakeys/ExtraKeyButton.java
index 1218ef7812..36457af253 100644
--- a/app/src/main/java/com/termux/app/input/extrakeys/ExtraKeyButton.java
+++ b/app/src/main/java/com/termux/app/terminal/extrakeys/ExtraKeyButton.java
@@ -1,4 +1,4 @@
-package com.termux.app.input.extrakeys;
+package com.termux.app.terminal.extrakeys;
 
 import android.text.TextUtils;
 
diff --git a/app/src/main/java/com/termux/app/input/extrakeys/ExtraKeysInfo.java b/app/src/main/java/com/termux/app/terminal/extrakeys/ExtraKeysInfo.java
similarity index 99%
rename from app/src/main/java/com/termux/app/input/extrakeys/ExtraKeysInfo.java
rename to app/src/main/java/com/termux/app/terminal/extrakeys/ExtraKeysInfo.java
index c71f3b1f40..e1406e7222 100644
--- a/app/src/main/java/com/termux/app/input/extrakeys/ExtraKeysInfo.java
+++ b/app/src/main/java/com/termux/app/terminal/extrakeys/ExtraKeysInfo.java
@@ -1,4 +1,4 @@
-package com.termux.app.input.extrakeys;
+package com.termux.app.terminal.extrakeys;
 
 import org.json.JSONArray;
 import org.json.JSONException;
diff --git a/app/src/main/java/com/termux/app/input/extrakeys/ExtraKeysView.java b/app/src/main/java/com/termux/app/terminal/extrakeys/ExtraKeysView.java
similarity index 99%
rename from app/src/main/java/com/termux/app/input/extrakeys/ExtraKeysView.java
rename to app/src/main/java/com/termux/app/terminal/extrakeys/ExtraKeysView.java
index 92e1c37021..d1b1dee51a 100644
--- a/app/src/main/java/com/termux/app/input/extrakeys/ExtraKeysView.java
+++ b/app/src/main/java/com/termux/app/terminal/extrakeys/ExtraKeysView.java
@@ -1,4 +1,4 @@
-package com.termux.app.input.extrakeys;
+package com.termux.app.terminal.extrakeys;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
diff --git a/app/src/main/res/layout/extra_keys_main.xml b/app/src/main/res/layout/extra_keys_main.xml
index 90584317d2..aaf57980cb 100644
--- a/app/src/main/res/layout/extra_keys_main.xml
+++ b/app/src/main/res/layout/extra_keys_main.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.termux.app.input.extrakeys.ExtraKeysView xmlns:android="http://schemas.android.com/apk/res/android"
+<com.termux.app.terminal.extrakeys.ExtraKeysView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/extra_keys"
     style="?android:attr/buttonBarStyle"
     android:layout_width="match_parent"

From e72841ba276a242694d19feaca680047d51cd57c Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Fri, 12 Mar 2021 05:53:10 +0500
Subject: [PATCH 226/912] Update TermuxConstants

The `TermuxConstants` classes has been updated to `v0.3.0`. Check its Changelog sections for info on changes.
---
 .../java/com/termux/app/TermuxConstants.java  | 35 ++++++-------------
 1 file changed, 11 insertions(+), 24 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxConstants.java b/app/src/main/java/com/termux/app/TermuxConstants.java
index d1c3acb600..8695e71530 100644
--- a/app/src/main/java/com/termux/app/TermuxConstants.java
+++ b/app/src/main/java/com/termux/app/TermuxConstants.java
@@ -5,7 +5,7 @@
 import java.io.File;
 
 /*
- * Version: v0.2.0
+ * Version: v0.3.0
  *
  * Changelog
  *
@@ -23,6 +23,14 @@
  *      - Renamed `CONFIG_HOME_PATH` to `TERMUX_CONFIG_HOME_DIR_PATH`.
  *      - Updated javadocs and spacing.
  *
+ * - 0.3.0 (2021-03-12)
+ *      - Remove TERMUX_CACHE_DIR_PATH*, TERMUX_DATABASES_DIR_PATH*, TERMUX_SHARED_PREFERENCES_DIR_PATH*
+ *          since they may not be consistent on all devices.
+ *      - Renamed `TERMUX_DEFAULT_PREFERENCES_FILE_BASENAME` to
+ *          `TERMUX_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION`. This should be used for
+ *           accessing shared preferences between Termux app and its plugins if ever needed by first
+ *           getting shared package context with {@link Context.createPackageContext(String,int}).
+ *
  */
 
 /**
@@ -121,23 +129,6 @@ public final class TermuxConstants {
     public static final File INTERNAL_PRIVATE_APP_DATA_DIR = new File(INTERNAL_PRIVATE_APP_DATA_DIR_PATH);
 
 
-    /** Termux app cache directory path */
-    public static final String TERMUX_CACHE_DIR_PATH = INTERNAL_PRIVATE_APP_DATA_DIR_PATH + "/cache"; // Default: "/data/data/com.termux/cache"
-    /** Termux app cache directory */
-    public static final File TERMUX_CACHE_DIR = new File(TERMUX_CACHE_DIR_PATH);
-
-
-    /** Termux app database directory path */
-    public static final String TERMUX_DATABASES_DIR_PATH = INTERNAL_PRIVATE_APP_DATA_DIR_PATH + "/databases"; // Default: "/data/data/com.termux/databases"
-    /** Termux app database directory */
-    public static final File TERMUX_DATABASES_DIR = new File(TERMUX_DATABASES_DIR_PATH);
-
-
-    /** Termux app shared preferences directory path */
-    public static final String TERMUX_SHARED_PREFERENCES_DIR_PATH = INTERNAL_PRIVATE_APP_DATA_DIR_PATH + "/shared_prefs"; // Default: "/data/data/com.termux/shared_prefs"
-    /** Termux app shared preferences directory */
-    public static final File TERMUX_SHARED_PREFERENCES_DIR = new File(TERMUX_SHARED_PREFERENCES_DIR_PATH);
-
 
     /** Termux app Files directory path */
     public static final String TERMUX_FILES_DIR_PATH = INTERNAL_PRIVATE_APP_DATA_DIR_PATH + "/files"; // Default: "/data/data/com.termux/files"
@@ -239,13 +230,9 @@ public final class TermuxConstants {
      * Termux app core file paths.
      */
 
-    /* Termux app default SharedPreferences file basename */
-    public static final String TERMUX_DEFAULT_PREFERENCES_FILE_BASENAME = TERMUX_PACKAGE_NAME + "_preferences.xml"; // Default: "com.termux_preferences.xml"
+    /* Termux app default SharedPreferences file basename without extension */
+    public static final String TERMUX_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION = TERMUX_PACKAGE_NAME + "_preferences"; // Default: "com.termux_preferences"
 
-    /* Termux app default SharedPreferences file path */
-    public static final String TERMUX_DEFAULT_PREFERENCES_FILE_PATH = TERMUX_SHARED_PREFERENCES_DIR_PATH + "/" + TERMUX_DEFAULT_PREFERENCES_FILE_BASENAME; // Default: "/data/data/com.termux/shared_prefs/com.termux_preferences.xml"
-    /* Termux app default SharedPreferences file */
-    public static final File TERMUX_DEFAULT_PREFERENCES_FILE = new File(TERMUX_DEFAULT_PREFERENCES_FILE_PATH);
 
     /* Termux app termux.properties primary file path */
     public static final String TERMUX_PROPERTIES_PRIMARY_FILE_PATH = TERMUX_DATA_HOME_DIR_PATH + "/termux.properties"; // Default: "/data/data/com.termux/files/home/.termux/termux.properties"

From ebf2e472b3f33ca9af4d98b2cc15371af503d214 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Fri, 12 Mar 2021 05:54:12 +0500
Subject: [PATCH 227/912] Fix typo in TermuxPropertyConstants

---
 .../app/settings/properties/TermuxPropertyConstants.java       | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/src/main/java/com/termux/app/settings/properties/TermuxPropertyConstants.java b/app/src/main/java/com/termux/app/settings/properties/TermuxPropertyConstants.java
index 9b8731a66e..a68e046689 100644
--- a/app/src/main/java/com/termux/app/settings/properties/TermuxPropertyConstants.java
+++ b/app/src/main/java/com/termux/app/settings/properties/TermuxPropertyConstants.java
@@ -29,7 +29,7 @@
  * This class will be hosted by termux-app and should be imported by other termux plugin apps as is
  * instead of copying constants to random classes. The 3rd party apps can also import it for
  * interacting with termux apps. If changes are made to this file, increment the version number
- *  * and add an entry in the Changelog section above.
+ * and add an entry in the Changelog section above.
  *
  * The properties are loaded from the first file found at
  * {@link TermuxConstants#TERMUX_PROPERTIES_PRIMARY_FILE_PATH} or
@@ -66,7 +66,6 @@ public final class TermuxPropertyConstants {
 
 
 
-
     /** Defines the key for whether to use black UI */
     public static final String KEY_USE_BLACK_UI =  "use-black-ui"; // Default: "use-black-ui"
 

From 93b506a001e579f3211138a55bf4551d176f6139 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Fri, 12 Mar 2021 06:01:31 +0500
Subject: [PATCH 228/912] Move Termux Preferences to
 com.termux.app.settings.preferences package

The termux preferences handling was mixed in with termux properties before an earlier commit. They are now moved out of into a separate sub package, the following classes are added:

- `TermuxPreferenceConstants` class that defines shared constants of the preferences used by Termux app and its plugins. This class should be imported by other termux plugin apps instead of copying and defining their own constants.
- `TermuxSharedPreferences` class that acts as manager for handling termux preferences.
---
 .../java/com/termux/app/TermuxActivity.java   |  38 +++--
 .../com/termux/app/TermuxPreferences.java     |  96 ------------
 .../java/com/termux/app/TermuxService.java    |   4 +-
 .../TermuxPreferenceConstants.java            |  50 +++++++
 .../preferences/TermuxSharedPreferences.java  | 138 ++++++++++++++++++
 5 files changed, 215 insertions(+), 111 deletions(-)
 delete mode 100644 app/src/main/java/com/termux/app/TermuxPreferences.java
 create mode 100644 app/src/main/java/com/termux/app/settings/preferences/TermuxPreferenceConstants.java
 create mode 100644 app/src/main/java/com/termux/app/settings/preferences/TermuxSharedPreferences.java

diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index f5df773d4b..ed12ec6103 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -48,6 +48,7 @@
 
 import com.termux.R;
 import com.termux.app.TermuxConstants.TERMUX_APP.TERMUX_ACTIVITY;
+import com.termux.app.settings.preferences.TermuxSharedPreferences;
 import com.termux.app.terminal.BellHandler;
 import com.termux.app.terminal.TermuxViewClient;
 import com.termux.app.terminal.extrakeys.ExtraKeysView;
@@ -119,9 +120,9 @@ public final class TermuxActivity extends Activity implements ServiceConnection
 
     ExtraKeysView mExtraKeysView;
 
-    TermuxPreferences mSettings;
+    private TermuxSharedPreferences mPreferences;
 
-    TermuxSharedProperties mProperties;
+    private TermuxSharedProperties mProperties;
 
     /** Initialized in {@link #onServiceConnected(ComponentName, IBinder)}. */
     ArrayAdapter<TerminalSession> mListViewAdapter;
@@ -212,7 +213,7 @@ public boolean ensureStoragePermissionGranted() {
 
     @Override
     public void onCreate(Bundle bundle) {
-        mSettings = new TermuxPreferences(this);
+        mPreferences = new TermuxSharedPreferences(this);
         mProperties = new TermuxSharedProperties(this);
 
         mIsUsingBlackUI = mProperties.isUsingBlackUI();
@@ -246,12 +247,12 @@ public void onCreate(Bundle bundle) {
         mTerminalView = findViewById(R.id.terminal_view);
         mTerminalView.setOnKeyListener(new TermuxViewClient(this));
 
-        mTerminalView.setTextSize(mSettings.getFontSize());
-        mTerminalView.setKeepScreenOn(mSettings.isScreenAlwaysOn());
+        mTerminalView.setTextSize(mPreferences.getFontSize());
+        mTerminalView.setKeepScreenOn(mPreferences.getKeepScreenOn());
         mTerminalView.requestFocus();
 
         final ViewPager viewPager = findViewById(R.id.viewpager);
-        if (mSettings.mShowExtraKeys) viewPager.setVisibility(View.VISIBLE);
+        if (mPreferences.getShowExtraKeys()) viewPager.setVisibility(View.VISIBLE);
 
 
         ViewGroup.LayoutParams layoutParams = viewPager.getLayoutParams();
@@ -382,7 +383,7 @@ void sendOpenedBroadcast() {
 
     public void toggleShowExtraKeys() {
         final ViewPager viewPager = findViewById(R.id.viewpager);
-        final boolean showNow = mSettings.toggleShowExtraKeys(TermuxActivity.this);
+        final boolean showNow = mPreferences.toggleShowExtraKeys();
         viewPager.setVisibility(showNow ? View.VISIBLE : View.GONE);
         if (showNow && viewPager.getCurrentItem() == 1) {
             // Focus the text input view if just revealed.
@@ -636,7 +637,7 @@ protected void onStop() {
         super.onStop();
         mIsVisible = false;
         TerminalSession currentSession = getCurrentTermSession();
-        if (currentSession != null) TermuxPreferences.storeCurrentSession(this, currentSession);
+        if (currentSession != null) mPreferences.setCurrentSession(currentSession.mHandle);
         unregisterReceiver(mBroadcastReceiever);
         getDrawer().closeDrawers();
     }
@@ -739,7 +740,7 @@ public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuIn
         menu.add(Menu.NONE, CONTEXTMENU_RESET_TERMINAL_ID, Menu.NONE, R.string.reset_terminal);
         menu.add(Menu.NONE, CONTEXTMENU_KILL_PROCESS_ID, Menu.NONE, getResources().getString(R.string.kill_process, getCurrentTermSession().getPid())).setEnabled(currentSession.isRunning());
         menu.add(Menu.NONE, CONTEXTMENU_STYLING_ID, Menu.NONE, R.string.style_terminal);
-        menu.add(Menu.NONE, CONTEXTMENU_TOGGLE_KEEP_SCREEN_ON, Menu.NONE, R.string.toggle_keep_screen_on).setCheckable(true).setChecked(mSettings.isScreenAlwaysOn());
+        menu.add(Menu.NONE, CONTEXTMENU_TOGGLE_KEEP_SCREEN_ON, Menu.NONE, R.string.toggle_keep_screen_on).setCheckable(true).setChecked(mPreferences.getKeepScreenOn());
         menu.add(Menu.NONE, CONTEXTMENU_HELP_ID, Menu.NONE, R.string.help);
     }
 
@@ -950,10 +951,10 @@ public boolean onContextItemSelected(MenuItem item) {
             case CONTEXTMENU_TOGGLE_KEEP_SCREEN_ON: {
                 if(mTerminalView.getKeepScreenOn()) {
                     mTerminalView.setKeepScreenOn(false);
-                    mSettings.setScreenAlwaysOn(this, false);
+                    mPreferences.setKeepScreenOn(false);
                 } else {
                     mTerminalView.setKeepScreenOn(true);
-                    mSettings.setScreenAlwaysOn(this, true);
+                    mPreferences.setKeepScreenOn(true);
                 }
                 return true;
             }
@@ -978,8 +979,8 @@ public void onRequestPermissionsResult(int requestCode, @NonNull String[] permis
     }
 
     public void changeFontSize(boolean increase) {
-        mSettings.changeFontSize(this, increase);
-        mTerminalView.setTextSize(mSettings.getFontSize());
+        mPreferences.changeFontSize(this, increase);
+        mTerminalView.setTextSize(mPreferences.getFontSize());
     }
 
     public void doPaste() {
@@ -995,12 +996,21 @@ public void doPaste() {
 
     /** The current session as stored or the last one if that does not exist. */
     public TerminalSession getStoredCurrentSessionOrLast() {
-        TerminalSession stored = TermuxPreferences.getCurrentSession(this);
+        TerminalSession stored = getCurrentSession(this);
         if (stored != null) return stored;
         List<TerminalSession> sessions = mTermService.getSessions();
         return sessions.isEmpty() ? null : sessions.get(sessions.size() - 1);
     }
 
+    private TerminalSession getCurrentSession(TermuxActivity context) {
+        String sessionHandle = mPreferences.getCurrentSession();
+        for (int i = 0, len = context.getTermService().getSessions().size(); i < len; i++) {
+            TerminalSession session = context.getTermService().getSessions().get(i);
+            if (session.mHandle.equals(sessionHandle)) return session;
+        }
+        return null;
+    }
+
     /** Show a toast and dismiss the last one if still visible. */
     void showToast(String text, boolean longDuration) {
         if (mLastToast != null) mLastToast.cancel();
diff --git a/app/src/main/java/com/termux/app/TermuxPreferences.java b/app/src/main/java/com/termux/app/TermuxPreferences.java
deleted file mode 100644
index 5567439dee..0000000000
--- a/app/src/main/java/com/termux/app/TermuxPreferences.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package com.termux.app;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.preference.PreferenceManager;
-import android.util.TypedValue;
-
-import com.termux.terminal.TerminalSession;
-
-final class TermuxPreferences {
-
-    private final int MIN_FONTSIZE;
-    private static final int MAX_FONTSIZE = 256;
-
-    private static final String SHOW_EXTRA_KEYS_KEY = "show_extra_keys";
-    private static final String FONTSIZE_KEY = "fontsize";
-    private static final String CURRENT_SESSION_KEY = "current_session";
-    private static final String SCREEN_ALWAYS_ON_KEY = "screen_always_on";
-
-    private boolean mScreenAlwaysOn;
-    private int mFontSize;
-    boolean mShowExtraKeys;
-
-    TermuxPreferences(Context context) {
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-
-        float dipInPixels = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 1, context.getResources().getDisplayMetrics());
-
-        // This is a bit arbitrary and sub-optimal. We want to give a sensible default for minimum font size
-        // to prevent invisible text due to zoom be mistake:
-        MIN_FONTSIZE = (int) (4f * dipInPixels);
-
-        mShowExtraKeys = prefs.getBoolean(SHOW_EXTRA_KEYS_KEY, true);
-        mScreenAlwaysOn = prefs.getBoolean(SCREEN_ALWAYS_ON_KEY, false);
-
-        // http://www.google.com/design/spec/style/typography.html#typography-line-height
-        int defaultFontSize = Math.round(12 * dipInPixels);
-        // Make it divisible by 2 since that is the minimal adjustment step:
-        if (defaultFontSize % 2 == 1) defaultFontSize--;
-
-        try {
-            mFontSize = Integer.parseInt(prefs.getString(FONTSIZE_KEY, Integer.toString(defaultFontSize)));
-        } catch (NumberFormatException | ClassCastException e) {
-            mFontSize = defaultFontSize;
-        }
-        mFontSize = clamp(mFontSize, MIN_FONTSIZE, MAX_FONTSIZE);
-    }
-
-    boolean toggleShowExtraKeys(Context context) {
-        mShowExtraKeys = !mShowExtraKeys;
-        PreferenceManager.getDefaultSharedPreferences(context).edit().putBoolean(SHOW_EXTRA_KEYS_KEY, mShowExtraKeys).apply();
-        return mShowExtraKeys;
-    }
-
-    int getFontSize() {
-        return mFontSize;
-    }
-
-    void changeFontSize(Context context, boolean increase) {
-        mFontSize += (increase ? 1 : -1) * 2;
-        mFontSize = Math.max(MIN_FONTSIZE, Math.min(mFontSize, MAX_FONTSIZE));
-
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-        prefs.edit().putString(FONTSIZE_KEY, Integer.toString(mFontSize)).apply();
-    }
-
-    boolean isScreenAlwaysOn() {
-        return mScreenAlwaysOn;
-    }
-
-    void setScreenAlwaysOn(Context context, boolean newValue) {
-        mScreenAlwaysOn = newValue;
-        PreferenceManager.getDefaultSharedPreferences(context).edit().putBoolean(SCREEN_ALWAYS_ON_KEY, newValue).apply();
-    }
-
-    static void storeCurrentSession(Context context, TerminalSession session) {
-        PreferenceManager.getDefaultSharedPreferences(context).edit().putString(TermuxPreferences.CURRENT_SESSION_KEY, session.mHandle).apply();
-    }
-
-    static TerminalSession getCurrentSession(TermuxActivity context) {
-        String sessionHandle = PreferenceManager.getDefaultSharedPreferences(context).getString(TermuxPreferences.CURRENT_SESSION_KEY, "");
-        for (int i = 0, len = context.mTermService.getSessions().size(); i < len; i++) {
-            TerminalSession session = context.mTermService.getSessions().get(i);
-            if (session.mHandle.equals(sessionHandle)) return session;
-        }
-        return null;
-    }
-
-    /**
-     * If value is not in the range [min, max], set it to either min or max.
-     */
-    static int clamp(int value, int min, int max) {
-        return Math.min(Math.max(value, min), max);
-    }
-
-}
diff --git a/app/src/main/java/com/termux/app/TermuxService.java b/app/src/main/java/com/termux/app/TermuxService.java
index 0f4dd46567..3301b30ac2 100644
--- a/app/src/main/java/com/termux/app/TermuxService.java
+++ b/app/src/main/java/com/termux/app/TermuxService.java
@@ -24,6 +24,7 @@
 import com.termux.R;
 import com.termux.app.TermuxConstants.TERMUX_APP.TERMUX_ACTIVITY;
 import com.termux.app.TermuxConstants.TERMUX_APP.TERMUX_SERVICE;
+import com.termux.app.settings.preferences.TermuxSharedPreferences;
 import com.termux.terminal.EmulatorDebug;
 import com.termux.terminal.TerminalSession;
 import com.termux.terminal.TerminalSession.SessionChangedCallback;
@@ -148,7 +149,8 @@ public int onStartCommand(Intent intent, int flags, int startId) {
                 }
 
                 // Make the newly created session the current one to be displayed:
-                TermuxPreferences.storeCurrentSession(this, newSession);
+                TermuxSharedPreferences preferences = new TermuxSharedPreferences(this);
+                preferences.setCurrentSession(newSession.mHandle);
 
                 // Launch the main Termux app, which will now show the current session:
                 startActivity(new Intent(this, TermuxActivity.class).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
diff --git a/app/src/main/java/com/termux/app/settings/preferences/TermuxPreferenceConstants.java b/app/src/main/java/com/termux/app/settings/preferences/TermuxPreferenceConstants.java
new file mode 100644
index 0000000000..f9ba174d59
--- /dev/null
+++ b/app/src/main/java/com/termux/app/settings/preferences/TermuxPreferenceConstants.java
@@ -0,0 +1,50 @@
+package com.termux.app.settings.preferences;
+
+import com.termux.app.TermuxConstants;
+
+/*
+ * Version: v0.1.0
+ *
+ * Changelog
+ *
+ * - 0.1.0 (2021-03-12)
+ *      - Initial Release.
+ *
+ */
+
+/**
+ * A class that defines shared constants of the Shared preferences used by Termux app and its plugins.
+ * This class will be hosted by termux-app and should be imported by other termux plugin apps as is
+ * instead of copying constants to random classes. The 3rd party apps can also import it for
+ * interacting with termux apps. If changes are made to this file, increment the version number
+ * and add an entry in the Changelog section above.
+ *
+ * The properties are loaded from the first file found at
+ * {@link TermuxConstants#TERMUX_PROPERTIES_PRIMARY_FILE_PATH} or
+ * {@link TermuxConstants#TERMUX_PROPERTIES_SECONDARY_FILE_PATH}
+ */
+public final class TermuxPreferenceConstants {
+
+    /** Defines the key for whether to show extra keys in termux terminal view */
+    public static final String KEY_SHOW_EXTRA_KEYS = "show_extra_keys";
+    public static final boolean DEFAULT_VALUE_SHOW_EXTRA_KEYS = true;
+
+
+
+    /** Defines the key for whether to always keep screen on */
+    public static final String KEY_KEEP_SCREEN_ON = "screen_always_on";
+    public static final boolean DEFAULT_VALUE_KEEP_SCREEN_ON = true;
+
+
+
+    /** Defines the key for font size of termux terminal view */
+    public static final String KEY_FONTSIZE = "fontsize";
+
+
+
+    /** Defines the key for current termux terminal session */
+    public static final String KEY_CURRENT_SESSION = "current_session";
+
+
+
+}
diff --git a/app/src/main/java/com/termux/app/settings/preferences/TermuxSharedPreferences.java b/app/src/main/java/com/termux/app/settings/preferences/TermuxSharedPreferences.java
new file mode 100644
index 0000000000..65fe967973
--- /dev/null
+++ b/app/src/main/java/com/termux/app/settings/preferences/TermuxSharedPreferences.java
@@ -0,0 +1,138 @@
+package com.termux.app.settings.preferences;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.util.Log;
+import android.util.TypedValue;
+
+import com.termux.app.TermuxConstants;
+import com.termux.terminal.EmulatorDebug;
+
+import javax.annotation.Nonnull;
+
+public class TermuxSharedPreferences {
+
+    private final Context mContext;
+    private final SharedPreferences mSharedPreferences;
+
+
+    private int MIN_FONTSIZE;
+    private int MAX_FONTSIZE;
+    private int DEFAULT_FONTSIZE;
+
+    public TermuxSharedPreferences(@Nonnull Context context) {
+        Context mTempContext;
+
+        try {
+            mTempContext = context.createPackageContext(TermuxConstants.TERMUX_PACKAGE_NAME, Context.CONTEXT_RESTRICTED);
+        } catch (Exception e) {
+            Log.e(EmulatorDebug.LOG_TAG, "Failed to get \"" + TermuxConstants.TERMUX_PACKAGE_NAME + "\" package context", e);
+            Log.e(EmulatorDebug.LOG_TAG, "Force using current context");
+            mTempContext = context;
+        }
+
+        mContext = mTempContext;
+        mSharedPreferences = getSharedPreferences(mContext);
+
+        setFontVariables(context);
+    }
+
+    private static SharedPreferences getSharedPreferences(Context context) {
+        return context.getSharedPreferences(TermuxConstants.TERMUX_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION, Context.MODE_PRIVATE);
+    }
+
+
+
+    public boolean getShowExtraKeys() {
+        return mSharedPreferences.getBoolean(TermuxPreferenceConstants.KEY_SHOW_EXTRA_KEYS, TermuxPreferenceConstants.DEFAULT_VALUE_SHOW_EXTRA_KEYS);
+    }
+
+    public void setShowExtraKeys(boolean value) {
+        mSharedPreferences.edit().putBoolean(TermuxPreferenceConstants.KEY_SHOW_EXTRA_KEYS, value).apply();
+    }
+
+    public boolean toggleShowExtraKeys() {
+        boolean currentValue = getShowExtraKeys();
+        setShowExtraKeys(!currentValue);
+        return !currentValue;
+    }
+
+
+
+    public boolean getKeepScreenOn() {
+        return mSharedPreferences.getBoolean(TermuxPreferenceConstants.KEY_KEEP_SCREEN_ON, TermuxPreferenceConstants.DEFAULT_VALUE_KEEP_SCREEN_ON);
+    }
+
+    public void setKeepScreenOn(boolean value) {
+        mSharedPreferences.edit().putBoolean(TermuxPreferenceConstants.KEY_KEEP_SCREEN_ON, value).apply();
+    }
+
+
+
+    private void setFontVariables(Context context) {
+        float dipInPixels = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 1, context.getResources().getDisplayMetrics());
+
+        // This is a bit arbitrary and sub-optimal. We want to give a sensible default for minimum font size
+        // to prevent invisible text due to zoom be mistake:
+        MIN_FONTSIZE = (int) (4f * dipInPixels);
+
+        // http://www.google.com/design/spec/style/typography.html#typography-line-height
+        int defaultFontSize = Math.round(12 * dipInPixels);
+        // Make it divisible by 2 since that is the minimal adjustment step:
+        if (defaultFontSize % 2 == 1) defaultFontSize--;
+
+        DEFAULT_FONTSIZE = defaultFontSize;
+
+        MAX_FONTSIZE = 256;
+    }
+
+    public int getFontSize() {
+        int fontSize;
+        String fontString;
+
+        try {
+            fontString = mSharedPreferences.getString(TermuxPreferenceConstants.KEY_FONTSIZE, Integer.toString(DEFAULT_FONTSIZE));
+            if(fontString != null)
+                fontSize =  Integer.parseInt(fontString);
+            else
+                fontSize = DEFAULT_FONTSIZE;
+        } catch (NumberFormatException | ClassCastException e) {
+            fontSize = DEFAULT_FONTSIZE;
+        }
+        fontSize = clamp(fontSize, MIN_FONTSIZE, MAX_FONTSIZE);
+
+        return fontSize;
+    }
+
+    public void setFontSize(String value) {
+        mSharedPreferences.edit().putString(TermuxPreferenceConstants.KEY_FONTSIZE, value).apply();
+    }
+
+    public void changeFontSize(Context context, boolean increase) {
+
+        int fontSize = getFontSize();
+
+        fontSize += (increase ? 1 : -1) * 2;
+        fontSize = Math.max(MIN_FONTSIZE, Math.min(fontSize, MAX_FONTSIZE));
+
+        setFontSize(Integer.toString(fontSize));
+    }
+
+    /**
+     * If value is not in the range [min, max], set it to either min or max.
+     */
+    static int clamp(int value, int min, int max) {
+        return Math.min(Math.max(value, min), max);
+    }
+
+
+
+    public String getCurrentSession() {
+        return mSharedPreferences.getString(TermuxPreferenceConstants.KEY_CURRENT_SESSION, "");
+    }
+
+    public void setCurrentSession(String value) {
+        mSharedPreferences.edit().putString(TermuxPreferenceConstants.KEY_CURRENT_SESSION, value).apply();
+    }
+
+}

From d39972b3bfe3361c1437e5faaf6ea8ffbcb0d8ef Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 13 Mar 2021 16:49:29 +0500
Subject: [PATCH 229/912] Implement GUI based Termux settings manager and a
 centralized logging framework

The settings activity can be accessed by long pressing on terminal view and selecting "Settings" from the popup shown. It uses the Android's Preference framework. Currently only debugging preferences to set log level and enabling terminal view key logging are provided. The Preference framework by default uses the keys set in `app:key` attribute in the respective preferences XML file to store the values in the default `SharedPreferences` file of the app. However, since we rely on `TermuxPreferenceConstants` and `TermuxPropertyConstants` classes to define key names so that they can be easily shared between termux and its plugin apps, we provide our own `PreferenceDataStore` for storing key/value pairs. The key name in the XML file can optionally be the same. Check `DebuggingPreferencesFragment` class for a sample. Each new preference category fragment should be added to `app/settings/` with its data store.

This commit may allow support to be added for modifying `termux.properties` file directly from the UI but that requires more work, since writing to property files with comments require in-place modification.

The `Logger` class provides various static functions for logging that should be used from now on instead of directly calling android `Log.*` functions. The log level is automatically loaded from shared preferences at application startup via `TermuxApplication` and set in the static `Logger.CURRENT_LOG_LEVEL` variable. Changing the log level through the settings activity also changes the log level immediately.

The 4 supported log levels are:
- LOG_LEVEL_OFF which will log nothing.
- LOG_LEVEL_NORMAL which will start logging error, warn and info messages and stacktraces.
- LOG_LEVEL_DEBUG which will start logging debug messages.
- LOG_LEVEL_VERBOSE which will start logging verbose messages.

The default log level is `LOG_LEVEL_NORMAL` which will not log debug or verbose messages. Contributors can add useful log entries at those levels where ever they feel is appropriate so that it allows users and devs to more easily help solve issues or find bugs, specially without having to recompile termux after having to manually add general log entries to the source. DO NOT log data that may have private info of users like command arguments at log levels below debug, like `BackgroundJob` was doing previously.

Logging to file support may be added later, will require log file rotation support and storage permissions.
---
 app/build.gradle                              |   2 +
 app/src/main/AndroidManifest.xml              | 131 ++++++----
 .../java/com/termux/app/BackgroundJob.java    |  20 +-
 .../com/termux/app/RunCommandService.java     |  12 +-
 .../java/com/termux/app/TermuxActivity.java   |  29 ++-
 .../com/termux/app/TermuxApplication.java     |  23 ++
 .../java/com/termux/app/TermuxInstaller.java  |  13 +-
 .../com/termux/app/TermuxOpenReceiver.java    |  15 +-
 .../java/com/termux/app/TermuxService.java    |  23 +-
 .../termux/app/TermuxSettingsActivity.java    |  43 ++++
 .../DebuggingPreferencesFragment.java         | 122 ++++++++++
 .../TermuxPreferenceConstants.java            |  14 +-
 .../preferences/TermuxSharedPreferences.java  |  43 +++-
 .../settings/properties/SharedProperties.java |  22 +-
 .../properties/TermuxPropertyConstants.java   |   5 +-
 .../properties/TermuxSharedProperties.java    |  23 +-
 .../termux/app/terminal/TermuxViewClient.java |  85 +++++--
 .../java/com/termux/app/utils/Logger.java     | 223 ++++++++++++++++++
 .../com/termux/app/utils/TermuxUtils.java     |  18 ++
 .../TermuxFileReceiverActivity.java           |   8 +-
 app/src/main/res/layout/settings_activity.xml |   9 +
 app/src/main/res/values/strings.xml           |  31 +++
 .../main/res/xml/debugging_preferences.xml    |  21 ++
 app/src/main/res/xml/root_preferences.xml     |   8 +
 .../java/com/termux/view/TerminalView.java    |  60 +++--
 .../com/termux/view/TerminalViewClient.java   |  29 ++-
 26 files changed, 854 insertions(+), 178 deletions(-)
 create mode 100644 app/src/main/java/com/termux/app/TermuxApplication.java
 create mode 100644 app/src/main/java/com/termux/app/TermuxSettingsActivity.java
 create mode 100644 app/src/main/java/com/termux/app/settings/DebuggingPreferencesFragment.java
 create mode 100644 app/src/main/java/com/termux/app/utils/Logger.java
 create mode 100644 app/src/main/java/com/termux/app/utils/TermuxUtils.java
 create mode 100644 app/src/main/res/layout/settings_activity.xml
 create mode 100644 app/src/main/res/xml/debugging_preferences.xml
 create mode 100644 app/src/main/res/xml/root_preferences.xml

diff --git a/app/build.gradle b/app/build.gradle
index c1f0c6dfd9..52c51d4b27 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -87,6 +87,8 @@ android {
 }
 
 dependencies {
+    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.preference:preference:1.1.1'
     testImplementation 'junit:junit:4.13.1'
     testImplementation 'org.robolectric:robolectric:4.4'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0a2e70a616..346f6d3bff 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,17 +1,23 @@
+<?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"
     android:installLocation="internalOnly"
     android:sharedUserId="${TERMUX_PACKAGE_NAME}"
-    android:sharedUserLabel="@string/shared_user_label" >
+    android:sharedUserLabel="@string/shared_user_label">
 
-    <uses-feature android:name="android.hardware.touchscreen" android:required="false" />
-    <uses-feature android:name="android.software.leanback" android:required="false" />
+    <uses-feature
+        android:name="android.hardware.touchscreen"
+        android:required="false" />
+    <uses-feature
+        android:name="android.software.leanback"
+        android:required="false" />
 
-    <permission android:name="${TERMUX_PACKAGE_NAME}.permission.RUN_COMMAND"
-        android:label="@string/run_command_permission_label"
+    <permission
+        android:name="${TERMUX_PACKAGE_NAME}.permission.RUN_COMMAND"
         android:description="@string/run_command_permission_description"
         android:icon="@mipmap/ic_launcher"
+        android:label="@string/run_command_permission_label"
         android:protectionLevel="dangerous" />
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@@ -20,65 +26,95 @@
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"/>
-    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
+    <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
     <uses-permission android:name="android.permission.READ_LOGS" />
     <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" />
 
     <application
-        android:label="@string/application_name"
-        android:icon="@mipmap/ic_launcher"
-        android:roundIcon="@mipmap/ic_launcher_round"
+        android:name=".app.TermuxApplication"
+        android:allowBackup="false"
         android:banner="@drawable/banner"
-        android:theme="@style/Theme.Termux"
-
         android:extractNativeLibs="true"
-        android:allowBackup="false"
-        android:supportsRtl="false" >
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/application_name"
+        android:roundIcon="@mipmap/ic_launcher_round"
+        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" />
+        <!--
+         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:label="@string/application_name"
-	    android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation"
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation"
+            android:label="@string/application_name"
             android:launchMode="singleTask"
             android:resizeableActivity="true"
-	    android:windowSoftInputMode="adjustResize|stateAlwaysVisible" >
+            android:windowSoftInputMode="adjustResize|stateAlwaysVisible">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+
                 <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
             </intent-filter>
-            <meta-data android:name="android.app.shortcuts" android:resource="@xml/shortcuts" />
+
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/shortcuts" />
         </activity>
 
+        <activity-alias
+            android:name=".HomeActivity"
+            android:targetActivity=".app.TermuxActivity">
+
+            <!-- Launch activity automatically on boot on Android Things devices -->
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.IOT_LAUNCHER" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity-alias>
+
         <activity
             android:name=".app.TermuxHelpActivity"
             android:exported="false"
-            android:theme="@android:style/Theme.Material.Light.DarkActionBar"
+            android:label="@string/application_name"
             android:parentActivityName=".app.TermuxActivity"
             android:resizeableActivity="true"
-            android:label="@string/application_name" />
+            android:theme="@android:style/Theme.Material.Light.DarkActionBar" />
+
+        <activity
+            android:name=".app.TermuxSettingsActivity"
+            android:label="@string/title_activity_termux_settings"
+            android:theme="@style/Theme.AppCompat.Light.DarkActionBar" />
 
         <activity
             android:name=".filepicker.TermuxFileReceiverActivity"
-            android:label="@string/application_name"
-            android:taskAffinity="${TERMUX_PACKAGE_NAME}.filereceiver"
             android:excludeFromRecents="true"
+            android:label="@string/application_name"
+            android:noHistory="true"
             android:resizeableActivity="true"
-            android:noHistory="true">
+            android:taskAffinity="${TERMUX_PACKAGE_NAME}.filereceiver">
+
             <!-- Accept multiple file types when sending. -->
             <intent-filter>
-                <action android:name="android.intent.action.SEND"/>
+                <action android:name="android.intent.action.SEND" />
+
                 <category android:name="android.intent.category.DEFAULT" />
+
                 <data android:mimeType="application/*" />
                 <data android:mimeType="audio/*" />
                 <data android:mimeType="image/*" />
@@ -89,8 +125,10 @@
             </intent-filter>
             <!-- Accept multiple file types to let Termux be usable as generic file viewer. -->
             <intent-filter tools:ignore="AppLinkUrlError">
-                <action android:name="android.intent.action.VIEW"/>
+                <action android:name="android.intent.action.VIEW" />
+
                 <category android:name="android.intent.category.DEFAULT" />
+
                 <data android:mimeType="application/*" />
                 <data android:mimeType="audio/*" />
                 <data android:mimeType="image/*" />
@@ -99,23 +137,11 @@
             </intent-filter>
         </activity>
 
-        <activity-alias
-            android:name=".HomeActivity"
-            android:targetActivity=".app.TermuxActivity">
-
-            <!-- Launch activity automatically on boot on Android Things devices -->
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.IOT_LAUNCHER"/>
-                <category android:name="android.intent.category.DEFAULT"/>
-            </intent-filter>
-        </activity-alias>
-
         <provider
             android:name=".filepicker.TermuxDocumentsProvider"
             android:authorities="${TERMUX_PACKAGE_NAME}.documents"
-            android:grantUriPermissions="true"
             android:exported="true"
+            android:grantUriPermissions="true"
             android:permission="android.permission.MANAGE_DOCUMENTS">
             <intent-filter>
                 <action android:name="android.content.action.DOCUMENTS_PROVIDER" />
@@ -125,11 +151,10 @@
         <service
             android:name=".app.TermuxService"
             android:exported="false" />
-
         <service
             android:name=".app.RunCommandService"
             android:exported="true"
-            android:permission="${TERMUX_PACKAGE_NAME}.permission.RUN_COMMAND" >
+            android:permission="${TERMUX_PACKAGE_NAME}.permission.RUN_COMMAND">
             <intent-filter>
                 <action android:name="${TERMUX_PACKAGE_NAME}.RUN_COMMAND" />
             </intent-filter>
@@ -137,13 +162,19 @@
 
         <receiver android:name=".app.TermuxOpenReceiver" />
 
-        <provider android:authorities="${TERMUX_PACKAGE_NAME}.files"
-                  android:readPermission="android.permission.permRead"
-                  android:exported="true"
-                  android:grantUriPermissions="true"
-                  android:name=".app.TermuxOpenReceiver$ContentProvider" />
-	<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"/>
+        <provider
+            android:name=".app.TermuxOpenReceiver$ContentProvider"
+            android:authorities="${TERMUX_PACKAGE_NAME}.files"
+            android:exported="true"
+            android:grantUriPermissions="true"
+            android:readPermission="android.permission.permRead" />
+
+        <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>
diff --git a/app/src/main/java/com/termux/app/BackgroundJob.java b/app/src/main/java/com/termux/app/BackgroundJob.java
index 3f502d16e6..61e32317e8 100644
--- a/app/src/main/java/com/termux/app/BackgroundJob.java
+++ b/app/src/main/java/com/termux/app/BackgroundJob.java
@@ -4,9 +4,9 @@
 import android.app.PendingIntent;
 import android.content.Intent;
 import android.os.Bundle;
-import android.util.Log;
 
 import com.termux.BuildConfig;
+import com.termux.app.utils.Logger;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -26,10 +26,10 @@
  */
 public final class BackgroundJob {
 
-    private static final String LOG_TAG = "termux-task";
-
     final Process mProcess;
 
+    private static final String LOG_TAG = "BackgroundJob";
+
     public BackgroundJob(String cwd, String fileToExecute, final String[] args, final TermuxService service){
         this(cwd, fileToExecute, args, service, null);
     }
@@ -47,7 +47,7 @@ public BackgroundJob(String cwd, String fileToExecute, final String[] args, fina
         } catch (IOException e) {
             mProcess = null;
             // TODO: Visible error message?
-            Log.e(LOG_TAG, "Failed running background job: " + processDescription, e);
+            Logger.logStackTraceWithMessage(LOG_TAG, "Failed running background job: " + processDescription, e);
             return;
         }
 
@@ -67,7 +67,7 @@ public void run() {
                     // FIXME: Long lines.
                     while ((line = reader.readLine()) != null) {
                         errResult.append(line).append('\n');
-                        Log.i(LOG_TAG, "[" + pid + "] stderr: " + line);
+                        Logger.logDebug(LOG_TAG, "[" + pid + "] stderr: " + line);
                     }
                 } catch (IOException e) {
                     // Ignore.
@@ -79,7 +79,7 @@ public void run() {
         new Thread() {
             @Override
             public void run() {
-                Log.i(LOG_TAG, "[" + pid + "] starting: " + processDescription);
+                Logger.logDebug(LOG_TAG, "[" + pid + "] starting: " + processDescription);
                 InputStream stdout = mProcess.getInputStream();
                 BufferedReader reader = new BufferedReader(new InputStreamReader(stdout, StandardCharsets.UTF_8));
 
@@ -87,20 +87,20 @@ public void run() {
                 try {
                     // FIXME: Long lines.
                     while ((line = reader.readLine()) != null) {
-                        Log.i(LOG_TAG, "[" + pid + "] stdout: " + line);
+                        Logger.logDebug(LOG_TAG, "[" + pid + "] stdout: " + line);
                         outResult.append(line).append('\n');
                     }
                 } catch (IOException e) {
-                    Log.e(LOG_TAG, "Error reading output", e);
+                    Logger.logStackTraceWithMessage(LOG_TAG, "Error reading output", e);
                 }
 
                 try {
                     int exitCode = mProcess.waitFor();
                     service.onBackgroundJobExited(BackgroundJob.this);
                     if (exitCode == 0) {
-                        Log.i(LOG_TAG, "[" + pid + "] exited normally");
+                        Logger.logDebug(LOG_TAG, "[" + pid + "] exited normally");
                     } else {
-                        Log.w(LOG_TAG, "[" + pid + "] exited with code: " + exitCode);
+                        Logger.logDebug(LOG_TAG, "[" + pid + "] exited with code: " + exitCode);
                     }
 
                     result.putString("stdout", outResult.toString());
diff --git a/app/src/main/java/com/termux/app/RunCommandService.java b/app/src/main/java/com/termux/app/RunCommandService.java
index f186e5b2cf..8745d31a3c 100644
--- a/app/src/main/java/com/termux/app/RunCommandService.java
+++ b/app/src/main/java/com/termux/app/RunCommandService.java
@@ -10,13 +10,13 @@
 import android.os.Binder;
 import android.os.Build;
 import android.os.IBinder;
-import android.util.Log;
 
 import com.termux.R;
 import com.termux.app.TermuxConstants.TERMUX_APP.RUN_COMMAND_SERVICE;
 import com.termux.app.TermuxConstants.TERMUX_APP.TERMUX_SERVICE;
 import com.termux.app.settings.properties.TermuxPropertyConstants;
 import com.termux.app.settings.properties.TermuxSharedProperties;
+import com.termux.app.utils.Logger;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -84,6 +84,8 @@ public class RunCommandService extends Service {
     private static final String NOTIFICATION_CHANNEL_ID = "termux_run_command_notification_channel";
     private static final int NOTIFICATION_ID = 1338;
 
+    private static final String LOG_TAG = "RunCommandService";
+
     class LocalBinder extends Binder {
         public final RunCommandService service = RunCommandService.this;
     }
@@ -107,13 +109,13 @@ public int onStartCommand(Intent intent, int flags, int startId) {
 
         // If wrong action passed, then just return
         if (!RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND.equals(intent.getAction())) {
-            Log.e("termux", "Unexpected intent action to RunCommandService: " + intent.getAction());
+            Logger.logError(LOG_TAG, "Unexpected intent action to RunCommandService: " + intent.getAction());
             return Service.START_NOT_STICKY;
         }
 
         // If allow-external-apps property is not set to "true"
         if (!TermuxSharedProperties.isPropertyValueTrue(this, TermuxPropertyConstants.getTermuxPropertiesFile(), TermuxConstants.PROP_ALLOW_EXTERNAL_APPS)) {
-            Log.e("termux", "RunCommandService requires allow-external-apps property to be set to \"true\" in \"" + TermuxConstants.TERMUX_PROPERTIES_PRIMARY_FILE_PATH + "\" file");
+            Logger.logError(LOG_TAG, "RunCommandService requires allow-external-apps property to be set to \"true\" in \"" + TermuxConstants.TERMUX_PROPERTIES_PRIMARY_FILE_PATH + "\" file");
             return Service.START_NOT_STICKY;
         }
 
@@ -155,7 +157,7 @@ private void runStopForeground() {
 
     private Notification buildNotification() {
         Notification.Builder builder = new Notification.Builder(this);
-        builder.setContentTitle(getText(R.string.application_name) + " Run Command");
+        builder.setContentTitle(TermuxConstants.TERMUX_APP_NAME + " Run Command");
         builder.setSmallIcon(R.drawable.ic_service_notification);
 
         // Use a low priority:
@@ -177,7 +179,7 @@ private Notification buildNotification() {
     private void setupNotificationChannel() {
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) return;
 
-        String channelName = "Termux Run Command";
+        String channelName = TermuxConstants.TERMUX_APP_NAME + " Run Command";
         int importance = NotificationManager.IMPORTANCE_LOW;
 
         NotificationChannel channel = new NotificationChannel(NOTIFICATION_CHANNEL_ID, channelName, importance);
diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index ed12ec6103..8b75f7ee94 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -28,7 +28,6 @@
 import android.text.Spanned;
 import android.text.TextUtils;
 import android.text.style.StyleSpan;
-import android.util.Log;
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
 import android.view.Gravity;
@@ -55,7 +54,7 @@
 import com.termux.app.terminal.FullScreenWorkAround;
 import com.termux.app.settings.properties.TermuxPropertyConstants;
 import com.termux.app.settings.properties.TermuxSharedProperties;
-import com.termux.terminal.EmulatorDebug;
+import com.termux.app.utils.Logger;
 import com.termux.terminal.TerminalColors;
 import com.termux.terminal.TerminalSession;
 import com.termux.terminal.TerminalSession.SessionChangedCallback;
@@ -100,6 +99,7 @@ public final class TermuxActivity extends Activity implements ServiceConnection
     private static final int CONTEXTMENU_HELP_ID = 8;
     private static final int CONTEXTMENU_TOGGLE_KEEP_SCREEN_ON = 9;
     private static final int CONTEXTMENU_AUTOFILL_ID = 10;
+    private static final int CONTEXTMENU_SETTINGS_ID = 11;
 
     private static final int MAX_SESSIONS = 8;
 
@@ -145,12 +145,14 @@ public final class TermuxActivity extends Activity implements ServiceConnection
             .setUsage(AudioAttributes.USAGE_ASSISTANCE_SONIFICATION).build()).build();
     int mBellSoundId;
 
+    private static final String LOG_TAG = "TermuxActivity";
+
     private final BroadcastReceiver mBroadcastReceiever = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
             if (mIsVisible) {
                 String whatToReload = intent.getStringExtra(TERMUX_ACTIVITY.EXTRA_RELOAD_STYLE);
-                Log.d("termux", "Reloading termux style for: " + whatToReload);
+                Logger.logDebug(LOG_TAG, "Reloading termux style for: " + whatToReload);
                 if ("storage".equals(whatToReload)) {
                     if (ensureStoragePermissionGranted())
                         TermuxInstaller.setupStorageSymlinks(TermuxActivity.this);
@@ -190,7 +192,7 @@ void checkForFontAndColors() {
             final Typeface newTypeface = (fontFile.exists() && fontFile.length() > 0) ? Typeface.createFromFile(fontFile) : Typeface.MONOSPACE;
             mTerminalView.setTypeface(newTypeface);
         } catch (Exception e) {
-            Log.e(EmulatorDebug.LOG_TAG, "Error in checkForFontAndColors()", e);
+            Logger.logStackTraceWithMessage(LOG_TAG, "Error in checkForFontAndColors()", e);
         }
     }
 
@@ -245,10 +247,12 @@ public void onCreate(Bundle bundle) {
         }
 
         mTerminalView = findViewById(R.id.terminal_view);
-        mTerminalView.setOnKeyListener(new TermuxViewClient(this));
+
+        mTerminalView.setTerminalViewClient(new TermuxViewClient(this));
 
         mTerminalView.setTextSize(mPreferences.getFontSize());
         mTerminalView.setKeepScreenOn(mPreferences.getKeepScreenOn());
+        mTerminalView.setIsTerminalViewKeyLoggingEnabled(mPreferences.getTerminalViewKeyLoggingEnabled());
         mTerminalView.requestFocus();
 
         final ViewPager viewPager = findViewById(R.id.viewpager);
@@ -627,6 +631,8 @@ public void onStart() {
 
         registerReceiver(mBroadcastReceiever, new IntentFilter(TERMUX_ACTIVITY.ACTION_RELOAD_STYLE));
 
+        mTerminalView.setIsTerminalViewKeyLoggingEnabled(mPreferences.getTerminalViewKeyLoggingEnabled());
+
         // The current terminal session may have changed while being away, force
         // a refresh of the displayed terminal:
         mTerminalView.onScreenUpdated();
@@ -742,6 +748,7 @@ public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuIn
         menu.add(Menu.NONE, CONTEXTMENU_STYLING_ID, Menu.NONE, R.string.style_terminal);
         menu.add(Menu.NONE, CONTEXTMENU_TOGGLE_KEEP_SCREEN_ON, Menu.NONE, R.string.toggle_keep_screen_on).setCheckable(true).setChecked(mPreferences.getKeepScreenOn());
         menu.add(Menu.NONE, CONTEXTMENU_HELP_ID, Menu.NONE, R.string.help);
+        menu.add(Menu.NONE, CONTEXTMENU_SETTINGS_ID, Menu.NONE, R.string.settings);
     }
 
     /** Hook system menu to show context menu instead. */
@@ -948,6 +955,9 @@ public boolean onContextItemSelected(MenuItem item) {
             case CONTEXTMENU_HELP_ID:
                 startActivity(new Intent(this, TermuxHelpActivity.class));
                 return true;
+            case CONTEXTMENU_SETTINGS_ID:
+                startActivity(new Intent(this, TermuxSettingsActivity.class));
+                return true;
             case CONTEXTMENU_TOGGLE_KEEP_SCREEN_ON: {
                 if(mTerminalView.getKeepScreenOn()) {
                     mTerminalView.setKeepScreenOn(false);
@@ -1036,6 +1046,10 @@ public void removeFinishedSession(TerminalSession finishedSession) {
         }
     }
 
+    public boolean isVisible() {
+        return mIsVisible;
+    }
+
     public TermuxService getTermService() {
         return mTermService;
     }
@@ -1047,8 +1061,13 @@ public TerminalView getTerminalView() {
     public ExtraKeysView getExtraKeysView() {
         return mExtraKeysView;
     }
+
     public TermuxSharedProperties getProperties() {
         return mProperties;
     }
 
+    public TermuxSharedPreferences getPreferences() {
+        return mPreferences;
+    }
+
 }
diff --git a/app/src/main/java/com/termux/app/TermuxApplication.java b/app/src/main/java/com/termux/app/TermuxApplication.java
new file mode 100644
index 0000000000..94c4dbccf6
--- /dev/null
+++ b/app/src/main/java/com/termux/app/TermuxApplication.java
@@ -0,0 +1,23 @@
+package com.termux.app;
+
+import android.app.Application;
+
+import com.termux.app.settings.preferences.TermuxSharedPreferences;
+import com.termux.app.utils.Logger;
+
+
+public class TermuxApplication extends Application {
+    public void onCreate() {
+        super.onCreate();
+
+        updateLogLevel();
+    }
+
+    private void updateLogLevel() {
+        // Load the log level from shared preferences and set it to the {@link Loggger.CURRENT_LOG_LEVEL}
+        TermuxSharedPreferences preferences = new TermuxSharedPreferences(getApplicationContext());
+        preferences.setLogLevel(null, preferences.getLogLevel());
+        Logger.logDebug("Starting Application");
+    }
+}
+
diff --git a/app/src/main/java/com/termux/app/TermuxInstaller.java b/app/src/main/java/com/termux/app/TermuxInstaller.java
index c5bf3d1726..6b218a4f4a 100644
--- a/app/src/main/java/com/termux/app/TermuxInstaller.java
+++ b/app/src/main/java/com/termux/app/TermuxInstaller.java
@@ -7,12 +7,11 @@
 import android.os.Environment;
 import android.os.UserManager;
 import android.system.Os;
-import android.util.Log;
 import android.util.Pair;
 import android.view.WindowManager;
 
 import com.termux.R;
-import com.termux.terminal.EmulatorDebug;
+import com.termux.app.utils.Logger;
 
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
@@ -46,6 +45,8 @@
  */
 final class TermuxInstaller {
 
+    private static final String LOG_TAG = "TermuxInstaller";
+
     /** Performs setup if necessary. */
     static void setupIfNeeded(final Activity activity, final Runnable whenDone) {
         // Termux can only be run as the primary user (device owner) since only that
@@ -130,7 +131,7 @@ public void run() {
 
                     activity.runOnUiThread(whenDone);
                 } catch (final Exception e) {
-                    Log.e(EmulatorDebug.LOG_TAG, "Bootstrap error", 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)
@@ -200,13 +201,13 @@ public void run() {
                         try {
                             deleteFolder(storageDir);
                         } catch (IOException e) {
-                            Log.e(LOG_TAG, "Could not delete old $HOME/storage, " + e.getMessage());
+                            Logger.logError(LOG_TAG, "Could not delete old $HOME/storage, " + e.getMessage());
                             return;
                         }
                     }
 
                     if (!storageDir.mkdirs()) {
-                        Log.e(LOG_TAG, "Unable to mkdirs() for $HOME/storage");
+                        Logger.logError(LOG_TAG, "Unable to mkdirs() for $HOME/storage");
                         return;
                     }
 
@@ -238,7 +239,7 @@ public void run() {
                         }
                     }
                 } catch (Exception e) {
-                    Log.e(LOG_TAG, "Error setting up link", e);
+                    Logger.logStackTraceWithMessage(LOG_TAG, "Error setting up link", e);
                 }
             }
         }.start();
diff --git a/app/src/main/java/com/termux/app/TermuxOpenReceiver.java b/app/src/main/java/com/termux/app/TermuxOpenReceiver.java
index 960ab8e57d..92ce70f871 100644
--- a/app/src/main/java/com/termux/app/TermuxOpenReceiver.java
+++ b/app/src/main/java/com/termux/app/TermuxOpenReceiver.java
@@ -11,10 +11,9 @@
 import android.os.Environment;
 import android.os.ParcelFileDescriptor;
 import android.provider.MediaStore;
-import android.util.Log;
 import android.webkit.MimeTypeMap;
 
-import com.termux.terminal.EmulatorDebug;
+import com.termux.app.utils.Logger;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -24,11 +23,13 @@
 
 public class TermuxOpenReceiver extends BroadcastReceiver {
 
+    private static final String LOG_TAG = "TermuxOpenReceiver";
+
     @Override
     public void onReceive(Context context, Intent intent) {
         final Uri data = intent.getData();
         if (data == null) {
-            Log.e(EmulatorDebug.LOG_TAG, "termux-open: Called without intent data");
+            Logger.logError(LOG_TAG, "termux-open: Called without intent data");
             return;
         }
 
@@ -42,7 +43,7 @@ public void onReceive(Context context, Intent intent) {
                 // Ok.
                 break;
             default:
-                Log.e(EmulatorDebug.LOG_TAG, "Invalid action '" + intentAction + "', using 'view'");
+                Logger.logError(LOG_TAG, "Invalid action '" + intentAction + "', using 'view'");
                 break;
         }
 
@@ -59,14 +60,14 @@ public void onReceive(Context context, Intent intent) {
             try {
                 context.startActivity(urlIntent);
             } catch (ActivityNotFoundException e) {
-                Log.e(EmulatorDebug.LOG_TAG, "termux-open: No app handles the url " + data);
+                Logger.logError(LOG_TAG, "termux-open: No app handles the url " + data);
             }
             return;
         }
 
         final File fileToShare = new File(filePath);
         if (!(fileToShare.isFile() && fileToShare.canRead())) {
-            Log.e(EmulatorDebug.LOG_TAG, "termux-open: Not a readable file: '" + fileToShare.getAbsolutePath() + "'");
+            Logger.logError(LOG_TAG, "termux-open: Not a readable file: '" + fileToShare.getAbsolutePath() + "'");
             return;
         }
 
@@ -103,7 +104,7 @@ public void onReceive(Context context, Intent intent) {
         try {
             context.startActivity(sendIntent);
         } catch (ActivityNotFoundException e) {
-            Log.e(EmulatorDebug.LOG_TAG, "termux-open: No app handles the url " + data);
+            Logger.logError(LOG_TAG, "termux-open: No app handles the url " + data);
         }
     }
 
diff --git a/app/src/main/java/com/termux/app/TermuxService.java b/app/src/main/java/com/termux/app/TermuxService.java
index 3301b30ac2..cc624d606c 100644
--- a/app/src/main/java/com/termux/app/TermuxService.java
+++ b/app/src/main/java/com/termux/app/TermuxService.java
@@ -18,14 +18,13 @@
 import android.os.IBinder;
 import android.os.PowerManager;
 import android.provider.Settings;
-import android.util.Log;
 import android.widget.ArrayAdapter;
 
 import com.termux.R;
 import com.termux.app.TermuxConstants.TERMUX_APP.TERMUX_ACTIVITY;
 import com.termux.app.TermuxConstants.TERMUX_APP.TERMUX_SERVICE;
 import com.termux.app.settings.preferences.TermuxSharedPreferences;
-import com.termux.terminal.EmulatorDebug;
+import com.termux.app.utils.Logger;
 import com.termux.terminal.TerminalSession;
 import com.termux.terminal.TerminalSession.SessionChangedCallback;
 
@@ -50,6 +49,8 @@ public final class TermuxService extends Service implements SessionChangedCallba
     private static final String NOTIFICATION_CHANNEL_ID = "termux_notification_channel";
     private static final int NOTIFICATION_ID = 1337;
 
+    private static final String LOG_TAG = "TermuxService";
+
     /** This service is only bound from inside the same process and never uses IPC. */
     class LocalBinder extends Binder {
         public final TermuxService service = TermuxService.this;
@@ -91,12 +92,12 @@ public int onStartCommand(Intent intent, int flags, int startId) {
         } else if (TERMUX_SERVICE.ACTION_WAKE_LOCK.equals(action)) {
             if (mWakeLock == null) {
                 PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
-                mWakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, EmulatorDebug.LOG_TAG + ":service-wakelock");
+                mWakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, TermuxConstants.TERMUX_APP_NAME.toLowerCase() + ":service-wakelock");
                 mWakeLock.acquire();
 
                 // http://tools.android.com/tech-docs/lint-in-studio-2-3#TOC-WifiManager-Leak
                 WifiManager wm = (WifiManager) getApplicationContext().getSystemService(Context.WIFI_SERVICE);
-                mWifiLock = wm.createWifiLock(WifiManager.WIFI_MODE_FULL_HIGH_PERF, EmulatorDebug.LOG_TAG);
+                mWifiLock = wm.createWifiLock(WifiManager.WIFI_MODE_FULL_HIGH_PERF, TermuxConstants.TERMUX_APP_NAME.toLowerCase());
                 mWifiLock.acquire();
 
                 String packageName = getPackageName();
@@ -109,7 +110,7 @@ public int onStartCommand(Intent intent, int flags, int startId) {
                     try {
                         startActivity(whitelist);
                     } catch (ActivityNotFoundException e) {
-                        Log.e(EmulatorDebug.LOG_TAG, "Failed to call ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS", e);
+                        Logger.logStackTraceWithMessage(LOG_TAG, "Failed to call ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS", e);
                     }
                 }
 
@@ -156,7 +157,7 @@ public int onStartCommand(Intent intent, int flags, int startId) {
                 startActivity(new Intent(this, TermuxActivity.class).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
             }
         } else if (action != null) {
-            Log.e(EmulatorDebug.LOG_TAG, "Unknown TermuxService action: '" + action + "'");
+            Logger.logError(LOG_TAG, "Unknown TermuxService action: '" + action + "'");
         }
 
         // If this service really do get killed, there is no point restarting it automatically - let the user do on next
@@ -246,7 +247,7 @@ public void onDestroy() {
             try {
                 TermuxInstaller.deleteFolder(termuxTmpDir.getCanonicalFile());
             } catch (Exception e) {
-                Log.e(EmulatorDebug.LOG_TAG, "Error while removing file at " + termuxTmpDir.getAbsolutePath(), e);
+                Logger.logStackTraceWithMessage(LOG_TAG, "Error while removing file at " + termuxTmpDir.getAbsolutePath(), e);
             }
 
             termuxTmpDir.mkdirs();
@@ -367,8 +368,8 @@ public void onBackgroundJobExited(final BackgroundJob task) {
     private void setupNotificationChannel() {
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) return;
 
-        String channelName = "Termux";
-        String channelDescription = "Notifications from Termux";
+        String channelName = TermuxConstants.TERMUX_APP_NAME;
+        String channelDescription = "Notifications from " + TermuxConstants.TERMUX_APP_NAME;
         int importance = NotificationManager.IMPORTANCE_LOW;
 
         NotificationChannel channel = new NotificationChannel(NOTIFICATION_CHANNEL_ID, channelName,importance);
@@ -376,4 +377,8 @@ private void setupNotificationChannel() {
         NotificationManager manager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
         manager.createNotificationChannel(channel);
     }
+
+    public boolean wantsToStop() {
+        return mWantsToStop;
+    }
 }
diff --git a/app/src/main/java/com/termux/app/TermuxSettingsActivity.java b/app/src/main/java/com/termux/app/TermuxSettingsActivity.java
new file mode 100644
index 0000000000..74604c96c0
--- /dev/null
+++ b/app/src/main/java/com/termux/app/TermuxSettingsActivity.java
@@ -0,0 +1,43 @@
+package com.termux.app;
+
+import android.os.Bundle;
+
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.preference.PreferenceFragmentCompat;
+
+import com.termux.R;
+
+public class TermuxSettingsActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.settings_activity);
+        if (savedInstanceState == null) {
+            getSupportFragmentManager()
+                .beginTransaction()
+                .replace(R.id.settings, new RootPreferencesFragment())
+                .commit();
+        }
+        ActionBar actionBar = getSupportActionBar();
+        if (actionBar != null) {
+            actionBar.setDisplayHomeAsUpEnabled(true);
+            actionBar.setDisplayShowHomeEnabled(true);
+        }
+    }
+
+    @Override
+    public boolean onSupportNavigateUp() {
+        onBackPressed();
+        return true;
+    }
+
+    public static class RootPreferencesFragment extends PreferenceFragmentCompat {
+        @Override
+        public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
+            setPreferencesFromResource(R.xml.root_preferences, rootKey);
+        }
+    }
+
+}
diff --git a/app/src/main/java/com/termux/app/settings/DebuggingPreferencesFragment.java b/app/src/main/java/com/termux/app/settings/DebuggingPreferencesFragment.java
new file mode 100644
index 0000000000..c976c30e59
--- /dev/null
+++ b/app/src/main/java/com/termux/app/settings/DebuggingPreferencesFragment.java
@@ -0,0 +1,122 @@
+package com.termux.app.settings;
+
+import android.content.Context;
+import android.os.Bundle;
+
+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.app.settings.preferences.TermuxPreferenceConstants;
+import com.termux.app.settings.preferences.TermuxSharedPreferences;
+import com.termux.app.utils.Logger;
+
+public class DebuggingPreferencesFragment extends PreferenceFragmentCompat {
+    @Override
+    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
+        PreferenceManager preferenceManager = getPreferenceManager();
+        preferenceManager.setPreferenceDataStore(DebuggingPreferencesDataStore.getInstance(getContext()));
+
+        setPreferencesFromResource(R.xml.debugging_preferences, rootKey);
+
+        PreferenceCategory loggingCategory = findPreference("logging");
+
+        if (loggingCategory != null) {
+            final ListPreference logLevelListPreference = setLogLevelListPreferenceData(findPreference("log_level"), getActivity());
+            loggingCategory.addPreference(logLevelListPreference);
+        }
+    }
+
+    protected ListPreference setLogLevelListPreferenceData(ListPreference logLevelListPreference, Context context) {
+        if(logLevelListPreference == null)
+            logLevelListPreference = new ListPreference(context);
+
+        CharSequence[] logLevels = Logger.getLogLevelsArray();
+        CharSequence[] logLevelLabels = Logger.getLogLevelLabelsArray(context, logLevels, true);
+
+        logLevelListPreference.setEntryValues(logLevels);
+        logLevelListPreference.setEntries(logLevelLabels);
+
+        logLevelListPreference.setKey(TermuxPreferenceConstants.KEY_LOG_LEVEL);
+        logLevelListPreference.setValue(String.valueOf(Logger.getLogLevel()));
+        logLevelListPreference.setDefaultValue(Logger.getLogLevel());
+
+        return logLevelListPreference;
+    }
+
+}
+
+class DebuggingPreferencesDataStore extends PreferenceDataStore {
+
+    private final Context mContext;
+    private final TermuxSharedPreferences mPreferences;
+
+    private static DebuggingPreferencesDataStore mInstance;
+
+    private DebuggingPreferencesDataStore(Context context) {
+        mContext = context;
+        mPreferences = new TermuxSharedPreferences(context);
+    }
+
+    public static synchronized DebuggingPreferencesDataStore getInstance(Context context) {
+        if (mInstance == null) {
+            mInstance = new DebuggingPreferencesDataStore(context.getApplicationContext());
+        }
+        return mInstance;
+    }
+
+    @Override
+    @Nullable
+    public String getString(String key, @Nullable String defValue) {
+        if(key == null) return null;
+
+        switch (key) {
+            case "log_level":
+                return String.valueOf(mPreferences.getLogLevel());
+            default:
+                return null;
+        }
+    }
+
+    @Override
+    public void putString(String key, @Nullable String value) {
+        if(key == null) return;
+
+        switch (key) {
+            case "log_level":
+                if (value != null) {
+                    mPreferences.setLogLevel(mContext, Integer.parseInt(value));
+                }
+                break;
+            default:
+                break;
+        }
+    }
+
+    @Override
+    public void putBoolean(String key, boolean value) {
+        if(key == null) return;
+
+        switch (key) {
+            case "terminal_view_key_logging_enabled":
+                    mPreferences.setTerminalViewKeyLoggingEnabled(value);
+                break;
+            default:
+                break;
+        }
+    }
+
+    @Override
+    public boolean getBoolean(String key, boolean defValue) {
+        switch (key) {
+            case "terminal_view_key_logging_enabled":
+                return mPreferences.getTerminalViewKeyLoggingEnabled();
+            default:
+                return false;
+        }
+    }
+}
diff --git a/app/src/main/java/com/termux/app/settings/preferences/TermuxPreferenceConstants.java b/app/src/main/java/com/termux/app/settings/preferences/TermuxPreferenceConstants.java
index f9ba174d59..a12aa954af 100644
--- a/app/src/main/java/com/termux/app/settings/preferences/TermuxPreferenceConstants.java
+++ b/app/src/main/java/com/termux/app/settings/preferences/TermuxPreferenceConstants.java
@@ -3,13 +3,14 @@
 import com.termux.app.TermuxConstants;
 
 /*
- * Version: v0.1.0
+ * Version: v0.2.0
  *
  * Changelog
  *
  * - 0.1.0 (2021-03-12)
  *      - Initial Release.
- *
+ * - 0.2.0 (2021-03-13)
+ *      - Added `KEY_LOG_LEVEL` and `KEY_TERMINAL_VIEW_LOGGING_ENABLED`
  */
 
 /**
@@ -47,4 +48,13 @@ public final class TermuxPreferenceConstants {
 
 
 
+    /** Defines the key for current termux log level */
+    public static final String KEY_LOG_LEVEL = "log_level";
+
+
+
+    /** Defines the key for whether termux terminal view key logging is enabled or not */
+    public static final String KEY_TERMINAL_VIEW_KEY_LOGGING_ENABLED = "terminal_view_key_logging_enabled";
+    public static final boolean DEFAULT_VALUE_TERMINAL_VIEW_KEY_LOGGING_ENABLED = false;
+
 }
diff --git a/app/src/main/java/com/termux/app/settings/preferences/TermuxSharedPreferences.java b/app/src/main/java/com/termux/app/settings/preferences/TermuxSharedPreferences.java
index 65fe967973..1278dd3e89 100644
--- a/app/src/main/java/com/termux/app/settings/preferences/TermuxSharedPreferences.java
+++ b/app/src/main/java/com/termux/app/settings/preferences/TermuxSharedPreferences.java
@@ -2,11 +2,11 @@
 
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.util.Log;
 import android.util.TypedValue;
 
 import com.termux.app.TermuxConstants;
-import com.termux.terminal.EmulatorDebug;
+import com.termux.app.utils.Logger;
+import com.termux.app.utils.TermuxUtils;
 
 import javax.annotation.Nonnull;
 
@@ -21,17 +21,7 @@ public class TermuxSharedPreferences {
     private int DEFAULT_FONTSIZE;
 
     public TermuxSharedPreferences(@Nonnull Context context) {
-        Context mTempContext;
-
-        try {
-            mTempContext = context.createPackageContext(TermuxConstants.TERMUX_PACKAGE_NAME, Context.CONTEXT_RESTRICTED);
-        } catch (Exception e) {
-            Log.e(EmulatorDebug.LOG_TAG, "Failed to get \"" + TermuxConstants.TERMUX_PACKAGE_NAME + "\" package context", e);
-            Log.e(EmulatorDebug.LOG_TAG, "Force using current context");
-            mTempContext = context;
-        }
-
-        mContext = mTempContext;
+        mContext = TermuxUtils.getTermuxPackageContext(context);
         mSharedPreferences = getSharedPreferences(mContext);
 
         setFontVariables(context);
@@ -135,4 +125,31 @@ public void setCurrentSession(String value) {
         mSharedPreferences.edit().putString(TermuxPreferenceConstants.KEY_CURRENT_SESSION, value).apply();
     }
 
+
+
+    public int getLogLevel() {
+        try {
+            return mSharedPreferences.getInt(TermuxPreferenceConstants.KEY_LOG_LEVEL, Logger.DEFAULT_LOG_LEVEL);
+        }
+        catch (Exception e) {
+            Logger.logStackTraceWithMessage("Error getting \"" + TermuxPreferenceConstants.KEY_LOG_LEVEL + "\" from shared preferences", e);
+            return Logger.DEFAULT_LOG_LEVEL;
+        }
+    }
+
+    public void setLogLevel(Context context, int logLevel) {
+        logLevel = Logger.setLogLevel(context, logLevel);
+        mSharedPreferences.edit().putInt(TermuxPreferenceConstants.KEY_LOG_LEVEL, logLevel).apply();
+    }
+
+
+
+    public boolean getTerminalViewKeyLoggingEnabled() {
+        return mSharedPreferences.getBoolean(TermuxPreferenceConstants.KEY_TERMINAL_VIEW_KEY_LOGGING_ENABLED, TermuxPreferenceConstants.DEFAULT_VALUE_TERMINAL_VIEW_KEY_LOGGING_ENABLED);
+    }
+
+    public void setTerminalViewKeyLoggingEnabled(boolean value) {
+        mSharedPreferences.edit().putBoolean(TermuxPreferenceConstants.KEY_TERMINAL_VIEW_KEY_LOGGING_ENABLED, value).apply();
+    }
+
 }
diff --git a/app/src/main/java/com/termux/app/settings/properties/SharedProperties.java b/app/src/main/java/com/termux/app/settings/properties/SharedProperties.java
index db6eb637dd..bf47fa0074 100644
--- a/app/src/main/java/com/termux/app/settings/properties/SharedProperties.java
+++ b/app/src/main/java/com/termux/app/settings/properties/SharedProperties.java
@@ -1,10 +1,10 @@
 package com.termux.app.settings.properties;
 
 import android.content.Context;
-import android.util.Log;
 import android.widget.Toast;
 
 import com.google.common.primitives.Primitives;
+import com.termux.app.utils.Logger;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -57,6 +57,8 @@ public class SharedProperties {
 
     private final Object mLock = new Object();
 
+    private static final String LOG_TAG = "SharedProperties";
+
     /**
      * Constructor for the SharedProperties class.
      *
@@ -97,7 +99,7 @@ public void loadPropertiesFromDisk() {
             Object internalValue;
             for (String key : mPropertiesList) {
                 value = properties.getProperty(key); // value will be null if key does not exist in propertiesFile
-                Log.d("termux", key + " : " + value);
+                Logger.logDebug(LOG_TAG, key + " : " + value);
 
                 // Call the {@link SharedPropertiesParser#getInternalPropertyValueFromValue(Context,String,String)}
                 // interface method to get the internal value to store in the  {@link #mMap}.
@@ -129,13 +131,13 @@ public void loadPropertiesFromDisk() {
     public static boolean putToMap(HashMap<String, Object> map, String key, Object value) {
 
         if (map == null) {
-            Log.e("termux", "Map passed to SharedProperties.putToProperties() is null");
+            Logger.logError(LOG_TAG, "Map passed to SharedProperties.putToProperties() is null");
             return false;
         }
 
         // null keys are not allowed to be stored in mMap
         if (key == null) {
-            Log.e("termux", "Cannot put a null key into properties map");
+            Logger.logError(LOG_TAG, "Cannot put a null key into properties map");
             return false;
         }
 
@@ -153,7 +155,7 @@ public static boolean putToMap(HashMap<String, Object> map, String key, Object v
             map.put(key, value);
             return true;
         } else {
-            Log.e("termux", "Cannot put a non-primitive value for the key \"" + key + "\" into properties map");
+            Logger.logError(LOG_TAG, "Cannot put a non-primitive value for the key \"" + key + "\" into properties map");
             return false;
         }
     }
@@ -172,13 +174,13 @@ public static boolean putToMap(HashMap<String, Object> map, String key, Object v
     public static boolean putToProperties(Properties properties, String key, String value) {
 
         if (properties == null) {
-            Log.e("termux", "Properties passed to SharedProperties.putToProperties() is null");
+            Logger.logError(LOG_TAG, "Properties passed to SharedProperties.putToProperties() is null");
             return false;
         }
 
         // null keys are not allowed to be stored in mMap
         if (key == null) {
-            Log.e("termux", "Cannot put a null key into properties");
+            Logger.logError(LOG_TAG, "Cannot put a null key into properties");
             return false;
         }
 
@@ -206,19 +208,19 @@ public static Properties getPropertiesFromFile(Context context, File propertiesF
         Properties properties = new Properties();
 
         if (propertiesFile == null) {
-            Log.e("termux", "Not loading properties since file is null");
+            Logger.logError(LOG_TAG, "Not loading properties since file is null");
             return properties;
         }
 
         try {
             try (FileInputStream in = new FileInputStream(propertiesFile)) {
-                Log.v("termux", "Loading properties from \"" + propertiesFile.getAbsolutePath() + "\" file");
+                Logger.logVerbose(LOG_TAG, "Loading properties from \"" + propertiesFile.getAbsolutePath() + "\" file");
                 properties.load(new InputStreamReader(in, StandardCharsets.UTF_8));
             }
         } catch (Exception e) {
             if(context != null)
                 Toast.makeText(context, "Could not open properties file \"" + propertiesFile.getAbsolutePath() + "\": " + e.getMessage(), Toast.LENGTH_LONG).show();
-            Log.e("termux", "Error loading properties file \"" + propertiesFile.getAbsolutePath() + "\"", e);
+            Logger.logStackTraceWithMessage(LOG_TAG, "Error loading properties file \"" + propertiesFile.getAbsolutePath() + "\"", e);
             return null;
         }
 
diff --git a/app/src/main/java/com/termux/app/settings/properties/TermuxPropertyConstants.java b/app/src/main/java/com/termux/app/settings/properties/TermuxPropertyConstants.java
index a68e046689..6e3dd673d2 100644
--- a/app/src/main/java/com/termux/app/settings/properties/TermuxPropertyConstants.java
+++ b/app/src/main/java/com/termux/app/settings/properties/TermuxPropertyConstants.java
@@ -1,9 +1,8 @@
 package com.termux.app.settings.properties;
 
-import android.util.Log;
-
 import com.google.common.collect.ImmutableBiMap;
 import com.termux.app.TermuxConstants;
+import com.termux.app.utils.Logger;
 
 import java.io.File;
 import java.util.Arrays;
@@ -237,7 +236,7 @@ public static File getTermuxPropertiesFile() {
         if (propertiesFile.isFile() && propertiesFile.canRead()) {
             return propertiesFile;
         } else {
-            Log.d("termux", "No readable termux.properties file found");
+            Logger.logDebug("No readable termux.properties file found");
             return null;
         }
     }
diff --git a/app/src/main/java/com/termux/app/settings/properties/TermuxSharedProperties.java b/app/src/main/java/com/termux/app/settings/properties/TermuxSharedProperties.java
index 70a3dc3ecb..8c72793fec 100644
--- a/app/src/main/java/com/termux/app/settings/properties/TermuxSharedProperties.java
+++ b/app/src/main/java/com/termux/app/settings/properties/TermuxSharedProperties.java
@@ -2,13 +2,12 @@
 
 import android.content.Context;
 import android.content.res.Configuration;
-import android.util.Log;
-import android.widget.Toast;
 
 import androidx.annotation.Nullable;
 
 import com.termux.app.terminal.extrakeys.ExtraKeysInfo;
 import com.termux.app.terminal.KeyboardShortcut;
+import com.termux.app.utils.Logger;
 
 import org.json.JSONException;
 
@@ -30,6 +29,8 @@ public class TermuxSharedProperties implements SharedPropertiesParser {
     private ExtraKeysInfo mExtraKeysInfo;
     private final List<KeyboardShortcut> mSessionShortcuts = new ArrayList<>();
 
+    private static final String LOG_TAG = "TermuxSharedProperties";
+
     public TermuxSharedProperties(@Nonnull Context context) {
         mContext = context;
         mPropertiesFile = TermuxPropertyConstants.getTermuxPropertiesFile();
@@ -65,14 +66,14 @@ private void setExtraKeys() {
             String extraKeysStyle = (String) getInternalPropertyValue(TermuxPropertyConstants.KEY_EXTRA_KEYS_STYLE, true);
             mExtraKeysInfo = new ExtraKeysInfo(extrakeys, extraKeysStyle);
         } catch (JSONException e) {
-            Toast.makeText(mContext, "Could not load and set the \"" + TermuxPropertyConstants.KEY_EXTRA_KEYS + "\" property from the properties file: " + e.toString(), Toast.LENGTH_LONG).show();
-            Log.e("termux", "Could not load and set the \"" + TermuxPropertyConstants.KEY_EXTRA_KEYS + "\" property from the properties file: ", 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);
             } catch (JSONException e2) {
-                Toast.makeText(mContext, "Can't create default extra keys", Toast.LENGTH_LONG).show();
-                Log.e("termux", "Could create default extra keys: ", e);
+                Logger.showToast(mContext, "Can't create default extra keys",true);
+                Logger.logStackTraceWithMessage(LOG_TAG, "Could create default extra keys: ", e);
                 mExtraKeysInfo = null;
             }
         }
@@ -262,7 +263,7 @@ public Object getInternalPropertyValue(String key, boolean cached) {
                 // A null value can still be returned by
                 // {@link #getInternalPropertyValueFromValue(Context,String,String)} for some keys
                 value = getInternalPropertyValueFromValue(mContext, key, null);
-                Log.w("termux", "The value for \"" + key + "\" not found in SharedProperties cahce, force returning default value: `" + value +  "`");
+                Logger.logWarn(LOG_TAG, "The value for \"" + key + "\" not found in SharedProperties cahce, force returning default value: `" + value +  "`");
                 return value;
             }
         } else {
@@ -423,7 +424,7 @@ public static Integer getCodePointForSessionShortcuts(String key, String value)
         String[] parts = value.toLowerCase().trim().split("\\+");
         String input = parts.length == 2 ? parts[1].trim() : null;
         if (!(parts.length == 2 && parts[0].trim().equals("ctrl")) || input.isEmpty() || input.length() > 2) {
-            Log.e("termux", "Keyboard shortcut '" + key + "' is not Ctrl+<something>");
+            Logger.logError(LOG_TAG, "Keyboard shortcut '" + key + "' is not Ctrl+<something>");
             return null;
         }
 
@@ -431,7 +432,7 @@ public static Integer getCodePointForSessionShortcuts(String key, String value)
         int codePoint = c;
         if (Character.isLowSurrogate(c)) {
             if (input.length() != 2 || Character.isHighSurrogate(input.charAt(1))) {
-                Log.e("termux", "Keyboard shortcut '" + key + "' is not Ctrl+<something>");
+                Logger.logError(LOG_TAG, "Keyboard shortcut '" + key + "' is not Ctrl+<something>");
                 return null;
             } else {
                 codePoint = Character.toCodePoint(input.charAt(1), c);
@@ -556,7 +557,7 @@ public void dumpPropertiesToLog() {
             propertiesDump.append(" null");
         }
 
-        Log.d("termux", propertiesDump.toString());
+        Logger.logDebug(LOG_TAG, propertiesDump.toString());
     }
 
     public void dumpInternalPropertiesToLog() {
@@ -570,7 +571,7 @@ public void dumpInternalPropertiesToLog() {
             }
         }
 
-        Log.d("termux", internalPropertiesDump.toString());
+        Logger.logDebug(LOG_TAG, internalPropertiesDump.toString());
     }
 
 }
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxViewClient.java b/app/src/main/java/com/termux/app/terminal/TermuxViewClient.java
index 567ebef8de..8d49b6dfdf 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxViewClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxViewClient.java
@@ -13,6 +13,7 @@
 import com.termux.app.TermuxService;
 import com.termux.app.terminal.extrakeys.ExtraKeysView;
 import com.termux.app.settings.properties.TermuxPropertyConstants;
+import com.termux.app.utils.Logger;
 import com.termux.terminal.KeyHandler;
 import com.termux.terminal.TerminalEmulator;
 import com.termux.terminal.TerminalSession;
@@ -20,6 +21,7 @@
 
 import java.util.List;
 
+
 import androidx.drawerlayout.widget.DrawerLayout;
 
 public final class TermuxViewClient implements TerminalViewClient {
@@ -43,6 +45,8 @@ public float onScale(float scale) {
         return scale;
     }
 
+
+
     @Override
     public void onSingleTapUp(MotionEvent e) {
         InputMethodManager mgr = (InputMethodManager) mActivity.getSystemService(Context.INPUT_METHOD_SERVICE);
@@ -64,12 +68,16 @@ public boolean shouldUseCtrlSpaceWorkaround() {
         return mActivity.getProperties().isUsingCtrlSpaceWorkaround();
     }
 
+
+
     @Override
     public void copyModeChanged(boolean copyMode) {
         // Disable drawer while copying.
         mActivity.getDrawer().setDrawerLockMode(copyMode ? DrawerLayout.LOCK_MODE_LOCKED_CLOSED : DrawerLayout.LOCK_MODE_UNLOCKED);
     }
 
+
+
     @SuppressLint("RtlHardcoded")
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent e, TerminalSession currentSession) {
@@ -127,6 +135,26 @@ public boolean onKeyUp(int keyCode, KeyEvent e) {
         return handleVirtualKeys(keyCode, e, false);
     }
 
+    /** Handle dedicated volume buttons as virtual keys if applicable. */
+    private boolean handleVirtualKeys(int keyCode, KeyEvent event, boolean down) {
+        InputDevice inputDevice = event.getDevice();
+        if (mActivity.getProperties().areVirtualVolumeKeysDisabled()) {
+            return false;
+        } else if (inputDevice != null && inputDevice.getKeyboardType() == InputDevice.KEYBOARD_TYPE_ALPHABETIC) {
+            // Do not steal dedicated buttons from a full external keyboard.
+            return false;
+        } else if (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN) {
+            mVirtualControlKeyDown = down;
+            return true;
+        } else if (keyCode == KeyEvent.KEYCODE_VOLUME_UP) {
+            mVirtualFnKeyDown = down;
+            return true;
+        }
+        return false;
+    }
+
+
+
     @Override
     public boolean readControlKey() {
         return (mActivity.getExtraKeysView() != null && mActivity.getExtraKeysView().readSpecialButton(ExtraKeysView.SpecialButton.CTRL)) || mVirtualControlKeyDown;
@@ -137,6 +165,13 @@ public boolean readAltKey() {
         return (mActivity.getExtraKeysView() != null && mActivity.getExtraKeysView().readSpecialButton(ExtraKeysView.SpecialButton.ALT));
     }
 
+    @Override
+    public boolean onLongPress(MotionEvent event) {
+        return false;
+    }
+
+
+
     @Override
     public boolean onCodePoint(final int codePoint, boolean ctrlDown, TerminalSession session) {
         if (mVirtualFnKeyDown) {
@@ -273,27 +308,41 @@ public boolean onCodePoint(final int codePoint, boolean ctrlDown, TerminalSessio
         return false;
     }
 
+
+
+    @Override
+    public void logError(String tag, String message) {
+        Logger.logError(tag, message);
+    }
+
     @Override
-    public boolean onLongPress(MotionEvent event) {
-        return false;
+    public void logWarn(String tag, String message) {
+        Logger.logWarn(tag, message);
     }
 
-    /** Handle dedicated volume buttons as virtual keys if applicable. */
-    private boolean handleVirtualKeys(int keyCode, KeyEvent event, boolean down) {
-        InputDevice inputDevice = event.getDevice();
-        if (mActivity.getProperties().areVirtualVolumeKeysDisabled()) {
-            return false;
-        } else if (inputDevice != null && inputDevice.getKeyboardType() == InputDevice.KEYBOARD_TYPE_ALPHABETIC) {
-            // Do not steal dedicated buttons from a full external keyboard.
-            return false;
-        } else if (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN) {
-            mVirtualControlKeyDown = down;
-            return true;
-        } else if (keyCode == KeyEvent.KEYCODE_VOLUME_UP) {
-            mVirtualFnKeyDown = down;
-            return true;
-        }
-        return false;
+    @Override
+    public void logInfo(String tag, String message) {
+        Logger.logInfo(tag, message);
+    }
+
+    @Override
+    public void logDebug(String tag, String message) {
+        Logger.logDebug(tag, message);
+    }
+
+    @Override
+    public void logVerbose(String tag, String message) {
+        Logger.logVerbose(tag, message);
+    }
+
+    @Override
+    public void logStackTraceWithMessage(String tag, String message, Exception e) {
+        Logger.logStackTraceWithMessage(tag, message, e);
+    }
+
+    @Override
+    public void logStackTrace(String tag, Exception e) {
+        Logger.logStackTrace(tag, e);
     }
 
 }
diff --git a/app/src/main/java/com/termux/app/utils/Logger.java b/app/src/main/java/com/termux/app/utils/Logger.java
new file mode 100644
index 0000000000..aace3c2555
--- /dev/null
+++ b/app/src/main/java/com/termux/app/utils/Logger.java
@@ -0,0 +1,223 @@
+package com.termux.app.utils;
+
+import android.content.Context;
+import android.os.Handler;
+import android.os.Looper;
+import android.util.Log;
+import android.widget.Toast;
+
+import androidx.appcompat.app.AlertDialog;
+
+import com.termux.R;
+import com.termux.app.TermuxConstants;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
+public class Logger {
+
+    public static final String DEFAULT_LOG_TAG = TermuxConstants.TERMUX_APP_NAME;
+
+    public static final int LOG_LEVEL_OFF = 0; // log nothing
+    public static final int LOG_LEVEL_NORMAL = 1; // start logging error, warn and info messages and stacktraces
+    public static final int LOG_LEVEL_DEBUG = 2; // start logging debug messages
+    public static final int LOG_LEVEL_VERBOSE = 3; // start logging verbose messages
+
+    public static final int DEFAULT_LOG_LEVEL = LOG_LEVEL_NORMAL;
+
+    private static int CURRENT_LOG_LEVEL = DEFAULT_LOG_LEVEL;
+
+    static public void logMesssage(int logLevel, String tag, String message) {
+        if(logLevel == Log.ERROR && CURRENT_LOG_LEVEL >= LOG_LEVEL_NORMAL)
+            Log.e(tag, message);
+        else if(logLevel == Log.WARN && CURRENT_LOG_LEVEL >= LOG_LEVEL_NORMAL)
+            Log.w(tag, message);
+        else if(logLevel == Log.INFO && CURRENT_LOG_LEVEL >= LOG_LEVEL_NORMAL)
+            Log.i(tag, message);
+        else if(logLevel == Log.DEBUG && CURRENT_LOG_LEVEL >= LOG_LEVEL_DEBUG)
+            Log.d(tag, message);
+        else if(logLevel == Log.VERBOSE && CURRENT_LOG_LEVEL >= LOG_LEVEL_VERBOSE)
+            Log.v(tag, message);
+    }
+
+
+
+    static public void logError(String tag, String message) {
+        logMesssage(Log.ERROR, tag, message);
+    }
+
+    static public void logError(String message) {
+        logMesssage(Log.ERROR, DEFAULT_LOG_TAG, message);
+    }
+
+
+
+    static public void logWarn(String tag, String message) {
+        logMesssage(Log.WARN, tag, message);
+    }
+
+    static public void logWarn(String message) {
+        logMesssage(Log.WARN, DEFAULT_LOG_TAG, message);
+    }
+
+
+
+    static public void logInfo(String tag, String message) {
+        logMesssage(Log.INFO, tag, message);
+    }
+
+    static public void logInfo(String message) {
+        logMesssage(Log.INFO, DEFAULT_LOG_TAG, message);
+    }
+
+
+
+    static public void logDebug(String tag, String message) {
+        logMesssage(Log.DEBUG, tag, message);
+    }
+
+    static public void logDebug(String message) {
+        logMesssage(Log.DEBUG, DEFAULT_LOG_TAG, message);
+    }
+
+
+
+    static public void logVerbose(String tag, String message) {
+        logMesssage(Log.VERBOSE, tag, message);
+    }
+
+    static public void logVerbose(String message) {
+        logMesssage(Log.VERBOSE, DEFAULT_LOG_TAG, message);
+    }
+
+
+
+    static public void logErrorAndShowToast(Context context, String tag, String message) {
+        if (context == null) return;
+
+        if(CURRENT_LOG_LEVEL >= LOG_LEVEL_NORMAL) {
+            logError(tag, message);
+            showToast(context, message, true);
+        }
+    }
+
+    static public void logErrorAndShowToast(Context context, String message) {
+        logErrorAndShowToast(context, DEFAULT_LOG_TAG, message);
+    }
+
+
+
+    static public void logDebugAndShowToast(Context context, String tag, String message) {
+        if (context == null) return;
+
+        if(CURRENT_LOG_LEVEL >= LOG_LEVEL_DEBUG) {
+            logDebug(tag, message);
+            showToast(context, message, true);
+        }
+    }
+
+    static public void logDebugAndShowToast(Context context, String message) {
+        logDebugAndShowToast(context, DEFAULT_LOG_TAG, message);
+    }
+
+
+
+    static public void logStackTraceWithMessage(String tag, String message, Exception e) {
+
+        if(CURRENT_LOG_LEVEL >= LOG_LEVEL_NORMAL)
+        {
+            try {
+                StringWriter errors = new StringWriter();
+                PrintWriter pw = new PrintWriter(errors);
+                e.printStackTrace(pw);
+                pw.close();
+                if(message != null)
+                    Log.e(tag, message + ":\n" + errors.toString());
+                else
+                    Log.e(tag, errors.toString());
+                errors.close();
+            } catch (IOException e1) {
+                e1.printStackTrace();
+            }
+        }
+    }
+
+    static public void logStackTraceWithMessage(String message, Exception e) {
+        logStackTraceWithMessage(DEFAULT_LOG_TAG, message, e);
+    }
+
+    static public void logStackTrace(String tag, Exception e) {
+        logStackTraceWithMessage(tag, null, e);
+    }
+
+    static public void logStackTrace(Exception e) {
+        logStackTraceWithMessage(DEFAULT_LOG_TAG, null, e);
+    }
+    
+
+
+    static public void showToast(final Context context, final String toastText, boolean longDuration) {
+        if (context == null) return;
+
+        new Handler(Looper.getMainLooper()).post(() -> Toast.makeText(context, toastText, longDuration ? Toast.LENGTH_LONG : Toast.LENGTH_SHORT).show());
+    }
+
+
+
+    public static CharSequence[] getLogLevelsArray() {
+        return new CharSequence[]{
+            String.valueOf(LOG_LEVEL_OFF),
+            String.valueOf(LOG_LEVEL_NORMAL),
+            String.valueOf(LOG_LEVEL_DEBUG),
+            String.valueOf(LOG_LEVEL_VERBOSE)
+        };
+    }
+
+    public static CharSequence[] getLogLevelLabelsArray(Context context, CharSequence[] logLevels, boolean addDefaultTag) {
+        if (logLevels == null) return null;
+
+        CharSequence[] logLevelLabels = new CharSequence[logLevels.length];
+
+        for(int i=0; i<logLevels.length; i++) {
+            logLevelLabels[i] = getLogLevelLabel(context, Integer.parseInt(logLevels[i].toString()), addDefaultTag);
+        }
+
+       return logLevelLabels;
+    }
+
+    public static String getLogLevelLabel(final Context context, final int logLevel, final boolean addDefaultTag) {
+        String logLabel;
+        switch (logLevel) {
+            case LOG_LEVEL_OFF: logLabel = context.getString(R.string.log_level_off); break;
+            case LOG_LEVEL_NORMAL: logLabel = context.getString(R.string.log_level_normal); break;
+            case LOG_LEVEL_DEBUG: logLabel = context.getString(R.string.log_level_debug); break;
+            case LOG_LEVEL_VERBOSE: logLabel = context.getString(R.string.log_level_verbose); break;
+            default: logLabel = context.getString(R.string.log_level_unknown); break;
+        }
+
+        if (addDefaultTag && logLevel == DEFAULT_LOG_LEVEL)
+            return logLabel + " (default)";
+        else
+            return logLabel;
+    }
+
+
+
+    public static int getLogLevel() {
+        return CURRENT_LOG_LEVEL;
+    }
+
+    public static int setLogLevel(Context context, int logLevel) {
+        if(logLevel >= LOG_LEVEL_OFF && logLevel <= LOG_LEVEL_VERBOSE)
+            CURRENT_LOG_LEVEL = logLevel;
+        else
+            CURRENT_LOG_LEVEL = DEFAULT_LOG_LEVEL;
+
+        if(context != null)
+            showToast(context, context.getString(R.string.log_level_value, getLogLevelLabel(context, CURRENT_LOG_LEVEL, false)),true);
+
+        return CURRENT_LOG_LEVEL;
+    }
+
+}
diff --git a/app/src/main/java/com/termux/app/utils/TermuxUtils.java b/app/src/main/java/com/termux/app/utils/TermuxUtils.java
new file mode 100644
index 0000000000..712b5b3ad2
--- /dev/null
+++ b/app/src/main/java/com/termux/app/utils/TermuxUtils.java
@@ -0,0 +1,18 @@
+package com.termux.app.utils;
+
+import android.content.Context;
+
+import com.termux.app.TermuxConstants;
+
+public class TermuxUtils {
+
+    public static Context getTermuxPackageContext(Context context) {
+        try {
+            return context.createPackageContext(TermuxConstants.TERMUX_PACKAGE_NAME, Context.CONTEXT_RESTRICTED);
+        } catch (Exception e) {
+            Logger.logStackTraceWithMessage("Failed to get \"" + TermuxConstants.TERMUX_PACKAGE_NAME + "\" package context. Force using current context.", e);
+            Logger.logError("Force using current context");
+            return context;
+        }
+    }
+}
diff --git a/app/src/main/java/com/termux/filepicker/TermuxFileReceiverActivity.java b/app/src/main/java/com/termux/filepicker/TermuxFileReceiverActivity.java
index 2367bdf0a9..f0f53dcbe5 100644
--- a/app/src/main/java/com/termux/filepicker/TermuxFileReceiverActivity.java
+++ b/app/src/main/java/com/termux/filepicker/TermuxFileReceiverActivity.java
@@ -6,7 +6,6 @@
 import android.database.Cursor;
 import android.net.Uri;
 import android.provider.OpenableColumns;
-import android.util.Log;
 import android.util.Patterns;
 
 import com.termux.R;
@@ -14,6 +13,7 @@
 import com.termux.app.TermuxConstants;
 import com.termux.app.TermuxConstants.TERMUX_APP.TERMUX_SERVICE;
 import com.termux.app.TermuxService;
+import com.termux.app.utils.Logger;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;
@@ -39,6 +39,8 @@ public class TermuxFileReceiverActivity extends Activity {
      */
     boolean mFinishOnDismissNameDialog = true;
 
+    private static final String LOG_TAG = "TermuxFileReceiverActivity";
+
     static boolean isSharedTextAnUrl(String sharedText) {
         return Patterns.WEB_URL.matcher(sharedText).matches()
             || Pattern.matches("magnet:\\?xt=urn:btih:.*?", sharedText);
@@ -111,7 +113,7 @@ void handleContentUri(final Uri uri, String subjectFromIntent) {
             promptNameAndSave(in, attachmentFileName);
         } catch (Exception e) {
             showErrorDialogAndQuit("Unable to handle shared content:\n\n" + e.getMessage());
-            Log.e("termux", "handleContentUri(uri=" + uri + ") failed", e);
+            Logger.logStackTraceWithMessage(LOG_TAG, "handleContentUri(uri=" + uri + ") failed", e);
         }
     }
 
@@ -171,7 +173,7 @@ public File saveStreamWithName(InputStream in, String attachmentFileName) {
             return outFile;
         } catch (IOException e) {
             showErrorDialogAndQuit("Error saving file:\n\n" + e);
-            Log.e("termux", "Error saving file", e);
+            Logger.logStackTraceWithMessage(LOG_TAG, "Error saving file", e);
             return null;
         }
     }
diff --git a/app/src/main/res/layout/settings_activity.xml b/app/src/main/res/layout/settings_activity.xml
new file mode 100644
index 0000000000..7dc1a6c5a7
--- /dev/null
+++ b/app/src/main/res/layout/settings_activity.xml
@@ -0,0 +1,9 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <FrameLayout
+        android:id="@+id/settings"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+</LinearLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a34c5d110d..968ac6456b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -63,4 +63,35 @@
     <string name="file_received_title">Save file in ~/downloads/</string>
     <string name="file_received_edit_button">Edit</string>
     <string name="file_received_open_folder_button">Open folder</string>
+
+
+
+
+
+    <!-- Termux Settings -->
+    <string name="settings">Settings</string>
+    <string name="title_activity_termux_settings">Termux Settings</string>
+
+
+
+    <!-- Debugging Preferences -->
+    <string name="debugging_preferences">Debugging</string>
+
+        <!-- Logging Category -->
+        <string name="logging_header">Logging</string>
+
+            <!-- Log Level -->
+            <string name="log_level_title">Log Level</string>
+            <string name="log_level_off">"Off"</string>
+            <string name="log_level_normal">"Normal"</string>
+            <string name="log_level_debug">"Debug"</string>
+            <string name="log_level_verbose">"Verbose"</string>
+            <string name="log_level_unknown">"*Unknown*"</string>
+            <string name="log_level_value">Logcat log level set to \"%1$s\"</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>
+
 </resources>
diff --git a/app/src/main/res/xml/debugging_preferences.xml b/app/src/main/res/xml/debugging_preferences.xml
new file mode 100644
index 0000000000..ba1f328da2
--- /dev/null
+++ b/app/src/main/res/xml/debugging_preferences.xml
@@ -0,0 +1,21 @@
+<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" />
+
+    </PreferenceCategory>
+
+</PreferenceScreen>
diff --git a/app/src/main/res/xml/root_preferences.xml b/app/src/main/res/xml/root_preferences.xml
new file mode 100644
index 0000000000..3ea2b58322
--- /dev/null
+++ b/app/src/main/res/xml/root_preferences.xml
@@ -0,0 +1,8 @@
+<PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <Preference
+        app:title="@string/debugging_preferences"
+        app:summary="Preferences for debugging"
+        app:fragment="com.termux.app.settings.DebuggingPreferencesFragment"/>
+
+</PreferenceScreen>
diff --git a/terminal-view/src/main/java/com/termux/view/TerminalView.java b/terminal-view/src/main/java/com/termux/view/TerminalView.java
index b9d18e69c7..995f8b9ad6 100644
--- a/terminal-view/src/main/java/com/termux/view/TerminalView.java
+++ b/terminal-view/src/main/java/com/termux/view/TerminalView.java
@@ -12,7 +12,6 @@
 import android.text.InputType;
 import android.text.TextUtils;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.view.ActionMode;
 import android.view.HapticFeedbackConstants;
 import android.view.InputDevice;
@@ -31,7 +30,6 @@
 
 import androidx.annotation.RequiresApi;
 
-import com.termux.terminal.EmulatorDebug;
 import com.termux.terminal.KeyHandler;
 import com.termux.terminal.TerminalEmulator;
 import com.termux.terminal.TerminalSession;
@@ -40,8 +38,8 @@
 /** View displaying and interacting with a {@link TerminalSession}. */
 public final class TerminalView extends View {
 
-    /** Log view key and IME events. */
-    private static final boolean LOG_KEY_EVENTS = false;
+    /** Log terminal view key and IME events. */
+    private static boolean TERMINAL_VIEW_KEY_LOGGING_ENABLED = false;
 
     /** The currently displayed terminal session, whose emulator is {@link #mEmulator}. */
     public TerminalSession mTermSession;
@@ -76,6 +74,8 @@ public final class TerminalView extends View {
 
     private final boolean mAccessibilityEnabled;
 
+    private static final String LOG_TAG = "TerminalView";
+
     public TerminalView(Context context, AttributeSet attributes) { // NO_UCD (unused code)
         super(context, attributes);
         mGestureRecognizer = new GestureAndScaleRecognizer(context, new GestureAndScaleRecognizer.Listener() {
@@ -210,11 +210,23 @@ public void onLongPress(MotionEvent event) {
     }
 
     /**
-     * @param onKeyListener Listener for all kinds of key events, both hardware and IME (which makes it different from that
-     *                      available with {@link View#setOnKeyListener(OnKeyListener)}.
+     * @param terminalViewClient Interface for communicating with the terminal view client. It allows
+     *                           for getting various configuration options from the client and
+     *                           for sending back data to the client like logs, key events, both
+     *                           hardware and IME (which makes it different from that available with
+     *                           {@link View#setOnKeyListener(OnKeyListener)}, etc.
+     */
+    public void setTerminalViewClient(TerminalViewClient terminalViewClient) {
+        this.mClient = terminalViewClient;
+    }
+
+    /**
+     * Sets terminal view key logging is enabled or not.
+     *
+     * @param value The boolean value that defines the state.
      */
-    public void setOnKeyListener(TerminalViewClient onKeyListener) {
-        this.mClient = onKeyListener;
+    public void setIsTerminalViewKeyLoggingEnabled(boolean value) {
+        TERMINAL_VIEW_KEY_LOGGING_ENABLED = value;
     }
 
     /**
@@ -264,7 +276,7 @@ public InputConnection onCreateInputConnection(EditorInfo outAttrs) {
 
             @Override
             public boolean finishComposingText() {
-                if (LOG_KEY_EVENTS) Log.i(EmulatorDebug.LOG_TAG, "IME: finishComposingText()");
+                if (TERMINAL_VIEW_KEY_LOGGING_ENABLED) mClient.logInfo(LOG_TAG, "IME: finishComposingText()");
                 super.finishComposingText();
 
                 sendTextToTerminal(getEditable());
@@ -274,8 +286,8 @@ public boolean finishComposingText() {
 
             @Override
             public boolean commitText(CharSequence text, int newCursorPosition) {
-                if (LOG_KEY_EVENTS) {
-                    Log.i(EmulatorDebug.LOG_TAG, "IME: commitText(\"" + text + "\", " + newCursorPosition + ")");
+                if (TERMINAL_VIEW_KEY_LOGGING_ENABLED) {
+                    mClient.logInfo(LOG_TAG, "IME: commitText(\"" + text + "\", " + newCursorPosition + ")");
                 }
                 super.commitText(text, newCursorPosition);
 
@@ -289,8 +301,8 @@ public boolean commitText(CharSequence text, int newCursorPosition) {
 
             @Override
             public boolean deleteSurroundingText(int leftLength, int rightLength) {
-                if (LOG_KEY_EVENTS) {
-                    Log.i(EmulatorDebug.LOG_TAG, "IME: deleteSurroundingText(" + leftLength + ", " + rightLength + ")");
+                if (TERMINAL_VIEW_KEY_LOGGING_ENABLED) {
+                    mClient.logInfo(LOG_TAG, "IME: deleteSurroundingText(" + leftLength + ", " + rightLength + ")");
                 }
                 // The stock Samsung keyboard with 'Auto check spelling' enabled sends leftLength > 1.
                 KeyEvent deleteKey = new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DEL);
@@ -521,8 +533,8 @@ public boolean onTouchEvent(MotionEvent event) {
 
     @Override
     public boolean onKeyPreIme(int keyCode, KeyEvent event) {
-        if (LOG_KEY_EVENTS)
-            Log.i(EmulatorDebug.LOG_TAG, "onKeyPreIme(keyCode=" + keyCode + ", event=" + event + ")");
+        if (TERMINAL_VIEW_KEY_LOGGING_ENABLED)
+            mClient.logInfo(LOG_TAG, "onKeyPreIme(keyCode=" + keyCode + ", event=" + event + ")");
         if (keyCode == KeyEvent.KEYCODE_BACK) {
             if (isSelectingText()) {
                 stopTextSelectionMode();
@@ -547,8 +559,8 @@ public boolean onKeyPreIme(int keyCode, KeyEvent event) {
 
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
-        if (LOG_KEY_EVENTS)
-            Log.i(EmulatorDebug.LOG_TAG, "onKeyDown(keyCode=" + keyCode + ", isSystem()=" + event.isSystem() + ", event=" + event + ")");
+        if (TERMINAL_VIEW_KEY_LOGGING_ENABLED)
+            mClient.logInfo(LOG_TAG, "onKeyDown(keyCode=" + keyCode + ", isSystem()=" + event.isSystem() + ", event=" + event + ")");
         if (mEmulator == null) return true;
         if (isSelectingText()) {
             stopTextSelectionMode();
@@ -575,7 +587,7 @@ public boolean onKeyDown(int keyCode, KeyEvent event) {
         if (event.isShiftPressed()) keyMod |= KeyHandler.KEYMOD_SHIFT;
         if (event.isNumLockOn()) keyMod |= KeyHandler.KEYMOD_NUM_LOCK;
         if (!event.isFunctionPressed() && handleKeyCode(keyCode, keyMod)) {
-            if (LOG_KEY_EVENTS) Log.i(EmulatorDebug.LOG_TAG, "handleKeyCode() took key event");
+            if (TERMINAL_VIEW_KEY_LOGGING_ENABLED) mClient.logInfo(LOG_TAG, "handleKeyCode() took key event");
             return true;
         }
 
@@ -590,8 +602,8 @@ public boolean onKeyDown(int keyCode, KeyEvent event) {
         int effectiveMetaState = event.getMetaState() & ~bitsToClear;
 
         int result = event.getUnicodeChar(effectiveMetaState);
-        if (LOG_KEY_EVENTS)
-            Log.i(EmulatorDebug.LOG_TAG, "KeyEvent#getUnicodeChar(" + effectiveMetaState + ") returned: " + result);
+        if (TERMINAL_VIEW_KEY_LOGGING_ENABLED)
+            mClient.logInfo(LOG_TAG, "KeyEvent#getUnicodeChar(" + effectiveMetaState + ") returned: " + result);
         if (result == 0) {
             return false;
         }
@@ -617,8 +629,8 @@ public boolean onKeyDown(int keyCode, KeyEvent event) {
     }
 
     public void inputCodePoint(int codePoint, boolean controlDownFromEvent, boolean leftAltDownFromEvent) {
-        if (LOG_KEY_EVENTS) {
-            Log.i(EmulatorDebug.LOG_TAG, "inputCodePoint(codePoint=" + codePoint + ", controlDownFromEvent=" + controlDownFromEvent + ", leftAltDownFromEvent="
+        if (TERMINAL_VIEW_KEY_LOGGING_ENABLED) {
+            mClient.logInfo(LOG_TAG, "inputCodePoint(codePoint=" + codePoint + ", controlDownFromEvent=" + controlDownFromEvent + ", leftAltDownFromEvent="
                 + leftAltDownFromEvent + ")");
         }
 
@@ -692,8 +704,8 @@ public boolean handleKeyCode(int keyCode, int keyMod) {
      */
     @Override
     public boolean onKeyUp(int keyCode, KeyEvent event) {
-        if (LOG_KEY_EVENTS)
-            Log.i(EmulatorDebug.LOG_TAG, "onKeyUp(keyCode=" + keyCode + ", event=" + event + ")");
+        if (TERMINAL_VIEW_KEY_LOGGING_ENABLED)
+            mClient.logInfo(LOG_TAG, "onKeyUp(keyCode=" + keyCode + ", event=" + event + ")");
         if (mEmulator == null) return true;
 
         if (mClient.onKeyUp(keyCode, event)) {
diff --git a/terminal-view/src/main/java/com/termux/view/TerminalViewClient.java b/terminal-view/src/main/java/com/termux/view/TerminalViewClient.java
index 390e9157ea..25be7d9dda 100644
--- a/terminal-view/src/main/java/com/termux/view/TerminalViewClient.java
+++ b/terminal-view/src/main/java/com/termux/view/TerminalViewClient.java
@@ -8,7 +8,7 @@
 
 /**
  * Input and scale listener which may be set on a {@link TerminalView} through
- * {@link TerminalView#setOnKeyListener(TerminalViewClient)}.
+ * {@link TerminalView#setTerminalViewClient(TerminalViewClient)}.
  * <p/>
  */
 public interface TerminalViewClient {
@@ -18,6 +18,8 @@ public interface TerminalViewClient {
      */
     float onScale(float scale);
 
+
+
     /**
      * On a single tap on the terminal if terminal mouse reporting not enabled.
      */
@@ -29,18 +31,41 @@ public interface TerminalViewClient {
 
     boolean shouldUseCtrlSpaceWorkaround();
 
+
+
     void copyModeChanged(boolean copyMode);
 
+
+
     boolean onKeyDown(int keyCode, KeyEvent e, TerminalSession session);
 
     boolean onKeyUp(int keyCode, KeyEvent e);
 
+    boolean onLongPress(MotionEvent event);
+
+
+
     boolean readControlKey();
 
     boolean readAltKey();
 
+
     boolean onCodePoint(int codePoint, boolean ctrlDown, TerminalSession session);
 
-    boolean onLongPress(MotionEvent event);
+
+
+    void logError(String tag, String message);
+
+    void logWarn(String tag, String message);
+
+    void logInfo(String tag, String message);
+
+    void logDebug(String tag, String message);
+
+    void logVerbose(String tag, String message);
+
+    void logStackTraceWithMessage(String tag, String message, Exception e);
+
+    void logStackTrace(String tag, Exception e);
 
 }

From 0225a8b1fc9ad6f516adadba6b6178dbd7b22a25 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Tue, 16 Mar 2021 03:41:17 +0500
Subject: [PATCH 230/912] Fix hardcoded value in strings.xml

---
 app/src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 968ac6456b..97b65a37a6 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -70,7 +70,7 @@
 
     <!-- Termux Settings -->
     <string name="settings">Settings</string>
-    <string name="title_activity_termux_settings">Termux Settings</string>
+    <string name="title_activity_termux_settings">&TERMUX_APP_NAME; Settings</string>
 
 
 

From 66f15d2a0815ae216d4343fc7c9fbc8e35d9d853 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Tue, 16 Mar 2021 03:44:27 +0500
Subject: [PATCH 231/912] Remove moved files

---
 .../main/java/com/termux/app/DialogUtils.java |  71 ----
 .../com/termux/app/terminal/BellHandler.java  |  63 ---
 .../app/terminal/FullScreenWorkAround.java    |  68 ----
 .../termux/app/terminal/KeyboardShortcut.java |  13 -
 .../terminal/extrakeys/ExtraKeyButton.java    |  92 -----
 .../app/terminal/extrakeys/ExtraKeysInfo.java | 253 ------------
 .../app/terminal/extrakeys/ExtraKeysView.java | 382 ------------------
 app/src/main/res/layout/drawer_layout.xml     |  80 ----
 app/src/main/res/layout/extra_keys_main.xml   |   8 -
 app/src/main/res/layout/extra_keys_right.xml  |  16 -
 app/src/main/res/layout/line_in_drawer.xml    |   9 -
 .../com/termux/terminal/EmulatorDebug.java    |  10 -
 12 files changed, 1065 deletions(-)
 delete mode 100644 app/src/main/java/com/termux/app/DialogUtils.java
 delete mode 100644 app/src/main/java/com/termux/app/terminal/BellHandler.java
 delete mode 100644 app/src/main/java/com/termux/app/terminal/FullScreenWorkAround.java
 delete mode 100644 app/src/main/java/com/termux/app/terminal/KeyboardShortcut.java
 delete mode 100644 app/src/main/java/com/termux/app/terminal/extrakeys/ExtraKeyButton.java
 delete mode 100644 app/src/main/java/com/termux/app/terminal/extrakeys/ExtraKeysInfo.java
 delete mode 100644 app/src/main/java/com/termux/app/terminal/extrakeys/ExtraKeysView.java
 delete mode 100644 app/src/main/res/layout/drawer_layout.xml
 delete mode 100644 app/src/main/res/layout/extra_keys_main.xml
 delete mode 100644 app/src/main/res/layout/extra_keys_right.xml
 delete mode 100644 app/src/main/res/layout/line_in_drawer.xml
 delete mode 100644 terminal-emulator/src/main/java/com/termux/terminal/EmulatorDebug.java

diff --git a/app/src/main/java/com/termux/app/DialogUtils.java b/app/src/main/java/com/termux/app/DialogUtils.java
deleted file mode 100644
index 4900f75dd9..0000000000
--- a/app/src/main/java/com/termux/app/DialogUtils.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package com.termux.app;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.content.DialogInterface;
-import android.text.Selection;
-import android.util.TypedValue;
-import android.view.KeyEvent;
-import android.view.ViewGroup.LayoutParams;
-import android.widget.EditText;
-import android.widget.LinearLayout;
-
-public final class DialogUtils {
-
-    public interface TextSetListener {
-        void onTextSet(String text);
-    }
-
-    public static void textInput(Activity activity, int titleText, String initialText,
-                                 int positiveButtonText, final TextSetListener onPositive,
-                                 int neutralButtonText, final TextSetListener onNeutral,
-                                 int negativeButtonText, final TextSetListener onNegative,
-                                 final DialogInterface.OnDismissListener onDismiss) {
-        final EditText input = new EditText(activity);
-        input.setSingleLine();
-        if (initialText != null) {
-            input.setText(initialText);
-            Selection.setSelection(input.getText(), initialText.length());
-        }
-
-        final AlertDialog[] dialogHolder = new AlertDialog[1];
-        input.setImeActionLabel(activity.getResources().getString(positiveButtonText), KeyEvent.KEYCODE_ENTER);
-        input.setOnEditorActionListener((v, actionId, event) -> {
-            onPositive.onTextSet(input.getText().toString());
-            dialogHolder[0].dismiss();
-            return true;
-        });
-
-        float dipInPixels = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 1, activity.getResources().getDisplayMetrics());
-        // https://www.google.com/design/spec/components/dialogs.html#dialogs-specs
-        int paddingTopAndSides = Math.round(16 * dipInPixels);
-        int paddingBottom = Math.round(24 * dipInPixels);
-
-        LinearLayout layout = new LinearLayout(activity);
-        layout.setOrientation(LinearLayout.VERTICAL);
-        layout.setLayoutParams(new LinearLayout.LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT));
-        layout.setPadding(paddingTopAndSides, paddingTopAndSides, paddingTopAndSides, paddingBottom);
-        layout.addView(input);
-
-        AlertDialog.Builder builder = new AlertDialog.Builder(activity)
-            .setTitle(titleText).setView(layout)
-            .setPositiveButton(positiveButtonText, (d, whichButton) -> onPositive.onTextSet(input.getText().toString()));
-
-        if (onNeutral != null) {
-            builder.setNeutralButton(neutralButtonText, (dialog, which) -> onNeutral.onTextSet(input.getText().toString()));
-        }
-
-        if (onNegative == null) {
-            builder.setNegativeButton(android.R.string.cancel, null);
-        } else {
-            builder.setNegativeButton(negativeButtonText, (dialog, which) -> onNegative.onTextSet(input.getText().toString()));
-        }
-
-        if (onDismiss != null) builder.setOnDismissListener(onDismiss);
-
-        dialogHolder[0] = builder.create();
-        dialogHolder[0].setCanceledOnTouchOutside(false);
-        dialogHolder[0].show();
-    }
-
-}
diff --git a/app/src/main/java/com/termux/app/terminal/BellHandler.java b/app/src/main/java/com/termux/app/terminal/BellHandler.java
deleted file mode 100644
index 207f7e7818..0000000000
--- a/app/src/main/java/com/termux/app/terminal/BellHandler.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.termux.app.terminal;
-
-import android.content.Context;
-import android.os.Handler;
-import android.os.Looper;
-import android.os.SystemClock;
-import android.os.Vibrator;
-
-public class BellHandler {
-    private static BellHandler instance = null;
-    private static final Object lock = new Object();
-
-    public static BellHandler getInstance(Context context) {
-        if (instance == null) {
-            synchronized (lock) {
-                if (instance == null) {
-                    instance = new BellHandler((Vibrator) context.getApplicationContext().getSystemService(Context.VIBRATOR_SERVICE));
-                }
-            }
-        }
-
-        return instance;
-    }
-
-    private static final long DURATION = 50;
-    private static final long MIN_PAUSE = 3 * DURATION;
-
-    private final Handler handler = new Handler(Looper.getMainLooper());
-    private long lastBell = 0;
-    private final Runnable bellRunnable;
-
-    private BellHandler(final Vibrator vibrator) {
-        bellRunnable = new Runnable() {
-            @Override
-            public void run() {
-                if (vibrator != null) {
-                    vibrator.vibrate(DURATION);
-                }
-            }
-        };
-    }
-
-    public synchronized void doBell() {
-        long now = now();
-        long timeSinceLastBell = now - lastBell;
-
-        if (timeSinceLastBell < 0) {
-            // there is a next bell pending; don't schedule another one
-        } else if (timeSinceLastBell < MIN_PAUSE) {
-            // there was a bell recently, scheudle the next one
-            handler.postDelayed(bellRunnable, MIN_PAUSE - timeSinceLastBell);
-            lastBell = lastBell + MIN_PAUSE;
-        } else {
-            // the last bell was long ago, do it now
-            bellRunnable.run();
-            lastBell = now;
-        }
-    }
-
-    private long now() {
-        return SystemClock.uptimeMillis();
-    }
-}
diff --git a/app/src/main/java/com/termux/app/terminal/FullScreenWorkAround.java b/app/src/main/java/com/termux/app/terminal/FullScreenWorkAround.java
deleted file mode 100644
index c37c870cfb..0000000000
--- a/app/src/main/java/com/termux/app/terminal/FullScreenWorkAround.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.termux.app.terminal;
-
-import android.graphics.Rect;
-import android.view.View;
-import android.view.ViewGroup;
-
-import com.termux.app.TermuxActivity;
-
-/**
- * Work around for fullscreen mode in Termux to fix ExtraKeysView not being visible.
- * This class is derived from:
- * https://stackoverflow.com/questions/7417123/android-how-to-adjust-layout-in-full-screen-mode-when-softkeyboard-is-visible
- * and has some additional tweaks
- * ---
- * For more information, see https://issuetracker.google.com/issues/36911528
- */
-public class FullScreenWorkAround {
-    private final View mChildOfContent;
-    private int mUsableHeightPrevious;
-    private final ViewGroup.LayoutParams mViewGroupLayoutParams;
-
-    private final int mNavBarHeight;
-
-
-    public static void apply(TermuxActivity activity) {
-        new FullScreenWorkAround(activity);
-    }
-
-    private FullScreenWorkAround(TermuxActivity activity) {
-        ViewGroup content = activity.findViewById(android.R.id.content);
-        mChildOfContent = content.getChildAt(0);
-        mViewGroupLayoutParams = mChildOfContent.getLayoutParams();
-        mNavBarHeight = activity.getNavBarHeight();
-        mChildOfContent.getViewTreeObserver().addOnGlobalLayoutListener(this::possiblyResizeChildOfContent);
-    }
-
-    private void possiblyResizeChildOfContent() {
-        int usableHeightNow = computeUsableHeight();
-        if (usableHeightNow != mUsableHeightPrevious) {
-            int usableHeightSansKeyboard = mChildOfContent.getRootView().getHeight();
-            int heightDifference = usableHeightSansKeyboard - usableHeightNow;
-            if (heightDifference > (usableHeightSansKeyboard / 4)) {
-                // keyboard probably just became visible
-
-                // ensures that usable layout space does not extend behind the
-                // soft keyboard, causing the extra keys to not be visible
-                mViewGroupLayoutParams.height = (usableHeightSansKeyboard - heightDifference) + getNavBarHeight();
-            } else {
-                // keyboard probably just became hidden
-                mViewGroupLayoutParams.height = usableHeightSansKeyboard;
-            }
-            mChildOfContent.requestLayout();
-            mUsableHeightPrevious = usableHeightNow;
-        }
-    }
-
-    private int getNavBarHeight() {
-        return mNavBarHeight;
-    }
-
-    private int computeUsableHeight() {
-        Rect r = new Rect();
-        mChildOfContent.getWindowVisibleDisplayFrame(r);
-        return (r.bottom - r.top);
-    }
-
-}
-
diff --git a/app/src/main/java/com/termux/app/terminal/KeyboardShortcut.java b/app/src/main/java/com/termux/app/terminal/KeyboardShortcut.java
deleted file mode 100644
index 5db41bec30..0000000000
--- a/app/src/main/java/com/termux/app/terminal/KeyboardShortcut.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.termux.app.terminal;
-
-public class KeyboardShortcut {
-
-    public final int codePoint;
-    public final int shortcutAction;
-
-    public KeyboardShortcut(int codePoint, int shortcutAction) {
-        this.codePoint = codePoint;
-        this.shortcutAction = shortcutAction;
-    }
-
-}
diff --git a/app/src/main/java/com/termux/app/terminal/extrakeys/ExtraKeyButton.java b/app/src/main/java/com/termux/app/terminal/extrakeys/ExtraKeyButton.java
deleted file mode 100644
index 36457af253..0000000000
--- a/app/src/main/java/com/termux/app/terminal/extrakeys/ExtraKeyButton.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package com.termux.app.terminal.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 = null;
-
-    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;
-    }
-}
diff --git a/app/src/main/java/com/termux/app/terminal/extrakeys/ExtraKeysInfo.java b/app/src/main/java/com/termux/app/terminal/extrakeys/ExtraKeysInfo.java
deleted file mode 100644
index e1406e7222..0000000000
--- a/app/src/main/java/com/termux/app/terminal/extrakeys/ExtraKeysInfo.java
+++ /dev/null
@@ -1,253 +0,0 @@
-package com.termux.app.terminal.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 = "default";
-
-    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);
-    }
-}
-
diff --git a/app/src/main/java/com/termux/app/terminal/extrakeys/ExtraKeysView.java b/app/src/main/java/com/termux/app/terminal/extrakeys/ExtraKeysView.java
deleted file mode 100644
index d1b1dee51a..0000000000
--- a/app/src/main/java/com/termux/app/terminal/extrakeys/ExtraKeysView.java
+++ /dev/null
@@ -1,382 +0,0 @@
-package com.termux.app.terminal.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.view.inputmethod.InputMethodManager;
-import android.widget.Button;
-import android.widget.GridLayout;
-import android.widget.PopupWindow;
-
-import com.termux.R;
-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;
-
-    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)) {
-            InputMethodManager imm = (InputMethodManager) getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
-            imm.toggleSoftInput(0, 0);
-        } 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);
-            }
-        }
-    }
-
-}
diff --git a/app/src/main/res/layout/drawer_layout.xml b/app/src/main/res/layout/drawer_layout.xml
deleted file mode 100644
index 71d36996da..0000000000
--- a/app/src/main/res/layout/drawer_layout.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<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">
-
-    <androidx.drawerlayout.widget.DrawerLayout
-        android:id="@+id/drawer_layout"
-        android:layout_width="match_parent"
-        android:layout_alignParentTop="true"
-        android:layout_above="@+id/viewpager"
-        android:layout_height="match_parent">
-
-        <com.termux.view.TerminalView
-            android:id="@+id/terminal_view"
-            android:layout_width="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" />
-
-        <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/left_drawer_list"
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_gravity="top"
-                android:layout_weight="1"
-                android:choiceMode="singleChoice"
-                android:longClickable="true" />
-
-            <LinearLayout
-                style="?android:attr/buttonBarStyle"
-                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/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/new_session" />
-            </LinearLayout>
-        </LinearLayout>
-
-    </androidx.drawerlayout.widget.DrawerLayout>
-
-    <androidx.viewpager.widget.ViewPager
-        android:id="@+id/viewpager"
-        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>
diff --git a/app/src/main/res/layout/extra_keys_main.xml b/app/src/main/res/layout/extra_keys_main.xml
deleted file mode 100644
index aaf57980cb..0000000000
--- a/app/src/main/res/layout/extra_keys_main.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<com.termux.app.terminal.extrakeys.ExtraKeysView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/extra_keys"
-    style="?android:attr/buttonBarStyle"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:layout_alignParentBottom="true"
-    android:orientation="horizontal" />
diff --git a/app/src/main/res/layout/extra_keys_right.xml b/app/src/main/res/layout/extra_keys_right.xml
deleted file mode 100644
index ef01c71a18..0000000000
--- a/app/src/main/res/layout/extra_keys_right.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<EditText xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/text_input"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:imeOptions="actionSend|flagNoFullscreen"
-    android:maxLines="1"
-    android:inputType="text"
-    android:importantForAutofill="no"
-    android:textColor="@android:color/white"
-    android:textColorHighlight="@android:color/darker_gray"
-    android:paddingTop="0dp"
-    android:textCursorDrawable="@null"
-    android:paddingBottom="0dp"
-    tools:ignore="LabelFor" />
diff --git a/app/src/main/res/layout/line_in_drawer.xml b/app/src/main/res/layout/line_in_drawer.xml
deleted file mode 100644
index 060c7db0ac..0000000000
--- a/app/src/main/res/layout/line_in_drawer.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/row_line"
-    android:layout_width="fill_parent"
-    android:layout_height="?android:attr/listPreferredItemHeight"
-    android:background="@drawable/selected_session_background"
-    android:ellipsize="marquee"
-    android:gravity="start|center_vertical"
-    android:padding="6dip"
-    android:textSize="14sp" />
\ No newline at end of file
diff --git a/terminal-emulator/src/main/java/com/termux/terminal/EmulatorDebug.java b/terminal-emulator/src/main/java/com/termux/terminal/EmulatorDebug.java
deleted file mode 100644
index f9cef418e9..0000000000
--- a/terminal-emulator/src/main/java/com/termux/terminal/EmulatorDebug.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.termux.terminal;
-
-import android.util.Log;
-
-public final class EmulatorDebug {
-
-    /** The tag to use with {@link Log}. */
-    public static final String LOG_TAG = "termux";
-
-}

From 3b5d3114a6d9a5c514d88fef57f823215cf81bdf Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Tue, 16 Mar 2021 03:44:45 +0500
Subject: [PATCH 232/912] Prefix DEFAULT_LOG_TAG even when a tag is passed
 while logging

---
 .../java/com/termux/app/utils/Logger.java     | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/termux/app/utils/Logger.java b/app/src/main/java/com/termux/app/utils/Logger.java
index aace3c2555..7543531138 100644
--- a/app/src/main/java/com/termux/app/utils/Logger.java
+++ b/app/src/main/java/com/termux/app/utils/Logger.java
@@ -30,15 +30,15 @@ public class Logger {
 
     static public void logMesssage(int logLevel, String tag, String message) {
         if(logLevel == Log.ERROR && CURRENT_LOG_LEVEL >= LOG_LEVEL_NORMAL)
-            Log.e(tag, message);
+            Log.e(getFullTag(tag), message);
         else if(logLevel == Log.WARN && CURRENT_LOG_LEVEL >= LOG_LEVEL_NORMAL)
-            Log.w(tag, message);
+            Log.w(getFullTag(tag), message);
         else if(logLevel == Log.INFO && CURRENT_LOG_LEVEL >= LOG_LEVEL_NORMAL)
-            Log.i(tag, message);
+            Log.i(getFullTag(tag), message);
         else if(logLevel == Log.DEBUG && CURRENT_LOG_LEVEL >= LOG_LEVEL_DEBUG)
-            Log.d(tag, message);
+            Log.d(getFullTag(tag), message);
         else if(logLevel == Log.VERBOSE && CURRENT_LOG_LEVEL >= LOG_LEVEL_VERBOSE)
-            Log.v(tag, message);
+            Log.v(getFullTag(tag), message);
     }
 
 
@@ -133,9 +133,9 @@ static public void logStackTraceWithMessage(String tag, String message, Exceptio
                 e.printStackTrace(pw);
                 pw.close();
                 if(message != null)
-                    Log.e(tag, message + ":\n" + errors.toString());
+                    Log.e(getFullTag(tag), message + ":\n" + errors.toString());
                 else
-                    Log.e(tag, errors.toString());
+                    Log.e(getFullTag(tag), errors.toString());
                 errors.close();
             } catch (IOException e1) {
                 e1.printStackTrace();
@@ -220,4 +220,11 @@ public static int setLogLevel(Context context, int logLevel) {
         return CURRENT_LOG_LEVEL;
     }
 
+    static public String getFullTag(String tag) {
+        if(DEFAULT_LOG_TAG.equals(tag))
+            return tag;
+        else
+            return DEFAULT_LOG_TAG + ":" + tag;
+    }
+
 }

From 11a236a172ac7d64a6963d369515801ff29dc3ac Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Tue, 16 Mar 2021 03:46:34 +0500
Subject: [PATCH 233/912] Update TerminalView and TerminalViewClient javadocs

---
 .../src/main/java/com/termux/view/TerminalView.java   | 11 ++++-------
 .../main/java/com/termux/view/TerminalViewClient.java |  9 ++++++---
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/terminal-view/src/main/java/com/termux/view/TerminalView.java b/terminal-view/src/main/java/com/termux/view/TerminalView.java
index 995f8b9ad6..0eea85d479 100644
--- a/terminal-view/src/main/java/com/termux/view/TerminalView.java
+++ b/terminal-view/src/main/java/com/termux/view/TerminalView.java
@@ -210,14 +210,11 @@ public void onLongPress(MotionEvent event) {
     }
 
     /**
-     * @param terminalViewClient Interface for communicating with the terminal view client. It allows
-     *                           for getting various configuration options from the client and
-     *                           for sending back data to the client like logs, key events, both
-     *                           hardware and IME (which makes it different from that available with
-     *                           {@link View#setOnKeyListener(OnKeyListener)}, etc.
+     * @param client The {@link TerminalViewClient} interface implementation to allow
+     *                           for communication between {@link TerminalView} and its client.
      */
-    public void setTerminalViewClient(TerminalViewClient terminalViewClient) {
-        this.mClient = terminalViewClient;
+    public void setTerminalViewClient(TerminalViewClient client) {
+        this.mClient = client;
     }
 
     /**
diff --git a/terminal-view/src/main/java/com/termux/view/TerminalViewClient.java b/terminal-view/src/main/java/com/termux/view/TerminalViewClient.java
index 25be7d9dda..a1ed550b21 100644
--- a/terminal-view/src/main/java/com/termux/view/TerminalViewClient.java
+++ b/terminal-view/src/main/java/com/termux/view/TerminalViewClient.java
@@ -3,13 +3,16 @@
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.ScaleGestureDetector;
+import android.view.View;
 
 import com.termux.terminal.TerminalSession;
 
 /**
- * Input and scale listener which may be set on a {@link TerminalView} through
- * {@link TerminalView#setTerminalViewClient(TerminalViewClient)}.
- * <p/>
+ * The interface for communication between {@link TerminalView} and its client. It allows for getting
+ * various  configuration options from the client and for sending back data to the client like logs,
+ * key events, both hardware and IME (which makes it different from that available with
+ * {@link View#setOnKeyListener(View.OnKeyListener)}, etc. It must be set for the
+ * {@link TerminalView} through {@link TerminalView#setTerminalViewClient(TerminalViewClient)}.
  */
 public interface TerminalViewClient {
 

From 7da847a485c1262d7fec3ba8983539a3cbc30401 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Tue, 16 Mar 2021 03:59:54 +0500
Subject: [PATCH 234/912] Update TermuxConstants

The `TermuxConstants` classes has been updated to `v0.4.0`. Check its Changelog sections for info on changes.
---
 .../java/com/termux/app/TermuxConstants.java  | 48 +++++++++++++++----
 1 file changed, 39 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxConstants.java b/app/src/main/java/com/termux/app/TermuxConstants.java
index 8695e71530..36eea3b9e4 100644
--- a/app/src/main/java/com/termux/app/TermuxConstants.java
+++ b/app/src/main/java/com/termux/app/TermuxConstants.java
@@ -5,7 +5,7 @@
 import java.io.File;
 
 /*
- * Version: v0.3.0
+ * Version: v0.4.0
  *
  * Changelog
  *
@@ -14,23 +14,33 @@
  *
  * - 0.2.0 (2021-03-11)
  *      - Added `_DIR` and `_FILE` substrings to paths.
- *      - Add INTERNAL_PRIVATE_APP_DATA_DIR*, TERMUX_CACHE_DIR*, TERMUX_DATABASES_DIR*,
- *          TERMUX_SHARED_PREFERENCES_DIR*, TERMUX_BIN_PREFIX_DIR*, TERMUX_ETC_DIR*, TERMUX_INCLUDE_DIR*,
- *          TERMUX_LIB_DIR*, TERMUX_LIBEXEC_DIR*, TERMUX_SHARE_DIR*, TERMUX_TMP_DIR*, TERMUX_VAR_DIR*,
- *          TERMUX_STAGING_PREFIX_DIR*, TERMUX_STORAGE_HOME_DIR*, TERMUX_DEFAULT_PREFERENCES_FILE_BASENAME*,
- *          TERMUX_DEFAULT_PREFERENCES_FILE
+ *      - Added `INTERNAL_PRIVATE_APP_DATA_DIR*`, `TERMUX_CACHE_DIR*`, `TERMUX_DATABASES_DIR*`,
+ *          `TERMUX_SHARED_PREFERENCES_DIR*`, `TERMUX_BIN_PREFIX_DIR*`, `TERMUX_ETC_DIR*`,
+ *          `TERMUX_INCLUDE_DIR*`, `TERMUX_LIB_DIR*`, `TERMUX_LIBEXEC_DIR*`, `TERMUX_SHARE_DIR*`,
+ *          `TERMUX_TMP_DIR*`, `TERMUX_VAR_DIR*`, `TERMUX_STAGING_PREFIX_DIR*`,
+ *          `TERMUX_STORAGE_HOME_DIR*`, `TERMUX_DEFAULT_PREFERENCES_FILE_BASENAME*`,
+ *          `TERMUX_DEFAULT_PREFERENCES_FILE`.
  *      - Renamed `DATA_HOME_PATH` to `TERMUX_DATA_HOME_DIR_PATH`.
  *      - Renamed `CONFIG_HOME_PATH` to `TERMUX_CONFIG_HOME_DIR_PATH`.
  *      - Updated javadocs and spacing.
  *
  * - 0.3.0 (2021-03-12)
- *      - Remove TERMUX_CACHE_DIR_PATH*, TERMUX_DATABASES_DIR_PATH*, TERMUX_SHARED_PREFERENCES_DIR_PATH*
- *          since they may not be consistent on all devices.
+ *      - Remove `TERMUX_CACHE_DIR_PATH*`, `TERMUX_DATABASES_DIR_PATH*`,
+ *          `TERMUX_SHARED_PREFERENCES_DIR_PATH*` since they may not be consistent on all devices.
  *      - Renamed `TERMUX_DEFAULT_PREFERENCES_FILE_BASENAME` to
  *          `TERMUX_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION`. This should be used for
  *           accessing shared preferences between Termux app and its plugins if ever needed by first
  *           getting shared package context with {@link Context.createPackageContext(String,int}).
  *
+ * - 0.4.0 (2021-03-16)
+ *      - Added `BROADCAST_TERMUX_OPENED`,
+ *          `TERMUX_API_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION`
+ *          `TERMUX_BOOT_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION`,
+ *          `TERMUX_FLOAT_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION`,
+ *          `TERMUX_STYLING_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION`,
+ *          `TERMUX_TASKER_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION`,
+ *          `TERMUX_WIDGET_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION`.
+ *
  */
 
 /**
@@ -227,12 +237,30 @@ public final class TermuxConstants {
 
 
     /*
-     * Termux app core file paths.
+     * Termux app and plugin preferences and properties file paths.
      */
 
     /* Termux app default SharedPreferences file basename without extension */
     public static final String TERMUX_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION = TERMUX_PACKAGE_NAME + "_preferences"; // Default: "com.termux_preferences"
 
+    /* Termux API app default SharedPreferences file basename without extension */
+    public static final String TERMUX_API_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION = TERMUX_API_PACKAGE_NAME + "_preferences"; // Default: "com.termux.api_preferences"
+
+    /* Termux Boot app default SharedPreferences file basename without extension */
+    public static final String TERMUX_BOOT_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION = TERMUX_BOOT_PACKAGE_NAME + "_preferences"; // Default: "com.termux.boot_preferences"
+
+    /* Termux Float app default SharedPreferences file basename without extension */
+    public static final String TERMUX_FLOAT_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION = TERMUX_FLOAT_PACKAGE_NAME + "_preferences"; // Default: "com.termux.window_preferences"
+
+    /* Termux Styling app default SharedPreferences file basename without extension */
+    public static final String TERMUX_STYLING_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION = TERMUX_STYLING_PACKAGE_NAME + "_preferences"; // Default: "com.termux.styling_preferences"
+
+    /* Termux Plugin app default SharedPreferences file basename without extension */
+    public static final String TERMUX_TASKER_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION = TERMUX_TASKER_PACKAGE_NAME + "_preferences"; // Default: "com.termux.tasker_preferences"
+
+    /* Termux Widget app default SharedPreferences file basename without extension */
+    public static final String TERMUX_WIDGET_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION = TERMUX_WIDGET_PACKAGE_NAME + "_preferences"; // Default: "com.termux.widget_preferences"
+
 
     /* Termux app termux.properties primary file path */
     public static final String TERMUX_PROPERTIES_PRIMARY_FILE_PATH = TERMUX_DATA_HOME_DIR_PATH + "/termux.properties"; // Default: "/data/data/com.termux/files/home/.termux/termux.properties"
@@ -244,6 +272,7 @@ public final class TermuxConstants {
     /* Termux app termux.properties secondary file */
     public static final File TERMUX_PROPERTIES_SECONDARY_FILE = new File(TERMUX_PROPERTIES_SECONDARY_FILE_PATH);
 
+
     /* Termux app and Termux:Styling colors.properties file path */
     public static final String TERMUX_COLOR_PROPERTIES_FILE_PATH = TERMUX_DATA_HOME_DIR_PATH + "/colors.properties"; // Default: "/data/data/com.termux/files/home/.termux/colors.properties"
     /* Termux app and Termux:Styling colors.properties file */
@@ -302,6 +331,7 @@ public final class TermuxConstants {
     public static final String PROP_DEFAULT_VALUE_ALLOW_EXTERNAL_APPS = "false"; // Default: "false"
 
 
+    public static final String BROADCAST_TERMUX_OPENED = TERMUX_PACKAGE_NAME + ".app.OPENED";
 
 
 

From 73af5c23264ef347a76fad6d459a7e7a93cbb71a Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Tue, 16 Mar 2021 04:05:15 +0500
Subject: [PATCH 235/912] Move terminal io related classed to
 com.termux.app.terminal.io package

---
 .../properties/TermuxSharedProperties.java    |   4 +-
 .../termux/app/terminal/io/BellHandler.java   |  63 +++
 .../app/terminal/io/FullScreenWorkAround.java |  68 ++++
 .../app/terminal/io/KeyboardShortcut.java     |  13 +
 .../terminal/io/extrakeys/ExtraKeyButton.java |  92 +++++
 .../terminal/io/extrakeys/ExtraKeysInfo.java  | 253 ++++++++++++
 .../terminal/io/extrakeys/ExtraKeysView.java  | 382 ++++++++++++++++++
 7 files changed, 873 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/java/com/termux/app/terminal/io/BellHandler.java
 create mode 100644 app/src/main/java/com/termux/app/terminal/io/FullScreenWorkAround.java
 create mode 100644 app/src/main/java/com/termux/app/terminal/io/KeyboardShortcut.java
 create mode 100644 app/src/main/java/com/termux/app/terminal/io/extrakeys/ExtraKeyButton.java
 create mode 100644 app/src/main/java/com/termux/app/terminal/io/extrakeys/ExtraKeysInfo.java
 create mode 100644 app/src/main/java/com/termux/app/terminal/io/extrakeys/ExtraKeysView.java

diff --git a/app/src/main/java/com/termux/app/settings/properties/TermuxSharedProperties.java b/app/src/main/java/com/termux/app/settings/properties/TermuxSharedProperties.java
index 8c72793fec..623ab13dd2 100644
--- a/app/src/main/java/com/termux/app/settings/properties/TermuxSharedProperties.java
+++ b/app/src/main/java/com/termux/app/settings/properties/TermuxSharedProperties.java
@@ -5,8 +5,8 @@
 
 import androidx.annotation.Nullable;
 
-import com.termux.app.terminal.extrakeys.ExtraKeysInfo;
-import com.termux.app.terminal.KeyboardShortcut;
+import com.termux.app.terminal.io.extrakeys.ExtraKeysInfo;
+import com.termux.app.terminal.io.KeyboardShortcut;
 import com.termux.app.utils.Logger;
 
 import org.json.JSONException;
diff --git a/app/src/main/java/com/termux/app/terminal/io/BellHandler.java b/app/src/main/java/com/termux/app/terminal/io/BellHandler.java
new file mode 100644
index 0000000000..490bd2fd40
--- /dev/null
+++ b/app/src/main/java/com/termux/app/terminal/io/BellHandler.java
@@ -0,0 +1,63 @@
+package com.termux.app.terminal.io;
+
+import android.content.Context;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.SystemClock;
+import android.os.Vibrator;
+
+public class BellHandler {
+    private static BellHandler instance = null;
+    private static final Object lock = new Object();
+
+    public static BellHandler getInstance(Context context) {
+        if (instance == null) {
+            synchronized (lock) {
+                if (instance == null) {
+                    instance = new BellHandler((Vibrator) context.getApplicationContext().getSystemService(Context.VIBRATOR_SERVICE));
+                }
+            }
+        }
+
+        return instance;
+    }
+
+    private static final long DURATION = 50;
+    private static final long MIN_PAUSE = 3 * DURATION;
+
+    private final Handler handler = new Handler(Looper.getMainLooper());
+    private long lastBell = 0;
+    private final Runnable bellRunnable;
+
+    private BellHandler(final Vibrator vibrator) {
+        bellRunnable = new Runnable() {
+            @Override
+            public void run() {
+                if (vibrator != null) {
+                    vibrator.vibrate(DURATION);
+                }
+            }
+        };
+    }
+
+    public synchronized void doBell() {
+        long now = now();
+        long timeSinceLastBell = now - lastBell;
+
+        if (timeSinceLastBell < 0) {
+            // there is a next bell pending; don't schedule another one
+        } else if (timeSinceLastBell < MIN_PAUSE) {
+            // there was a bell recently, scheudle the next one
+            handler.postDelayed(bellRunnable, MIN_PAUSE - timeSinceLastBell);
+            lastBell = lastBell + MIN_PAUSE;
+        } else {
+            // the last bell was long ago, do it now
+            bellRunnable.run();
+            lastBell = now;
+        }
+    }
+
+    private long now() {
+        return SystemClock.uptimeMillis();
+    }
+}
diff --git a/app/src/main/java/com/termux/app/terminal/io/FullScreenWorkAround.java b/app/src/main/java/com/termux/app/terminal/io/FullScreenWorkAround.java
new file mode 100644
index 0000000000..c01f8994d8
--- /dev/null
+++ b/app/src/main/java/com/termux/app/terminal/io/FullScreenWorkAround.java
@@ -0,0 +1,68 @@
+package com.termux.app.terminal.io;
+
+import android.graphics.Rect;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.termux.app.TermuxActivity;
+
+/**
+ * Work around for fullscreen mode in Termux to fix ExtraKeysView not being visible.
+ * This class is derived from:
+ * https://stackoverflow.com/questions/7417123/android-how-to-adjust-layout-in-full-screen-mode-when-softkeyboard-is-visible
+ * and has some additional tweaks
+ * ---
+ * For more information, see https://issuetracker.google.com/issues/36911528
+ */
+public class FullScreenWorkAround {
+    private final View mChildOfContent;
+    private int mUsableHeightPrevious;
+    private final ViewGroup.LayoutParams mViewGroupLayoutParams;
+
+    private final int mNavBarHeight;
+
+
+    public static void apply(TermuxActivity activity) {
+        new FullScreenWorkAround(activity);
+    }
+
+    private FullScreenWorkAround(TermuxActivity activity) {
+        ViewGroup content = activity.findViewById(android.R.id.content);
+        mChildOfContent = content.getChildAt(0);
+        mViewGroupLayoutParams = mChildOfContent.getLayoutParams();
+        mNavBarHeight = activity.getNavBarHeight();
+        mChildOfContent.getViewTreeObserver().addOnGlobalLayoutListener(this::possiblyResizeChildOfContent);
+    }
+
+    private void possiblyResizeChildOfContent() {
+        int usableHeightNow = computeUsableHeight();
+        if (usableHeightNow != mUsableHeightPrevious) {
+            int usableHeightSansKeyboard = mChildOfContent.getRootView().getHeight();
+            int heightDifference = usableHeightSansKeyboard - usableHeightNow;
+            if (heightDifference > (usableHeightSansKeyboard / 4)) {
+                // keyboard probably just became visible
+
+                // ensures that usable layout space does not extend behind the
+                // soft keyboard, causing the extra keys to not be visible
+                mViewGroupLayoutParams.height = (usableHeightSansKeyboard - heightDifference) + getNavBarHeight();
+            } else {
+                // keyboard probably just became hidden
+                mViewGroupLayoutParams.height = usableHeightSansKeyboard;
+            }
+            mChildOfContent.requestLayout();
+            mUsableHeightPrevious = usableHeightNow;
+        }
+    }
+
+    private int getNavBarHeight() {
+        return mNavBarHeight;
+    }
+
+    private int computeUsableHeight() {
+        Rect r = new Rect();
+        mChildOfContent.getWindowVisibleDisplayFrame(r);
+        return (r.bottom - r.top);
+    }
+
+}
+
diff --git a/app/src/main/java/com/termux/app/terminal/io/KeyboardShortcut.java b/app/src/main/java/com/termux/app/terminal/io/KeyboardShortcut.java
new file mode 100644
index 0000000000..00a832dd6a
--- /dev/null
+++ b/app/src/main/java/com/termux/app/terminal/io/KeyboardShortcut.java
@@ -0,0 +1,13 @@
+package com.termux.app.terminal.io;
+
+public class KeyboardShortcut {
+
+    public final int codePoint;
+    public final int shortcutAction;
+
+    public KeyboardShortcut(int codePoint, int shortcutAction) {
+        this.codePoint = codePoint;
+        this.shortcutAction = shortcutAction;
+    }
+
+}
diff --git a/app/src/main/java/com/termux/app/terminal/io/extrakeys/ExtraKeyButton.java b/app/src/main/java/com/termux/app/terminal/io/extrakeys/ExtraKeyButton.java
new file mode 100644
index 0000000000..2701a9ecc4
--- /dev/null
+++ b/app/src/main/java/com/termux/app/terminal/io/extrakeys/ExtraKeyButton.java
@@ -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 = null;
+
+    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;
+    }
+}
diff --git a/app/src/main/java/com/termux/app/terminal/io/extrakeys/ExtraKeysInfo.java b/app/src/main/java/com/termux/app/terminal/io/extrakeys/ExtraKeysInfo.java
new file mode 100644
index 0000000000..12fe30a966
--- /dev/null
+++ b/app/src/main/java/com/termux/app/terminal/io/extrakeys/ExtraKeysInfo.java
@@ -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 = "default";
+
+    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);
+    }
+}
+
diff --git a/app/src/main/java/com/termux/app/terminal/io/extrakeys/ExtraKeysView.java b/app/src/main/java/com/termux/app/terminal/io/extrakeys/ExtraKeysView.java
new file mode 100644
index 0000000000..be896ab443
--- /dev/null
+++ b/app/src/main/java/com/termux/app/terminal/io/extrakeys/ExtraKeysView.java
@@ -0,0 +1,382 @@
+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.view.inputmethod.InputMethodManager;
+import android.widget.Button;
+import android.widget.GridLayout;
+import android.widget.PopupWindow;
+
+import com.termux.R;
+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;
+
+    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)) {
+            InputMethodManager imm = (InputMethodManager) getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
+            imm.toggleSoftInput(0, 0);
+        } 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);
+            }
+        }
+    }
+
+}

From 5e0b29bb6d3b1ee73e7fba1d6c2ecc7446264419 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Tue, 16 Mar 2021 04:07:01 +0500
Subject: [PATCH 236/912] Move DialogUtils to com.termux.app.utils package

---
 .../com/termux/app/utils/DialogUtils.java     | 71 +++++++++++++++++++
 .../TermuxFileReceiverActivity.java           |  2 +-
 2 files changed, 72 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/java/com/termux/app/utils/DialogUtils.java

diff --git a/app/src/main/java/com/termux/app/utils/DialogUtils.java b/app/src/main/java/com/termux/app/utils/DialogUtils.java
new file mode 100644
index 0000000000..5970850fe0
--- /dev/null
+++ b/app/src/main/java/com/termux/app/utils/DialogUtils.java
@@ -0,0 +1,71 @@
+package com.termux.app.utils;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.DialogInterface;
+import android.text.Selection;
+import android.util.TypedValue;
+import android.view.KeyEvent;
+import android.view.ViewGroup.LayoutParams;
+import android.widget.EditText;
+import android.widget.LinearLayout;
+
+public final class DialogUtils {
+
+    public interface TextSetListener {
+        void onTextSet(String text);
+    }
+
+    public static void textInput(Activity activity, int titleText, String initialText,
+                                 int positiveButtonText, final TextSetListener onPositive,
+                                 int neutralButtonText, final TextSetListener onNeutral,
+                                 int negativeButtonText, final TextSetListener onNegative,
+                                 final DialogInterface.OnDismissListener onDismiss) {
+        final EditText input = new EditText(activity);
+        input.setSingleLine();
+        if (initialText != null) {
+            input.setText(initialText);
+            Selection.setSelection(input.getText(), initialText.length());
+        }
+
+        final AlertDialog[] dialogHolder = new AlertDialog[1];
+        input.setImeActionLabel(activity.getResources().getString(positiveButtonText), KeyEvent.KEYCODE_ENTER);
+        input.setOnEditorActionListener((v, actionId, event) -> {
+            onPositive.onTextSet(input.getText().toString());
+            dialogHolder[0].dismiss();
+            return true;
+        });
+
+        float dipInPixels = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 1, activity.getResources().getDisplayMetrics());
+        // https://www.google.com/design/spec/components/dialogs.html#dialogs-specs
+        int paddingTopAndSides = Math.round(16 * dipInPixels);
+        int paddingBottom = Math.round(24 * dipInPixels);
+
+        LinearLayout layout = new LinearLayout(activity);
+        layout.setOrientation(LinearLayout.VERTICAL);
+        layout.setLayoutParams(new LinearLayout.LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT));
+        layout.setPadding(paddingTopAndSides, paddingTopAndSides, paddingTopAndSides, paddingBottom);
+        layout.addView(input);
+
+        AlertDialog.Builder builder = new AlertDialog.Builder(activity)
+            .setTitle(titleText).setView(layout)
+            .setPositiveButton(positiveButtonText, (d, whichButton) -> onPositive.onTextSet(input.getText().toString()));
+
+        if (onNeutral != null) {
+            builder.setNeutralButton(neutralButtonText, (dialog, which) -> onNeutral.onTextSet(input.getText().toString()));
+        }
+
+        if (onNegative == null) {
+            builder.setNegativeButton(android.R.string.cancel, null);
+        } else {
+            builder.setNegativeButton(negativeButtonText, (dialog, which) -> onNegative.onTextSet(input.getText().toString()));
+        }
+
+        if (onDismiss != null) builder.setOnDismissListener(onDismiss);
+
+        dialogHolder[0] = builder.create();
+        dialogHolder[0].setCanceledOnTouchOutside(false);
+        dialogHolder[0].show();
+    }
+
+}
diff --git a/app/src/main/java/com/termux/filepicker/TermuxFileReceiverActivity.java b/app/src/main/java/com/termux/filepicker/TermuxFileReceiverActivity.java
index f0f53dcbe5..94194f27a4 100644
--- a/app/src/main/java/com/termux/filepicker/TermuxFileReceiverActivity.java
+++ b/app/src/main/java/com/termux/filepicker/TermuxFileReceiverActivity.java
@@ -9,7 +9,7 @@
 import android.util.Patterns;
 
 import com.termux.R;
-import com.termux.app.DialogUtils;
+import com.termux.app.utils.DialogUtils;
 import com.termux.app.TermuxConstants;
 import com.termux.app.TermuxConstants.TERMUX_APP.TERMUX_SERVICE;
 import com.termux.app.TermuxService;

From c9e18e5b933ca0abb5647b7f69468825791c05e4 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Tue, 16 Mar 2021 05:01:09 +0500
Subject: [PATCH 237/912] Refactor TermuxActivity

This commit majorly refactors `TermuxActivity` and moves its view components and functions into dedicated classes.

- The view layouts and ids have been given meaningful names, like `termux_activity.xml`.
- The `TerminalToolbarViewPager` class has been created to handle the now called toolbar that shows on the bottom of the terminal view. It currently contains extra keys view defined by `terminal_toolbar_extra_keys_view.xml` file and a text input view defined by `terminal_toolbar_text_input_view.xml` file when user can switch to by swiping left. The input text will now be preserved if android destroys the activity or its recreated.
- The `TermuxSessionsListViewController` class has been created to handle view related functionality of the termux sessions list shown in the left drawer, namely view creation, `onItemClick()`, `onItemLongClick()`, etc. Its list view is defined by `termux_activity.xml` file and each item's layout is defined by the `terminal_sessions_list_item.xml` file.
- The `TextDataUtils` class has been added to the `com.termux.app.utils` package for text utils.
- The design for the `SessionChangedCallback` interface for `TerminalSession` has been majorly changed. Firstly, it has been renamed and moved from `TerminalSession` to the dedicated `TerminalSessionClient` class file. The interface now also supports the termux app centralized logging framework so that `TerminalSession` and `TerminalEmulator` can use them. Previously, `TermuxService` was implementing a wrapper interface, which would then call the real interface defined by the `TermuxActivity` if it was currently bound to the service. This cluttered and partially duplicated the code. Now, the implementation is defined by the `TermuxSessionClientBase` and `TermuxSessionClient` classes. The `TermuxSessionClientBase` implements the `TerminalSessionClient` interface but the definition of the activity related functions do not do anything, only the background ones like the logging functions are fully implemented. The `TermuxSessionClient` class inherits from the `TermuxSessionClientBase` class and provides the implementation for the activity related functions. The design for how this works is that if the `TermuxService` is not bound to `TermuxActivity`, it just passes the `TermuxSessionClientBase` implementation to `TerminalSession`. If the activity is bound at some point, then in `onServiceConnected()` it replaces/updates the client objects stored in `TerminalSession` and `TerminalEmulator` with `TermuxSessionClient`, and then replaces them back with `TermuxSessionClientBase` in `onDestroy()`. This seems to be working for now without an issue.
---
 .../java/com/termux/app/TermuxActivity.java   | 1221 ++++++-----------
 .../java/com/termux/app/TermuxService.java    |   88 +-
 .../TermuxPreferenceConstants.java            |    6 +-
 .../preferences/TermuxSharedPreferences.java  |   30 +-
 .../app/terminal/TermuxSessionClient.java     |  315 +++++
 .../app/terminal/TermuxSessionClientBase.java |   71 +
 .../TermuxSessionsListViewController.java     |  107 ++
 .../termux/app/terminal/TermuxViewClient.java |  145 +-
 .../terminal/io/TerminalToolbarViewPager.java |  114 ++
 .../com/termux/app/utils/TermuxUtils.java     |   27 +
 .../com/termux/app/utils/TextDataUtils.java   |  111 ++
 .../layout/terminal_sessions_list_item.xml    |    9 +
 .../terminal_toolbar_extra_keys_view.xml      |    8 +
 .../terminal_toolbar_text_input_view.xml      |   16 +
 app/src/main/res/layout/termux_activity.xml   |   80 ++
 .../com/termux/app/TermuxActivityTest.java    |    4 +-
 .../com/termux/terminal/TerminalEmulator.java |   34 +-
 .../com/termux/terminal/TerminalSession.java  |  178 ++-
 .../terminal/TerminalSessionClient.java       |   37 +
 19 files changed, 1631 insertions(+), 970 deletions(-)
 create mode 100644 app/src/main/java/com/termux/app/terminal/TermuxSessionClient.java
 create mode 100644 app/src/main/java/com/termux/app/terminal/TermuxSessionClientBase.java
 create mode 100644 app/src/main/java/com/termux/app/terminal/TermuxSessionsListViewController.java
 create mode 100644 app/src/main/java/com/termux/app/terminal/io/TerminalToolbarViewPager.java
 create mode 100644 app/src/main/java/com/termux/app/utils/TextDataUtils.java
 create mode 100644 app/src/main/res/layout/terminal_sessions_list_item.xml
 create mode 100644 app/src/main/res/layout/terminal_toolbar_extra_keys_view.xml
 create mode 100644 app/src/main/res/layout/terminal_toolbar_text_input_view.xml
 create mode 100644 app/src/main/res/layout/termux_activity.xml
 create mode 100644 terminal-emulator/src/main/java/com/termux/terminal/TerminalSessionClient.java

diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index 8b75f7ee94..f2fc16882d 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -6,32 +6,19 @@
 import android.app.AlertDialog;
 import android.content.ActivityNotFoundException;
 import android.content.BroadcastReceiver;
-import android.content.ClipData;
-import android.content.ClipboardManager;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.ServiceConnection;
 import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.graphics.Color;
-import android.graphics.Paint;
-import android.graphics.Typeface;
-import android.media.AudioAttributes;
-import android.media.SoundPool;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.IBinder;
-import android.text.SpannableString;
-import android.text.Spanned;
-import android.text.TextUtils;
-import android.text.style.StyleSpan;
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
 import android.view.Gravity;
-import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -39,43 +26,31 @@
 import android.view.WindowManager;
 import android.view.autofill.AutofillManager;
 import android.view.inputmethod.InputMethodManager;
-import android.widget.ArrayAdapter;
 import android.widget.EditText;
 import android.widget.ListView;
-import android.widget.TextView;
 import android.widget.Toast;
 
 import com.termux.R;
 import com.termux.app.TermuxConstants.TERMUX_APP.TERMUX_ACTIVITY;
 import com.termux.app.settings.preferences.TermuxSharedPreferences;
-import com.termux.app.terminal.BellHandler;
+import com.termux.app.terminal.TermuxSessionsListViewController;
+import com.termux.app.terminal.io.TerminalToolbarViewPager;
+import com.termux.app.terminal.TermuxSessionClient;
 import com.termux.app.terminal.TermuxViewClient;
-import com.termux.app.terminal.extrakeys.ExtraKeysView;
-import com.termux.app.terminal.FullScreenWorkAround;
-import com.termux.app.settings.properties.TermuxPropertyConstants;
+import com.termux.app.terminal.io.extrakeys.ExtraKeysView;
 import com.termux.app.settings.properties.TermuxSharedProperties;
+import com.termux.app.utils.DialogUtils;
 import com.termux.app.utils.Logger;
-import com.termux.terminal.TerminalColors;
+import com.termux.app.utils.TermuxUtils;
 import com.termux.terminal.TerminalSession;
-import com.termux.terminal.TerminalSession.SessionChangedCallback;
-import com.termux.terminal.TextStyle;
+import com.termux.terminal.TerminalSessionClient;
 import com.termux.view.TerminalView;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Properties;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
+import com.termux.view.TerminalViewClient;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
 import androidx.drawerlayout.widget.DrawerLayout;
-import androidx.viewpager.widget.PagerAdapter;
 import androidx.viewpager.widget.ViewPager;
 
 /**
@@ -90,44 +65,59 @@
  */
 public final class TermuxActivity extends Activity implements ServiceConnection {
 
-    private static final int CONTEXTMENU_SELECT_URL_ID = 0;
-    private static final int CONTEXTMENU_SHARE_TRANSCRIPT_ID = 1;
-    private static final int CONTEXTMENU_PASTE_ID = 3;
-    private static final int CONTEXTMENU_KILL_PROCESS_ID = 4;
-    private static final int CONTEXTMENU_RESET_TERMINAL_ID = 5;
-    private static final int CONTEXTMENU_STYLING_ID = 6;
-    private static final int CONTEXTMENU_HELP_ID = 8;
-    private static final int CONTEXTMENU_TOGGLE_KEEP_SCREEN_ON = 9;
-    private static final int CONTEXTMENU_AUTOFILL_ID = 10;
-    private static final int CONTEXTMENU_SETTINGS_ID = 11;
-
-    private static final int MAX_SESSIONS = 8;
-
-    private static final int REQUESTCODE_PERMISSION_STORAGE = 1234;
-
-
-    private static final String BROADCAST_TERMUX_OPENED = TermuxConstants.TERMUX_PACKAGE_NAME + ".app.OPENED";
 
     /**
      * 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
      * {@link #onServiceConnected(ComponentName, IBinder)}.
      */
-    TermuxService mTermService;
+    TermuxService mTermuxService;
 
-    /** The main view of the activity showing the terminal. Initialized in onCreate(). */
+    /**
+     * The main view of the activity showing the terminal. Initialized in onCreate().
+     */
     TerminalView mTerminalView;
 
-    ExtraKeysView mExtraKeysView;
+    /**
+     *  The {@link TerminalViewClient} interface implementation to allow for communication between
+     *  {@link TerminalView} and {@link TermuxActivity}.
+     */
+    TermuxViewClient mTermuxViewClient;
+
+    /**
+     *  The {@link TerminalSessionClient} interface implementation to allow for communication between
+     *  {@link TerminalSession} and {@link TermuxActivity}.
+     */
+    TermuxSessionClient mTermuxSessionClient;
 
+    /**
+     * Termux app shared preferences manager.
+     */
     private TermuxSharedPreferences mPreferences;
 
+    /**
+     * Termux app shared properties manager, loaded from termux.properties
+     */
     private TermuxSharedProperties mProperties;
 
-    /** Initialized in {@link #onServiceConnected(ComponentName, IBinder)}. */
-    ArrayAdapter<TerminalSession> mListViewAdapter;
+    /**
+     * The terminal extra keys view.
+     */
+    ExtraKeysView mExtraKeysView;
+
+    /**
+     * The termux sessions list controller.
+     */
+    TermuxSessionsListViewController mTermuxSessionListViewController;
+
+    /**
+     * The {@link TermuxActivity} broadcast receiver for various things like terminal style configuration changes.
+     */
+    private final BroadcastReceiver mTermuxActivityBroadcastReceiever = new TermuxActivityBroadcastReceiever();
 
-    /** The last toast shown, used cancel current toast before showing new in {@link #showToast(String, boolean)}. */
+    /**
+     * The last toast shown, used cancel current toast before showing new in {@link #showToast(String, boolean)}.
+     */
     Toast mLastToast;
 
     /**
@@ -136,99 +126,40 @@ public final class TermuxActivity extends Activity implements ServiceConnection
      */
     boolean mIsVisible;
 
-    boolean mIsUsingBlackUI;
-
     int mNavBarHeight;
 
-    final SoundPool mBellSoundPool = new SoundPool.Builder().setMaxStreams(1).setAudioAttributes(
-        new AudioAttributes.Builder().setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
-            .setUsage(AudioAttributes.USAGE_ASSISTANCE_SONIFICATION).build()).build();
-    int mBellSoundId;
-
-    private static final String LOG_TAG = "TermuxActivity";
-
-    private final BroadcastReceiver mBroadcastReceiever = new BroadcastReceiver() {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            if (mIsVisible) {
-                String whatToReload = intent.getStringExtra(TERMUX_ACTIVITY.EXTRA_RELOAD_STYLE);
-                Logger.logDebug(LOG_TAG, "Reloading termux style for: " + whatToReload);
-                if ("storage".equals(whatToReload)) {
-                    if (ensureStoragePermissionGranted())
-                        TermuxInstaller.setupStorageSymlinks(TermuxActivity.this);
-                    return;
-                }
-
-                checkForFontAndColors();
+    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_PASTE_ID = 3;
+    private static final int CONTEXT_MENU_KILL_PROCESS_ID = 4;
+    private static final int CONTEXT_MENU_RESET_TERMINAL_ID = 5;
+    private static final int CONTEXT_MENU_STYLING_ID = 6;
+    private static final int CONTEXT_MENU_HELP_ID = 8;
+    private static final int CONTEXT_MENU_TOGGLE_KEEP_SCREEN_ON = 9;
+    private static final int CONTEXT_MENU_AUTOFILL_ID = 10;
+    private static final int CONTEXT_MENU_SETTINGS_ID = 11;
 
-                mProperties.loadTermuxPropertiesFromDisk();
 
-                if (mExtraKeysView != null) {
-                    mExtraKeysView.reload(mProperties.getExtraKeysInfo());
-                }
-            }
-        }
-    };
-
-    void checkForFontAndColors() {
-        try {
-            File colorsFile = TermuxConstants.TERMUX_COLOR_PROPERTIES_FILE;
-            File fontFile = TermuxConstants.TERMUX_FONT_FILE;
-
-            final Properties props = new Properties();
-            if (colorsFile.isFile()) {
-                try (InputStream in = new FileInputStream(colorsFile)) {
-                    props.load(in);
-                }
-            }
+    private static final int REQUESTCODE_PERMISSION_STORAGE = 1234;
 
-            TerminalColors.COLOR_SCHEME.updateWith(props);
-            TerminalSession session = getCurrentTermSession();
-            if (session != null && session.getEmulator() != null) {
-                session.getEmulator().mColors.reset();
-            }
-            updateBackgroundColor();
+    private static final String ARG_TERMINAL_TOOLBAR_TEXT_INPUT = "terminal_toolbar_text_input";
 
-            final Typeface newTypeface = (fontFile.exists() && fontFile.length() > 0) ? Typeface.createFromFile(fontFile) : Typeface.MONOSPACE;
-            mTerminalView.setTypeface(newTypeface);
-        } catch (Exception e) {
-            Logger.logStackTraceWithMessage(LOG_TAG, "Error in checkForFontAndColors()", e);
-        }
-    }
+    private static final String LOG_TAG = "TermuxActivity";
 
-    void updateBackgroundColor() {
-        TerminalSession session = getCurrentTermSession();
-        if (session != null && session.getEmulator() != null) {
-            getWindow().getDecorView().setBackgroundColor(session.getEmulator().mColors.mCurrentColors[TextStyle.COLOR_INDEX_BACKGROUND]);
-        }
-    }
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
 
-    /** For processes to access shared internal storage (/sdcard) we need this permission. */
-    public boolean ensureStoragePermissionGranted() {
-        if (checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED) {
-            return true;
-        } else {
-            requestPermissions(new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, REQUESTCODE_PERMISSION_STORAGE);
-            return false;
-        }
-    }
+        Logger.logDebug(LOG_TAG, "onCreate");
 
-    @Override
-    public void onCreate(Bundle bundle) {
+        // Load termux shared preferences and properties
         mPreferences = new TermuxSharedPreferences(this);
         mProperties = new TermuxSharedProperties(this);
 
-        mIsUsingBlackUI = mProperties.isUsingBlackUI();
-        if (mIsUsingBlackUI) {
-            this.setTheme(R.style.Theme_Termux_Black);
-        } else {
-            this.setTheme(R.style.Theme_Termux);
-        }
+        setActivityTheme();
 
-        super.onCreate(bundle);
+        super.onCreate(savedInstanceState);
 
-
-        setContentView(R.layout.drawer_layout);
+        setContentView(R.layout.termux_activity);
 
         View content = findViewById(android.R.id.content);
         content.setOnApplyWindowInsetsListener((v, insets) -> {
@@ -240,159 +171,57 @@ public void onCreate(Bundle bundle) {
             getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
         }
 
-        if (mIsUsingBlackUI) {
-            findViewById(R.id.left_drawer).setBackgroundColor(
-                getResources().getColor(android.R.color.background_dark)
-            );
-        }
+        setDrawerTheme();
 
-        mTerminalView = findViewById(R.id.terminal_view);
+        setTermuxTerminalViewAndClients();
 
-        mTerminalView.setTerminalViewClient(new TermuxViewClient(this));
+        setTerminalToolbarView(savedInstanceState);
 
-        mTerminalView.setTextSize(mPreferences.getFontSize());
-        mTerminalView.setKeepScreenOn(mPreferences.getKeepScreenOn());
-        mTerminalView.setIsTerminalViewKeyLoggingEnabled(mPreferences.getTerminalViewKeyLoggingEnabled());
-        mTerminalView.requestFocus();
-
-        final ViewPager viewPager = findViewById(R.id.viewpager);
-        if (mPreferences.getShowExtraKeys()) viewPager.setVisibility(View.VISIBLE);
-
-
-        ViewGroup.LayoutParams layoutParams = viewPager.getLayoutParams();
-        layoutParams.height = layoutParams.height * (mProperties.getExtraKeysInfo() == null ? 0 : mProperties.getExtraKeysInfo().getMatrix().length);
-        viewPager.setLayoutParams(layoutParams);
-
-        viewPager.setAdapter(new PagerAdapter() {
-            @Override
-            public int getCount() {
-                return 2;
-            }
-
-            @Override
-            public boolean isViewFromObject(@NonNull View view, @NonNull Object object) {
-                return view == object;
-            }
-
-            @NonNull
-            @Override
-            public Object instantiateItem(@NonNull ViewGroup collection, int position) {
-                LayoutInflater inflater = LayoutInflater.from(TermuxActivity.this);
-                View layout;
-                if (position == 0) {
-                    layout = mExtraKeysView = (ExtraKeysView) inflater.inflate(R.layout.extra_keys_main, collection, false);
-                    mExtraKeysView.reload(mProperties.getExtraKeysInfo());
-
-                    // apply extra keys fix if enabled in prefs
-                    if (mProperties.isUsingFullScreen() && mProperties.isUsingFullScreenWorkAround()) {
-                        FullScreenWorkAround.apply(TermuxActivity.this);
-                    }
-
-                } else {
-                    layout = inflater.inflate(R.layout.extra_keys_right, collection, false);
-                    final EditText editText = layout.findViewById(R.id.text_input);
-                    editText.setOnEditorActionListener((v, actionId, event) -> {
-                        TerminalSession session = getCurrentTermSession();
-                        if (session != null) {
-                            if (session.isRunning()) {
-                                String textToSend = editText.getText().toString();
-                                if (textToSend.length() == 0) textToSend = "\r";
-                                session.write(textToSend);
-                            } else {
-                                removeFinishedSession(session);
-                            }
-                            editText.setText("");
-                        }
-                        return true;
-                    });
-                }
-                collection.addView(layout);
-                return layout;
-            }
+        setNewSessionButtonView();
 
-            @Override
-            public void destroyItem(@NonNull ViewGroup collection, int position, @NonNull Object view) {
-                collection.removeView((View) view);
-            }
-        });
-
-        viewPager.addOnPageChangeListener(new ViewPager.SimpleOnPageChangeListener() {
-            @Override
-            public void onPageSelected(int position) {
-                if (position == 0) {
-                    mTerminalView.requestFocus();
-                } else {
-                    final EditText editText = viewPager.findViewById(R.id.text_input);
-                    if (editText != null) editText.requestFocus();
-                }
-            }
-        });
-
-        View newSessionButton = findViewById(R.id.new_session_button);
-        newSessionButton.setOnClickListener(v -> addNewSession(false, null));
-        newSessionButton.setOnLongClickListener(v -> {
-            DialogUtils.textInput(TermuxActivity.this, R.string.session_new_named_title, null, R.string.session_new_named_positive_button,
-                text -> addNewSession(false, text), R.string.new_session_failsafe, text -> addNewSession(true, text)
-                , -1, null, null);
-            return true;
-        });
-
-        findViewById(R.id.toggle_keyboard_button).setOnClickListener(v -> {
-            InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
-            imm.toggleSoftInput(InputMethodManager.SHOW_IMPLICIT, 0);
-            getDrawer().closeDrawers();
-        });
-
-        findViewById(R.id.toggle_keyboard_button).setOnLongClickListener(v -> {
-            toggleShowExtraKeys();
-            return true;
-        });
+        setToggleKeyboardView();
 
         registerForContextMenu(mTerminalView);
 
+        // Start the {@link TermuxService} and make it run regardless of who is bound to it
         Intent serviceIntent = new Intent(this, TermuxService.class);
-        // Start the service and make it run regardless of who is bound to it:
         startService(serviceIntent);
+
+        // Attempt to bind to the service, this will call the {@link #onServiceConnected(ComponentName, IBinder)}
+        // callback if it succeeds.
         if (!bindService(serviceIntent, this, 0))
             throw new RuntimeException("bindService() failed");
 
-        checkForFontAndColors();
+        // Send the {@link TermuxConstants#BROADCAST_TERMUX_OPENED} broadcast to notify apps that Termux
+        // app has been opened.
+        TermuxUtils.sendTermuxOpenedBroadcast(this);
+    }
 
-        mBellSoundId = mBellSoundPool.load(this, R.raw.bell, 1);
+    @Override
+    public void onStart() {
+        super.onStart();
 
-        sendOpenedBroadcast();
-    }
+        Logger.logDebug(LOG_TAG, "onStart");
 
-    public int getNavBarHeight() {
-        return mNavBarHeight;
-    }
+        mIsVisible = true;
 
-    /**
-     * Send a broadcast notifying Termux app has been opened
-     */
-    void sendOpenedBroadcast() {
-        Intent broadcast = new Intent(BROADCAST_TERMUX_OPENED);
-        List<ResolveInfo> matches = getPackageManager().queryBroadcastReceivers(broadcast, 0);
-
-        // send broadcast to registered Termux receivers
-        // this technique is needed to work around broadcast changes that Oreo introduced
-        for (ResolveInfo info : matches) {
-            Intent explicitBroadcast = new Intent(broadcast);
-            ComponentName cname = new ComponentName(info.activityInfo.applicationInfo.packageName,
-                info.activityInfo.name);
-            explicitBroadcast.setComponent(cname);
-            sendBroadcast(explicitBroadcast);
+        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.
+            mTermuxSessionClient.setCurrentSession(mTermuxSessionClient.getCurrentStoredSessionOrLast());
+            terminalSessionListNotifyUpdated();
         }
-    }
 
-    public void toggleShowExtraKeys() {
-        final ViewPager viewPager = findViewById(R.id.viewpager);
-        final boolean showNow = mPreferences.toggleShowExtraKeys();
-        viewPager.setVisibility(showNow ? View.VISIBLE : View.GONE);
-        if (showNow && viewPager.getCurrentItem() == 1) {
-            // Focus the text input view if just revealed.
-            findViewById(R.id.text_input).requestFocus();
-        }
+        registerReceiver(mTermuxActivityBroadcastReceiever, new IntentFilter(TERMUX_ACTIVITY.ACTION_RELOAD_STYLE));
+
+        // 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();
     }
 
     /**
@@ -402,164 +231,24 @@ public void toggleShowExtraKeys() {
      */
     @Override
     public void onServiceConnected(ComponentName componentName, IBinder service) {
-        mTermService = ((TermuxService.LocalBinder) service).service;
-
-        mTermService.mSessionChangeCallback = new SessionChangedCallback() {
-            @Override
-            public void onTextChanged(TerminalSession changedSession) {
-                if (!mIsVisible) return;
-                if (getCurrentTermSession() == changedSession) mTerminalView.onScreenUpdated();
-            }
-
-            @Override
-            public void onTitleChanged(TerminalSession updatedSession) {
-                if (!mIsVisible) return;
-                if (updatedSession != getCurrentTermSession()) {
-                    // Only show toast for other sessions than the current one, since the user
-                    // probably consciously caused the title change to change in the current session
-                    // and don't want an annoying toast for that.
-                    showToast(toToastTitle(updatedSession), false);
-                }
-                mListViewAdapter.notifyDataSetChanged();
-            }
-
-            @Override
-            public void onSessionFinished(final TerminalSession finishedSession) {
-                if (mTermService.mWantsToStop) {
-                    // The service wants to stop as soon as possible.
-                    finishActivityIfNotFinishing();
-                    return;
-                }
-                if (mIsVisible && finishedSession != getCurrentTermSession()) {
-                    // Show toast for non-current sessions that exit.
-                    int indexOfSession = mTermService.getSessions().indexOf(finishedSession);
-                    // Verify that session was not removed before we got told about it finishing:
-                    if (indexOfSession >= 0)
-                        showToast(toToastTitle(finishedSession) + " - exited", true);
-                }
 
-                if (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 (mTermService.getSessions().size() > 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) {
-                        removeFinishedSession(finishedSession);
-                    }
-                }
+        Logger.logDebug(LOG_TAG, "onServiceConnected");
 
-                mListViewAdapter.notifyDataSetChanged();
-            }
+        mTermuxService = ((TermuxService.LocalBinder) service).service;
 
-            @Override
-            public void onClipboardText(TerminalSession session, String text) {
-                if (!mIsVisible) return;
-                ClipboardManager clipboard = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
-                clipboard.setPrimaryClip(new ClipData(null, new String[]{"text/plain"}, new ClipData.Item(text)));
-            }
+        setTermuxSessionsListView();
 
-            @Override
-            public void onBell(TerminalSession session) {
-                if (!mIsVisible) return;
-
-                switch (mProperties.getBellBehaviour()) {
-                    case TermuxPropertyConstants.IVALUE_BELL_BEHAVIOUR_VIBRATE:
-                        BellHandler.getInstance(TermuxActivity.this).doBell();
-                        break;
-                    case TermuxPropertyConstants.IVALUE_BELL_BEHAVIOUR_BEEP:
-                        mBellSoundPool.play(mBellSoundId, 1.f, 1.f, 1, 0, 1.f);
-                        break;
-                    case TermuxPropertyConstants.IVALUE_BELL_BEHAVIOUR_IGNORE:
-                        // Ignore the bell character.
-                        break;
-                }
-
-            }
-
-            @Override
-            public void onColorsChanged(TerminalSession changedSession) {
-                if (getCurrentTermSession() == changedSession) updateBackgroundColor();
-            }
-        };
-
-        ListView listView = findViewById(R.id.left_drawer_list);
-        mListViewAdapter = new ArrayAdapter<TerminalSession>(getApplicationContext(), R.layout.line_in_drawer, mTermService.getSessions()) {
-            final StyleSpan boldSpan = new StyleSpan(Typeface.BOLD);
-            final StyleSpan italicSpan = new StyleSpan(Typeface.ITALIC);
-
-            @NonNull
-            @Override
-            public View getView(int position, View convertView, @NonNull ViewGroup parent) {
-                View row = convertView;
-                if (row == null) {
-                    LayoutInflater inflater = getLayoutInflater();
-                    row = inflater.inflate(R.layout.line_in_drawer, parent, false);
-                }
-
-                TerminalSession sessionAtRow = getItem(position);
-                if (sessionAtRow == null) return row;
-
-                boolean sessionRunning = false;
-                sessionRunning = sessionAtRow.isRunning();
-
-                TextView firstLineView = row.findViewById(R.id.row_line);
-                if (mIsUsingBlackUI) {
-                    firstLineView.setBackground(
-                        getResources().getDrawable(R.drawable.selected_session_background_black)
-                    );
-                }
-                String name = sessionAtRow.mSessionName;
-                String sessionTitle = sessionAtRow.getTitle();
-
-                String numberPart = "[" + (position + 1) + "] ";
-                String sessionNamePart = (TextUtils.isEmpty(name) ? "" : name);
-                String sessionTitlePart = (TextUtils.isEmpty(sessionTitle) ? "" : ((sessionNamePart.isEmpty() ? "" : "\n") + sessionTitle));
-
-                String text = numberPart + sessionNamePart + sessionTitlePart;
-                SpannableString styledText = new SpannableString(text);
-                styledText.setSpan(boldSpan, 0, numberPart.length() + sessionNamePart.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-                styledText.setSpan(italicSpan, numberPart.length() + sessionNamePart.length(), text.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-
-                firstLineView.setText(styledText);
-
-                if (sessionRunning) {
-                    firstLineView.setPaintFlags(firstLineView.getPaintFlags() & ~Paint.STRIKE_THRU_TEXT_FLAG);
-                } else {
-                    firstLineView.setPaintFlags(firstLineView.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG);
-                }
-                int defaultColor = mIsUsingBlackUI ? Color.WHITE : Color.BLACK;
-                int color = sessionRunning || sessionAtRow.getExitStatus() == 0 ? defaultColor : Color.RED;
-                firstLineView.setTextColor(color);
-                return row;
-            }
-        };
-        listView.setAdapter(mListViewAdapter);
-        listView.setOnItemClickListener((parent, view, position, id) -> {
-            TerminalSession clickedSession = mListViewAdapter.getItem(position);
-            switchToSession(clickedSession);
-            getDrawer().closeDrawers();
-        });
-        listView.setOnItemLongClickListener((parent, view, position, id) -> {
-            final TerminalSession selectedSession = mListViewAdapter.getItem(position);
-            renameSession(selectedSession);
-            return true;
-        });
-
-        if (mTermService.getSessions().isEmpty()) {
+        if (mTermuxService.getSessions().isEmpty()) {
             if (mIsVisible) {
                 TermuxInstaller.setupIfNeeded(TermuxActivity.this, () -> {
-                    if (mTermService == null) return; // Activity might have been destroyed.
+                    if (mTermuxService == null) return; // Activity might have been destroyed.
                     try {
                         Bundle bundle = getIntent().getExtras();
                         boolean launchFailsafe = false;
                         if (bundle != null) {
                             launchFailsafe = bundle.getBoolean(TERMUX_ACTIVITY.ACTION_FAILSAFE_SESSION, false);
                         }
-                        addNewSession(launchFailsafe, null);
+                        mTermuxSessionClient.addNewSession(launchFailsafe, null);
                     } catch (WindowManager.BadTokenException e) {
                         // Activity finished - ignore.
                     }
@@ -573,182 +262,225 @@ public View getView(int position, View convertView, @NonNull ViewGroup parent) {
             if (i != null && Intent.ACTION_RUN.equals(i.getAction())) {
                 // Android 7.1 app shortcut from res/xml/shortcuts.xml.
                 boolean failSafe = i.getBooleanExtra(TERMUX_ACTIVITY.ACTION_FAILSAFE_SESSION, false);
-                addNewSession(failSafe, null);
+                mTermuxSessionClient.addNewSession(failSafe, null);
             } else {
-                switchToSession(getStoredCurrentSessionOrLast());
+                mTermuxSessionClient.setCurrentSession(mTermuxSessionClient.getCurrentStoredSessionOrLast());
             }
         }
-    }
-
-    public void switchToSession(boolean forward) {
-        TerminalSession currentSession = getCurrentTermSession();
-        int index = mTermService.getSessions().indexOf(currentSession);
-        if (forward) {
-            if (++index >= mTermService.getSessions().size()) index = 0;
-        } else {
-            if (--index < 0) index = mTermService.getSessions().size() - 1;
-        }
-        switchToSession(mTermService.getSessions().get(index));
-    }
 
-    @SuppressLint("InflateParams")
-    public void renameSession(final TerminalSession sessionToRename) {
-        if (sessionToRename == null) return;
-        DialogUtils.textInput(this, R.string.session_rename_title, sessionToRename.mSessionName, R.string.session_rename_positive_button, text -> {
-            sessionToRename.mSessionName = text;
-            mListViewAdapter.notifyDataSetChanged();
-        }, -1, null, -1, null, null);
+        // Update the {@link TerminalSession} and {@link TerminalEmulator} clients.
+        mTermuxService.setTermuxSessionClient(mTermuxSessionClient);
     }
 
     @Override
     public void onServiceDisconnected(ComponentName name) {
-        // Respect being stopped from the TermuxService notification action.
-        finishActivityIfNotFinishing();
-    }
 
-    public void finishActivityIfNotFinishing() {
-        // prevent duplicate calls to finish() if called from multiple places
-        if (!TermuxActivity.this.isFinishing()) {
-            finish();
-        }
-    }
+        Logger.logDebug(LOG_TAG, "onServiceDisconnected");
 
-    @Nullable
-    public TerminalSession getCurrentTermSession() {
-        return mTerminalView.getCurrentSession();
+        // Respect being stopped from the {@link TermuxService} notification action.
+        finishActivityIfNotFinishing();
     }
 
     @Override
-    public void onStart() {
-        super.onStart();
-        mIsVisible = true;
+    protected void onStop() {
+        super.onStop();
 
-        if (mTermService != null) {
-            // The service has connected, but data may have changed since we were last in the foreground.
-            switchToSession(getStoredCurrentSessionOrLast());
-            mListViewAdapter.notifyDataSetChanged();
-        }
+        Logger.logDebug(LOG_TAG, "onStop");
 
-        registerReceiver(mBroadcastReceiever, new IntentFilter(TERMUX_ACTIVITY.ACTION_RELOAD_STYLE));
+        mIsVisible = false;
 
-        mTerminalView.setIsTerminalViewKeyLoggingEnabled(mPreferences.getTerminalViewKeyLoggingEnabled());
+        // Store current session in shared preferences so that it can be restored later in
+        // {@link #onStart} if needed.
+        mTermuxSessionClient.setCurrentStoredSession();
 
-        // The current terminal session may have changed while being away, force
-        // a refresh of the displayed terminal:
-        mTerminalView.onScreenUpdated();
+        unregisterReceiver(mTermuxActivityBroadcastReceiever);
+        getDrawer().closeDrawers();
     }
 
     @Override
-    protected void onStop() {
-        super.onStop();
-        mIsVisible = false;
-        TerminalSession currentSession = getCurrentTermSession();
-        if (currentSession != null) mPreferences.setCurrentSession(currentSession.mHandle);
-        unregisterReceiver(mBroadcastReceiever);
-        getDrawer().closeDrawers();
+    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.unsetTermuxSessionClient();
+            mTermuxService = null;
+        }
+        unbindService(this);
     }
 
-    @SuppressLint("RtlHardcoded")
     @Override
-    public void onBackPressed() {
-        if (getDrawer().isDrawerOpen(Gravity.LEFT)) {
-            getDrawer().closeDrawers();
+    public void onSaveInstanceState(Bundle savedInstanceState) {
+        super.onSaveInstanceState(savedInstanceState);
+        saveTerminalToolbarTextInput(savedInstanceState);
+    }
+
+
+
+    private void setActivityTheme() {
+        if (mProperties.isUsingBlackUI()) {
+            this.setTheme(R.style.Theme_Termux_Black);
         } else {
-            finishActivityIfNotFinishing();
+            this.setTheme(R.style.Theme_Termux);
         }
     }
 
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-        if (mTermService != null) {
-            // Do not leave service with references to activity.
-            mTermService.mSessionChangeCallback = null;
-            mTermService = null;
+    private void setDrawerTheme() {
+        if (mProperties.isUsingBlackUI()) {
+            findViewById(R.id.left_drawer).setBackgroundColor(ContextCompat.getColor(this,
+                android.R.color.background_dark));
         }
-        unbindService(this);
     }
 
-    public DrawerLayout getDrawer() {
-        return (DrawerLayout) findViewById(R.id.drawer_layout);
-    }
 
-    public void addNewSession(boolean failSafe, String sessionName) {
-        if (mTermService.getSessions().size() >= MAX_SESSIONS) {
-            new AlertDialog.Builder(this).setTitle(R.string.max_terminals_reached_title).setMessage(R.string.max_terminals_reached_message)
-                .setPositiveButton(android.R.string.ok, null).show();
-        } else {
-            TerminalSession currentSession = getCurrentTermSession();
 
-            String workingDirectory;
-            if (currentSession == null) {
-                workingDirectory = mProperties.getDefaultWorkingDirectory();
-            } else {
-                workingDirectory = currentSession.getCwd();
-            }
+    private void setTerminalToolbarView(Bundle savedInstanceState) {
+        final ViewPager terminalToolbarViewPager = findViewById(R.id.terminal_toolbar_view_pager);
+        if (mPreferences.getShowTerminalToolbar()) terminalToolbarViewPager.setVisibility(View.VISIBLE);
 
-            TerminalSession newSession = mTermService.createTermSession(null, null, workingDirectory, failSafe);
-            if (sessionName != null) {
-                newSession.mSessionName = sessionName;
-            }
-            switchToSession(newSession);
-            getDrawer().closeDrawers();
+        ViewGroup.LayoutParams layoutParams = terminalToolbarViewPager.getLayoutParams();
+        layoutParams.height = layoutParams.height * (mProperties.getExtraKeysInfo() == null ? 0 : mProperties.getExtraKeysInfo().getMatrix().length);
+        terminalToolbarViewPager.setLayoutParams(layoutParams);
+
+        String savedTextInput = null;
+        if(savedInstanceState != null)
+            savedTextInput = savedInstanceState.getString(ARG_TERMINAL_TOOLBAR_TEXT_INPUT);
+
+        terminalToolbarViewPager.setAdapter(new TerminalToolbarViewPager.PageAdapter(this, savedTextInput));
+        terminalToolbarViewPager.addOnPageChangeListener(new TerminalToolbarViewPager.OnPageChangeListener(this, terminalToolbarViewPager));
+    }
+
+    public void toggleTerminalToolbar() {
+        final ViewPager terminalToolbarViewPager = findViewById(R.id.terminal_toolbar_view_pager);
+        final boolean showNow = mPreferences.toogleShowTerminalToolbar();
+        terminalToolbarViewPager.setVisibility(showNow ? View.VISIBLE : View.GONE);
+        if (showNow && terminalToolbarViewPager.getCurrentItem() == 1) {
+            // Focus the text input view if just revealed.
+            findViewById(R.id.terminal_toolbar_text_input).requestFocus();
         }
     }
 
-    /** Try switching to session and note about it, but do nothing if already displaying the session. */
-    public void switchToSession(TerminalSession session) {
-        if (mTerminalView.attachSession(session)) {
-            noteSessionInfo();
-            updateBackgroundColor();
+    private void saveTerminalToolbarTextInput(Bundle savedInstanceState) {
+        if(savedInstanceState == null) return;
+
+        final EditText textInputView =  findViewById(R.id.terminal_toolbar_text_input);
+        if(textInputView != null) {
+            String textInput = textInputView.getText().toString();
+            if(!textInput.isEmpty()) savedInstanceState.putString(ARG_TERMINAL_TOOLBAR_TEXT_INPUT, textInput);
         }
     }
 
-    String toToastTitle(TerminalSession session) {
-        final int indexOfSession = mTermService.getSessions().indexOf(session);
-        StringBuilder toastTitle = new StringBuilder("[" + (indexOfSession + 1) + "]");
-        if (!TextUtils.isEmpty(session.mSessionName)) {
-            toastTitle.append(" ").append(session.mSessionName);
+
+
+    private void setNewSessionButtonView() {
+        View newSessionButton = findViewById(R.id.new_session_button);
+        newSessionButton.setOnClickListener(v -> mTermuxSessionClient.addNewSession(false, null));
+        newSessionButton.setOnLongClickListener(v -> {
+            DialogUtils.textInput(TermuxActivity.this, R.string.session_new_named_title, null, R.string.session_new_named_positive_button,
+                text -> mTermuxSessionClient.addNewSession(false, text), R.string.new_session_failsafe, text -> mTermuxSessionClient.addNewSession(true, text)
+                , -1, null, null);
+            return true;
+        });
+    }
+
+    private void setToggleKeyboardView() {
+        findViewById(R.id.toggle_keyboard_button).setOnClickListener(v -> {
+            InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+            imm.toggleSoftInput(InputMethodManager.SHOW_IMPLICIT, 0);
+            getDrawer().closeDrawers();
+        });
+
+        findViewById(R.id.toggle_keyboard_button).setOnLongClickListener(v -> {
+            toggleTerminalToolbar();
+            return true;
+        });
+    }
+
+
+
+    private void setTermuxTerminalViewAndClients() {
+        // Set termux terminal view and session clients
+        mTermuxSessionClient = new TermuxSessionClient(this);
+        mTermuxViewClient = new TermuxViewClient(this, mTermuxSessionClient);
+
+        // Set termux terminal view
+        mTerminalView = findViewById(R.id.terminal_view);
+        mTerminalView.setTerminalViewClient(mTermuxViewClient);
+
+        mTerminalView.setTextSize(mPreferences.getFontSize());
+        mTerminalView.setKeepScreenOn(mPreferences.getKeepScreenOn());
+
+        // Set {@link TerminalView#TERMINAL_VIEW_KEY_LOGGING_ENABLED} value
+        mTerminalView.setIsTerminalViewKeyLoggingEnabled(mPreferences.getTerminalViewKeyLoggingEnabled());
+
+        mTerminalView.requestFocus();
+
+        mTermuxSessionClient.checkForFontAndColors();
+    }
+
+    private void setTermuxSessionsListView() {
+        ListView termuxSessionsListView = findViewById(R.id.terminal_sessions_list);
+        mTermuxSessionListViewController = new TermuxSessionsListViewController(this, mTermuxService.getSessions());
+        termuxSessionsListView.setAdapter(mTermuxSessionListViewController);
+        termuxSessionsListView.setOnItemClickListener(mTermuxSessionListViewController);
+        termuxSessionsListView.setOnItemLongClickListener(mTermuxSessionListViewController);
+    }
+
+
+
+
+
+    @SuppressLint("RtlHardcoded")
+    @Override
+    public void onBackPressed() {
+        if (getDrawer().isDrawerOpen(Gravity.LEFT)) {
+            getDrawer().closeDrawers();
+        } else {
+            finishActivityIfNotFinishing();
         }
-        String title = session.getTitle();
-        if (!TextUtils.isEmpty(title)) {
-            // Space to "[${NR}] or newline after session name:
-            toastTitle.append(session.mSessionName == null ? " " : "\n");
-            toastTitle.append(title);
+    }
+
+    public void finishActivityIfNotFinishing() {
+        // prevent duplicate calls to finish() if called from multiple places
+        if (!TermuxActivity.this.isFinishing()) {
+            finish();
         }
-        return toastTitle.toString();
     }
 
-    void noteSessionInfo() {
-        if (!mIsVisible) return;
-        TerminalSession session = getCurrentTermSession();
-        final int indexOfSession = mTermService.getSessions().indexOf(session);
-        showToast(toToastTitle(session), false);
-        mListViewAdapter.notifyDataSetChanged();
-        final ListView lv = findViewById(R.id.left_drawer_list);
-        lv.setItemChecked(indexOfSession, true);
-        lv.smoothScrollToPosition(indexOfSession);
+    /** Show a toast and dismiss the last one if still visible. */
+    public void showToast(String text, boolean longDuration) {
+        if (mLastToast != null) mLastToast.cancel();
+        mLastToast = Toast.makeText(TermuxActivity.this, text, longDuration ? Toast.LENGTH_LONG : Toast.LENGTH_SHORT);
+        mLastToast.setGravity(Gravity.TOP, 0, 0);
+        mLastToast.show();
     }
 
+
+
     @Override
     public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
-        TerminalSession currentSession = getCurrentTermSession();
+        TerminalSession currentSession = getCurrentSession();
         if (currentSession == null) return;
 
-        menu.add(Menu.NONE, CONTEXTMENU_SELECT_URL_ID, Menu.NONE, R.string.select_url);
-        menu.add(Menu.NONE, CONTEXTMENU_SHARE_TRANSCRIPT_ID, Menu.NONE, R.string.select_all_and_share);
+        boolean addAutoFillMenu = false;
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             AutofillManager autofillManager = getSystemService(AutofillManager.class);
             if (autofillManager != null && autofillManager.isEnabled()) {
-                menu.add(Menu.NONE, CONTEXTMENU_AUTOFILL_ID, Menu.NONE, R.string.autofill_password);
+                addAutoFillMenu = true;
             }
         }
-        menu.add(Menu.NONE, CONTEXTMENU_RESET_TERMINAL_ID, Menu.NONE, R.string.reset_terminal);
-        menu.add(Menu.NONE, CONTEXTMENU_KILL_PROCESS_ID, Menu.NONE, getResources().getString(R.string.kill_process, getCurrentTermSession().getPid())).setEnabled(currentSession.isRunning());
-        menu.add(Menu.NONE, CONTEXTMENU_STYLING_ID, Menu.NONE, R.string.style_terminal);
-        menu.add(Menu.NONE, CONTEXTMENU_TOGGLE_KEEP_SCREEN_ON, Menu.NONE, R.string.toggle_keep_screen_on).setCheckable(true).setChecked(mPreferences.getKeepScreenOn());
-        menu.add(Menu.NONE, CONTEXTMENU_HELP_ID, Menu.NONE, R.string.help);
-        menu.add(Menu.NONE, CONTEXTMENU_SETTINGS_ID, Menu.NONE, R.string.settings);
+
+        menu.add(Menu.NONE, CONTEXT_MENU_SELECT_URL_ID, Menu.NONE, R.string.select_url);
+        menu.add(Menu.NONE, CONTEXT_MENU_SHARE_TRANSCRIPT_ID, Menu.NONE, R.string.select_all_and_share);
+        if (addAutoFillMenu) menu.add(Menu.NONE, CONTEXT_MENU_AUTOFILL_ID, Menu.NONE, R.string.autofill_password);
+        menu.add(Menu.NONE, CONTEXT_MENU_RESET_TERMINAL_ID, Menu.NONE, R.string.reset_terminal);
+        menu.add(Menu.NONE, CONTEXT_MENU_KILL_PROCESS_ID, Menu.NONE, getResources().getString(R.string.kill_process, getCurrentSession().getPid())).setEnabled(currentSession.isRunning());
+        menu.add(Menu.NONE, CONTEXT_MENU_STYLING_ID, Menu.NONE, R.string.style_terminal);
+        menu.add(Menu.NONE, CONTEXT_MENU_TOGGLE_KEEP_SCREEN_ON, Menu.NONE, R.string.toggle_keep_screen_on).setCheckable(true).setChecked(mPreferences.getKeepScreenOn());
+        menu.add(Menu.NONE, CONTEXT_MENU_HELP_ID, Menu.NONE, R.string.help);
+        menu.add(Menu.NONE, CONTEXT_MENU_SETTINGS_ID, Menu.NONE, R.string.settings);
     }
 
     /** Hook system menu to show context menu instead. */
@@ -758,316 +490,215 @@ public boolean onCreateOptionsMenu(Menu menu) {
         return false;
     }
 
-    static LinkedHashSet<CharSequence> extractUrls(String text) {
-
-        StringBuilder regex_sb = new StringBuilder();
-
-        regex_sb.append("(");                       // Begin first matching group.
-        regex_sb.append("(?:");                     // Begin scheme group.
-        regex_sb.append("dav|");                    // The DAV proto.
-        regex_sb.append("dict|");                   // The DICT proto.
-        regex_sb.append("dns|");                    // The DNS proto.
-        regex_sb.append("file|");                   // File path.
-        regex_sb.append("finger|");                 // The Finger proto.
-        regex_sb.append("ftp(?:s?)|");              // The FTP proto.
-        regex_sb.append("git|");                    // The Git proto.
-        regex_sb.append("gopher|");                 // The Gopher proto.
-        regex_sb.append("http(?:s?)|");             // The HTTP proto.
-        regex_sb.append("imap(?:s?)|");             // The IMAP proto.
-        regex_sb.append("irc(?:[6s]?)|");           // The IRC proto.
-        regex_sb.append("ip[fn]s|");                // The IPFS proto.
-        regex_sb.append("ldap(?:s?)|");             // The LDAP proto.
-        regex_sb.append("pop3(?:s?)|");             // The POP3 proto.
-        regex_sb.append("redis(?:s?)|");            // The Redis proto.
-        regex_sb.append("rsync|");                  // The Rsync proto.
-        regex_sb.append("rtsp(?:[su]?)|");          // The RTSP proto.
-        regex_sb.append("sftp|");                   // The SFTP proto.
-        regex_sb.append("smb(?:s?)|");              // The SAMBA proto.
-        regex_sb.append("smtp(?:s?)|");             // The SMTP proto.
-        regex_sb.append("svn(?:(?:\\+ssh)?)|");     // The Subversion proto.
-        regex_sb.append("tcp|");                    // The TCP proto.
-        regex_sb.append("telnet|");                 // The Telnet proto.
-        regex_sb.append("tftp|");                   // The TFTP proto.
-        regex_sb.append("udp|");                    // The UDP proto.
-        regex_sb.append("vnc|");                    // The VNC proto.
-        regex_sb.append("ws(?:s?)");                // The Websocket proto.
-        regex_sb.append(")://");                    // End scheme group.
-        regex_sb.append(")");                       // End first matching group.
-
-
-        // Begin second matching group.
-        regex_sb.append("(");
-
-        // User name and/or password in format 'user:pass@'.
-        regex_sb.append("(?:\\S+(?::\\S*)?@)?");
-
-        // Begin host group.
-        regex_sb.append("(?:");
-
-        // IP address (from http://www.regular-expressions.info/examples.html).
-        regex_sb.append("(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)|");
-
-        // Host name or domain.
-        regex_sb.append("(?:(?:[a-z\\u00a1-\\uffff0-9]-*)*[a-z\\u00a1-\\uffff0-9]+)(?:(?:\\.(?:[a-z\\u00a1-\\uffff0-9]-*)*[a-z\\u00a1-\\uffff0-9]+)*(?:\\.(?:[a-z\\u00a1-\\uffff]{2,})))?|");
-
-        // Just path. Used in case of 'file://' scheme.
-        regex_sb.append("/(?:(?:[a-z\\u00a1-\\uffff0-9]-*)*[a-z\\u00a1-\\uffff0-9]+)");
-
-        // End host group.
-        regex_sb.append(")");
-
-        // Port number.
-        regex_sb.append("(?::\\d{1,5})?");
-
-        // Resource path with optional query string.
-        regex_sb.append("(?:/[a-zA-Z0-9:@%\\-._~!$&()*+,;=?/]*)?");
-
-        // Fragment.
-        regex_sb.append("(?:#[a-zA-Z0-9:@%\\-._~!$&()*+,;=?/]*)?");
-
-        // End second matching group.
-        regex_sb.append(")");
-
-        final Pattern urlPattern = Pattern.compile(
-            regex_sb.toString(),
-            Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL);
-
-        LinkedHashSet<CharSequence> urlSet = new LinkedHashSet<>();
-        Matcher matcher = urlPattern.matcher(text);
-
-        while (matcher.find()) {
-            int matchStart = matcher.start(1);
-            int matchEnd = matcher.end();
-            String url = text.substring(matchStart, matchEnd);
-            urlSet.add(url);
-        }
-
-        return urlSet;
-    }
-
-    public void showUrlSelection() {
-        String text = null;
-        if (getCurrentTermSession() != null) {
-            text = getCurrentTermSession().getEmulator().getScreen().getTranscriptTextWithFullLinesJoined();
-        }
-        LinkedHashSet<CharSequence> urlSet = extractUrls(text);
-        if (urlSet.isEmpty()) {
-            new AlertDialog.Builder(this).setMessage(R.string.select_url_no_found).show();
-            return;
-        }
-
-        final CharSequence[] urls = urlSet.toArray(new CharSequence[0]);
-        Collections.reverse(Arrays.asList(urls)); // Latest first.
-
-        // Click to copy url to clipboard:
-        final AlertDialog dialog = new AlertDialog.Builder(TermuxActivity.this).setItems(urls, (di, which) -> {
-            String url = (String) urls[which];
-            ClipboardManager clipboard = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
-            clipboard.setPrimaryClip(new ClipData(null, new String[]{"text/plain"}, new ClipData.Item(url)));
-            Toast.makeText(TermuxActivity.this, R.string.select_url_copied_to_clipboard, Toast.LENGTH_LONG).show();
-        }).setTitle(R.string.select_url_dialog_title).create();
-
-        // Long press to open URL:
-        dialog.setOnShowListener(di -> {
-            ListView lv = dialog.getListView(); // this is a ListView with your "buds" in it
-            lv.setOnItemLongClickListener((parent, view, position, id) -> {
-                dialog.dismiss();
-                String url = (String) urls[position];
-                Intent i = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
-                try {
-                    startActivity(i, null);
-                } catch (ActivityNotFoundException e) {
-                    // If no applications match, Android displays a system message.
-                    startActivity(Intent.createChooser(i, null));
-                }
-                return true;
-            });
-        });
-
-        dialog.show();
-    }
-
     @Override
     public boolean onContextItemSelected(MenuItem item) {
-        TerminalSession session = getCurrentTermSession();
+        TerminalSession session = getCurrentSession();
 
         switch (item.getItemId()) {
-            case CONTEXTMENU_SELECT_URL_ID:
-                showUrlSelection();
+            case CONTEXT_MENU_SELECT_URL_ID:
+                mTermuxViewClient.showUrlSelection();
                 return true;
-            case CONTEXTMENU_SHARE_TRANSCRIPT_ID:
-                if (session != null) {
-                    Intent intent = new Intent(Intent.ACTION_SEND);
-                    intent.setType("text/plain");
-                    String transcriptText = session.getEmulator().getScreen().getTranscriptTextWithoutJoinedLines().trim();
-                    // See https://github.com/termux/termux-app/issues/1166.
-                    final int MAX_LENGTH = 100_000;
-                    if (transcriptText.length() > MAX_LENGTH) {
-                        int cutOffIndex = transcriptText.length() - MAX_LENGTH;
-                        int nextNewlineIndex = transcriptText.indexOf('\n', cutOffIndex);
-                        if (nextNewlineIndex != -1 && nextNewlineIndex != transcriptText.length() - 1) {
-                            cutOffIndex = nextNewlineIndex + 1;
-                        }
-                        transcriptText = transcriptText.substring(cutOffIndex).trim();
-                    }
-                    intent.putExtra(Intent.EXTRA_TEXT, transcriptText);
-                    intent.putExtra(Intent.EXTRA_SUBJECT, getString(R.string.share_transcript_title));
-                    startActivity(Intent.createChooser(intent, getString(R.string.share_transcript_chooser_title)));
-                }
+            case CONTEXT_MENU_SHARE_TRANSCRIPT_ID:
+                mTermuxViewClient.shareSessionTranscript();
                 return true;
-            case CONTEXTMENU_PASTE_ID:
-                doPaste();
+            case CONTEXT_MENU_PASTE_ID:
+                mTermuxViewClient.doPaste();
                 return true;
-            case CONTEXTMENU_KILL_PROCESS_ID:
-                final AlertDialog.Builder b = new AlertDialog.Builder(this);
-                final TerminalSession terminalSession = getCurrentTermSession();
-                if (terminalSession == null) return true;
-
-                b.setIcon(android.R.drawable.ic_dialog_alert);
-                b.setMessage(R.string.confirm_kill_process);
-                b.setPositiveButton(android.R.string.yes, (dialog, id) -> {
-                    dialog.dismiss();
-                    terminalSession.finishIfRunning();
-                });
-                b.setNegativeButton(android.R.string.no, null);
-                b.show();
+            case CONTEXT_MENU_KILL_PROCESS_ID:
+                showKillSessionDialog(session);
                 return true;
-            case CONTEXTMENU_RESET_TERMINAL_ID: {
-                if (session != null) {
-                    session.reset();
-                    showToast(getResources().getString(R.string.reset_toast_notification), true);
-                }
+            case CONTEXT_MENU_RESET_TERMINAL_ID:
+                resetSession(session);
                 return true;
-            }
-            case CONTEXTMENU_STYLING_ID: {
-                Intent stylingIntent = new Intent();
-                stylingIntent.setClassName(TermuxConstants.TERMUX_STYLING_PACKAGE_NAME, TermuxConstants.TERMUX_STYLING.TERMUX_STYLING_ACTIVITY_NAME);
-                try {
-                    startActivity(stylingIntent);
-                } catch (ActivityNotFoundException | IllegalArgumentException e) {
-                    // The startActivity() call is not documented to throw IllegalArgumentException.
-                    // However, crash reporting shows that it sometimes does, so catch it here.
-                    new AlertDialog.Builder(this).setMessage(getString(R.string.styling_not_installed))
-                        .setPositiveButton(R.string.styling_install, (dialog, which) -> startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://f-droid.org/en/packages/" + TermuxConstants.TERMUX_STYLING_PACKAGE_NAME + " /")))).setNegativeButton(android.R.string.cancel, null).show();
-                }
+            case CONTEXT_MENU_STYLING_ID:
+                showStylingDialog();
                 return true;
-            }
-            case CONTEXTMENU_HELP_ID:
+            case CONTEXT_MENU_HELP_ID:
                 startActivity(new Intent(this, TermuxHelpActivity.class));
                 return true;
-            case CONTEXTMENU_SETTINGS_ID:
+            case CONTEXT_MENU_SETTINGS_ID:
                 startActivity(new Intent(this, TermuxSettingsActivity.class));
                 return true;
-            case CONTEXTMENU_TOGGLE_KEEP_SCREEN_ON: {
-                if(mTerminalView.getKeepScreenOn()) {
-                    mTerminalView.setKeepScreenOn(false);
-                    mPreferences.setKeepScreenOn(false);
-                } else {
-                    mTerminalView.setKeepScreenOn(true);
-                    mPreferences.setKeepScreenOn(true);
-                }
+            case CONTEXT_MENU_TOGGLE_KEEP_SCREEN_ON:
+                toggleKeepScreenOn();
+                return true;
+            case CONTEXT_MENU_AUTOFILL_ID:
+                requestAutoFill();
                 return true;
-            }
-            case CONTEXTMENU_AUTOFILL_ID: {
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                    AutofillManager autofillManager = getSystemService(AutofillManager.class);
-                    if (autofillManager != null && autofillManager.isEnabled()) {
-                        autofillManager.requestAutofill(mTerminalView);
-                    }
-                }
-            }
             default:
                 return super.onContextItemSelected(item);
         }
     }
 
-    @Override
-    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
-        if (requestCode == REQUESTCODE_PERMISSION_STORAGE && grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-            TermuxInstaller.setupStorageSymlinks(this);
+    private void showKillSessionDialog(TerminalSession session) {
+        if (session == null) return;
+
+        final AlertDialog.Builder b = new AlertDialog.Builder(this);
+        b.setIcon(android.R.drawable.ic_dialog_alert);
+        b.setMessage(R.string.confirm_kill_process);
+        b.setPositiveButton(android.R.string.yes, (dialog, id) -> {
+            dialog.dismiss();
+            session.finishIfRunning();
+        });
+        b.setNegativeButton(android.R.string.no, null);
+        b.show();
+    }
+
+    private void resetSession(TerminalSession session) {
+        if (session != null) {
+            session.reset();
+            showToast(getResources().getString(R.string.reset_toast_notification), true);
         }
     }
 
-    public void changeFontSize(boolean increase) {
-        mPreferences.changeFontSize(this, increase);
-        mTerminalView.setTextSize(mPreferences.getFontSize());
+    private void showStylingDialog() {
+        Intent stylingIntent = new Intent();
+        stylingIntent.setClassName(TermuxConstants.TERMUX_STYLING_PACKAGE_NAME, TermuxConstants.TERMUX_STYLING.TERMUX_STYLING_ACTIVITY_NAME);
+        try {
+            startActivity(stylingIntent);
+        } catch (ActivityNotFoundException | IllegalArgumentException e) {
+            // The startActivity() call is not documented to throw IllegalArgumentException.
+            // However, crash reporting shows that it sometimes does, so catch it here.
+            new AlertDialog.Builder(this).setMessage(getString(R.string.styling_not_installed))
+                .setPositiveButton(R.string.styling_install, (dialog, which) -> startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://f-droid.org/en/packages/" + TermuxConstants.TERMUX_STYLING_PACKAGE_NAME + " /")))).setNegativeButton(android.R.string.cancel, null).show();
+        }
+    }
+    private void toggleKeepScreenOn() {
+        if(mTerminalView.getKeepScreenOn()) {
+            mTerminalView.setKeepScreenOn(false);
+            mPreferences.setKeepScreenOn(false);
+        } else {
+            mTerminalView.setKeepScreenOn(true);
+            mPreferences.setKeepScreenOn(true);
+        }
     }
 
-    public void doPaste() {
-        ClipboardManager clipboard = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
-        ClipData clipData = clipboard.getPrimaryClip();
-        if (clipData == null) return;
-        CharSequence paste = clipData.getItemAt(0).coerceToText(this);
-        if (!TextUtils.isEmpty(paste))
-            if (getCurrentTermSession() != null) {
-                getCurrentTermSession().getEmulator().paste(paste.toString());
+    private void requestAutoFill() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            AutofillManager autofillManager = getSystemService(AutofillManager.class);
+            if (autofillManager != null && autofillManager.isEnabled()) {
+                autofillManager.requestAutofill(mTerminalView);
             }
+        }
     }
 
-    /** The current session as stored or the last one if that does not exist. */
-    public TerminalSession getStoredCurrentSessionOrLast() {
-        TerminalSession stored = getCurrentSession(this);
-        if (stored != null) return stored;
-        List<TerminalSession> sessions = mTermService.getSessions();
-        return sessions.isEmpty() ? null : sessions.get(sessions.size() - 1);
+
+
+    /**
+     * For processes to access shared internal storage (/sdcard) we need this permission.
+     */
+    public boolean ensureStoragePermissionGranted() {
+        if (checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED) {
+            return true;
+        } else {
+            Logger.logDebug(LOG_TAG, "Storage permission not granted, requesting permission.");
+            requestPermissions(new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, REQUESTCODE_PERMISSION_STORAGE);
+            return false;
+        }
     }
 
-    private TerminalSession getCurrentSession(TermuxActivity context) {
-        String sessionHandle = mPreferences.getCurrentSession();
-        for (int i = 0, len = context.getTermService().getSessions().size(); i < len; i++) {
-            TerminalSession session = context.getTermService().getSessions().get(i);
-            if (session.mHandle.equals(sessionHandle)) return session;
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        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.logDebug(LOG_TAG, "Storage permission denied by user on request.");
         }
-        return null;
     }
 
-    /** Show a toast and dismiss the last one if still visible. */
-    void showToast(String text, boolean longDuration) {
-        if (mLastToast != null) mLastToast.cancel();
-        mLastToast = Toast.makeText(TermuxActivity.this, text, longDuration ? Toast.LENGTH_LONG : Toast.LENGTH_SHORT);
-        mLastToast.setGravity(Gravity.TOP, 0, 0);
-        mLastToast.show();
+
+
+    public int getNavBarHeight() {
+        return mNavBarHeight;
     }
 
-    public void removeFinishedSession(TerminalSession finishedSession) {
-        // Return pressed with finished session - remove it.
-        TermuxService service = mTermService;
+    public ExtraKeysView getExtraKeysView() {
+        return mExtraKeysView;
+    }
 
-        int index = service.removeTermSession(finishedSession);
-        mListViewAdapter.notifyDataSetChanged();
-        if (mTermService.getSessions().isEmpty()) {
-            // There are no sessions to show, so finish the activity.
-            finishActivityIfNotFinishing();
-        } else {
-            if (index >= service.getSessions().size()) {
-                index = service.getSessions().size() - 1;
-            }
-            switchToSession(service.getSessions().get(index));
-        }
+    public void setExtraKeysView(ExtraKeysView extraKeysView) {
+        mExtraKeysView = extraKeysView;
+    }
+
+    public DrawerLayout getDrawer() {
+        return (DrawerLayout) findViewById(R.id.drawer_layout);
+    }
+
+    public void terminalSessionListNotifyUpdated() {
+        mTermuxSessionListViewController.notifyDataSetChanged();
     }
 
     public boolean isVisible() {
         return mIsVisible;
     }
 
-    public TermuxService getTermService() {
-        return mTermService;
+
+
+    public TermuxService getTermuxService() {
+        return mTermuxService;
     }
 
     public TerminalView getTerminalView() {
         return mTerminalView;
     }
 
-    public ExtraKeysView getExtraKeysView() {
-        return mExtraKeysView;
+    public TermuxSessionClient getTermuxSessionClient() {
+        return mTermuxSessionClient;
     }
 
-    public TermuxSharedProperties getProperties() {
-        return mProperties;
+    @Nullable
+    public TerminalSession getCurrentSession() {
+        if(mTerminalView != null)
+            return mTerminalView.getCurrentSession();
+        else
+            return null;
     }
 
     public TermuxSharedPreferences getPreferences() {
         return mPreferences;
     }
 
+    public TermuxSharedProperties getProperties() {
+        return mProperties;
+    }
+
+
+
+
+    class TermuxActivityBroadcastReceiever extends BroadcastReceiver {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            if (mIsVisible) {
+                String whatToReload = intent.getStringExtra(TERMUX_ACTIVITY.EXTRA_RELOAD_STYLE);
+                Logger.logDebug(LOG_TAG, "Reloading termux style for: " + whatToReload);
+                if ("storage".equals(whatToReload)) {
+                    if (ensureStoragePermissionGranted())
+                        TermuxInstaller.setupStorageSymlinks(TermuxActivity.this);
+                    return;
+                }
+
+                if(mTermuxSessionClient!= null) {
+                    mTermuxSessionClient.checkForFontAndColors();
+                }
+
+                if(mProperties!= null) {
+                    mProperties.loadTermuxPropertiesFromDisk();
+
+                    if (mExtraKeysView != null) {
+                        mExtraKeysView.reload(mProperties.getExtraKeysInfo());
+                    }
+                }
+
+                // To change the activity and drawer theme, activity needs to be recreated.
+                // But this will destroy the activity, and will call the onCreate() again.
+                // We need to investigate if enabling this is wise, since all stored variables and
+                // views will be destroyed and bindService() will be called again. Extra keys input
+                // text will we restored since that has already been implemented. Terminal sessions
+                // and transcripts are also already preserved. Theme does change properly too.
+                // TermuxActivity.this.recreate();
+            }
+        }
+    };
+
 }
diff --git a/app/src/main/java/com/termux/app/TermuxService.java b/app/src/main/java/com/termux/app/TermuxService.java
index cc624d606c..46aebbcf71 100644
--- a/app/src/main/java/com/termux/app/TermuxService.java
+++ b/app/src/main/java/com/termux/app/TermuxService.java
@@ -24,9 +24,12 @@
 import com.termux.app.TermuxConstants.TERMUX_APP.TERMUX_ACTIVITY;
 import com.termux.app.TermuxConstants.TERMUX_APP.TERMUX_SERVICE;
 import com.termux.app.settings.preferences.TermuxSharedPreferences;
+import com.termux.app.terminal.TermuxSessionClient;
+import com.termux.app.terminal.TermuxSessionClientBase;
 import com.termux.app.utils.Logger;
+import com.termux.terminal.TerminalEmulator;
 import com.termux.terminal.TerminalSession;
-import com.termux.terminal.TerminalSession.SessionChangedCallback;
+import com.termux.terminal.TerminalSessionClient;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -44,13 +47,11 @@
  * Optionally may hold a wake and a wifi lock, in which case that is shown in the notification - see
  * {@link #buildNotification()}.
  */
-public final class TermuxService extends Service implements SessionChangedCallback {
+public final class TermuxService extends Service {
 
     private static final String NOTIFICATION_CHANNEL_ID = "termux_notification_channel";
     private static final int NOTIFICATION_ID = 1337;
 
-    private static final String LOG_TAG = "TermuxService";
-
     /** This service is only bound from inside the same process and never uses IPC. */
     class LocalBinder extends Binder {
         public final TermuxService service = TermuxService.this;
@@ -63,15 +64,23 @@ class LocalBinder extends Binder {
     /**
      * The terminal sessions which this service manages.
      * <p/>
-     * Note that this list is observed by {@link TermuxActivity#mListViewAdapter}, so any changes must be made on the UI
+     * Note that this list is observed by {@link TermuxActivity#mTermuxSessionListViewController}, so any changes must be made on the UI
      * thread and followed by a call to {@link ArrayAdapter#notifyDataSetChanged()} }.
      */
     final List<TerminalSession> mTerminalSessions = new ArrayList<>();
 
     final List<BackgroundJob> mBackgroundTasks = new ArrayList<>();
 
-    /** Note that the service may often outlive the activity, so need to clear this reference. */
-    SessionChangedCallback mSessionChangeCallback;
+    /** The full implementation of the {@link TerminalSessionClient} interface to be used by {@link TerminalSession}
+     * that holds activity references for activity related functions.
+     * Note that the service may often outlive the activity, so need to clear this reference.
+     */
+    TermuxSessionClient mTermuxSessionClient;
+
+    /** The basic implementation of the {@link TerminalSessionClient} interface to be used by {@link TerminalSession}
+     * that does not hold activity references.
+     */
+    final TermuxSessionClientBase mTermuxSessionClientBase = new TermuxSessionClientBase();;
 
     /** The wake lock and wifi lock are always acquired and released together. */
     private PowerManager.WakeLock mWakeLock;
@@ -80,6 +89,8 @@ class LocalBinder extends Binder {
     /** If the user has executed the {@link TermuxConstants.TERMUX_APP.TERMUX_SERVICE#ACTION_STOP_SERVICE} intent. */
     boolean mWantsToStop = false;
 
+    private static final String LOG_TAG = "TermuxService";
+
     @SuppressLint("Wakelock")
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
@@ -266,7 +277,7 @@ public List<TerminalSession> getSessions() {
         return mTerminalSessions;
     }
 
-    TerminalSession createTermSession(String executablePath, String[] arguments, String cwd, boolean failSafe) {
+    public TerminalSession createTermSession(String executablePath, String[] arguments, String cwd, boolean failSafe) {
         TermuxConstants.TERMUX_HOME_DIR.mkdirs();
 
         if (cwd == null || cwd.isEmpty()) cwd = TermuxConstants.TERMUX_HOME_DIR_PATH;
@@ -302,7 +313,7 @@ TerminalSession createTermSession(String executablePath, String[] arguments, Str
         args[0] = processName;
         if (processArgs.length > 1) System.arraycopy(processArgs, 1, args, 1, processArgs.length - 1);
 
-        TerminalSession session = new TerminalSession(executablePath, cwd, args, env, this);
+        TerminalSession session = new TerminalSession(executablePath, cwd, args, env, getTermuxSessionClient());
         mTerminalSessions.add(session);
         updateNotification();
 
@@ -327,35 +338,48 @@ public int removeTermSession(TerminalSession sessionToRemove) {
         return indexOfRemoved;
     }
 
-    @Override
-    public void onTitleChanged(TerminalSession changedSession) {
-        if (mSessionChangeCallback != null) mSessionChangeCallback.onTitleChanged(changedSession);
-    }
-
-    @Override
-    public void onSessionFinished(final TerminalSession finishedSession) {
-        if (mSessionChangeCallback != null)
-            mSessionChangeCallback.onSessionFinished(finishedSession);
+    /** If {@link TermuxActivity} has not bound to the {@link TermuxService} yet or is destroyed, then
+     * interface functions requiring the activity should not be available to the terminal sessions,
+     * so we just return the {@link #mTermuxSessionClientBase}. Once {@link TermuxActivity} bind
+     * callback is received, it should call {@link #setTermuxSessionClient} to set the
+     * {@link TermuxService#mTermuxSessionClient} so that further terminal sessions are directly
+     * passed the {@link TermuxSessionClient} object which fully implements the
+     * {@link TerminalSessionClient} interface.
+     *
+     * @return Returns the {@link TermuxSessionClient} if {@link TermuxActivity} has bound with
+     * {@link TermuxService}, otherwise {@link TermuxSessionClientBase}.
+     */
+    public TermuxSessionClientBase getTermuxSessionClient() {
+        if (mTermuxSessionClient != null)
+            return mTermuxSessionClient;
+        else
+            return mTermuxSessionClientBase;
     }
 
-    @Override
-    public void onTextChanged(TerminalSession changedSession) {
-        if (mSessionChangeCallback != null) mSessionChangeCallback.onTextChanged(changedSession);
-    }
+    /** This should be called when {@link TermuxActivity#onServiceConnected} is called to set the
+     * {@link TermuxService#mTermuxSessionClient} variable and update the {@link TerminalSession}
+     * and {@link TerminalEmulator} clients in case they were passed {@link TermuxSessionClientBase}
+     * earlier.
+     *
+     * @param termuxSessionClient The {@link TermuxSessionClient} object that fully
+     * implements the {@link TerminalSessionClient} interface.
+     */
+    public void setTermuxSessionClient(TermuxSessionClient termuxSessionClient) {
+        mTermuxSessionClient = termuxSessionClient;
 
-    @Override
-    public void onClipboardText(TerminalSession session, String text) {
-        if (mSessionChangeCallback != null) mSessionChangeCallback.onClipboardText(session, text);
+        for (int i = 0; i < mTerminalSessions.size(); i++)
+            mTerminalSessions.get(i).updateTerminalSessionClient(mTermuxSessionClient);
     }
 
-    @Override
-    public void onBell(TerminalSession session) {
-        if (mSessionChangeCallback != null) mSessionChangeCallback.onBell(session);
-    }
+    /** This should be called when {@link TermuxActivity} has been destroyed so that the
+     * {@link TermuxService} and {@link TerminalSession} and {@link TerminalEmulator} clients do not
+     * hold an activity references.
+     */
+    public void unsetTermuxSessionClient() {
+        mTermuxSessionClient = null;
 
-    @Override
-    public void onColorsChanged(TerminalSession session) {
-        if (mSessionChangeCallback != null) mSessionChangeCallback.onColorsChanged(session);
+        for (int i = 0; i < mTerminalSessions.size(); i++)
+            mTerminalSessions.get(i).updateTerminalSessionClient(mTermuxSessionClientBase);
     }
 
     public void onBackgroundJobExited(final BackgroundJob task) {
diff --git a/app/src/main/java/com/termux/app/settings/preferences/TermuxPreferenceConstants.java b/app/src/main/java/com/termux/app/settings/preferences/TermuxPreferenceConstants.java
index a12aa954af..1e9df39dae 100644
--- a/app/src/main/java/com/termux/app/settings/preferences/TermuxPreferenceConstants.java
+++ b/app/src/main/java/com/termux/app/settings/preferences/TermuxPreferenceConstants.java
@@ -26,9 +26,9 @@
  */
 public final class TermuxPreferenceConstants {
 
-    /** Defines the key for whether to show extra keys in termux terminal view */
-    public static final String KEY_SHOW_EXTRA_KEYS = "show_extra_keys";
-    public static final boolean DEFAULT_VALUE_SHOW_EXTRA_KEYS = true;
+    /** Defines the key for whether to show terminal toolbar containing extra keys and text input field */
+    public static final String KEY_SHOW_TERMINAL_TOOLBAR = "show_extra_keys";
+    public static final boolean DEFAULT_VALUE_SHOW_TERMINAL_TOOLBAR = true;
 
 
 
diff --git a/app/src/main/java/com/termux/app/settings/preferences/TermuxSharedPreferences.java b/app/src/main/java/com/termux/app/settings/preferences/TermuxSharedPreferences.java
index 1278dd3e89..dc54d69671 100644
--- a/app/src/main/java/com/termux/app/settings/preferences/TermuxSharedPreferences.java
+++ b/app/src/main/java/com/termux/app/settings/preferences/TermuxSharedPreferences.java
@@ -33,17 +33,17 @@ private static SharedPreferences getSharedPreferences(Context context) {
 
 
 
-    public boolean getShowExtraKeys() {
-        return mSharedPreferences.getBoolean(TermuxPreferenceConstants.KEY_SHOW_EXTRA_KEYS, TermuxPreferenceConstants.DEFAULT_VALUE_SHOW_EXTRA_KEYS);
+    public boolean getShowTerminalToolbar() {
+        return mSharedPreferences.getBoolean(TermuxPreferenceConstants.KEY_SHOW_TERMINAL_TOOLBAR, TermuxPreferenceConstants.DEFAULT_VALUE_SHOW_TERMINAL_TOOLBAR);
     }
 
-    public void setShowExtraKeys(boolean value) {
-        mSharedPreferences.edit().putBoolean(TermuxPreferenceConstants.KEY_SHOW_EXTRA_KEYS, value).apply();
+    public void setShowTerminalToolbar(boolean value) {
+        mSharedPreferences.edit().putBoolean(TermuxPreferenceConstants.KEY_SHOW_TERMINAL_TOOLBAR, value).apply();
     }
 
-    public boolean toggleShowExtraKeys() {
-        boolean currentValue = getShowExtraKeys();
-        setShowExtraKeys(!currentValue);
+    public boolean toogleShowTerminalToolbar() {
+        boolean currentValue = getShowTerminalToolbar();
+        setShowTerminalToolbar(!currentValue);
         return !currentValue;
     }
 
@@ -108,13 +108,6 @@ public void changeFontSize(Context context, boolean increase) {
         setFontSize(Integer.toString(fontSize));
     }
 
-    /**
-     * If value is not in the range [min, max], set it to either min or max.
-     */
-    static int clamp(int value, int min, int max) {
-        return Math.min(Math.max(value, min), max);
-    }
-
 
 
     public String getCurrentSession() {
@@ -152,4 +145,13 @@ public void setTerminalViewKeyLoggingEnabled(boolean value) {
         mSharedPreferences.edit().putBoolean(TermuxPreferenceConstants.KEY_TERMINAL_VIEW_KEY_LOGGING_ENABLED, value).apply();
     }
 
+
+
+    /**
+     * If value is not in the range [min, max], set it to either min or max.
+     */
+    static int clamp(int value, int min, int max) {
+        return Math.min(Math.max(value, min), max);
+    }
+
 }
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxSessionClient.java b/app/src/main/java/com/termux/app/terminal/TermuxSessionClient.java
new file mode 100644
index 0000000000..6222b0aa92
--- /dev/null
+++ b/app/src/main/java/com/termux/app/terminal/TermuxSessionClient.java
@@ -0,0 +1,315 @@
+package com.termux.app.terminal;
+
+import android.annotation.SuppressLint;
+import android.app.AlertDialog;
+import android.content.ClipData;
+import android.content.ClipboardManager;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.graphics.Typeface;
+import android.media.AudioAttributes;
+import android.media.SoundPool;
+import android.text.TextUtils;
+import android.widget.ListView;
+
+import com.termux.R;
+import com.termux.app.utils.DialogUtils;
+import com.termux.app.TermuxActivity;
+import com.termux.app.TermuxConstants;
+import com.termux.app.TermuxService;
+import com.termux.app.settings.properties.TermuxPropertyConstants;
+import com.termux.app.terminal.io.BellHandler;
+import com.termux.app.utils.Logger;
+import com.termux.terminal.TerminalColors;
+import com.termux.terminal.TerminalSession;
+import com.termux.terminal.TextStyle;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.util.List;
+import java.util.Properties;
+
+public class TermuxSessionClient extends TermuxSessionClientBase {
+
+    final TermuxActivity mActivity;
+
+    private static final int MAX_SESSIONS = 8;
+
+    final SoundPool mBellSoundPool = new SoundPool.Builder().setMaxStreams(1).setAudioAttributes(
+        new AudioAttributes.Builder().setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
+            .setUsage(AudioAttributes.USAGE_ASSISTANCE_SONIFICATION).build()).build();
+
+    int mBellSoundId;
+
+    private static final String LOG_TAG = "TermuxSessionClient";
+
+    public TermuxSessionClient(TermuxActivity activity) {
+        this.mActivity = activity;
+
+        mBellSoundId = mBellSoundPool.load(activity, R.raw.bell, 1);
+    }
+
+    @Override
+    public void onTextChanged(TerminalSession changedSession) {
+        if (!mActivity.isVisible()) return;
+
+        if (mActivity.getCurrentSession() == changedSession) mActivity.getTerminalView().onScreenUpdated();
+    }
+
+    @Override
+    public void onTitleChanged(TerminalSession updatedSession) {
+        if (!mActivity.isVisible()) return;
+
+        if (updatedSession != mActivity.getCurrentSession()) {
+            // Only show toast for other sessions than the current one, since the user
+            // probably consciously caused the title change to change in the current session
+            // and don't want an annoying toast for that.
+            mActivity.showToast(toToastTitle(updatedSession), true);
+        }
+
+        mActivity.terminalSessionListNotifyUpdated();
+    }
+
+    @Override
+    public void onSessionFinished(final TerminalSession finishedSession) {
+        if (mActivity.getTermuxService().wantsToStop()) {
+            // The service wants to stop as soon as possible.
+            mActivity.finishActivityIfNotFinishing();
+            return;
+        }
+
+        if (mActivity.isVisible() && finishedSession != mActivity.getCurrentSession()) {
+            // Show toast for non-current sessions that exit.
+            int indexOfSession = mActivity.getTermuxService().getSessions().indexOf(finishedSession);
+            // Verify that session was not removed before we got told about it finishing:
+            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 (mActivity.getTermuxService().getSessions().size() > 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) {
+                removeFinishedSession(finishedSession);
+            }
+        }
+
+        mActivity.terminalSessionListNotifyUpdated();
+    }
+
+    @Override
+    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 onBell(TerminalSession session) {
+        if (!mActivity.isVisible()) return;
+
+        switch (mActivity.getProperties().getBellBehaviour()) {
+            case TermuxPropertyConstants.IVALUE_BELL_BEHAVIOUR_VIBRATE:
+                BellHandler.getInstance(mActivity).doBell();
+                break;
+            case TermuxPropertyConstants.IVALUE_BELL_BEHAVIOUR_BEEP:
+                mBellSoundPool.play(mBellSoundId, 1.f, 1.f, 1, 0, 1.f);
+                break;
+            case TermuxPropertyConstants.IVALUE_BELL_BEHAVIOUR_IGNORE:
+                // Ignore the bell character.
+                break;
+        }
+
+    }
+
+    @Override
+    public void onColorsChanged(TerminalSession changedSession) {
+        if (mActivity.getCurrentSession() == changedSession)
+            updateBackgroundColor();
+    }
+
+
+
+    /** Try switching to session and note about it, but do nothing if already displaying the session. */
+    public void setCurrentSession(TerminalSession session) {
+        if (mActivity.getTerminalView().attachSession(session)) {
+            noteSessionInfo();
+            updateBackgroundColor();
+        }
+    }
+
+    void noteSessionInfo() {
+        if (!mActivity.isVisible()) return;
+
+        TerminalSession session = mActivity.getCurrentSession();
+        final int indexOfSession = mActivity.getTermuxService().getSessions().indexOf(session);
+        mActivity.showToast(toToastTitle(session), false);
+        mActivity.terminalSessionListNotifyUpdated();
+        final ListView lv = mActivity.findViewById(R.id.terminal_sessions_list);
+        lv.setItemChecked(indexOfSession, true);
+        lv.smoothScrollToPosition(indexOfSession);
+    }
+
+    public void switchToSession(boolean forward) {
+        TermuxService service = mActivity.getTermuxService();
+
+        TerminalSession currentSession = mActivity.getCurrentSession();
+        int index = service.getSessions().indexOf(currentSession);
+        if (forward) {
+            if (++index >= service.getSessions().size()) index = 0;
+        } else {
+            if (--index < 0) index = service.getSessions().size() - 1;
+        }
+        setCurrentSession(service.getSessions().get(index));
+    }
+
+    @SuppressLint("InflateParams")
+    public void renameSession(final TerminalSession sessionToRename) {
+        if (sessionToRename == null) return;
+
+        DialogUtils.textInput(mActivity, R.string.session_rename_title, sessionToRename.mSessionName, R.string.session_rename_positive_button, text -> {
+            sessionToRename.mSessionName = text;
+            mActivity.terminalSessionListNotifyUpdated();
+        }, -1, null, -1, null, null);
+    }
+
+    public void addNewSession(boolean failSafe, String sessionName) {
+        if (mActivity.getTermuxService().getSessions().size() >= MAX_SESSIONS) {
+            new AlertDialog.Builder(mActivity).setTitle(R.string.max_terminals_reached_title).setMessage(R.string.max_terminals_reached_message)
+                .setPositiveButton(android.R.string.ok, null).show();
+        } else {
+            TerminalSession currentSession = mActivity.getCurrentSession();
+
+            String workingDirectory;
+            if (currentSession == null) {
+                workingDirectory = mActivity.getProperties().getDefaultWorkingDirectory();
+            } else {
+                workingDirectory = currentSession.getCwd();
+            }
+
+            TerminalSession newSession = mActivity.getTermuxService().createTermSession(null, null, workingDirectory, failSafe);
+            if (sessionName != null) {
+                newSession.mSessionName = sessionName;
+            }
+            setCurrentSession(newSession);
+            mActivity.getDrawer().closeDrawers();
+        }
+    }
+
+    public void setCurrentStoredSession() {
+        TerminalSession currentSession = mActivity.getCurrentSession();
+        if (currentSession != null)
+            mActivity.getPreferences().setCurrentSession(currentSession.mHandle);
+        else
+            mActivity.getPreferences().setCurrentSession(null);
+    }
+
+    /** The current session as stored or the last one if that does not exist. */
+    public TerminalSession getCurrentStoredSessionOrLast() {
+        TerminalSession stored = getCurrentStoredSession(mActivity);
+
+        if (stored != null) {
+            // If a stored session is in the list of currently running sessions, then return it
+            return stored;
+        } else {
+            // Else return the last session currently running
+            List<TerminalSession> sessions = mActivity.getTermuxService().getSessions();
+            return sessions.isEmpty() ? null : sessions.get(sessions.size() - 1);
+        }
+    }
+
+    private TerminalSession getCurrentStoredSession(TermuxActivity context) {
+        String sessionHandle = mActivity.getPreferences().getCurrentSession();
+
+        // If no session is stored in shared preferences
+        if(sessionHandle == null)
+            return null;
+
+        // Check if the session handle found matches one of the currently running sessions
+        List<TerminalSession> sessions = context.getTermuxService().getSessions();
+        for (int i = 0, len = sessions.size(); i < len; i++) {
+            TerminalSession session = sessions.get(i);
+            if (session.mHandle.equals(sessionHandle))
+                return session;
+        }
+
+        return null;
+    }
+
+    public void removeFinishedSession(TerminalSession finishedSession) {
+        // Return pressed with finished session - remove it.
+        TermuxService service = mActivity.getTermuxService();
+
+        int index = service.removeTermSession(finishedSession);
+        mActivity.terminalSessionListNotifyUpdated();
+        if (mActivity.getTermuxService().getSessions().isEmpty()) {
+            // There are no sessions to show, so finish the activity.
+            mActivity.finishActivityIfNotFinishing();
+        } else {
+            if (index >= service.getSessions().size()) {
+                index = service.getSessions().size() - 1;
+            }
+            setCurrentSession(service.getSessions().get(index));
+        }
+    }
+
+
+
+    String toToastTitle(TerminalSession session) {
+        final int indexOfSession = mActivity.getTermuxService().getSessions().indexOf(session);
+        StringBuilder toastTitle = new StringBuilder("[" + (indexOfSession + 1) + "]");
+        if (!TextUtils.isEmpty(session.mSessionName)) {
+            toastTitle.append(" ").append(session.mSessionName);
+        }
+        String title = session.getTitle();
+        if (!TextUtils.isEmpty(title)) {
+            // Space to "[${NR}] or newline after session name:
+            toastTitle.append(session.mSessionName == null ? " " : "\n");
+            toastTitle.append(title);
+        }
+        return toastTitle.toString();
+    }
+
+
+    public void checkForFontAndColors() {
+        try {
+            File colorsFile = TermuxConstants.TERMUX_COLOR_PROPERTIES_FILE;
+            File fontFile = TermuxConstants.TERMUX_FONT_FILE;
+
+            final Properties props = new Properties();
+            if (colorsFile.isFile()) {
+                try (InputStream in = new FileInputStream(colorsFile)) {
+                    props.load(in);
+                }
+            }
+
+            TerminalColors.COLOR_SCHEME.updateWith(props);
+            TerminalSession session = mActivity.getCurrentSession();
+            if (session != null && session.getEmulator() != null) {
+                session.getEmulator().mColors.reset();
+            }
+            updateBackgroundColor();
+
+            final Typeface newTypeface = (fontFile.exists() && fontFile.length() > 0) ? Typeface.createFromFile(fontFile) : Typeface.MONOSPACE;
+            mActivity.getTerminalView().setTypeface(newTypeface);
+        } catch (Exception e) {
+            Logger.logStackTraceWithMessage(LOG_TAG, "Error in checkForFontAndColors()", e);
+        }
+    }
+
+    public void updateBackgroundColor() {
+        TerminalSession session = mActivity.getCurrentSession();
+        if (session != null && session.getEmulator() != null) {
+            mActivity.getWindow().getDecorView().setBackgroundColor(session.getEmulator().mColors.mCurrentColors[TextStyle.COLOR_INDEX_BACKGROUND]);
+        }
+    }
+
+}
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxSessionClientBase.java b/app/src/main/java/com/termux/app/terminal/TermuxSessionClientBase.java
new file mode 100644
index 0000000000..7404ed00b9
--- /dev/null
+++ b/app/src/main/java/com/termux/app/terminal/TermuxSessionClientBase.java
@@ -0,0 +1,71 @@
+package com.termux.app.terminal;
+
+import com.termux.app.utils.Logger;
+import com.termux.terminal.TerminalSession;
+import com.termux.terminal.TerminalSessionClient;
+
+public class TermuxSessionClientBase implements TerminalSessionClient {
+
+    public TermuxSessionClientBase() {
+    }
+
+    @Override
+    public void onTextChanged(TerminalSession changedSession) {
+    }
+
+    @Override
+    public void onTitleChanged(TerminalSession updatedSession) {
+    }
+
+    @Override
+    public void onSessionFinished(final TerminalSession finishedSession) {
+    }
+
+    @Override
+    public void onClipboardText(TerminalSession session, String text) {
+    }
+
+    @Override
+    public void onBell(TerminalSession session) {
+    }
+
+    @Override
+    public void onColorsChanged(TerminalSession changedSession) {
+    }
+
+    @Override
+    public void logError(String tag, String message) {
+        Logger.logError(tag, message);
+    }
+
+    @Override
+    public void logWarn(String tag, String message) {
+        Logger.logWarn(tag, message);
+    }
+
+    @Override
+    public void logInfo(String tag, String message) {
+        Logger.logInfo(tag, message);
+    }
+
+    @Override
+    public void logDebug(String tag, String message) {
+        Logger.logDebug(tag, message);
+    }
+
+    @Override
+    public void logVerbose(String tag, String message) {
+        Logger.logVerbose(tag, message);
+    }
+
+    @Override
+    public void logStackTraceWithMessage(String tag, String message, Exception e) {
+        Logger.logStackTraceWithMessage(tag, message, e);
+    }
+
+    @Override
+    public void logStackTrace(String tag, Exception e) {
+        Logger.logStackTrace(tag, e);
+    }
+
+}
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxSessionsListViewController.java b/app/src/main/java/com/termux/app/terminal/TermuxSessionsListViewController.java
new file mode 100644
index 0000000000..1216193a59
--- /dev/null
+++ b/app/src/main/java/com/termux/app/terminal/TermuxSessionsListViewController.java
@@ -0,0 +1,107 @@
+package com.termux.app.terminal;
+
+import android.annotation.SuppressLint;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.Typeface;
+import android.text.SpannableString;
+import android.text.Spanned;
+import android.text.TextUtils;
+import android.text.style.StyleSpan;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
+
+import com.termux.R;
+import com.termux.app.TermuxActivity;
+import com.termux.terminal.TerminalSession;
+
+import java.util.List;
+
+public class TermuxSessionsListViewController extends ArrayAdapter<TerminalSession> implements AdapterView.OnItemClickListener, AdapterView.OnItemLongClickListener {
+
+    final TermuxActivity mActivity;
+
+    final StyleSpan boldSpan = new StyleSpan(Typeface.BOLD);
+    final StyleSpan italicSpan = new StyleSpan(Typeface.ITALIC);
+
+    public TermuxSessionsListViewController(TermuxActivity activity, List<TerminalSession> sessionList) {
+        super(activity.getApplicationContext(), R.layout.terminal_sessions_list_item, sessionList);
+        this.mActivity = activity;
+    }
+
+    @SuppressLint("SetTextI18n")
+    @NonNull
+    @Override
+    public View getView(int position, View convertView, @NonNull ViewGroup parent) {
+        View sessionRowView = convertView;
+        if (sessionRowView == null) {
+            LayoutInflater inflater = mActivity.getLayoutInflater();
+            sessionRowView = inflater.inflate(R.layout.terminal_sessions_list_item, parent, false);
+        }
+
+        TextView sessionTitleView = sessionRowView.findViewById(R.id.session_title);
+
+        TerminalSession sessionAtRow = getItem(position);
+        if (sessionAtRow == null) {
+            sessionTitleView.setText("null session");
+            return sessionRowView;
+        }
+
+        boolean isUsingBlackUI = mActivity.getProperties().isUsingBlackUI();
+
+        if (isUsingBlackUI) {
+            sessionTitleView.setBackground(
+                ContextCompat.getDrawable(mActivity, R.drawable.selected_session_background_black)
+            );
+        }
+
+        String name = sessionAtRow.mSessionName;
+        String sessionTitle = sessionAtRow.getTitle();
+
+        String numberPart = "[" + (position + 1) + "] ";
+        String sessionNamePart = (TextUtils.isEmpty(name) ? "" : name);
+        String sessionTitlePart = (TextUtils.isEmpty(sessionTitle) ? "" : ((sessionNamePart.isEmpty() ? "" : "\n") + sessionTitle));
+
+        String fullSessionTitle = numberPart + sessionNamePart + sessionTitlePart;
+        SpannableString fullSessionTitleStyled = new SpannableString(fullSessionTitle);
+        fullSessionTitleStyled.setSpan(boldSpan, 0, numberPart.length() + sessionNamePart.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+        fullSessionTitleStyled.setSpan(italicSpan, numberPart.length() + sessionNamePart.length(), fullSessionTitle.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+
+        sessionTitleView.setText(fullSessionTitleStyled);
+
+        boolean sessionRunning = sessionAtRow.isRunning();
+
+        if (sessionRunning) {
+            sessionTitleView.setPaintFlags(sessionTitleView.getPaintFlags() & ~Paint.STRIKE_THRU_TEXT_FLAG);
+        } else {
+            sessionTitleView.setPaintFlags(sessionTitleView.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG);
+        }
+        int defaultColor = isUsingBlackUI ? Color.WHITE : Color.BLACK;
+        int color = sessionRunning || sessionAtRow.getExitStatus() == 0 ? defaultColor : Color.RED;
+        sessionTitleView.setTextColor(color);
+        return sessionRowView;
+    }
+
+    @Override
+    public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+        TerminalSession clickedSession = getItem(position);
+        mActivity.getTermuxSessionClient().setCurrentSession(clickedSession);
+        mActivity.getDrawer().closeDrawers();
+
+    }
+
+    @Override
+    public boolean onItemLongClick(AdapterView<?> parent, View view, int position, long id) {
+        final TerminalSession selectedSession = getItem(position);
+        mActivity.getTermuxSessionClient().renameSession(selectedSession);
+        return true;
+    }
+
+}
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxViewClient.java b/app/src/main/java/com/termux/app/terminal/TermuxViewClient.java
index 8d49b6dfdf..2025b3d369 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxViewClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxViewClient.java
@@ -1,45 +1,62 @@
 package com.termux.app.terminal;
 
 import android.annotation.SuppressLint;
+import android.app.AlertDialog;
+import android.content.ActivityNotFoundException;
+import android.content.ClipData;
+import android.content.ClipboardManager;
 import android.content.Context;
+import android.content.Intent;
 import android.media.AudioManager;
+import android.net.Uri;
+import android.text.TextUtils;
 import android.view.Gravity;
 import android.view.InputDevice;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.inputmethod.InputMethodManager;
+import android.widget.ListView;
+import android.widget.Toast;
 
+import com.termux.R;
 import com.termux.app.TermuxActivity;
 import com.termux.app.TermuxService;
-import com.termux.app.terminal.extrakeys.ExtraKeysView;
+import com.termux.app.terminal.io.KeyboardShortcut;
+import com.termux.app.terminal.io.extrakeys.ExtraKeysView;
 import com.termux.app.settings.properties.TermuxPropertyConstants;
+import com.termux.app.utils.TextDataUtils;
 import com.termux.app.utils.Logger;
 import com.termux.terminal.KeyHandler;
 import com.termux.terminal.TerminalEmulator;
 import com.termux.terminal.TerminalSession;
 import com.termux.view.TerminalViewClient;
 
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.LinkedHashSet;
 import java.util.List;
 
-
 import androidx.drawerlayout.widget.DrawerLayout;
 
-public final class TermuxViewClient implements TerminalViewClient {
+public class TermuxViewClient implements TerminalViewClient {
 
     final TermuxActivity mActivity;
 
+    final TermuxSessionClient mTermuxSessionClient;
+
     /** Keeping track of the special keys acting as Ctrl and Fn for the soft keyboard and other hardware keys. */
     boolean mVirtualControlKeyDown, mVirtualFnKeyDown;
 
-    public TermuxViewClient(TermuxActivity activity) {
+    public TermuxViewClient(TermuxActivity activity, TermuxSessionClient termuxSessionClient) {
         this.mActivity = activity;
+        this.mTermuxSessionClient = termuxSessionClient;
     }
 
     @Override
     public float onScale(float scale) {
         if (scale < 0.9f || scale > 1.1f) {
             boolean increase = scale > 1.f;
-            mActivity.changeFontSize(increase);
+            changeFontSize(increase);
             return 1.0f;
         }
         return scale;
@@ -84,16 +101,16 @@ public boolean onKeyDown(int keyCode, KeyEvent e, TerminalSession currentSession
         if (handleVirtualKeys(keyCode, e, true)) return true;
 
         if (keyCode == KeyEvent.KEYCODE_ENTER && !currentSession.isRunning()) {
-            mActivity.removeFinishedSession(currentSession);
+            mTermuxSessionClient.removeFinishedSession(currentSession);
             return true;
         } else if (e.isCtrlPressed() && e.isAltPressed()) {
             // Get the unmodified code point:
             int unicodeChar = e.getUnicodeChar(0);
 
             if (keyCode == KeyEvent.KEYCODE_DPAD_DOWN || unicodeChar == 'n'/* next */) {
-                mActivity.switchToSession(true);
+                mTermuxSessionClient.switchToSession(true);
             } else if (keyCode == KeyEvent.KEYCODE_DPAD_UP || unicodeChar == 'p' /* previous */) {
-                mActivity.switchToSession(false);
+                mTermuxSessionClient.switchToSession(false);
             } else if (keyCode == KeyEvent.KEYCODE_DPAD_RIGHT) {
                 mActivity.getDrawer().openDrawer(Gravity.LEFT);
             } else if (keyCode == KeyEvent.KEYCODE_DPAD_LEFT) {
@@ -104,24 +121,24 @@ public boolean onKeyDown(int keyCode, KeyEvent e, TerminalSession currentSession
             } else if (unicodeChar == 'm'/* menu */) {
                 mActivity.getTerminalView().showContextMenu();
             } else if (unicodeChar == 'r'/* rename */) {
-                mActivity.renameSession(currentSession);
+                mTermuxSessionClient.renameSession(currentSession);
             } else if (unicodeChar == 'c'/* create */) {
-                mActivity.addNewSession(false, null);
+                mTermuxSessionClient.addNewSession(false, null);
             } else if (unicodeChar == 'u' /* urls */) {
-                mActivity.showUrlSelection();
+                showUrlSelection();
             } else if (unicodeChar == 'v') {
-                mActivity.doPaste();
+                doPaste();
             } else if (unicodeChar == '+' || e.getUnicodeChar(KeyEvent.META_SHIFT_ON) == '+') {
                 // We also check for the shifted char here since shift may be required to produce '+',
                 // see https://github.com/termux/termux-api/issues/2
-                mActivity.changeFontSize(true);
+                changeFontSize(true);
             } else if (unicodeChar == '-') {
-                mActivity.changeFontSize(false);
+                changeFontSize(false);
             } else if (unicodeChar >= '1' && unicodeChar <= '9') {
                 int num = unicodeChar - '1';
-                TermuxService service = mActivity.getTermService();
+                TermuxService service = mActivity.getTermuxService();
                 if (service.getSessions().size() > num)
-                    mActivity.switchToSession(service.getSessions().get(num));
+                    mTermuxSessionClient.setCurrentSession(service.getSessions().get(num));
             }
             return true;
         }
@@ -262,7 +279,7 @@ public boolean onCodePoint(final int codePoint, boolean ctrlDown, TerminalSessio
                 // Writing mode:
                 case 'q':
                 case 'k':
-                    mActivity.toggleShowExtraKeys();
+                    mActivity.toggleTerminalToolbar();
                     mVirtualFnKeyDown=false; // force disable fn key down to restore keyboard input into terminal view, fixes termux/termux-app#1420
                     break;
             }
@@ -276,7 +293,7 @@ public boolean onCodePoint(final int codePoint, boolean ctrlDown, TerminalSessio
             return true;
         } else if (ctrlDown) {
             if (codePoint == 106 /* Ctrl+j or \n */ && !session.isRunning()) {
-                mActivity.removeFinishedSession(session);
+                mTermuxSessionClient.removeFinishedSession(session);
                 return true;
             }
 
@@ -288,16 +305,16 @@ public boolean onCodePoint(final int codePoint, boolean ctrlDown, TerminalSessio
                     if (codePointLowerCase == shortcut.codePoint) {
                         switch (shortcut.shortcutAction) {
                             case TermuxPropertyConstants.ACTION_SHORTCUT_CREATE_SESSION:
-                                mActivity.addNewSession(false, null);
+                                mTermuxSessionClient.addNewSession(false, null);
                                 return true;
                             case TermuxPropertyConstants.ACTION_SHORTCUT_NEXT_SESSION:
-                                mActivity.switchToSession(true);
+                                mTermuxSessionClient.switchToSession(true);
                                 return true;
                             case TermuxPropertyConstants.ACTION_SHORTCUT_PREVIOUS_SESSION:
-                                mActivity.switchToSession(false);
+                                mTermuxSessionClient.switchToSession(false);
                                 return true;
                             case TermuxPropertyConstants.ACTION_SHORTCUT_RENAME_SESSION:
-                                mActivity.renameSession(mActivity.getCurrentTermSession());
+                                mTermuxSessionClient.renameSession(mActivity.getCurrentSession());
                                 return true;
                         }
                     }
@@ -310,6 +327,90 @@ public boolean onCodePoint(final int codePoint, boolean ctrlDown, TerminalSessio
 
 
 
+    public void changeFontSize(boolean increase) {
+        mActivity.getPreferences().changeFontSize(mActivity, increase);
+        mActivity.getTerminalView().setTextSize(mActivity.getPreferences().getFontSize());
+    }
+
+
+
+    public void shareSessionTranscript() {
+        TerminalSession session = mActivity.getCurrentSession();
+        if (session == null) return;
+
+        String transcriptText = session.getEmulator().getScreen().getTranscriptTextWithoutJoinedLines().trim();
+
+        try {
+            // See https://github.com/termux/termux-app/issues/1166.
+            Intent intent = new Intent(Intent.ACTION_SEND);
+            intent.setType("text/plain");
+            transcriptText = TextDataUtils.getTruncatedCommandOutput(transcriptText, 100_000);
+            intent.putExtra(Intent.EXTRA_TEXT, transcriptText);
+            intent.putExtra(Intent.EXTRA_SUBJECT, mActivity.getString(R.string.share_transcript_title));
+            mActivity.startActivity(Intent.createChooser(intent, mActivity.getString(R.string.share_transcript_chooser_title)));
+        } catch (Exception e) {
+            Logger.logStackTraceWithMessage("Failed to get share session transcript of length " + transcriptText.length(), e);
+        }
+    }
+
+    public void showUrlSelection() {
+        TerminalSession session = mActivity.getCurrentSession();
+        if (session == null) return;
+
+        String text = session.getEmulator().getScreen().getTranscriptTextWithFullLinesJoined();
+
+        LinkedHashSet<CharSequence> urlSet = TextDataUtils.extractUrls(text);
+        if (urlSet.isEmpty()) {
+            new AlertDialog.Builder(mActivity).setMessage(R.string.select_url_no_found).show();
+            return;
+        }
+
+        final CharSequence[] urls = urlSet.toArray(new CharSequence[0]);
+        Collections.reverse(Arrays.asList(urls)); // Latest first.
+
+        // Click to copy url to clipboard:
+        final AlertDialog dialog = new AlertDialog.Builder(mActivity).setItems(urls, (di, which) -> {
+            String url = (String) urls[which];
+            ClipboardManager clipboard = (ClipboardManager) mActivity.getSystemService(Context.CLIPBOARD_SERVICE);
+            clipboard.setPrimaryClip(new ClipData(null, new String[]{"text/plain"}, new ClipData.Item(url)));
+            Toast.makeText(mActivity, R.string.select_url_copied_to_clipboard, Toast.LENGTH_LONG).show();
+        }).setTitle(R.string.select_url_dialog_title).create();
+
+        // Long press to open URL:
+        dialog.setOnShowListener(di -> {
+            ListView lv = dialog.getListView(); // this is a ListView with your "buds" in it
+            lv.setOnItemLongClickListener((parent, view, position, id) -> {
+                dialog.dismiss();
+                String url = (String) urls[position];
+                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;
+            });
+        });
+
+        dialog.show();
+    }
+
+    public void doPaste() {
+        TerminalSession session = mActivity.getCurrentSession();
+        if (session == null) return;
+        if (!session.isRunning()) return;
+
+        ClipboardManager clipboard = (ClipboardManager) mActivity.getSystemService(Context.CLIPBOARD_SERVICE);
+        ClipData clipData = clipboard.getPrimaryClip();
+        if (clipData == null) return;
+        CharSequence paste = clipData.getItemAt(0).coerceToText(mActivity);
+        if (!TextUtils.isEmpty(paste))
+            session.getEmulator().paste(paste.toString());
+    }
+
+
+
     @Override
     public void logError(String tag, String message) {
         Logger.logError(tag, message);
diff --git a/app/src/main/java/com/termux/app/terminal/io/TerminalToolbarViewPager.java b/app/src/main/java/com/termux/app/terminal/io/TerminalToolbarViewPager.java
new file mode 100644
index 0000000000..e53fbbcd07
--- /dev/null
+++ b/app/src/main/java/com/termux/app/terminal/io/TerminalToolbarViewPager.java
@@ -0,0 +1,114 @@
+package com.termux.app.terminal.io;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.EditText;
+
+import androidx.annotation.NonNull;
+import androidx.viewpager.widget.PagerAdapter;
+import androidx.viewpager.widget.ViewPager;
+
+import com.termux.R;
+import com.termux.app.TermuxActivity;
+import com.termux.app.terminal.io.extrakeys.ExtraKeysView;
+import com.termux.terminal.TerminalSession;
+
+public class TerminalToolbarViewPager {
+
+    public static class PageAdapter extends PagerAdapter {
+
+        final TermuxActivity mActivity;
+        String mSavedTextInput;
+
+        public PageAdapter(TermuxActivity activity, String savedTextInput) {
+            this.mActivity = activity;
+            this.mSavedTextInput = savedTextInput;
+        }
+
+        @Override
+        public int getCount() {
+            return 2;
+        }
+
+        @Override
+        public boolean isViewFromObject(@NonNull View view, @NonNull Object object) {
+            return view == object;
+        }
+
+        @NonNull
+        @Override
+        public Object instantiateItem(@NonNull ViewGroup collection, int position) {
+            LayoutInflater inflater = LayoutInflater.from(mActivity);
+            View layout;
+            if (position == 0) {
+                layout = inflater.inflate(R.layout.terminal_toolbar_extra_keys_view, collection, false);
+                ExtraKeysView extraKeysView = (ExtraKeysView) layout;
+                mActivity.setExtraKeysView(extraKeysView);
+                extraKeysView.reload(mActivity.getProperties().getExtraKeysInfo());
+
+                // apply extra keys fix if enabled in prefs
+                if (mActivity.getProperties().isUsingFullScreen() && mActivity.getProperties().isUsingFullScreenWorkAround()) {
+                    FullScreenWorkAround.apply(mActivity);
+                }
+
+            } else {
+                layout = inflater.inflate(R.layout.terminal_toolbar_text_input_view, collection, false);
+                final EditText editText = layout.findViewById(R.id.terminal_toolbar_text_input);
+
+                if(mSavedTextInput != null) {
+                    editText.setText(mSavedTextInput);
+                    mSavedTextInput = null;
+                }
+
+                editText.setOnEditorActionListener((v, actionId, event) -> {
+                    TerminalSession session = mActivity.getCurrentSession();
+                    if (session != null) {
+                        if (session.isRunning()) {
+                            String textToSend = editText.getText().toString();
+                            if (textToSend.length() == 0) textToSend = "\r";
+                            session.write(textToSend);
+                        } else {
+                            mActivity.getTermuxSessionClient().removeFinishedSession(session);
+                        }
+                        editText.setText("");
+                    }
+                    return true;
+                });
+            }
+            collection.addView(layout);
+            return layout;
+        }
+
+        @Override
+        public void destroyItem(@NonNull ViewGroup collection, int position, @NonNull Object view) {
+            collection.removeView((View) view);
+        }
+
+    }
+
+
+
+    public static class OnPageChangeListener extends ViewPager.SimpleOnPageChangeListener {
+
+        final TermuxActivity mActivity;
+        final ViewPager mTerminalToolbarViewPager;
+
+        public OnPageChangeListener(TermuxActivity activity, ViewPager viewPager) {
+            this.mActivity = activity;
+            this.mTerminalToolbarViewPager = viewPager;
+        }
+
+        @Override
+        public void onPageSelected(int position) {
+            if (position == 0) {
+                mActivity.getTerminalView().requestFocus();
+            } else {
+                final EditText editText = mTerminalToolbarViewPager.findViewById(R.id.terminal_toolbar_text_input);
+                if (editText != null) editText.requestFocus();
+            }
+        }
+
+    }
+
+}
diff --git a/app/src/main/java/com/termux/app/utils/TermuxUtils.java b/app/src/main/java/com/termux/app/utils/TermuxUtils.java
index 712b5b3ad2..db66b01a0a 100644
--- a/app/src/main/java/com/termux/app/utils/TermuxUtils.java
+++ b/app/src/main/java/com/termux/app/utils/TermuxUtils.java
@@ -1,9 +1,14 @@
 package com.termux.app.utils;
 
+import android.content.ComponentName;
 import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ResolveInfo;
 
 import com.termux.app.TermuxConstants;
 
+import java.util.List;
+
 public class TermuxUtils {
 
     public static Context getTermuxPackageContext(Context context) {
@@ -15,4 +20,26 @@ public static Context getTermuxPackageContext(Context context) {
             return context;
         }
     }
+
+    /**
+     * Send the {@link TermuxConstants#BROADCAST_TERMUX_OPENED} broadcast to notify apps that Termux
+     * app has been opened.
+     *
+     * @param context The Context to send the broadcast.
+     */
+    public static void sendTermuxOpenedBroadcast(Context context) {
+        Intent broadcast = new Intent(TermuxConstants.BROADCAST_TERMUX_OPENED);
+        List<ResolveInfo> matches = context.getPackageManager().queryBroadcastReceivers(broadcast, 0);
+
+        // send broadcast to registered Termux receivers
+        // this technique is needed to work around broadcast changes that Oreo introduced
+        for (ResolveInfo info : matches) {
+            Intent explicitBroadcast = new Intent(broadcast);
+            ComponentName cname = new ComponentName(info.activityInfo.applicationInfo.packageName,
+                info.activityInfo.name);
+            explicitBroadcast.setComponent(cname);
+            context.sendBroadcast(explicitBroadcast);
+        }
+    }
+
 }
diff --git a/app/src/main/java/com/termux/app/utils/TextDataUtils.java b/app/src/main/java/com/termux/app/utils/TextDataUtils.java
new file mode 100644
index 0000000000..e61e373cdf
--- /dev/null
+++ b/app/src/main/java/com/termux/app/utils/TextDataUtils.java
@@ -0,0 +1,111 @@
+package com.termux.app.utils;
+
+import java.util.LinkedHashSet;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class TextDataUtils {
+
+    // https://cs.android.com/androidx/platform/frameworks/support/+/androidx-main:media2/media2-session/src/main/java/androidx/media2/session/MediaUtils.java
+    public static final int TRANSACTION_SIZE_LIMIT_IN_BYTES = 256 * 1024; // 256KB
+
+    public static String getTruncatedCommandOutput(String text, int maxLength) {
+        if (text.length() > maxLength) {
+            int cutOffIndex = text.length() - maxLength;
+            int nextNewlineIndex = text.indexOf('\n', cutOffIndex);
+            if (nextNewlineIndex != -1 && nextNewlineIndex != text.length() - 1) {
+                cutOffIndex = nextNewlineIndex + 1;
+            }
+            text = text.substring(cutOffIndex).trim();
+        }
+        return text;
+    }
+
+    public static LinkedHashSet<CharSequence> extractUrls(String text) {
+
+        StringBuilder regex_sb = new StringBuilder();
+
+        regex_sb.append("(");                       // Begin first matching group.
+        regex_sb.append("(?:");                     // Begin scheme group.
+        regex_sb.append("dav|");                    // The DAV proto.
+        regex_sb.append("dict|");                   // The DICT proto.
+        regex_sb.append("dns|");                    // The DNS proto.
+        regex_sb.append("file|");                   // File path.
+        regex_sb.append("finger|");                 // The Finger proto.
+        regex_sb.append("ftp(?:s?)|");              // The FTP proto.
+        regex_sb.append("git|");                    // The Git proto.
+        regex_sb.append("gopher|");                 // The Gopher proto.
+        regex_sb.append("http(?:s?)|");             // The HTTP proto.
+        regex_sb.append("imap(?:s?)|");             // The IMAP proto.
+        regex_sb.append("irc(?:[6s]?)|");           // The IRC proto.
+        regex_sb.append("ip[fn]s|");                // The IPFS proto.
+        regex_sb.append("ldap(?:s?)|");             // The LDAP proto.
+        regex_sb.append("pop3(?:s?)|");             // The POP3 proto.
+        regex_sb.append("redis(?:s?)|");            // The Redis proto.
+        regex_sb.append("rsync|");                  // The Rsync proto.
+        regex_sb.append("rtsp(?:[su]?)|");          // The RTSP proto.
+        regex_sb.append("sftp|");                   // The SFTP proto.
+        regex_sb.append("smb(?:s?)|");              // The SAMBA proto.
+        regex_sb.append("smtp(?:s?)|");             // The SMTP proto.
+        regex_sb.append("svn(?:(?:\\+ssh)?)|");     // The Subversion proto.
+        regex_sb.append("tcp|");                    // The TCP proto.
+        regex_sb.append("telnet|");                 // The Telnet proto.
+        regex_sb.append("tftp|");                   // The TFTP proto.
+        regex_sb.append("udp|");                    // The UDP proto.
+        regex_sb.append("vnc|");                    // The VNC proto.
+        regex_sb.append("ws(?:s?)");                // The Websocket proto.
+        regex_sb.append(")://");                    // End scheme group.
+        regex_sb.append(")");                       // End first matching group.
+
+
+        // Begin second matching group.
+        regex_sb.append("(");
+
+        // User name and/or password in format 'user:pass@'.
+        regex_sb.append("(?:\\S+(?::\\S*)?@)?");
+
+        // Begin host group.
+        regex_sb.append("(?:");
+
+        // IP address (from http://www.regular-expressions.info/examples.html).
+        regex_sb.append("(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)|");
+
+        // Host name or domain.
+        regex_sb.append("(?:(?:[a-z\\u00a1-\\uffff0-9]-*)*[a-z\\u00a1-\\uffff0-9]+)(?:(?:\\.(?:[a-z\\u00a1-\\uffff0-9]-*)*[a-z\\u00a1-\\uffff0-9]+)*(?:\\.(?:[a-z\\u00a1-\\uffff]{2,})))?|");
+
+        // Just path. Used in case of 'file://' scheme.
+        regex_sb.append("/(?:(?:[a-z\\u00a1-\\uffff0-9]-*)*[a-z\\u00a1-\\uffff0-9]+)");
+
+        // End host group.
+        regex_sb.append(")");
+
+        // Port number.
+        regex_sb.append("(?::\\d{1,5})?");
+
+        // Resource path with optional query string.
+        regex_sb.append("(?:/[a-zA-Z0-9:@%\\-._~!$&()*+,;=?/]*)?");
+
+        // Fragment.
+        regex_sb.append("(?:#[a-zA-Z0-9:@%\\-._~!$&()*+,;=?/]*)?");
+
+        // End second matching group.
+        regex_sb.append(")");
+
+        final Pattern urlPattern = Pattern.compile(
+            regex_sb.toString(),
+            Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL);
+
+        LinkedHashSet<CharSequence> urlSet = new LinkedHashSet<>();
+        Matcher matcher = urlPattern.matcher(text);
+
+        while (matcher.find()) {
+            int matchStart = matcher.start(1);
+            int matchEnd = matcher.end();
+            String url = text.substring(matchStart, matchEnd);
+            urlSet.add(url);
+        }
+
+        return urlSet;
+    }
+
+}
diff --git a/app/src/main/res/layout/terminal_sessions_list_item.xml b/app/src/main/res/layout/terminal_sessions_list_item.xml
new file mode 100644
index 0000000000..61842a3708
--- /dev/null
+++ b/app/src/main/res/layout/terminal_sessions_list_item.xml
@@ -0,0 +1,9 @@
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/session_title"
+    android:layout_width="fill_parent"
+    android:layout_height="?android:attr/listPreferredItemHeight"
+    android:background="@drawable/selected_session_background"
+    android:ellipsize="marquee"
+    android:gravity="start|center_vertical"
+    android:padding="6dip"
+    android:textSize="14sp" />
diff --git a/app/src/main/res/layout/terminal_toolbar_extra_keys_view.xml b/app/src/main/res/layout/terminal_toolbar_extra_keys_view.xml
new file mode 100644
index 0000000000..fbefe1ec6e
--- /dev/null
+++ b/app/src/main/res/layout/terminal_toolbar_extra_keys_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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"
+    android:layout_height="match_parent"
+    android:layout_alignParentBottom="true"
+    android:orientation="horizontal" />
diff --git a/app/src/main/res/layout/terminal_toolbar_text_input_view.xml b/app/src/main/res/layout/terminal_toolbar_text_input_view.xml
new file mode 100644
index 0000000000..86b3ce92d3
--- /dev/null
+++ b/app/src/main/res/layout/terminal_toolbar_text_input_view.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<EditText xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/terminal_toolbar_text_input"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:imeOptions="actionSend|flagNoFullscreen"
+    android:maxLines="1"
+    android:inputType="text"
+    android:importantForAutofill="no"
+    android:textColor="@android:color/white"
+    android:textColorHighlight="@android:color/darker_gray"
+    android:paddingTop="0dp"
+    android:textCursorDrawable="@null"
+    android:paddingBottom="0dp"
+    tools:ignore="LabelFor" />
diff --git a/app/src/main/res/layout/termux_activity.xml b/app/src/main/res/layout/termux_activity.xml
new file mode 100644
index 0000000000..2faa7d3120
--- /dev/null
+++ b/app/src/main/res/layout/termux_activity.xml
@@ -0,0 +1,80 @@
+<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">
+
+    <androidx.drawerlayout.widget.DrawerLayout
+        android:id="@+id/drawer_layout"
+        android:layout_width="match_parent"
+        android:layout_alignParentTop="true"
+        android:layout_above="@+id/terminal_toolbar_view_pager"
+        android:layout_height="match_parent">
+
+        <com.termux.view.TerminalView
+            android:id="@+id/terminal_view"
+            android:layout_width="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" />
+
+        <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="0dp"
+                android:layout_gravity="top"
+                android:layout_weight="1"
+                android:choiceMode="singleChoice"
+                android:longClickable="true" />
+
+            <LinearLayout
+                style="?android:attr/buttonBarStyle"
+                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/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/new_session" />
+            </LinearLayout>
+        </LinearLayout>
+
+    </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>
diff --git a/app/src/test/java/com/termux/app/TermuxActivityTest.java b/app/src/test/java/com/termux/app/TermuxActivityTest.java
index b4f5251fce..ac5ef9093a 100644
--- a/app/src/test/java/com/termux/app/TermuxActivityTest.java
+++ b/app/src/test/java/com/termux/app/TermuxActivityTest.java
@@ -1,5 +1,7 @@
 package com.termux.app;
 
+import com.termux.app.utils.TextDataUtils;
+
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -11,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, TermuxActivity.extractUrls(text));
+        Assert.assertEquals(expected, TextDataUtils.extractUrls(text));
     }
 
     @Test
diff --git a/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java b/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
index 6aae59a319..8f449dab2d 100644
--- a/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
+++ b/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
@@ -1,7 +1,6 @@
 package com.termux.terminal;
 
 import android.util.Base64;
-import android.util.Log;
 
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
@@ -153,6 +152,8 @@ public final class TerminalEmulator {
     /** The terminal session this emulator is bound to. */
     private final TerminalOutput mSession;
 
+    TerminalSessionClient mClient;
+
     /** Keeps track of the current argument of the current escape sequence. Ranges from 0 to MAX_ESCAPE_PARAMETERS-1. */
     private int mArgIndex;
     /** Holds the arguments of the current escape sequence. */
@@ -227,6 +228,8 @@ public final class TerminalEmulator {
 
     public final TerminalColors mColors = new TerminalColors();
 
+    private static final String LOG_TAG = "TerminalEmulator";
+
     private boolean isDecsetInternalBitSet(int bit) {
         return (mCurrentDecSetFlags & bit) != 0;
     }
@@ -279,16 +282,21 @@ static int mapDecSetBitToInternalBit(int decsetBit) {
         }
     }
 
-    public TerminalEmulator(TerminalOutput session, int columns, int rows, int transcriptRows) {
+    public TerminalEmulator(TerminalOutput session, int columns, int rows, int transcriptRows, TerminalSessionClient client) {
         mSession = session;
         mScreen = mMainBuffer = new TerminalBuffer(columns, transcriptRows, rows);
         mAltBuffer = new TerminalBuffer(columns, rows, rows);
+        mClient = client;
         mRows = rows;
         mColumns = columns;
         mTabStop = new boolean[mColumns];
         reset();
     }
 
+    public void updateTerminalSessionClient(TerminalSessionClient client) {
+        mClient = client;
+    }
+
     public TerminalBuffer getScreen() {
         return mScreen;
     }
@@ -751,7 +759,7 @@ public void processCodePoint(int b) {
                                 if (internalBit != -1) {
                                     value = isDecsetInternalBitSet(internalBit) ? 1 : 2; // 1=set, 2=reset.
                                 } else {
-                                    Log.e(EmulatorDebug.LOG_TAG, "Got DECRQM for unrecognized private DEC mode=" + mode);
+                                    mClient.logError(LOG_TAG, "Got DECRQM for unrecognized private DEC mode=" + mode);
                                     value = 0; // 0=not recognized, 3=permanently set, 4=permanently reset
                                 }
                             }
@@ -888,7 +896,7 @@ private void doDeviceControl(int b) {
                                     case "&8": // Undo key - ignore.
                                         break;
                                     default:
-                                        Log.w(EmulatorDebug.LOG_TAG, "Unhandled termcap/terminfo name: '" + trans + "'");
+                                        mClient.logWarn(LOG_TAG, "Unhandled termcap/terminfo name: '" + trans + "'");
                                 }
                                 // Respond with invalid request:
                                 mSession.write("\033P0+r" + part + "\033\\");
@@ -900,12 +908,12 @@ private void doDeviceControl(int b) {
                                 mSession.write("\033P1+r" + part + "=" + hexEncoded + "\033\\");
                             }
                         } else {
-                            Log.e(EmulatorDebug.LOG_TAG, "Invalid device termcap/terminfo name of odd length: " + part);
+                            mClient.logError(LOG_TAG, "Invalid device termcap/terminfo name of odd length: " + part);
                         }
                     }
                 } else {
                     if (LOG_ESCAPE_SEQUENCES)
-                        Log.e(EmulatorDebug.LOG_TAG, "Unrecognized device control string: " + dcs);
+                        mClient.logError(LOG_TAG, "Unrecognized device control string: " + dcs);
                 }
                 finishSequence();
             }
@@ -995,7 +1003,7 @@ private void doCsiQuestionMark(int b) {
                     int externalBit = mArgs[i];
                     int internalBit = mapDecSetBitToInternalBit(externalBit);
                     if (internalBit == -1) {
-                        Log.w(EmulatorDebug.LOG_TAG, "Ignoring request to save/recall decset bit=" + externalBit);
+                        mClient.logWarn(LOG_TAG, "Ignoring request to save/recall decset bit=" + externalBit);
                     } else {
                         if (b == 's') {
                             mSavedDecSetFlags |= internalBit;
@@ -1182,7 +1190,7 @@ private void doCsiBiggerThan(int b) {
                 // (1) enables this feature for keys except for those with well-known behavior, e.g., Tab, Backarrow and
                 // some special control character cases, e.g., Control-Space to make a NUL.
                 // (2) enables this feature for keys including the exceptions listed.
-                Log.e(EmulatorDebug.LOG_TAG, "(ignored) CSI > MODIFY RESOURCE: " + getArg0(-1) + " to " + getArg1(-1));
+                mClient.logError(LOG_TAG, "(ignored) CSI > MODIFY RESOURCE: " + getArg0(-1) + " to " + getArg1(-1));
                 break;
             default:
                 parseArg(b);
@@ -1729,7 +1737,7 @@ private void selectGraphicRendition() {
                 int firstArg = mArgs[i + 1];
                 if (firstArg == 2) {
                     if (i + 4 > mArgIndex) {
-                        Log.w(EmulatorDebug.LOG_TAG, "Too few CSI" + code + ";2 RGB arguments");
+                        mClient.logWarn(LOG_TAG, "Too few CSI" + code + ";2 RGB arguments");
                     } else {
                         int red = mArgs[i + 2], green = mArgs[i + 3], blue = mArgs[i + 4];
                         if (red < 0 || green < 0 || blue < 0 || red > 255 || green > 255 || blue > 255) {
@@ -1754,7 +1762,7 @@ private void selectGraphicRendition() {
                             mBackColor = color;
                         }
                     } else {
-                        if (LOG_ESCAPE_SEQUENCES) Log.w(EmulatorDebug.LOG_TAG, "Invalid color index: " + color);
+                        if (LOG_ESCAPE_SEQUENCES) mClient.logWarn(LOG_TAG, "Invalid color index: " + color);
                     }
                 } else {
                     finishSequenceAndLogError("Invalid ISO-8613-3 SGR first argument: " + firstArg);
@@ -1771,7 +1779,7 @@ private void selectGraphicRendition() {
                 mBackColor = code - 100 + 8;
             } else {
                 if (LOG_ESCAPE_SEQUENCES)
-                    Log.w(EmulatorDebug.LOG_TAG, String.format("SGR unknown code %d", code));
+                    mClient.logWarn(LOG_TAG, String.format("SGR unknown code %d", code));
             }
         }
     }
@@ -1905,7 +1913,7 @@ private void doOscSetTextParameters(String bellOrStringTerminator) {
                     String clipboardText = new String(Base64.decode(textParameter.substring(startIndex), 0), StandardCharsets.UTF_8);
                     mSession.clipboardText(clipboardText);
                 } catch (Exception e) {
-                    Log.e(EmulatorDebug.LOG_TAG, "OSC Manipulate selection, invalid string '" + textParameter + "");
+                    mClient.logError(LOG_TAG, "OSC Manipulate selection, invalid string '" + textParameter + "");
                 }
                 break;
             case 104:
@@ -2101,7 +2109,7 @@ private void logError(String errorType) {
     }
 
     private void finishSequenceAndLogError(String error) {
-        if (LOG_ESCAPE_SEQUENCES) Log.w(EmulatorDebug.LOG_TAG, error);
+        if (LOG_ESCAPE_SEQUENCES) mClient.logWarn(LOG_TAG, error);
         finishSequence();
     }
 
diff --git a/terminal-emulator/src/main/java/com/termux/terminal/TerminalSession.java b/terminal-emulator/src/main/java/com/termux/terminal/TerminalSession.java
index a0c5b855b6..3ebb793ff1 100644
--- a/terminal-emulator/src/main/java/com/termux/terminal/TerminalSession.java
+++ b/terminal-emulator/src/main/java/com/termux/terminal/TerminalSession.java
@@ -6,7 +6,6 @@
 import android.system.ErrnoException;
 import android.system.Os;
 import android.system.OsConstants;
-import android.util.Log;
 
 import java.io.File;
 import java.io.FileDescriptor;
@@ -31,41 +30,6 @@
  */
 public final class TerminalSession extends TerminalOutput {
 
-    /** Callback to be invoked when a {@link TerminalSession} changes. */
-    public interface SessionChangedCallback {
-        void onTextChanged(TerminalSession changedSession);
-
-        void onTitleChanged(TerminalSession changedSession);
-
-        void onSessionFinished(TerminalSession finishedSession);
-
-        void onClipboardText(TerminalSession session, String text);
-
-        void onBell(TerminalSession session);
-
-        void onColorsChanged(TerminalSession session);
-
-    }
-
-    private static FileDescriptor wrapFileDescriptor(int fileDescriptor) {
-        FileDescriptor result = new FileDescriptor();
-        try {
-            Field descriptorField;
-            try {
-                descriptorField = FileDescriptor.class.getDeclaredField("descriptor");
-            } catch (NoSuchFieldException e) {
-                // For desktop java:
-                descriptorField = FileDescriptor.class.getDeclaredField("fd");
-            }
-            descriptorField.setAccessible(true);
-            descriptorField.set(result, fileDescriptor);
-        } catch (NoSuchFieldException | IllegalAccessException | IllegalArgumentException e) {
-            Log.wtf(EmulatorDebug.LOG_TAG, "Error accessing FileDescriptor#descriptor private field", e);
-            System.exit(1);
-        }
-        return result;
-    }
-
     private static final int MSG_NEW_INPUT = 1;
     private static final int MSG_PROCESS_EXITED = 4;
 
@@ -87,7 +51,7 @@ private static FileDescriptor wrapFileDescriptor(int fileDescriptor) {
     private final byte[] mUtf8InputBuffer = new byte[5];
 
     /** Callback which gets notified when a session finishes or changes title. */
-    final SessionChangedCallback mChangeCallback;
+    TerminalSessionClient mClient;
 
     /** The pid of the shell process. 0 if not started and -1 if finished running. */
     int mShellPid;
@@ -104,52 +68,32 @@ private static FileDescriptor wrapFileDescriptor(int fileDescriptor) {
     /** Set by the application for user identification of session, not by terminal. */
     public String mSessionName;
 
-    @SuppressLint("HandlerLeak")
-    final Handler mMainThreadHandler = new Handler() {
-        final byte[] mReceiveBuffer = new byte[4 * 1024];
-
-        @Override
-        public void handleMessage(Message msg) {
-            int bytesRead = mProcessToTerminalIOQueue.read(mReceiveBuffer, false);
-            if (bytesRead > 0) {
-                mEmulator.append(mReceiveBuffer, bytesRead);
-                notifyScreenUpdate();
-            }
-
-            if (msg.what == MSG_PROCESS_EXITED) {
-                int exitCode = (Integer) msg.obj;
-                cleanupResources(exitCode);
-                mChangeCallback.onSessionFinished(TerminalSession.this);
-
-                String exitDescription = "\r\n[Process completed";
-                if (exitCode > 0) {
-                    // Non-zero process exit.
-                    exitDescription += " (code " + exitCode + ")";
-                } else if (exitCode < 0) {
-                    // Negated signal.
-                    exitDescription += " (signal " + (-exitCode) + ")";
-                }
-                exitDescription += " - press Enter]";
-
-                byte[] bytesToWrite = exitDescription.getBytes(StandardCharsets.UTF_8);
-                mEmulator.append(bytesToWrite, bytesToWrite.length);
-                notifyScreenUpdate();
-            }
-        }
-    };
+    final Handler mMainThreadHandler = new MainThreadHandler();
 
     private final String mShellPath;
     private final String mCwd;
     private final String[] mArgs;
     private final String[] mEnv;
 
-    public TerminalSession(String shellPath, String cwd, String[] args, String[] env, SessionChangedCallback changeCallback) {
-        mChangeCallback = changeCallback;
+    private static final String LOG_TAG = "TerminalSession";
 
+    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.mClient = client;
+    }
+
+    /**
+     * @param client The {@link TerminalSessionClient} interface implementation to allow
+     *               for communication between {@link TerminalSession} and its client.
+     */
+    public void updateTerminalSessionClient(TerminalSessionClient client) {
+        mClient = client;
+
+        if (mEmulator != null)
+            mEmulator.updateTerminalSessionClient(client);
     }
 
     /** Inform the attached pty of the new size and reflow or initialize the emulator. */
@@ -174,13 +118,13 @@ public String getTitle() {
      * @param rows    The number of rows in the terminal window.
      */
     public void initializeEmulator(int columns, int rows) {
-        mEmulator = new TerminalEmulator(this, columns, rows, /* transcript= */2000);
+        mEmulator = new TerminalEmulator(this, columns, rows, /* transcript= */2000, mClient);
 
         int[] processId = new int[1];
         mTerminalFileDescriptor = JNI.createSubprocess(mShellPath, mCwd, mArgs, mEnv, processId, rows, columns);
         mShellPid = processId[0];
 
-        final FileDescriptor terminalFileDescriptorWrapped = wrapFileDescriptor(mTerminalFileDescriptor);
+        final FileDescriptor terminalFileDescriptorWrapped = wrapFileDescriptor(mTerminalFileDescriptor, mClient);
 
         new Thread("TermSessionInputReader[pid=" + mShellPid + "]") {
             @Override
@@ -246,23 +190,23 @@ public void writeCodePoint(boolean prependEscape, int codePoint) {
         } else if (codePoint <= /* 11 bits */0b11111111111) {
             /* 110xxxxx leading byte with leading 5 bits */
             mUtf8InputBuffer[bufferPosition++] = (byte) (0b11000000 | (codePoint >> 6));
-			/* 10xxxxxx continuation byte with following 6 bits */
+            /* 10xxxxxx continuation byte with following 6 bits */
             mUtf8InputBuffer[bufferPosition++] = (byte) (0b10000000 | (codePoint & 0b111111));
         } else if (codePoint <= /* 16 bits */0b1111111111111111) {
-			/* 1110xxxx leading byte with leading 4 bits */
+            /* 1110xxxx leading byte with leading 4 bits */
             mUtf8InputBuffer[bufferPosition++] = (byte) (0b11100000 | (codePoint >> 12));
-			/* 10xxxxxx continuation byte with following 6 bits */
+            /* 10xxxxxx continuation byte with following 6 bits */
             mUtf8InputBuffer[bufferPosition++] = (byte) (0b10000000 | ((codePoint >> 6) & 0b111111));
-			/* 10xxxxxx continuation byte with following 6 bits */
+            /* 10xxxxxx continuation byte with following 6 bits */
             mUtf8InputBuffer[bufferPosition++] = (byte) (0b10000000 | (codePoint & 0b111111));
         } else { /* We have checked codePoint <= 1114111 above, so we have max 21 bits = 0b111111111111111111111 */
-			/* 11110xxx leading byte with leading 3 bits */
+            /* 11110xxx leading byte with leading 3 bits */
             mUtf8InputBuffer[bufferPosition++] = (byte) (0b11110000 | (codePoint >> 18));
-			/* 10xxxxxx continuation byte with following 6 bits */
+            /* 10xxxxxx continuation byte with following 6 bits */
             mUtf8InputBuffer[bufferPosition++] = (byte) (0b10000000 | ((codePoint >> 12) & 0b111111));
-			/* 10xxxxxx continuation byte with following 6 bits */
+            /* 10xxxxxx continuation byte with following 6 bits */
             mUtf8InputBuffer[bufferPosition++] = (byte) (0b10000000 | ((codePoint >> 6) & 0b111111));
-			/* 10xxxxxx continuation byte with following 6 bits */
+            /* 10xxxxxx continuation byte with following 6 bits */
             mUtf8InputBuffer[bufferPosition++] = (byte) (0b10000000 | (codePoint & 0b111111));
         }
         write(mUtf8InputBuffer, 0, bufferPosition);
@@ -272,9 +216,9 @@ public TerminalEmulator getEmulator() {
         return mEmulator;
     }
 
-    /** Notify the {@link #mChangeCallback} that the screen has changed. */
+    /** Notify the {@link #mClient} that the screen has changed. */
     protected void notifyScreenUpdate() {
-        mChangeCallback.onTextChanged(this);
+        mClient.onTextChanged(this);
     }
 
     /** Reset state for terminal emulator state. */
@@ -289,7 +233,7 @@ public void finishIfRunning() {
             try {
                 Os.kill(mShellPid, OsConstants.SIGKILL);
             } catch (ErrnoException e) {
-                Log.w("termux", "Failed sending SIGKILL: " + e.getMessage());
+                mClient.logWarn(LOG_TAG, "Failed sending SIGKILL: " + e.getMessage());
             }
         }
     }
@@ -309,7 +253,7 @@ void cleanupResources(int exitStatus) {
 
     @Override
     public void titleChanged(String oldTitle, String newTitle) {
-        mChangeCallback.onTitleChanged(this);
+        mClient.onTitleChanged(this);
     }
 
     public synchronized boolean isRunning() {
@@ -323,17 +267,17 @@ public synchronized int getExitStatus() {
 
     @Override
     public void clipboardText(String text) {
-        mChangeCallback.onClipboardText(this, text);
+        mClient.onClipboardText(this, text);
     }
 
     @Override
     public void onBell() {
-        mChangeCallback.onBell(this);
+        mClient.onBell(this);
     }
 
     @Override
     public void onColorsChanged() {
-        mChangeCallback.onColorsChanged(this);
+        mClient.onColorsChanged(this);
     }
 
     public int getPid() {
@@ -356,10 +300,64 @@ public String getCwd() {
                 return outputPath;
             }
         } catch (IOException | SecurityException e) {
-            Log.e(EmulatorDebug.LOG_TAG, "Error getting current directory", e);
+            mClient.logStackTraceWithMessage(LOG_TAG, "Error getting current directory", e);
         }
         return null;
     }
 
+    private static FileDescriptor wrapFileDescriptor(int fileDescriptor, TerminalSessionClient client) {
+        FileDescriptor result = new FileDescriptor();
+        try {
+            Field descriptorField;
+            try {
+                descriptorField = FileDescriptor.class.getDeclaredField("descriptor");
+            } catch (NoSuchFieldException e) {
+                // For desktop java:
+                descriptorField = FileDescriptor.class.getDeclaredField("fd");
+            }
+            descriptorField.setAccessible(true);
+            descriptorField.set(result, fileDescriptor);
+        } catch (NoSuchFieldException | IllegalAccessException | IllegalArgumentException e) {
+            client.logStackTraceWithMessage(LOG_TAG, "Error accessing FileDescriptor#descriptor private field", e);
+            System.exit(1);
+        }
+        return result;
+    }
+
+    @SuppressLint("HandlerLeak")
+    class MainThreadHandler extends Handler {
+
+        final byte[] mReceiveBuffer = new byte[4 * 1024];
+
+        @Override
+        public void handleMessage(Message msg) {
+            int bytesRead = mProcessToTerminalIOQueue.read(mReceiveBuffer, false);
+            if (bytesRead > 0) {
+                mEmulator.append(mReceiveBuffer, bytesRead);
+                notifyScreenUpdate();
+            }
+
+            if (msg.what == MSG_PROCESS_EXITED) {
+                int exitCode = (Integer) msg.obj;
+                cleanupResources(exitCode);
+                mClient.onSessionFinished(TerminalSession.this);
+
+                String exitDescription = "\r\n[Process completed";
+                if (exitCode > 0) {
+                    // Non-zero process exit.
+                    exitDescription += " (code " + exitCode + ")";
+                } else if (exitCode < 0) {
+                    // Negated signal.
+                    exitDescription += " (signal " + (-exitCode) + ")";
+                }
+                exitDescription += " - press Enter]";
+
+                byte[] bytesToWrite = exitDescription.getBytes(StandardCharsets.UTF_8);
+                mEmulator.append(bytesToWrite, bytesToWrite.length);
+                notifyScreenUpdate();
+            }
+        }
+
+    }
 
 }
diff --git a/terminal-emulator/src/main/java/com/termux/terminal/TerminalSessionClient.java b/terminal-emulator/src/main/java/com/termux/terminal/TerminalSessionClient.java
new file mode 100644
index 0000000000..c275ca82d3
--- /dev/null
+++ b/terminal-emulator/src/main/java/com/termux/terminal/TerminalSessionClient.java
@@ -0,0 +1,37 @@
+package com.termux.terminal;
+
+/**
+ * The interface for communication between {@link TerminalSession} and its client. It is used to
+ * send callbacks to the client when {@link TerminalSession} changes or for sending other
+ * back data to the client like logs.
+ */
+public interface TerminalSessionClient {
+
+    void onTextChanged(TerminalSession changedSession);
+
+    void onTitleChanged(TerminalSession changedSession);
+
+    void onSessionFinished(TerminalSession finishedSession);
+
+    void onClipboardText(TerminalSession session, String text);
+
+    void onBell(TerminalSession session);
+
+    void onColorsChanged(TerminalSession session);
+
+
+    void logError(String tag, String message);
+
+    void logWarn(String tag, String message);
+
+    void logInfo(String tag, String message);
+
+    void logDebug(String tag, String message);
+
+    void logVerbose(String tag, String message);
+
+    void logStackTraceWithMessage(String tag, String message, Exception e);
+
+    void logStackTrace(String tag, Exception e);
+
+}

From ff0440d7d239a306d0f3f4a7383795d8b6228d1f Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Tue, 16 Mar 2021 07:04:55 +0500
Subject: [PATCH 238/912] Allow users to adjust termux toolbar height with
 termux.properties

This `terminal-toolbar-height` key can be used to adjust the toolbar height. The user can set a float value between `0.4` and `3.0` which will be used as the scaling factor for the default height. The default scaling factor is `1`. So adding an entry like `terminal-toolbar-height=2.0` to `termux.properties` file will make the toolbar height twice its original height. Running `termux-reload-settings` command will also update the height instantaneously if changed.

Fixes #1857
---
 .../java/com/termux/app/TermuxActivity.java   | 25 +++++++++--
 .../preferences/TermuxSharedPreferences.java  | 10 ++---
 .../properties/TermuxPropertyConstants.java   | 15 ++++++-
 .../properties/TermuxSharedProperties.java    | 45 ++++++++++++++++++-
 .../com/termux/app/utils/TextDataUtils.java   | 41 +++++++++++++++++
 5 files changed, 122 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index f2fc16882d..fe2b2bc667 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -124,9 +124,11 @@ public final class TermuxActivity extends Activity implements ServiceConnection
      * If between onResume() and onStop(). Note that only one session is in the foreground of the terminal view at the
      * time, so if the session causing a change is not in the foreground it should probably be treated as background.
      */
-    boolean mIsVisible;
+    private boolean mIsVisible;
 
-    int mNavBarHeight;
+    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;
@@ -341,8 +343,9 @@ private void setTerminalToolbarView(Bundle savedInstanceState) {
         if (mPreferences.getShowTerminalToolbar()) terminalToolbarViewPager.setVisibility(View.VISIBLE);
 
         ViewGroup.LayoutParams layoutParams = terminalToolbarViewPager.getLayoutParams();
-        layoutParams.height = layoutParams.height * (mProperties.getExtraKeysInfo() == null ? 0 : mProperties.getExtraKeysInfo().getMatrix().length);
-        terminalToolbarViewPager.setLayoutParams(layoutParams);
+        mTerminalToolbarDefaultHeight = layoutParams.height;
+
+        setTerminalToolbarHeight();
 
         String savedTextInput = null;
         if(savedInstanceState != null)
@@ -352,8 +355,20 @@ private void setTerminalToolbarView(Bundle savedInstanceState) {
         terminalToolbarViewPager.addOnPageChangeListener(new TerminalToolbarViewPager.OnPageChangeListener(this, terminalToolbarViewPager));
     }
 
+    private void setTerminalToolbarHeight() {
+        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());
+        terminalToolbarViewPager.setLayoutParams(layoutParams);
+    }
+
     public void toggleTerminalToolbar() {
         final ViewPager terminalToolbarViewPager = findViewById(R.id.terminal_toolbar_view_pager);
+        if(terminalToolbarViewPager == null) return;
+
         final boolean showNow = mPreferences.toogleShowTerminalToolbar();
         terminalToolbarViewPager.setVisibility(showNow ? View.VISIBLE : View.GONE);
         if (showNow && terminalToolbarViewPager.getCurrentItem() == 1) {
@@ -690,6 +705,8 @@ public void onReceive(Context context, Intent intent) {
                     }
                 }
 
+                setTerminalToolbarHeight();
+
                 // To change the activity and drawer theme, activity needs to be recreated.
                 // But this will destroy the activity, and will call the onCreate() again.
                 // We need to investigate if enabling this is wise, since all stored variables and
diff --git a/app/src/main/java/com/termux/app/settings/preferences/TermuxSharedPreferences.java b/app/src/main/java/com/termux/app/settings/preferences/TermuxSharedPreferences.java
index dc54d69671..c0e9ab0a51 100644
--- a/app/src/main/java/com/termux/app/settings/preferences/TermuxSharedPreferences.java
+++ b/app/src/main/java/com/termux/app/settings/preferences/TermuxSharedPreferences.java
@@ -7,6 +7,7 @@
 import com.termux.app.TermuxConstants;
 import com.termux.app.utils.Logger;
 import com.termux.app.utils.TermuxUtils;
+import com.termux.app.utils.TextDataUtils;
 
 import javax.annotation.Nonnull;
 
@@ -89,7 +90,7 @@ public int getFontSize() {
         } catch (NumberFormatException | ClassCastException e) {
             fontSize = DEFAULT_FONTSIZE;
         }
-        fontSize = clamp(fontSize, MIN_FONTSIZE, MAX_FONTSIZE);
+        fontSize = TextDataUtils.clamp(fontSize, MIN_FONTSIZE, MAX_FONTSIZE);
 
         return fontSize;
     }
@@ -147,11 +148,6 @@ public void setTerminalViewKeyLoggingEnabled(boolean value) {
 
 
 
-    /**
-     * If value is not in the range [min, max], set it to either min or max.
-     */
-    static int clamp(int value, int min, int max) {
-        return Math.min(Math.max(value, min), max);
-    }
+
 
 }
diff --git a/app/src/main/java/com/termux/app/settings/properties/TermuxPropertyConstants.java b/app/src/main/java/com/termux/app/settings/properties/TermuxPropertyConstants.java
index 6e3dd673d2..50ae0982cd 100644
--- a/app/src/main/java/com/termux/app/settings/properties/TermuxPropertyConstants.java
+++ b/app/src/main/java/com/termux/app/settings/properties/TermuxPropertyConstants.java
@@ -10,7 +10,7 @@
 import java.util.Set;
 
 /*
- * Version: v0.2.0
+ * Version: v0.3.0
  *
  * Changelog
  *
@@ -20,6 +20,8 @@
  *      - Renamed `HOME_PATH` to `TERMUX_HOME_DIR_PATH`
  *      - Renamed `TERMUX_PROPERTIES_PRIMARY_PATH` to `TERMUX_PROPERTIES_PRIMARY_FILE_PATH`
  *      - Renamed `TERMUX_PROPERTIES_SECONDARY_FILE_PATH` to `TERMUX_PROPERTIES_SECONDARY_FILE_PATH`
+ * - 0.3.0 (2021-03-16)
+ *      - Add `*TERMINAL_TOOLBAR_HEIGHT_SCALE_FACTOR*`
  *
  */
 
@@ -116,6 +118,14 @@ public final class TermuxPropertyConstants {
 
 
 
+    /** Defines the key for the bell behaviour */
+    public static final String KEY_TERMINAL_TOOLBAR_HEIGHT_SCALE_FACTOR =  "terminal-toolbar-height"; // Default: "terminal-toolbar-height"
+    public static final float IVALUE_TERMINAL_TOOLBAR_HEIGHT_SCALE_FACTOR_MIN = 0.4f;
+    public static final float IVALUE_TERMINAL_TOOLBAR_HEIGHT_SCALE_FACTOR_MAX = 3;
+    public static final float DEFAULT_IVALUE_TERMINAL_TOOLBAR_HEIGHT_SCALE_FACTOR = 1;
+
+
+
     /** Defines the key for create session shortcut */
     public static final String KEY_SHORTCUT_CREATE_SESSION =  "shortcut.create-session"; // Default: "shortcut.create-session"
     /** Defines the key for next session shortcut */
@@ -176,6 +186,9 @@ public final class TermuxPropertyConstants {
         // int
         KEY_BELL_BEHAVIOUR,
 
+        // float
+        KEY_TERMINAL_TOOLBAR_HEIGHT_SCALE_FACTOR,
+
         // Integer
         KEY_SHORTCUT_CREATE_SESSION,
         KEY_SHORTCUT_NEXT_SESSION,
diff --git a/app/src/main/java/com/termux/app/settings/properties/TermuxSharedProperties.java b/app/src/main/java/com/termux/app/settings/properties/TermuxSharedProperties.java
index 623ab13dd2..e8acf5fd31 100644
--- a/app/src/main/java/com/termux/app/settings/properties/TermuxSharedProperties.java
+++ b/app/src/main/java/com/termux/app/settings/properties/TermuxSharedProperties.java
@@ -8,6 +8,7 @@
 import com.termux.app.terminal.io.extrakeys.ExtraKeysInfo;
 import com.termux.app.terminal.io.KeyboardShortcut;
 import com.termux.app.utils.Logger;
+import com.termux.app.utils.TextDataUtils;
 
 import org.json.JSONException;
 
@@ -313,6 +314,10 @@ public static Object getInternalTermuxPropertyValueFromValue(Context context, St
             case TermuxPropertyConstants.KEY_BELL_BEHAVIOUR:
                 return (int) getBellBehaviourInternalPropertyValueFromValue(value);
 
+            // float
+            case TermuxPropertyConstants.KEY_TERMINAL_TOOLBAR_HEIGHT_SCALE_FACTOR:
+                return (float) getTerminalToolbarHeightScaleFactorInternalPropertyValueFromValue(value);
+
             // Integer (may be null)
             case TermuxPropertyConstants.KEY_SHORTCUT_CREATE_SESSION:
             case TermuxPropertyConstants.KEY_SHORTCUT_NEXT_SESSION:
@@ -391,7 +396,8 @@ public static boolean getUseBlackUIInternalPropertyValueFromValue(Context contex
     }
 
     /**
-     * Returns {@code true} if value is not {@code null} and equals {@link TermuxPropertyConstants#VALUE_VOLUME_KEY_BEHAVIOUR_VOLUME}, otherwise {@code false}.
+     * Returns {@code true} if value is not {@code null} and equals
+     * {@link TermuxPropertyConstants#VALUE_VOLUME_KEY_BEHAVIOUR_VOLUME}, otherwise {@code false}.
      *
      * @param value The {@link String} value to convert.
      * @return Returns the internal value for value.
@@ -401,7 +407,9 @@ public static boolean getVolumeKeysDisabledInternalPropertyValueFromValue(String
     }
 
     /**
-     * Returns {@code true} if value is not {@code null} and equals {@link TermuxPropertyConstants#VALUE_BACK_KEY_BEHAVIOUR_ESCAPE}, otherwise {@code false}.
+     * Returns the internal value after mapping it based on
+     * {@code TermuxPropertyConstants#MAP_BELL_BEHAVIOUR} if the value is not {@code null}
+     * and is valid, otherwise returns {@code TermuxPropertyConstants#DEFAULT_IVALUE_BELL_BEHAVIOUR}.
      *
      * @param value The {@link String} value to convert.
      * @return Returns the internal value for value.
@@ -410,6 +418,35 @@ public static int getBellBehaviourInternalPropertyValueFromValue(String value) {
         return getDefaultIfNull(TermuxPropertyConstants.MAP_BELL_BEHAVIOUR.get(toLowerCase(value)), TermuxPropertyConstants.DEFAULT_IVALUE_BELL_BEHAVIOUR);
     }
 
+    /**
+     * Returns the int for the value if its not null and is between
+     * {@code TermuxPropertyConstants#IVALUE_TERMINAL_TOOLBAR_HEIGHT_SCALE_FACTOR_MIN} and
+     * {@code TermuxPropertyConstants#IVALUE_TERMINAL_TOOLBAR_HEIGHT_SCALE_FACTOR_MAX},
+     * otherwise returns {@code TermuxPropertyConstants#DEFAULT_IVALUE_TERMINAL_TOOLBAR_HEIGHT_SCALE_FACTOR}.
+     *
+     * @param value The {@link String} value to convert.
+     * @return Returns the internal value for value.
+     */
+    public static float getTerminalToolbarHeightScaleFactorInternalPropertyValueFromValue(String value) {
+        return rangeTerminalToolbarHeightScaleFactorValue(TextDataUtils.getFloatFromString(value, TermuxPropertyConstants.DEFAULT_IVALUE_TERMINAL_TOOLBAR_HEIGHT_SCALE_FACTOR));
+    }
+
+    /**
+     * Returns the value itself if it is between
+     * {@code TermuxPropertyConstants#IVALUE_TERMINAL_TOOLBAR_HEIGHT_SCALE_FACTOR_MIN} and
+     * {@code TermuxPropertyConstants#IVALUE_TERMINAL_TOOLBAR_HEIGHT_SCALE_FACTOR_MAX},
+     * otherwise returns {@code TermuxPropertyConstants#DEFAULT_IVALUE_TERMINAL_TOOLBAR_HEIGHT_SCALE_FACTOR}.
+     *
+     * @param value The value to clamp.
+     * @return Returns the clamped value.
+     */
+    public static float rangeTerminalToolbarHeightScaleFactorValue(float value) {
+        return TextDataUtils.rangedOrDefault(value,
+            TermuxPropertyConstants.DEFAULT_IVALUE_TERMINAL_TOOLBAR_HEIGHT_SCALE_FACTOR,
+            TermuxPropertyConstants.IVALUE_TERMINAL_TOOLBAR_HEIGHT_SCALE_FACTOR_MIN,
+            TermuxPropertyConstants.IVALUE_TERMINAL_TOOLBAR_HEIGHT_SCALE_FACTOR_MAX);
+    }
+
     /**
      * Returns the code point for the value if key is not {@code null} and value is not {@code null} and is valid,
      * otherwise returns {@code null}.
@@ -517,6 +554,10 @@ public int getBellBehaviour() {
         return (int) getInternalPropertyValue(TermuxPropertyConstants.KEY_BELL_BEHAVIOUR, true);
     }
 
+    public float getTerminalToolbarHeightScaleFactor() {
+        return rangeTerminalToolbarHeightScaleFactorValue((float) getInternalPropertyValue(TermuxPropertyConstants.KEY_TERMINAL_TOOLBAR_HEIGHT_SCALE_FACTOR, true));
+    }
+
     public List<KeyboardShortcut> getSessionShortcuts() {
         return mSessionShortcuts;
     }
diff --git a/app/src/main/java/com/termux/app/utils/TextDataUtils.java b/app/src/main/java/com/termux/app/utils/TextDataUtils.java
index e61e373cdf..cbf8c3fb0b 100644
--- a/app/src/main/java/com/termux/app/utils/TextDataUtils.java
+++ b/app/src/main/java/com/termux/app/utils/TextDataUtils.java
@@ -21,6 +21,47 @@ public static String getTruncatedCommandOutput(String text, int maxLength) {
         return text;
     }
 
+    public static float getFloatFromString(String value, float def) {
+        if(value == null) return def;
+
+        try {
+            return Float.parseFloat(value);
+        }
+        catch (Exception e) {
+            return def;
+        }
+    }
+
+    public static int getIntFromString(String value, int def) {
+        if(value == null) return def;
+
+        try {
+            return Integer.parseInt(value);
+        }
+        catch (Exception e) {
+            return def;
+        }
+    }
+
+    /**
+     * If value is not in the range [min, max], set it to either min or max.
+     */
+    public static int clamp(int value, int min, int max) {
+        return Math.min(Math.max(value, min), max);
+    }
+
+    /**
+     * If value is not in the range [min, max], set it to default.
+     */
+    public static float rangedOrDefault(float value, float def, float min, float max) {
+        if (value < min || value > max)
+            return def;
+        else
+            return value;
+    }
+
+
+
     public static LinkedHashSet<CharSequence> extractUrls(String text) {
 
         StringBuilder regex_sb = new StringBuilder();

From 6f6d11fbb84ea12675f8dcb2c73fe0a169389bd3 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Tue, 16 Mar 2021 19:06:17 +0500
Subject: [PATCH 239/912] Updated TermuxPreferenceConstants

The `TermuxPreferenceConstants` classes has been updated to `v0.3.0`. Check its Changelog sections for info on changes.
---
 .../TermuxPreferenceConstants.java            | 72 +++++++++++++------
 .../preferences/TermuxSharedPreferences.java  | 31 ++++----
 2 files changed, 64 insertions(+), 39 deletions(-)

diff --git a/app/src/main/java/com/termux/app/settings/preferences/TermuxPreferenceConstants.java b/app/src/main/java/com/termux/app/settings/preferences/TermuxPreferenceConstants.java
index 1e9df39dae..a760a1bfd1 100644
--- a/app/src/main/java/com/termux/app/settings/preferences/TermuxPreferenceConstants.java
+++ b/app/src/main/java/com/termux/app/settings/preferences/TermuxPreferenceConstants.java
@@ -1,16 +1,22 @@
 package com.termux.app.settings.preferences;
 
-import com.termux.app.TermuxConstants;
-
 /*
- * Version: v0.2.0
+ * Version: v0.3.0
  *
  * Changelog
  *
  * - 0.1.0 (2021-03-12)
  *      - Initial Release.
+ *
  * - 0.2.0 (2021-03-13)
  *      - Added `KEY_LOG_LEVEL` and `KEY_TERMINAL_VIEW_LOGGING_ENABLED`
+ * 
+ * - 0.3.0 (2021-03-16)
+ *      - Changed to per app scoping of variables so that the same file can store all constants of
+ *          Termux app and its plugins. This will allow {@link com.termux.app.TermuxSettings} to
+ *          manage preferences of plugins as well if they don't have launcher activity themselves
+ *          and also allow plugin apps to make changes to preferences from background.
+ *      - Added `KEY_LOG_LEVEL` to `TERMUX_TASKER_APP` scope.
  */
 
 /**
@@ -19,42 +25,64 @@
  * instead of copying constants to random classes. The 3rd party apps can also import it for
  * interacting with termux apps. If changes are made to this file, increment the version number
  * and add an entry in the Changelog section above.
- *
- * The properties are loaded from the first file found at
- * {@link TermuxConstants#TERMUX_PROPERTIES_PRIMARY_FILE_PATH} or
- * {@link TermuxConstants#TERMUX_PROPERTIES_SECONDARY_FILE_PATH}
  */
 public final class TermuxPreferenceConstants {
 
-    /** Defines the key for whether to show terminal toolbar containing extra keys and text input field */
-    public static final String KEY_SHOW_TERMINAL_TOOLBAR = "show_extra_keys";
-    public static final boolean DEFAULT_VALUE_SHOW_TERMINAL_TOOLBAR = true;
+    /**
+     * Termux app constants.
+     */
+    public static final class TERMUX_APP {
 
+        /**
+         * Defines the key for whether to show terminal toolbar containing extra keys and text input field
+         */
+        public static final String KEY_SHOW_TERMINAL_TOOLBAR = "show_extra_keys";
+        public static final boolean DEFAULT_VALUE_SHOW_TERMINAL_TOOLBAR = true;
 
 
-    /** Defines the key for whether to always keep screen on */
-    public static final String KEY_KEEP_SCREEN_ON = "screen_always_on";
-    public static final boolean DEFAULT_VALUE_KEEP_SCREEN_ON = true;
+        /**
+         * Defines the key for whether to always keep screen on
+         */
+        public static final String KEY_KEEP_SCREEN_ON = "screen_always_on";
+        public static final boolean DEFAULT_VALUE_KEEP_SCREEN_ON = true;
 
 
+        /**
+         * Defines the key for font size of termux terminal view
+         */
+        public static final String KEY_FONTSIZE = "fontsize";
 
-    /** Defines the key for font size of termux terminal view */
-    public static final String KEY_FONTSIZE = "fontsize";
 
+        /**
+         * Defines the key for current termux terminal session
+         */
+        public static final String KEY_CURRENT_SESSION = "current_session";
 
 
-    /** Defines the key for current termux terminal session */
-    public static final String KEY_CURRENT_SESSION = "current_session";
+        /**
+         * Defines the key for current termux log level
+         */
+        public static final String KEY_LOG_LEVEL = "log_level";
 
 
+        /**
+         * Defines the key for whether termux terminal view key logging is enabled or not
+         */
+        public static final String KEY_TERMINAL_VIEW_KEY_LOGGING_ENABLED = "terminal_view_key_logging_enabled";
+        public static final boolean DEFAULT_VALUE_TERMINAL_VIEW_KEY_LOGGING_ENABLED = false;
 
-    /** Defines the key for current termux log level */
-    public static final String KEY_LOG_LEVEL = "log_level";
+    }
 
+    /**
+     * Termux Tasker app constants.
+     */
+    public static final class TERMUX_TASKER_APP {
 
+        /**
+         * Defines the key for current termux log level
+         */
+        public static final String KEY_LOG_LEVEL = "log_level";
 
-    /** Defines the key for whether termux terminal view key logging is enabled or not */
-    public static final String KEY_TERMINAL_VIEW_KEY_LOGGING_ENABLED = "terminal_view_key_logging_enabled";
-    public static final boolean DEFAULT_VALUE_TERMINAL_VIEW_KEY_LOGGING_ENABLED = false;
+    }
 
 }
diff --git a/app/src/main/java/com/termux/app/settings/preferences/TermuxSharedPreferences.java b/app/src/main/java/com/termux/app/settings/preferences/TermuxSharedPreferences.java
index c0e9ab0a51..f1a7b0b102 100644
--- a/app/src/main/java/com/termux/app/settings/preferences/TermuxSharedPreferences.java
+++ b/app/src/main/java/com/termux/app/settings/preferences/TermuxSharedPreferences.java
@@ -8,6 +8,7 @@
 import com.termux.app.utils.Logger;
 import com.termux.app.utils.TermuxUtils;
 import com.termux.app.utils.TextDataUtils;
+import com.termux.app.settings.preferences.TermuxPreferenceConstants.TERMUX_APP;
 
 import javax.annotation.Nonnull;
 
@@ -35,11 +36,11 @@ private static SharedPreferences getSharedPreferences(Context context) {
 
 
     public boolean getShowTerminalToolbar() {
-        return mSharedPreferences.getBoolean(TermuxPreferenceConstants.KEY_SHOW_TERMINAL_TOOLBAR, TermuxPreferenceConstants.DEFAULT_VALUE_SHOW_TERMINAL_TOOLBAR);
+        return mSharedPreferences.getBoolean(TERMUX_APP.KEY_SHOW_TERMINAL_TOOLBAR, TERMUX_APP.DEFAULT_VALUE_SHOW_TERMINAL_TOOLBAR);
     }
 
     public void setShowTerminalToolbar(boolean value) {
-        mSharedPreferences.edit().putBoolean(TermuxPreferenceConstants.KEY_SHOW_TERMINAL_TOOLBAR, value).apply();
+        mSharedPreferences.edit().putBoolean(TERMUX_APP.KEY_SHOW_TERMINAL_TOOLBAR, value).apply();
     }
 
     public boolean toogleShowTerminalToolbar() {
@@ -51,11 +52,11 @@ public boolean toogleShowTerminalToolbar() {
 
 
     public boolean getKeepScreenOn() {
-        return mSharedPreferences.getBoolean(TermuxPreferenceConstants.KEY_KEEP_SCREEN_ON, TermuxPreferenceConstants.DEFAULT_VALUE_KEEP_SCREEN_ON);
+        return mSharedPreferences.getBoolean(TERMUX_APP.KEY_KEEP_SCREEN_ON, TERMUX_APP.DEFAULT_VALUE_KEEP_SCREEN_ON);
     }
 
     public void setKeepScreenOn(boolean value) {
-        mSharedPreferences.edit().putBoolean(TermuxPreferenceConstants.KEY_KEEP_SCREEN_ON, value).apply();
+        mSharedPreferences.edit().putBoolean(TERMUX_APP.KEY_KEEP_SCREEN_ON, value).apply();
     }
 
 
@@ -82,7 +83,7 @@ public int getFontSize() {
         String fontString;
 
         try {
-            fontString = mSharedPreferences.getString(TermuxPreferenceConstants.KEY_FONTSIZE, Integer.toString(DEFAULT_FONTSIZE));
+            fontString = mSharedPreferences.getString(TERMUX_APP.KEY_FONTSIZE, Integer.toString(DEFAULT_FONTSIZE));
             if(fontString != null)
                 fontSize =  Integer.parseInt(fontString);
             else
@@ -96,7 +97,7 @@ public int getFontSize() {
     }
 
     public void setFontSize(String value) {
-        mSharedPreferences.edit().putString(TermuxPreferenceConstants.KEY_FONTSIZE, value).apply();
+        mSharedPreferences.edit().putString(TERMUX_APP.KEY_FONTSIZE, value).apply();
     }
 
     public void changeFontSize(Context context, boolean increase) {
@@ -112,42 +113,38 @@ public void changeFontSize(Context context, boolean increase) {
 
 
     public String getCurrentSession() {
-        return mSharedPreferences.getString(TermuxPreferenceConstants.KEY_CURRENT_SESSION, "");
+        return mSharedPreferences.getString(TERMUX_APP.KEY_CURRENT_SESSION, "");
     }
 
     public void setCurrentSession(String value) {
-        mSharedPreferences.edit().putString(TermuxPreferenceConstants.KEY_CURRENT_SESSION, value).apply();
+        mSharedPreferences.edit().putString(TERMUX_APP.KEY_CURRENT_SESSION, value).apply();
     }
 
 
 
     public int getLogLevel() {
         try {
-            return mSharedPreferences.getInt(TermuxPreferenceConstants.KEY_LOG_LEVEL, Logger.DEFAULT_LOG_LEVEL);
+            return mSharedPreferences.getInt(TERMUX_APP.KEY_LOG_LEVEL, Logger.DEFAULT_LOG_LEVEL);
         }
         catch (Exception e) {
-            Logger.logStackTraceWithMessage("Error getting \"" + TermuxPreferenceConstants.KEY_LOG_LEVEL + "\" from shared preferences", e);
+            Logger.logStackTraceWithMessage("Error getting \"" + TERMUX_APP.KEY_LOG_LEVEL + "\" from shared preferences", e);
             return Logger.DEFAULT_LOG_LEVEL;
         }
     }
 
     public void setLogLevel(Context context, int logLevel) {
         logLevel = Logger.setLogLevel(context, logLevel);
-        mSharedPreferences.edit().putInt(TermuxPreferenceConstants.KEY_LOG_LEVEL, logLevel).apply();
+        mSharedPreferences.edit().putInt(TERMUX_APP.KEY_LOG_LEVEL, logLevel).apply();
     }
 
 
 
     public boolean getTerminalViewKeyLoggingEnabled() {
-        return mSharedPreferences.getBoolean(TermuxPreferenceConstants.KEY_TERMINAL_VIEW_KEY_LOGGING_ENABLED, TermuxPreferenceConstants.DEFAULT_VALUE_TERMINAL_VIEW_KEY_LOGGING_ENABLED);
+        return mSharedPreferences.getBoolean(TERMUX_APP.KEY_TERMINAL_VIEW_KEY_LOGGING_ENABLED, TERMUX_APP.DEFAULT_VALUE_TERMINAL_VIEW_KEY_LOGGING_ENABLED);
     }
 
     public void setTerminalViewKeyLoggingEnabled(boolean value) {
-        mSharedPreferences.edit().putBoolean(TermuxPreferenceConstants.KEY_TERMINAL_VIEW_KEY_LOGGING_ENABLED, value).apply();
+        mSharedPreferences.edit().putBoolean(TERMUX_APP.KEY_TERMINAL_VIEW_KEY_LOGGING_ENABLED, value).apply();
     }
 
-
-
-
-
 }

From 4427c1675dcacd868ff83225ded3617647da17d6 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Tue, 16 Mar 2021 19:07:54 +0500
Subject: [PATCH 240/912] Update TermuxConstants

The `TermuxConstants` classes has been updated to `v0.5.0`. Check its Changelog sections for info on changes.
---
 app/src/main/java/com/termux/app/TermuxConstants.java | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxConstants.java b/app/src/main/java/com/termux/app/TermuxConstants.java
index 36eea3b9e4..b210184fdb 100644
--- a/app/src/main/java/com/termux/app/TermuxConstants.java
+++ b/app/src/main/java/com/termux/app/TermuxConstants.java
@@ -5,7 +5,7 @@
 import java.io.File;
 
 /*
- * Version: v0.4.0
+ * Version: v0.5.0
  *
  * Changelog
  *
@@ -41,6 +41,8 @@
  *          `TERMUX_TASKER_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION`,
  *          `TERMUX_WIDGET_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION`.
  *
+ * - 0.5.0 (2021-03-16)
+ *      - Renamed "Termux Plugin app" to "Termux Tasker app"
  */
 
 /**
@@ -113,9 +115,9 @@ public final class TermuxConstants {
     public static final String TERMUX_STYLING_PACKAGE_NAME = TERMUX_PACKAGE_NAME + ".styling"; // Default: "com.termux.styling"
 
 
-    /** Termux Plugin app name */
+    /** Termux Tasker app name */
     public static final String TERMUX_TASKER_APP_NAME = "Termux:Tasker"; // Default: "Termux:Tasker"
-    /** Termux Plugin app package name */
+    /** Termux Tasker app package name */
     public static final String TERMUX_TASKER_PACKAGE_NAME = TERMUX_PACKAGE_NAME + ".tasker"; // Default: "com.termux.tasker"
 
 
@@ -255,7 +257,7 @@ public final class TermuxConstants {
     /* Termux Styling app default SharedPreferences file basename without extension */
     public static final String TERMUX_STYLING_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION = TERMUX_STYLING_PACKAGE_NAME + "_preferences"; // Default: "com.termux.styling_preferences"
 
-    /* Termux Plugin app default SharedPreferences file basename without extension */
+    /* Termux Tasker app default SharedPreferences file basename without extension */
     public static final String TERMUX_TASKER_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION = TERMUX_TASKER_PACKAGE_NAME + "_preferences"; // Default: "com.termux.tasker_preferences"
 
     /* Termux Widget app default SharedPreferences file basename without extension */

From 9e82561804b08ea04d123eb7feb5e7a0f28e188f Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Tue, 16 Mar 2021 20:51:41 +0500
Subject: [PATCH 241/912] Added SharedPreferenceUtils

The `SharedPreferenceUtils` class has been added to provide static util functions for shared preferences like get and set while safely handling exceptions. The `TermuxSharedPreferences` class has been renamed to `TermuxAppSharedPreferences` since its to be used to handle only Termux App related shared preferences and not of other plugin apps. For plugin apps, separate classes can be created. However, Termux app and its plugins will share the same `TermuxPreferenceConstants` class that now has per app scoping since `v0.3.0`.
---
 .../java/com/termux/app/TermuxActivity.java   |   8 +-
 .../com/termux/app/TermuxApplication.java     |   4 +-
 .../java/com/termux/app/TermuxService.java    |   4 +-
 .../DebuggingPreferencesFragment.java         |  11 +-
 .../preferences/SharedPreferenceUtils.java    | 185 ++++++++++++++++++
 ...s.java => TermuxAppSharedPreferences.java} |  57 ++----
 .../termux/app/terminal/TermuxViewClient.java |   2 +-
 7 files changed, 221 insertions(+), 50 deletions(-)
 create mode 100644 app/src/main/java/com/termux/app/settings/preferences/SharedPreferenceUtils.java
 rename app/src/main/java/com/termux/app/settings/preferences/{TermuxSharedPreferences.java => TermuxAppSharedPreferences.java} (56%)

diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index fe2b2bc667..da66bddd86 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -32,7 +32,7 @@
 
 import com.termux.R;
 import com.termux.app.TermuxConstants.TERMUX_APP.TERMUX_ACTIVITY;
-import com.termux.app.settings.preferences.TermuxSharedPreferences;
+import com.termux.app.settings.preferences.TermuxAppSharedPreferences;
 import com.termux.app.terminal.TermuxSessionsListViewController;
 import com.termux.app.terminal.io.TerminalToolbarViewPager;
 import com.termux.app.terminal.TermuxSessionClient;
@@ -93,7 +93,7 @@ public final class TermuxActivity extends Activity implements ServiceConnection
     /**
      * Termux app shared preferences manager.
      */
-    private TermuxSharedPreferences mPreferences;
+    private TermuxAppSharedPreferences mPreferences;
 
     /**
      * Termux app shared properties manager, loaded from termux.properties
@@ -154,7 +154,7 @@ public void onCreate(Bundle savedInstanceState) {
         Logger.logDebug(LOG_TAG, "onCreate");
 
         // Load termux shared preferences and properties
-        mPreferences = new TermuxSharedPreferences(this);
+        mPreferences = new TermuxAppSharedPreferences(this);
         mProperties = new TermuxSharedProperties(this);
 
         setActivityTheme();
@@ -670,7 +670,7 @@ public TerminalSession getCurrentSession() {
             return null;
     }
 
-    public TermuxSharedPreferences getPreferences() {
+    public TermuxAppSharedPreferences getPreferences() {
         return mPreferences;
     }
 
diff --git a/app/src/main/java/com/termux/app/TermuxApplication.java b/app/src/main/java/com/termux/app/TermuxApplication.java
index 94c4dbccf6..53d129eb2f 100644
--- a/app/src/main/java/com/termux/app/TermuxApplication.java
+++ b/app/src/main/java/com/termux/app/TermuxApplication.java
@@ -2,7 +2,7 @@
 
 import android.app.Application;
 
-import com.termux.app.settings.preferences.TermuxSharedPreferences;
+import com.termux.app.settings.preferences.TermuxAppSharedPreferences;
 import com.termux.app.utils.Logger;
 
 
@@ -15,7 +15,7 @@ public void onCreate() {
 
     private void updateLogLevel() {
         // Load the log level from shared preferences and set it to the {@link Loggger.CURRENT_LOG_LEVEL}
-        TermuxSharedPreferences preferences = new TermuxSharedPreferences(getApplicationContext());
+        TermuxAppSharedPreferences preferences = new TermuxAppSharedPreferences(getApplicationContext());
         preferences.setLogLevel(null, preferences.getLogLevel());
         Logger.logDebug("Starting Application");
     }
diff --git a/app/src/main/java/com/termux/app/TermuxService.java b/app/src/main/java/com/termux/app/TermuxService.java
index 46aebbcf71..5cac2719d0 100644
--- a/app/src/main/java/com/termux/app/TermuxService.java
+++ b/app/src/main/java/com/termux/app/TermuxService.java
@@ -23,7 +23,7 @@
 import com.termux.R;
 import com.termux.app.TermuxConstants.TERMUX_APP.TERMUX_ACTIVITY;
 import com.termux.app.TermuxConstants.TERMUX_APP.TERMUX_SERVICE;
-import com.termux.app.settings.preferences.TermuxSharedPreferences;
+import com.termux.app.settings.preferences.TermuxAppSharedPreferences;
 import com.termux.app.terminal.TermuxSessionClient;
 import com.termux.app.terminal.TermuxSessionClientBase;
 import com.termux.app.utils.Logger;
@@ -161,7 +161,7 @@ public int onStartCommand(Intent intent, int flags, int startId) {
                 }
 
                 // Make the newly created session the current one to be displayed:
-                TermuxSharedPreferences preferences = new TermuxSharedPreferences(this);
+                TermuxAppSharedPreferences preferences = new TermuxAppSharedPreferences(this);
                 preferences.setCurrentSession(newSession.mHandle);
 
                 // Launch the main Termux app, which will now show the current session:
diff --git a/app/src/main/java/com/termux/app/settings/DebuggingPreferencesFragment.java b/app/src/main/java/com/termux/app/settings/DebuggingPreferencesFragment.java
index c976c30e59..e6dc03c619 100644
--- a/app/src/main/java/com/termux/app/settings/DebuggingPreferencesFragment.java
+++ b/app/src/main/java/com/termux/app/settings/DebuggingPreferencesFragment.java
@@ -12,7 +12,7 @@
 
 import com.termux.R;
 import com.termux.app.settings.preferences.TermuxPreferenceConstants;
-import com.termux.app.settings.preferences.TermuxSharedPreferences;
+import com.termux.app.settings.preferences.TermuxAppSharedPreferences;
 import com.termux.app.utils.Logger;
 
 public class DebuggingPreferencesFragment extends PreferenceFragmentCompat {
@@ -41,7 +41,6 @@ protected ListPreference setLogLevelListPreferenceData(ListPreference logLevelLi
         logLevelListPreference.setEntryValues(logLevels);
         logLevelListPreference.setEntries(logLevelLabels);
 
-        logLevelListPreference.setKey(TermuxPreferenceConstants.KEY_LOG_LEVEL);
         logLevelListPreference.setValue(String.valueOf(Logger.getLogLevel()));
         logLevelListPreference.setDefaultValue(Logger.getLogLevel());
 
@@ -53,13 +52,13 @@ protected ListPreference setLogLevelListPreferenceData(ListPreference logLevelLi
 class DebuggingPreferencesDataStore extends PreferenceDataStore {
 
     private final Context mContext;
-    private final TermuxSharedPreferences mPreferences;
+    private final TermuxAppSharedPreferences mPreferences;
 
     private static DebuggingPreferencesDataStore mInstance;
 
     private DebuggingPreferencesDataStore(Context context) {
         mContext = context;
-        mPreferences = new TermuxSharedPreferences(context);
+        mPreferences = new TermuxAppSharedPreferences(context);
     }
 
     public static synchronized DebuggingPreferencesDataStore getInstance(Context context) {
@@ -69,6 +68,8 @@ public static synchronized DebuggingPreferencesDataStore getInstance(Context con
         return mInstance;
     }
 
+
+
     @Override
     @Nullable
     public String getString(String key, @Nullable String defValue) {
@@ -97,6 +98,8 @@ public void putString(String key, @Nullable String value) {
         }
     }
 
+
+
     @Override
     public void putBoolean(String key, boolean value) {
         if(key == null) return;
diff --git a/app/src/main/java/com/termux/app/settings/preferences/SharedPreferenceUtils.java b/app/src/main/java/com/termux/app/settings/preferences/SharedPreferenceUtils.java
new file mode 100644
index 0000000000..3f2a9b1741
--- /dev/null
+++ b/app/src/main/java/com/termux/app/settings/preferences/SharedPreferenceUtils.java
@@ -0,0 +1,185 @@
+package com.termux.app.settings.preferences;
+
+import android.content.SharedPreferences;
+
+import com.termux.app.utils.Logger;
+
+public class SharedPreferenceUtils {
+
+    private static final String LOG_TAG = "SharedPreferenceUtils";
+
+    /**
+     * Get a {@code boolean} from {@link SharedPreferences}.
+     *
+     * @param sharedPreferences The {@link SharedPreferences} to get the value from.
+     * @param key The key for the value.
+     * @param def The default value if failed to read a valid value.
+     * @return Returns the {@code boolean} value stored in {@link SharedPreferences}, otherwise returns
+     * default if failed to read a valid value, like in case of an exception.
+     */
+    public static boolean getBoolean(SharedPreferences sharedPreferences, String key, boolean def) {
+        if(sharedPreferences == null) {
+            Logger.logError(LOG_TAG, "Error getting boolean value for the \"" + key + "\" key from null shared preferences. Returning default value \"" + def + "\".");
+            return def;
+        }
+
+        try {
+            return sharedPreferences.getBoolean(key, def);
+        }
+        catch (ClassCastException e) {
+            Logger.logStackTraceWithMessage(LOG_TAG, "Error getting boolean value for the \"" + key + "\" key from shared preferences. Returning default value \"" + def + "\".", e);
+            return def;
+        }
+    }
+
+    /**
+     * Set a {@code boolean} in {@link SharedPreferences}.
+     *
+     * @param sharedPreferences The {@link SharedPreferences} to set the value in.
+     * @param key The key for the value.
+     * @param value The value to store.
+     */
+    public static void setBoolean(SharedPreferences sharedPreferences, String key, boolean value) {
+        if(sharedPreferences == null) {
+            Logger.logError(LOG_TAG, "Ignoring setting boolean value \"" + value + "\" for the \"" + key + "\" key into null shared preferences.");
+            return;
+        }
+
+        sharedPreferences.edit().putBoolean(key, value).apply();
+    }
+
+
+
+    /**
+     * Get an {@code int} from {@link SharedPreferences}.
+     *
+     * @param sharedPreferences The {@link SharedPreferences} to get the value from.
+     * @param key The key for the value.
+     * @param def The default value if failed to read a valid value.
+     * @return Returns the {@code int} value stored in {@link SharedPreferences}, otherwise returns
+     * default if failed to read a valid value, like in case of an exception.
+     */
+    public static int getInt(SharedPreferences sharedPreferences, String key, int def) {
+        if(sharedPreferences == null) {
+            Logger.logError(LOG_TAG, "Error getting int value for the \"" + key + "\" key from null shared preferences. Returning default value \"" + def + "\".");
+            return def;
+        }
+
+        try {
+            return sharedPreferences.getInt(key, def);
+        }
+        catch (ClassCastException e) {
+            Logger.logStackTraceWithMessage(LOG_TAG, "Error getting int value for the \"" + key + "\" key from shared preferences. Returning default value \"" + def + "\".", e);
+            return def;
+        }
+    }
+
+    /**
+     * Set an {@code int} in {@link SharedPreferences}.
+     *
+     * @param sharedPreferences The {@link SharedPreferences} to set the value in.
+     * @param key The key for the value.
+     * @param value The value to store.
+     */
+    public static void setInt(SharedPreferences sharedPreferences, String key, int value) {
+        if(sharedPreferences == null) {
+            Logger.logError(LOG_TAG, "Ignoring setting int value \"" + value + "\" for the \"" + key + "\" key into null shared preferences.");
+            return;
+        }
+
+        sharedPreferences.edit().putInt(key, value).apply();
+    }
+
+
+
+    /**
+     * Get a {@code String} from {@link SharedPreferences}.
+     *
+     * @param sharedPreferences The {@link SharedPreferences} to get the value from.
+     * @param key The key for the value.
+     * @param def The default value if failed to read a valid value.
+     * @return Returns the {@code String} value stored in {@link SharedPreferences}, otherwise returns
+     * default if failed to read a valid value, like in case of an exception.
+     */
+    public static String getString(SharedPreferences sharedPreferences, String key, String def) {
+        if(sharedPreferences == null) {
+            Logger.logError(LOG_TAG, "Error getting String value for the \"" + key + "\" key from null shared preferences. Returning default value \"" + def + "\".");
+            return def;
+        }
+
+        try {
+            return sharedPreferences.getString(key, def);
+        }
+        catch (ClassCastException e) {
+            Logger.logStackTraceWithMessage(LOG_TAG, "Error getting String value for the \"" + key + "\" key from shared preferences. Returning default value \"" + def + "\".", e);
+            return def;
+        }
+    }
+
+    /**
+     * Set a {@code String} in {@link SharedPreferences}.
+     *
+     * @param sharedPreferences The {@link SharedPreferences} to set the value in.
+     * @param key The key for the value.
+     * @param value The value to store.
+     */
+    public static void setString(SharedPreferences sharedPreferences, String key, String value) {
+        if(sharedPreferences == null) {
+            Logger.logError(LOG_TAG, "Ignoring setting String value \"" + value + "\" for the \"" + key + "\" key into null shared preferences.");
+            return;
+        }
+
+        sharedPreferences.edit().putString(key, value).apply();
+    }
+
+
+
+    /**
+     * Get an {@code int} from {@link SharedPreferences} that is stored as a {@link String}.
+     *
+     * @param sharedPreferences The {@link SharedPreferences} to get the value from.
+     * @param key The key for the value.
+     * @param def The default value if failed to read a valid value.
+     * @return Returns the {@code int} value after parsing the {@link String} value stored in
+     * {@link SharedPreferences}, otherwise returns default if failed to read a valid value,
+     * like in case of an exception.
+     */
+    public static int getIntStoredAsString(SharedPreferences sharedPreferences, String key, int def) {
+        if(sharedPreferences == null) {
+            Logger.logError(LOG_TAG, "Error getting int value for the \"" + key + "\" key from null shared preferences. Returning default value \"" + def + "\".");
+            return def;
+        }
+
+        String stringValue;
+        int intValue;
+
+        try {
+            stringValue = sharedPreferences.getString(key, Integer.toString(def));
+            if(stringValue != null)
+                intValue =  Integer.parseInt(stringValue);
+            else
+                intValue = def;
+        } catch (NumberFormatException | ClassCastException e) {
+            intValue = def;
+        }
+
+        return intValue;
+    }
+
+    /**
+     * Set an {@code int} into {@link SharedPreferences} that is stored as a {@link String}.
+     *
+     * @param sharedPreferences The {@link SharedPreferences} to set the value in.
+     * @param key The key for the value.
+     * @param value The value to store.
+     */
+    public static void setIntStoredAsString(SharedPreferences sharedPreferences, String key, int value) {
+        if(sharedPreferences == null) {
+            Logger.logError(LOG_TAG, "Ignoring setting int value \"" + value + "\" for the \"" + key + "\" key into null shared preferences.");
+            return;
+        }
+
+        sharedPreferences.edit().putString(key, Integer.toString(value)).apply();
+    }
+
+}
diff --git a/app/src/main/java/com/termux/app/settings/preferences/TermuxSharedPreferences.java b/app/src/main/java/com/termux/app/settings/preferences/TermuxAppSharedPreferences.java
similarity index 56%
rename from app/src/main/java/com/termux/app/settings/preferences/TermuxSharedPreferences.java
rename to app/src/main/java/com/termux/app/settings/preferences/TermuxAppSharedPreferences.java
index f1a7b0b102..3dbbdeb6e7 100644
--- a/app/src/main/java/com/termux/app/settings/preferences/TermuxSharedPreferences.java
+++ b/app/src/main/java/com/termux/app/settings/preferences/TermuxAppSharedPreferences.java
@@ -12,7 +12,7 @@
 
 import javax.annotation.Nonnull;
 
-public class TermuxSharedPreferences {
+public class TermuxAppSharedPreferences {
 
     private final Context mContext;
     private final SharedPreferences mSharedPreferences;
@@ -22,7 +22,9 @@ public class TermuxSharedPreferences {
     private int MAX_FONTSIZE;
     private int DEFAULT_FONTSIZE;
 
-    public TermuxSharedPreferences(@Nonnull Context context) {
+    private static final String LOG_TAG = "TermuxAppSharedPreferences";
+
+    public TermuxAppSharedPreferences(@Nonnull Context context) {
         mContext = TermuxUtils.getTermuxPackageContext(context);
         mSharedPreferences = getSharedPreferences(mContext);
 
@@ -36,11 +38,11 @@ private static SharedPreferences getSharedPreferences(Context context) {
 
 
     public boolean getShowTerminalToolbar() {
-        return mSharedPreferences.getBoolean(TERMUX_APP.KEY_SHOW_TERMINAL_TOOLBAR, TERMUX_APP.DEFAULT_VALUE_SHOW_TERMINAL_TOOLBAR);
+        return SharedPreferenceUtils.getBoolean(mSharedPreferences, TERMUX_APP.KEY_SHOW_TERMINAL_TOOLBAR, TERMUX_APP.DEFAULT_VALUE_SHOW_TERMINAL_TOOLBAR);
     }
 
     public void setShowTerminalToolbar(boolean value) {
-        mSharedPreferences.edit().putBoolean(TERMUX_APP.KEY_SHOW_TERMINAL_TOOLBAR, value).apply();
+        SharedPreferenceUtils.setBoolean(mSharedPreferences, TERMUX_APP.KEY_SHOW_TERMINAL_TOOLBAR, value);
     }
 
     public boolean toogleShowTerminalToolbar() {
@@ -52,11 +54,11 @@ public boolean toogleShowTerminalToolbar() {
 
 
     public boolean getKeepScreenOn() {
-        return mSharedPreferences.getBoolean(TERMUX_APP.KEY_KEEP_SCREEN_ON, TERMUX_APP.DEFAULT_VALUE_KEEP_SCREEN_ON);
+        return SharedPreferenceUtils.getBoolean(mSharedPreferences, TERMUX_APP.KEY_KEEP_SCREEN_ON, TERMUX_APP.DEFAULT_VALUE_KEEP_SCREEN_ON);
     }
 
     public void setKeepScreenOn(boolean value) {
-        mSharedPreferences.edit().putBoolean(TERMUX_APP.KEY_KEEP_SCREEN_ON, value).apply();
+        SharedPreferenceUtils.setBoolean(mSharedPreferences, TERMUX_APP.KEY_KEEP_SCREEN_ON, value);
     }
 
 
@@ -79,72 +81,53 @@ private void setFontVariables(Context context) {
     }
 
     public int getFontSize() {
-        int fontSize;
-        String fontString;
-
-        try {
-            fontString = mSharedPreferences.getString(TERMUX_APP.KEY_FONTSIZE, Integer.toString(DEFAULT_FONTSIZE));
-            if(fontString != null)
-                fontSize =  Integer.parseInt(fontString);
-            else
-                fontSize = DEFAULT_FONTSIZE;
-        } catch (NumberFormatException | ClassCastException e) {
-            fontSize = DEFAULT_FONTSIZE;
-        }
-        fontSize = TextDataUtils.clamp(fontSize, MIN_FONTSIZE, MAX_FONTSIZE);
-
-        return fontSize;
+        int fontSize = SharedPreferenceUtils.getIntStoredAsString(mSharedPreferences, TERMUX_APP.KEY_FONTSIZE, DEFAULT_FONTSIZE);
+        return TextDataUtils.clamp(fontSize, MIN_FONTSIZE, MAX_FONTSIZE);
     }
 
-    public void setFontSize(String value) {
-        mSharedPreferences.edit().putString(TERMUX_APP.KEY_FONTSIZE, value).apply();
+    public void setFontSize(int value) {
+        SharedPreferenceUtils.setIntStoredAsString(mSharedPreferences, TERMUX_APP.KEY_FONTSIZE, value);
     }
 
-    public void changeFontSize(Context context, boolean increase) {
+    public void changeFontSize(boolean increase) {
 
         int fontSize = getFontSize();
 
         fontSize += (increase ? 1 : -1) * 2;
         fontSize = Math.max(MIN_FONTSIZE, Math.min(fontSize, MAX_FONTSIZE));
 
-        setFontSize(Integer.toString(fontSize));
+        setFontSize(fontSize);
     }
 
 
 
     public String getCurrentSession() {
-        return mSharedPreferences.getString(TERMUX_APP.KEY_CURRENT_SESSION, "");
+        return SharedPreferenceUtils.getString(mSharedPreferences, TERMUX_APP.KEY_CURRENT_SESSION, null);
     }
 
     public void setCurrentSession(String value) {
-        mSharedPreferences.edit().putString(TERMUX_APP.KEY_CURRENT_SESSION, value).apply();
+        SharedPreferenceUtils.setString(mSharedPreferences, TERMUX_APP.KEY_CURRENT_SESSION, value);
     }
 
 
 
     public int getLogLevel() {
-        try {
-            return mSharedPreferences.getInt(TERMUX_APP.KEY_LOG_LEVEL, Logger.DEFAULT_LOG_LEVEL);
-        }
-        catch (Exception e) {
-            Logger.logStackTraceWithMessage("Error getting \"" + TERMUX_APP.KEY_LOG_LEVEL + "\" from shared preferences", e);
-            return Logger.DEFAULT_LOG_LEVEL;
-        }
+        return SharedPreferenceUtils.getInt(mSharedPreferences, TERMUX_APP.KEY_LOG_LEVEL, Logger.DEFAULT_LOG_LEVEL);
     }
 
     public void setLogLevel(Context context, int logLevel) {
         logLevel = Logger.setLogLevel(context, logLevel);
-        mSharedPreferences.edit().putInt(TERMUX_APP.KEY_LOG_LEVEL, logLevel).apply();
+        SharedPreferenceUtils.setInt(mSharedPreferences, TERMUX_APP.KEY_LOG_LEVEL, logLevel);
     }
 
 
 
     public boolean getTerminalViewKeyLoggingEnabled() {
-        return mSharedPreferences.getBoolean(TERMUX_APP.KEY_TERMINAL_VIEW_KEY_LOGGING_ENABLED, TERMUX_APP.DEFAULT_VALUE_TERMINAL_VIEW_KEY_LOGGING_ENABLED);
+        return SharedPreferenceUtils.getBoolean(mSharedPreferences, TERMUX_APP.KEY_TERMINAL_VIEW_KEY_LOGGING_ENABLED, TERMUX_APP.DEFAULT_VALUE_TERMINAL_VIEW_KEY_LOGGING_ENABLED);
     }
 
     public void setTerminalViewKeyLoggingEnabled(boolean value) {
-        mSharedPreferences.edit().putBoolean(TERMUX_APP.KEY_TERMINAL_VIEW_KEY_LOGGING_ENABLED, value).apply();
+        SharedPreferenceUtils.setBoolean(mSharedPreferences, TERMUX_APP.KEY_TERMINAL_VIEW_KEY_LOGGING_ENABLED, value);
     }
 
 }
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxViewClient.java b/app/src/main/java/com/termux/app/terminal/TermuxViewClient.java
index 2025b3d369..6f3e29cb43 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxViewClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxViewClient.java
@@ -328,7 +328,7 @@ public boolean onCodePoint(final int codePoint, boolean ctrlDown, TerminalSessio
 
 
     public void changeFontSize(boolean increase) {
-        mActivity.getPreferences().changeFontSize(mActivity, increase);
+        mActivity.getPreferences().changeFontSize(increase);
         mActivity.getTerminalView().setTextSize(mActivity.getPreferences().getFontSize());
     }
 

From 2e7fd480f492400d987b5da72e2d48afc35c7765 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Tue, 16 Mar 2021 21:29:25 +0500
Subject: [PATCH 242/912] Update TermuxConstants

The `TermuxConstants` classes has been updated to `v0.6.0`. Check its Changelog sections for info on changes.
---
 .../main/java/com/termux/app/TermuxConstants.java   | 13 ++++++++++---
 .../java/com/termux/app/TermuxOpenReceiver.java     |  2 +-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxConstants.java b/app/src/main/java/com/termux/app/TermuxConstants.java
index b210184fdb..87714f4462 100644
--- a/app/src/main/java/com/termux/app/TermuxConstants.java
+++ b/app/src/main/java/com/termux/app/TermuxConstants.java
@@ -5,7 +5,7 @@
 import java.io.File;
 
 /*
- * Version: v0.5.0
+ * Version: v0.6.0
  *
  * Changelog
  *
@@ -42,7 +42,10 @@
  *          `TERMUX_WIDGET_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION`.
  *
  * - 0.5.0 (2021-03-16)
- *      - Renamed "Termux Plugin app" to "Termux Tasker app"
+ *      - Renamed "Termux Plugin app" labels to "Termux Tasker app"
+ *
+ * - 0.6.0 (2021-03-16)
+ *      - Added `TERMUX_FILE_SHARE_URI_AUTHORITY`
  */
 
 /**
@@ -332,9 +335,13 @@ public final class TermuxConstants {
     /* Default value for {@link #PROP_ALLOW_EXTERNAL_APPS} */
     public static final String PROP_DEFAULT_VALUE_ALLOW_EXTERNAL_APPS = "false"; // Default: "false"
 
-
+    /* The broadcast action sent when Termux App opens */
     public static final String BROADCAST_TERMUX_OPENED = TERMUX_PACKAGE_NAME + ".app.OPENED";
 
+    /* The Uri authority for Termux app file shares */
+    public static final String TERMUX_FILE_SHARE_URI_AUTHORITY = TERMUX_PACKAGE_NAME + ".files"; // Default: "com.termux.files"
+
+
 
 
 
diff --git a/app/src/main/java/com/termux/app/TermuxOpenReceiver.java b/app/src/main/java/com/termux/app/TermuxOpenReceiver.java
index 92ce70f871..455c2211bf 100644
--- a/app/src/main/java/com/termux/app/TermuxOpenReceiver.java
+++ b/app/src/main/java/com/termux/app/TermuxOpenReceiver.java
@@ -88,7 +88,7 @@ public void onReceive(Context context, Intent intent) {
             contentTypeToUse = contentTypeExtra;
         }
 
-        Uri uriToShare = Uri.parse("content://com.termux.files" + fileToShare.getAbsolutePath());
+        Uri uriToShare = Uri.parse("content://" + TermuxConstants.TERMUX_FILE_SHARE_URI_AUTHORITY + fileToShare.getAbsolutePath());
 
         if (Intent.ACTION_SEND.equals(intentAction)) {
             sendIntent.putExtra(Intent.EXTRA_STREAM, uriToShare);

From 2a940dfca6daf7f37cf32785c0edc8f4a6e3015e Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Tue, 16 Mar 2021 22:52:20 +0500
Subject: [PATCH 243/912] Move general static functions from
 TermuxSharedProperties to SharedProperties class

This will allow `SharedProperties` class to be used directly to get property values and their internal values via static functions instead of using `TermuxSharedProperties` where the functions don't belong in.

The `TermuxPropertyConstants` classes has been updated to `v0.4.0`. Check its Changelog sections for info on changes.
---
 .../com/termux/app/RunCommandService.java     |   4 +-
 .../settings/properties/SharedProperties.java | 334 +++++++++++++-----
 .../properties/TermuxPropertyConstants.java   |  22 +-
 .../properties/TermuxSharedProperties.java    | 126 +------
 4 files changed, 257 insertions(+), 229 deletions(-)

diff --git a/app/src/main/java/com/termux/app/RunCommandService.java b/app/src/main/java/com/termux/app/RunCommandService.java
index 8745d31a3c..e667265652 100644
--- a/app/src/main/java/com/termux/app/RunCommandService.java
+++ b/app/src/main/java/com/termux/app/RunCommandService.java
@@ -14,8 +14,8 @@
 import com.termux.R;
 import com.termux.app.TermuxConstants.TERMUX_APP.RUN_COMMAND_SERVICE;
 import com.termux.app.TermuxConstants.TERMUX_APP.TERMUX_SERVICE;
+import com.termux.app.settings.properties.SharedProperties;
 import com.termux.app.settings.properties.TermuxPropertyConstants;
-import com.termux.app.settings.properties.TermuxSharedProperties;
 import com.termux.app.utils.Logger;
 
 import java.io.File;
@@ -114,7 +114,7 @@ public int onStartCommand(Intent intent, int flags, int startId) {
         }
 
         // If allow-external-apps property is not set to "true"
-        if (!TermuxSharedProperties.isPropertyValueTrue(this, TermuxPropertyConstants.getTermuxPropertiesFile(), TermuxConstants.PROP_ALLOW_EXTERNAL_APPS)) {
+        if (!SharedProperties.isPropertyValueTrue(this, TermuxPropertyConstants.getTermuxPropertiesFile(), TermuxConstants.PROP_ALLOW_EXTERNAL_APPS)) {
             Logger.logError(LOG_TAG, "RunCommandService requires allow-external-apps property to be set to \"true\" in \"" + TermuxConstants.TERMUX_PROPERTIES_PRIMARY_FILE_PATH + "\" file");
             return Service.START_NOT_STICKY;
         }
diff --git a/app/src/main/java/com/termux/app/settings/properties/SharedProperties.java b/app/src/main/java/com/termux/app/settings/properties/SharedProperties.java
index bf47fa0074..49d9f3e28e 100644
--- a/app/src/main/java/com/termux/app/settings/properties/SharedProperties.java
+++ b/app/src/main/java/com/termux/app/settings/properties/SharedProperties.java
@@ -3,6 +3,7 @@
 import android.content.Context;
 import android.widget.Toast;
 
+import com.google.common.collect.ImmutableBiMap;
 import com.google.common.primitives.Primitives;
 import com.termux.app.utils.Logger;
 
@@ -21,11 +22,16 @@
 /**
  * An implementation similar to android's {@link android.content.SharedPreferences} interface for
  * reading and writing to and from ".properties" files which also maintains an in-memory cache for
- * the key/value pairs. Operations are does under synchronization locks and should be thread safe.
+ * the key/value pairs when an instance object is used. Operations are done under
+ * synchronization locks and should be thread safe.
  *
- * Two types of in-memory cache maps are maintained, one for the literal {@link String} values found
- * in the file for the keys and an additional one that stores (near) primitive {@link Object} values for
- * internal use by the caller.
+ * If {@link SharedProperties} instance object is used, then two types of in-memory cache maps are
+ * maintained, one for the literal {@link String} values found in the file for the keys and an
+ * additional one that stores (near) primitive {@link Object} values for internal use by the caller.
+ *
+ * The {@link SharedProperties} also provides static functions that can be used to read properties
+ * from files or individual key values or even their internal values. An automatic mapping to a
+ * boolean as internal value can also be done. An in-memory cache is not maintained, nor a locks used.
  *
  * This currently only has read support, write support can/will be added later if needed. Check android's
  * SharedPreferencesImpl class for reference implementation.
@@ -57,6 +63,20 @@ public class SharedProperties {
 
     private final Object mLock = new Object();
 
+    /** Defines the bidirectional map for boolean values and their internal values  */
+    public static final ImmutableBiMap<String, Boolean> MAP_GENERIC_BOOLEAN =
+        new ImmutableBiMap.Builder<String, Boolean>()
+            .put("true", true)
+            .put("false", false)
+            .build();
+
+    /** Defines the bidirectional map for inverted boolean values and their internal values  */
+    public static final ImmutableBiMap<String, Boolean> MAP_GENERIC_INVERTED_BOOLEAN =
+        new ImmutableBiMap.Builder<String, Boolean>()
+            .put("true", false)
+            .put("false", true)
+            .build();
+
     private static final String LOG_TAG = "SharedProperties";
 
     /**
@@ -65,7 +85,7 @@ public class SharedProperties {
      * @param context The Context for operations.
      * @param propertiesFile The {@link File} object to load properties from.
      * @param propertiesList The {@link Set<String>} object that defined which properties to load.
-     * @param sharedPropertiesParser that implements the {@link SharedPropertiesParser} interface.
+     * @param sharedPropertiesParser The implementation of the {@link SharedPropertiesParser} interface.
      */
     public SharedProperties(@Nonnull Context context, @Nullable File propertiesFile, @Nonnull Set<String> propertiesList, @Nonnull SharedPropertiesParser sharedPropertiesParser) {
         mContext = context;
@@ -102,7 +122,7 @@ public void loadPropertiesFromDisk() {
                 Logger.logDebug(LOG_TAG, key + " : " + value);
 
                 // Call the {@link SharedPropertiesParser#getInternalPropertyValueFromValue(Context,String,String)}
-                // interface method to get the internal value to store in the  {@link #mMap}.
+                // interface method to get the internal value to store in the {@link #mMap}.
                 internalValue = mSharedPropertiesParser.getInternalPropertyValueFromValue(mContext, key, value);
 
                 // If the internal value was successfully added to map, then also add value to newProperties
@@ -117,6 +137,178 @@ public void loadPropertiesFromDisk() {
         }
     }
 
+    /**
+     * Get the {@link Properties} object for the {@link #mPropertiesFile}. The {@link Properties}
+     * object will also contain properties not defined by the {@link #mPropertiesList} if cache
+     * value is {@code false}.
+     *
+     * @param cached If {@code true}, then the {@link #mProperties} in-memory cache is returned. Otherwise
+     *               the {@link Properties} object is directly read from the {@link #mPropertiesFile}.
+     * @return Returns the {@link Properties} object if read from file, otherwise a copy of {@link #mProperties}.
+     */
+    public Properties getProperties(boolean cached) {
+        synchronized (mLock) {
+            if (cached) {
+                if (mProperties == null) mProperties = new Properties();
+                return getPropertiesCopy(mProperties);
+            } else {
+                return getPropertiesFromFile(mContext, mPropertiesFile);
+            }
+        }
+    }
+
+    /**
+     * Get the {@link String} value for the key passed from the {@link #mPropertiesFile}.
+     *
+     * @param key The key to read from the {@link Properties} object.
+     * @param cached If {@code true}, then the value is returned from the {@link #mProperties} in-memory cache.
+     *               Otherwise the {@link Properties} object is read directly from the {@link #mPropertiesFile}
+     *               and value is returned from it against the key.
+     * @return Returns the {@link String} object. This will be {@code null} if key is not found.
+     */
+    public String getProperty(String key, boolean cached) {
+        synchronized (mLock) {
+            return (String) getProperties(cached).get(key);
+        }
+    }
+
+    /**
+     * Get the {@link #mMap} object for the {@link #mPropertiesFile}. A call to
+     * {@link #loadPropertiesFromDisk()} must be made before this.
+     *
+     * @return Returns a copy of {@link #mMap} object.
+     */
+    public Map<String, Object> getInternalProperties() {
+        synchronized (mLock) {
+            if (mMap == null) mMap = new HashMap<String, Object>();
+            return getMapCopy(mMap);
+        }
+    }
+
+    /**
+     * Get the internal {@link Object} value for the key passed from the {@link #mPropertiesFile}.
+     * The value is returned from the {@link #mMap} in-memory cache, so a call to
+     * {@link #loadPropertiesFromDisk()} must be made before this.
+     *
+     * @param key The key to read from the {@link #mMap} object.
+     * @return Returns the {@link Object} object. This will be {@code null} if key is not found or
+     * if object was {@code null}. Use {@link HashMap#containsKey(Object)} to detect the later.
+     * situation.
+     */
+    public Object getInternalProperty(String key) {
+        synchronized (mLock) {
+            // null keys are not allowed to be stored in mMap
+            if (key != null)
+                return getInternalProperties().get(key);
+            else
+                return null;
+        }
+    }
+
+
+
+
+
+    /**
+     * A static function to get the {@link Properties} object for the propertiesFile. A lock is not
+     * taken when this function is called.
+     *
+     * @param context The {@link Context} to use to show a flash if an exception is raised while
+     *                reading the file. If context is {@code null}, then flash will not be shown.
+     * @param propertiesFile The {@link File} to read the {@link Properties} from.
+     * @return Returns the {@link Properties} object. It will be {@code null} if an exception is
+     * raised while reading the file.
+     */
+    public static Properties getPropertiesFromFile(Context context, File propertiesFile) {
+        Properties properties = new Properties();
+
+        if (propertiesFile == null) {
+            Logger.logError(LOG_TAG, "Not loading properties since file is null");
+            return properties;
+        }
+
+        try {
+            try (FileInputStream in = new FileInputStream(propertiesFile)) {
+                Logger.logVerbose(LOG_TAG, "Loading properties from \"" + propertiesFile.getAbsolutePath() + "\" file");
+                properties.load(new InputStreamReader(in, StandardCharsets.UTF_8));
+            }
+        } catch (Exception e) {
+            if(context != null)
+                Toast.makeText(context, "Could not open properties file \"" + propertiesFile.getAbsolutePath() + "\": " + e.getMessage(), Toast.LENGTH_LONG).show();
+            Logger.logStackTraceWithMessage(LOG_TAG, "Error loading properties file \"" + propertiesFile.getAbsolutePath() + "\"", e);
+            return null;
+        }
+
+        return properties;
+    }
+
+    /**
+     * A static function to get the {@link String} value for the {@link Properties} key read from
+     * the propertiesFile file.
+     *
+     * @param context The {@link Context} for the {@link #getPropertiesFromFile(Context,File)} call.
+     * @param propertiesFile The {@link File} to read the {@link Properties} from.
+     * @param key The key to read.
+     * @param def The default value.
+     * @return Returns the {@link String} object. This will be {@code null} if key is not found.
+     */
+    public static String getProperty(Context context, File propertiesFile, String key, String def) {
+        return (String) getDefaultIfNull(getDefaultIfNull(getPropertiesFromFile(context, propertiesFile), new Properties()).get(key), def);
+    }
+
+    /**
+     * A static function to get the internal {@link Object} value for the {@link String} value for
+     * the {@link Properties} key read from the propertiesFile file.
+     *
+     * @param context The {@link Context} for the {@link #getPropertiesFromFile(Context,File)} call.
+     * @param propertiesFile The {@link File} to read the {@link Properties} from.
+     * @param key The key to read.
+     * @param sharedPropertiesParser The implementation of the {@link SharedPropertiesParser} interface.
+     * @return Returns the {@link String} Object returned by the call to
+     * {@link SharedPropertiesParser#getInternalPropertyValueFromValue(Context,String,String)}.
+     */
+    public static Object getInternalProperty(Context context, File propertiesFile, String key, @Nonnull SharedPropertiesParser sharedPropertiesParser) {
+        String value = (String) getDefaultIfNull(getPropertiesFromFile(context, propertiesFile), new Properties()).get(key);
+
+        // Call the {@link SharedPropertiesParser#getInternalPropertyValueFromValue(Context,String,String)}
+        // interface method to get the internal value to return.
+        return sharedPropertiesParser.getInternalPropertyValueFromValue(context, key, value);
+    }
+
+    /**
+     * A static function to check if the value is {@code true} for {@link Properties} key read from
+     * the propertiesFile file.
+     *
+     * @param context The {@link Context} for the {@link #getPropertiesFromFile(Context,File)}call.
+     * @param propertiesFile The {@link File} to read the {@link Properties} from.
+     * @param key The key to read.
+     * @return Returns the {@code true} if the {@link Properties} key {@link String} value equals "true",
+     * regardless of case. If the key does not exist in the file or does not equal "true", then
+     * {@code false} will be returned.
+     */
+    public static boolean isPropertyValueTrue(Context context, File propertiesFile, String key) {
+        return (boolean) getBooleanValueForStringValue((String) getProperty(context, propertiesFile, key, null), false);
+    }
+
+    /**
+     * A static function to check if the value is {@code false} for {@link Properties} key read from
+     * the propertiesFile file.
+     *
+     * @param context The {@link Context} for the {@link #getPropertiesFromFile(Context,File)} call.
+     * @param propertiesFile The {@link File} to read the {@link Properties} from.
+     * @param key The key to read.
+     * @return Returns the {@code true} if the {@link Properties} key {@link String} value equals "false",
+     * regardless of case. If the key does not exist in the file or does not equal "false", then
+     * {@code true} will be returned.
+     */
+    public static boolean isPropertyValueFalse(Context context, File propertiesFile, String key) {
+        return (boolean) getInvertedBooleanValueForStringValue((String) getProperty(context, propertiesFile, key, null), true);
+    }
+
+
+
+
+
     /**
      * Put a value in a {@link #mMap}.
      * The key cannot be {@code null}.
@@ -194,121 +386,69 @@ public static boolean putToProperties(Properties properties, String key, String
         return true;
     }
 
-    /**
-     * A static function to get the {@link Properties} object for the propertiesFile. A lock is not
-     * taken when this function is called.
-     *
-     * @param context The {@link Context} to use to show a flash if an exception is raised while
-     *                reading the file. If context is {@code null}, then flash will not be shown.
-     * @param propertiesFile The {@link File} to read the {@link Properties} from.
-     * @return Returns the {@link Properties} object. It will be {@code null} if an exception is
-     * raised while reading the file.
-     */
-    public static Properties getPropertiesFromFile(Context context, File propertiesFile) {
-        Properties properties = new Properties();
+    public static Properties getPropertiesCopy(Properties inputProperties) {
+        if(inputProperties == null) return null;
 
-        if (propertiesFile == null) {
-            Logger.logError(LOG_TAG, "Not loading properties since file is null");
-            return properties;
+        Properties outputProperties = new Properties();
+        for (String key : inputProperties.stringPropertyNames()) {
+            outputProperties.put(key, inputProperties.get(key));
         }
 
-        try {
-            try (FileInputStream in = new FileInputStream(propertiesFile)) {
-                Logger.logVerbose(LOG_TAG, "Loading properties from \"" + propertiesFile.getAbsolutePath() + "\" file");
-                properties.load(new InputStreamReader(in, StandardCharsets.UTF_8));
-            }
-        } catch (Exception e) {
-            if(context != null)
-                Toast.makeText(context, "Could not open properties file \"" + propertiesFile.getAbsolutePath() + "\": " + e.getMessage(), Toast.LENGTH_LONG).show();
-            Logger.logStackTraceWithMessage(LOG_TAG, "Error loading properties file \"" + propertiesFile.getAbsolutePath() + "\"", e);
-            return null;
-        }
+        return outputProperties;
+    }
 
-        return properties;
+    public static Map<String, Object> getMapCopy(Map<String, Object> map) {
+        if(map == null) return null;
+        return new HashMap<String, Object>(map);
     }
 
+
+
+
+
     /**
-     * Get the {@link Properties} object for the {@link #mPropertiesFile}. The {@link Properties}
-     * object will also contain properties not defined by the {@link #mPropertiesList} if cache
-     * value is {@code false}.
+     * Get the boolean value for the {@link String} value.
      *
-     * @param cached If {@code true}, then the {@link #mProperties} in-memory cache is returned. Otherwise
-     *               the {@link Properties} object is directly read from the {@link #mPropertiesFile}.
-     * @return Returns the {@link Properties} object if read from file, otherwise a copy of {@link #mProperties}.
+     * @param value The {@link String} value to convert.
+     * @param def The default {@link boolean} value to return.
+     * @return Returns {@code true} or {@code false} if value is the literal string "true" or "false" respectively,
+     * regardless of case. Otherwise returns default value.
      */
-    public Properties getProperties(boolean cached) {
-        synchronized (mLock) {
-            if (cached) {
-                if (mProperties == null) mProperties = new Properties();
-                return getPropertiesCopy(mProperties);
-            } else {
-                return getPropertiesFromFile(mContext, mPropertiesFile);
-            }
-        }
+    public static boolean getBooleanValueForStringValue(String value, boolean def) {
+        return (boolean) getDefaultIfNull(MAP_GENERIC_BOOLEAN.get(toLowerCase(value)), def);
     }
 
     /**
-     * Get the {@link String} value for the key passed from the {@link #mPropertiesFile}.
+     * Get the inverted boolean value for the {@link String} value.
      *
-     * @param key The key to read from the {@link Properties} object.
-     * @param cached If {@code true}, then the value is returned from the {@link #mProperties} in-memory cache.
-     *               Otherwise the {@link Properties} object is read directly from the {@link #mPropertiesFile}
-     *               and value is returned from it against the key.
-     * @return Returns the {@link String} object. This will be {@code null} if key is not found.
+     * @param value The {@link String} value to convert.
+     * @param def The default {@link boolean} value to return.
+     * @return Returns {@code true} or {@code false} if value is the literal string "false" or "true" respectively,
+     * regardless of case. Otherwise returns default value.
      */
-    public String getProperty(String key, boolean cached) {
-        synchronized (mLock) {
-            return (String) getProperties(cached).get(key);
-        }
+    public static boolean getInvertedBooleanValueForStringValue(String value, boolean def) {
+        return (boolean) getDefaultIfNull(MAP_GENERIC_INVERTED_BOOLEAN.get(toLowerCase(value)), def);
     }
 
     /**
-     * Get the {@link #mMap} object for the {@link #mPropertiesFile}. A call to
-     * {@link #loadPropertiesFromDisk()} must be made before this.
+     * Get the object itself if it is not {@code null}, otherwise default.
      *
-     * @return Returns a copy of {@link #mMap} object.
+     * @param object The {@link Object} to check.
+     * @param def The default {@link Object}.
+     * @return Returns {@code object} if it is not {@code null}, otherwise returns {@code def}.
      */
-    public Map<String, Object> getInternalProperties() {
-        synchronized (mLock) {
-            if (mMap == null) mMap = new HashMap<String, Object>();
-            return getMapCopy(mMap);
-        }
+    public static <T> T getDefaultIfNull(@androidx.annotation.Nullable T object, @androidx.annotation.Nullable T def) {
+        return (object == null) ? def : object;
     }
 
     /**
-     * Get the internal {@link Object} value for the key passed from the {@link #mPropertiesFile}.
-     * The value is returned from the {@link #mMap} in-memory cache, so a call to
-     * {@link #loadPropertiesFromDisk()} must be made before this.
+     * Covert the {@link String} value to lowercase.
      *
-     * @param key The key to read from the {@link #mMap} object.
-     * @return Returns the {@link Object} object. This will be {@code null} if key is not found or
-     * if object was {@code null}. Use {@link HashMap#containsKey(Object)} to detect the later.
-     * situation.
+     * @param value The {@link String} value to convert.
+     * @return Returns the lowercased value.
      */
-    public Object getInternalProperty(String key) {
-        synchronized (mLock) {
-            // null keys are not allowed to be stored in mMap
-            if (key != null)
-                return getInternalProperties().get(key);
-            else
-                return null;
-        }
-    }
-
-    public static Properties getPropertiesCopy(Properties inputProperties) {
-        if(inputProperties == null) return null;
-
-        Properties outputProperties = new Properties();
-        for (String key : inputProperties.stringPropertyNames()) {
-            outputProperties.put(key, inputProperties.get(key));
-        }
-
-        return outputProperties;
-    }
-
-    public static Map<String, Object> getMapCopy(Map<String, Object> map) {
-        if(map == null) return null;
-        return new HashMap<String, Object>(map);
+    public static String toLowerCase(String value) {
+        if (value == null) return null; else return value.toLowerCase();
     }
 
 }
diff --git a/app/src/main/java/com/termux/app/settings/properties/TermuxPropertyConstants.java b/app/src/main/java/com/termux/app/settings/properties/TermuxPropertyConstants.java
index 50ae0982cd..b3acbb3973 100644
--- a/app/src/main/java/com/termux/app/settings/properties/TermuxPropertyConstants.java
+++ b/app/src/main/java/com/termux/app/settings/properties/TermuxPropertyConstants.java
@@ -10,19 +10,23 @@
 import java.util.Set;
 
 /*
- * Version: v0.3.0
+ * Version: v0.4.0
  *
  * Changelog
  *
  * - 0.1.0 (2021-03-11)
  *      - Initial Release.
+ *
  * - 0.2.0 (2021-03-11)
  *      - Renamed `HOME_PATH` to `TERMUX_HOME_DIR_PATH`
  *      - Renamed `TERMUX_PROPERTIES_PRIMARY_PATH` to `TERMUX_PROPERTIES_PRIMARY_FILE_PATH`
  *      - Renamed `TERMUX_PROPERTIES_SECONDARY_FILE_PATH` to `TERMUX_PROPERTIES_SECONDARY_FILE_PATH`
+ *
  * - 0.3.0 (2021-03-16)
  *      - Add `*TERMINAL_TOOLBAR_HEIGHT_SCALE_FACTOR*`
  *
+ * - 0.4.0 (2021-03-16)
+ *      - Removed `MAP_GENERIC_BOOLEAN` and `MAP_GENERIC_INVERTED_BOOLEAN`.
  */
 
 /**
@@ -38,22 +42,6 @@
  */
 public final class TermuxPropertyConstants {
 
-    /** Defines the bidirectional map for boolean values and their internal values  */
-    public static final ImmutableBiMap<String, Boolean> MAP_GENERIC_BOOLEAN =
-        new ImmutableBiMap.Builder<String, Boolean>()
-            .put("true", true)
-            .put("false", false)
-            .build();
-
-    /** Defines the bidirectional map for inverted boolean values and their internal values  */
-    public static final ImmutableBiMap<String, Boolean> MAP_GENERIC_INVERTED_BOOLEAN =
-        new ImmutableBiMap.Builder<String, Boolean>()
-            .put("true", false)
-            .put("false", true)
-            .build();
-
-
-
     /** Defines the key for whether to use back key as the escape key */
     public static final String KEY_USE_BACK_KEY_AS_ESCAPE_KEY =  "back-key"; // Default: "back-key"
 
diff --git a/app/src/main/java/com/termux/app/settings/properties/TermuxSharedProperties.java b/app/src/main/java/com/termux/app/settings/properties/TermuxSharedProperties.java
index e8acf5fd31..a39c273b4a 100644
--- a/app/src/main/java/com/termux/app/settings/properties/TermuxSharedProperties.java
+++ b/app/src/main/java/com/termux/app/settings/properties/TermuxSharedProperties.java
@@ -3,8 +3,6 @@
 import android.content.Context;
 import android.content.res.Configuration;
 
-import androidx.annotation.Nullable;
-
 import com.termux.app.terminal.io.extrakeys.ExtraKeysInfo;
 import com.termux.app.terminal.io.KeyboardShortcut;
 import com.termux.app.utils.Logger;
@@ -39,9 +37,6 @@ public TermuxSharedProperties(@Nonnull Context context) {
         loadTermuxPropertiesFromDisk();
     }
 
-
-
-
     /**
      * Reload the termux properties from disk into an in-memory cache.
      */
@@ -102,66 +97,6 @@ private void setSessionShortcuts() {
 
 
 
-    /**
-     * A static function to get the {@link Properties} from the propertiesFile file.
-     *
-     * @param context The {@link Context} for the {@link SharedProperties#getPropertiesFromFile(Context,File)} call.
-     * @param propertiesFile The {@link File} to read the {@link Properties} from.
-     * @return Returns the {@link Properties} object. It will be {@code null} if an exception is
-     * raised while reading the file.
-     */
-    public static Properties getPropertiesFromFile(Context context, File propertiesFile) {
-        return SharedProperties.getPropertiesFromFile(context, propertiesFile);
-    }
-
-    /**
-     * A static function to get the {@link String} value for the {@link Properties} key read from
-     * the propertiesFile file.
-     *
-     * @param context The {@link Context} for the {@link SharedProperties#getPropertiesFromFile(Context,File)} call.
-     * @param propertiesFile The {@link File} to read the {@link Properties} from.
-     * @param key The key to read.
-     * @param def The default value.
-     * @return Returns the {@link String} object. This will be {@code null} if key is not found.
-     */
-    public static String getPropertyValue(Context context, File propertiesFile, String key, String def) {
-        return (String) getDefaultIfNull(getDefaultIfNull(getPropertiesFromFile(context, propertiesFile), new Properties()).get(key), def);
-    }
-
-    /**
-     * A static function to check if the value is {@code true} for {@link Properties} key read from
-     * the propertiesFile file.
-     *
-     * @param context The {@link Context} for the {@link SharedProperties#getPropertiesFromFile(Context,File)}call.
-     * @param propertiesFile The {@link File} to read the {@link Properties} from.
-     * @param key The key to read.
-     * @return Returns the {@code true} if the {@link Properties} key {@link String} value equals "true",
-     * regardless of case. If the key does not exist in the file or does not equal "true", then
-     * {@code false} will be returned.
-     */
-    public static boolean isPropertyValueTrue(Context context, File propertiesFile, String key) {
-        return (boolean) getBooleanValueForStringValue((String) getPropertyValue(context, propertiesFile, key, null), false);
-    }
-
-    /**
-     * A static function to check if the value is {@code false} for {@link Properties} key read from
-     * the propertiesFile file.
-     *
-     * @param context The {@link Context} for the {@link SharedProperties#getPropertiesFromFile(Context,File)} call.
-     * @param propertiesFile The {@link File} to read the {@link Properties} from.
-     * @param key The key to read.
-     * @return Returns the {@code true} if the {@link Properties} key {@link String} value equals "false",
-     * regardless of case. If the key does not exist in the file or does not equal "false", then
-     * {@code true} will be returned.
-     */
-    public static boolean isPropertyValueFalse(Context context, File propertiesFile, String key) {
-        return (boolean) getInvertedBooleanValueForStringValue((String) getPropertyValue(context, propertiesFile, key, null), true);
-    }
-
-
-
-
-
     /**
      * Get the {@link Properties} from the {@link #mPropertiesFile} file.
      *
@@ -186,7 +121,7 @@ public Properties getProperties(boolean cached) {
      * @return Returns the {@link String} object. This will be {@code null} if key is not found.
      */
     public String getPropertyValue(String key, String def, boolean cached) {
-        return getDefaultIfNull(mSharedProperties.getProperty(key, cached), def);
+        return SharedProperties.getDefaultIfNull(mSharedProperties.getProperty(key, cached), def);
     }
 
     /**
@@ -202,7 +137,7 @@ public String getPropertyValue(String key, String def, boolean cached) {
      * {@code false} will be returned.
      */
     public boolean isPropertyValueTrue(String key, boolean cached) {
-        return (boolean) getBooleanValueForStringValue((String) getPropertyValue(key, null, cached), false);
+        return (boolean) SharedProperties.getBooleanValueForStringValue((String) getPropertyValue(key, null, cached), false);
     }
 
     /**
@@ -218,7 +153,7 @@ public boolean isPropertyValueTrue(String key, boolean cached) {
      * {@code true} will be returned.
      */
     public boolean isPropertyValueFalse(String key, boolean cached) {
-        return (boolean) getInvertedBooleanValueForStringValue((String) getPropertyValue(key, null, cached), true);
+        return (boolean) SharedProperties.getInvertedBooleanValueForStringValue((String) getPropertyValue(key, null, cached), true);
     }
 
 
@@ -335,10 +270,10 @@ public static Object getInternalTermuxPropertyValueFromValue(Context context, St
             default:
                 // default boolean behaviour
                 if(TermuxPropertyConstants.TERMUX_DEFAULT_BOOLEAN_BEHAVIOUR_PROPERTIES_LIST.contains(key))
-                    return (boolean) getBooleanValueForStringValue(value, false);
+                    return (boolean) SharedProperties.getBooleanValueForStringValue(value, false);
                 // default inverted boolean behaviour
                 else if(TermuxPropertyConstants.TERMUX_DEFAULT_INVERETED_BOOLEAN_BEHAVIOUR_PROPERTIES_LIST.contains(key))
-                    return (boolean) getInvertedBooleanValueForStringValue(value, true);
+                    return (boolean) SharedProperties.getInvertedBooleanValueForStringValue(value, true);
                 // just use String object as is (may be null)
                 else
                     return value;
@@ -349,30 +284,6 @@ else if(TermuxPropertyConstants.TERMUX_DEFAULT_INVERETED_BOOLEAN_BEHAVIOUR_PROPE
 
 
 
-    /**
-     * Get the boolean value for the {@link String} value.
-     *
-     * @param value The {@link String} value to convert.
-     * @param def The default {@link boolean} value to return.
-     * @return Returns {@code true} or {@code false} if value is the literal string "true" or "false" respectively,
-     * regardless of case. Otherwise returns default value.
-     */
-    public static boolean getBooleanValueForStringValue(String value, boolean def) {
-        return (boolean) getDefaultIfNull(TermuxPropertyConstants.MAP_GENERIC_BOOLEAN.get(toLowerCase(value)), def);
-    }
-
-    /**
-     * Get the inverted boolean value for the {@link String} value.
-     *
-     * @param value The {@link String} value to convert.
-     * @param def The default {@link boolean} value to return.
-     * @return Returns {@code true} or {@code false} if value is the literal string "false" or "true" respectively,
-     * regardless of case. Otherwise returns default value.
-     */
-    public static boolean getInvertedBooleanValueForStringValue(String value, boolean def) {
-        return (boolean) getDefaultIfNull(TermuxPropertyConstants.MAP_GENERIC_INVERTED_BOOLEAN.get(toLowerCase(value)), def);
-    }
-
     /**
      * Returns {@code true} if value is not {@code null} and equals {@link TermuxPropertyConstants#VALUE_BACK_KEY_BEHAVIOUR_ESCAPE}, otherwise false.
      *
@@ -380,7 +291,7 @@ public static boolean getInvertedBooleanValueForStringValue(String value, boolea
      * @return Returns the internal value for value.
      */
     public static boolean getUseBackKeyAsEscapeKeyInternalPropertyValueFromValue(String value) {
-        return getDefaultIfNull(value, TermuxPropertyConstants.VALUE_BACK_KEY_BEHAVIOUR_BACK).equals(TermuxPropertyConstants.VALUE_BACK_KEY_BEHAVIOUR_ESCAPE);
+        return SharedProperties.getDefaultIfNull(value, TermuxPropertyConstants.VALUE_BACK_KEY_BEHAVIOUR_BACK).equals(TermuxPropertyConstants.VALUE_BACK_KEY_BEHAVIOUR_ESCAPE);
     }
 
     /**
@@ -392,7 +303,7 @@ public static boolean getUseBackKeyAsEscapeKeyInternalPropertyValueFromValue(Str
      */
     public static boolean getUseBlackUIInternalPropertyValueFromValue(Context context, String value) {
         int nightMode = context.getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
-        return getBooleanValueForStringValue(value, nightMode == Configuration.UI_MODE_NIGHT_YES);
+        return SharedProperties.getBooleanValueForStringValue(value, nightMode == Configuration.UI_MODE_NIGHT_YES);
     }
 
     /**
@@ -403,7 +314,7 @@ public static boolean getUseBlackUIInternalPropertyValueFromValue(Context contex
      * @return Returns the internal value for value.
      */
     public static boolean getVolumeKeysDisabledInternalPropertyValueFromValue(String value) {
-        return getDefaultIfNull(value, TermuxPropertyConstants.VALUE_VOLUME_KEY_BEHAVIOUR_VIRTUAL).equals(TermuxPropertyConstants.VALUE_VOLUME_KEY_BEHAVIOUR_VOLUME);
+        return SharedProperties.getDefaultIfNull(value, TermuxPropertyConstants.VALUE_VOLUME_KEY_BEHAVIOUR_VIRTUAL).equals(TermuxPropertyConstants.VALUE_VOLUME_KEY_BEHAVIOUR_VOLUME);
     }
 
     /**
@@ -415,7 +326,7 @@ public static boolean getVolumeKeysDisabledInternalPropertyValueFromValue(String
      * @return Returns the internal value for value.
      */
     public static int getBellBehaviourInternalPropertyValueFromValue(String value) {
-        return getDefaultIfNull(TermuxPropertyConstants.MAP_BELL_BEHAVIOUR.get(toLowerCase(value)), TermuxPropertyConstants.DEFAULT_IVALUE_BELL_BEHAVIOUR);
+        return SharedProperties.getDefaultIfNull(TermuxPropertyConstants.MAP_BELL_BEHAVIOUR.get(SharedProperties.toLowerCase(value)), TermuxPropertyConstants.DEFAULT_IVALUE_BELL_BEHAVIOUR);
     }
 
     /**
@@ -505,7 +416,7 @@ public static String getDefaultWorkingDirectoryInternalPropertyValueFromValue(St
      * @return Returns the internal value for value.
      */
     public static String getExtraKeysInternalPropertyValueFromValue(String value) {
-        return getDefaultIfNull(value, TermuxPropertyConstants.DEFAULT_IVALUE_EXTRA_KEYS);
+        return SharedProperties.getDefaultIfNull(value, TermuxPropertyConstants.DEFAULT_IVALUE_EXTRA_KEYS);
     }
 
     /**
@@ -515,7 +426,7 @@ public static String getExtraKeysInternalPropertyValueFromValue(String value) {
      * @return Returns the internal value for value.
      */
     public static String getExtraKeysStyleInternalPropertyValueFromValue(String value) {
-        return getDefaultIfNull(value, TermuxPropertyConstants.DEFAULT_IVALUE_EXTRA_KEYS_STYLE);
+        return SharedProperties.getDefaultIfNull(value, TermuxPropertyConstants.DEFAULT_IVALUE_EXTRA_KEYS_STYLE);
     }
 
 
@@ -574,17 +485,6 @@ public ExtraKeysInfo getExtraKeysInfo() {
 
 
 
-    public static <T> T getDefaultIfNull(@Nullable T object, @Nullable T def) {
-        return (object == null) ? def : object;
-    }
-
-    private static String toLowerCase(String value) {
-        if (value == null) return null; else return value.toLowerCase();
-    }
-
-
-
-
     public void dumpPropertiesToLog() {
         Properties properties = getProperties(true);
         StringBuilder propertiesDump = new StringBuilder();
@@ -598,7 +498,7 @@ public void dumpPropertiesToLog() {
             propertiesDump.append(" null");
         }
 
-        Logger.logDebug(LOG_TAG, propertiesDump.toString());
+        Logger.logVerbose(LOG_TAG, propertiesDump.toString());
     }
 
     public void dumpInternalPropertiesToLog() {
@@ -612,7 +512,7 @@ public void dumpInternalPropertiesToLog() {
             }
         }
 
-        Logger.logDebug(LOG_TAG, internalPropertiesDump.toString());
+        Logger.logVerbose(LOG_TAG, internalPropertiesDump.toString());
     }
 
 }

From 8c1c7ce7277bffddbe1107c99c49494092fcb0a3 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 17 Mar 2021 01:13:44 +0500
Subject: [PATCH 244/912] Update TermuxConstants

The `TermuxConstants` classes has been updated to `v0.7.0`. Check its Changelog sections for info on changes.
---
 .../java/com/termux/app/TermuxConstants.java  | 36 ++++++++++---------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxConstants.java b/app/src/main/java/com/termux/app/TermuxConstants.java
index 87714f4462..56a147f2a6 100644
--- a/app/src/main/java/com/termux/app/TermuxConstants.java
+++ b/app/src/main/java/com/termux/app/TermuxConstants.java
@@ -5,7 +5,7 @@
 import java.io.File;
 
 /*
- * Version: v0.6.0
+ * Version: v0.7.0
  *
  * Changelog
  *
@@ -42,10 +42,13 @@
  *          `TERMUX_WIDGET_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION`.
  *
  * - 0.5.0 (2021-03-16)
- *      - Renamed "Termux Plugin app" labels to "Termux Tasker app"
+ *      - Renamed "Termux Plugin app" labels to "Termux Tasker app".
  *
  * - 0.6.0 (2021-03-16)
- *      - Added `TERMUX_FILE_SHARE_URI_AUTHORITY`
+ *      - Added `TERMUX_FILE_SHARE_URI_AUTHORITY`.
+ *
+ * - 0.7.0 (2021-03-17)
+ *      - Fixed javadocs.
  */
 
 /**
@@ -55,32 +58,33 @@
  * interacting with termux apps. If changes are made to this file, increment the version number
  * and add an entry in the Changelog section above.
  *
- * Termux app default package name is "com.termux" and is used in PREFIX_PATH.
- * The binaries compiled for termux have PREFIX_PATH hardcoded in them but it can be changed during
- * compilation.
+ * Termux app default package name is "com.termux" and is used in {@link #TERMUX_PREFIX_DIR_PATH}.
+ * The binaries compiled for termux have {@link #TERMUX_PREFIX_DIR_PATH} hardcoded in them but it
+ * can be changed during compilation.
  *
- * The TERMUX_PACKAGE_NAME must be the same as the applicationId of termux-app build.gradle since
- * its also used by FILES_PATH.
- * If TERMUX_PACKAGE_NAME is changed, then binaries, specially used in bootstrap need to be compiled
- * appropriately. Check https://github.com/termux/termux-packages/wiki/Building-packages for more info.
+ * The {@link #TERMUX_PACKAGE_NAME} must be the same as the applicationId of termux-app build.gradle
+ * since its also used by {@link #TERMUX_FILES_DIR_PATH}.
+ * If {@link #TERMUX_PACKAGE_NAME} is changed, then binaries, specially used in bootstrap need to be
+ * compiled appropriately. Check https://github.com/termux/termux-packages/wiki/Building-packages
+ * for more info.
  *
  * Ideally the only places where changes should be required if changing package name are the following:
- * - The TERMUX_PACKAGE_NAME in TermuxConstants.
+ * - The {@link #TERMUX_PACKAGE_NAME} in {@link TermuxConstants}.
  * - The "applicationId" in "build.gradle". This is package name that android and app stores will
  *       use and is also the final package name stored in "AndroidManifest.xml".
- * - The "manifestPlaceholders" values for TERMUX_PACKAGE_NAME and *_APP_NAME in "build.gradle".
- * - The "ENTITY" values for TERMUX_PACKAGE_NAME and *_APP_NAME in "strings.xml".
+ * - The "manifestPlaceholders" values for {@link #TERMUX_PACKAGE_NAME} and *_APP_NAME in "build.gradle".
+ * - The "ENTITY" values for {@link #TERMUX_PACKAGE_NAME} and *_APP_NAME in "strings.xml".
  * - The "shortcut.xml" files like in termux-app since dynamic variables don't work in it.
  * - Optionally the "package" in "AndroidManifest.xml" if modifying project structure. This is
  *      package name for java classes project structure and is prefixed if activity and service
  *      names use dot (.) notation.
- * - Optionally the *_PATH variables in TermuxConstants containing the string "termux".
+ * - Optionally the *_PATH variables in {@link TermuxConstants} containing the string "termux".
  *
  * Check https://developer.android.com/studio/build/application-id for info on "package" in
  * "AndroidManifest.xml" and "applicationId" in "build.gradle".
  *
- * TERMUX_PACKAGE_NAME must be used in source code of Termux app and its plugins instead of hardcoded
- * "com.termux" paths.
+ * {@link #TERMUX_PACKAGE_NAME} must be used in source code of Termux app and its plugins instead of
+ * hardcoded "com.termux" paths.
  */
 public final class TermuxConstants {
 

From c1a377d15df42a77b89f490f9a1daeadaaf5de45 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 17 Mar 2021 03:16:37 +0500
Subject: [PATCH 245/912] Update SharedPreferenceUtils

This SharedPreferenceUtils now supports:
- Getting `Context.MODE_PRIVATE` and/or `Context.MODE_MULTI_PROCESS` `SharedPreference` instances.
- Setting values to shared preferences in-memory cache and the file synchronously.
- Getting and setting `float`, `long` and `Set<Sting>` values in shared preferences.
---
 .../preferences/SharedPreferenceUtils.java    | 226 +++++++++++++++++-
 .../TermuxAppSharedPreferences.java           |  18 +-
 2 files changed, 227 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/com/termux/app/settings/preferences/SharedPreferenceUtils.java b/app/src/main/java/com/termux/app/settings/preferences/SharedPreferenceUtils.java
index 3f2a9b1741..389ba9ba29 100644
--- a/app/src/main/java/com/termux/app/settings/preferences/SharedPreferenceUtils.java
+++ b/app/src/main/java/com/termux/app/settings/preferences/SharedPreferenceUtils.java
@@ -1,13 +1,47 @@
 package com.termux.app.settings.preferences;
 
+import android.annotation.SuppressLint;
+import android.content.Context;
 import android.content.SharedPreferences;
 
 import com.termux.app.utils.Logger;
 
+import java.util.Set;
+
 public class SharedPreferenceUtils {
 
     private static final String LOG_TAG = "SharedPreferenceUtils";
 
+    /**
+     * Get {@link SharedPreferences} instance of the preferences file 'name' with the operating mode
+     * {@link Context#MODE_PRIVATE}. This file will be created in the app package's default
+     * shared preferences directory.
+     *
+     * @param context The {@link Context} to get the {@link SharedPreferences} instance.
+     * @param name The preferences file basename without extension.
+     * @return The single {@link SharedPreferences} instance that can be used to retrieve and
+     * modify the preference values.
+     */
+    public static SharedPreferences getPrivateSharedPreferences(Context context, String name) {
+        return context.getSharedPreferences(name, Context.MODE_PRIVATE);
+    }
+
+    /**
+     * Get {@link SharedPreferences} instance of the preferences file 'name' with the operating mode
+     * {@link Context#MODE_PRIVATE} and {@link Context#MODE_MULTI_PROCESS}. This file will be
+     * created in the app package's default shared preferences directory.
+     *
+     * @param context The {@link Context} to get the {@link SharedPreferences} instance.
+     * @param name The preferences file basename without extension.
+     * @return The single {@link SharedPreferences} instance that can be used to retrieve and
+     * modify the preference values.
+     */
+    public static SharedPreferences getPrivateAndMultiProcessSharedPreferences(Context context, String name) {
+        return context.getSharedPreferences(name, Context.MODE_PRIVATE | Context.MODE_MULTI_PROCESS);
+    }
+
+
+
     /**
      * Get a {@code boolean} from {@link SharedPreferences}.
      *
@@ -38,14 +72,71 @@ public static boolean getBoolean(SharedPreferences sharedPreferences, String key
      * @param sharedPreferences The {@link SharedPreferences} to set the value in.
      * @param key The key for the value.
      * @param value The value to store.
+     * @param commitToFile If set to {@code true}, then value will be set to shared preferences
+     *                     in-memory cache and the file synchronously. Ideally, only to be used for
+     *                     multi-process use-cases.
      */
-    public static void setBoolean(SharedPreferences sharedPreferences, String key, boolean value) {
+    @SuppressLint("ApplySharedPref")
+    public static void setBoolean(SharedPreferences sharedPreferences, String key, boolean value, boolean commitToFile) {
         if(sharedPreferences == null) {
             Logger.logError(LOG_TAG, "Ignoring setting boolean value \"" + value + "\" for the \"" + key + "\" key into null shared preferences.");
             return;
         }
 
-        sharedPreferences.edit().putBoolean(key, value).apply();
+        if(commitToFile)
+            sharedPreferences.edit().putBoolean(key, value).commit();
+        else
+            sharedPreferences.edit().putBoolean(key, value).apply();
+
+    }
+
+
+
+    /**
+     * Get a {@code float} from {@link SharedPreferences}.
+     *
+     * @param sharedPreferences The {@link SharedPreferences} to get the value from.
+     * @param key The key for the value.
+     * @param def The default value if failed to read a valid value.
+     * @return Returns the {@code float} value stored in {@link SharedPreferences}, otherwise returns
+     * default if failed to read a valid value, like in case of an exception.
+     */
+    public static float getFloat(SharedPreferences sharedPreferences, String key, float def) {
+        if(sharedPreferences == null) {
+            Logger.logError(LOG_TAG, "Error getting float value for the \"" + key + "\" key from null shared preferences. Returning default value \"" + def + "\".");
+            return def;
+        }
+
+        try {
+            return sharedPreferences.getFloat(key, def);
+        }
+        catch (ClassCastException e) {
+            Logger.logStackTraceWithMessage(LOG_TAG, "Error getting float value for the \"" + key + "\" key from shared preferences. Returning default value \"" + def + "\".", e);
+            return def;
+        }
+    }
+
+    /**
+     * Set a {@code float} in {@link SharedPreferences}.
+     *
+     * @param sharedPreferences The {@link SharedPreferences} to set the value in.
+     * @param key The key for the value.
+     * @param value The value to store.
+     * @param commitToFile If set to {@code true}, then value will be set to shared preferences
+     *                     in-memory cache and the file synchronously. Ideally, only to be used for
+     *                     multi-process use-cases.
+     */
+    @SuppressLint("ApplySharedPref")
+    public static void setFloat(SharedPreferences sharedPreferences, String key, float value, boolean commitToFile) {
+        if(sharedPreferences == null) {
+            Logger.logError(LOG_TAG, "Ignoring setting float value \"" + value + "\" for the \"" + key + "\" key into null shared preferences.");
+            return;
+        }
+
+        if(commitToFile)
+            sharedPreferences.edit().putFloat(key, value).commit();
+        else
+            sharedPreferences.edit().putFloat(key, value).apply();
     }
 
 
@@ -80,14 +171,70 @@ public static int getInt(SharedPreferences sharedPreferences, String key, int de
      * @param sharedPreferences The {@link SharedPreferences} to set the value in.
      * @param key The key for the value.
      * @param value The value to store.
+     * @param commitToFile If set to {@code true}, then value will be set to shared preferences
+     *                     in-memory cache and the file synchronously. Ideally, only to be used for
+     *                     multi-process use-cases.
      */
-    public static void setInt(SharedPreferences sharedPreferences, String key, int value) {
+    @SuppressLint("ApplySharedPref")
+    public static void setInt(SharedPreferences sharedPreferences, String key, int value, boolean commitToFile) {
         if(sharedPreferences == null) {
             Logger.logError(LOG_TAG, "Ignoring setting int value \"" + value + "\" for the \"" + key + "\" key into null shared preferences.");
             return;
         }
 
-        sharedPreferences.edit().putInt(key, value).apply();
+        if(commitToFile)
+            sharedPreferences.edit().putInt(key, value).commit();
+        else
+            sharedPreferences.edit().putInt(key, value).apply();
+    }
+
+
+
+    /**
+     * Get a {@code long} from {@link SharedPreferences}.
+     *
+     * @param sharedPreferences The {@link SharedPreferences} to get the value from.
+     * @param key The key for the value.
+     * @param def The default value if failed to read a valid value.
+     * @return Returns the {@code long} value stored in {@link SharedPreferences}, otherwise returns
+     * default if failed to read a valid value, like in case of an exception.
+     */
+    public static long getLong(SharedPreferences sharedPreferences, String key, long def) {
+        if(sharedPreferences == null) {
+            Logger.logError(LOG_TAG, "Error getting long value for the \"" + key + "\" key from null shared preferences. Returning default value \"" + def + "\".");
+            return def;
+        }
+
+        try {
+            return sharedPreferences.getLong(key, def);
+        }
+        catch (ClassCastException e) {
+            Logger.logStackTraceWithMessage(LOG_TAG, "Error getting long value for the \"" + key + "\" key from shared preferences. Returning default value \"" + def + "\".", e);
+            return def;
+        }
+    }
+
+    /**
+     * Set a {@code long} in {@link SharedPreferences}.
+     *
+     * @param sharedPreferences The {@link SharedPreferences} to set the value in.
+     * @param key The key for the value.
+     * @param value The value to store.
+     * @param commitToFile If set to {@code true}, then value will be set to shared preferences
+     *                     in-memory cache and the file synchronously. Ideally, only to be used for
+     *                     multi-process use-cases.
+     */
+    @SuppressLint("ApplySharedPref")
+    public static void setLong(SharedPreferences sharedPreferences, String key, long value, boolean commitToFile) {
+        if(sharedPreferences == null) {
+            Logger.logError(LOG_TAG, "Ignoring setting long value \"" + value + "\" for the \"" + key + "\" key into null shared preferences.");
+            return;
+        }
+
+        if(commitToFile)
+            sharedPreferences.edit().putLong(key, value).commit();
+        else
+            sharedPreferences.edit().putLong(key, value).apply();
     }
 
 
@@ -122,14 +269,70 @@ public static String getString(SharedPreferences sharedPreferences, String key,
      * @param sharedPreferences The {@link SharedPreferences} to set the value in.
      * @param key The key for the value.
      * @param value The value to store.
+     * @param commitToFile If set to {@code true}, then value will be set to shared preferences
+     *                     in-memory cache and the file synchronously. Ideally, only to be used for
+     *                     multi-process use-cases.
      */
-    public static void setString(SharedPreferences sharedPreferences, String key, String value) {
+    @SuppressLint("ApplySharedPref")
+    public static void setString(SharedPreferences sharedPreferences, String key, String value, boolean commitToFile) {
         if(sharedPreferences == null) {
             Logger.logError(LOG_TAG, "Ignoring setting String value \"" + value + "\" for the \"" + key + "\" key into null shared preferences.");
             return;
         }
 
-        sharedPreferences.edit().putString(key, value).apply();
+        if(commitToFile)
+            sharedPreferences.edit().putString(key, value).commit();
+        else
+            sharedPreferences.edit().putString(key, value).apply();
+    }
+
+
+
+    /**
+     * Get a {@code Set<String>} from {@link SharedPreferences}.
+     *
+     * @param sharedPreferences The {@link SharedPreferences} to get the value from.
+     * @param key The key for the value.
+     * @param def The default value if failed to read a valid value.
+     * @return Returns the {@code Set<String>} value stored in {@link SharedPreferences}, otherwise returns
+     * default if failed to read a valid value, like in case of an exception.
+     */
+    public static Set<String> getStringSet(SharedPreferences sharedPreferences, String key, Set<String> def) {
+        if(sharedPreferences == null) {
+            Logger.logError(LOG_TAG, "Error getting Set<String> value for the \"" + key + "\" key from null shared preferences. Returning default value \"" + def + "\".");
+            return def;
+        }
+
+        try {
+            return sharedPreferences.getStringSet(key, def);
+        }
+        catch (ClassCastException e) {
+            Logger.logStackTraceWithMessage(LOG_TAG, "Error getting Set<String> value for the \"" + key + "\" key from shared preferences. Returning default value \"" + def + "\".", e);
+            return def;
+        }
+    }
+
+    /**
+     * Set a {@code Set<String>} in {@link SharedPreferences}.
+     *
+     * @param sharedPreferences The {@link SharedPreferences} to set the value in.
+     * @param key The key for the value.
+     * @param value The value to store.
+     * @param commitToFile If set to {@code true}, then value will be set to shared preferences
+     *                     in-memory cache and the file synchronously. Ideally, only to be used for
+     *                     multi-process use-cases.
+     */
+    @SuppressLint("ApplySharedPref")
+    public static void setStringSet(SharedPreferences sharedPreferences, String key, Set<String> value, boolean commitToFile) {
+        if(sharedPreferences == null) {
+            Logger.logError(LOG_TAG, "Ignoring setting Set<String> value \"" + value + "\" for the \"" + key + "\" key into null shared preferences.");
+            return;
+        }
+
+        if(commitToFile)
+            sharedPreferences.edit().putStringSet(key, value).commit();
+        else
+            sharedPreferences.edit().putStringSet(key, value).apply();
     }
 
 
@@ -172,14 +375,21 @@ public static int getIntStoredAsString(SharedPreferences sharedPreferences, Stri
      * @param sharedPreferences The {@link SharedPreferences} to set the value in.
      * @param key The key for the value.
      * @param value The value to store.
+     * @param commitToFile If set to {@code true}, then value will be set to shared preferences
+     *                     in-memory cache and the file synchronously. Ideally, only to be used for
+     *                     multi-process use-cases.
      */
-    public static void setIntStoredAsString(SharedPreferences sharedPreferences, String key, int value) {
+    @SuppressLint("ApplySharedPref")
+    public static void setIntStoredAsString(SharedPreferences sharedPreferences, String key, int value, boolean commitToFile) {
         if(sharedPreferences == null) {
             Logger.logError(LOG_TAG, "Ignoring setting int value \"" + value + "\" for the \"" + key + "\" key into null shared preferences.");
             return;
         }
 
-        sharedPreferences.edit().putString(key, Integer.toString(value)).apply();
+        if(commitToFile)
+            sharedPreferences.edit().putString(key, Integer.toString(value)).commit();
+        else
+            sharedPreferences.edit().putString(key, Integer.toString(value)).apply();
     }
 
 }
diff --git a/app/src/main/java/com/termux/app/settings/preferences/TermuxAppSharedPreferences.java b/app/src/main/java/com/termux/app/settings/preferences/TermuxAppSharedPreferences.java
index 3dbbdeb6e7..18be3803b0 100644
--- a/app/src/main/java/com/termux/app/settings/preferences/TermuxAppSharedPreferences.java
+++ b/app/src/main/java/com/termux/app/settings/preferences/TermuxAppSharedPreferences.java
@@ -26,13 +26,13 @@ public class TermuxAppSharedPreferences {
 
     public TermuxAppSharedPreferences(@Nonnull Context context) {
         mContext = TermuxUtils.getTermuxPackageContext(context);
-        mSharedPreferences = getSharedPreferences(mContext);
+        mSharedPreferences = getPrivateSharedPreferences(mContext);
 
         setFontVariables(context);
     }
 
-    private static SharedPreferences getSharedPreferences(Context context) {
-        return context.getSharedPreferences(TermuxConstants.TERMUX_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION, Context.MODE_PRIVATE);
+    private static SharedPreferences getPrivateSharedPreferences(Context context) {
+        return SharedPreferenceUtils.getPrivateSharedPreferences(context, TermuxConstants.TERMUX_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION);
     }
 
 
@@ -42,7 +42,7 @@ public boolean getShowTerminalToolbar() {
     }
 
     public void setShowTerminalToolbar(boolean value) {
-        SharedPreferenceUtils.setBoolean(mSharedPreferences, TERMUX_APP.KEY_SHOW_TERMINAL_TOOLBAR, value);
+        SharedPreferenceUtils.setBoolean(mSharedPreferences, TERMUX_APP.KEY_SHOW_TERMINAL_TOOLBAR, value, false);
     }
 
     public boolean toogleShowTerminalToolbar() {
@@ -58,7 +58,7 @@ public boolean getKeepScreenOn() {
     }
 
     public void setKeepScreenOn(boolean value) {
-        SharedPreferenceUtils.setBoolean(mSharedPreferences, TERMUX_APP.KEY_KEEP_SCREEN_ON, value);
+        SharedPreferenceUtils.setBoolean(mSharedPreferences, TERMUX_APP.KEY_KEEP_SCREEN_ON, value, false);
     }
 
 
@@ -86,7 +86,7 @@ public int getFontSize() {
     }
 
     public void setFontSize(int value) {
-        SharedPreferenceUtils.setIntStoredAsString(mSharedPreferences, TERMUX_APP.KEY_FONTSIZE, value);
+        SharedPreferenceUtils.setIntStoredAsString(mSharedPreferences, TERMUX_APP.KEY_FONTSIZE, value, false);
     }
 
     public void changeFontSize(boolean increase) {
@@ -106,7 +106,7 @@ public String getCurrentSession() {
     }
 
     public void setCurrentSession(String value) {
-        SharedPreferenceUtils.setString(mSharedPreferences, TERMUX_APP.KEY_CURRENT_SESSION, value);
+        SharedPreferenceUtils.setString(mSharedPreferences, TERMUX_APP.KEY_CURRENT_SESSION, value, false);
     }
 
 
@@ -117,7 +117,7 @@ public int getLogLevel() {
 
     public void setLogLevel(Context context, int logLevel) {
         logLevel = Logger.setLogLevel(context, logLevel);
-        SharedPreferenceUtils.setInt(mSharedPreferences, TERMUX_APP.KEY_LOG_LEVEL, logLevel);
+        SharedPreferenceUtils.setInt(mSharedPreferences, TERMUX_APP.KEY_LOG_LEVEL, logLevel, false);
     }
 
 
@@ -127,7 +127,7 @@ public boolean getTerminalViewKeyLoggingEnabled() {
     }
 
     public void setTerminalViewKeyLoggingEnabled(boolean value) {
-        SharedPreferenceUtils.setBoolean(mSharedPreferences, TERMUX_APP.KEY_TERMINAL_VIEW_KEY_LOGGING_ENABLED, value);
+        SharedPreferenceUtils.setBoolean(mSharedPreferences, TERMUX_APP.KEY_TERMINAL_VIEW_KEY_LOGGING_ENABLED, value, false);
     }
 
 }

From fb6e9b69abf5e9f25495dbc15118f472846fb9e0 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 18 Mar 2021 07:15:00 +0500
Subject: [PATCH 246/912] Update TermuxConstants

The `TermuxConstants` classes has been updated to `v0.8.0`. Check its Changelog sections for info on changes.
---
 .../java/com/termux/app/TermuxConstants.java  | 41 +++++++++++++++----
 1 file changed, 32 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxConstants.java b/app/src/main/java/com/termux/app/TermuxConstants.java
index 56a147f2a6..41d2f2d7e8 100644
--- a/app/src/main/java/com/termux/app/TermuxConstants.java
+++ b/app/src/main/java/com/termux/app/TermuxConstants.java
@@ -5,7 +5,7 @@
 import java.io.File;
 
 /*
- * Version: v0.7.0
+ * Version: v0.8.0
  *
  * Changelog
  *
@@ -49,6 +49,11 @@
  *
  * - 0.7.0 (2021-03-17)
  *      - Fixed javadocs.
+ *
+ * - 0.8.0 (2021-03-18)
+ *      - Fixed Intent extra types javadocs.
+ *      - Added `EXTRA_PENDING_INTENT`, `EXTRA_RESULT_BUNDLE`,
+ *          `EXTRA_STDOUT`, `EXTRA_STDERR`, `EXTRA_EXIT_CODE`, `EXTRA_ERR`, `EXTRA_ERRMSG`.
  */
 
 /**
@@ -368,7 +373,7 @@ public static final class TERMUX_ACTIVITY {
 
             /* Intent action to make termux reload its termux session styling */
             public static final String ACTION_RELOAD_STYLE = TermuxConstants.TERMUX_PACKAGE_NAME + ".app.reload_style"; // Default: "com.termux.app.reload_style"
-            /* Intent extra for what to reload for the TERMUX_ACTIVITY.ACTION_RELOAD_STYLE intent */
+            /* Intent {@code String} extra for what to reload for the TERMUX_ACTIVITY.ACTION_RELOAD_STYLE intent */
             public static final String EXTRA_RELOAD_STYLE = TermuxConstants.TERMUX_PACKAGE_NAME + ".app.reload_style"; // Default: "com.termux.app.reload_style"
 
         }
@@ -401,12 +406,30 @@ public static final class TERMUX_SERVICE {
             public static final String ACTION_SERVICE_EXECUTE = TERMUX_PACKAGE_NAME + ".service_execute"; // Default: "com.termux.service_execute"
             /* Uri scheme for paths sent via intent to TERMUX_SERVICE */
             public static final String URI_SCHEME_SERVICE_EXECUTE = TERMUX_PACKAGE_NAME + ".file"; // Default: "com.termux.file"
-            /* Intent extra for command arguments for the TERMUX_SERVICE.ACTION_SERVICE_EXECUTE intent */
+            /* Intent {@code String[]} extra for command arguments for the TERMUX_SERVICE.ACTION_SERVICE_EXECUTE intent */
             public static final String EXTRA_ARGUMENTS = TERMUX_PACKAGE_NAME + ".execute.arguments"; // Default: "com.termux.execute.arguments"
-            /* Intent extra for command current working directory for the TERMUX_SERVICE.ACTION_SERVICE_EXECUTE intent */
+            /* Intent {@code String} extra for command current working directory for the TERMUX_SERVICE.ACTION_SERVICE_EXECUTE intent */
             public static final String EXTRA_WORKDIR = TERMUX_PACKAGE_NAME + ".execute.cwd"; // Default: "com.termux.execute.cwd"
-            /* Intent extra for command background mode for the TERMUX_SERVICE.ACTION_SERVICE_EXECUTE intent */
+            /* Intent {@code boolean} extra for command background mode for the TERMUX_SERVICE.ACTION_SERVICE_EXECUTE intent */
             public static final String EXTRA_BACKGROUND = TERMUX_PACKAGE_NAME + ".execute.background"; // Default: "com.termux.execute.background"
+            /** Intent {@code Parcelable} extra containing pending intent for the execute command caller */
+            public static final String EXTRA_PENDING_INTENT = "pendingIntent"; // Default: "pendingIntent"
+
+
+            /** Intent {@code Bundle} extra to store result of execute command that is sent back for the
+             * TERMUX_SERVICE.ACTION_SERVICE_EXECUTE intent if the {@link #EXTRA_PENDING_INTENT} is not
+             * {@code null} */
+            public static final String EXTRA_RESULT_BUNDLE = "result"; // Default: "result"
+            /** Intent {@code String} extra for stdout value of execute command of the {@link #EXTRA_RESULT_BUNDLE} */
+            public static final String EXTRA_STDOUT = "stdout"; // Default: "stdout"
+            /** Intent {@code String} extra for stderr value of execute command of the {@link #EXTRA_RESULT_BUNDLE} */
+            public static final String EXTRA_STDERR = "stderr"; // Default: "stderr"
+            /** Intent {@code int} extra for exit code value of execute command of the {@link #EXTRA_RESULT_BUNDLE} */
+            public static final String EXTRA_EXIT_CODE = "exitCode"; // Default: "exitCode"
+            /** Intent {@code int} extra for err value of execute command of the {@link #EXTRA_RESULT_BUNDLE} */
+            public static final String EXTRA_ERR = "err"; // Default: "err"
+            /** Intent {@code String} extra for errmsg value of execute command of the {@link #EXTRA_RESULT_BUNDLE} */
+            public static final String EXTRA_ERRMSG = "errmsg"; // Default: "errmsg"
 
         }
 
@@ -424,13 +447,13 @@ public static final class RUN_COMMAND_SERVICE {
 
             /* Intent action to execute command with RUN_COMMAND_SERVICE */
             public static final String ACTION_RUN_COMMAND = TERMUX_PACKAGE_NAME + ".RUN_COMMAND"; // Default: "com.termux.RUN_COMMAND"
-            /* Intent extra for command path for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent */
+            /* Intent {@code String} extra for command path for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent */
             public static final String EXTRA_COMMAND_PATH = TERMUX_PACKAGE_NAME + ".RUN_COMMAND_PATH"; // Default: "com.termux.RUN_COMMAND_PATH"
-            /* Intent extra for command arguments for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent */
+            /* Intent {@code String[]} extra for command arguments for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent */
             public static final String EXTRA_ARGUMENTS = TERMUX_PACKAGE_NAME + ".RUN_COMMAND_ARGUMENTS"; // Default: "com.termux.RUN_COMMAND_ARGUMENTS"
-            /* Intent extra for command current working directory for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent */
+            /* Intent {@code String} extra for command current working directory for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent */
             public static final String EXTRA_WORKDIR = TERMUX_PACKAGE_NAME + ".RUN_COMMAND_WORKDIR"; // Default: "com.termux.RUN_COMMAND_WORKDIR"
-            /* Intent extra for command background mode for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent */
+            /* Intent {@code boolean} extra for command background mode for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent */
             public static final String EXTRA_BACKGROUND = TERMUX_PACKAGE_NAME + ".RUN_COMMAND_BACKGROUND"; // Default: "com.termux.RUN_COMMAND_BACKGROUND"
 
         }

From f969c01f7e4110f9b2210acc15329c9c09f4d17d Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 18 Mar 2021 21:52:22 +0500
Subject: [PATCH 247/912] Update TermuxConstants

The `TermuxConstants` classes has been updated to `v0.9.0`. Check its Changelog sections for info on changes.
---
 .../java/com/termux/app/TermuxConstants.java  | 93 ++++++++++---------
 1 file changed, 48 insertions(+), 45 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxConstants.java b/app/src/main/java/com/termux/app/TermuxConstants.java
index 41d2f2d7e8..980507f031 100644
--- a/app/src/main/java/com/termux/app/TermuxConstants.java
+++ b/app/src/main/java/com/termux/app/TermuxConstants.java
@@ -5,7 +5,7 @@
 import java.io.File;
 
 /*
- * Version: v0.8.0
+ * Version: v0.9.0
  *
  * Changelog
  *
@@ -54,6 +54,9 @@
  *      - Fixed Intent extra types javadocs.
  *      - Added `EXTRA_PENDING_INTENT`, `EXTRA_RESULT_BUNDLE`,
  *          `EXTRA_STDOUT`, `EXTRA_STDERR`, `EXTRA_EXIT_CODE`, `EXTRA_ERR`, `EXTRA_ERRMSG`.
+ *
+ * - 0.9.0 (2021-03-18)
+ *      - Fixed javadocs.
  */
 
 /**
@@ -254,47 +257,47 @@ public final class TermuxConstants {
      * Termux app and plugin preferences and properties file paths.
      */
 
-    /* Termux app default SharedPreferences file basename without extension */
+    /** Termux app default SharedPreferences file basename without extension */
     public static final String TERMUX_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION = TERMUX_PACKAGE_NAME + "_preferences"; // Default: "com.termux_preferences"
 
-    /* Termux API app default SharedPreferences file basename without extension */
+    /** Termux API app default SharedPreferences file basename without extension */
     public static final String TERMUX_API_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION = TERMUX_API_PACKAGE_NAME + "_preferences"; // Default: "com.termux.api_preferences"
 
-    /* Termux Boot app default SharedPreferences file basename without extension */
+    /** Termux Boot app default SharedPreferences file basename without extension */
     public static final String TERMUX_BOOT_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION = TERMUX_BOOT_PACKAGE_NAME + "_preferences"; // Default: "com.termux.boot_preferences"
 
-    /* Termux Float app default SharedPreferences file basename without extension */
+    /** Termux Float app default SharedPreferences file basename without extension */
     public static final String TERMUX_FLOAT_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION = TERMUX_FLOAT_PACKAGE_NAME + "_preferences"; // Default: "com.termux.window_preferences"
 
-    /* Termux Styling app default SharedPreferences file basename without extension */
+    /** Termux Styling app default SharedPreferences file basename without extension */
     public static final String TERMUX_STYLING_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION = TERMUX_STYLING_PACKAGE_NAME + "_preferences"; // Default: "com.termux.styling_preferences"
 
-    /* Termux Tasker app default SharedPreferences file basename without extension */
+    /** Termux Tasker app default SharedPreferences file basename without extension */
     public static final String TERMUX_TASKER_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION = TERMUX_TASKER_PACKAGE_NAME + "_preferences"; // Default: "com.termux.tasker_preferences"
 
-    /* Termux Widget app default SharedPreferences file basename without extension */
+    /** Termux Widget app default SharedPreferences file basename without extension */
     public static final String TERMUX_WIDGET_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION = TERMUX_WIDGET_PACKAGE_NAME + "_preferences"; // Default: "com.termux.widget_preferences"
 
 
-    /* Termux app termux.properties primary file path */
+    /** Termux app termux.properties primary file path */
     public static final String TERMUX_PROPERTIES_PRIMARY_FILE_PATH = TERMUX_DATA_HOME_DIR_PATH + "/termux.properties"; // Default: "/data/data/com.termux/files/home/.termux/termux.properties"
-    /* Termux app termux.properties primary file */
+    /** Termux app termux.properties primary file */
     public static final File TERMUX_PROPERTIES_PRIMARY_FILE = new File(TERMUX_PROPERTIES_PRIMARY_FILE_PATH);
 
-    /* Termux app termux.properties secondary file path */
+    /** Termux app termux.properties secondary file path */
     public static final String TERMUX_PROPERTIES_SECONDARY_FILE_PATH = TERMUX_CONFIG_HOME_DIR_PATH + "/termux.properties"; // Default: "/data/data/com.termux/files/home/.config/termux/termux.properties"
-    /* Termux app termux.properties secondary file */
+    /** Termux app termux.properties secondary file */
     public static final File TERMUX_PROPERTIES_SECONDARY_FILE = new File(TERMUX_PROPERTIES_SECONDARY_FILE_PATH);
 
 
-    /* Termux app and Termux:Styling colors.properties file path */
+    /** Termux app and Termux:Styling colors.properties file path */
     public static final String TERMUX_COLOR_PROPERTIES_FILE_PATH = TERMUX_DATA_HOME_DIR_PATH + "/colors.properties"; // Default: "/data/data/com.termux/files/home/.termux/colors.properties"
-    /* Termux app and Termux:Styling colors.properties file */
+    /** Termux app and Termux:Styling colors.properties file */
     public static final File TERMUX_COLOR_PROPERTIES_FILE = new File(TERMUX_COLOR_PROPERTIES_FILE_PATH);
 
-    /* Termux app and Termux:Styling font.ttf file path */
+    /** Termux app and Termux:Styling font.ttf file path */
     public static final String TERMUX_FONT_FILE_PATH = TERMUX_DATA_HOME_DIR_PATH + "/font.ttf"; // Default: "/data/data/com.termux/files/home/.termux/font.ttf"
-    /* Termux app and Termux:Styling font.ttf file */
+    /** Termux app and Termux:Styling font.ttf file */
     public static final File TERMUX_FONT_FILE = new File(TERMUX_FONT_FILE_PATH);
 
 
@@ -305,27 +308,27 @@ public final class TermuxConstants {
      * Termux app plugin specific paths.
      */
 
-     /* Termux app directory path to store scripts to be run at boot by Termux:Boot */
+     /** Termux app directory path to store scripts to be run at boot by Termux:Boot */
     public static final String TERMUX_BOOT_SCRIPTS_DIR_PATH = TERMUX_DATA_HOME_DIR_PATH + "/boot"; // Default: "/data/data/com.termux/files/home/.termux/boot"
-    /* Termux app directory to store scripts to be run at boot by Termux:Boot */
+    /** Termux app directory to store scripts to be run at boot by Termux:Boot */
     public static final File TERMUX_BOOT_SCRIPTS_DIR = new File(TERMUX_BOOT_SCRIPTS_DIR_PATH);
 
 
-    /* Termux app directory path to store foreground scripts that can be run by the termux launcher widget provided by Termux:Widget */
+    /** Termux app directory path to store foreground scripts that can be run by the termux launcher widget provided by Termux:Widget */
     public static final String TERMUX_SHORTCUT_SCRIPTS_DIR_PATH = TERMUX_DATA_HOME_DIR_PATH + "/shortcuts"; // Default: "/data/data/com.termux/files/home/.termux/shortcuts"
-    /* Termux app directory to store foreground scripts that can be run by the termux launcher widget provided by Termux:Widget */
+    /** Termux app directory to store foreground scripts that can be run by the termux launcher widget provided by Termux:Widget */
     public static final File TERMUX_SHORTCUT_SCRIPTS_DIR = new File(TERMUX_SHORTCUT_SCRIPTS_DIR_PATH);
 
 
-     /* Termux app directory path to store background scripts that can be run by the termux launcher widget provided by Termux:Widget */
+     /** Termux app directory path to store background scripts that can be run by the termux launcher widget provided by Termux:Widget */
     public static final String TERMUX_SHORTCUT_TASKS_SCRIPTS_DIR_PATH = TERMUX_DATA_HOME_DIR_PATH + "/shortcuts/tasks"; // Default: "/data/data/com.termux/files/home/.termux/shortcuts/tasks"
-    /* Termux app directory to store background scripts that can be run by the termux launcher widget provided by Termux:Widget */
+    /** Termux app directory to store background scripts that can be run by the termux launcher widget provided by Termux:Widget */
     public static final File TERMUX_SHORTCUT_TASKS_SCRIPTS_DIR = new File(TERMUX_SHORTCUT_TASKS_SCRIPTS_DIR_PATH);
 
 
-    /* Termux app directory path to store scripts to be run by 3rd party twofortyfouram locale plugin host apps like Tasker app via the Termux:Tasker plugin client */
+    /** Termux app directory path to store scripts to be run by 3rd party twofortyfouram locale plugin host apps like Tasker app via the Termux:Tasker plugin client */
     public static final String TERMUX_TASKER_SCRIPTS_DIR_PATH = TERMUX_DATA_HOME_DIR_PATH + "/tasker"; // Default: "/data/data/com.termux/files/home/.termux/tasker"
-    /* Termux app directory to store scripts to be run by 3rd party twofortyfouram locale plugin host apps like Tasker app via the Termux:Tasker plugin client */
+    /** Termux app directory to store scripts to be run by 3rd party twofortyfouram locale plugin host apps like Tasker app via the Termux:Tasker plugin client */
     public static final File TERMUX_TASKER_SCRIPTS_DIR = new File(TERMUX_TASKER_SCRIPTS_DIR_PATH);
 
 
@@ -336,18 +339,18 @@ public final class TermuxConstants {
      * Termux app and plugins miscellaneous variables.
      */
 
-     /* Android OS permission declared by Termux app in AndroidManifest.xml which can be requested by 3rd party apps to run various commands in Termux app context */
+     /** Android OS permission declared by Termux app in AndroidManifest.xml which can be requested by 3rd party apps to run various commands in Termux app context */
     public static final String PERMISSION_RUN_COMMAND = TERMUX_PACKAGE_NAME + ".permission.RUN_COMMAND"; // Default: "com.termux.permission.RUN_COMMAND"
 
-     /* Termux property defined in termux.properties file as a secondary check to PERMISSION_RUN_COMMAND to allow 3rd party apps to run various commands in Termux app context */
+     /** Termux property defined in termux.properties file as a secondary check to PERMISSION_RUN_COMMAND to allow 3rd party apps to run various commands in Termux app context */
     public static final String PROP_ALLOW_EXTERNAL_APPS = "allow-external-apps"; // Default: "allow-external-apps"
-    /* Default value for {@link #PROP_ALLOW_EXTERNAL_APPS} */
+    /** Default value for {@link #PROP_ALLOW_EXTERNAL_APPS} */
     public static final String PROP_DEFAULT_VALUE_ALLOW_EXTERNAL_APPS = "false"; // Default: "false"
 
-    /* The broadcast action sent when Termux App opens */
+    /** The broadcast action sent when Termux App opens */
     public static final String BROADCAST_TERMUX_OPENED = TERMUX_PACKAGE_NAME + ".app.OPENED";
 
-    /* The Uri authority for Termux app file shares */
+    /** The Uri authority for Termux app file shares */
     public static final String TERMUX_FILE_SHARE_URI_AUTHORITY = TERMUX_PACKAGE_NAME + ".files"; // Default: "com.termux.files"
 
 
@@ -367,13 +370,13 @@ public static final class TERMUX_APP {
          */
         public static final class TERMUX_ACTIVITY {
 
-            /* Intent action to start termux failsafe session */
+            /** Intent action to start termux failsafe session */
             public static final String ACTION_FAILSAFE_SESSION = TermuxConstants.TERMUX_PACKAGE_NAME + ".app.failsafe_session"; // Default: "com.termux.app.failsafe_session"
 
 
-            /* Intent action to make termux reload its termux session styling */
+            /** Intent action to make termux reload its termux session styling */
             public static final String ACTION_RELOAD_STYLE = TermuxConstants.TERMUX_PACKAGE_NAME + ".app.reload_style"; // Default: "com.termux.app.reload_style"
-            /* Intent {@code String} extra for what to reload for the TERMUX_ACTIVITY.ACTION_RELOAD_STYLE intent */
+            /** Intent {@code String} extra for what to reload for the TERMUX_ACTIVITY.ACTION_RELOAD_STYLE intent */
             public static final String EXTRA_RELOAD_STYLE = TermuxConstants.TERMUX_PACKAGE_NAME + ".app.reload_style"; // Default: "com.termux.app.reload_style"
 
         }
@@ -390,27 +393,27 @@ public static final class TERMUX_ACTIVITY {
          */
         public static final class TERMUX_SERVICE {
 
-            /* Intent action to stop TERMUX_SERVICE */
+            /** Intent action to stop TERMUX_SERVICE */
             public static final String ACTION_STOP_SERVICE = TERMUX_PACKAGE_NAME + ".service_stop"; // Default: "com.termux.service_stop"
 
 
-            /* Intent action to make TERMUX_SERVICE acquire a wakelock */
+            /** Intent action to make TERMUX_SERVICE acquire a wakelock */
             public static final String ACTION_WAKE_LOCK = TERMUX_PACKAGE_NAME + ".service_wake_lock"; // Default: "com.termux.service_wake_lock"
 
 
-            /* Intent action to make TERMUX_SERVICE release wakelock */
+            /** Intent action to make TERMUX_SERVICE release wakelock */
             public static final String ACTION_WAKE_UNLOCK = TERMUX_PACKAGE_NAME + ".service_wake_unlock"; // Default: "com.termux.service_wake_unlock"
 
 
-            /* Intent action to execute command with TERMUX_SERVICE */
+            /** Intent action to execute command with TERMUX_SERVICE */
             public static final String ACTION_SERVICE_EXECUTE = TERMUX_PACKAGE_NAME + ".service_execute"; // Default: "com.termux.service_execute"
-            /* Uri scheme for paths sent via intent to TERMUX_SERVICE */
+            /** Uri scheme for paths sent via intent to TERMUX_SERVICE */
             public static final String URI_SCHEME_SERVICE_EXECUTE = TERMUX_PACKAGE_NAME + ".file"; // Default: "com.termux.file"
-            /* Intent {@code String[]} extra for command arguments for the TERMUX_SERVICE.ACTION_SERVICE_EXECUTE intent */
+            /** Intent {@code String[]} extra for command arguments for the TERMUX_SERVICE.ACTION_SERVICE_EXECUTE intent */
             public static final String EXTRA_ARGUMENTS = TERMUX_PACKAGE_NAME + ".execute.arguments"; // Default: "com.termux.execute.arguments"
-            /* Intent {@code String} extra for command current working directory for the TERMUX_SERVICE.ACTION_SERVICE_EXECUTE intent */
+            /** Intent {@code String} extra for command current working directory for the TERMUX_SERVICE.ACTION_SERVICE_EXECUTE intent */
             public static final String EXTRA_WORKDIR = TERMUX_PACKAGE_NAME + ".execute.cwd"; // Default: "com.termux.execute.cwd"
-            /* Intent {@code boolean} extra for command background mode for the TERMUX_SERVICE.ACTION_SERVICE_EXECUTE intent */
+            /** Intent {@code boolean} extra for command background mode for the TERMUX_SERVICE.ACTION_SERVICE_EXECUTE intent */
             public static final String EXTRA_BACKGROUND = TERMUX_PACKAGE_NAME + ".execute.background"; // Default: "com.termux.execute.background"
             /** Intent {@code Parcelable} extra containing pending intent for the execute command caller */
             public static final String EXTRA_PENDING_INTENT = "pendingIntent"; // Default: "pendingIntent"
@@ -445,15 +448,15 @@ public static final class TERMUX_SERVICE {
          */
         public static final class RUN_COMMAND_SERVICE {
 
-            /* Intent action to execute command with RUN_COMMAND_SERVICE */
+            /** Intent action to execute command with RUN_COMMAND_SERVICE */
             public static final String ACTION_RUN_COMMAND = TERMUX_PACKAGE_NAME + ".RUN_COMMAND"; // Default: "com.termux.RUN_COMMAND"
-            /* Intent {@code String} extra for command path for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent */
+            /** Intent {@code String} extra for command path for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent */
             public static final String EXTRA_COMMAND_PATH = TERMUX_PACKAGE_NAME + ".RUN_COMMAND_PATH"; // Default: "com.termux.RUN_COMMAND_PATH"
-            /* Intent {@code String[]} extra for command arguments for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent */
+            /** Intent {@code String[]} extra for command arguments for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent */
             public static final String EXTRA_ARGUMENTS = TERMUX_PACKAGE_NAME + ".RUN_COMMAND_ARGUMENTS"; // Default: "com.termux.RUN_COMMAND_ARGUMENTS"
-            /* Intent {@code String} extra for command current working directory for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent */
+            /** Intent {@code String} extra for command current working directory for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent */
             public static final String EXTRA_WORKDIR = TERMUX_PACKAGE_NAME + ".RUN_COMMAND_WORKDIR"; // Default: "com.termux.RUN_COMMAND_WORKDIR"
-            /* Intent {@code boolean} extra for command background mode for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent */
+            /** Intent {@code boolean} extra for command background mode for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent */
             public static final String EXTRA_BACKGROUND = TERMUX_PACKAGE_NAME + ".RUN_COMMAND_BACKGROUND"; // Default: "com.termux.RUN_COMMAND_BACKGROUND"
 
         }

From bc02508102b5ffe6f0ed46392585597b70351d56 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 18 Mar 2021 21:55:42 +0500
Subject: [PATCH 248/912] Fix dependencies ordering

---
 app/build.gradle | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 52c51d4b27..0d88b0a4dc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,9 +8,11 @@ android {
 
     dependencies {
         implementation "androidx.annotation:annotation:1.1.0"
-        implementation "androidx.viewpager:viewpager:1.0.0"
+        implementation 'androidx.appcompat:appcompat:1.2.0'
+        implementation 'androidx.core:core:1.5.0-beta03'
         implementation "androidx.drawerlayout:drawerlayout:1.1.1"
-        implementation 'androidx.core:core:1.5.0-beta02'
+        implementation 'androidx.preference:preference:1.1.1'
+        implementation "androidx.viewpager:viewpager:1.0.0"
         implementation 'com.google.guava:guava:24.1-jre'
         implementation project(":terminal-view")
     }
@@ -87,8 +89,6 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'androidx.preference:preference:1.1.1'
     testImplementation 'junit:junit:4.13.1'
     testImplementation 'org.robolectric:robolectric:4.4'
 }

From d9b5344b2467ef345276c228c7cf7bf7867ec5ff Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 18 Mar 2021 22:02:19 +0500
Subject: [PATCH 249/912] Refactor TermuxService

- Dedicated functions have been created for various actions and commands.
- The `startForeground()` call will be made both on `onCreate()` and `onStartCommand().
- The `stopForeground()` call will be made before every `onSelf()` call.
- The references to `TermuxActivity` will now be removed in `onUnbind()` as well if activity `onDestroy()` failed to do so.
- Appropriate log entries are added to help debug issues.
---
 .../java/com/termux/app/TermuxService.java    | 430 +++++++++++-------
 .../app/terminal/TermuxSessionClient.java     |  11 +-
 2 files changed, 283 insertions(+), 158 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxService.java b/app/src/main/java/com/termux/app/TermuxService.java
index 5cac2719d0..fe7abe74fa 100644
--- a/app/src/main/java/com/termux/app/TermuxService.java
+++ b/app/src/main/java/com/termux/app/TermuxService.java
@@ -63,12 +63,15 @@ class LocalBinder extends Binder {
 
     /**
      * The terminal sessions which this service manages.
-     * <p/>
-     * Note that this list is observed by {@link TermuxActivity#mTermuxSessionListViewController}, so any changes must be made on the UI
-     * thread and followed by a call to {@link ArrayAdapter#notifyDataSetChanged()} }.
+     * Note that this list is observed by {@link TermuxActivity#mTermuxSessionListViewController},
+     * so any changes must be made on the UI thread and followed by a call to
+     * {@link ArrayAdapter#notifyDataSetChanged()} }.
      */
     final List<TerminalSession> mTerminalSessions = new ArrayList<>();
 
+    /**
+     * The background jobs which this service manages.
+     */
     final List<BackgroundJob> mBackgroundTasks = new ArrayList<>();
 
     /** The full implementation of the {@link TerminalSessionClient} interface to be used by {@link TerminalSession}
@@ -86,89 +89,49 @@ class LocalBinder extends Binder {
     private PowerManager.WakeLock mWakeLock;
     private WifiManager.WifiLock mWifiLock;
 
-    /** If the user has executed the {@link TermuxConstants.TERMUX_APP.TERMUX_SERVICE#ACTION_STOP_SERVICE} intent. */
+    /** If the user has executed the {@link TERMUX_SERVICE#ACTION_STOP_SERVICE} intent. */
     boolean mWantsToStop = false;
 
     private static final String LOG_TAG = "TermuxService";
 
+    @Override
+    public void onCreate() {
+        Logger.logVerbose(LOG_TAG, "onCreate");
+        runStartForeground();
+    }
+
     @SuppressLint("Wakelock")
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
-        String action = intent.getAction();
-        if (TERMUX_SERVICE.ACTION_STOP_SERVICE.equals(action)) {
-            mWantsToStop = true;
-            for (int i = 0; i < mTerminalSessions.size(); i++)
-                mTerminalSessions.get(i).finishIfRunning();
-            stopSelf();
-        } else if (TERMUX_SERVICE.ACTION_WAKE_LOCK.equals(action)) {
-            if (mWakeLock == null) {
-                PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
-                mWakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, TermuxConstants.TERMUX_APP_NAME.toLowerCase() + ":service-wakelock");
-                mWakeLock.acquire();
-
-                // http://tools.android.com/tech-docs/lint-in-studio-2-3#TOC-WifiManager-Leak
-                WifiManager wm = (WifiManager) getApplicationContext().getSystemService(Context.WIFI_SERVICE);
-                mWifiLock = wm.createWifiLock(WifiManager.WIFI_MODE_FULL_HIGH_PERF, TermuxConstants.TERMUX_APP_NAME.toLowerCase());
-                mWifiLock.acquire();
-
-                String packageName = getPackageName();
-                if (!pm.isIgnoringBatteryOptimizations(packageName)) {
-                    Intent whitelist = new Intent();
-                    whitelist.setAction(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS);
-                    whitelist.setData(Uri.parse("package:" + packageName));
-                    whitelist.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-
-                    try {
-                        startActivity(whitelist);
-                    } catch (ActivityNotFoundException e) {
-                        Logger.logStackTraceWithMessage(LOG_TAG, "Failed to call ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS", e);
-                    }
-                }
-
-                updateNotification();
-            }
-        } else if (TERMUX_SERVICE.ACTION_WAKE_UNLOCK.equals(action)) {
-            if (mWakeLock != null) {
-                mWakeLock.release();
-                mWakeLock = null;
+        Logger.logDebug(LOG_TAG, "onStartCommand");
 
-                mWifiLock.release();
-                mWifiLock = null;
-
-                updateNotification();
-            }
-        } else if (TERMUX_SERVICE.ACTION_SERVICE_EXECUTE.equals(action)) {
-            Uri executableUri = intent.getData();
-            String executablePath = (executableUri == null ? null : executableUri.getPath());
-
-            String[] arguments = (executableUri == null ? null : intent.getStringArrayExtra(TERMUX_SERVICE.EXTRA_ARGUMENTS));
-            String cwd = intent.getStringExtra(TERMUX_SERVICE.EXTRA_WORKDIR);
-
-            if (intent.getBooleanExtra(TERMUX_SERVICE.EXTRA_BACKGROUND, false)) {
-                BackgroundJob task = new BackgroundJob(cwd, executablePath, arguments, this, intent.getParcelableExtra("pendingIntent"));
-                mBackgroundTasks.add(task);
-                updateNotification();
-            } else {
-                boolean failsafe = intent.getBooleanExtra(TERMUX_ACTIVITY.ACTION_FAILSAFE_SESSION, false);
-                TerminalSession newSession = createTermSession(executablePath, arguments, cwd, failsafe);
-
-                // Transform executable path to session name, e.g. "/bin/do-something.sh" => "do something.sh".
-                if (executablePath != null) {
-                    int lastSlash = executablePath.lastIndexOf('/');
-                    String name = (lastSlash == -1) ? executablePath : executablePath.substring(lastSlash + 1);
-                    name = name.replace('-', ' ');
-                    newSession.mSessionName = name;
-                }
+        // Run again in case service is already started and onCreate() is not called
+        runStartForeground();
 
-                // Make the newly created session the current one to be displayed:
-                TermuxAppSharedPreferences preferences = new TermuxAppSharedPreferences(this);
-                preferences.setCurrentSession(newSession.mHandle);
+        String action = intent.getAction();
 
-                // Launch the main Termux app, which will now show the current session:
-                startActivity(new Intent(this, TermuxActivity.class).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
+        if (action != null) {
+            switch (action) {
+                case TERMUX_SERVICE.ACTION_STOP_SERVICE:
+                    Logger.logDebug(LOG_TAG, "ACTION_STOP_SERVICE intent received");
+                    actionStopService();
+                    break;
+                case TERMUX_SERVICE.ACTION_WAKE_LOCK:
+                    Logger.logDebug(LOG_TAG, "ACTION_WAKE_LOCK intent received");
+                    actionAcquireWakeLock();
+                    break;
+                case TERMUX_SERVICE.ACTION_WAKE_UNLOCK:
+                    Logger.logDebug(LOG_TAG, "ACTION_WAKE_UNLOCK intent received");
+                    actionReleaseWakeLock(true);
+                    break;
+                case TERMUX_SERVICE.ACTION_SERVICE_EXECUTE:
+                    Logger.logDebug(LOG_TAG, "ACTION_SERVICE_EXECUTE intent received");
+                    actionServiceExecute(intent);
+                    break;
+                default:
+                    Logger.logError(LOG_TAG, "Invalid action: \"" + action + "\"");
+                    break;
             }
-        } else if (action != null) {
-            Logger.logError(LOG_TAG, "Unknown TermuxService action: '" + action + "'");
         }
 
         // If this service really do get killed, there is no point restarting it automatically - let the user do on next
@@ -176,108 +139,194 @@ public int onStartCommand(Intent intent, int flags, int startId) {
         return Service.START_NOT_STICKY;
     }
 
+    @Override
+    public void onDestroy() {
+        Logger.logVerbose(LOG_TAG, "onDestroy");
+        File termuxTmpDir = TermuxConstants.TERMUX_TMP_DIR;
+
+        if (termuxTmpDir.exists()) {
+            try {
+                TermuxInstaller.deleteFolder(termuxTmpDir.getCanonicalFile());
+            } catch (Exception e) {
+                Logger.logStackTraceWithMessage(LOG_TAG, "Error while removing file at " + termuxTmpDir.getAbsolutePath(), e);
+            }
+
+            termuxTmpDir.mkdirs();
+        }
+
+        actionReleaseWakeLock(false);
+        finishAllTerminalSessions();
+        runStopForeground();
+    }
+
     @Override
     public IBinder onBind(Intent intent) {
+        Logger.logVerbose(LOG_TAG, "onBind");
         return mBinder;
     }
 
     @Override
-    public void onCreate() {
+    public boolean onUnbind(Intent intent) {
+        Logger.logVerbose(LOG_TAG, "onUnbind");
+
+        // Since we cannot rely on {@link TermuxActivity.onDestroy()} to always complete,
+        // we unset clients here as well if it failed, so that we do not leave service and session
+        // clients with references to the activity.
+        if(mTermuxSessionClient != null)
+            unsetTermuxSessionClient();
+        return false;
+    }
+
+    /** Make service run in foreground mode. */
+    private void runStartForeground() {
         setupNotificationChannel();
         startForeground(NOTIFICATION_ID, buildNotification());
     }
 
-    /** Update the shown foreground service notification after making any changes that affect it. */
-    void updateNotification() {
-        if (mWakeLock == null && mTerminalSessions.isEmpty() && mBackgroundTasks.isEmpty()) {
-            // Exit if we are updating after the user disabled all locks with no sessions or tasks running.
-            stopSelf();
+    /** Make service leave foreground mode. */
+    private void runStopForeground() {
+        stopForeground(true);
+    }
+
+    /** Request to stop service. */
+    private void requestStopService() {
+        Logger.logDebug(LOG_TAG, "Requesting to stop service");
+        runStopForeground();
+        stopSelf();
+    }
+
+
+
+    /** Process action to stop service. */
+    private void actionStopService() {
+        mWantsToStop = true;
+        finishAllTerminalSessions();
+        requestStopService();
+    }
+
+    /** Process action to acquire Power and Wi-Fi WakeLocks. */
+    @SuppressLint({"WakelockTimeout", "BatteryLife"})
+    private void actionAcquireWakeLock() {
+        if (mWakeLock == null) {
+            Logger.logDebug(LOG_TAG, "Acquiring WakeLocks");
+
+            PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
+            mWakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, TermuxConstants.TERMUX_APP_NAME.toLowerCase() + ":service-wakelock");
+            mWakeLock.acquire();
+
+            // http://tools.android.com/tech-docs/lint-in-studio-2-3#TOC-WifiManager-Leak
+            WifiManager wm = (WifiManager) getApplicationContext().getSystemService(Context.WIFI_SERVICE);
+            mWifiLock = wm.createWifiLock(WifiManager.WIFI_MODE_FULL_HIGH_PERF, TermuxConstants.TERMUX_APP_NAME.toLowerCase());
+            mWifiLock.acquire();
+
+            String packageName = getPackageName();
+            if (!pm.isIgnoringBatteryOptimizations(packageName)) {
+                Intent whitelist = new Intent();
+                whitelist.setAction(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS);
+                whitelist.setData(Uri.parse("package:" + packageName));
+                whitelist.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+
+                try {
+                    startActivity(whitelist);
+                } catch (ActivityNotFoundException e) {
+                    Logger.logStackTraceWithMessage(LOG_TAG, "Failed to call ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS", e);
+                }
+            }
+
+            updateNotification();
+
+            Logger.logDebug(LOG_TAG, "WakeLocks acquired successfully");
         } else {
-            ((NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE)).notify(NOTIFICATION_ID, buildNotification());
+            Logger.logDebug(LOG_TAG, "Ignoring acquiring WakeLocks since they are already held");
         }
     }
 
-    private Notification buildNotification() {
-        Intent notifyIntent = new Intent(this, TermuxActivity.class);
-        // PendingIntent#getActivity(): "Note that the activity will be started outside of the context of an existing
-        // activity, so you must use the Intent.FLAG_ACTIVITY_NEW_TASK launch flag in the Intent":
-        notifyIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        PendingIntent pendingIntent = PendingIntent.getActivity(this, 0, notifyIntent, 0);
+    /** Process action to release Power and Wi-Fi WakeLocks. */
+    private void actionReleaseWakeLock(boolean updateNotification) {
+        if (mWakeLock == null && mWifiLock == null){
+            Logger.logDebug(LOG_TAG, "Ignoring releasing WakeLocks since none are already held");
+            return;
+        }
 
-        int sessionCount = mTerminalSessions.size();
-        int taskCount = mBackgroundTasks.size();
-        String contentText = sessionCount + " session" + (sessionCount == 1 ? "" : "s");
-        if (taskCount > 0) {
-            contentText += ", " + taskCount + " task" + (taskCount == 1 ? "" : "s");
+        Logger.logDebug(LOG_TAG, "Releasing WakeLocks");
+
+        if (mWakeLock != null) {
+            mWakeLock.release();
+            mWakeLock = null;
         }
 
-        final boolean wakeLockHeld = mWakeLock != null;
-        if (wakeLockHeld) contentText += " (wake lock held)";
+        if (mWifiLock != null) {
+            mWifiLock.release();
+            mWifiLock = null;
+        }
 
-        Notification.Builder builder = new Notification.Builder(this);
-        builder.setContentTitle(getText(R.string.application_name));
-        builder.setContentText(contentText);
-        builder.setSmallIcon(R.drawable.ic_service_notification);
-        builder.setContentIntent(pendingIntent);
-        builder.setOngoing(true);
+        if(updateNotification)
+            updateNotification();
 
-        // If holding a wake or wifi lock consider the notification of high priority since it's using power,
-        // otherwise use a low priority
-        builder.setPriority((wakeLockHeld) ? Notification.PRIORITY_HIGH : Notification.PRIORITY_LOW);
+        Logger.logDebug(LOG_TAG, "WakeLocks released successfully");
+    }
 
-        // No need to show a timestamp:
-        builder.setShowWhen(false);
+    /** Process action to execute a shell command in a foreground session or in background. */
+    private void actionServiceExecute(Intent intent) {
+        Uri executableUri = intent.getData();
+        String executablePath = (executableUri == null ? null : executableUri.getPath());
 
-        // Background color for small notification icon:
-        builder.setColor(0xFF607D8B);
+        String[] arguments = (executableUri == null ? null : intent.getStringArrayExtra(TERMUX_SERVICE.EXTRA_ARGUMENTS));
+        String cwd = intent.getStringExtra(TERMUX_SERVICE.EXTRA_WORKDIR);
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            builder.setChannelId(NOTIFICATION_CHANNEL_ID);
+        PendingIntent pendingIntent = intent.getParcelableExtra(TERMUX_SERVICE.EXTRA_PENDING_INTENT);
+
+        if (intent.getBooleanExtra(TERMUX_SERVICE.EXTRA_BACKGROUND, false)) {
+            executeBackgroundCommand(executablePath, arguments, cwd, pendingIntent);
+        } else {
+            executeForegroundCommand(intent, executablePath, arguments, cwd);
         }
+    }
 
-        Resources res = getResources();
-        Intent exitIntent = new Intent(this, TermuxService.class).setAction(TERMUX_SERVICE.ACTION_STOP_SERVICE);
-        builder.addAction(android.R.drawable.ic_delete, res.getString(R.string.notification_action_exit), PendingIntent.getService(this, 0, exitIntent, 0));
+    /** Execute a shell command in background with {@link BackgroundJob}. */
+    private void executeBackgroundCommand(String executablePath, String[] arguments, String cwd, PendingIntent pendingIntent) {
+        Logger.logDebug(LOG_TAG, "Starting background command");
 
-        String newWakeAction = wakeLockHeld ? TERMUX_SERVICE.ACTION_WAKE_UNLOCK : TERMUX_SERVICE.ACTION_WAKE_LOCK;
-        Intent toggleWakeLockIntent = new Intent(this, TermuxService.class).setAction(newWakeAction);
-        String actionTitle = res.getString(wakeLockHeld ?
-            R.string.notification_action_wake_unlock :
-            R.string.notification_action_wake_lock);
-        int actionIcon = wakeLockHeld ? android.R.drawable.ic_lock_idle_lock : android.R.drawable.ic_lock_lock;
-        builder.addAction(actionIcon, actionTitle, PendingIntent.getService(this, 0, toggleWakeLockIntent, 0));
+        BackgroundJob task = new BackgroundJob(cwd, executablePath, arguments, this, pendingIntent);
+        mBackgroundTasks.add(task);
+        updateNotification();
+    }
 
-        return builder.build();
+    /** Callback received when a {@link BackgroundJob} finishes. */
+    public void onBackgroundJobExited(final BackgroundJob task) {
+        mHandler.post(() -> {
+            mBackgroundTasks.remove(task);
+            updateNotification();
+        });
     }
 
-    @Override
-    public void onDestroy() {
-        File termuxTmpDir = TermuxConstants.TERMUX_TMP_DIR;
+    /** Execute a shell command in a foreground terminal session. */
+    private void executeForegroundCommand(Intent intent, String executablePath, String[] arguments, String cwd) {
+        Logger.logDebug(LOG_TAG, "Starting foreground command");
 
-        if (termuxTmpDir.exists()) {
-            try {
-                TermuxInstaller.deleteFolder(termuxTmpDir.getCanonicalFile());
-            } catch (Exception e) {
-                Logger.logStackTraceWithMessage(LOG_TAG, "Error while removing file at " + termuxTmpDir.getAbsolutePath(), e);
-            }
+        boolean failsafe = intent.getBooleanExtra(TERMUX_ACTIVITY.ACTION_FAILSAFE_SESSION, false);
+        TerminalSession newSession = createTerminalSession(executablePath, arguments, cwd, failsafe);
 
-            termuxTmpDir.mkdirs();
+        // Transform executable path to session name, e.g. "/bin/do-something.sh" => "do something.sh".
+        if (executablePath != null) {
+            int lastSlash = executablePath.lastIndexOf('/');
+            String name = (lastSlash == -1) ? executablePath : executablePath.substring(lastSlash + 1);
+            name = name.replace('-', ' ');
+            newSession.mSessionName = name;
         }
 
-        if (mWakeLock != null) mWakeLock.release();
-        if (mWifiLock != null) mWifiLock.release();
-
-        stopForeground(true);
+        // Make the newly created session the current one to be displayed:
+        TermuxAppSharedPreferences preferences = new TermuxAppSharedPreferences(this);
+        preferences.setCurrentSession(newSession.mHandle);
 
-        for (int i = 0; i < mTerminalSessions.size(); i++)
-            mTerminalSessions.get(i).finishIfRunning();
+        // Launch the main Termux app, which will now show the current session:
+        startActivity(new Intent(this, TermuxActivity.class).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
     }
 
-    public List<TerminalSession> getSessions() {
-        return mTerminalSessions;
-    }
 
-    public TerminalSession createTermSession(String executablePath, String[] arguments, String cwd, boolean failSafe) {
+
+    /** Create a terminal session. */
+    public TerminalSession createTerminalSession(String executablePath, String[] arguments, String cwd, boolean failSafe) {
         TermuxConstants.TERMUX_HOME_DIR.mkdirs();
 
         if (cwd == null || cwd.isEmpty()) cwd = TermuxConstants.TERMUX_HOME_DIR_PATH;
@@ -325,19 +374,29 @@ public TerminalSession createTermSession(String executablePath, String[] argumen
         return session;
     }
 
-    public int removeTermSession(TerminalSession sessionToRemove) {
+    /** Remove a terminal session. */
+    public int removeTerminalSession(TerminalSession sessionToRemove) {
         int indexOfRemoved = mTerminalSessions.indexOf(sessionToRemove);
         mTerminalSessions.remove(indexOfRemoved);
+
         if (mTerminalSessions.isEmpty() && mWakeLock == null) {
             // Finish if there are no sessions left and the wake lock is not held, otherwise keep the service alive if
             // holding wake lock since there may be daemon processes (e.g. sshd) running.
-            stopSelf();
+            requestStopService();
         } else {
             updateNotification();
         }
         return indexOfRemoved;
     }
 
+    /** Finish all terminal sessions by sending SIGKILL to their shells. */
+    private void finishAllTerminalSessions() {
+        for (int i = 0; i < mTerminalSessions.size(); i++)
+            mTerminalSessions.get(i).finishIfRunning();
+    }
+
+
+
     /** If {@link TermuxActivity} has not bound to the {@link TermuxService} yet or is destroyed, then
      * interface functions requiring the activity should not be available to the terminal sessions,
      * so we just return the {@link #mTermuxSessionClientBase}. Once {@link TermuxActivity} bind
@@ -371,22 +430,70 @@ public void setTermuxSessionClient(TermuxSessionClient termuxSessionClient) {
             mTerminalSessions.get(i).updateTerminalSessionClient(mTermuxSessionClient);
     }
 
-    /** This should be called when {@link TermuxActivity} has been destroyed so that the
-     * {@link TermuxService} and {@link TerminalSession} and {@link TerminalEmulator} clients do not
-     * hold an activity references.
+    /** This should be called when {@link TermuxActivity} has been destroyed and in {@link #onUnbind(Intent)}
+     * so that the {@link TermuxService} and {@link TerminalSession} and {@link TerminalEmulator}
+     * clients do not hold an activity references.
      */
     public void unsetTermuxSessionClient() {
-        mTermuxSessionClient = null;
-
         for (int i = 0; i < mTerminalSessions.size(); i++)
             mTerminalSessions.get(i).updateTerminalSessionClient(mTermuxSessionClientBase);
+
+        mTermuxSessionClient = null;
     }
 
-    public void onBackgroundJobExited(final BackgroundJob task) {
-        mHandler.post(() -> {
-            mBackgroundTasks.remove(task);
-            updateNotification();
-        });
+
+
+    private Notification buildNotification() {
+        Intent notifyIntent = new Intent(this, TermuxActivity.class);
+        // PendingIntent#getActivity(): "Note that the activity will be started outside of the context of an existing
+        // activity, so you must use the Intent.FLAG_ACTIVITY_NEW_TASK launch flag in the Intent":
+        notifyIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        PendingIntent pendingIntent = PendingIntent.getActivity(this, 0, notifyIntent, 0);
+
+        int sessionCount = mTerminalSessions.size();
+        int taskCount = mBackgroundTasks.size();
+        String contentText = sessionCount + " session" + (sessionCount == 1 ? "" : "s");
+        if (taskCount > 0) {
+            contentText += ", " + taskCount + " task" + (taskCount == 1 ? "" : "s");
+        }
+
+        final boolean wakeLockHeld = mWakeLock != null;
+        if (wakeLockHeld) contentText += " (wake lock held)";
+
+        Notification.Builder builder = new Notification.Builder(this);
+        builder.setContentTitle(getText(R.string.application_name));
+        builder.setContentText(contentText);
+        builder.setSmallIcon(R.drawable.ic_service_notification);
+        builder.setContentIntent(pendingIntent);
+        builder.setOngoing(true);
+
+        // If holding a wake or wifi lock consider the notification of high priority since it's using power,
+        // otherwise use a low priority
+        builder.setPriority((wakeLockHeld) ? Notification.PRIORITY_HIGH : Notification.PRIORITY_LOW);
+
+        // No need to show a timestamp:
+        builder.setShowWhen(false);
+
+        // Background color for small notification icon:
+        builder.setColor(0xFF607D8B);
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            builder.setChannelId(NOTIFICATION_CHANNEL_ID);
+        }
+
+        Resources res = getResources();
+        Intent exitIntent = new Intent(this, TermuxService.class).setAction(TERMUX_SERVICE.ACTION_STOP_SERVICE);
+        builder.addAction(android.R.drawable.ic_delete, res.getString(R.string.notification_action_exit), PendingIntent.getService(this, 0, exitIntent, 0));
+
+        String newWakeAction = wakeLockHeld ? TERMUX_SERVICE.ACTION_WAKE_UNLOCK : TERMUX_SERVICE.ACTION_WAKE_LOCK;
+        Intent toggleWakeLockIntent = new Intent(this, TermuxService.class).setAction(newWakeAction);
+        String actionTitle = res.getString(wakeLockHeld ?
+            R.string.notification_action_wake_unlock :
+            R.string.notification_action_wake_lock);
+        int actionIcon = wakeLockHeld ? android.R.drawable.ic_lock_idle_lock : android.R.drawable.ic_lock_lock;
+        builder.addAction(actionIcon, actionTitle, PendingIntent.getService(this, 0, toggleWakeLockIntent, 0));
+
+        return builder.build();
     }
 
     private void setupNotificationChannel() {
@@ -402,7 +509,24 @@ private void setupNotificationChannel() {
         manager.createNotificationChannel(channel);
     }
 
+    /** Update the shown foreground service notification after making any changes that affect it. */
+    void updateNotification() {
+        if (mWakeLock == null && mTerminalSessions.isEmpty() && mBackgroundTasks.isEmpty()) {
+            // Exit if we are updating after the user disabled all locks with no sessions or tasks running.
+            requestStopService();
+        } else {
+            ((NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE)).notify(NOTIFICATION_ID, buildNotification());
+        }
+    }
+
+
+
     public boolean wantsToStop() {
         return mWantsToStop;
     }
+
+    public List<TerminalSession> getSessions() {
+        return mTerminalSessions;
+    }
+
 }
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxSessionClient.java b/app/src/main/java/com/termux/app/terminal/TermuxSessionClient.java
index 6222b0aa92..7997277367 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxSessionClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxSessionClient.java
@@ -153,9 +153,10 @@ void noteSessionInfo() {
         final int indexOfSession = mActivity.getTermuxService().getSessions().indexOf(session);
         mActivity.showToast(toToastTitle(session), false);
         mActivity.terminalSessionListNotifyUpdated();
-        final ListView lv = mActivity.findViewById(R.id.terminal_sessions_list);
-        lv.setItemChecked(indexOfSession, true);
-        lv.smoothScrollToPosition(indexOfSession);
+
+        final ListView termuxSessionsListView = mActivity.findViewById(R.id.terminal_sessions_list);
+        termuxSessionsListView.setItemChecked(indexOfSession, true);
+        termuxSessionsListView.smoothScrollToPosition(indexOfSession);
     }
 
     public void switchToSession(boolean forward) {
@@ -195,7 +196,7 @@ public void addNewSession(boolean failSafe, String sessionName) {
                 workingDirectory = currentSession.getCwd();
             }
 
-            TerminalSession newSession = mActivity.getTermuxService().createTermSession(null, null, workingDirectory, failSafe);
+            TerminalSession newSession = mActivity.getTermuxService().createTerminalSession(null, null, workingDirectory, failSafe);
             if (sessionName != null) {
                 newSession.mSessionName = sessionName;
             }
@@ -248,7 +249,7 @@ public void removeFinishedSession(TerminalSession finishedSession) {
         // Return pressed with finished session - remove it.
         TermuxService service = mActivity.getTermuxService();
 
-        int index = service.removeTermSession(finishedSession);
+        int index = service.removeTerminalSession(finishedSession);
         mActivity.terminalSessionListNotifyUpdated();
         if (mActivity.getTermuxService().getSessions().isEmpty()) {
             // There are no sessions to show, so finish the activity.

From ae260fad9cff11c40334eb895d1d0e05942b03d5 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 18 Mar 2021 22:19:33 +0500
Subject: [PATCH 250/912] Fix old bug where termux app would crash if sessions
 list ListView was not notified of new sessions

To reproduce:
1. Create 2 sessions.
2. From either session, run a random `RUN_COMMAND` intent command with `am` command and shift to the other session.

Termux app would crash and throw the `The content of the adapter has changed but ListView did not receive a notification.` exception. TermuxService was previously not notifying the ListView of the sessions list that a new session has been added, if the activity was in foreground.
---
 .../main/java/com/termux/app/TermuxService.java    |  5 +++++
 .../termux/app/terminal/TermuxSessionClient.java   | 14 +++++++++-----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxService.java b/app/src/main/java/com/termux/app/TermuxService.java
index fe7abe74fa..cc960e90a4 100644
--- a/app/src/main/java/com/termux/app/TermuxService.java
+++ b/app/src/main/java/com/termux/app/TermuxService.java
@@ -319,6 +319,11 @@ private void executeForegroundCommand(Intent intent, String executablePath, Stri
         TermuxAppSharedPreferences preferences = new TermuxAppSharedPreferences(this);
         preferences.setCurrentSession(newSession.mHandle);
 
+        // Notify {@link TermuxSessionsListViewController} that sessions list has been updated if
+        // activity in is foreground
+        if(mTermuxSessionClient != null)
+            mTermuxSessionClient.terminalSessionListNotifyUpdated();
+
         // Launch the main Termux app, which will now show the current session:
         startActivity(new Intent(this, TermuxActivity.class).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
     }
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxSessionClient.java b/app/src/main/java/com/termux/app/terminal/TermuxSessionClient.java
index 7997277367..467b778bc8 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxSessionClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxSessionClient.java
@@ -68,7 +68,7 @@ public void onTitleChanged(TerminalSession updatedSession) {
             mActivity.showToast(toToastTitle(updatedSession), true);
         }
 
-        mActivity.terminalSessionListNotifyUpdated();
+        terminalSessionListNotifyUpdated();
     }
 
     @Override
@@ -101,7 +101,7 @@ public void onSessionFinished(final TerminalSession finishedSession) {
             }
         }
 
-        mActivity.terminalSessionListNotifyUpdated();
+        terminalSessionListNotifyUpdated();
     }
 
     @Override
@@ -152,7 +152,7 @@ void noteSessionInfo() {
         TerminalSession session = mActivity.getCurrentSession();
         final int indexOfSession = mActivity.getTermuxService().getSessions().indexOf(session);
         mActivity.showToast(toToastTitle(session), false);
-        mActivity.terminalSessionListNotifyUpdated();
+        terminalSessionListNotifyUpdated();
 
         final ListView termuxSessionsListView = mActivity.findViewById(R.id.terminal_sessions_list);
         termuxSessionsListView.setItemChecked(indexOfSession, true);
@@ -178,7 +178,7 @@ public void renameSession(final TerminalSession sessionToRename) {
 
         DialogUtils.textInput(mActivity, R.string.session_rename_title, sessionToRename.mSessionName, R.string.session_rename_positive_button, text -> {
             sessionToRename.mSessionName = text;
-            mActivity.terminalSessionListNotifyUpdated();
+            terminalSessionListNotifyUpdated();
         }, -1, null, -1, null, null);
     }
 
@@ -250,7 +250,7 @@ public void removeFinishedSession(TerminalSession finishedSession) {
         TermuxService service = mActivity.getTermuxService();
 
         int index = service.removeTerminalSession(finishedSession);
-        mActivity.terminalSessionListNotifyUpdated();
+        terminalSessionListNotifyUpdated();
         if (mActivity.getTermuxService().getSessions().isEmpty()) {
             // There are no sessions to show, so finish the activity.
             mActivity.finishActivityIfNotFinishing();
@@ -262,6 +262,10 @@ public void removeFinishedSession(TerminalSession finishedSession) {
         }
     }
 
+    public void terminalSessionListNotifyUpdated() {
+        mActivity.terminalSessionListNotifyUpdated();
+    }
+
 
 
     String toToastTitle(TerminalSession session) {

From 607ba3ee56924aa4a824077c027e0dee597b157d Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Fri, 19 Mar 2021 02:19:55 +0500
Subject: [PATCH 251/912] Update TermuxConstants

The `TermuxConstants` classes has been updated to `v0.10.0`. Check its Changelog sections for info on changes.
---
 .../java/com/termux/app/TermuxConstants.java  | 63 ++++++++++++++++---
 1 file changed, 56 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxConstants.java b/app/src/main/java/com/termux/app/TermuxConstants.java
index 980507f031..c5497d45dc 100644
--- a/app/src/main/java/com/termux/app/TermuxConstants.java
+++ b/app/src/main/java/com/termux/app/TermuxConstants.java
@@ -5,7 +5,7 @@
 import java.io.File;
 
 /*
- * Version: v0.9.0
+ * Version: v0.10.0
  *
  * Changelog
  *
@@ -52,11 +52,24 @@
  *
  * - 0.8.0 (2021-03-18)
  *      - Fixed Intent extra types javadocs.
- *      - Added `EXTRA_PENDING_INTENT`, `EXTRA_RESULT_BUNDLE`,
- *          `EXTRA_STDOUT`, `EXTRA_STDERR`, `EXTRA_EXIT_CODE`, `EXTRA_ERR`, `EXTRA_ERRMSG`.
+ *      - Added following to `TERMUX_SERVICE`:
+ *          `EXTRA_PENDING_INTENT`, `EXTRA_RESULT_BUNDLE`,
+ *          `EXTRA_STDOUT`, `EXTRA_STDERR`, `EXTRA_EXIT_CODE`,
+ *          `EXTRA_ERR`, `EXTRA_ERRMSG`
+ *          .
  *
  * - 0.9.0 (2021-03-18)
  *      - Fixed javadocs.
+ *
+ * - 0.10.0 (2021-03-19)
+ *      - Added following to `TERMUX_SERVICE`:
+ *          `EXTRA_SESSION_ACTION`,
+ *          `VALUE_EXTRA_SESSION_ACTION_SWITCH_TO_NEW_SESSION_AND_OPEN_ACTIVITY`,
+ *          `VALUE_EXTRA_SESSION_ACTION_KEEP_CURRENT_SESSION_AND_OPEN_ACTIVITY`,
+ *          `VALUE_EXTRA_SESSION_ACTION_SWITCH_TO_NEW_SESSION_AND_DONT_OPEN_ACTIVITY`
+ *          `VALUE_EXTRA_SESSION_ACTION_KEEP_CURRENT_SESSION_AND_DONT_OPEN_ACTIVITY`
+ *      - Added following to `RUN_COMMAND_SERVICE`:
+ *          `EXTRA_SESSION_ACTION`
  */
 
 /**
@@ -415,10 +428,44 @@ public static final class TERMUX_SERVICE {
             public static final String EXTRA_WORKDIR = TERMUX_PACKAGE_NAME + ".execute.cwd"; // Default: "com.termux.execute.cwd"
             /** Intent {@code boolean} extra for command background mode for the TERMUX_SERVICE.ACTION_SERVICE_EXECUTE intent */
             public static final String EXTRA_BACKGROUND = TERMUX_PACKAGE_NAME + ".execute.background"; // Default: "com.termux.execute.background"
+            /** Intent {@code String} extra for session action for foreground commands for the TERMUX_SERVICE.ACTION_SERVICE_EXECUTE intent */
+            public static final String EXTRA_SESSION_ACTION = TERMUX_PACKAGE_NAME + ".execute.session_action"; // Default: "com.termux.execute.session_action"
             /** Intent {@code Parcelable} extra containing pending intent for the execute command caller */
             public static final String EXTRA_PENDING_INTENT = "pendingIntent"; // Default: "pendingIntent"
 
 
+
+            /** The value for {@link #EXTRA_SESSION_ACTION} extra that will set the new session as
+             * the current session and will start {@link TermuxActivity} if its not running to bring
+             * the new session to foreground.
+             */
+            public static final int VALUE_EXTRA_SESSION_ACTION_SWITCH_TO_NEW_SESSION_AND_OPEN_ACTIVITY = 0;
+
+            /** The value for {@link #EXTRA_SESSION_ACTION} extra that will keep any existing session
+             * as the current session and will start {@link TermuxActivity} if its not running to
+             * bring the existing session to foreground. The new session will be added to the left
+             * sidebar in the sessions list.
+             */
+            public static final int VALUE_EXTRA_SESSION_ACTION_KEEP_CURRENT_SESSION_AND_OPEN_ACTIVITY = 1;
+
+            /** The value for {@link #EXTRA_SESSION_ACTION} extra that will set the new session as
+             * the current session but will not start {@link TermuxActivity} if its not running
+             * and session(s) will be seen in Termux notification and can be clicked to bring new
+             * session to foreground. If the {@link TermuxActivity} is already running, then this
+             * will behave like {@link #VALUE_EXTRA_SESSION_ACTION_KEEP_CURRENT_SESSION_AND_OPEN_ACTIVITY}.
+             */
+            public static final int VALUE_EXTRA_SESSION_ACTION_SWITCH_TO_NEW_SESSION_AND_DONT_OPEN_ACTIVITY = 2;
+
+            /** The value for {@link #EXTRA_SESSION_ACTION} extra that will keep any existing session
+             * as the current session but will not start {@link TermuxActivity} if its not running
+             * and session(s) will be seen in Termux notification and can be clicked to bring
+             * existing session to foreground. If the {@link TermuxActivity} is already running,
+             * then this will behave like {@link #VALUE_EXTRA_SESSION_ACTION_KEEP_CURRENT_SESSION_AND_OPEN_ACTIVITY}.
+             */
+            public static final int VALUE_EXTRA_SESSION_ACTION_KEEP_CURRENT_SESSION_AND_DONT_OPEN_ACTIVITY = 3;
+
+
+
             /** Intent {@code Bundle} extra to store result of execute command that is sent back for the
              * TERMUX_SERVICE.ACTION_SERVICE_EXECUTE intent if the {@link #EXTRA_PENDING_INTENT} is not
              * {@code null} */
@@ -450,14 +497,16 @@ public static final class RUN_COMMAND_SERVICE {
 
             /** Intent action to execute command with RUN_COMMAND_SERVICE */
             public static final String ACTION_RUN_COMMAND = TERMUX_PACKAGE_NAME + ".RUN_COMMAND"; // Default: "com.termux.RUN_COMMAND"
-            /** Intent {@code String} extra for command path for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent */
+            /** Intent {@code String} extra for absolute path of command for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent */
             public static final String EXTRA_COMMAND_PATH = TERMUX_PACKAGE_NAME + ".RUN_COMMAND_PATH"; // Default: "com.termux.RUN_COMMAND_PATH"
-            /** Intent {@code String[]} extra for command arguments for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent */
+            /** Intent {@code String[]} extra for any arguments to pass to command for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent */
             public static final String EXTRA_ARGUMENTS = TERMUX_PACKAGE_NAME + ".RUN_COMMAND_ARGUMENTS"; // Default: "com.termux.RUN_COMMAND_ARGUMENTS"
-            /** Intent {@code String} extra for command current working directory for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent */
+            /** Intent {@code String} extra for current working directory of command for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent */
             public static final String EXTRA_WORKDIR = TERMUX_PACKAGE_NAME + ".RUN_COMMAND_WORKDIR"; // Default: "com.termux.RUN_COMMAND_WORKDIR"
-            /** Intent {@code boolean} extra for command background mode for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent */
+            /** Intent {@code boolean} extra for whether to run command in background or foreground terminal session for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent */
             public static final String EXTRA_BACKGROUND = TERMUX_PACKAGE_NAME + ".RUN_COMMAND_BACKGROUND"; // Default: "com.termux.RUN_COMMAND_BACKGROUND"
+            /** Intent {@code String} extra for session action of foreground commands for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent */
+            public static final String EXTRA_SESSION_ACTION = TERMUX_PACKAGE_NAME + ".RUN_COMMAND_SESSION_ACTION"; // Default: "com.termux.RUN_COMMAND_SESSION_ACTION"
 
         }
     }

From ec7568d28e28a74e2e144ab52bb310d075f690ee Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Fri, 19 Mar 2021 02:39:06 +0500
Subject: [PATCH 252/912] Add support for session actions for foreground
 session commands

The `TERMUX_SERVICE.EXTRA_SESSION_ACTION` extra can be passed to define what should happen when a foreground session
command is received for the `TERMUX_SERVICE.ACTION_SERVICE_EXECUTE` intent to `TermuxService`, like from `RunCommandService` or `Termux:Tasker`. The user can define whether the new session should be automatically switched to or if existing session should remain as the current session. The user can also define if foreground session commands should open the `TermuxActivity` or if they should run in the "background" in the Termux notification. The user can click the notification to open the sessions. Check `TERMUX_SERVICE.VALUE_EXTRA_SESSION_ACTION*` values to see various behaviors.

This also solves the old "issue" that if a foreground command was received while an existing session was already in the foreground, the new session won't be switched to automatically. It only brought the new session to the foreground if the activity was not already in foreground, since a call to `mTermuxSessionClient.setCurrentSession(newSession)` wasn't being made.
---
 .../com/termux/app/RunCommandService.java     | 88 +++++++++++++------
 .../java/com/termux/app/TermuxService.java    | 55 ++++++++++--
 .../com/termux/app/utils/TextDataUtils.java   | 35 ++++++++
 3 files changed, 144 insertions(+), 34 deletions(-)

diff --git a/app/src/main/java/com/termux/app/RunCommandService.java b/app/src/main/java/com/termux/app/RunCommandService.java
index e667265652..f695967eef 100644
--- a/app/src/main/java/com/termux/app/RunCommandService.java
+++ b/app/src/main/java/com/termux/app/RunCommandService.java
@@ -18,30 +18,43 @@
 import com.termux.app.settings.properties.TermuxPropertyConstants;
 import com.termux.app.utils.Logger;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStreamReader;
-import java.nio.charset.StandardCharsets;
-import java.util.Properties;
-
 /**
  * Third-party apps that are not part of termux world can run commands in termux context by either
  * sending an intent to RunCommandService or becoming a plugin host for the termux-tasker plugin
  * client.
  *
- * For the RunCommandService intent to work, there are 2 main requirements:
+ * For the {@link RUN_COMMAND_SERVICE#ACTION_RUN_COMMAND} intent to work, there are 2 main requirements:
+ *
  * 1. The `allow-external-apps` property must be set to "true" in ~/.termux/termux.properties in
- * termux app, regardless of if the executable path is inside or outside the `~/.termux/tasker/`
- * directory.
+ *      termux app, regardless of if the executable path is inside or outside the `~/.termux/tasker/`
+ *      directory.
  * 2. The intent sender/third-party app must request the `com.termux.permission.RUN_COMMAND`
- * permission in its `AndroidManifest.xml` and it should be granted by user to the app through the
- * app's App Info permissions page in android settings, likely under Additional Permissions.
+ *      permission in its `AndroidManifest.xml` and it should be granted by user to the app through the
+ *      app's App Info permissions page in android settings, likely under Additional Permissions.
+ *
+ *
+ *
+ * The {@link RUN_COMMAND_SERVICE#ACTION_RUN_COMMAND} intent expects the following extras:
+ *
+ * 1. The {@code String} {@link RUN_COMMAND_SERVICE#EXTRA_COMMAND_PATH} extra for absolute path of
+ *      command. This is mandatory.
+ * 2. The {@code String[]} {@link RUN_COMMAND_SERVICE#EXTRA_ARGUMENTS} extra for any arguments to
+ *      pass to command. This is optional.
+ * 3. The {@code String} {@link RUN_COMMAND_SERVICE#EXTRA_WORKDIR} extra for current working directory
+ *      of command. This is optional and defaults to {@link TermuxConstants#TERMUX_HOME_DIR_PATH}.
+ * 4. The {@code boolean} {@link RUN_COMMAND_SERVICE#EXTRA_BACKGROUND} extra whether to run command
+ *      in background or foreground terminal session. This is optional and defaults to {@code false}.
+ * 5. The {@code String} {@link RUN_COMMAND_SERVICE#EXTRA_SESSION_ACTION} extra for for session action
+ *      of foreground commands. This is optional and defaults to
+ *      {@link TERMUX_SERVICE#VALUE_EXTRA_SESSION_ACTION_SWITCH_TO_NEW_SESSION_AND_OPEN_ACTIVITY}.
+ *
+ *
+ *
+ * The {@link RUN_COMMAND_SERVICE#EXTRA_COMMAND_PATH} and {@link RUN_COMMAND_SERVICE#EXTRA_WORKDIR}
+ * can optionally be prefixed with "$PREFIX/" or "~/" if an absolute path is not to be given.
+ * The "$PREFIX/" will expand to {@link TermuxConstants#TERMUX_PREFIX_DIR_PATH} and
+ * "~/" will expand to {@link TermuxConstants#TERMUX_HOME_DIR_PATH}, followed by a forward slash "/".
  *
- * The absolute path of executable or script must be given in "RUN_COMMAND_PATH" extra.
- * The "RUN_COMMAND_ARGUMENTS", "RUN_COMMAND_WORKDIR" and "RUN_COMMAND_BACKGROUND" extras are
- * optional. The workdir defaults to termux home. The background mode defaults to "false".
- * The command path and workdir can optionally be prefixed with "$PREFIX/" or "~/" if an absolute
- * path is not to be given.
  *
  * To automatically bring termux session to foreground and start termux commands that were started
  * with background mode "false" in android >= 10 without user having to click the notification
@@ -51,10 +64,20 @@
  * Check https://github.com/termux/termux-tasker for more details on allow-external-apps and draw
  * over apps and other limitations.
  *
+ *
  * To reduce the chance of termux being killed by android even further due to violation of not
  * being able to call startForeground() within ~5s of service start in android >= 8, the user
  * may disable battery optimizations for termux.
  *
+ *
+ * If your third-party app is targeting sdk 30 (android 11), then it needs to add `com.termux`
+ * package to the `queries` element or request `QUERY_ALL_PACKAGES` permission in its
+ * `AndroidManifest.xml`. Otherwise it will get `PackageSetting{...... com.termux/......} BLOCKED`
+ * errors in logcat and `RUN_COMMAND` won't work.
+ * https://developer.android.com/training/basics/intents/package-visibility#package-name
+ *
+ *
+ *
  * Sample code to run command "top" with java:
  *   Intent intent = new Intent();
  *   intent.setClassName("com.termux", "com.termux.app.RunCommandService");
@@ -63,6 +86,7 @@
  *   intent.putExtra("com.termux.RUN_COMMAND_ARGUMENTS", new String[]{"-n", "5"});
  *   intent.putExtra("com.termux.RUN_COMMAND_WORKDIR", "/data/data/com.termux/files/home");
  *   intent.putExtra("com.termux.RUN_COMMAND_BACKGROUND", false);
+ *   intent.putExtra("com.termux.RUN_COMMAND_SESSION_ACTION", "0");
  *   startService(intent);
  *
  * Sample code to run command "top" with "am startservice" command:
@@ -71,13 +95,8 @@
  * --es com.termux.RUN_COMMAND_PATH '/data/data/com.termux/files/usr/bin/top' \
  * --esa com.termux.RUN_COMMAND_ARGUMENTS '-n,5' \
  * --es com.termux.RUN_COMMAND_WORKDIR '/data/data/com.termux/files/home' \
- * --ez com.termux.RUN_COMMAND_BACKGROUND 'false'
- *
- * If your third-party app is targeting sdk 30 (android 11), then it needs to add `com.termux`
- * package to the `queries` element or request `QUERY_ALL_PACKAGES` permission in its
- * `AndroidManifest.xml`. Otherwise it will get `PackageSetting{...... com.termux/......} BLOCKED`
- * errors in logcat and `RUN_COMMAND` won't work.
- * https://developer.android.com/training/basics/intents/package-visibility#package-name
+ * --ez com.termux.RUN_COMMAND_BACKGROUND 'false' \
+ * --es com.termux.RUN_COMMAND_SESSION_ACTION '0'
  */
 public class RunCommandService extends Service {
 
@@ -99,17 +118,20 @@ public IBinder onBind(Intent intent) {
 
     @Override
     public void onCreate() {
+        Logger.logVerbose(LOG_TAG, "onCreate");
         runStartForeground();
     }
 
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
+        Logger.logDebug(LOG_TAG, "onStartCommand");
+
         // Run again in case service is already started and onCreate() is not called
         runStartForeground();
 
-        // If wrong action passed, then just return
+        // If invalid action passed, then just return
         if (!RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND.equals(intent.getAction())) {
-            Logger.logError(LOG_TAG, "Unexpected intent action to RunCommandService: " + intent.getAction());
+            Logger.logError(LOG_TAG, "Invalid intent action to RunCommandService: \"" + intent.getAction() + "\"");
             return Service.START_NOT_STICKY;
         }
 
@@ -119,18 +141,32 @@ public int onStartCommand(Intent intent, int flags, int startId) {
             return Service.START_NOT_STICKY;
         }
 
-        Uri programUri = new Uri.Builder().scheme(TERMUX_SERVICE.URI_SCHEME_SERVICE_EXECUTE).path(getExpandedTermuxPath(intent.getStringExtra(RUN_COMMAND_SERVICE.EXTRA_COMMAND_PATH))).build();
+
+
+        String commandPath = intent.getStringExtra(RUN_COMMAND_SERVICE.EXTRA_COMMAND_PATH);
+        // If invalid commandPath passed, then just return
+        if (commandPath == null || commandPath.isEmpty()) {
+            Logger.logError(LOG_TAG, "Invalid coommand path to RunCommandService: \"" + commandPath + "\"");
+            return Service.START_NOT_STICKY;
+        }
+
+        Uri programUri = new Uri.Builder().scheme(TERMUX_SERVICE.URI_SCHEME_SERVICE_EXECUTE).path(getExpandedTermuxPath(commandPath)).build();
+
+
 
         Intent execIntent = new Intent(TERMUX_SERVICE.ACTION_SERVICE_EXECUTE, programUri);
         execIntent.setClass(this, TermuxService.class);
         execIntent.putExtra(TERMUX_SERVICE.EXTRA_ARGUMENTS, intent.getStringArrayExtra(RUN_COMMAND_SERVICE.EXTRA_ARGUMENTS));
         execIntent.putExtra(TERMUX_SERVICE.EXTRA_BACKGROUND, intent.getBooleanExtra(RUN_COMMAND_SERVICE.EXTRA_BACKGROUND, false));
+        execIntent.putExtra(TERMUX_SERVICE.EXTRA_SESSION_ACTION, intent.getStringExtra(RUN_COMMAND_SERVICE.EXTRA_SESSION_ACTION));
 
         String workingDirectory = intent.getStringExtra(RUN_COMMAND_SERVICE.EXTRA_WORKDIR);
         if (workingDirectory != null && !workingDirectory.isEmpty()) {
             execIntent.putExtra(TERMUX_SERVICE.EXTRA_WORKDIR, getExpandedTermuxPath(workingDirectory));
         }
 
+
+
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             this.startForegroundService(execIntent);
         } else {
diff --git a/app/src/main/java/com/termux/app/TermuxService.java b/app/src/main/java/com/termux/app/TermuxService.java
index cc960e90a4..4b43564e14 100644
--- a/app/src/main/java/com/termux/app/TermuxService.java
+++ b/app/src/main/java/com/termux/app/TermuxService.java
@@ -27,6 +27,7 @@
 import com.termux.app.terminal.TermuxSessionClient;
 import com.termux.app.terminal.TermuxSessionClientBase;
 import com.termux.app.utils.Logger;
+import com.termux.app.utils.TextDataUtils;
 import com.termux.terminal.TerminalEmulator;
 import com.termux.terminal.TerminalSession;
 import com.termux.terminal.TerminalSessionClient;
@@ -276,10 +277,13 @@ private void actionServiceExecute(Intent intent) {
 
         PendingIntent pendingIntent = intent.getParcelableExtra(TERMUX_SERVICE.EXTRA_PENDING_INTENT);
 
+        int sessionAction = TextDataUtils.getIntStoredAsStringFromBundle(intent.getExtras(),
+            TERMUX_SERVICE.EXTRA_SESSION_ACTION, TERMUX_SERVICE.VALUE_EXTRA_SESSION_ACTION_SWITCH_TO_NEW_SESSION_AND_OPEN_ACTIVITY);
+
         if (intent.getBooleanExtra(TERMUX_SERVICE.EXTRA_BACKGROUND, false)) {
             executeBackgroundCommand(executablePath, arguments, cwd, pendingIntent);
         } else {
-            executeForegroundCommand(intent, executablePath, arguments, cwd);
+            executeForegroundCommand(intent, executablePath, arguments, cwd, sessionAction);
         }
     }
 
@@ -301,7 +305,7 @@ public void onBackgroundJobExited(final BackgroundJob task) {
     }
 
     /** Execute a shell command in a foreground terminal session. */
-    private void executeForegroundCommand(Intent intent, String executablePath, String[] arguments, String cwd) {
+    private void executeForegroundCommand(Intent intent, String executablePath, String[] arguments, String cwd, int sessionAction) {
         Logger.logDebug(LOG_TAG, "Starting foreground command");
 
         boolean failsafe = intent.getBooleanExtra(TERMUX_ACTIVITY.ACTION_FAILSAFE_SESSION, false);
@@ -315,20 +319,55 @@ private void executeForegroundCommand(Intent intent, String executablePath, Stri
             newSession.mSessionName = name;
         }
 
-        // Make the newly created session the current one to be displayed:
-        TermuxAppSharedPreferences preferences = new TermuxAppSharedPreferences(this);
-        preferences.setCurrentSession(newSession.mHandle);
-
         // Notify {@link TermuxSessionsListViewController} that sessions list has been updated if
         // activity in is foreground
         if(mTermuxSessionClient != null)
             mTermuxSessionClient.terminalSessionListNotifyUpdated();
 
-        // Launch the main Termux app, which will now show the current session:
-        startActivity(new Intent(this, TermuxActivity.class).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
+        handleSessionAction(sessionAction, newSession);
     }
 
+    private void setCurrentStoredSession(TerminalSession newSession) {
+        // Make the newly created session the current one to be displayed:
+        TermuxAppSharedPreferences preferences = new TermuxAppSharedPreferences(this);
+        preferences.setCurrentSession(newSession.mHandle);
+    }
 
+    /** Process session action for new session. */
+    private void handleSessionAction(int sessionAction, TerminalSession newSession) {
+        Logger.logDebug(LOG_TAG, "Processing sessionAction \"" + sessionAction + "\" for session \"" + newSession.mSessionName + "\"");
+
+        switch (sessionAction) {
+            case TERMUX_SERVICE.VALUE_EXTRA_SESSION_ACTION_SWITCH_TO_NEW_SESSION_AND_OPEN_ACTIVITY:
+                setCurrentStoredSession(newSession);
+                if(mTermuxSessionClient != null)
+                    mTermuxSessionClient.setCurrentSession(newSession);
+                startTermuxActivity();
+                break;
+            case TERMUX_SERVICE.VALUE_EXTRA_SESSION_ACTION_KEEP_CURRENT_SESSION_AND_OPEN_ACTIVITY:
+                if(mTerminalSessions.size() == 1)
+                    setCurrentStoredSession(newSession);
+                startTermuxActivity();
+                break;
+            case TERMUX_SERVICE.VALUE_EXTRA_SESSION_ACTION_SWITCH_TO_NEW_SESSION_AND_DONT_OPEN_ACTIVITY:
+                setCurrentStoredSession(newSession);
+                if(mTermuxSessionClient != null)
+                    mTermuxSessionClient.setCurrentSession(newSession);
+                break;
+            case TERMUX_SERVICE.VALUE_EXTRA_SESSION_ACTION_KEEP_CURRENT_SESSION_AND_DONT_OPEN_ACTIVITY:
+                if(mTerminalSessions.size() == 1)
+                    setCurrentStoredSession(newSession);
+                break;
+            default:
+                Logger.logError(LOG_TAG, "Invalid sessionAction: \"" + sessionAction + "\"");
+                break;
+        }
+    }
+
+    /** Launch the {@link }TermuxActivity} to bring it to foreground. */
+    private void startTermuxActivity() {
+        startActivity(new Intent(this, TermuxActivity.class).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
+    }
 
     /** Create a terminal session. */
     public TerminalSession createTerminalSession(String executablePath, String[] arguments, String cwd, boolean failSafe) {
diff --git a/app/src/main/java/com/termux/app/utils/TextDataUtils.java b/app/src/main/java/com/termux/app/utils/TextDataUtils.java
index cbf8c3fb0b..aebacdaea5 100644
--- a/app/src/main/java/com/termux/app/utils/TextDataUtils.java
+++ b/app/src/main/java/com/termux/app/utils/TextDataUtils.java
@@ -1,5 +1,7 @@
 package com.termux.app.utils;
 
+import android.os.Bundle;
+
 import java.util.LinkedHashSet;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -21,6 +23,14 @@ public static String getTruncatedCommandOutput(String text, int maxLength) {
         return text;
     }
 
+    /**
+     * Get the {@code float} from a {@link String}.
+     *
+     * @param value The {@link String value.
+     * @param def The default value if failed to read a valid value.
+     * @return Returns the {@code float} value after parsing the {@link String} value, otherwise
+     * returns default if failed to read a valid value, like in case of an exception.
+     */
     public static float getFloatFromString(String value, float def) {
         if(value == null) return def;
 
@@ -32,6 +42,14 @@ public static float getFloatFromString(String value, float def) {
         }
     }
 
+    /**
+     * Get the {@code int} from a {@link String}.
+     *
+     * @param value The {@link String value.
+     * @param def The default value if failed to read a valid value.
+     * @return Returns the {@code int} value after parsing the {@link String} value, otherwise
+     * returns default if failed to read a valid value, like in case of an exception.
+     */
     public static int getIntFromString(String value, int def) {
         if(value == null) return def;
 
@@ -43,6 +61,23 @@ public static int getIntFromString(String value, int def) {
         }
     }
 
+    /**
+     * Get an {@code int} from {@link Bundle} that is stored as a {@link String}.
+     *
+     * @param bundle The {@link Bundle} to get the value from.
+     * @param key The key for the value.
+     * @param def The default value if failed to read a valid value.
+     * @return Returns the {@code int} value after parsing the {@link String} value stored in
+     * {@link Bundle}, otherwise returns default if failed to read a valid value,
+     * like in case of an exception.
+     */
+    public static int getIntStoredAsStringFromBundle(Bundle bundle, String key, int def) {
+        if(bundle == null) return def;
+        return getIntFromString(bundle.getString(key, Integer.toString(def)), def);
+    }
+
+
+
     /**
      * If value is not in the range [min, max], set it to either min or max.
      */

From b4995ef9a78665409ac8f22b6a4239dc74c61cb1 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Fri, 19 Mar 2021 18:40:26 +0500
Subject: [PATCH 253/912] Refactor RunCommandService

- The `FileUtils` and `PluginUtils` have been added to provide utility functions.
- The executable and working directory validation has been added to check for existence and missing permissions.
- The `expandPath()` function is removed from `RunCommandService`.
- Working directory will automatically be created if under `TermuxConstants.TERMUX_FILES_DIR_PATH` if missing.
- Better logging has been added. This will later be used to notify the user in foreground.
- Javadocs have been updated.
---
 .../com/termux/app/RunCommandService.java     | 170 +++++---
 .../java/com/termux/app/utils/FileUtils.java  | 376 ++++++++++++++++++
 .../com/termux/app/utils/PluginUtils.java     | 180 +++++++++
 app/src/main/res/values/strings.xml           |  24 ++
 4 files changed, 696 insertions(+), 54 deletions(-)
 create mode 100644 app/src/main/java/com/termux/app/utils/FileUtils.java
 create mode 100644 app/src/main/java/com/termux/app/utils/PluginUtils.java

diff --git a/app/src/main/java/com/termux/app/RunCommandService.java b/app/src/main/java/com/termux/app/RunCommandService.java
index f695967eef..a5236e7c4e 100644
--- a/app/src/main/java/com/termux/app/RunCommandService.java
+++ b/app/src/main/java/com/termux/app/RunCommandService.java
@@ -10,27 +10,79 @@
 import android.os.Binder;
 import android.os.Build;
 import android.os.IBinder;
+import android.util.Log;
 
 import com.termux.R;
 import com.termux.app.TermuxConstants.TERMUX_APP.RUN_COMMAND_SERVICE;
 import com.termux.app.TermuxConstants.TERMUX_APP.TERMUX_SERVICE;
-import com.termux.app.settings.properties.SharedProperties;
-import com.termux.app.settings.properties.TermuxPropertyConstants;
+import com.termux.app.utils.FileUtils;
 import com.termux.app.utils.Logger;
+import com.termux.app.utils.PluginUtils;
+
+import java.util.Arrays;
+import java.util.HashMap;
 
 /**
  * Third-party apps that are not part of termux world can run commands in termux context by either
  * sending an intent to RunCommandService or becoming a plugin host for the termux-tasker plugin
  * client.
  *
- * For the {@link RUN_COMMAND_SERVICE#ACTION_RUN_COMMAND} intent to work, there are 2 main requirements:
+ * For the {@link RUN_COMMAND_SERVICE#ACTION_RUN_COMMAND} intent to work, here are the requirements:
  *
- * 1. The `allow-external-apps` property must be set to "true" in ~/.termux/termux.properties in
- *      termux app, regardless of if the executable path is inside or outside the `~/.termux/tasker/`
- *      directory.
- * 2. The intent sender/third-party app must request the `com.termux.permission.RUN_COMMAND`
+ * 1. `com.termux.permission.RUN_COMMAND` permission (Mandatory)
+ *      The Intent sender/third-party app must request the `com.termux.permission.RUN_COMMAND`
  *      permission in its `AndroidManifest.xml` and it should be granted by user to the app through the
- *      app's App Info permissions page in android settings, likely under Additional Permissions.
+ *      app's `App Info` `Permissions` page in Android Settings, likely under `Additional Permissions`.
+ *      This is a security measure to prevent any other apps from running commands in `Termux` context
+ *      which do not have the required permission granted to them.
+ *
+ *      For `Tasker` you can grant it with:
+ *      `Android Settings` -> `Apps` -> `Tasker` -> `Permissions` -> `Additional permissions` ->
+ *      `Run commands in Termux environment`.
+ *
+ * 2. `allow-external-apps` property (Mandatory)
+ *      The `allow-external-apps` property must be set to "true" in `~/.termux/termux.properties` in
+ *      Termux app, regardless of if the executable path is inside or outside the `~/.termux/tasker/`
+ *      directory. Check https://github.com/termux/termux-tasker#allow-external-apps-property-optional
+ *      for more info.
+ *
+ * 3. `Draw Over Apps` permission (Optional)
+ *      For android `>= 10` there are new
+ *      [restrictions](https://developer.android.com/guide/components/activities/background-starts)
+ *      that prevent activities from starting from the background. This prevents the background
+ *      {@link TermuxService} from starting a terminal session in the foreground and running the
+ *      commands until the user manually clicks `Termux` notification in the status bar dropdown
+ *      notifications list. This only affects commands that are to be executed in a terminal
+ *      session and not the background ones. `Termux` version `>= 0.100`
+ *      requests the `Draw Over Apps` permission so that users can bypass this restriction so
+ *      that commands can automatically start running without user intervention.
+ *      You can grant `Termux` the `Draw Over Apps` permission from its `App Info` activity:
+ *      `Android Settings` -> `Apps` -> `Termux` -> `Advanced` -> `Draw over other apps`.
+ *
+ * 4. `Storage` permission (Optional)
+ *      Termux app must be granted `Storage` permission if the executable is accessing or working
+ *      directory is set to path in external shared storage. The common paths which usually refer to
+ *      it are `~/storage`, `/sdcard`, `/storage/emulated/0` etc.
+ *       You can grant `Termux` the `Storage` permission from its `App Info` activity:
+ *       For Android version < 11:
+ *          `Android Settings` -> `Apps` -> `Termux` -> `Permissions` -> `Storage`.
+ *       For Android version >= 11
+ *          `Android Settings` -> `Apps` -> `Termux` -> `Permissions` -> `Files and media` ->
+ *          `Allowed management of all files`.
+ *       NOTE: For Android version >= 11, sometimes you will get `Permission Denied` errors for
+ *       external shared storage even when you have granted `Files and media` permission. To solve
+ *       this, Deny the permission and then Allow it again and restart Termux.
+ *       Also check https://wiki.termux.com/wiki/Termux-setup-storage
+ *
+ * 5. Battery Optimizations (May be mandatory depending on device)
+ *      Some devices kill apps aggressively or prevent apps from starting from background.
+ *      If Termux is running into such problems, then exempt it from such restrictions.
+ *      The user may also disable battery optimizations for Termux to reduce the chances of Termux
+ *      being killed by Android even further due to violation of not being able to call
+ *      `startForeground()` within ~5s of service start in android >= 8.
+ *      Check https://dontkillmyapp.com/ for device specfic info to opt-out of battery optimiations.
+ *
+ *  You may also want to check https://github.com/termux/termux-tasker
  *
  *
  *
@@ -55,21 +107,6 @@
  * The "$PREFIX/" will expand to {@link TermuxConstants#TERMUX_PREFIX_DIR_PATH} and
  * "~/" will expand to {@link TermuxConstants#TERMUX_HOME_DIR_PATH}, followed by a forward slash "/".
  *
- *
- * To automatically bring termux session to foreground and start termux commands that were started
- * with background mode "false" in android >= 10 without user having to click the notification
- * manually requires termux to be granted draw over apps permission due to new restrictions
- * of starting activities from the background, this also applies to Termux:Tasker plugin.
- *
- * Check https://github.com/termux/termux-tasker for more details on allow-external-apps and draw
- * over apps and other limitations.
- *
- *
- * To reduce the chance of termux being killed by android even further due to violation of not
- * being able to call startForeground() within ~5s of service start in android >= 8, the user
- * may disable battery optimizations for termux.
- *
- *
  * If your third-party app is targeting sdk 30 (android 11), then it needs to add `com.termux`
  * package to the `queries` element or request `QUERY_ALL_PACKAGES` permission in its
  * `AndroidManifest.xml`. Otherwise it will get `PackageSetting{...... com.termux/......} BLOCKED`
@@ -129,44 +166,80 @@ public int onStartCommand(Intent intent, int flags, int startId) {
         // Run again in case service is already started and onCreate() is not called
         runStartForeground();
 
+        String errmsg;
+
         // If invalid action passed, then just return
         if (!RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND.equals(intent.getAction())) {
-            Logger.logError(LOG_TAG, "Invalid intent action to RunCommandService: \"" + intent.getAction() + "\"");
+            errmsg = this.getString(R.string.run_command_service_invalid_action, intent.getAction());
+            Logger.logError(LOG_TAG, errmsg);
             return Service.START_NOT_STICKY;
         }
 
-        // If allow-external-apps property is not set to "true"
-        if (!SharedProperties.isPropertyValueTrue(this, TermuxPropertyConstants.getTermuxPropertiesFile(), TermuxConstants.PROP_ALLOW_EXTERNAL_APPS)) {
-            Logger.logError(LOG_TAG, "RunCommandService requires allow-external-apps property to be set to \"true\" in \"" + TermuxConstants.TERMUX_PROPERTIES_PRIMARY_FILE_PATH + "\" file");
+        // If "allow-external-apps" property to not set to "true", then just return
+        errmsg = PluginUtils.checkIfRunCommandServiceAllowExternalAppsPolicyIsViolated(this);
+        if (errmsg != null) {
+            Logger.logError(LOG_TAG, errmsg);
             return Service.START_NOT_STICKY;
         }
 
 
-
-        String commandPath = intent.getStringExtra(RUN_COMMAND_SERVICE.EXTRA_COMMAND_PATH);
-        // If invalid commandPath passed, then just return
-        if (commandPath == null || commandPath.isEmpty()) {
-            Logger.logError(LOG_TAG, "Invalid coommand path to RunCommandService: \"" + commandPath + "\"");
+        String executable = intent.getStringExtra(RUN_COMMAND_SERVICE.EXTRA_COMMAND_PATH);
+        String[] arguments = intent.getStringArrayExtra(RUN_COMMAND_SERVICE.EXTRA_ARGUMENTS);
+        boolean inBackground = intent.getBooleanExtra(RUN_COMMAND_SERVICE.EXTRA_BACKGROUND, false);
+        String workingDirectory = intent.getStringExtra(RUN_COMMAND_SERVICE.EXTRA_WORKDIR);
+        String sessionAction = intent.getStringExtra(RUN_COMMAND_SERVICE.EXTRA_SESSION_ACTION);
+
+        // Get canonical path of executable
+        executable = FileUtils.getCanonicalPath(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
+        errmsg = FileUtils.validateRegularFileExistenceAndPermissions(this, executable,
+            null, PluginUtils.PLUGIN_EXECUTABLE_FILE_PERMISSIONS,
+            false, false);
+        if (errmsg != null) {
+            errmsg  += "\n" + this.getString(R.string.executable_absolute_path, executable);
+            Logger.logError(LOG_TAG, errmsg);
             return Service.START_NOT_STICKY;
         }
 
-        Uri programUri = new Uri.Builder().scheme(TERMUX_SERVICE.URI_SCHEME_SERVICE_EXECUTE).path(getExpandedTermuxPath(commandPath)).build();
+        // If workingDirectory is not null or empty
+        if (workingDirectory != null && !workingDirectory.isEmpty()) {
+            // Get canonical path of workingDirectory
+            workingDirectory = FileUtils.getCanonicalPath(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 {@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.
+            errmsg = FileUtils.validateDirectoryExistenceAndPermissions(this, workingDirectory,
+                TermuxConstants.TERMUX_FILES_DIR_PATH, PluginUtils.PLUGIN_WORKING_DIRECTORY_PERMISSIONS,
+                true, true, false,
+                true);
+            if (errmsg != null) {
+                errmsg  += "\n" + this.getString(R.string.working_directory_absolute_path, workingDirectory);
+                Logger.logError(LOG_TAG, errmsg);
+                return Service.START_NOT_STICKY;
+            }
+        }
 
+        PluginUtils.dumpExecutionIntentToLog(Log.VERBOSE, LOG_TAG, "RUN_COMMAND Intent", executable, Arrays.asList(arguments), workingDirectory, inBackground, new HashMap<String, Object>() {{
+            put("sessionAction", sessionAction);
+        }});
 
+        Uri executableUri = new Uri.Builder().scheme(TERMUX_SERVICE.URI_SCHEME_SERVICE_EXECUTE).path(FileUtils.getExpandedTermuxPath(executable)).build();
 
-        Intent execIntent = new Intent(TERMUX_SERVICE.ACTION_SERVICE_EXECUTE, programUri);
+        // 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, executableUri);
         execIntent.setClass(this, TermuxService.class);
-        execIntent.putExtra(TERMUX_SERVICE.EXTRA_ARGUMENTS, intent.getStringArrayExtra(RUN_COMMAND_SERVICE.EXTRA_ARGUMENTS));
-        execIntent.putExtra(TERMUX_SERVICE.EXTRA_BACKGROUND, intent.getBooleanExtra(RUN_COMMAND_SERVICE.EXTRA_BACKGROUND, false));
-        execIntent.putExtra(TERMUX_SERVICE.EXTRA_SESSION_ACTION, intent.getStringExtra(RUN_COMMAND_SERVICE.EXTRA_SESSION_ACTION));
-
-        String workingDirectory = intent.getStringExtra(RUN_COMMAND_SERVICE.EXTRA_WORKDIR);
-        if (workingDirectory != null && !workingDirectory.isEmpty()) {
-            execIntent.putExtra(TERMUX_SERVICE.EXTRA_WORKDIR, getExpandedTermuxPath(workingDirectory));
-        }
-
+        execIntent.putExtra(TERMUX_SERVICE.EXTRA_ARGUMENTS, arguments);
+        execIntent.putExtra(TERMUX_SERVICE.EXTRA_BACKGROUND, inBackground);
+        if (workingDirectory != null && !workingDirectory.isEmpty()) execIntent.putExtra(TERMUX_SERVICE.EXTRA_WORKDIR, workingDirectory);
+        execIntent.putExtra(TERMUX_SERVICE.EXTRA_SESSION_ACTION, sessionAction);
 
 
+        // Start TERMUX_SERVICE and pass it execution intent
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             this.startForegroundService(execIntent);
         } else {
@@ -223,15 +296,4 @@ private void setupNotificationChannel() {
         manager.createNotificationChannel(channel);
     }
 
-    /** Replace "$PREFIX/" or "~/" prefix with termux absolute paths */
-    public static String getExpandedTermuxPath(String path) {
-        if(path != null && !path.isEmpty()) {
-            path = path.replaceAll("^\\$PREFIX$", TermuxConstants.TERMUX_PREFIX_DIR_PATH);
-            path = path.replaceAll("^\\$PREFIX/", TermuxConstants.TERMUX_PREFIX_DIR_PATH + "/");
-            path = path.replaceAll("^~/$", TermuxConstants.TERMUX_HOME_DIR_PATH);
-            path = path.replaceAll("^~/", TermuxConstants.TERMUX_HOME_DIR_PATH + "/");
-        }
-
-        return path;
-    }
 }
diff --git a/app/src/main/java/com/termux/app/utils/FileUtils.java b/app/src/main/java/com/termux/app/utils/FileUtils.java
new file mode 100644
index 0000000000..f50ea91c59
--- /dev/null
+++ b/app/src/main/java/com/termux/app/utils/FileUtils.java
@@ -0,0 +1,376 @@
+package com.termux.app.utils;
+
+import android.content.Context;
+
+import com.termux.R;
+import com.termux.app.TermuxConstants;
+
+import java.io.File;
+import java.util.regex.Pattern;
+
+public class FileUtils {
+
+    private static final String LOG_TAG = "FileUtils";
+
+    /**
+     * Replace "$PREFIX/" or "~/" prefix with termux absolute paths.
+     *
+     * @param path The {@code path} to expand.
+     * @return Returns the {@code expand path}.
+     */
+    public static String getExpandedTermuxPath(String path) {
+        if(path != null && !path.isEmpty()) {
+            path = path.replaceAll("^\\$PREFIX$", TermuxConstants.TERMUX_PREFIX_DIR_PATH);
+            path = path.replaceAll("^\\$PREFIX/", TermuxConstants.TERMUX_PREFIX_DIR_PATH + "/");
+            path = path.replaceAll("^~/$", TermuxConstants.TERMUX_HOME_DIR_PATH);
+            path = path.replaceAll("^~/", TermuxConstants.TERMUX_HOME_DIR_PATH + "/");
+        }
+
+        return path;
+    }
+
+    /**
+     * Replace termux absolute paths with "$PREFIX/" or "~/" prefix.
+     *
+     * @param path The {@code path} to unexpand.
+     * @return Returns the {@code unexpand path}.
+     */
+    public static String getUnExpandedTermuxPath(String path) {
+        if(path != null && !path.isEmpty()) {
+            path = path.replaceAll("^" + Pattern.quote(TermuxConstants.TERMUX_PREFIX_DIR_PATH) + "/", "\\$PREFIX/");
+            path = path.replaceAll("^" + Pattern.quote(TermuxConstants.TERMUX_HOME_DIR_PATH) + "/", "~/");
+        }
+
+        return path;
+    }
+
+    /**
+     * If {@code expandPath} is enabled, then input path is first attempted to be expanded by calling
+     * {@link #getExpandedTermuxPath(String)}.
+     *
+     * Then if path is already an absolute path, then it is used as is to get canonical path.
+     * If path is not an absolute path and {code prefixForNonAbsolutePath} is not {@code null}, then
+     * {code prefixForNonAbsolutePath} + "/" is prefixed before path before getting canonical path.
+     * If path is not an absolute path and {code prefixForNonAbsolutePath} is {@code null}, then
+     * "/" is prefixed before path before getting canonical path.
+     *
+     * If an exception is raised to get the canonical path, then absolute path is returned.
+     *
+     * @param path The {@code path} to convert.
+     * @param prefixForNonAbsolutePath Optional prefix path to prefix before non-absolute paths. This
+     *                                 can be set to {@code null} if non-absolute paths should
+     *                                 be prefixed with "/". The call to {@link File#getCanonicalPath()}
+     *                                 will automatically do this anyways.
+     * @return Returns the {@code canonical path}.
+     */
+    public static String getCanonicalPath(String path, String prefixForNonAbsolutePath, boolean expandPath) {
+        if (path == null) path = "";
+
+        if(expandPath)
+            path = getExpandedTermuxPath(path);
+
+        String absolutePath;
+
+        // If path is already an absolute path
+        if (path.startsWith("/") ) {
+            absolutePath = path;
+        } else {
+            if (prefixForNonAbsolutePath != null)
+                absolutePath = prefixForNonAbsolutePath + "/" + path;
+            else
+                absolutePath = "/" + path;
+        }
+
+        try {
+            return new File(absolutePath).getCanonicalPath();
+        } catch(Exception e) {
+        }
+
+        return absolutePath;
+    }
+
+    /**
+     * Removes one or more forward slashes "//" with single slash "/"
+     * Removes "./"
+     * Removes trailing forward slash "/"
+     *
+     * @param path The {@code path} to convert.
+     * @return Returns the {@code normalized path}.
+     */
+    public static String normalizePath(String path) {
+        if (path == null) return null;
+
+        path = path.replaceAll("/+", "/");
+        path = path.replaceAll("\\./", "");
+
+        if (path.endsWith("/")) {
+            path = path.substring(0, path.length() - 1);
+        }
+
+        return path;
+    }
+
+    /**
+     * Determines whether path is in {@code dirPath}.
+     *
+     * @param path The {@code path} to check.
+     * @param dirPath The {@code directory path} to check in.
+     * @param ensureUnder If set to {@code true}, then it will be ensured that {@code path} is
+     *                    under the directory and does not equal it.
+     * @return Returns {@code true} if path in {@code dirPath}, otherwise returns {@code false}.
+     */
+    public static boolean isPathInDirPath(String path, String dirPath, boolean ensureUnder) {
+        if (path == null || dirPath == null) return false;
+
+        try {
+            path = new File(path).getCanonicalPath();
+        } catch(Exception e) {
+            return false;
+        }
+
+        String normalizedDirPath = normalizePath(dirPath);
+
+        if(ensureUnder)
+            return !path.equals(normalizedDirPath) && path.startsWith(normalizedDirPath + "/");
+        else
+            return path.startsWith(normalizedDirPath + "/");
+    }
+
+    /**
+     * Validate the existence and permissions of regular file at path.
+     *
+     * If the {@code parentDirPath} is not {@code null}, then setting of missing permissions will
+     * only be done if {@code path} is under {@code parentDirPath}.
+     *
+     * @param context The {@link Context} to get error string.
+     * @param path The {@code path} for file to validate.
+     * @param parentDirPath The optional {@code parent directory path} to restrict operations to.
+     *                      This can optionally be {@code null}.
+     * @param permissionsToCheck The 3 character string that contains the "r", "w", "x" or "-" in-order.
+     * @param setMissingPermissions The {@code boolean} that decides if missing permissions are to be
+     *                              automatically set.
+     * @param ignoreErrorsIfPathIsUnderParentDirPath The {@code boolean} that decides if permission
+     *                                               errors are to be ignored if path is under
+     *                                               {@code parentDirPath}.
+     * @return Returns the {@code errmsg} if path is not a regular file, or validating permissions
+     * failed, otherwise {@code null}.
+     */
+    public static String validateRegularFileExistenceAndPermissions(final Context context, final String path, final String parentDirPath, String permissionsToCheck, final boolean setMissingPermissions, final boolean ignoreErrorsIfPathIsUnderParentDirPath) {
+        if (path == null || path.isEmpty()) return context.getString(R.string.null_or_empty_file);
+
+        try {
+            File file = new File(path);
+
+            // If file exits but not a regular file
+            if (file.exists() && !file.isFile()) {
+                return context.getString(R.string.non_regular_file_found);
+            }
+
+            boolean isPathUnderParentDirPath = false;
+            if (parentDirPath != null) {
+                // The path can only be under parent directory path
+                isPathUnderParentDirPath = isPathInDirPath(path, parentDirPath, true);
+            }
+
+            // If setMissingPermissions is enabled and path is a regular file
+            if (setMissingPermissions && permissionsToCheck != null && file.isFile()) {
+                // If there is not parentDirPath restriction or path is under parentDirPath
+                if (parentDirPath == null || (isPathUnderParentDirPath && new File(parentDirPath).isDirectory())) {
+                    setMissingFilePermissions(path, permissionsToCheck);
+                }
+            }
+
+            // If path is not a regular file
+            // Regular files cannot be automatically created so we do not ignore if missing
+            if (!file.isFile()) {
+                return context.getString(R.string.no_regular_file_found);
+            }
+
+            // If there is not parentDirPath restriction or path is not under parentDirPath or
+            // if permission errors must not be ignored for paths under parentDirPath
+            if (parentDirPath == null || !isPathUnderParentDirPath || !ignoreErrorsIfPathIsUnderParentDirPath) {
+                if (permissionsToCheck != null) {
+                    // Check if permissions are missing
+                    return checkMissingFilePermissions(context, path, permissionsToCheck, "File", false);
+                }
+            }
+        }
+        // Some function calls may throw SecurityException, etc
+        catch (Exception e) {
+            return context.getString(R.string.validate_file_existence_and_permissions_failed_with_exception, path, e.getMessage());
+        }
+
+        return null;
+
+    }
+
+    /**
+     * Validate the existence and permissions of directory at path.
+     *
+     * If the {@code parentDirPath} is not {@code null}, then creation of missing directory and
+     * setting of missing permissions will only be done if {@code path} is under
+     * {@code parentDirPath} or equals {@code parentDirPath}.
+     *
+     * @param context The {@link Context} to get error string.
+     * @param path The {@code path} for file to validate.
+     * @param parentDirPath The optional {@code parent directory path} to restrict operations to.
+     *                      This can optionally be {@code null}.
+     * @param permissionsToCheck The 3 character string that contains the "r", "w", "x" or "-" in-order.
+     * @param createDirectoryIfMissing The {@code boolean} that decides if directory
+     *                                 should be created if its missing.
+     * @param setMissingPermissions The {@code boolean} that decides if missing permissions are to be
+     *                              automatically set.
+     * @param ignoreErrorsIfPathIsInParentDirPath The {@code boolean} that decides if existence
+     *                                  and permission errors are to be ignored if path is
+     *                                  in {@code parentDirPath}.
+     * @param ignoreIfNotExecutable The {@code boolean} that decides if missing executable permission
+     *                              error is to be ignored. This allows making an attempt to set
+     *                              executable permissions, but ignoring if it fails.
+     * @return Returns the {@code errmsg} if path is not a directory, or validating permissions
+     * failed, otherwise {@code null}.
+     */
+    public static String validateDirectoryExistenceAndPermissions(final Context context, final String path, final String parentDirPath, String permissionsToCheck, final boolean createDirectoryIfMissing, final boolean setMissingPermissions, final boolean ignoreErrorsIfPathIsInParentDirPath, final boolean ignoreIfNotExecutable) {
+        if (path == null || path.isEmpty()) return context.getString(R.string.null_or_empty_directory);
+
+        try {
+            File file = new File(path);
+
+            // If file exits but not a directory file
+            if (file.exists() && !file.isDirectory()) {
+                return context.getString(R.string.non_directory_file_found);
+            }
+
+            boolean isPathInParentDirPath = false;
+            if (parentDirPath != null) {
+                // The path can be equal to parent directory path or under it
+                isPathInParentDirPath = isPathInDirPath(path, parentDirPath, false);
+            }
+
+            if (createDirectoryIfMissing || setMissingPermissions) {
+                // If there is not parentDirPath restriction or path is in parentDirPath
+                if (parentDirPath == null || (isPathInParentDirPath && new File(parentDirPath).isDirectory())) {
+                    // If createDirectoryIfMissing is enabled and no file exists at path, then create directory
+                    if (createDirectoryIfMissing && !file.exists()) {
+                        Logger.logVerbose(LOG_TAG, "Creating missing directory at path: \"" + path + "\"");
+                        // If failed to create directory
+                        if (!file.mkdirs()) {
+                            return context.getString(R.string.creating_missing_directory_failed, path);
+                        }
+                    }
+
+                    // If setMissingPermissions is enabled and path is a directory
+                    if (setMissingPermissions && permissionsToCheck != null && file.isDirectory()) {
+                        setMissingFilePermissions(path, permissionsToCheck);
+                    }
+                }
+            }
+
+            // If there is not parentDirPath restriction or path is not in parentDirPath or
+            // if existence or permission errors must not be ignored for paths in parentDirPath
+            if (parentDirPath == null || !isPathInParentDirPath || !ignoreErrorsIfPathIsInParentDirPath) {
+                // If path is not a directory
+                // Directories can be automatically created so we can ignore if missing with above check
+                if (!file.isDirectory()) {
+                    return context.getString(R.string.no_directory_found);
+                }
+
+                if (permissionsToCheck != null) {
+                    // Check if permissions are missing
+                    return checkMissingFilePermissions(context, path, permissionsToCheck, "Directory", ignoreIfNotExecutable);
+                }
+            }
+        }
+        // Some function calls may throw SecurityException, etc
+        catch (Exception e) {
+            return context.getString(R.string.validate_directory_existence_and_permissions_failed_with_exception, path, e.getMessage());
+        }
+
+        return null;
+    }
+
+    /**
+     * Set missing permissions for file at path.
+     *
+     * @param path The {@code path} for file to set permissions to.
+     * @param permissionsToSet The 3 character string that contains the "r", "w", "x" or "-" in-order.
+     */
+    public static void setMissingFilePermissions(String path, String permissionsToSet) {
+        if (path == null || path.isEmpty()) return;
+
+        if (!isValidPermissingString(permissionsToSet)) {
+            Logger.logError(LOG_TAG, "Invalid permissionsToSet passed to setMissingFilePermissions: \"" + permissionsToSet + "\"");
+            return;
+        }
+
+        File file = new File(path);
+
+        if (permissionsToSet.contains("r") && !file.canRead()) {
+            Logger.logVerbose(LOG_TAG, "Setting missing read permissions for file at path: \"" + path + "\"");
+            file.setReadable(true);
+        }
+
+        if (permissionsToSet.contains("w") && !file.canWrite()) {
+            Logger.logVerbose(LOG_TAG, "Setting missing write permissions for file at path: \"" + path + "\"");
+            file.setWritable(true);
+        }
+
+        if (permissionsToSet.contains("x") && !file.canExecute()) {
+            Logger.logVerbose(LOG_TAG, "Setting missing execute permissions for file at path: \"" + path + "\"");
+            file.setExecutable(true);
+        }
+    }
+
+    /**
+     * Checking missing permissions for file at path.
+     *
+     * @param context The {@link Context} to get error string.
+     * @param path The {@code path} for file to check permissions for.
+     * @param permissionsToCheck The 3 character string that contains the "r", "w", "x" or "-" in-order.
+     * @param fileType The label for the type of file to use for error string.
+     * @param ignoreIfNotExecutable The {@code boolean} that decides if missing executable permission
+     *                              error is to be ignored.
+     * @return Returns the {@code errmsg} if validating permissions failed, otherwise {@code null}.
+     */
+    public static String checkMissingFilePermissions(Context context, String path, String permissionsToCheck, String fileType, boolean ignoreIfNotExecutable) {
+        if (path == null || path.isEmpty()) return context.getString(R.string.null_or_empty_path);
+
+        if (!isValidPermissingString(permissionsToCheck)) {
+            Logger.logError(LOG_TAG, "Invalid permissionsToCheck passed to checkMissingFilePermissions: \"" + permissionsToCheck + "\"");
+            return context.getString(R.string.invalid_file_permissions_string_to_check);
+        }
+
+        if (fileType == null || fileType.isEmpty()) fileType = "File";
+
+        File file = new File(path);
+
+        // If file is not readable
+        if (permissionsToCheck.contains("r") && !file.canRead()) {
+            return context.getString(R.string.file_not_readable, fileType);
+        }
+
+        // If file is not writable
+        if (permissionsToCheck.contains("w") && !file.canWrite()) {
+            return context.getString(R.string.file_not_writable, fileType);
+        }
+        // If file is not executable
+        // This canExecute() will give "avc: granted { execute }" warnings for target sdk 29
+        else if (permissionsToCheck.contains("x") && !file.canExecute() && !ignoreIfNotExecutable) {
+            return context.getString(R.string.file_not_executable, fileType);
+        }
+
+        return null;
+    }
+
+    /**
+     * Determines whether string exactly matches the 3 character permission string that
+     * contains the "r", "w", "x" or "-" in-order.
+     *
+     * @param string The {@link String} to check.
+     * @return Returns {@code true} if string exactly matches a permission string, otherwise {@code false}.
+     */
+    public static boolean isValidPermissingString(String string) {
+        if (string == null || string.isEmpty()) return false;
+        return Pattern.compile("^([r-])[w-][x-]$", 0).matcher(string).matches();
+    }
+
+}
diff --git a/app/src/main/java/com/termux/app/utils/PluginUtils.java b/app/src/main/java/com/termux/app/utils/PluginUtils.java
new file mode 100644
index 0000000000..e59af7f830
--- /dev/null
+++ b/app/src/main/java/com/termux/app/utils/PluginUtils.java
@@ -0,0 +1,180 @@
+package com.termux.app.utils;
+
+import android.app.Activity;
+import android.app.PendingIntent;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+
+import com.termux.R;
+import com.termux.app.TermuxConstants;
+import com.termux.app.TermuxConstants.TERMUX_APP.TERMUX_SERVICE;
+import com.termux.app.settings.properties.SharedProperties;
+import com.termux.app.settings.properties.TermuxPropertyConstants;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class PluginUtils {
+
+    /** Plugin variable for stdout value of termux command */
+    public static final String PLUGIN_VARIABLE_STDOUT = "%stdout"; // Default: "%stdout"
+    /** Plugin variable for stderr value of termux command */
+    public static final String PLUGIN_VARIABLE_STDERR = "%stderr"; // Default: "%stderr"
+    /** Plugin variable for exit code value of termux command */
+    public static final String PLUGIN_VARIABLE_EXIT_CODE = "%result"; // Default: "%result"
+    /** Plugin variable for err value of termux command */
+    public static final String PLUGIN_VARIABLE_ERR = "%err"; // Default: "%err"
+    /** Plugin variable for errmsg value of termux command */
+    public static final String PLUGIN_VARIABLE_ERRMSG = "%errmsg"; // Default: "%errmsg"
+
+    /** Intent {@code Parcelable} extra containing original intent received from plugin host app by FireReceiver */
+    public static final String EXTRA_ORIGINAL_INTENT = "originalIntent"; // Default: "originalIntent"
+
+
+
+    /** 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"
+
+
+
+    /**
+     * A regex to validate if a string matches a valid plugin host variable name with the percent sign "%" prefix.
+     * Valid values: A string containing a percent sign character "%", followed by 1 alphanumeric character,
+     * followed by 2 or more alphanumeric or underscore "_" characters but does not end with an underscore "_"
+     */
+    public static final String PLUGIN_HOST_VARIABLE_NAME_MATCH_EXPRESSION =  "%[a-zA-Z0-9][a-zA-Z0-9_]{2,}(?<!_)";
+
+
+
+    private static final String LOG_TAG = "PluginUtils";
+
+    /**
+     * Send execution result of commands to the {@link PendingIntent} creator received by
+     * execution service if {@code pendingIntent} is not {@code null}
+     *
+     * @param logLevel The log level to dump the result.
+     * @param logTag The log tag to use for logging.
+     * @param context The {@link Context} that will be used to send result intent to the PluginResultsService.
+     * @param pendingIntent The {@link PendingIntent} sent by creator to the execution service.
+     * @param stdout The value for {@link TERMUX_SERVICE#EXTRA_STDOUT} extra of {@link TERMUX_SERVICE#EXTRA_RESULT_BUNDLE} bundle of intent.
+     * @param stderr The value for {@link TERMUX_SERVICE#EXTRA_STDERR} extra of {@link TERMUX_SERVICE#EXTRA_RESULT_BUNDLE} bundle of intent.
+     * @param exitCode The value for {@link TERMUX_SERVICE#EXTRA_EXIT_CODE} extra of {@link TERMUX_SERVICE#EXTRA_RESULT_BUNDLE} bundle of intent.
+     * @param errCode The value for {@link TERMUX_SERVICE#EXTRA_ERR} extra of {@link TERMUX_SERVICE#EXTRA_RESULT_BUNDLE} bundle of intent.
+     * @param errmsg The value for {@link TERMUX_SERVICE#EXTRA_ERRMSG} extra of {@link TERMUX_SERVICE#EXTRA_RESULT_BUNDLE} bundle of intent.
+     */
+    public static void sendExecuteResultToResultsService(final int logLevel, final String logTag, final Context context, final PendingIntent pendingIntent, final String stdout, final String stderr, final String exitCode, final String errCode, final String errmsg) {
+        String label;
+
+        if(pendingIntent == null)
+            label = "Execution Result";
+        else
+            label = "Sending execution result to " + pendingIntent.getCreatorPackage();
+
+        Logger.logMesssage(logLevel, logTag, label + ":\n" +
+            TERMUX_SERVICE.EXTRA_STDOUT + ":\n```\n" + stdout + "\n```\n" +
+            TERMUX_SERVICE.EXTRA_STDERR + ":\n```\n" + stderr + "\n```\n" +
+            TERMUX_SERVICE.EXTRA_EXIT_CODE + ": `" + exitCode + "`\n" +
+            TERMUX_SERVICE.EXTRA_ERR + ": `" + errCode + "`\n" +
+            TERMUX_SERVICE.EXTRA_ERRMSG + ": `" + errmsg + "`");
+
+        // If pendingIntent is null, then just return
+        if(pendingIntent == null) return;
+
+        final Bundle resultBundle = new Bundle();
+
+        resultBundle.putString(TERMUX_SERVICE.EXTRA_STDOUT, stdout);
+        resultBundle.putString(TERMUX_SERVICE.EXTRA_STDERR, stderr);
+        if (exitCode != null && !exitCode.isEmpty()) resultBundle.putInt(TERMUX_SERVICE.EXTRA_EXIT_CODE, Integer.parseInt(exitCode));
+        if (errCode != null && !errCode.isEmpty()) resultBundle.putInt(TERMUX_SERVICE.EXTRA_ERR, Integer.parseInt(errCode));
+        resultBundle.putString(TERMUX_SERVICE.EXTRA_ERRMSG, errmsg);
+
+        Intent resultIntent = new Intent();
+        resultIntent.putExtra(TERMUX_SERVICE.EXTRA_RESULT_BUNDLE, resultBundle);
+
+        if(context != null) {
+            try {
+                pendingIntent.send(context, Activity.RESULT_OK, resultIntent);
+            } catch (PendingIntent.CanceledException e) {
+                // The caller doesn't want the result? That's fine, just ignore
+            }
+        }
+    }
+
+    /**
+     * 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 errmsg} if policy is violated, otherwise {@code null}.
+     */
+    public static String checkIfRunCommandServiceAllowExternalAppsPolicyIsViolated(final Context context) {
+        String errmsg = null;
+        if (!SharedProperties.isPropertyValueTrue(context, TermuxPropertyConstants.getTermuxPropertiesFile(), TermuxConstants.PROP_ALLOW_EXTERNAL_APPS)) {
+            errmsg = context.getString(R.string.run_command_service_allow_external_apps_ungranted_warning);
+        }
+
+        return errmsg;
+    }
+
+    /**
+     * Send execution result of commands to the {@link PendingIntent} creator received by
+     * execution service if {@code pendingIntent} is not {@code null}
+     *
+     * @param logLevel The log level to dump the result.
+     * @param logTag The log tag to use for logging.
+     * @param executable The executable received.
+     * @param arguments_list The arguments list for executable received.
+     * @param workingDirectory The working directory for the command received.
+     * @param inBackground The command should be run in background.
+     * @param additionalExtras The {@link HashMap} for additional extras received. The key will be
+     *                         used as the label to log the value. The object will be converted
+     *                        to {@link String} with a call to {@code value.toString()}.
+     */
+    public static void dumpExecutionIntentToLog(int logLevel, String logTag, String label, String executable, List<String> arguments_list, String workingDirectory, boolean inBackground, HashMap<String, Object> additionalExtras) {
+        if (label == null) label = "Execution Intent";
+
+        StringBuilder executionIntentDump = new StringBuilder();
+
+        executionIntentDump.append(label).append(":\n");
+        executionIntentDump.append("Executable: `").append(executable).append("`\n");
+        executionIntentDump.append("Arguments:").append(getArgumentsStringForLog(arguments_list)).append("\n");
+        executionIntentDump.append("Working Directory: `").append(workingDirectory).append("`\n");
+        executionIntentDump.append("inBackground: `").append(inBackground).append("`");
+
+        if(additionalExtras != null) {
+            for (Map.Entry<String, Object> entry : additionalExtras.entrySet()) {
+                executionIntentDump.append("\n").append(entry.getKey()).append(": `").append(entry.getValue()).append("`");
+            }
+        }
+
+        Logger.logMesssage(logLevel, logTag, executionIntentDump.toString());
+    }
+
+    /**
+     * Converts arguments list to log friendly format. If arguments are null or of size 0, then
+     * nothing is returned. Otherwise following format is returned:
+     *
+     * ```
+     * Arg 0: `value`
+     * Arg 1: 'value`
+     * ```
+     *
+     * @param arguments_list The arguments list.
+     * @return Returns the formatted arguments list.
+     */
+    public static String getArgumentsStringForLog(List<String> arguments_list) {
+        if (arguments_list==null || arguments_list.size() == 0) return "";
+
+        StringBuilder arguments_list_string = new StringBuilder("\n```\n");
+        for(int i = 0; i != arguments_list.size(); i++) {
+            arguments_list_string.append("Arg ").append(i).append(": `").append(arguments_list.get(i)).append("`\n");
+        }
+        arguments_list_string.append("```");
+
+        return arguments_list_string.toString();
+    }
+}
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 97b65a37a6..9de363d1aa 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -9,6 +9,7 @@
     <!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>
@@ -64,6 +65,29 @@
     <string name="file_received_edit_button">Edit</string>
     <string name="file_received_open_folder_button">Open folder</string>
 
+    <string name="executable_absolute_path">Executable Absolute Path: \"%1$s\"</string>
+    <string name="working_directory_absolute_path">Working Directory Absolute Path: \"%1$s\"</string>
+
+    <string name="executable_required">Executable required.</string>
+    <string name="null_or_empty_path">The path is null or empty.</string>
+    <string name="null_or_empty_file">The file is null or empty.</string>
+    <string name="null_or_empty_executable">The executable is null or empty.</string>
+    <string name="null_or_empty_directory">The directory is null or empty.</string>
+    <string name="invalid_file_permissions_string_to_check">The file permission string to check is invalid.</string>
+    <string name="no_regular_file_found">Regular file not found at path.</string>
+    <string name="no_directory_found">Directory not found at path.</string>
+    <string name="file_not_readable">%1$s at path is not readable. Permission Denied.</string>
+    <string name="file_not_writable">%1$s at path is not writable. Permission Denied.</string>
+    <string name="file_not_executable">%1$s at path is not executable. Permission Denied.</string>
+    <string name="non_regular_file_found">Non-regular file found at path.</string>
+    <string name="non_directory_file_found">Non-directory file found at path.</string>
+    <string name="creating_missing_directory_failed">Failed to create missing directory at path: \"%1$s\"</string>
+    <string name="validate_file_existence_and_permissions_failed_with_exception">Validating file existence and permissions fafiled: \"%1$s\"\nException: %2$s</string>
+    <string name="validate_directory_existence_and_permissions_failed_with_exception">Validating directory existence and permissions fafiled: \"%1$s\"\nException: %2$s</string>
+
+    <string name="run_command_service_invalid_action">Invalid intent action to RunCommandService: \"%1$s\"</string>
+    <string name="run_command_service_invalid_command_path">Invalid coommand path to RunCommandService: \"%1$s\"</string>
+    <string name="run_command_service_allow_external_apps_ungranted_warning">RunCommandService require allow-external-apps property to be set to \"true\" in &TERMUX_PROPERTIES_PRIMARY_PATH_SHORT; file.</string>
 
 
 

From 5d6a98452ac2a527205e6c74298e322b586034c1 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Fri, 19 Mar 2021 18:42:12 +0500
Subject: [PATCH 254/912] Added TERMUX_SERVICE#ACTION_SERVICE_EXECUTE Intent
 Logging

---
 .../java/com/termux/app/TermuxService.java     | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/app/src/main/java/com/termux/app/TermuxService.java b/app/src/main/java/com/termux/app/TermuxService.java
index 4b43564e14..3820b1a284 100644
--- a/app/src/main/java/com/termux/app/TermuxService.java
+++ b/app/src/main/java/com/termux/app/TermuxService.java
@@ -18,6 +18,7 @@
 import android.os.IBinder;
 import android.os.PowerManager;
 import android.provider.Settings;
+import android.util.Log;
 import android.widget.ArrayAdapter;
 
 import com.termux.R;
@@ -27,6 +28,7 @@
 import com.termux.app.terminal.TermuxSessionClient;
 import com.termux.app.terminal.TermuxSessionClientBase;
 import com.termux.app.utils.Logger;
+import com.termux.app.utils.PluginUtils;
 import com.termux.app.utils.TextDataUtils;
 import com.termux.terminal.TerminalEmulator;
 import com.termux.terminal.TerminalSession;
@@ -34,6 +36,8 @@
 
 import java.io.File;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -291,7 +295,15 @@ private void actionServiceExecute(Intent intent) {
     private void executeBackgroundCommand(String executablePath, String[] arguments, String cwd, PendingIntent pendingIntent) {
         Logger.logDebug(LOG_TAG, "Starting background command");
 
+        final String pendingIntentCreator;
+        if(pendingIntent != null) pendingIntentCreator = pendingIntent.getCreatorPackage(); else pendingIntentCreator = null;
+
+        PluginUtils.dumpExecutionIntentToLog(Log.DEBUG, LOG_TAG, null, executablePath, Arrays.asList(arguments), cwd, true, new HashMap<String, Object>() {{
+            put("pendingIntentCreator", pendingIntentCreator);
+        }});
+
         BackgroundJob task = new BackgroundJob(cwd, executablePath, arguments, this, pendingIntent);
+
         mBackgroundTasks.add(task);
         updateNotification();
     }
@@ -309,6 +321,12 @@ private void executeForegroundCommand(Intent intent, String executablePath, Stri
         Logger.logDebug(LOG_TAG, "Starting foreground command");
 
         boolean failsafe = intent.getBooleanExtra(TERMUX_ACTIVITY.ACTION_FAILSAFE_SESSION, false);
+
+        PluginUtils.dumpExecutionIntentToLog(Log.DEBUG, LOG_TAG, null, executablePath, Arrays.asList(arguments), cwd, false, new HashMap<String, Object>() {{
+            put("sessionAction", sessionAction);
+            put("failsafe", failsafe);
+        }});
+
         TerminalSession newSession = createTerminalSession(executablePath, arguments, cwd, failsafe);
 
         // Transform executable path to session name, e.g. "/bin/do-something.sh" => "do something.sh".

From 7d53a147d8e18424c5ed6bb4b26c4345c6b80ad2 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Fri, 19 Mar 2021 18:44:39 +0500
Subject: [PATCH 255/912] Reordered TermuxService.actionAcquireWakeLock()

---
 .../java/com/termux/app/TermuxService.java    | 60 ++++++++++---------
 1 file changed, 31 insertions(+), 29 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxService.java b/app/src/main/java/com/termux/app/TermuxService.java
index 3820b1a284..8c8f8f3a9e 100644
--- a/app/src/main/java/com/termux/app/TermuxService.java
+++ b/app/src/main/java/com/termux/app/TermuxService.java
@@ -212,38 +212,40 @@ private void actionStopService() {
     /** Process action to acquire Power and Wi-Fi WakeLocks. */
     @SuppressLint({"WakelockTimeout", "BatteryLife"})
     private void actionAcquireWakeLock() {
-        if (mWakeLock == null) {
-            Logger.logDebug(LOG_TAG, "Acquiring WakeLocks");
-
-            PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
-            mWakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, TermuxConstants.TERMUX_APP_NAME.toLowerCase() + ":service-wakelock");
-            mWakeLock.acquire();
-
-            // http://tools.android.com/tech-docs/lint-in-studio-2-3#TOC-WifiManager-Leak
-            WifiManager wm = (WifiManager) getApplicationContext().getSystemService(Context.WIFI_SERVICE);
-            mWifiLock = wm.createWifiLock(WifiManager.WIFI_MODE_FULL_HIGH_PERF, TermuxConstants.TERMUX_APP_NAME.toLowerCase());
-            mWifiLock.acquire();
-
-            String packageName = getPackageName();
-            if (!pm.isIgnoringBatteryOptimizations(packageName)) {
-                Intent whitelist = new Intent();
-                whitelist.setAction(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS);
-                whitelist.setData(Uri.parse("package:" + packageName));
-                whitelist.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-
-                try {
-                    startActivity(whitelist);
-                } catch (ActivityNotFoundException e) {
-                    Logger.logStackTraceWithMessage(LOG_TAG, "Failed to call ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS", e);
-                }
-            }
+        if (mWakeLock != null) {
+            Logger.logDebug(LOG_TAG, "Ignoring acquiring WakeLocks since they are already held");
+            return;
+        }
 
-            updateNotification();
+        Logger.logDebug(LOG_TAG, "Acquiring WakeLocks");
 
-            Logger.logDebug(LOG_TAG, "WakeLocks acquired successfully");
-        } else {
-            Logger.logDebug(LOG_TAG, "Ignoring acquiring WakeLocks since they are already held");
+        PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
+        mWakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, TermuxConstants.TERMUX_APP_NAME.toLowerCase() + ":service-wakelock");
+        mWakeLock.acquire();
+
+        // http://tools.android.com/tech-docs/lint-in-studio-2-3#TOC-WifiManager-Leak
+        WifiManager wm = (WifiManager) getApplicationContext().getSystemService(Context.WIFI_SERVICE);
+        mWifiLock = wm.createWifiLock(WifiManager.WIFI_MODE_FULL_HIGH_PERF, TermuxConstants.TERMUX_APP_NAME.toLowerCase());
+        mWifiLock.acquire();
+
+        String packageName = getPackageName();
+        if (!pm.isIgnoringBatteryOptimizations(packageName)) {
+            Intent whitelist = new Intent();
+            whitelist.setAction(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS);
+            whitelist.setData(Uri.parse("package:" + packageName));
+            whitelist.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+
+            try {
+                startActivity(whitelist);
+            } catch (ActivityNotFoundException e) {
+                Logger.logStackTraceWithMessage(LOG_TAG, "Failed to call ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS", e);
+            }
         }
+
+        updateNotification();
+
+        Logger.logDebug(LOG_TAG, "WakeLocks acquired successfully");
+
     }
 
     /** Process action to release Power and Wi-Fi WakeLocks. */

From 8612a1d0f8e40c29f2a3391026284d789593b46e Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Fri, 19 Mar 2021 22:49:06 +0500
Subject: [PATCH 256/912] Added plugin_error_notifications_enabled preference

This will allow user to control whether flashes and notifications for plugin errors are enabled or not.

The `TermuxPreferenceConstants` classes has been updated to `v0.4.0`. Check its Changelog sections for info on changes.
---
 .../settings/DebuggingPreferencesFragment.java    |  5 +++++
 .../preferences/TermuxAppSharedPreferences.java   | 10 ++++++++++
 .../preferences/TermuxPreferenceConstants.java    | 15 +++++++++++++--
 app/src/main/res/values/strings.xml               |  6 ++++++
 app/src/main/res/xml/debugging_preferences.xml    |  6 ++++++
 5 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/termux/app/settings/DebuggingPreferencesFragment.java b/app/src/main/java/com/termux/app/settings/DebuggingPreferencesFragment.java
index e6dc03c619..9944cf6113 100644
--- a/app/src/main/java/com/termux/app/settings/DebuggingPreferencesFragment.java
+++ b/app/src/main/java/com/termux/app/settings/DebuggingPreferencesFragment.java
@@ -108,6 +108,9 @@ public void putBoolean(String key, boolean value) {
             case "terminal_view_key_logging_enabled":
                     mPreferences.setTerminalViewKeyLoggingEnabled(value);
                 break;
+            case "plugin_error_notifications_enabled":
+                mPreferences.setPluginErrorNotificationsEnabled(value);
+                break;
             default:
                 break;
         }
@@ -118,6 +121,8 @@ public boolean getBoolean(String key, boolean defValue) {
         switch (key) {
             case "terminal_view_key_logging_enabled":
                 return mPreferences.getTerminalViewKeyLoggingEnabled();
+            case "plugin_error_notifications_enabled":
+                return mPreferences.getPluginErrorNotificationsEnabled();
             default:
                 return false;
         }
diff --git a/app/src/main/java/com/termux/app/settings/preferences/TermuxAppSharedPreferences.java b/app/src/main/java/com/termux/app/settings/preferences/TermuxAppSharedPreferences.java
index 18be3803b0..33c12d9079 100644
--- a/app/src/main/java/com/termux/app/settings/preferences/TermuxAppSharedPreferences.java
+++ b/app/src/main/java/com/termux/app/settings/preferences/TermuxAppSharedPreferences.java
@@ -130,4 +130,14 @@ public void setTerminalViewKeyLoggingEnabled(boolean value) {
         SharedPreferenceUtils.setBoolean(mSharedPreferences, TERMUX_APP.KEY_TERMINAL_VIEW_KEY_LOGGING_ENABLED, value, false);
     }
 
+
+
+    public boolean getPluginErrorNotificationsEnabled() {
+        return SharedPreferenceUtils.getBoolean(mSharedPreferences, TERMUX_APP.KEY_PLUGIN_ERROR_NOTIFICATIONS_ENABLED, TERMUX_APP.DEFAULT_VALUE_PLUGIN_ERROR_NOTIFICATIONS_ENABLED);
+    }
+
+    public void setPluginErrorNotificationsEnabled(boolean value) {
+        SharedPreferenceUtils.setBoolean(mSharedPreferences, TERMUX_APP.KEY_PLUGIN_ERROR_NOTIFICATIONS_ENABLED, value, false);
+    }
+
 }
diff --git a/app/src/main/java/com/termux/app/settings/preferences/TermuxPreferenceConstants.java b/app/src/main/java/com/termux/app/settings/preferences/TermuxPreferenceConstants.java
index a760a1bfd1..605e9f0610 100644
--- a/app/src/main/java/com/termux/app/settings/preferences/TermuxPreferenceConstants.java
+++ b/app/src/main/java/com/termux/app/settings/preferences/TermuxPreferenceConstants.java
@@ -1,7 +1,7 @@
 package com.termux.app.settings.preferences;
 
 /*
- * Version: v0.3.0
+ * Version: v0.4.0
  *
  * Changelog
  *
@@ -16,7 +16,12 @@
  *          Termux app and its plugins. This will allow {@link com.termux.app.TermuxSettings} to
  *          manage preferences of plugins as well if they don't have launcher activity themselves
  *          and also allow plugin apps to make changes to preferences from background.
- *      - Added `KEY_LOG_LEVEL` to `TERMUX_TASKER_APP` scope.
+ *      - Added following to `TERMUX_TASKER_APP`:
+     *      `KEY_LOG_LEVEL`.
+ *
+ * - 0.4.0 (2021-03-13)
+ *      - Added following to `TERMUX_APP`:
+ *          `KEY_PLUGIN_ERROR_NOTIFICATIONS_ENABLED` and `DEFAULT_VALUE_PLUGIN_ERROR_NOTIFICATIONS_ENABLED`.
  */
 
 /**
@@ -71,6 +76,12 @@ public static final class TERMUX_APP {
         public static final String KEY_TERMINAL_VIEW_KEY_LOGGING_ENABLED = "terminal_view_key_logging_enabled";
         public static final boolean DEFAULT_VALUE_TERMINAL_VIEW_KEY_LOGGING_ENABLED = false;
 
+        /**
+         * Defines the key for whether flashes and notifications for plugin errors are enabled or not
+         */
+        public static final String KEY_PLUGIN_ERROR_NOTIFICATIONS_ENABLED = "plugin_error_notifications_enabled";
+        public static final boolean DEFAULT_VALUE_PLUGIN_ERROR_NOTIFICATIONS_ENABLED = true;
+
     }
 
     /**
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9de363d1aa..a186ce4690 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -118,4 +118,10 @@
             <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>
 
+
+            <!-- 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>
+
 </resources>
diff --git a/app/src/main/res/xml/debugging_preferences.xml b/app/src/main/res/xml/debugging_preferences.xml
index ba1f328da2..af126ff38f 100644
--- a/app/src/main/res/xml/debugging_preferences.xml
+++ b/app/src/main/res/xml/debugging_preferences.xml
@@ -16,6 +16,12 @@
             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" />
+
     </PreferenceCategory>
 
 </PreferenceScreen>

From f393e9b2cf5ddbfcef860eebaf51541d850d70e3 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 24 Mar 2021 02:27:28 +0500
Subject: [PATCH 257/912] Allow mPropertiesList to be null for SharedProperties

This will allow all keys that are read from file to be stored in mMap without knowing their names beforehand.
---
 .../settings/properties/SharedProperties.java | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/termux/app/settings/properties/SharedProperties.java b/app/src/main/java/com/termux/app/settings/properties/SharedProperties.java
index 49d9f3e28e..87f32eaea7 100644
--- a/app/src/main/java/com/termux/app/settings/properties/SharedProperties.java
+++ b/app/src/main/java/com/termux/app/settings/properties/SharedProperties.java
@@ -42,8 +42,8 @@ public class SharedProperties {
 
     /**
      * The {@link Properties} object that maintains an in-memory cache of values loaded from the
-     * {@link #mPropertiesFile} file. The key/value pairs are of any keys defined by
-     * {@link #mPropertiesList} that are found in the file against their literal values in the file.
+     * {@link #mPropertiesFile} file. The key/value pairs are of any keys that are found in the file
+     * against their literal values in the file.
      */
     private Properties mProperties;
 
@@ -85,9 +85,11 @@ public class SharedProperties {
      * @param context The Context for operations.
      * @param propertiesFile The {@link File} object to load properties from.
      * @param propertiesList The {@link Set<String>} object that defined which properties to load.
+     *                       If this is set to {@code null}, then all properties that exist in
+     *                       {@code propertiesFile} will be read by {@link #loadPropertiesFromDisk()}
      * @param sharedPropertiesParser The implementation of the {@link SharedPropertiesParser} interface.
      */
-    public SharedProperties(@Nonnull Context context, @Nullable File propertiesFile, @Nonnull Set<String> propertiesList, @Nonnull SharedPropertiesParser sharedPropertiesParser) {
+    public SharedProperties(@Nonnull Context context, @Nullable File propertiesFile, Set<String> propertiesList, @Nonnull SharedPropertiesParser sharedPropertiesParser) {
         mContext = context;
         mPropertiesFile = propertiesFile;
         mPropertiesList = propertiesList;
@@ -98,8 +100,9 @@ public SharedProperties(@Nonnull Context context, @Nullable File propertiesFile,
     }
 
     /**
-     * Load the properties defined by {@link #mPropertiesList} from the {@link #mPropertiesFile} file
-     * to update the {@link #mProperties} and {@link #mMap} in-memory cache.
+     * Load the properties defined by {@link #mPropertiesList} or all properties if its {@code null}
+     * from the {@link #mPropertiesFile} file to update the {@link #mProperties} and {@link #mMap}
+     * in-memory cache.
      * Properties are not loading automatically when constructor is called and must be manually called.
      */
     public void loadPropertiesFromDisk() {
@@ -115,9 +118,13 @@ public void loadPropertiesFromDisk() {
             HashMap<String, Object> map = new HashMap<String, Object>();
             Properties newProperties = new Properties();
 
+            Set<String> propertiesList = mPropertiesList;
+            if(propertiesList == null)
+                propertiesList = properties.stringPropertyNames();
+
             String value;
             Object internalValue;
-            for (String key : mPropertiesList) {
+            for (String key : propertiesList) {
                 value = properties.getProperty(key); // value will be null if key does not exist in propertiesFile
                 Logger.logDebug(LOG_TAG, key + " : " + value);
 
@@ -126,7 +133,7 @@ public void loadPropertiesFromDisk() {
                 internalValue = mSharedPropertiesParser.getInternalPropertyValueFromValue(mContext, key, value);
 
                 // If the internal value was successfully added to map, then also add value to newProperties
-                // We only store values in-memory defined by {@link #mPropertiesList}
+                // We only store values in-memory defined by propertiesList
                 if (putToMap(map, key, internalValue)) { // null internalValue will be put into map
                     putToProperties(newProperties, key, value); // null value will **not** be into properties
                 }

From 131f481750dcea638371ac84f31fb0ac494c3f2c Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 24 Mar 2021 02:30:20 +0500
Subject: [PATCH 258/912] Add commonmark-spec markdown support with markwon
 library

Also adds MarkdownUtitls to provide various utils for markdown processing.
---
 app/build.gradle                              |   8 +
 .../com/termux/app/utils/MarkdownUtils.java   | 191 ++++++++++++++++++
 2 files changed, 199 insertions(+)
 create mode 100644 app/src/main/java/com/termux/app/utils/MarkdownUtils.java

diff --git a/app/build.gradle b/app/build.gradle
index 0d88b0a4dc..22bfe3eebe 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,6 +2,8 @@ plugins {
   id "com.android.application"
 }
 
+ext.markwon_version='4.6.2'
+
 android {
     compileSdkVersion project.properties.compileSdkVersion.toInteger()
     ndkVersion project.properties.ndkVersion
@@ -14,6 +16,10 @@ android {
         implementation 'androidx.preference:preference:1.1.1'
         implementation "androidx.viewpager:viewpager:1.0.0"
         implementation 'com.google.guava:guava:24.1-jre'
+        implementation  "io.noties.markwon:core:$markwon_version"
+        implementation  "io.noties.markwon:ext-strikethrough:$markwon_version"
+        implementation  "io.noties.markwon:linkify:$markwon_version"
+        implementation  "io.noties.markwon:recycler:$markwon_version"
         implementation project(":terminal-view")
     }
 
@@ -89,6 +95,8 @@ android {
 }
 
 dependencies {
+    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     testImplementation 'junit:junit:4.13.1'
     testImplementation 'org.robolectric:robolectric:4.4'
 }
diff --git a/app/src/main/java/com/termux/app/utils/MarkdownUtils.java b/app/src/main/java/com/termux/app/utils/MarkdownUtils.java
new file mode 100644
index 0000000000..712b01b232
--- /dev/null
+++ b/app/src/main/java/com/termux/app/utils/MarkdownUtils.java
@@ -0,0 +1,191 @@
+package com.termux.app.utils;
+
+import android.content.Context;
+import android.graphics.Typeface;
+import android.text.Spanned;
+import android.text.style.AbsoluteSizeSpan;
+import android.text.style.BackgroundColorSpan;
+import android.text.style.BulletSpan;
+import android.text.style.QuoteSpan;
+import android.text.style.StrikethroughSpan;
+import android.text.style.StyleSpan;
+import android.text.style.TypefaceSpan;
+import android.text.util.Linkify;
+
+import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
+
+import com.google.common.base.Strings;
+import com.termux.R;
+
+import org.commonmark.ext.gfm.strikethrough.Strikethrough;
+import org.commonmark.node.BlockQuote;
+import org.commonmark.node.Code;
+import org.commonmark.node.Emphasis;
+import org.commonmark.node.FencedCodeBlock;
+import org.commonmark.node.ListItem;
+import org.commonmark.node.StrongEmphasis;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import io.noties.markwon.AbstractMarkwonPlugin;
+import io.noties.markwon.Markwon;
+import io.noties.markwon.MarkwonSpansFactory;
+import io.noties.markwon.MarkwonVisitor;
+import io.noties.markwon.ext.strikethrough.StrikethroughPlugin;
+import io.noties.markwon.linkify.LinkifyPlugin;
+
+public class MarkdownUtils {
+
+    public static String backtick = "`";
+    public static Pattern backticksPattern = Pattern.compile("(" + backtick + "+)");
+
+    /**
+     * Get the markdown code {@link String} for a {@link String}. This ensures all backticks "`" are
+     * properly escaped so that markdown does not break.
+     *
+     * @param string The {@link String} to convert.
+     * @param codeBlock If the {@link String} is to be converted to a code block or inline code.
+     * @return Returns the markdown code {@link String}.
+     */
+    public static String getMarkdownCodeForString(String string, boolean codeBlock) {
+        if(string == null) return null;
+        if(string.isEmpty()) return "";
+
+        int maxConsecutiveBackTicksCount = getMaxConsecutiveBackTicksCount(string);
+
+        // markdown requires surrounding backticks count to be at least one more than the count
+        // of consecutive ticks in the string itself
+        int backticksCountToUse;
+        if(codeBlock)
+            backticksCountToUse = maxConsecutiveBackTicksCount + 3;
+        else
+            backticksCountToUse = maxConsecutiveBackTicksCount + 1;
+
+        // create a string with n backticks where n==backticksCountToUse
+        String backticksToUse = Strings.repeat(backtick, backticksCountToUse);
+
+        if(codeBlock)
+            return backticksToUse + "\n" + string + "\n" + backticksToUse;
+        else {
+            // add a space to any prefixed or suffixed backtick characters
+            if(string.startsWith(backtick))
+                string = " " + string;
+            if(string.endsWith(backtick))
+                string = string + " ";
+
+            return backticksToUse + string + backticksToUse;
+        }
+    }
+
+    /**
+     * Get the max consecutive backticks "`" in a {@link String}.
+     *
+     * @param string The {@link String} to check.
+     * @return Returns the max consecutive backticks count.
+     */
+    public static int getMaxConsecutiveBackTicksCount(String string) {
+        if(string == null || string.isEmpty()) return 0;
+
+        int maxCount = 0;
+        int matchCount;
+
+        Matcher matcher = backticksPattern.matcher(string);
+        while(matcher.find()) {
+            matchCount = matcher.group(1).length();
+            if(matchCount > maxCount)
+                maxCount = matchCount;
+        }
+
+        return maxCount;
+    }
+
+
+
+    public static String getSingleLineMarkdownStringEntry(String label, Object object, String def) {
+        if (object != null)
+            return "**" + label + "**: " + getMarkdownCodeForString(object.toString(), false) +  "  ";
+        else
+            return "**" + label + "**: " + def +  "  ";
+    }
+
+    public static String getMultiLineMarkdownStringEntry(String label, Object object, String def) {
+        if (object != null)
+            return "**" + label + "**:\n" + getMarkdownCodeForString(object.toString(), true) + "\n";
+        else
+            return "**" + label + "**: " + def + "\n";
+    }
+
+
+    /** Check following for more info:
+     * https://github.com/noties/Markwon/tree/v4.6.2/app-sample
+     * https://noties.io/Markwon/docs/v4/recycler/
+     * https://github.com/noties/Markwon/blob/v4.6.2/app-sample/src/main/java/io/noties/markwon/app/readme/ReadMeActivity.kt
+     */
+    public static Markwon getRecyclerMarkwonBuilder(Context context) {
+        return Markwon.builder(context)
+            .usePlugin(LinkifyPlugin.create(Linkify.EMAIL_ADDRESSES | Linkify.WEB_URLS))
+            .usePlugin(new AbstractMarkwonPlugin() {
+                @Override
+                public void configureVisitor(@NonNull MarkwonVisitor.Builder builder) {
+                    builder.on(FencedCodeBlock.class, (visitor, fencedCodeBlock) -> {
+                        // we actually won't be applying code spans here, as our custom xml view will
+                        // draw background and apply mono typeface
+                        //
+                        // NB the `trim` operation on literal (as code will have a new line at the end)
+                        final CharSequence code = visitor.configuration()
+                            .syntaxHighlight()
+                            .highlight(fencedCodeBlock.getInfo(), fencedCodeBlock.getLiteral().trim());
+                        visitor.builder().append(code);
+                    });
+                }
+
+                @Override
+                public void configureSpansFactory(@NonNull MarkwonSpansFactory.Builder builder) {
+                    builder
+                        // set color for inline code
+                        .setFactory(Code.class, (configuration, props) -> new Object[]{
+                            new BackgroundColorSpan(ContextCompat.getColor(context, R.color.background_markdown_code_inline)),
+                        });
+                }
+            })
+            .build();
+    }
+
+    /** Check following for more info:
+     * https://github.com/noties/Markwon/tree/v4.6.2/app-sample
+     * https://github.com/noties/Markwon/blob/v4.6.2/app-sample/src/main/java/io/noties/markwon/app/samples/notification/NotificationSample.java
+     */
+    public static Markwon getSpannedMarkwonBuilder(Context context) {
+        return Markwon.builder(context)
+                .usePlugin(StrikethroughPlugin.create())
+                .usePlugin(new AbstractMarkwonPlugin() {
+                    @Override
+                    public void configureSpansFactory(@NonNull MarkwonSpansFactory.Builder builder) {
+                        builder
+                            .setFactory(Emphasis.class, (configuration, props) -> new StyleSpan(Typeface.ITALIC))
+                            .setFactory(StrongEmphasis.class, (configuration, props) -> new StyleSpan(Typeface.BOLD))
+                            .setFactory(BlockQuote.class, (configuration, props) -> new QuoteSpan())
+                            .setFactory(Strikethrough.class, (configuration, props) -> new StrikethroughSpan())
+                            // NB! notification does not handle background color
+                            .setFactory(Code.class, (configuration, props) -> new Object[]{
+                                new BackgroundColorSpan(ContextCompat.getColor(context, R.color.background_markdown_code_inline)),
+                                new TypefaceSpan("monospace"),
+                                new AbsoluteSizeSpan(8)
+                            })
+                            // NB! both ordered and bullet list items
+                            .setFactory(ListItem.class, (configuration, props) -> new BulletSpan());
+                    }
+                })
+                .build();
+    }
+
+    public static Spanned getSpannedMarkdownText(Context context, String string) {
+
+        final Markwon markwon = getSpannedMarkwonBuilder(context);
+
+        return markwon.toMarkdown(string);
+    }
+
+}

From c28990a176b947331d011842c2789ad052a41a78 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 24 Mar 2021 02:31:22 +0500
Subject: [PATCH 259/912] Add ShareUtils

---
 .../java/com/termux/app/utils/ShareUtils.java | 69 +++++++++++++++++++
 1 file changed, 69 insertions(+)
 create mode 100644 app/src/main/java/com/termux/app/utils/ShareUtils.java

diff --git a/app/src/main/java/com/termux/app/utils/ShareUtils.java b/app/src/main/java/com/termux/app/utils/ShareUtils.java
new file mode 100644
index 0000000000..4f8b628e22
--- /dev/null
+++ b/app/src/main/java/com/termux/app/utils/ShareUtils.java
@@ -0,0 +1,69 @@
+package com.termux.app.utils;
+
+import android.content.ClipData;
+import android.content.ClipboardManager;
+import android.content.Context;
+import android.content.Intent;
+
+import androidx.core.content.ContextCompat;
+
+import com.termux.R;
+
+public class ShareUtils {
+
+    /**
+     * Open the system app chooser that allows the user to select which app to send the intent.
+     *
+     * @param context The context for operations.
+     * @param intent The intent that describes the choices that should be shown.
+     * @param title The title for choose menu.
+     */
+    private static void openSystemAppChooser(final Context context, final Intent intent, final String title) {
+        if(context == null) return;
+
+        final Intent chooserIntent = new Intent(Intent.ACTION_CHOOSER);
+        chooserIntent.putExtra(Intent.EXTRA_INTENT, intent);
+        chooserIntent.putExtra(Intent.EXTRA_TITLE, title);
+        chooserIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        context.startActivity(chooserIntent);
+    }
+
+    /**
+     * Share text.
+     *
+     * @param context The context for operations.
+     * @param subject The subject for sharing.
+     * @param text The text to share.
+     */
+    public static void shareText(final Context context, final String subject, final String text) {
+        if(context == null) return;
+
+        final Intent shareTextIntent = new Intent(Intent.ACTION_SEND);
+        shareTextIntent.setType("text/plain");
+        shareTextIntent.putExtra(Intent.EXTRA_SUBJECT, subject);
+        shareTextIntent.putExtra(Intent.EXTRA_TEXT, text);
+
+        openSystemAppChooser(context, shareTextIntent, context.getString(R.string.share_with));
+    }
+
+    /**
+     * Copy the text to clipboard.
+     *
+     * @param context The context for operations.
+     * @param text The text to copy.
+     * @param toastString If this is not {@code null} or empty, then a toast is shown if copying to
+     *                    clipboard is successful.
+     */
+    public static void copyTextToClipboard(final Context context, final String text, final String toastString) {
+        if(context == null) return;
+
+        final ClipboardManager clipboardManager = ContextCompat.getSystemService(context, ClipboardManager.class);
+
+        if (clipboardManager != null) {
+            clipboardManager.setPrimaryClip(ClipData.newPlainText(null, text));
+            if (toastString != null && !toastString.isEmpty())
+                Logger.showToast(context, toastString, true);
+        }
+    }
+
+}

From 134e21765c7f9546edb287d6a6f9aeec842380d1 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 24 Mar 2021 02:34:53 +0500
Subject: [PATCH 260/912] Update Logger

- Add support to log Throwables instead of just Exception class objects.
- Adds utility functions to get Throwables as Strings and Markdown Strings.
---
 .../java/com/termux/app/utils/Logger.java     | 122 ++++++++++++++----
 1 file changed, 99 insertions(+), 23 deletions(-)

diff --git a/app/src/main/java/com/termux/app/utils/Logger.java b/app/src/main/java/com/termux/app/utils/Logger.java
index 7543531138..40a4b68b21 100644
--- a/app/src/main/java/com/termux/app/utils/Logger.java
+++ b/app/src/main/java/com/termux/app/utils/Logger.java
@@ -6,14 +6,14 @@
 import android.util.Log;
 import android.widget.Toast;
 
-import androidx.appcompat.app.AlertDialog;
-
 import com.termux.R;
 import com.termux.app.TermuxConstants;
 
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.StringWriter;
+import java.util.Collections;
+import java.util.List;
 
 public class Logger {
 
@@ -123,36 +123,112 @@ static public void logDebugAndShowToast(Context context, String message) {
 
 
 
-    static public void logStackTraceWithMessage(String tag, String message, Exception e) {
+    static public void logStackTraceWithMessage(String tag, String message, Throwable throwable) {
+        if(CURRENT_LOG_LEVEL >= LOG_LEVEL_NORMAL)
+            Log.e(getFullTag(tag), getMessageAndStackTraceString(message, throwable));
+    }
+
+    static public void logStackTraceWithMessage(String message, Throwable throwable) {
+        logStackTraceWithMessage(DEFAULT_LOG_TAG, message, throwable);
+    }
+
+    static public void logStackTrace(String tag, Throwable throwable) {
+        logStackTraceWithMessage(tag, null, throwable);
+    }
+
+    static public void logStackTrace(Throwable throwable) {
+        logStackTraceWithMessage(DEFAULT_LOG_TAG, null, throwable);
+    }
 
+    static public void logStackTracesWithMessage(String tag, String message, List<Throwable> throwableList) {
         if(CURRENT_LOG_LEVEL >= LOG_LEVEL_NORMAL)
-        {
-            try {
-                StringWriter errors = new StringWriter();
-                PrintWriter pw = new PrintWriter(errors);
-                e.printStackTrace(pw);
-                pw.close();
-                if(message != null)
-                    Log.e(getFullTag(tag), message + ":\n" + errors.toString());
-                else
-                    Log.e(getFullTag(tag), errors.toString());
-                errors.close();
-            } catch (IOException e1) {
-                e1.printStackTrace();
-            }
+            Log.e(getFullTag(tag), getMessageAndStackTracesString(message, throwableList));
+    }
+
+    static public String getMessageAndStackTraceString(String message, Throwable throwable) {
+        if(message == null && throwable == null)
+            return null;
+        else if(message != null && throwable != null)
+            return message + ":\n" + getStackTraceString(throwable);
+        else if(throwable == null)
+            return message;
+        else
+            return getStackTraceString(throwable);
+    }
+
+    static public String getMessageAndStackTracesString(String message, List<Throwable> throwableList) {
+        if(message == null && (throwableList == null || throwableList.size() == 0))
+            return null;
+        else if(message != null && (throwableList != null && throwableList.size() != 0))
+            return message + ":\n" + getStackTracesString(null, getStackTraceStringArray(throwableList));
+        else if(throwableList == null || throwableList.size() == 0)
+            return message;
+        else
+            return getStackTracesString(null, getStackTraceStringArray(throwableList));
+    }
+
+    static public String getStackTraceString(Throwable throwable) {
+        if(throwable == null) return null;
+
+        String stackTraceString = null;
+
+        try {
+            StringWriter errors = new StringWriter();
+            PrintWriter pw = new PrintWriter(errors);
+            throwable.printStackTrace(pw);
+            pw.close();
+            stackTraceString = errors.toString();
+            errors.close();
+        } catch (IOException e1) {
+            e1.printStackTrace();
         }
+
+        return stackTraceString;
     }
+    private static String[] getStackTraceStringArray(Throwable throwable) {
+        return getStackTraceStringArray(Collections.singletonList(throwable));
+    }
+
+    public static String[] getStackTraceStringArray(List<Throwable> throwableList) {
+        if (throwableList == null) return null;
 
-    static public void logStackTraceWithMessage(String message, Exception e) {
-        logStackTraceWithMessage(DEFAULT_LOG_TAG, message, e);
+        final String[] stackTraceStringArray = new String[throwableList.size()];
+        for (int i = 0; i < throwableList.size(); i++) {
+            stackTraceStringArray[i] = getStackTraceString(throwableList.get(i));
+        }
+        return stackTraceStringArray;
     }
 
-    static public void logStackTrace(String tag, Exception e) {
-        logStackTraceWithMessage(tag, null, e);
+    public static String getStackTracesString(String label, String[] stackTraceStringArray) {
+        if(label == null) label = "StackTraces:";
+        StringBuilder stackTracesString = new StringBuilder(label);
+
+        if (stackTraceStringArray == null || stackTraceStringArray.length == 0) {
+            stackTracesString.append(" -");
+        } else {
+            for (int i = 0; i != stackTraceStringArray.length; i++) {
+                stackTracesString.append("\n\nStacktrace ").append(i + 1).append("\n```\n").append(stackTraceStringArray[i]).append("\n```\n");
+            }
+        }
+
+        return stackTracesString.toString();
     }
 
-    static public void logStackTrace(Exception e) {
-        logStackTraceWithMessage(DEFAULT_LOG_TAG, null, e);
+    public static String getStackTracesMarkdownString(String label, String[] stackTraceStringArray) {
+        if(label == null) label = "StackTraces:";
+        StringBuilder stackTracesString = new StringBuilder("#### " + label);
+
+        if (stackTraceStringArray == null || stackTraceStringArray.length == 0) {
+            stackTracesString.append("\n\n`-`");
+        } else {
+            for (int i = 0; i != stackTraceStringArray.length; i++) {
+                stackTracesString.append("\n\n\n##### Stacktrace ").append(i + 1).append("\n\n```\n").append(stackTraceStringArray[i]).append("\n```");
+            }
+        }
+
+        stackTracesString.append("\n##\n");
+
+        return stackTracesString.toString();
     }
     
 

From 3491956385e58aa4c1d5deaf8744b8daf084ee29 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 24 Mar 2021 02:38:37 +0500
Subject: [PATCH 261/912] Update TermuxUtils to add support for getting device
 and termux info as markdown

---
 .../com/termux/app/utils/TermuxUtils.java     | 157 ++++++++++++++++++
 1 file changed, 157 insertions(+)

diff --git a/app/src/main/java/com/termux/app/utils/TermuxUtils.java b/app/src/main/java/com/termux/app/utils/TermuxUtils.java
index db66b01a0a..8e40fcbd2e 100644
--- a/app/src/main/java/com/termux/app/utils/TermuxUtils.java
+++ b/app/src/main/java/com/termux/app/utils/TermuxUtils.java
@@ -1,13 +1,30 @@
 package com.termux.app.utils;
 
+import android.annotation.SuppressLint;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ResolveInfo;
+import android.os.Build;
+
+import androidx.annotation.NonNull;
+
+import com.google.common.base.Joiner;
+import com.termux.BuildConfig;
 
 import com.termux.app.TermuxConstants;
 
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
+import java.util.Properties;
+import java.util.TimeZone;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 public class TermuxUtils {
 
@@ -42,4 +59,144 @@ public static void sendTermuxOpenedBroadcast(Context context) {
         }
     }
 
+    /**
+     * Get a markdown {@link String} for the device details.
+     *
+     * @param context The context for operations.
+     * @return Returns the markdown {@link String}.
+     */
+    public static String getDeviceDetailsMarkdownString(final Context context) {
+        if (context == null) return "null";
+
+        // Some properties cannot be read with {@link System#getProperty(String)} but can be read
+        // directly by running getprop command
+        Properties systemProperties = getSystemProperties();
+
+        StringBuilder markdownString = new StringBuilder();
+
+        markdownString.append("#### Software\n");
+        appendPropertyMarkdown(markdownString,
+            TermuxConstants.TERMUX_APP_NAME.toUpperCase() + "_VERSION", getTermuxAppVersionName() + "(" + getTermuxAppVersionCode() + ")");
+        appendPropertyMarkdown(markdownString,TermuxConstants.TERMUX_APP_NAME.toUpperCase() + "_DEBUG_BUILD", isTermuxAppDebugBuild());
+        appendPropertyMarkdown(markdownString,"OS_VERSION", getSystemPropertyWithAndroidAPI("os.version"));
+        appendPropertyMarkdown(markdownString, "SDK_INT", Build.VERSION.SDK_INT);
+        // If its a release version
+        if ("REL".equals(Build.VERSION.CODENAME))
+            appendPropertyMarkdown(markdownString, "RELEASE", Build.VERSION.RELEASE);
+        else
+            appendPropertyMarkdown(markdownString, "CODENAME", Build.VERSION.CODENAME);
+        appendPropertyMarkdown(markdownString, "INCREMENTAL", Build.VERSION.INCREMENTAL);
+        appendPropertyMarkdownIfSet(markdownString, "SECURITY_PATCH", systemProperties.getProperty("ro.build.version.security_patch"));
+        appendPropertyMarkdownIfSet(markdownString, "IS_DEBUGGABLE", systemProperties.getProperty("ro.debuggable"));
+        appendPropertyMarkdownIfSet(markdownString, "IS_EMULATOR", systemProperties.getProperty("ro.boot.qemu"));
+        appendPropertyMarkdownIfSet(markdownString, "IS_TREBLE_ENABLED", systemProperties.getProperty("ro.treble.enabled"));
+        appendPropertyMarkdown(markdownString, "TYPE", Build.TYPE);
+        appendPropertyMarkdown(markdownString, "TAGS", Build.TAGS);
+
+        markdownString.append("\n\n#### Hardware\n");
+        appendPropertyMarkdown(markdownString, "MANUFACTURER", Build.MANUFACTURER);
+        appendPropertyMarkdown(markdownString, "BRAND", Build.BRAND);
+        appendPropertyMarkdown(markdownString, "MODEL", Build.MODEL);
+        appendPropertyMarkdown(markdownString, "PRODUCT", Build.PRODUCT);
+        appendPropertyMarkdown(markdownString, "DISPLAY", Build.DISPLAY);
+        appendPropertyMarkdown(markdownString, "ID", Build.ID);
+        appendPropertyMarkdown(markdownString, "BOARD", Build.BOARD);
+        appendPropertyMarkdown(markdownString, "HARDWARE", Build.HARDWARE);
+        appendPropertyMarkdown(markdownString, "DEVICE", Build.DEVICE);
+        appendPropertyMarkdown(markdownString, "SUPPORTED_ABIS", Joiner.on(", ").skipNulls().join(Build.SUPPORTED_ABIS));
+
+        return markdownString.toString();
+    }
+
+    public static Properties getSystemProperties() {
+        Properties systemProperties = new Properties();
+
+        // getprop commands returns values in the format `[key]: [value]`
+        // Regex matches string starting with a literal `[`,
+        // followed by one or more characters that do not match a closing square bracket as the key,
+        // followed by a literal `]: [`,
+        // followed by one or more characters as the value,
+        // followed by string ending with literal `]`
+        // multiline values will be ignored
+        Pattern propertiesPattern = Pattern.compile("^\\[([^]]+)]: \\[(.+)]$");
+
+        try {
+            Process process = new ProcessBuilder()
+                .command("/system/bin/getprop")
+                .redirectErrorStream(true)
+                .start();
+
+            InputStream inputStream = process.getInputStream();
+            BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(inputStream));
+            String line, key, value;
+
+            while ((line = bufferedReader.readLine()) != null) {
+                Matcher matcher = propertiesPattern.matcher(line);
+                if (matcher.matches()) {
+                    key = matcher.group(1);
+                    value = matcher.group(2);
+                    if(key != null && value != null && !key.isEmpty() && !value.isEmpty())
+                        systemProperties.put(key, value);
+                }
+            }
+
+            bufferedReader.close();
+            process.destroy();
+
+        } catch (IOException e) {
+            Logger.logStackTraceWithMessage("Failed to get run \"/system/bin/getprop\" to get system properties.", e);
+        }
+
+        //for (String key : systemProperties.stringPropertyNames()) {
+        //    Logger.logVerbose(key + ": " +  systemProperties.get(key));
+        //}
+
+        return systemProperties;
+    }
+
+    private static String getSystemPropertyWithAndroidAPI(@NonNull String property) {
+        try {
+            return System.getProperty(property);
+        } catch (Exception e) {
+            Logger.logVerbose("Failed to get system property \"" + property + "\":" + e.getMessage());
+            return null;
+        }
+    }
+
+    private static void appendPropertyMarkdownIfSet(StringBuilder markdownString, String label, Object value) {
+        if(value == null) return;
+        if(value instanceof String && (((String) value).isEmpty()) || "REL".equals(value)) return;
+        markdownString.append("\n").append(getPropertyMarkdown(label, value));
+    }
+
+    private static void appendPropertyMarkdown(StringBuilder markdownString, String label, Object value) {
+        markdownString.append("\n").append(getPropertyMarkdown(label, value));
+    }
+
+    private static String getPropertyMarkdown(String label, Object value) {
+        return MarkdownUtils.getSingleLineMarkdownStringEntry(label, value, "-");
+    }
+
+
+
+    public static int getTermuxAppVersionCode() {
+        return BuildConfig.VERSION_CODE;
+    }
+
+    public static String getTermuxAppVersionName() {
+        return BuildConfig.VERSION_NAME;
+    }
+
+    public static boolean isTermuxAppDebugBuild() {
+        return BuildConfig.DEBUG;
+    }
+
+    public static String getCurrentTimeStamp() {
+        @SuppressLint("SimpleDateFormat")
+        final SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+        df.setTimeZone(TimeZone.getTimeZone("UTC"));
+        return df.format(new Date());
+    }
+
+
 }

From 9d36e9adde543133873d6ea3487091cb713fb201 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 24 Mar 2021 03:22:12 +0500
Subject: [PATCH 262/912] Add ReportActivity and ReportInfo

This implements the framework to report info to users. This may include reporting failure or result of commands or any exceptions that are raised.

The ReportInfo provides 5 fields:
- userAction: The user action that was being processed for which the report was generated.
- sender: The internal app component that sent the report.
- title: The report title.
- reportString: The markdown text for the report.
- addReportAndDeviceDetails: If set to true, then report and device details will be added to the report.

This should provide the basics parameters for showing a report to the user. The ReportActivity also allows user to copy and share the report.

In future this can also be used to allow users to easily email or post crash reports to github for Termux app crashes instead of going through logcat.
---
 app/src/main/AndroidManifest.xml              |   6 +
 .../termux/app/activities/ReportActivity.java | 190 ++++++++++++++++++
 .../java/com/termux/models/ReportInfo.java    |  26 +++
 .../java/com/termux/models/UserAction.java    |  17 ++
 app/src/main/res/drawable/ic_copy.xml         |   5 +
 app/src/main/res/drawable/ic_share.xml        |   5 +
 app/src/main/res/layout/activity_report.xml   |  21 ++
 ...ctivity_report_adapter_node_code_block.xml |  27 +++
 .../activity_report_adapter_node_default.xml  |  17 ++
 app/src/main/res/layout/toolbar_layout.xml    |  22 ++
 app/src/main/res/menu/menu_report.xml         |  15 ++
 app/src/main/res/values/colors.xml            |   5 +
 app/src/main/res/values/dimens.xml            |  10 +
 app/src/main/res/values/strings.xml           |   7 +-
 app/src/main/res/values/styles.xml            |  20 +-
 15 files changed, 386 insertions(+), 7 deletions(-)
 create mode 100644 app/src/main/java/com/termux/app/activities/ReportActivity.java
 create mode 100644 app/src/main/java/com/termux/models/ReportInfo.java
 create mode 100644 app/src/main/java/com/termux/models/UserAction.java
 create mode 100644 app/src/main/res/drawable/ic_copy.xml
 create mode 100644 app/src/main/res/drawable/ic_share.xml
 create mode 100644 app/src/main/res/layout/activity_report.xml
 create mode 100644 app/src/main/res/layout/activity_report_adapter_node_code_block.xml
 create mode 100644 app/src/main/res/layout/activity_report_adapter_node_default.xml
 create mode 100644 app/src/main/res/layout/toolbar_layout.xml
 create mode 100644 app/src/main/res/menu/menu_report.xml
 create mode 100644 app/src/main/res/values/colors.xml
 create mode 100644 app/src/main/res/values/dimens.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 346f6d3bff..17d2c1b209 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -101,6 +101,12 @@
             android:label="@string/title_activity_termux_settings"
             android:theme="@style/Theme.AppCompat.Light.DarkActionBar" />
 
+        <activity
+            android:name=".app.activities.ReportActivity"
+            android:theme="@style/Theme.AppCompat.TermuxReportActivity"
+            android:documentLaunchMode="intoExisting"
+            />
+
         <activity
             android:name=".filepicker.TermuxFileReceiverActivity"
             android:excludeFromRecents="true"
diff --git a/app/src/main/java/com/termux/app/activities/ReportActivity.java b/app/src/main/java/com/termux/app/activities/ReportActivity.java
new file mode 100644
index 0000000000..5b033b56dc
--- /dev/null
+++ b/app/src/main/java/com/termux/app/activities/ReportActivity.java
@@ -0,0 +1,190 @@
+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.app.TermuxConstants;
+import com.termux.app.utils.MarkdownUtils;
+import com.termux.app.utils.ShareUtils;
+import com.termux.app.utils.TermuxUtils;
+import com.termux.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 ARG_REPORT_INFO = "report_info";
+
+    ReportInfo mReportInfo;
+
+    @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(ARG_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.text_view))
+            .build();
+
+        recyclerView.setLayoutManager(new LinearLayoutManager(this));
+        recyclerView.setAdapter(adapter);
+
+        adapter.setMarkdown(markwon, mReportInfo.reportString + getReportAndDeviceDetailsMarkdownString());
+        adapter.notifyDataSetChanged();
+    }
+
+
+
+    @Override
+    public void onSaveInstanceState(@NonNull Bundle outState) {
+        super.onSaveInstanceState(outState);
+
+        outState.putSerializable(ARG_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 (mReportInfo != null)
+                ShareUtils.shareText(this, getString(R.string.report_text), mReportInfo.reportString);
+        } else if (id == R.id.menu_item_copy_report) {
+            if (mReportInfo != null)
+                ShareUtils.copyTextToClipboard(this, mReportInfo.reportString, null);
+        }
+
+        return false;
+    }
+
+    /**
+     * Get a markdown {@link String} for {@link #mReportInfo} and device details.
+     *
+     * @return Returns the markdown {@link String}.
+     */
+    private String getReportAndDeviceDetailsMarkdownString() {
+        if(!mReportInfo.addReportAndDeviceDetails) return "";
+
+        StringBuilder markdownString = new StringBuilder();
+
+        markdownString.append("\n\n### Report And Device Details\n\n");
+
+        if (mReportInfo != null) {
+            markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("User Action", mReportInfo.userAction, "-"));
+            markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Sender", mReportInfo.sender, "-"));
+        }
+
+        markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Timestamp", TermuxUtils.getCurrentTimeStamp(), "-"));
+
+        markdownString.append("\n\n").append(TermuxUtils.getDeviceDetailsMarkdownString(this));
+
+        markdownString.append("\n##\n");
+
+        return markdownString.toString();
+    }
+
+
+
+    public static void startReportActivity(@NonNull final Context context, @NonNull final ReportInfo reportInfo) {
+        if(context == null) return;
+        context.startActivity(newInstance(context, reportInfo));
+    }
+
+    public static Intent newInstance(@NonNull final Context context, @NonNull final ReportInfo reportInfo) {
+        if(context == null) return null;
+
+        Intent intent = new Intent(context, ReportActivity.class);
+        Bundle bundle = new Bundle();
+        bundle.putSerializable(ARG_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;
+    }
+
+}
diff --git a/app/src/main/java/com/termux/models/ReportInfo.java b/app/src/main/java/com/termux/models/ReportInfo.java
new file mode 100644
index 0000000000..8572f3a474
--- /dev/null
+++ b/app/src/main/java/com/termux/models/ReportInfo.java
@@ -0,0 +1,26 @@
+package com.termux.models;
+
+import java.io.Serializable;
+
+public class ReportInfo implements Serializable {
+
+    /** The user action that was being processed for which the report was generated. */
+    public UserAction userAction;
+    /** The internal app component that sent the report. */
+    public String sender;
+    /** The report title. */
+    public String reportTitle;
+    /** The markdown text for the report. */
+    public String reportString;
+    /** If set to {@code true}, then report and device details will be added to the report. */
+    public boolean addReportAndDeviceDetails;
+
+    public ReportInfo(UserAction userAction, String sender, String reportTitle, String reportString, boolean addReportAndDeviceDetails) {
+        this.userAction = userAction;
+        this.sender = sender;
+        this.reportTitle = reportTitle;
+        this.reportString = reportString;
+        this.addReportAndDeviceDetails = addReportAndDeviceDetails;
+    }
+
+}
diff --git a/app/src/main/java/com/termux/models/UserAction.java b/app/src/main/java/com/termux/models/UserAction.java
new file mode 100644
index 0000000000..270a14a6d5
--- /dev/null
+++ b/app/src/main/java/com/termux/models/UserAction.java
@@ -0,0 +1,17 @@
+package com.termux.models;
+
+public enum UserAction {
+
+    PLUGIN_EXECUTION_COMMAND("plugin execution command");
+
+    private final String name;
+
+    UserAction(final String name) {
+        this.name = name;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+}
diff --git a/app/src/main/res/drawable/ic_copy.xml b/app/src/main/res/drawable/ic_copy.xml
new file mode 100644
index 0000000000..0fb13c2d07
--- /dev/null
+++ b/app/src/main/res/drawable/ic_copy.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M16,1L4,1c-1.1,0 -2,0.9 -2,2v14h2L4,3h12L16,1zM19,5L8,5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h11c1.1,0 2,-0.9 2,-2L21,7c0,-1.1 -0.9,-2 -2,-2zM19,21L8,21L8,7h11v14z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_share.xml b/app/src/main/res/drawable/ic_share.xml
new file mode 100644
index 0000000000..9300daf6fa
--- /dev/null
+++ b/app/src/main/res/drawable/ic_share.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_report.xml b/app/src/main/res/layout/activity_report.xml
new file mode 100644
index 0000000000..b442a324d8
--- /dev/null
+++ b/app/src/main/res/layout/activity_report.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <include
+        layout="@layout/toolbar_layout"
+        android:id="@+id/toolbar_layout"/>
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recycler_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:clipChildren="false"
+        android:clipToPadding="false"
+        android:overScrollMode="never"
+        android:paddingTop="@dimen/content_padding"
+        android:paddingBottom="36dip" />
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/activity_report_adapter_node_code_block.xml b/app/src/main/res/layout/activity_report_adapter_node_code_block.xml
new file mode 100644
index 0000000000..c5a23f3150
--- /dev/null
+++ b/app/src/main/res/layout/activity_report_adapter_node_code_block.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<HorizontalScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:clipChildren="false"
+    android:clipToPadding="false"
+    android:fillViewport="true"
+    android:paddingLeft="16dip"
+    android:paddingRight="16dip"
+    android:scrollbarStyle="outsideInset">
+
+    <TextView
+        android:id="@+id/text_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="@color/background_markdown_code_block"
+        android:fontFamily="monospace"
+        android:lineSpacingExtra="2dip"
+        android:paddingLeft="16dip"
+        android:paddingTop="8dip"
+        android:paddingRight="16dip"
+        android:paddingBottom="8dip"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:textSize="12sp"
+        android:textIsSelectable="true" />
+
+</HorizontalScrollView>
diff --git a/app/src/main/res/layout/activity_report_adapter_node_default.xml b/app/src/main/res/layout/activity_report_adapter_node_default.xml
new file mode 100644
index 0000000000..414eec1228
--- /dev/null
+++ b/app/src/main/res/layout/activity_report_adapter_node_default.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/text_view"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginLeft="16dip"
+    android:layout_marginRight="16dip"
+    android:breakStrategy="simple"
+    android:hyphenationFrequency="none"
+    android:lineSpacingExtra="2dip"
+    android:paddingTop="8dip"
+    android:paddingBottom="8dip"
+    android:textAppearance="?android:attr/textAppearanceMedium"
+    android:textColor="#000"
+    android:textSize="12sp"
+    android:textIsSelectable="true" />
diff --git a/app/src/main/res/layout/toolbar_layout.xml b/app/src/main/res/layout/toolbar_layout.xml
new file mode 100644
index 0000000000..85bb19b1f4
--- /dev/null
+++ b/app/src/main/res/layout/toolbar_layout.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/toolbar_container"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <androidx.appcompat.widget.Toolbar
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        android:background="?attr/colorPrimaryDark"
+        android:gravity="center_vertical"
+        android:minHeight="?attr/actionBarSize"
+        android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
+        app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
+        app:titleTextAppearance="@style/Toolbar.Title">
+
+    </androidx.appcompat.widget.Toolbar>
+
+</LinearLayout>
diff --git a/app/src/main/res/menu/menu_report.xml b/app/src/main/res/menu/menu_report.xml
new file mode 100644
index 0000000000..513508a5b8
--- /dev/null
+++ b/app/src/main/res/menu/menu_report.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/menu_item_share_report"
+        android:icon="@drawable/ic_share"
+        android:title="@string/share"
+        app:showAsAction="never" />
+    <item
+        android:id="@+id/menu_item_copy_report"
+        android:icon="@drawable/ic_copy"
+        android:title="@string/copy"
+        app:showAsAction="never" />
+</menu>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
new file mode 100644
index 0000000000..cc83b56d07
--- /dev/null
+++ b/app/src/main/res/values/colors.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="background_markdown_code_inline">#1F000000</color>
+    <color name="background_markdown_code_block">#0F000000</color>
+</resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
new file mode 100644
index 0000000000..e5167ac7d9
--- /dev/null
+++ b/app/src/main/res/values/dimens.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Default screen margins, per the Android Design guidelines. -->
+    <dimen name="activity_horizontal_margin">16dp</dimen>
+    <dimen name="activity_vertical_margin">16dp</dimen>
+
+    <dimen name="content_padding">8dip</dimen>
+    <dimen name="content_padding_double">16dip</dimen>
+    <dimen name="content_padding_half">4dip</dimen>
+</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a186ce4690..21947fa525 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -89,6 +89,10 @@
     <string name="run_command_service_invalid_command_path">Invalid coommand path to RunCommandService: \"%1$s\"</string>
     <string name="run_command_service_allow_external_apps_ungranted_warning">RunCommandService require allow-external-apps property to be set to \"true\" in &TERMUX_PROPERTIES_PRIMARY_PATH_SHORT; file.</string>
 
+    <string name="share">Share</string>
+    <string name="share_with">Share With</string>
+    <string name="copy">Copy</string>
+    <string name="report_text">Report Text</string>
 
 
 
@@ -96,8 +100,6 @@
     <string name="settings">Settings</string>
     <string name="title_activity_termux_settings">&TERMUX_APP_NAME; Settings</string>
 
-
-
     <!-- Debugging Preferences -->
     <string name="debugging_preferences">Debugging</string>
 
@@ -118,7 +120,6 @@
             <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>
 
-
             <!-- 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>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 1f352423c9..c747fed795 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -21,10 +21,6 @@
         <item name="android:windowAllowEnterTransitionOverlap">true</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>
-    </style>
 
     <!-- See https://developer.android.com/training/material/theme.html for how to customize the Material theme. -->
     <!-- NOTE: Cannot use "Light." since it hides the terminal scrollbar on the default black background. -->
@@ -46,4 +42,20 @@
         <item name="android:windowAllowReturnTransitionOverlap">true</item>
         <item name="android:windowAllowEnterTransitionOverlap">true</item>
     </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>
+    </style>
+
 </resources>

From 20d20f42c056ec72f4f486cd73c132b0b7d05b34 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 24 Mar 2021 03:25:25 +0500
Subject: [PATCH 263/912] Added NotificationUtils to build and manage
 notifications

The `TermuxPreferenceConstants` classes has been updated to `v0.5.0`. Check its Changelog sections for info on changes.
---
 .../TermuxAppSharedPreferences.java           |  10 ++
 .../TermuxPreferenceConstants.java            |  19 +-
 .../termux/app/utils/NotificationUtils.java   | 166 ++++++++++++++++++
 3 files changed, 191 insertions(+), 4 deletions(-)
 create mode 100644 app/src/main/java/com/termux/app/utils/NotificationUtils.java

diff --git a/app/src/main/java/com/termux/app/settings/preferences/TermuxAppSharedPreferences.java b/app/src/main/java/com/termux/app/settings/preferences/TermuxAppSharedPreferences.java
index 33c12d9079..a1e663d7bc 100644
--- a/app/src/main/java/com/termux/app/settings/preferences/TermuxAppSharedPreferences.java
+++ b/app/src/main/java/com/termux/app/settings/preferences/TermuxAppSharedPreferences.java
@@ -122,6 +122,16 @@ public void setLogLevel(Context context, int logLevel) {
 
 
 
+    public int getLastNotificationId() {
+        return SharedPreferenceUtils.getInt(mSharedPreferences, TERMUX_APP.KEY_LAST_NOTIFICATION_ID, TERMUX_APP.DEFAULT_VALUE_KEY_LAST_NOTIFICATION_ID);
+    }
+
+    public void setLastNotificationId(int notificationId) {
+        SharedPreferenceUtils.setInt(mSharedPreferences, TERMUX_APP.KEY_LAST_NOTIFICATION_ID, notificationId, false);
+    }
+
+
+
     public boolean getTerminalViewKeyLoggingEnabled() {
         return SharedPreferenceUtils.getBoolean(mSharedPreferences, TERMUX_APP.KEY_TERMINAL_VIEW_KEY_LOGGING_ENABLED, TERMUX_APP.DEFAULT_VALUE_TERMINAL_VIEW_KEY_LOGGING_ENABLED);
     }
diff --git a/app/src/main/java/com/termux/app/settings/preferences/TermuxPreferenceConstants.java b/app/src/main/java/com/termux/app/settings/preferences/TermuxPreferenceConstants.java
index 605e9f0610..51ac344f84 100644
--- a/app/src/main/java/com/termux/app/settings/preferences/TermuxPreferenceConstants.java
+++ b/app/src/main/java/com/termux/app/settings/preferences/TermuxPreferenceConstants.java
@@ -1,7 +1,7 @@
 package com.termux.app.settings.preferences;
 
 /*
- * Version: v0.4.0
+ * Version: v0.5.0
  *
  * Changelog
  *
@@ -9,19 +9,23 @@
  *      - Initial Release.
  *
  * - 0.2.0 (2021-03-13)
- *      - Added `KEY_LOG_LEVEL` and `KEY_TERMINAL_VIEW_LOGGING_ENABLED`
- * 
+ *      - Added `KEY_LOG_LEVEL` and `KEY_TERMINAL_VIEW_LOGGING_ENABLED`.
+ *
  * - 0.3.0 (2021-03-16)
  *      - Changed to per app scoping of variables so that the same file can store all constants of
  *          Termux app and its plugins. This will allow {@link com.termux.app.TermuxSettings} to
  *          manage preferences of plugins as well if they don't have launcher activity themselves
  *          and also allow plugin apps to make changes to preferences from background.
  *      - Added following to `TERMUX_TASKER_APP`:
-     *      `KEY_LOG_LEVEL`.
+ *           `KEY_LOG_LEVEL`.
  *
  * - 0.4.0 (2021-03-13)
  *      - Added following to `TERMUX_APP`:
  *          `KEY_PLUGIN_ERROR_NOTIFICATIONS_ENABLED` and `DEFAULT_VALUE_PLUGIN_ERROR_NOTIFICATIONS_ENABLED`.
+ *
+ * - 0.5.0 (2021-03-24)
+ *      - Added following to `TERMUX_APP`:
+ *          `KEY_LAST_NOTIFICATION_ID` and `DEFAULT_VALUE_KEY_LAST_NOTIFICATION_ID`.
  */
 
 /**
@@ -70,6 +74,13 @@ public static final class TERMUX_APP {
         public static final String KEY_LOG_LEVEL = "log_level";
 
 
+        /**
+         * Defines the key for last used notification id
+         */
+        public static final String KEY_LAST_NOTIFICATION_ID = "last_notification_id";
+        public static final int DEFAULT_VALUE_KEY_LAST_NOTIFICATION_ID = 0;
+
+
         /**
          * Defines the key for whether termux terminal view key logging is enabled or not
          */
diff --git a/app/src/main/java/com/termux/app/utils/NotificationUtils.java b/app/src/main/java/com/termux/app/utils/NotificationUtils.java
new file mode 100644
index 0000000000..9c83132ed1
--- /dev/null
+++ b/app/src/main/java/com/termux/app/utils/NotificationUtils.java
@@ -0,0 +1,166 @@
+package com.termux.app.utils;
+
+import android.app.Notification;
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.content.Context;
+import android.os.Build;
+
+import androidx.annotation.Nullable;
+
+import com.termux.app.RunCommandService;
+import com.termux.app.TermuxService;
+import com.termux.app.settings.preferences.TermuxAppSharedPreferences;
+import com.termux.app.settings.preferences.TermuxPreferenceConstants;
+
+public class NotificationUtils {
+
+    /** Do not show notification */
+    public static final int NOTIFICATION_MODE_NONE = 0;
+    /** Show notification without sound, vibration or lights */
+    public static final int NOTIFICATION_MODE_SILENT = 1;
+    /** Show notification with sound */
+    public static final int NOTIFICATION_MODE_SOUND = 2;
+    /** Show notification with vibration */
+    public static final int NOTIFICATION_MODE_VIBRATE = 3;
+    /** Show notification with lights */
+    public static final int NOTIFICATION_MODE_LIGHTS = 4;
+    /** Show notification with sound and vibration */
+    public static final int NOTIFICATION_MODE_SOUND_AND_VIBRATE = 5;
+    /** Show notification with sound and lights */
+    public static final int NOTIFICATION_MODE_SOUND_AND_LIGHTS = 6;
+    /** Show notification with vibration and lights */
+    public static final int NOTIFICATION_MODE_VIBRATE_AND_LIGHTS = 7;
+    /** Show notification with sound, vibration and lights */
+    public static final int NOTIFICATION_MODE_ALL = 8;
+
+    private static final String LOG_TAG = "NotificationUtils";
+
+    /**
+     * Get the {@link NotificationManager}.
+     *
+     * @param context The {@link Context} for operations.
+     * @return Returns the {@link NotificationManager}.
+     */
+    @Nullable
+    public static NotificationManager getNotificationManager(final Context context) {
+        if(context == null) return null;
+        return (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
+    }
+
+    /**
+     * Try to get the next unique notification id that isn't already being used by the app.
+     *
+     * @param context The {@link Context} for operations.
+     * @return Returns the notification id that should be safe to use.
+     */
+    public synchronized static int getNextNotificationId(final Context context) {
+        if(context == null) return TermuxPreferenceConstants.TERMUX_APP.DEFAULT_VALUE_KEY_LAST_NOTIFICATION_ID;
+
+        TermuxAppSharedPreferences preferences = new TermuxAppSharedPreferences(context);
+        int lastNotificationId = preferences.getLastNotificationId();
+
+        int nextNotificationId = lastNotificationId + 1;
+        while(nextNotificationId == TermuxService.NOTIFICATION_ID || nextNotificationId == RunCommandService.NOTIFICATION_ID) {
+            nextNotificationId++;
+        }
+
+        if(nextNotificationId == Integer.MAX_VALUE || nextNotificationId < 0)
+            nextNotificationId = TermuxPreferenceConstants.TERMUX_APP.DEFAULT_VALUE_KEY_LAST_NOTIFICATION_ID;
+
+        preferences.setLastNotificationId(nextNotificationId);
+        return nextNotificationId;
+    }
+
+    /**
+     * Get {@link Notification.Builder}.
+     *
+     * @param context The {@link Context} for operations.
+     * @param title The title for the notification.
+     * @param notifiationText The second line text of the notification.
+     * @param notificationBigText The full text of the notification that may optionally be styled.
+     * @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_*}.
+     *                         The builder returned will be {@code null} if {@link #NOTIFICATION_MODE_NONE}
+     *                         is passed. That case should ideally be handled before calling this function.
+     * @return Returns the {@link Notification.Builder}.
+     */
+    @Nullable
+    public static Notification.Builder geNotificationBuilder(final Context context, final String channelId, final int priority, final CharSequence title, final CharSequence notifiationText, final CharSequence notificationBigText, final PendingIntent pendingIntent, final int notificationMode) {
+        if(context == null) return null;
+        Notification.Builder builder = new Notification.Builder(context);
+        builder.setContentTitle(title);
+        builder.setContentText(notifiationText);
+        builder.setStyle(new Notification.BigTextStyle().bigText(notificationBigText));
+        builder.setContentIntent(pendingIntent);
+
+        builder.setPriority(priority);
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
+            builder.setChannelId(channelId);
+
+        builder = setNotificationDefaults(builder, notificationMode);
+
+        return builder;
+    }
+
+    /**
+     * Setup the notification channel if Android version is greater than or equal to
+     * {@link Build.VERSION_CODES#O}.
+     *
+     * @param context The {@link Context} for operations.
+     * @param channelId The id of the channel. Must be unique per package.
+     * @param channelName The user visible name of the channel.
+     * @param importance The importance of the channel. This controls how interruptive notifications
+     *                   posted to this channel are.
+     */
+    public static void setupNotificationChannel(final Context context, final String channelId, final CharSequence channelName, final int importance) {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) return;
+
+        NotificationChannel channel = new NotificationChannel(channelId, channelName, importance);
+
+        NotificationManager notificationManager = getNotificationManager(context);
+        if(notificationManager != null)
+            notificationManager.createNotificationChannel(channel);
+    }
+
+    public static Notification.Builder setNotificationDefaults(Notification.Builder builder, final int notificationMode) {
+
+        // TODO: setDefaults() is deprecated and should also implement setting notification mode via notification channel
+        switch (notificationMode) {
+            case NOTIFICATION_MODE_NONE:
+                Logger.logWarn(LOG_TAG, "The NOTIFICATION_MODE_NONE passed to setNotificationDefaults(), force setting builder to null.");
+                return null; // return null since notification is not supposed to be shown
+            case NOTIFICATION_MODE_SILENT:
+                break;
+            case NOTIFICATION_MODE_SOUND:
+                builder.setDefaults(Notification.DEFAULT_SOUND);
+                break;
+            case NOTIFICATION_MODE_VIBRATE:
+                builder.setDefaults(Notification.DEFAULT_VIBRATE);
+                break;
+            case NOTIFICATION_MODE_LIGHTS:
+                builder.setDefaults(Notification.DEFAULT_LIGHTS);
+                break;
+            case NOTIFICATION_MODE_SOUND_AND_VIBRATE:
+                builder.setDefaults(Notification.DEFAULT_SOUND | Notification.DEFAULT_VIBRATE);
+                break;
+            case NOTIFICATION_MODE_SOUND_AND_LIGHTS:
+                builder.setDefaults(Notification.DEFAULT_SOUND | Notification.DEFAULT_LIGHTS);
+                break;
+            case NOTIFICATION_MODE_VIBRATE_AND_LIGHTS:
+                builder.setDefaults(Notification.DEFAULT_VIBRATE | Notification.DEFAULT_LIGHTS);
+                break;
+            case NOTIFICATION_MODE_ALL:
+                builder.setDefaults(Notification.DEFAULT_ALL);
+                break;
+            default:
+                Logger.logError(LOG_TAG, "Invalid notificationMode: \"" + notificationMode + "\" passed to setNotificationDefaults()");
+                break;
+        }
+
+        return builder;
+    }
+
+}

From bccc35bc3fb19c25580c384d3dfd5f1a7d3daaa2 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 24 Mar 2021 03:48:24 +0500
Subject: [PATCH 264/912] Added ExectionCommand

ExectionCommand is a class that stores all data related to an execution command like:

- Input parameters like executable and arguments to be used to run the shell command, etc
- Output parameters like stdout, stderr and exitCode.
- Error info generated internally by termux outside the shell in errCode and errmsg.
- Command info like, id, label, description, help info, etc.
- Other config info like for how termux should handle the command.
- The pending intent if any that should be sent after execution to command requester.
- The help for the plugin API that was used to send the intent.
- Current and previous state of the command.

This allow easier management and passing of execution command data between classes and management of it. This will later allow each ExectionCommand command to be linked to a Terminal Session, to handle post processing and failure management.
The ExectionCommand also provides functions to get its data in markdown format, which can be used by failure or success reports generated for the command that are shown to the user. The commandHelp and pluginAPIHelp can also be specially useful to provide info to users on how to manage failures that are generated.
---
 .../com/termux/models/ExecutionCommand.java   | 531 ++++++++++++++++++
 1 file changed, 531 insertions(+)
 create mode 100644 app/src/main/java/com/termux/models/ExecutionCommand.java

diff --git a/app/src/main/java/com/termux/models/ExecutionCommand.java b/app/src/main/java/com/termux/models/ExecutionCommand.java
new file mode 100644
index 0000000000..fa94498c71
--- /dev/null
+++ b/app/src/main/java/com/termux/models/ExecutionCommand.java
@@ -0,0 +1,531 @@
+package com.termux.models;
+
+import android.app.PendingIntent;
+import android.net.Uri;
+
+import androidx.annotation.NonNull;
+
+import com.termux.app.utils.Logger;
+import com.termux.app.utils.MarkdownUtils;
+import com.termux.app.utils.TextDataUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ExecutionCommand {
+
+    /*
+    The {@link ExecutionState#SUCCESS} and {@link ExecutionState#FAILED} is defined based on
+    successful execution of command without any internal errors or exceptions being raised.
+    The shell command {@link #exitCode} being non-zero **does not** mean that execution command failed.
+    Only the {@link #errCode} being non-zero means that execution command failed from the Termux app
+    perspective.
+    */
+
+    /** The {@link Enum} that defines {@link ExecutionCommand} state. */
+    public enum ExecutionState {
+
+        PRE_EXECUTION("Pre-Execution", 0),
+        EXECUTING("Executing", 1),
+        EXECUTED("Executed", 2),
+        SUCCESS("Success", 3),
+        FAILED("Failed", 4);
+
+        private final String name;
+        private final int value;
+
+        ExecutionState(final String name, final int value) {
+            this.name = name;
+            this.value = value;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+    }
+
+    /** The optional unique id for the {@link ExecutionCommand}. */
+    public Integer id;
+
+
+    /** The current state of the {@link ExecutionCommand}. */
+    public ExecutionState currentState = ExecutionState.PRE_EXECUTION;
+    /** The previous state of the {@link ExecutionCommand}. */
+    public ExecutionState previousState = ExecutionState.PRE_EXECUTION;
+
+
+    /** The executable for the {@link ExecutionCommand}. */
+    public String executable;
+    /** The executable Uri for the {@link ExecutionCommand}. */
+    public Uri executableUri;
+    /** The executable arguments array for the {@link ExecutionCommand}. */
+    public String[] arguments;
+    /** The current working directory for the {@link ExecutionCommand}. */
+    public String workingDirectory;
+
+
+    /** If the {@link ExecutionCommand} is a background or a foreground terminal session command. */
+    public boolean inBackground;
+    /** If the {@link ExecutionCommand} is meant to start a failsafe terminal session. */
+    public boolean isFailsafe;
+
+
+    /** The session action of foreground commands. */
+    public String sessionAction;
+
+
+    /** The command label for the {@link ExecutionCommand}. */
+    public String commandLabel;
+    /** The markdown text for the command description for the {@link ExecutionCommand}. */
+    public String commandDescription;
+    /** The markdown text for the help of command for the {@link ExecutionCommand}. This can be used
+     * to provide useful info to the user if an internal error is raised. */
+    public String commandHelp;
+
+
+    /** Defines the markdown text for the help of the Termux plugin API that was used to start the
+     * {@link ExecutionCommand}. This can be used to provide useful info to the user if an internal
+     * error is raised. */
+    public String pluginAPIHelp;
+
+
+    /** Defines if {@link ExecutionCommand} was started because of an external plugin request or from
+     * within Termux app itself. */
+    public boolean isPluginExecutionCommand;
+    /** Defines {@link PendingIntent} that should be sent if an external plugin requested the execution. */
+    public PendingIntent pluginPendingIntent;
+
+
+    /** The stdout of shell command. */
+    public String stdout;
+    /** The sterr of shell command. */
+    public String stderr;
+    /** The exit code of shell command. */
+    public Integer exitCode;
+
+
+    /** The internal error code of {@link ExecutionCommand}. */
+    public Integer errCode;
+    /** The internal error message of {@link ExecutionCommand}. */
+    public String errmsg;
+    /** The internal exceptions of {@link ExecutionCommand}. */
+    public List<Throwable> throwableList  = new ArrayList<>();
+
+
+
+    public ExecutionCommand(){
+    }
+
+    public ExecutionCommand(Integer id){
+        this.id = id;
+    }
+
+    public ExecutionCommand(Integer id, String executable, String[] arguments, String workingDirectory, boolean inBackground, boolean isFailsafe) {
+        this.id = id;
+        this.executable = executable;
+        this.arguments = arguments;
+        this.workingDirectory = workingDirectory;
+        this.inBackground = inBackground;
+        this.isFailsafe = isFailsafe;
+    }
+
+    @NonNull
+    @Override
+    public String toString() {
+        if(currentState.getValue() < ExecutionState.EXECUTED.getValue())
+            return getExecutionInputLogString(this, true);
+        else {
+            return getExecutionOutputLogString(this, true);
+        }
+    }
+
+    /**
+     * Get a log friendly {@link String} for {@link ExecutionCommand} execution input parameters.
+     *
+     * @param executionCommand The {@link ExecutionCommand} to convert.
+     * @param ignoreNull Set to {@code true} if non-critical {@code null} values are to be ignored.
+     * @return Returns the log friendly {@link String}.
+     */
+    public static String getExecutionInputLogString(ExecutionCommand executionCommand, boolean ignoreNull) {
+        if (executionCommand == null) return "null";
+
+        StringBuilder logString = new StringBuilder();
+
+        logString.append(executionCommand.getIdLogString());
+        logString.append(executionCommand.getCommandLabelLogString()).append(":");
+
+        if(executionCommand.previousState != ExecutionState.PRE_EXECUTION)
+            logString.append("\n").append(executionCommand.getPreviousStateLogString());
+        logString.append("\n").append(executionCommand.getCurrentStateLogString());
+
+        logString.append("\n").append(executionCommand.getExecutableLogString());
+        logString.append("\n").append(executionCommand.getArgumentsLogString());
+        logString.append("\n").append(executionCommand.getWorkingDirectoryLogString());
+        logString.append("\n").append(executionCommand.getInBackgroundLogString());
+        logString.append("\n").append(executionCommand.getIsFailsafeLogString());
+
+
+        if(!ignoreNull || executionCommand.sessionAction != null)
+            logString.append("\n").append(executionCommand.getSessionActionLogString());
+
+        logString.append("\n").append(executionCommand.getIsPluginExecutionCommandLogString());
+        if(!ignoreNull || executionCommand.isPluginExecutionCommand) {
+            if (!ignoreNull || executionCommand.pluginPendingIntent != null)
+                logString.append("\n").append(executionCommand.getPendingIntentCreatorLogString());
+        }
+
+        return logString.toString();
+    }
+
+    /**
+     * Get a log friendly {@link String} for {@link ExecutionCommand} execution output parameters.
+     *
+     * @param executionCommand The {@link ExecutionCommand} to convert.
+     * @param ignoreNull Set to {@code true} if non-critical {@code null} values are to be ignored.
+     * @return Returns the log friendly {@link String}.
+     */
+    public static String getExecutionOutputLogString(ExecutionCommand executionCommand, boolean ignoreNull) {
+        if (executionCommand == null) return "null";
+
+        StringBuilder logString = new StringBuilder();
+
+        logString.append(executionCommand.getIdLogString());
+        logString.append(executionCommand.getCommandLabelLogString()).append(":");
+
+        logString.append("\n").append(executionCommand.getPreviousStateLogString());
+        logString.append("\n").append(executionCommand.getCurrentStateLogString());
+
+        logString.append("\n").append(executionCommand.getStdoutLogString());
+        logString.append("\n").append(executionCommand.getStderrLogString());
+        logString.append("\n").append(executionCommand.getExitCodeLogString());
+
+        logString.append(getExecutionErrLogString(executionCommand, ignoreNull));
+
+        return logString.toString();
+    }
+
+    /**
+     * Get a log friendly {@link String} for {@link ExecutionCommand} execution error parameters.
+     *
+     * @param executionCommand The {@link ExecutionCommand} to convert.
+     * @param ignoreNull Set to {@code true} if non-critical {@code null} values are to be ignored.
+     * @return Returns the log friendly {@link String}.
+     */
+    public static String getExecutionErrLogString(ExecutionCommand executionCommand, boolean ignoreNull) {
+        StringBuilder logString = new StringBuilder();
+
+        if(!ignoreNull || (executionCommand.errCode != null && executionCommand.errCode != 0)) {
+            logString.append("\n").append(executionCommand.getErrCodeLogString());
+            logString.append("\n").append(executionCommand.getErrmsgLogString());
+            logString.append("\n").append(executionCommand.geStackTracesLogString());
+        } else {
+            logString.append("");
+        }
+
+        return logString.toString();
+    }
+
+    /**
+     * Get a log friendly {@link String} for {@link ExecutionCommand} with more details.
+     *
+     * @param executionCommand The {@link ExecutionCommand} to convert.
+     * @return Returns the log friendly {@link String}.
+     */
+    public static String getDetailedLogString(ExecutionCommand executionCommand) {
+        if (executionCommand == null) return "null";
+
+        StringBuilder logString = new StringBuilder();
+
+        logString.append(getExecutionInputLogString(executionCommand, false));
+        logString.append(getExecutionOutputLogString(executionCommand, false));
+
+        logString.append("\n").append(executionCommand.getCommandDescriptionLogString());
+        logString.append("\n").append(executionCommand.getCommandHelpLogString());
+        logString.append("\n").append(executionCommand.getPluginAPIHelpLogString());
+
+        return logString.toString();
+    }
+
+    /**
+     * Get a markdown {@link String} for {@link ExecutionCommand}.
+     *
+     * @param executionCommand The {@link ExecutionCommand} to convert.
+     * @return Returns the markdown {@link String}.
+     */
+    public static String getDetailedMarkdownString(ExecutionCommand executionCommand) {
+        if (executionCommand == null) return "null";
+
+        if (executionCommand.commandLabel == null) executionCommand.commandLabel = "Execution Command";
+
+        StringBuilder markdownString = new StringBuilder();
+
+        markdownString.append("### ").append(executionCommand.commandLabel).append("\n");
+
+
+        markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Previous State", executionCommand.previousState.getName(), "-"));
+        markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Current State", executionCommand.currentState.getName(), "-"));
+
+        markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Executable", executionCommand.executable, "-"));
+        markdownString.append("\n").append(getArgumentsMarkdownString(executionCommand.arguments));
+        markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Working Directory", executionCommand.workingDirectory, "-"));
+        markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("inBackground", executionCommand.inBackground, "-"));
+        markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("isFailsafe", executionCommand.isFailsafe, "-"));
+        markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Session Action", executionCommand.sessionAction, "-"));
+
+
+        markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("isPluginExecutionCommand", executionCommand.isPluginExecutionCommand, "-"));
+        if (executionCommand.pluginPendingIntent != null)
+            markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Pending Intent Creator", executionCommand.pluginPendingIntent.getCreatorPackage(), "-"));
+        else
+            markdownString.append("\n").append("**Pending Intent Creator:** -  ");
+
+        markdownString.append("\n\n").append(MarkdownUtils.getMultiLineMarkdownStringEntry("Stdout", executionCommand.stdout, "-"));
+        markdownString.append("\n").append(MarkdownUtils.getMultiLineMarkdownStringEntry("Stderr", executionCommand.stderr, "-"));
+        markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Exit Code", executionCommand.exitCode, "-"));
+
+        markdownString.append("\n\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Err Code", executionCommand.errCode, "-"));
+        markdownString.append("\n").append("**Errmsg:**\n").append(TextDataUtils.getDefaultIfNull(executionCommand.errmsg, "-"));
+        markdownString.append("\n\n").append(executionCommand.geStackTracesMarkdownString());
+
+        if(executionCommand.commandDescription != null || executionCommand.commandHelp != null) {
+            if (executionCommand.commandDescription != null)
+                markdownString.append("\n\n#### Command Description\n\n").append(executionCommand.commandDescription).append("\n");
+            if (executionCommand.commandHelp != null)
+                markdownString.append("\n\n#### Command Help\n\n").append(executionCommand.commandHelp).append("\n");
+            markdownString.append("\n##\n");
+        }
+
+        if(executionCommand.pluginAPIHelp != null) {
+            markdownString.append("\n\n#### Plugin API Help\n\n").append(executionCommand.pluginAPIHelp);
+            markdownString.append("\n##\n");
+        }
+
+        return markdownString.toString();
+    }
+
+
+
+    public String getIdLogString() {
+        if(id != null)
+            return "(" + id + ") ";
+        else
+            return "";
+    }
+
+    public String getCurrentStateLogString() {
+        return "Current State: `" + currentState.getName() + "`";
+    }
+
+    public String getPreviousStateLogString() {
+        return "Previous State: `" + previousState.getName() + "`";
+    }
+
+    public String getCommandLabelLogString() {
+        if (commandLabel != null && !commandLabel.isEmpty())
+            return commandLabel;
+        else
+            return "Execution Command";
+    }
+
+    public String getExecutableLogString() {
+        return "Executable: `" + executable + "`";
+    }
+
+    public String getArgumentsLogString() {
+        return getArgumentsLogString(arguments);
+    }
+
+    public String getWorkingDirectoryLogString() {
+        return "Working Directory: `" + workingDirectory + "`";
+    }
+
+    public String getInBackgroundLogString() {
+        return "inBackground: `" + inBackground + "`";
+    }
+
+    public String getIsFailsafeLogString() {
+        return "isFailsafe: `" + isFailsafe + "`";
+    }
+
+    public String getIsPluginExecutionCommandLogString() {
+        return "isPluginExecutionCommand: `" + isPluginExecutionCommand + "`";
+    }
+
+    public String getSessionActionLogString() {
+        return getSingleLineLogStringEntry("Session Action", sessionAction, "-");
+    }
+
+    public String getPendingIntentCreatorLogString() {
+        if (pluginPendingIntent != null)
+            return "Pending Intent Creator: `" + pluginPendingIntent.getCreatorPackage() + "`";
+        else
+            return "Pending Intent Creator: -";
+    }
+
+    public String getCommandDescriptionLogString() {
+        return getSingleLineLogStringEntry("Command Description", commandDescription, "-");
+    }
+
+    public String getCommandHelpLogString() {
+        return getSingleLineLogStringEntry("Command Help", commandHelp, "-");
+    }
+
+    public String getPluginAPIHelpLogString() {
+        return getSingleLineLogStringEntry("Plugin API Help", pluginAPIHelp, "-");
+    }
+
+    public String getStdoutLogString() {
+        return getMultiLineLogStringEntry("Stdout", stdout, "-");
+    }
+
+    public String getStderrLogString() {
+        return getMultiLineLogStringEntry("Stderr", stderr, "-");
+    }
+
+    public String getExitCodeLogString() {
+        return getSingleLineLogStringEntry("Exit Code", exitCode, "-");
+    }
+
+    public String getErrCodeLogString() {
+        return getSingleLineLogStringEntry("Err Code", errCode, "-");
+    }
+
+    public String getErrmsgLogString() {
+        return getMultiLineLogStringEntry("Errmsg", errmsg, "-");
+    }
+
+    public String geStackTracesLogString() {
+        return Logger.getStackTracesString("StackTraces:", Logger.getStackTraceStringArray(throwableList));
+    }
+
+    public String geStackTracesMarkdownString() {
+        return Logger.getStackTracesMarkdownString("StackTraces:", Logger.getStackTraceStringArray(throwableList));
+    }
+
+
+
+    /**
+     * Get a markdown {@link String} for {@link String[]} argumentsArray.
+     * If argumentsArray are null or of size 0, then `**Arguments:** -` is returned. Otherwise
+     * following format is returned:
+     *
+     * **Arguments:**
+     *
+     * **Arg 1:**
+     * ```
+     * value
+     * ```
+     * **Arg 2:**
+     * ```
+     * value
+     *```
+     *
+     * @param argumentsArray The {@link String[]} argumentsArray to convert.
+     * @return Returns the markdown {@link String}.
+     */
+    public static String getArgumentsMarkdownString(String[] argumentsArray) {
+        StringBuilder argumentsString = new StringBuilder("**Arguments:**");
+
+        if (argumentsArray != null && argumentsArray.length != 0) {
+            argumentsString.append("\n");
+            for (int i = 0; i != argumentsArray.length; i++) {
+                argumentsString.append(MarkdownUtils.getMultiLineMarkdownStringEntry("Arg " + (i + 1), argumentsArray[i], "-")).append("\n");
+            }
+        } else{
+            argumentsString.append(" -");
+        }
+
+        return argumentsString.toString();
+    }
+
+
+    /**
+     * Get a log friendly {@link String} for {@link List<String>} argumentsArray.
+     * If argumentsArray are null or of size 0, then `Arguments: -` is returned. Otherwise
+     * following format is returned:
+     *
+     * Arguments:
+     * ```
+     * Arg 1: `value`
+     * Arg 2: 'value`
+     * ```
+     *
+     * @param argumentsArray The {@link String[]} argumentsArray to convert.
+     * @return Returns the log friendly {@link String}.
+     */
+    public static String getArgumentsLogString(String[] argumentsArray) {
+        StringBuilder argumentsString = new StringBuilder("Arguments:");
+
+        if (argumentsArray != null && argumentsArray.length != 0) {
+            argumentsString.append("\n```\n");
+            for (int i = 0; i != argumentsArray.length; i++) {
+                argumentsString.append(getSingleLineLogStringEntry("Arg " + (i + 1), argumentsArray[i], "-")).append("`\n");
+            }
+            argumentsString.append("```");
+        } else{
+            argumentsString.append(" -");
+        }
+
+        return argumentsString.toString();
+    }
+
+
+
+    public static String getSingleLineLogStringEntry(String label, Object object, String def) {
+        if (object != null)
+            return label + ": `" + object + "`";
+        else
+            return  label + ": "  +  def;
+    }
+
+    public static String getMultiLineLogStringEntry( String label, Object object,String def) {
+        if (object != null)
+            return label + ":\n```\n" + object + "\n```\n";
+        else
+            return  label + ": "  +  def;
+    }
+
+
+
+    public boolean setState(ExecutionState newState) {
+        // The state transition cannot go back or change if already at {@link ExecutionState#SUCCESS}
+        if(newState.getValue() < currentState.getValue() || currentState == ExecutionState.SUCCESS) {
+            Logger.logError("Invalid ExecutionCommand state transition from \"" + currentState.getName() + "\" to " +  "\"" + newState.getName() + "\"");
+            return false;
+        }
+
+        // The {@link ExecutionState#FAILED} can be set again, like to add more errors, but we don't update
+        // {@link #previousState} with the {@link #currentState} value if its at {@link ExecutionState#FAILED} to
+        // preserve the last valid state
+        if(currentState != ExecutionState.FAILED)
+            previousState = currentState;
+
+        currentState = newState;
+        return  true;
+    }
+
+    public boolean setStateFailed(int errCode, String errmsg,  Throwable throwable) {
+        if(errCode < 1)
+            return false;
+
+        if(!setState(ExecutionState.FAILED))
+            return false;
+
+        this.errCode = errCode;
+        this.errmsg = errmsg;
+
+        if(this.throwableList == null)
+            this.throwableList =  new ArrayList<>();
+
+        if(throwable != null)
+            this.throwableList.add(throwable);
+
+        return true;
+    }
+
+}

From ef1ab197b6481c9ffb3a29bf0452b7b5d7f87cdf Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 24 Mar 2021 03:51:57 +0500
Subject: [PATCH 265/912] Update TermuxConstants

The `TermuxConstants` classes has been updated to `v0.11.0`. Check its Changelog sections for info on changes.
---
 .../java/com/termux/app/TermuxConstants.java  | 52 +++++++++++++------
 1 file changed, 36 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxConstants.java b/app/src/main/java/com/termux/app/TermuxConstants.java
index c5497d45dc..f578509002 100644
--- a/app/src/main/java/com/termux/app/TermuxConstants.java
+++ b/app/src/main/java/com/termux/app/TermuxConstants.java
@@ -5,7 +5,7 @@
 import java.io.File;
 
 /*
- * Version: v0.10.0
+ * Version: v0.11.0
  *
  * Changelog
  *
@@ -55,8 +55,7 @@
  *      - Added following to `TERMUX_SERVICE`:
  *          `EXTRA_PENDING_INTENT`, `EXTRA_RESULT_BUNDLE`,
  *          `EXTRA_STDOUT`, `EXTRA_STDERR`, `EXTRA_EXIT_CODE`,
- *          `EXTRA_ERR`, `EXTRA_ERRMSG`
- *          .
+ *          `EXTRA_ERR`, `EXTRA_ERRMSG`.
  *
  * - 0.9.0 (2021-03-18)
  *      - Fixed javadocs.
@@ -67,9 +66,16 @@
  *          `VALUE_EXTRA_SESSION_ACTION_SWITCH_TO_NEW_SESSION_AND_OPEN_ACTIVITY`,
  *          `VALUE_EXTRA_SESSION_ACTION_KEEP_CURRENT_SESSION_AND_OPEN_ACTIVITY`,
  *          `VALUE_EXTRA_SESSION_ACTION_SWITCH_TO_NEW_SESSION_AND_DONT_OPEN_ACTIVITY`
- *          `VALUE_EXTRA_SESSION_ACTION_KEEP_CURRENT_SESSION_AND_DONT_OPEN_ACTIVITY`
+ *          `VALUE_EXTRA_SESSION_ACTION_KEEP_CURRENT_SESSION_AND_DONT_OPEN_ACTIVITY`.
  *      - Added following to `RUN_COMMAND_SERVICE`:
- *          `EXTRA_SESSION_ACTION`
+ *          `EXTRA_SESSION_ACTION`.
+ *
+ * - 0.11.0 (2021-03-24)
+ *      - Added following to `TERMUX_SERVICE`:
+ *          `EXTRA_COMMAND_LABEL`, `EXTRA_COMMAND_DESCRIPTION`, `EXTRA_COMMAND_HELP`, `EXTRA_PLUGIN_API_HELP`.
+ *      - Added following to `RUN_COMMAND_SERVICE`:
+ *          `EXTRA_COMMAND_LABEL`, `EXTRA_COMMAND_DESCRIPTION`, `EXTRA_COMMAND_HELP`.
+ *      - Updated `RESULT_BUNDLE` related extras with `PLUGIN_RESULT_BUNDLE` prefixes.
  */
 
 /**
@@ -432,6 +438,14 @@ public static final class TERMUX_SERVICE {
             public static final String EXTRA_SESSION_ACTION = TERMUX_PACKAGE_NAME + ".execute.session_action"; // Default: "com.termux.execute.session_action"
             /** Intent {@code Parcelable} extra containing pending intent for the execute command caller */
             public static final String EXTRA_PENDING_INTENT = "pendingIntent"; // Default: "pendingIntent"
+            /** Intent {@code String} extra for label of the command for the TERMUX_SERVICE.ACTION_SERVICE_EXECUTE intent */
+            public static final String EXTRA_COMMAND_LABEL = TERMUX_PACKAGE_NAME + ".execute.command_label"; // Default: "com.termux.execute.command_label"
+            /** Intent markdown {@code String} extra for description of the command for the TERMUX_SERVICE.ACTION_SERVICE_EXECUTE intent */
+            public static final String EXTRA_COMMAND_DESCRIPTION = TERMUX_PACKAGE_NAME + ".execute.command_description"; // Default: "com.termux.execute.command_description"
+            /** Intent markdown {@code String} extra for help of the command for the TERMUX_SERVICE.ACTION_SERVICE_EXECUTE intent */
+            public static final String EXTRA_COMMAND_HELP = TERMUX_PACKAGE_NAME + ".execute.command_help"; // Default: "com.termux.execute.command_help"
+            /** Intent markdown {@code String} extra for help of the plugin API for the TERMUX_SERVICE.ACTION_SERVICE_EXECUTE intent (Internal Use Only) */
+            public static final String EXTRA_PLUGIN_API_HELP = TERMUX_PACKAGE_NAME + ".execute.plugin_api_help"; // Default: "com.termux.execute.plugin_help"
 
 
 
@@ -469,17 +483,17 @@ public static final class TERMUX_SERVICE {
             /** Intent {@code Bundle} extra to store result of execute command that is sent back for the
              * TERMUX_SERVICE.ACTION_SERVICE_EXECUTE intent if the {@link #EXTRA_PENDING_INTENT} is not
              * {@code null} */
-            public static final String EXTRA_RESULT_BUNDLE = "result"; // Default: "result"
-            /** Intent {@code String} extra for stdout value of execute command of the {@link #EXTRA_RESULT_BUNDLE} */
-            public static final String EXTRA_STDOUT = "stdout"; // Default: "stdout"
-            /** Intent {@code String} extra for stderr value of execute command of the {@link #EXTRA_RESULT_BUNDLE} */
-            public static final String EXTRA_STDERR = "stderr"; // Default: "stderr"
-            /** Intent {@code int} extra for exit code value of execute command of the {@link #EXTRA_RESULT_BUNDLE} */
-            public static final String EXTRA_EXIT_CODE = "exitCode"; // Default: "exitCode"
-            /** Intent {@code int} extra for err value of execute command of the {@link #EXTRA_RESULT_BUNDLE} */
-            public static final String EXTRA_ERR = "err"; // Default: "err"
-            /** Intent {@code String} extra for errmsg value of execute command of the {@link #EXTRA_RESULT_BUNDLE} */
-            public static final String EXTRA_ERRMSG = "errmsg"; // Default: "errmsg"
+            public static final String EXTRA_PLUGIN_RESULT_BUNDLE = "result"; // Default: "result"
+            /** Intent {@code String} extra for stdout value of execute command of the {@link #EXTRA_PLUGIN_RESULT_BUNDLE} */
+            public static final String EXTRA_PLUGIN_RESULT_BUNDLE_STDOUT = "stdout"; // Default: "stdout"
+            /** Intent {@code String} extra for stderr value of execute command of the {@link #EXTRA_PLUGIN_RESULT_BUNDLE} */
+            public static final String EXTRA_PLUGIN_RESULT_BUNDLE_STDERR = "stderr"; // Default: "stderr"
+            /** Intent {@code int} extra for exit code value of execute command of the {@link #EXTRA_PLUGIN_RESULT_BUNDLE} */
+            public static final String EXTRA_PLUGIN_RESULT_BUNDLE_EXIT_CODE = "exitCode"; // Default: "exitCode"
+            /** Intent {@code int} extra for err value of execute command of the {@link #EXTRA_PLUGIN_RESULT_BUNDLE} */
+            public static final String EXTRA_PLUGIN_RESULT_BUNDLE_ERR = "err"; // Default: "err"
+            /** Intent {@code String} extra for errmsg value of execute command of the {@link #EXTRA_PLUGIN_RESULT_BUNDLE} */
+            public static final String EXTRA_PLUGIN_RESULT_BUNDLE_ERRMSG = "errmsg"; // Default: "errmsg"
 
         }
 
@@ -507,6 +521,12 @@ public static final class RUN_COMMAND_SERVICE {
             public static final String EXTRA_BACKGROUND = TERMUX_PACKAGE_NAME + ".RUN_COMMAND_BACKGROUND"; // Default: "com.termux.RUN_COMMAND_BACKGROUND"
             /** Intent {@code String} extra for session action of foreground commands for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent */
             public static final String EXTRA_SESSION_ACTION = TERMUX_PACKAGE_NAME + ".RUN_COMMAND_SESSION_ACTION"; // Default: "com.termux.RUN_COMMAND_SESSION_ACTION"
+            /** Intent {@code String} extra for label of the command for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent */
+            public static final String EXTRA_COMMAND_LABEL = TERMUX_PACKAGE_NAME + ".RUN_COMMAND_COMMAND_LABEL"; // Default: "com.termux.RUN_COMMAND_COMMAND_LABEL"
+            /** Intent markdown {@code String} extra for description of the command for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent */
+            public static final String EXTRA_COMMAND_DESCRIPTION = TERMUX_PACKAGE_NAME + ".RUN_COMMAND_COMMAND_DESCRIPTION"; // Default: "com.termux.RUN_COMMAND_COMMAND_DESCRIPTION"
+            /** Intent markdown {@code String} extra for help of the command for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent */
+            public static final String EXTRA_COMMAND_HELP = TERMUX_PACKAGE_NAME + ".RUN_COMMAND_COMMAND_HELP"; // Default: "com.termux.RUN_COMMAND_COMMAND_HELP"
 
         }
     }

From 31371b5e3df946fe1b5524e24aadd826b853d6b4 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 24 Mar 2021 03:56:25 +0500
Subject: [PATCH 266/912] Fully integrate ExectionCommand into
 RunCommandService

Users will now also be shown flashes and notifications in addition to log entries for missing allow-external-apps permission or for invalid extras passed like the executable. The flashes and notifications can be controlled with the Termux Settings -> Debugging -> Plugin Error Notifications toggle
---
 .../com/termux/app/RunCommandService.java     | 116 ++++++----
 .../com/termux/app/utils/PluginUtils.java     | 210 ++++++++++--------
 .../com/termux/app/utils/TextDataUtils.java   |  13 ++
 .../res/drawable/ic_error_notification.xml    |  37 +++
 app/src/main/res/values/strings.xml           |  10 +-
 5 files changed, 250 insertions(+), 136 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_error_notification.xml

diff --git a/app/src/main/java/com/termux/app/RunCommandService.java b/app/src/main/java/com/termux/app/RunCommandService.java
index a5236e7c4e..f8abb0a986 100644
--- a/app/src/main/java/com/termux/app/RunCommandService.java
+++ b/app/src/main/java/com/termux/app/RunCommandService.java
@@ -10,7 +10,6 @@
 import android.os.Binder;
 import android.os.Build;
 import android.os.IBinder;
-import android.util.Log;
 
 import com.termux.R;
 import com.termux.app.TermuxConstants.TERMUX_APP.RUN_COMMAND_SERVICE;
@@ -18,9 +17,9 @@
 import com.termux.app.utils.FileUtils;
 import com.termux.app.utils.Logger;
 import com.termux.app.utils.PluginUtils;
-
-import java.util.Arrays;
-import java.util.HashMap;
+import com.termux.app.utils.TextDataUtils;
+import com.termux.models.ExecutionCommand;
+import com.termux.models.ExecutionCommand.ExecutionState;
 
 /**
  * Third-party apps that are not part of termux world can run commands in termux context by either
@@ -88,18 +87,24 @@
  *
  * The {@link RUN_COMMAND_SERVICE#ACTION_RUN_COMMAND} intent expects the following extras:
  *
- * 1. The {@code String} {@link RUN_COMMAND_SERVICE#EXTRA_COMMAND_PATH} extra for absolute path of
- *      command. This is mandatory.
+ * 1. The **mandatory** {@code String} {@link RUN_COMMAND_SERVICE#EXTRA_COMMAND_PATH} extra for
+ *      absolute path of command.
  * 2. The {@code String[]} {@link RUN_COMMAND_SERVICE#EXTRA_ARGUMENTS} extra for any arguments to
- *      pass to command. This is optional.
+ *      pass to command.
  * 3. The {@code String} {@link RUN_COMMAND_SERVICE#EXTRA_WORKDIR} extra for current working directory
- *      of command. This is optional and defaults to {@link TermuxConstants#TERMUX_HOME_DIR_PATH}.
+ *      of command. This defaults to {@link TermuxConstants#TERMUX_HOME_DIR_PATH}.
  * 4. The {@code boolean} {@link RUN_COMMAND_SERVICE#EXTRA_BACKGROUND} extra whether to run command
- *      in background or foreground terminal session. This is optional and defaults to {@code false}.
+ *      in background or foreground terminal session. This defaults to {@code false}.
  * 5. The {@code String} {@link RUN_COMMAND_SERVICE#EXTRA_SESSION_ACTION} extra for for session action
- *      of foreground commands. This is optional and defaults to
+ *      of foreground commands. This defaults to
  *      {@link TERMUX_SERVICE#VALUE_EXTRA_SESSION_ACTION_SWITCH_TO_NEW_SESSION_AND_OPEN_ACTIVITY}.
- *
+ * 6. The {@code String} {@link RUN_COMMAND_SERVICE#EXTRA_COMMAND_LABEL} extra for label of the command.
+ * 7. The markdown {@code String} {@link RUN_COMMAND_SERVICE#EXTRA_COMMAND_DESCRIPTION} extra for
+ *      description of the command. This should ideally be get short.
+ * 8. The markdown {@code String} {@link RUN_COMMAND_SERVICE#EXTRA_COMMAND_HELP} extra for help of
+ *      the command. This can add details about the command. 3rd party apps can provide more info
+ *      to users for setting up commands. Ideally a url link should be provided that goes into full
+ *      details.
  *
  *
  * The {@link RUN_COMMAND_SERVICE#EXTRA_COMMAND_PATH} and {@link RUN_COMMAND_SERVICE#EXTRA_WORKDIR}
@@ -107,6 +112,20 @@
  * The "$PREFIX/" will expand to {@link TermuxConstants#TERMUX_PREFIX_DIR_PATH} and
  * "~/" will expand to {@link TermuxConstants#TERMUX_HOME_DIR_PATH}, followed by a forward slash "/".
  *
+ *
+ * The `EXTRA_COMMAND_*` extras are used for logging and are their values are provided to users in case
+ * of failure in a popup. The popup shown is in commonmark-spec markdown using markwon library so
+ * make sure to follow its formatting rules. Also make sure to end lines with 2 blank spaces to prevent
+ * word-wrap wherever needed.
+ * It's the users and 3rd party apps responsibility to use them wisely. There are also android
+ * internal intent size limits (roughly 500KB) that must not exceed when sending intents so make sure
+ * the combined size of ALL extras is less than that.
+ * There are also limits on the arguments size you can pass to commands or the full command string
+ * length that can be run, which is likely equal to 131072 bytes or 128KB on an android device.
+ * Check https://github.com/termux/termux-tasker#arguments-and-result-data-limits for more details.
+ *
+ *
+ *
  * If your third-party app is targeting sdk 30 (android 11), then it needs to add `com.termux`
  * package to the `queries` element or request `QUERY_ALL_PACKAGES` permission in its
  * `AndroidManifest.xml`. Otherwise it will get `PackageSetting{...... com.termux/......} BLOCKED`
@@ -138,7 +157,7 @@
 public class RunCommandService extends Service {
 
     private static final String NOTIFICATION_CHANNEL_ID = "termux_run_command_notification_channel";
-    private static final int NOTIFICATION_ID = 1338;
+    public static final int NOTIFICATION_ID = 1338;
 
     private static final String LOG_TAG = "RunCommandService";
 
@@ -166,78 +185,91 @@ public int onStartCommand(Intent intent, int flags, int startId) {
         // Run again in case service is already started and onCreate() is not called
         runStartForeground();
 
+        ExecutionCommand executionCommand = new ExecutionCommand();
+        executionCommand.pluginAPIHelp = this.getString(R.string.run_command_service_api_help);
+
         String errmsg;
 
         // If invalid action passed, then just return
         if (!RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND.equals(intent.getAction())) {
             errmsg = this.getString(R.string.run_command_service_invalid_action, intent.getAction());
-            Logger.logError(LOG_TAG, errmsg);
+            executionCommand.setStateFailed(1, errmsg, null);
+            PluginUtils.processPluginExecutionCommandError(this, LOG_TAG, executionCommand);
             return Service.START_NOT_STICKY;
         }
 
+        executionCommand.executable = intent.getStringExtra(RUN_COMMAND_SERVICE.EXTRA_COMMAND_PATH);
+        executionCommand.arguments = intent.getStringArrayExtra(RUN_COMMAND_SERVICE.EXTRA_ARGUMENTS);
+        executionCommand.workingDirectory = intent.getStringExtra(RUN_COMMAND_SERVICE.EXTRA_WORKDIR);
+        executionCommand.inBackground = intent.getBooleanExtra(RUN_COMMAND_SERVICE.EXTRA_BACKGROUND, false);
+        executionCommand.sessionAction = intent.getStringExtra(RUN_COMMAND_SERVICE.EXTRA_SESSION_ACTION);
+        executionCommand.commandLabel = TextDataUtils.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);
+
+        if(!executionCommand.setState(ExecutionState.PRE_EXECUTION))
+            return Service.START_NOT_STICKY;
+
         // If "allow-external-apps" property to not set to "true", then just return
         errmsg = PluginUtils.checkIfRunCommandServiceAllowExternalAppsPolicyIsViolated(this);
         if (errmsg != null) {
-            Logger.logError(LOG_TAG, errmsg);
+            executionCommand.setStateFailed(1, errmsg, null);
+            PluginUtils.processPluginExecutionCommandError(this, LOG_TAG, executionCommand);
             return Service.START_NOT_STICKY;
         }
 
-
-        String executable = intent.getStringExtra(RUN_COMMAND_SERVICE.EXTRA_COMMAND_PATH);
-        String[] arguments = intent.getStringArrayExtra(RUN_COMMAND_SERVICE.EXTRA_ARGUMENTS);
-        boolean inBackground = intent.getBooleanExtra(RUN_COMMAND_SERVICE.EXTRA_BACKGROUND, false);
-        String workingDirectory = intent.getStringExtra(RUN_COMMAND_SERVICE.EXTRA_WORKDIR);
-        String sessionAction = intent.getStringExtra(RUN_COMMAND_SERVICE.EXTRA_SESSION_ACTION);
-
         // Get canonical path of executable
-        executable = FileUtils.getCanonicalPath(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
-        errmsg = FileUtils.validateRegularFileExistenceAndPermissions(this, executable,
+        errmsg = FileUtils.validateRegularFileExistenceAndPermissions(this, executionCommand.executable,
             null, PluginUtils.PLUGIN_EXECUTABLE_FILE_PERMISSIONS,
             false, false);
         if (errmsg != null) {
-            errmsg  += "\n" + this.getString(R.string.executable_absolute_path, executable);
-            Logger.logError(LOG_TAG, errmsg);
+            errmsg  += "\n" + this.getString(R.string.executable_absolute_path, executionCommand.executable);
+            executionCommand.setStateFailed(1, errmsg, null);
+            PluginUtils.processPluginExecutionCommandError(this, LOG_TAG, executionCommand);
             return Service.START_NOT_STICKY;
         }
 
         // If workingDirectory is not null or empty
-        if (workingDirectory != null && !workingDirectory.isEmpty()) {
+        if (executionCommand.workingDirectory != null && !executionCommand.workingDirectory.isEmpty()) {
             // Get canonical path of workingDirectory
-            workingDirectory = FileUtils.getCanonicalPath(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 {@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.
-            errmsg = FileUtils.validateDirectoryExistenceAndPermissions(this, workingDirectory,
+            errmsg = FileUtils.validateDirectoryExistenceAndPermissions(this, executionCommand.workingDirectory,
                 TermuxConstants.TERMUX_FILES_DIR_PATH, PluginUtils.PLUGIN_WORKING_DIRECTORY_PERMISSIONS,
                 true, true, false,
                 true);
             if (errmsg != null) {
-                errmsg  += "\n" + this.getString(R.string.working_directory_absolute_path, workingDirectory);
-                Logger.logError(LOG_TAG, errmsg);
+                errmsg  += "\n" + this.getString(R.string.working_directory_absolute_path, executionCommand.workingDirectory);
+                executionCommand.setStateFailed(1, errmsg, null);
+                PluginUtils.processPluginExecutionCommandError(this, LOG_TAG, executionCommand);
                 return Service.START_NOT_STICKY;
             }
         }
 
-        PluginUtils.dumpExecutionIntentToLog(Log.VERBOSE, LOG_TAG, "RUN_COMMAND Intent", executable, Arrays.asList(arguments), workingDirectory, inBackground, new HashMap<String, Object>() {{
-            put("sessionAction", sessionAction);
-        }});
+        executionCommand.executableUri = new Uri.Builder().scheme(TERMUX_SERVICE.URI_SCHEME_SERVICE_EXECUTE).path(FileUtils.getExpandedTermuxPath(executionCommand.executable)).build();
 
-        Uri executableUri = new Uri.Builder().scheme(TERMUX_SERVICE.URI_SCHEME_SERVICE_EXECUTE).path(FileUtils.getExpandedTermuxPath(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, executableUri);
+        Intent execIntent = new Intent(TERMUX_SERVICE.ACTION_SERVICE_EXECUTE, executionCommand.executableUri);
         execIntent.setClass(this, TermuxService.class);
-        execIntent.putExtra(TERMUX_SERVICE.EXTRA_ARGUMENTS, arguments);
-        execIntent.putExtra(TERMUX_SERVICE.EXTRA_BACKGROUND, inBackground);
-        if (workingDirectory != null && !workingDirectory.isEmpty()) execIntent.putExtra(TERMUX_SERVICE.EXTRA_WORKDIR, workingDirectory);
-        execIntent.putExtra(TERMUX_SERVICE.EXTRA_SESSION_ACTION, sessionAction);
-
+        execIntent.putExtra(TERMUX_SERVICE.EXTRA_ARGUMENTS, executionCommand.arguments);
+        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_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);
 
         // Start TERMUX_SERVICE and pass it execution intent
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
@@ -292,8 +324,8 @@ private void setupNotificationChannel() {
         int importance = NotificationManager.IMPORTANCE_LOW;
 
         NotificationChannel channel = new NotificationChannel(NOTIFICATION_CHANNEL_ID, channelName, importance);
-        NotificationManager manager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
-        manager.createNotificationChannel(channel);
+        NotificationManager notificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+        notificationManager.createNotificationChannel(channel);
     }
 
 }
diff --git a/app/src/main/java/com/termux/app/utils/PluginUtils.java b/app/src/main/java/com/termux/app/utils/PluginUtils.java
index e59af7f830..0fd2a7e9c1 100644
--- a/app/src/main/java/com/termux/app/utils/PluginUtils.java
+++ b/app/src/main/java/com/termux/app/utils/PluginUtils.java
@@ -1,38 +1,31 @@
 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.content.Intent;
 import android.os.Bundle;
 
+import androidx.annotation.Nullable;
+
 import com.termux.R;
 import com.termux.app.TermuxConstants;
 import com.termux.app.TermuxConstants.TERMUX_APP.TERMUX_SERVICE;
+import com.termux.app.activities.ReportActivity;
+import com.termux.app.settings.preferences.TermuxAppSharedPreferences;
+import com.termux.app.settings.preferences.TermuxPreferenceConstants;
 import com.termux.app.settings.properties.SharedProperties;
 import com.termux.app.settings.properties.TermuxPropertyConstants;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import com.termux.models.ReportInfo;
+import com.termux.models.ExecutionCommand;
+import com.termux.models.UserAction;
 
 public class PluginUtils {
 
-    /** Plugin variable for stdout value of termux command */
-    public static final String PLUGIN_VARIABLE_STDOUT = "%stdout"; // Default: "%stdout"
-    /** Plugin variable for stderr value of termux command */
-    public static final String PLUGIN_VARIABLE_STDERR = "%stderr"; // Default: "%stderr"
-    /** Plugin variable for exit code value of termux command */
-    public static final String PLUGIN_VARIABLE_EXIT_CODE = "%result"; // Default: "%result"
-    /** Plugin variable for err value of termux command */
-    public static final String PLUGIN_VARIABLE_ERR = "%err"; // Default: "%err"
-    /** Plugin variable for errmsg value of termux command */
-    public static final String PLUGIN_VARIABLE_ERRMSG = "%errmsg"; // Default: "%errmsg"
-
-    /** Intent {@code Parcelable} extra containing original intent received from plugin host app by FireReceiver */
-    public static final String EXTRA_ORIGINAL_INTENT = "originalIntent"; // Default: "originalIntent"
-
-
+    private static final String NOTIFICATION_CHANNEL_ID_PLUGIN_COMMAND_ERRORS = "termux_plugin_command_errors_notification_channel";
+    private static final String NOTIFICATION_CHANNEL_NAME_PLUGIN_COMMAND_ERRORS = TermuxConstants.TERMUX_APP_NAME + " Plugin Commands Errors";
 
     /** 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"
@@ -40,34 +33,23 @@ public class PluginUtils {
      * 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"
 
-
-
-    /**
-     * A regex to validate if a string matches a valid plugin host variable name with the percent sign "%" prefix.
-     * Valid values: A string containing a percent sign character "%", followed by 1 alphanumeric character,
-     * followed by 2 or more alphanumeric or underscore "_" characters but does not end with an underscore "_"
-     */
-    public static final String PLUGIN_HOST_VARIABLE_NAME_MATCH_EXPRESSION =  "%[a-zA-Z0-9][a-zA-Z0-9_]{2,}(?<!_)";
-
-
-
     private static final String LOG_TAG = "PluginUtils";
 
     /**
      * Send execution result of commands to the {@link PendingIntent} creator received by
-     * execution service if {@code pendingIntent} is not {@code null}
+     * execution service if {@code pendingIntent} is not {@code null}.
      *
+     * @param context The {@link Context} that will be used to send result intent to the {@link PendingIntent} creator.
      * @param logLevel The log level to dump the result.
      * @param logTag The log tag to use for logging.
-     * @param context The {@link Context} that will be used to send result intent to the PluginResultsService.
      * @param pendingIntent The {@link PendingIntent} sent by creator to the execution service.
-     * @param stdout The value for {@link TERMUX_SERVICE#EXTRA_STDOUT} extra of {@link TERMUX_SERVICE#EXTRA_RESULT_BUNDLE} bundle of intent.
-     * @param stderr The value for {@link TERMUX_SERVICE#EXTRA_STDERR} extra of {@link TERMUX_SERVICE#EXTRA_RESULT_BUNDLE} bundle of intent.
-     * @param exitCode The value for {@link TERMUX_SERVICE#EXTRA_EXIT_CODE} extra of {@link TERMUX_SERVICE#EXTRA_RESULT_BUNDLE} bundle of intent.
-     * @param errCode The value for {@link TERMUX_SERVICE#EXTRA_ERR} extra of {@link TERMUX_SERVICE#EXTRA_RESULT_BUNDLE} bundle of intent.
-     * @param errmsg The value for {@link TERMUX_SERVICE#EXTRA_ERRMSG} extra of {@link TERMUX_SERVICE#EXTRA_RESULT_BUNDLE} bundle of intent.
+     * @param stdout The value for {@link TERMUX_SERVICE#EXTRA_PLUGIN_RESULT_BUNDLE_STDOUT} extra of {@link TERMUX_SERVICE#EXTRA_PLUGIN_RESULT_BUNDLE} bundle of intent.
+     * @param stderr The value for {@link TERMUX_SERVICE#EXTRA_PLUGIN_RESULT_BUNDLE_STDERR} extra of {@link TERMUX_SERVICE#EXTRA_PLUGIN_RESULT_BUNDLE} bundle of intent.
+     * @param exitCode The value for {@link TERMUX_SERVICE#EXTRA_PLUGIN_RESULT_BUNDLE_EXIT_CODE} extra of {@link TERMUX_SERVICE#EXTRA_PLUGIN_RESULT_BUNDLE} bundle of intent.
+     * @param errCode The value for {@link TERMUX_SERVICE#EXTRA_PLUGIN_RESULT_BUNDLE_ERR} extra of {@link TERMUX_SERVICE#EXTRA_PLUGIN_RESULT_BUNDLE} bundle of intent.
+     * @param errmsg The value for {@link TERMUX_SERVICE#EXTRA_PLUGIN_RESULT_BUNDLE_ERRMSG} extra of {@link TERMUX_SERVICE#EXTRA_PLUGIN_RESULT_BUNDLE} bundle of intent.
      */
-    public static void sendExecuteResultToResultsService(final int logLevel, final String logTag, final Context context, final PendingIntent pendingIntent, final String stdout, final String stderr, final String exitCode, final String errCode, final String errmsg) {
+    public static void sendExecuteResultToResultsService(final Context context, final int logLevel, final String logTag, final PendingIntent pendingIntent, final String stdout, final String stderr, final String exitCode, final String errCode, final String errmsg) {
         String label;
 
         if(pendingIntent == null)
@@ -76,25 +58,25 @@ public static void sendExecuteResultToResultsService(final int logLevel, final S
             label = "Sending execution result to " + pendingIntent.getCreatorPackage();
 
         Logger.logMesssage(logLevel, logTag, label + ":\n" +
-            TERMUX_SERVICE.EXTRA_STDOUT + ":\n```\n" + stdout + "\n```\n" +
-            TERMUX_SERVICE.EXTRA_STDERR + ":\n```\n" + stderr + "\n```\n" +
-            TERMUX_SERVICE.EXTRA_EXIT_CODE + ": `" + exitCode + "`\n" +
-            TERMUX_SERVICE.EXTRA_ERR + ": `" + errCode + "`\n" +
-            TERMUX_SERVICE.EXTRA_ERRMSG + ": `" + errmsg + "`");
+            TERMUX_SERVICE.EXTRA_PLUGIN_RESULT_BUNDLE_STDOUT + ":\n```\n" + stdout + "\n```\n" +
+            TERMUX_SERVICE.EXTRA_PLUGIN_RESULT_BUNDLE_STDERR + ":\n```\n" + stderr + "\n```\n" +
+            TERMUX_SERVICE.EXTRA_PLUGIN_RESULT_BUNDLE_EXIT_CODE + ": `" + exitCode + "`\n" +
+            TERMUX_SERVICE.EXTRA_PLUGIN_RESULT_BUNDLE_ERR + ": `" + errCode + "`\n" +
+            TERMUX_SERVICE.EXTRA_PLUGIN_RESULT_BUNDLE_ERRMSG + ": `" + errmsg + "`");
 
         // If pendingIntent is null, then just return
         if(pendingIntent == null) return;
 
         final Bundle resultBundle = new Bundle();
 
-        resultBundle.putString(TERMUX_SERVICE.EXTRA_STDOUT, stdout);
-        resultBundle.putString(TERMUX_SERVICE.EXTRA_STDERR, stderr);
-        if (exitCode != null && !exitCode.isEmpty()) resultBundle.putInt(TERMUX_SERVICE.EXTRA_EXIT_CODE, Integer.parseInt(exitCode));
-        if (errCode != null && !errCode.isEmpty()) resultBundle.putInt(TERMUX_SERVICE.EXTRA_ERR, Integer.parseInt(errCode));
-        resultBundle.putString(TERMUX_SERVICE.EXTRA_ERRMSG, errmsg);
+        resultBundle.putString(TERMUX_SERVICE.EXTRA_PLUGIN_RESULT_BUNDLE_STDOUT, stdout);
+        resultBundle.putString(TERMUX_SERVICE.EXTRA_PLUGIN_RESULT_BUNDLE_STDERR, stderr);
+        if (exitCode != null && !exitCode.isEmpty()) resultBundle.putInt(TERMUX_SERVICE.EXTRA_PLUGIN_RESULT_BUNDLE_EXIT_CODE, Integer.parseInt(exitCode));
+        if (errCode != null && !errCode.isEmpty()) resultBundle.putInt(TERMUX_SERVICE.EXTRA_PLUGIN_RESULT_BUNDLE_ERR, Integer.parseInt(errCode));
+        resultBundle.putString(TERMUX_SERVICE.EXTRA_PLUGIN_RESULT_BUNDLE_ERRMSG, errmsg);
 
         Intent resultIntent = new Intent();
-        resultIntent.putExtra(TERMUX_SERVICE.EXTRA_RESULT_BUNDLE, resultBundle);
+        resultIntent.putExtra(TERMUX_SERVICE.EXTRA_PLUGIN_RESULT_BUNDLE, resultBundle);
 
         if(context != null) {
             try {
@@ -121,60 +103,108 @@ public static String checkIfRunCommandServiceAllowExternalAppsPolicyIsViolated(f
     }
 
     /**
-     * Send execution result of commands to the {@link PendingIntent} creator received by
-     * execution service if {@code pendingIntent} is not {@code null}
+     * Proceses {@link ExecutionCommand} error.
+     * The {@link ExecutionCommand#errCode} must have been set to a non-zero value.
+     * The {@link ExecutionCommand#errmsg} and any {@link ExecutionCommand#throwableList} must also
+     * be set with appropriate error info.
+     * If the {@link TermuxPreferenceConstants.TERMUX_APP#KEY_PLUGIN_ERROR_NOTIFICATIONS_ENABLED} is
+     * enabled, then a flash and a notification will be shown for the error as well
+     * on the {@link #NOTIFICATION_CHANNEL_NAME_PLUGIN_COMMAND_ERRORS} channel.
      *
-     * @param logLevel The log level to dump the result.
+     * @param context The {@link Context} for operations.
      * @param logTag The log tag to use for logging.
-     * @param executable The executable received.
-     * @param arguments_list The arguments list for executable received.
-     * @param workingDirectory The working directory for the command received.
-     * @param inBackground The command should be run in background.
-     * @param additionalExtras The {@link HashMap} for additional extras received. The key will be
-     *                         used as the label to log the value. The object will be converted
-     *                        to {@link String} with a call to {@code value.toString()}.
+     * @param executionCommand The {@link ExecutionCommand} that failed.
      */
-    public static void dumpExecutionIntentToLog(int logLevel, String logTag, String label, String executable, List<String> arguments_list, String workingDirectory, boolean inBackground, HashMap<String, Object> additionalExtras) {
-        if (label == null) label = "Execution Intent";
+    public static void processPluginExecutionCommandError(final Context context, String logTag, final ExecutionCommand executionCommand) {
+        if(context == null || executionCommand == null) return;
 
-        StringBuilder executionIntentDump = new StringBuilder();
+        if(executionCommand.errCode == null || executionCommand.errCode == 0) {
+            Logger.logWarn(LOG_TAG, "Ignoring call to processPluginExecutionCommandError() since the execution command errCode has not been set to a non-zero value");
+            return;
+        }
 
-        executionIntentDump.append(label).append(":\n");
-        executionIntentDump.append("Executable: `").append(executable).append("`\n");
-        executionIntentDump.append("Arguments:").append(getArgumentsStringForLog(arguments_list)).append("\n");
-        executionIntentDump.append("Working Directory: `").append(workingDirectory).append("`\n");
-        executionIntentDump.append("inBackground: `").append(inBackground).append("`");
+        // Log the error and any exception
+        logTag = TextDataUtils.getDefaultIfNull(logTag, LOG_TAG);
+        Logger.logStackTracesWithMessage(logTag, executionCommand.errmsg, executionCommand.throwableList);
 
-        if(additionalExtras != null) {
-            for (Map.Entry<String, Object> entry : additionalExtras.entrySet()) {
-                executionIntentDump.append("\n").append(entry.getKey()).append(": `").append(entry.getValue()).append("`");
-            }
-        }
+        TermuxAppSharedPreferences preferences = new TermuxAppSharedPreferences(context);
+        // If user has disabled notifications for plugin, then just return
+        if (!preferences.getPluginErrorNotificationsEnabled())
+            return;
+
+        // Flash the errmsg
+        Logger.showToast(context, executionCommand.errmsg, true);
 
-        Logger.logMesssage(logLevel, logTag, executionIntentDump.toString());
+        // 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";
+
+        Intent notificationIntent = ReportActivity.newInstance(context, new ReportInfo(UserAction.PLUGIN_EXECUTION_COMMAND, logTag, title, ExecutionCommand.getDetailedMarkdownString(executionCommand), 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 notifiationText = MarkdownUtils.getSpannedMarkdownText(context, executionCommand.errmsg);
+        //CharSequence notifiationText = executionCommand.errmsg;
+
+        // Build the notification
+        Notification.Builder builder = getPluginCommandErrorsNotificationBuilder(context, title, notifiationText, notifiationText, 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());
     }
 
     /**
-     * Converts arguments list to log friendly format. If arguments are null or of size 0, then
-     * nothing is returned. Otherwise following format is returned:
+     * Get {@link Notification.Builder} for {@link #NOTIFICATION_CHANNEL_ID_PLUGIN_COMMAND_ERRORS}
+     * and {@link #NOTIFICATION_CHANNEL_NAME_PLUGIN_COMMAND_ERRORS}.
      *
-     * ```
-     * Arg 0: `value`
-     * Arg 1: 'value`
-     * ```
-     *
-     * @param arguments_list The arguments list.
-     * @return Returns the formatted arguments list.
+     * @param context The {@link Context} for operations.
+     * @param title The title for the notification.
+     * @param notifiationText The second line text of the notification.
+     * @param notificationBigText The full text of the notification that may optionally be styled.
+     * @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}.
      */
-    public static String getArgumentsStringForLog(List<String> arguments_list) {
-        if (arguments_list==null || arguments_list.size() == 0) return "";
+    @Nullable
+    public static Notification.Builder getPluginCommandErrorsNotificationBuilder(final Context context, final CharSequence title, final CharSequence notifiationText, final CharSequence notificationBigText, final PendingIntent pendingIntent, final int notificationMode) {
 
-        StringBuilder arguments_list_string = new StringBuilder("\n```\n");
-        for(int i = 0; i != arguments_list.size(); i++) {
-            arguments_list_string.append("Arg ").append(i).append(": `").append(arguments_list.get(i)).append("`\n");
-        }
-        arguments_list_string.append("```");
+        Notification.Builder builder =  NotificationUtils.geNotificationBuilder(context,
+            NOTIFICATION_CHANNEL_ID_PLUGIN_COMMAND_ERRORS, Notification.PRIORITY_HIGH,
+            title, notifiationText, notificationBigText, pendingIntent, notificationMode);
+
+        if(builder == null)  return null;
+
+        // Enable timestamp
+        builder.setShowWhen(true);
 
-        return arguments_list_string.toString();
+        // Set notification icon
+        builder.setSmallIcon(R.drawable.ic_error_notification);
+
+        // Set background color for small notification icon
+        builder.setColor(0xFF607D8B);
+
+        // Dismiss on click
+        builder.setAutoCancel(true);
+
+        return builder;
     }
+
+    /**
+     * Setup the notification channel for {@link #NOTIFICATION_CHANNEL_ID_PLUGIN_COMMAND_ERRORS} and
+     * {@link #NOTIFICATION_CHANNEL_NAME_PLUGIN_COMMAND_ERRORS}.
+     *
+     * @param context The {@link Context} for operations.
+     */
+    public static void setupPluginCommandErrorsNotificationChannel(final Context context) {
+        NotificationUtils.setupNotificationChannel(context, NOTIFICATION_CHANNEL_ID_PLUGIN_COMMAND_ERRORS,
+            NOTIFICATION_CHANNEL_NAME_PLUGIN_COMMAND_ERRORS, NotificationManager.IMPORTANCE_HIGH);
+    }
+
 }
diff --git a/app/src/main/java/com/termux/app/utils/TextDataUtils.java b/app/src/main/java/com/termux/app/utils/TextDataUtils.java
index aebacdaea5..fdde1b072c 100644
--- a/app/src/main/java/com/termux/app/utils/TextDataUtils.java
+++ b/app/src/main/java/com/termux/app/utils/TextDataUtils.java
@@ -97,6 +97,19 @@ public static float rangedOrDefault(float value, float def, float min, float max
 
 
 
+    /**
+     * Get the object itself if it is not {@code null}, otherwise default.
+     *
+     * @param object The {@link Object} to check.
+     * @param def The default {@link Object}.
+     * @return Returns {@code object} if it is not {@code null}, otherwise returns {@code def}.
+     */
+    public static <T> T getDefaultIfNull(@androidx.annotation.Nullable T object, @androidx.annotation.Nullable T def) {
+        return (object == null) ? def : object;
+    }
+
+
+
     public static LinkedHashSet<CharSequence> extractUrls(String text) {
 
         StringBuilder regex_sb = new StringBuilder();
diff --git a/app/src/main/res/drawable/ic_error_notification.xml b/app/src/main/res/drawable/ic_error_notification.xml
new file mode 100644
index 0000000000..67f1771256
--- /dev/null
+++ b/app/src/main/res/drawable/ic_error_notification.xml
@@ -0,0 +1,37 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <!--
+        Updated notification icon compliant with system icons guidelines
+        https://material.io/design/iconography/system-icons.html
+    -->
+
+    <group>
+        <clip-path
+            android:pathData="M0,0h24v24h-24z"/>
+
+        <path
+            android:pathData="M5,4H2L8,12L2,20H5L11,12L5,4Z"
+            android:fillColor="#ffffff"/>
+
+        <path
+            android:pathData="M19.59,14
+                              l-2.09,2.09
+                              L15.41,14
+                              L14,15.41
+                              l2.09,2.09
+                              L14,19.59
+                              L15.41,21
+                              l2.09,-2.08
+                              L19.59,21
+                              L21,19.59
+                              l-2.08,-2.09
+                              L21,15.41
+                              L19.59,14
+                              z"
+            android:fillColor="#ffffff"/>
+
+    </group>
+</vector>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 21947fa525..4226e32908 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -16,7 +16,8 @@
     <string name="application_name">&TERMUX_APP_NAME;</string>
     <string name="shared_user_label">&TERMUX_APP_NAME; user</string>
     <string name="run_command_permission_label">Run commands in &TERMUX_APP_NAME; environment</string>
-    <string name="run_command_permission_description">execute arbitrary commands within &TERMUX_APP_NAME; environment</string>
+    <string name="run_command_permission_description">execute arbitrary commands within &TERMUX_APP_NAME;
+        environment</string>
     <string name="new_session">New session</string>
     <string name="new_session_failsafe">Failsafe</string>
     <string name="toggle_soft_keyboard">Keyboard</string>
@@ -85,9 +86,10 @@
     <string name="validate_file_existence_and_permissions_failed_with_exception">Validating file existence and permissions fafiled: \"%1$s\"\nException: %2$s</string>
     <string name="validate_directory_existence_and_permissions_failed_with_exception">Validating directory existence and permissions fafiled: \"%1$s\"\nException: %2$s</string>
 
-    <string name="run_command_service_invalid_action">Invalid intent action to RunCommandService: \"%1$s\"</string>
-    <string name="run_command_service_invalid_command_path">Invalid coommand path to RunCommandService: \"%1$s\"</string>
-    <string name="run_command_service_allow_external_apps_ungranted_warning">RunCommandService require allow-external-apps property to be set to \"true\" in &TERMUX_PROPERTIES_PRIMARY_PATH_SHORT; file.</string>
+    <string name="run_command_service_invalid_action">Invalid intent action to RunCommandService: `%1$s`</string>
+    <string name="run_command_service_invalid_command_path">Invalid coommand path to RunCommandService: `%1$s`</string>
+    <string name="run_command_service_allow_external_apps_ungranted_warning">RunCommandService require `allow-external-apps` property to be set to `true` in `&TERMUX_PROPERTIES_PRIMARY_PATH_SHORT;` file.</string>
+    <string name="run_command_service_api_help">Visit https://github.com/termux/termux-app/blob/master/app/src/main/java/com/termux/app/RunCommandService.java for more info on RUN_COMMAND Intent usage.</string>
 
     <string name="share">Share</string>
     <string name="share_with">Share With</string>

From 1b5e5b56cbf19809df09b4e90170d2962b4ca0cc Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 24 Mar 2021 03:59:18 +0500
Subject: [PATCH 267/912] Partially integrate ExectionCommand into
 TermuxService and BackgroundJob

The TERMUX_SERVICE.ACTION_SERVICE_EXECUTE intent received will be managed by the ExectionCommand now.
The cwd and failsafe have been renamed to workingDirectory and isFailsafe.
---
 .../java/com/termux/app/BackgroundJob.java    | 50 ++++++----
 .../java/com/termux/app/TermuxActivity.java   |  4 +-
 .../java/com/termux/app/TermuxService.java    | 93 +++++++++++--------
 .../app/terminal/TermuxSessionClient.java     |  4 +-
 4 files changed, 87 insertions(+), 64 deletions(-)

diff --git a/app/src/main/java/com/termux/app/BackgroundJob.java b/app/src/main/java/com/termux/app/BackgroundJob.java
index 61e32317e8..171fedffa1 100644
--- a/app/src/main/java/com/termux/app/BackgroundJob.java
+++ b/app/src/main/java/com/termux/app/BackgroundJob.java
@@ -7,6 +7,8 @@
 
 import com.termux.BuildConfig;
 import com.termux.app.utils.Logger;
+import com.termux.models.ExecutionCommand;
+import com.termux.models.ExecutionCommand.ExecutionState;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -26,28 +28,33 @@
  */
 public final class BackgroundJob {
 
-    final Process mProcess;
+    Process mProcess;
 
     private static final String LOG_TAG = "BackgroundJob";
 
-    public BackgroundJob(String cwd, String fileToExecute, final String[] args, final TermuxService service){
-        this(cwd, fileToExecute, args, service, null);
+    public BackgroundJob(String executable, final String[] arguments, String workingDirectory, final TermuxService service){
+        this(new ExecutionCommand(TermuxService.getNextExecutionId(), executable, arguments, workingDirectory, false, false), service);
     }
 
-    public BackgroundJob(String cwd, String fileToExecute, final String[] args, final TermuxService service, PendingIntent pendingIntent) {
-        String[] env = buildEnvironment(false, cwd);
-        if (cwd == null || cwd.isEmpty()) cwd = TermuxConstants.TERMUX_HOME_DIR_PATH;
+    public BackgroundJob(ExecutionCommand executionCommand, final TermuxService service) {
+        String[] env = buildEnvironment(false, executionCommand.workingDirectory);
 
-        final String[] progArray = setupProcessArgs(fileToExecute, args);
-        final String processDescription = Arrays.toString(progArray);
+        if (executionCommand.workingDirectory == null || executionCommand.workingDirectory.isEmpty())
+            executionCommand.workingDirectory = TermuxConstants.TERMUX_HOME_DIR_PATH;
+
+        final String[] commandArray = setupProcessArgs(executionCommand.executable, executionCommand.arguments);
+        final String commandDescription = Arrays.toString(commandArray);
+
+        if(!executionCommand.setState(ExecutionState.EXECUTING))
+            return;
 
         Process process;
         try {
-            process = Runtime.getRuntime().exec(progArray, env, new File(cwd));
+            process = Runtime.getRuntime().exec(commandArray, env, new File(executionCommand.workingDirectory));
         } catch (IOException e) {
             mProcess = null;
             // TODO: Visible error message?
-            Logger.logStackTraceWithMessage(LOG_TAG, "Failed running background job: " + processDescription, e);
+            Logger.logStackTraceWithMessage(LOG_TAG, "Failed running background job: " + commandDescription, e);
             return;
         }
 
@@ -79,7 +86,7 @@ public void run() {
         new Thread() {
             @Override
             public void run() {
-                Logger.logDebug(LOG_TAG, "[" + pid + "] starting: " + processDescription);
+                Logger.logDebug(LOG_TAG, "[" + pid + "] starting: " + commandDescription);
                 InputStream stdout = mProcess.getInputStream();
                 BufferedReader reader = new BufferedReader(new InputStreamReader(stdout, StandardCharsets.UTF_8));
 
@@ -109,16 +116,21 @@ public void run() {
                     errThread.join();
                     result.putString("stderr", errResult.toString());
 
+                    if(!executionCommand.setState(ExecutionState.EXECUTED))
+                        return;
+
                     Intent data = new Intent();
                     data.putExtra("result", result);
 
-                    if(pendingIntent != null) {
+                    if(executionCommand.pluginPendingIntent != null) {
                         try {
-                            pendingIntent.send(service.getApplicationContext(), Activity.RESULT_OK, data);
+                            executionCommand.pluginPendingIntent.send(service.getApplicationContext(), Activity.RESULT_OK, data);
                         } catch (PendingIntent.CanceledException e) {
                             // The caller doesn't want the result? That's fine, just ignore
                         }
                     }
+
+                    executionCommand.setState(ExecutionState.SUCCESS);
                 } catch (InterruptedException e) {
                     // Ignore
                 }
@@ -133,10 +145,10 @@ private static void addToEnvIfPresent(List<String> environment, String name) {
         }
     }
 
-    static String[] buildEnvironment(boolean failSafe, String cwd) {
+    static String[] buildEnvironment(boolean isFailSafe, String workingDirectory) {
         TermuxConstants.TERMUX_HOME_DIR.mkdirs();
 
-        if (cwd == null || cwd.isEmpty()) cwd = TermuxConstants.TERMUX_HOME_DIR_PATH;
+        if (workingDirectory == null || workingDirectory.isEmpty()) workingDirectory = TermuxConstants.TERMUX_HOME_DIR_PATH;
 
         List<String> environment = new ArrayList<>();
 
@@ -159,13 +171,13 @@ static String[] buildEnvironment(boolean failSafe, String cwd) {
         addToEnvIfPresent(environment, "ANDROID_RUNTIME_ROOT");
         addToEnvIfPresent(environment, "ANDROID_TZDATA_ROOT");
 
-        if (failSafe) {
+        if (isFailSafe) {
             // Keep the default path so that system binaries can be used in the failsafe session.
             environment.add("PATH= " + System.getenv("PATH"));
         } else {
             environment.add("LANG=en_US.UTF-8");
             environment.add("PATH=" + TermuxConstants.TERMUX_BIN_PREFIX_DIR_PATH);
-            environment.add("PWD=" + cwd);
+            environment.add("PWD=" + workingDirectory);
             environment.add("TMPDIR=" + TermuxConstants.TERMUX_TMP_PREFIX_DIR_PATH);
         }
 
@@ -186,7 +198,7 @@ public static int getPid(Process p) {
         }
     }
 
-    static String[] setupProcessArgs(String fileToExecute, String[] args) {
+    static String[] setupProcessArgs(String fileToExecute, String[] arguments) {
         // The file to execute may either be:
         // - An elf file, in which we execute it directly.
         // - A script file without shebang, which we execute with our standard shell $PREFIX/bin/sh instead of the
@@ -236,7 +248,7 @@ static String[] setupProcessArgs(String fileToExecute, String[] args) {
         List<String> result = new ArrayList<>();
         if (interpreter != null) result.add(interpreter);
         result.add(fileToExecute);
-        if (args != null) Collections.addAll(result, args);
+        if (arguments != null) Collections.addAll(result, arguments);
         return result.toArray(new String[0]);
     }
 
diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index da66bddd86..b86db958fd 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -263,8 +263,8 @@ public void onServiceConnected(ComponentName componentName, IBinder service) {
             Intent i = getIntent();
             if (i != null && Intent.ACTION_RUN.equals(i.getAction())) {
                 // Android 7.1 app shortcut from res/xml/shortcuts.xml.
-                boolean failSafe = i.getBooleanExtra(TERMUX_ACTIVITY.ACTION_FAILSAFE_SESSION, false);
-                mTermuxSessionClient.addNewSession(failSafe, null);
+                boolean isFailSafe = i.getBooleanExtra(TERMUX_ACTIVITY.ACTION_FAILSAFE_SESSION, false);
+                mTermuxSessionClient.addNewSession(isFailSafe, null);
             } else {
                 mTermuxSessionClient.setCurrentSession(mTermuxSessionClient.getCurrentStoredSessionOrLast());
             }
diff --git a/app/src/main/java/com/termux/app/TermuxService.java b/app/src/main/java/com/termux/app/TermuxService.java
index 8c8f8f3a9e..ba1e56dcfe 100644
--- a/app/src/main/java/com/termux/app/TermuxService.java
+++ b/app/src/main/java/com/termux/app/TermuxService.java
@@ -18,7 +18,6 @@
 import android.os.IBinder;
 import android.os.PowerManager;
 import android.provider.Settings;
-import android.util.Log;
 import android.widget.ArrayAdapter;
 
 import com.termux.R;
@@ -28,16 +27,15 @@
 import com.termux.app.terminal.TermuxSessionClient;
 import com.termux.app.terminal.TermuxSessionClientBase;
 import com.termux.app.utils.Logger;
-import com.termux.app.utils.PluginUtils;
 import com.termux.app.utils.TextDataUtils;
+import com.termux.models.ExecutionCommand;
+import com.termux.models.ExecutionCommand.ExecutionState;
 import com.termux.terminal.TerminalEmulator;
 import com.termux.terminal.TerminalSession;
 import com.termux.terminal.TerminalSessionClient;
 
 import java.io.File;
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -55,7 +53,9 @@
 public final class TermuxService extends Service {
 
     private static final String NOTIFICATION_CHANNEL_ID = "termux_notification_channel";
-    private static final int NOTIFICATION_ID = 1337;
+    public static final int NOTIFICATION_ID = 1337;
+
+    private static int EXECUTION_ID = 1000;
 
     /** This service is only bound from inside the same process and never uses IPC. */
     class LocalBinder extends Binder {
@@ -275,36 +275,45 @@ private void actionReleaseWakeLock(boolean updateNotification) {
 
     /** Process action to execute a shell command in a foreground session or in background. */
     private void actionServiceExecute(Intent intent) {
-        Uri executableUri = intent.getData();
-        String executablePath = (executableUri == null ? null : executableUri.getPath());
+        if (intent == null){
+            Logger.logError(LOG_TAG, "Ignoring null intent to actionServiceExecute");
+            return;
+        }
 
-        String[] arguments = (executableUri == null ? null : intent.getStringArrayExtra(TERMUX_SERVICE.EXTRA_ARGUMENTS));
-        String cwd = intent.getStringExtra(TERMUX_SERVICE.EXTRA_WORKDIR);
+        ExecutionCommand executionCommand = new ExecutionCommand(getNextExecutionId());
 
-        PendingIntent pendingIntent = intent.getParcelableExtra(TERMUX_SERVICE.EXTRA_PENDING_INTENT);
+        executionCommand.executableUri = intent.getData();
 
-        int sessionAction = TextDataUtils.getIntStoredAsStringFromBundle(intent.getExtras(),
-            TERMUX_SERVICE.EXTRA_SESSION_ACTION, TERMUX_SERVICE.VALUE_EXTRA_SESSION_ACTION_SWITCH_TO_NEW_SESSION_AND_OPEN_ACTIVITY);
+        if(executionCommand.executableUri != null) {
+            executionCommand.executable = executionCommand.executableUri.getPath();
+            executionCommand.arguments = intent.getStringArrayExtra(TERMUX_SERVICE.EXTRA_ARGUMENTS);
+        }
 
-        if (intent.getBooleanExtra(TERMUX_SERVICE.EXTRA_BACKGROUND, false)) {
-            executeBackgroundCommand(executablePath, arguments, cwd, pendingIntent);
+        executionCommand.workingDirectory = intent.getStringExtra(TERMUX_SERVICE.EXTRA_WORKDIR);
+        executionCommand.inBackground = intent.getBooleanExtra(TERMUX_SERVICE.EXTRA_BACKGROUND, false);
+        executionCommand.isFailsafe = intent.getBooleanExtra(TERMUX_ACTIVITY.ACTION_FAILSAFE_SESSION, false);
+        executionCommand.sessionAction = intent.getStringExtra(TERMUX_SERVICE.EXTRA_SESSION_ACTION);
+        executionCommand.commandLabel = TextDataUtils.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.pluginPendingIntent = intent.getParcelableExtra(TERMUX_SERVICE.EXTRA_PENDING_INTENT);
+
+        if (executionCommand.inBackground) {
+            executeBackgroundCommand(executionCommand);
         } else {
-            executeForegroundCommand(intent, executablePath, arguments, cwd, sessionAction);
+            executeForegroundCommand(executionCommand);
         }
     }
 
     /** Execute a shell command in background with {@link BackgroundJob}. */
-    private void executeBackgroundCommand(String executablePath, String[] arguments, String cwd, PendingIntent pendingIntent) {
+    private void executeBackgroundCommand(ExecutionCommand executionCommand) {
         Logger.logDebug(LOG_TAG, "Starting background command");
 
-        final String pendingIntentCreator;
-        if(pendingIntent != null) pendingIntentCreator = pendingIntent.getCreatorPackage(); else pendingIntentCreator = null;
+        Logger.logDebug(LOG_TAG, executionCommand.toString());
 
-        PluginUtils.dumpExecutionIntentToLog(Log.DEBUG, LOG_TAG, null, executablePath, Arrays.asList(arguments), cwd, true, new HashMap<String, Object>() {{
-            put("pendingIntentCreator", pendingIntentCreator);
-        }});
-
-        BackgroundJob task = new BackgroundJob(cwd, executablePath, arguments, this, pendingIntent);
+        BackgroundJob task = new BackgroundJob(executionCommand, this);
 
         mBackgroundTasks.add(task);
         updateNotification();
@@ -319,22 +328,20 @@ public void onBackgroundJobExited(final BackgroundJob task) {
     }
 
     /** Execute a shell command in a foreground terminal session. */
-    private void executeForegroundCommand(Intent intent, String executablePath, String[] arguments, String cwd, int sessionAction) {
+    private void executeForegroundCommand(ExecutionCommand executionCommand) {
         Logger.logDebug(LOG_TAG, "Starting foreground command");
 
-        boolean failsafe = intent.getBooleanExtra(TERMUX_ACTIVITY.ACTION_FAILSAFE_SESSION, false);
+        if(!executionCommand.setState(ExecutionState.EXECUTING))
+            return;
 
-        PluginUtils.dumpExecutionIntentToLog(Log.DEBUG, LOG_TAG, null, executablePath, Arrays.asList(arguments), cwd, false, new HashMap<String, Object>() {{
-            put("sessionAction", sessionAction);
-            put("failsafe", failsafe);
-        }});
+        Logger.logDebug(LOG_TAG, executionCommand.toString());
 
-        TerminalSession newSession = createTerminalSession(executablePath, arguments, cwd, failsafe);
+        TerminalSession newSession = createTerminalSession(executionCommand.executable, executionCommand.arguments, executionCommand.workingDirectory, executionCommand.isFailsafe);
 
         // Transform executable path to session name, e.g. "/bin/do-something.sh" => "do something.sh".
-        if (executablePath != null) {
-            int lastSlash = executablePath.lastIndexOf('/');
-            String name = (lastSlash == -1) ? executablePath : executablePath.substring(lastSlash + 1);
+        if (executionCommand.executable != null) {
+            int lastSlash = executionCommand.executable.lastIndexOf('/');
+            String name = (lastSlash == -1) ? executionCommand.executable : executionCommand.executable.substring(lastSlash + 1);
             name = name.replace('-', ' ');
             newSession.mSessionName = name;
         }
@@ -344,7 +351,7 @@ private void executeForegroundCommand(Intent intent, String executablePath, Stri
         if(mTermuxSessionClient != null)
             mTermuxSessionClient.terminalSessionListNotifyUpdated();
 
-        handleSessionAction(sessionAction, newSession);
+        handleSessionAction(TextDataUtils.getIntFromString(executionCommand.sessionAction, TERMUX_SERVICE.VALUE_EXTRA_SESSION_ACTION_SWITCH_TO_NEW_SESSION_AND_OPEN_ACTIVITY), newSession);
     }
 
     private void setCurrentStoredSession(TerminalSession newSession) {
@@ -390,16 +397,16 @@ private void startTermuxActivity() {
     }
 
     /** Create a terminal session. */
-    public TerminalSession createTerminalSession(String executablePath, String[] arguments, String cwd, boolean failSafe) {
+    public TerminalSession createTerminalSession(String executablePath, String[] arguments, String workingDirectory, boolean isFailSafe) {
         TermuxConstants.TERMUX_HOME_DIR.mkdirs();
 
-        if (cwd == null || cwd.isEmpty()) cwd = TermuxConstants.TERMUX_HOME_DIR_PATH;
+        if (workingDirectory == null || workingDirectory.isEmpty()) workingDirectory = TermuxConstants.TERMUX_HOME_DIR_PATH;
 
-        String[] env = BackgroundJob.buildEnvironment(failSafe, cwd);
+        String[] env = BackgroundJob.buildEnvironment(isFailSafe, workingDirectory);
         boolean isLoginShell = false;
 
         if (executablePath == null) {
-            if (!failSafe) {
+            if (!isFailSafe) {
                 for (String shellBinary : new String[]{"login", "bash", "zsh"}) {
                     File shellFile = new File(TermuxConstants.TERMUX_BIN_PREFIX_DIR_PATH, shellBinary);
                     if (shellFile.canExecute()) {
@@ -426,7 +433,7 @@ public TerminalSession createTerminalSession(String executablePath, String[] arg
         args[0] = processName;
         if (processArgs.length > 1) System.arraycopy(processArgs, 1, args, 1, processArgs.length - 1);
 
-        TerminalSession session = new TerminalSession(executablePath, cwd, args, env, getTermuxSessionClient());
+        TerminalSession session = new TerminalSession(executablePath, workingDirectory, args, env, getTermuxSessionClient());
         mTerminalSessions.add(session);
         updateNotification();
 
@@ -569,8 +576,8 @@ private void setupNotificationChannel() {
 
         NotificationChannel channel = new NotificationChannel(NOTIFICATION_CHANNEL_ID, channelName,importance);
         channel.setDescription(channelDescription);
-        NotificationManager manager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
-        manager.createNotificationChannel(channel);
+        NotificationManager notificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+        notificationManager.createNotificationChannel(channel);
     }
 
     /** Update the shown foreground service notification after making any changes that affect it. */
@@ -593,4 +600,8 @@ public List<TerminalSession> getSessions() {
         return mTerminalSessions;
     }
 
+    synchronized public static int getNextExecutionId() {
+        return EXECUTION_ID++;
+    }
+
 }
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxSessionClient.java b/app/src/main/java/com/termux/app/terminal/TermuxSessionClient.java
index 467b778bc8..4229cc9140 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxSessionClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxSessionClient.java
@@ -182,7 +182,7 @@ public void renameSession(final TerminalSession sessionToRename) {
         }, -1, null, -1, null, null);
     }
 
-    public void addNewSession(boolean failSafe, String sessionName) {
+    public void addNewSession(boolean isFailSafe, String sessionName) {
         if (mActivity.getTermuxService().getSessions().size() >= MAX_SESSIONS) {
             new AlertDialog.Builder(mActivity).setTitle(R.string.max_terminals_reached_title).setMessage(R.string.max_terminals_reached_message)
                 .setPositiveButton(android.R.string.ok, null).show();
@@ -196,7 +196,7 @@ public void addNewSession(boolean failSafe, String sessionName) {
                 workingDirectory = currentSession.getCwd();
             }
 
-            TerminalSession newSession = mActivity.getTermuxService().createTerminalSession(null, null, workingDirectory, failSafe);
+            TerminalSession newSession = mActivity.getTermuxService().createTerminalSession(null, null, workingDirectory, isFailSafe);
             if (sessionName != null) {
                 newSession.mSessionName = sessionName;
             }

From 92b804dc9cd7186228f59b7dceaba5fc93240c2f Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 24 Mar 2021 04:55:10 +0500
Subject: [PATCH 268/912] Add logging for termux bootstrap package installation
 and setup of storage symlinks

---
 .../java/com/termux/app/TermuxInstaller.java  | 47 +++++++++++++------
 .../java/com/termux/app/TermuxService.java    |  2 +-
 app/src/main/res/values/strings.xml           |  6 +--
 3 files changed, 37 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxInstaller.java b/app/src/main/java/com/termux/app/TermuxInstaller.java
index 6b218a4f4a..389aaa60e5 100644
--- a/app/src/main/java/com/termux/app/TermuxInstaller.java
+++ b/app/src/main/java/com/termux/app/TermuxInstaller.java
@@ -28,11 +28,11 @@
  * Install the Termux bootstrap packages if necessary by following the below steps:
  * <p/>
  * (1) If $PREFIX already exist, assume that it is correct and be done. Note that this relies on that we do not create a
- * broken $PREFIX folder below.
+ * broken $PREFIX directory below.
  * <p/>
  * (2) A progress dialog is shown with "Installing..." message and a spinner.
  * <p/>
- * (3) A staging folder, $STAGING_PREFIX, is {@link #deleteFolder(File)} if left over from broken installation below.
+ * (3) A staging directory, $STAGING_PREFIX, is {@link #deleteDirectory(File)} if left over from broken installation below.
  * <p/>
  * (4) The zip file is loaded from a shared library.
  * <p/>
@@ -49,16 +49,21 @@ final class TermuxInstaller {
 
     /** Performs setup if necessary. */
     static void setupIfNeeded(final Activity activity, final Runnable whenDone) {
+        Logger.logInfo(LOG_TAG, "Installing " + TermuxConstants.TERMUX_APP_NAME + " bootstrap packages.");
+
         // Termux can only be run as the primary user (device owner) since only that
         // account has the expected file system paths. Verify that:
         UserManager um = (UserManager) activity.getSystemService(Context.USER_SERVICE);
         boolean isPrimaryUser = um.getSerialNumberForUser(android.os.Process.myUserHandle()) == 0;
         if (!isPrimaryUser) {
-            new AlertDialog.Builder(activity).setTitle(R.string.bootstrap_error_title).setMessage(R.string.bootstrap_error_not_primary_user_message)
+            String bootstrapErrorMessage = activity.getString(R.string.bootstrap_error_not_primary_user_message, TermuxConstants.TERMUX_PREFIX_DIR_PATH);
+            Logger.logError(LOG_TAG, 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;
         }
 
+        Logger.logInfo(LOG_TAG, "Creating prefix directory \"" + TermuxConstants.TERMUX_PREFIX_DIR_PATH + "\".");
         final File PREFIX_FILE = TermuxConstants.TERMUX_PREFIX_DIR;
         if (PREFIX_FILE.isDirectory()) {
             whenDone.run();
@@ -74,9 +79,12 @@ public void run() {
                     final File STAGING_PREFIX_FILE = new File(STAGING_PREFIX_PATH);
 
                     if (STAGING_PREFIX_FILE.exists()) {
-                        deleteFolder(STAGING_PREFIX_FILE);
+                        Logger.logInfo(LOG_TAG, "Deleting prefix staging directory \"" + TermuxConstants.TERMUX_STAGING_PREFIX_DIR_PATH + "\".");
+                        deleteDirectory(STAGING_PREFIX_FILE);
                     }
 
+                    Logger.logInfo(LOG_TAG, "Extracting bootstrap zip to prefix staging directory \"" + TermuxConstants.TERMUX_STAGING_PREFIX_DIR_PATH + "\".");
+
                     final byte[] buffer = new byte[8096];
                     final List<Pair<String, String>> symlinks = new ArrayList<>(50);
 
@@ -125,10 +133,13 @@ public void run() {
                         Os.symlink(symlink.first, symlink.second);
                     }
 
+                    Logger.logInfo(LOG_TAG, "Moving prefix staging to prefix directory.");
+
                     if (!STAGING_PREFIX_FILE.renameTo(PREFIX_FILE)) {
-                        throw new RuntimeException("Unable to rename staging folder");
+                        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) {
                     Logger.logStackTraceWithMessage(LOG_TAG, "Bootstrap error", e);
@@ -139,9 +150,9 @@ public void run() {
                                     dialog.dismiss();
                                     activity.finish();
                                 }).setPositiveButton(R.string.bootstrap_error_try_again, (dialog, which) -> {
-                                    dialog.dismiss();
-                                    TermuxInstaller.setupIfNeeded(activity, whenDone);
-                                }).show();
+                                dialog.dismiss();
+                                TermuxInstaller.setupIfNeeded(activity, whenDone);
+                            }).show();
                         } catch (WindowManager.BadTokenException e1) {
                             // Activity already dismissed - ignore.
                         }
@@ -173,14 +184,14 @@ public static byte[] loadZipBytes() {
 
     public static native byte[] getZip();
 
-    /** Delete a folder and all its content or throw. Don't follow symlinks. */
-    static void deleteFolder(File fileOrDirectory) throws IOException {
+    /** Delete a directory and all its content or throw. Don't follow symlinks. */
+    static void deleteDirectory(File fileOrDirectory) throws IOException {
         if (fileOrDirectory.getCanonicalPath().equals(fileOrDirectory.getAbsolutePath()) && fileOrDirectory.isDirectory()) {
             File[] children = fileOrDirectory.listFiles();
 
             if (children != null) {
                 for (File child : children) {
-                    deleteFolder(child);
+                    deleteDirectory(child);
                 }
             }
         }
@@ -192,6 +203,9 @@ static void deleteFolder(File fileOrDirectory) throws IOException {
 
     static void setupStorageSymlinks(final Context context) {
         final String LOG_TAG = "termux-storage";
+
+        Logger.logInfo(LOG_TAG, "Setting up storage symlinks.");
+
         new Thread() {
             public void run() {
                 try {
@@ -199,18 +213,20 @@ public void run() {
 
                     if (storageDir.exists()) {
                         try {
-                            deleteFolder(storageDir);
+                            deleteDirectory(storageDir);
                         } catch (IOException e) {
-                            Logger.logError(LOG_TAG, "Could not delete old $HOME/storage, " + e.getMessage());
+                            Logger.logStackTraceWithMessage(LOG_TAG, "Failed to delete old ~/storage directory", e);
                             return;
                         }
                     }
 
                     if (!storageDir.mkdirs()) {
-                        Logger.logError(LOG_TAG, "Unable to mkdirs() for $HOME/storage");
+                        Logger.logError(LOG_TAG, "Unable to create ~/storage directory.");
                         return;
                     }
 
+                    Logger.logInfo(LOG_TAG, "Setting up storage symlinks at ~/storage/shared, ~/storage/downloads, ~/storage/dcim, ~/storage/pictures, ~/storage/music and ~/storage/movies for directories in \"" + Environment.getExternalStorageDirectory().getAbsolutePath() + "\".");
+
                     File sharedDir = Environment.getExternalStorageDirectory();
                     Os.symlink(sharedDir.getAbsolutePath(), new File(storageDir, "shared").getAbsolutePath());
 
@@ -235,9 +251,12 @@ public void run() {
                             File dir = dirs[i];
                             if (dir == null) continue;
                             String symlinkName = "external-" + i;
+                            Logger.logInfo(LOG_TAG, "Setting up storage symlinks at ~/storage/" + symlinkName + " for \"" + dir.getAbsolutePath() + "\".");
                             Os.symlink(dir.getAbsolutePath(), new File(storageDir, symlinkName).getAbsolutePath());
                         }
                     }
+
+                    Logger.logInfo(LOG_TAG, "Storage symlinks created successfully.");
                 } catch (Exception e) {
                     Logger.logStackTraceWithMessage(LOG_TAG, "Error setting up link", e);
                 }
diff --git a/app/src/main/java/com/termux/app/TermuxService.java b/app/src/main/java/com/termux/app/TermuxService.java
index ba1e56dcfe..01feb00596 100644
--- a/app/src/main/java/com/termux/app/TermuxService.java
+++ b/app/src/main/java/com/termux/app/TermuxService.java
@@ -151,7 +151,7 @@ public void onDestroy() {
 
         if (termuxTmpDir.exists()) {
             try {
-                TermuxInstaller.deleteFolder(termuxTmpDir.getCanonicalFile());
+                TermuxInstaller.deleteDirectory(termuxTmpDir.getCanonicalFile());
             } catch (Exception e) {
                 Logger.logStackTraceWithMessage(LOG_TAG, "Error while removing file at " + termuxTmpDir.getAbsolutePath(), e);
             }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4226e32908..73793195e7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -28,12 +28,12 @@
     <string name="toggle_keep_screen_on">Keep screen on</string>
     <string name="autofill_password">Autofill password</string>
 
-    <string name="bootstrap_installer_body">Installing…</string>
-    <string name="bootstrap_error_title">Unable to install</string>
+    <string name="bootstrap_installer_body">Installing bootstrap packages…</string>
+    <string name="bootstrap_error_title">Unable to install bootstrap</string>
     <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 installed on the primary user account.</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="max_terminals_reached_title">Max terminals reached</string>
     <string name="max_terminals_reached_message">Close down existing ones before creating new.</string>

From 1bdf9bf2e3967315268c947fd98d48ebb7c1bf38 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 24 Mar 2021 04:57:35 +0500
Subject: [PATCH 269/912] Change log level to warn from error when
 termux.properties file is missing

---
 .../com/termux/app/settings/properties/SharedProperties.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/termux/app/settings/properties/SharedProperties.java b/app/src/main/java/com/termux/app/settings/properties/SharedProperties.java
index 87f32eaea7..d2dfc417ff 100644
--- a/app/src/main/java/com/termux/app/settings/properties/SharedProperties.java
+++ b/app/src/main/java/com/termux/app/settings/properties/SharedProperties.java
@@ -230,7 +230,7 @@ public static Properties getPropertiesFromFile(Context context, File propertiesF
         Properties properties = new Properties();
 
         if (propertiesFile == null) {
-            Logger.logError(LOG_TAG, "Not loading properties since file is null");
+            Logger.logWarn(LOG_TAG, "Not loading properties since file is null");
             return properties;
         }
 

From b856e16998a136bedc03a766728160f55914dfea Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 24 Mar 2021 05:13:00 +0500
Subject: [PATCH 270/912] Move activities and fragments to respective packages

Move com.termux.TermuxSettingsActivity to com.termux.app.activities.SettingsActivity
Move com.termux.TermuxHepActivity to com.termux.app.activities.HelpActivity
Move com.termux.settings.DebuggingPreferencesFragment to com.termux.app.fragments.settings.DebuggingPreferencesFragment
---
 app/src/main/AndroidManifest.xml                            | 4 ++--
 app/src/main/java/com/termux/app/TermuxActivity.java        | 6 ++++--
 .../HelpActivity.java}                                      | 4 ++--
 .../SettingsActivity.java}                                  | 4 ++--
 .../settings/DebuggingPreferencesFragment.java              | 3 +--
 app/src/main/res/xml/root_preferences.xml                   | 2 +-
 6 files changed, 12 insertions(+), 11 deletions(-)
 rename app/src/main/java/com/termux/app/{TermuxHelpActivity.java => activities/HelpActivity.java} (96%)
 rename app/src/main/java/com/termux/app/{TermuxSettingsActivity.java => activities/SettingsActivity.java} (92%)
 rename app/src/main/java/com/termux/app/{ => fragments}/settings/DebuggingPreferencesFragment.java (97%)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 17d2c1b209..e986f0c4e2 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -89,7 +89,7 @@
         </activity-alias>
 
         <activity
-            android:name=".app.TermuxHelpActivity"
+            android:name=".app.activities.HelpActivity"
             android:exported="false"
             android:label="@string/application_name"
             android:parentActivityName=".app.TermuxActivity"
@@ -97,7 +97,7 @@
             android:theme="@android:style/Theme.Material.Light.DarkActionBar" />
 
         <activity
-            android:name=".app.TermuxSettingsActivity"
+            android:name=".app.activities.SettingsActivity"
             android:label="@string/title_activity_termux_settings"
             android:theme="@style/Theme.AppCompat.Light.DarkActionBar" />
 
diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index b86db958fd..e5e1ed902b 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -32,6 +32,8 @@
 
 import com.termux.R;
 import com.termux.app.TermuxConstants.TERMUX_APP.TERMUX_ACTIVITY;
+import com.termux.app.activities.HelpActivity;
+import com.termux.app.activities.SettingsActivity;
 import com.termux.app.settings.preferences.TermuxAppSharedPreferences;
 import com.termux.app.terminal.TermuxSessionsListViewController;
 import com.termux.app.terminal.io.TerminalToolbarViewPager;
@@ -529,10 +531,10 @@ public boolean onContextItemSelected(MenuItem item) {
                 showStylingDialog();
                 return true;
             case CONTEXT_MENU_HELP_ID:
-                startActivity(new Intent(this, TermuxHelpActivity.class));
+                startActivity(new Intent(this, HelpActivity.class));
                 return true;
             case CONTEXT_MENU_SETTINGS_ID:
-                startActivity(new Intent(this, TermuxSettingsActivity.class));
+                startActivity(new Intent(this, SettingsActivity.class));
                 return true;
             case CONTEXT_MENU_TOGGLE_KEEP_SCREEN_ON:
                 toggleKeepScreenOn();
diff --git a/app/src/main/java/com/termux/app/TermuxHelpActivity.java b/app/src/main/java/com/termux/app/activities/HelpActivity.java
similarity index 96%
rename from app/src/main/java/com/termux/app/TermuxHelpActivity.java
rename to app/src/main/java/com/termux/app/activities/HelpActivity.java
index 0aa8a97ac0..fa32bfc4e2 100644
--- a/app/src/main/java/com/termux/app/TermuxHelpActivity.java
+++ b/app/src/main/java/com/termux/app/activities/HelpActivity.java
@@ -1,4 +1,4 @@
-package com.termux.app;
+package com.termux.app.activities;
 
 import android.app.Activity;
 import android.content.ActivityNotFoundException;
@@ -13,7 +13,7 @@
 import android.widget.RelativeLayout;
 
 /** Basic embedded browser for viewing help pages. */
-public final class TermuxHelpActivity extends Activity {
+public final class HelpActivity extends Activity {
 
     WebView mWebView;
 
diff --git a/app/src/main/java/com/termux/app/TermuxSettingsActivity.java b/app/src/main/java/com/termux/app/activities/SettingsActivity.java
similarity index 92%
rename from app/src/main/java/com/termux/app/TermuxSettingsActivity.java
rename to app/src/main/java/com/termux/app/activities/SettingsActivity.java
index 74604c96c0..7111a7b98a 100644
--- a/app/src/main/java/com/termux/app/TermuxSettingsActivity.java
+++ b/app/src/main/java/com/termux/app/activities/SettingsActivity.java
@@ -1,4 +1,4 @@
-package com.termux.app;
+package com.termux.app.activities;
 
 import android.os.Bundle;
 
@@ -8,7 +8,7 @@
 
 import com.termux.R;
 
-public class TermuxSettingsActivity extends AppCompatActivity {
+public class SettingsActivity extends AppCompatActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
diff --git a/app/src/main/java/com/termux/app/settings/DebuggingPreferencesFragment.java b/app/src/main/java/com/termux/app/fragments/settings/DebuggingPreferencesFragment.java
similarity index 97%
rename from app/src/main/java/com/termux/app/settings/DebuggingPreferencesFragment.java
rename to app/src/main/java/com/termux/app/fragments/settings/DebuggingPreferencesFragment.java
index 9944cf6113..d7a3aa600c 100644
--- a/app/src/main/java/com/termux/app/settings/DebuggingPreferencesFragment.java
+++ b/app/src/main/java/com/termux/app/fragments/settings/DebuggingPreferencesFragment.java
@@ -1,4 +1,4 @@
-package com.termux.app.settings;
+package com.termux.app.fragments.settings;
 
 import android.content.Context;
 import android.os.Bundle;
@@ -11,7 +11,6 @@
 import androidx.preference.PreferenceManager;
 
 import com.termux.R;
-import com.termux.app.settings.preferences.TermuxPreferenceConstants;
 import com.termux.app.settings.preferences.TermuxAppSharedPreferences;
 import com.termux.app.utils.Logger;
 
diff --git a/app/src/main/res/xml/root_preferences.xml b/app/src/main/res/xml/root_preferences.xml
index 3ea2b58322..39c731ebf8 100644
--- a/app/src/main/res/xml/root_preferences.xml
+++ b/app/src/main/res/xml/root_preferences.xml
@@ -3,6 +3,6 @@
     <Preference
         app:title="@string/debugging_preferences"
         app:summary="Preferences for debugging"
-        app:fragment="com.termux.app.settings.DebuggingPreferencesFragment"/>
+        app:fragment="com.termux.app.fragments.settings.DebuggingPreferencesFragment"/>
 
 </PreferenceScreen>

From 4eced52c5fa76ec39a123e0f41f1eec9de608252 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 24 Mar 2021 05:28:38 +0500
Subject: [PATCH 271/912] Fix xml files naming convention

---
 app/src/main/java/com/termux/app/TermuxActivity.java        | 2 +-
 .../java/com/termux/app/activities/SettingsActivity.java    | 2 +-
 .../app/terminal/TermuxSessionsListViewController.java      | 6 +++---
 .../termux/app/terminal/io/TerminalToolbarViewPager.java    | 4 ++--
 ...ound_black.xml => session_background_black_selected.xml} | 0
 ...ssion_background.xml => session_background_selected.xml} | 0
 app/src/main/res/layout/activity_report.xml                 | 2 +-
 .../layout/{settings_activity.xml => activity_settings.xml} | 0
 .../res/layout/{termux_activity.xml => activity_termux.xml} | 0
 ...ssions_list_item.xml => item_terminal_sessions_list.xml} | 2 +-
 .../res/layout/{toolbar_layout.xml => partial_toolbar.xml}  | 0
 ...a_keys_view.xml => view_terminal_toolbar_extra_keys.xml} | 0
 ..._input_view.xml => view_terminal_toolbar_text_input.xml} | 0
 13 files changed, 9 insertions(+), 9 deletions(-)
 rename app/src/main/res/drawable/{selected_session_background_black.xml => session_background_black_selected.xml} (100%)
 rename app/src/main/res/drawable/{selected_session_background.xml => session_background_selected.xml} (100%)
 rename app/src/main/res/layout/{settings_activity.xml => activity_settings.xml} (100%)
 rename app/src/main/res/layout/{termux_activity.xml => activity_termux.xml} (100%)
 rename app/src/main/res/layout/{terminal_sessions_list_item.xml => item_terminal_sessions_list.xml} (84%)
 rename app/src/main/res/layout/{toolbar_layout.xml => partial_toolbar.xml} (100%)
 rename app/src/main/res/layout/{terminal_toolbar_extra_keys_view.xml => view_terminal_toolbar_extra_keys.xml} (100%)
 rename app/src/main/res/layout/{terminal_toolbar_text_input_view.xml => view_terminal_toolbar_text_input.xml} (100%)

diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index e5e1ed902b..b87ba14515 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -163,7 +163,7 @@ public void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
 
-        setContentView(R.layout.termux_activity);
+        setContentView(R.layout.activity_termux);
 
         View content = findViewById(android.R.id.content);
         content.setOnApplyWindowInsetsListener((v, insets) -> {
diff --git a/app/src/main/java/com/termux/app/activities/SettingsActivity.java b/app/src/main/java/com/termux/app/activities/SettingsActivity.java
index 7111a7b98a..b30b1a5799 100644
--- a/app/src/main/java/com/termux/app/activities/SettingsActivity.java
+++ b/app/src/main/java/com/termux/app/activities/SettingsActivity.java
@@ -13,7 +13,7 @@ public class SettingsActivity extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.settings_activity);
+        setContentView(R.layout.activity_settings);
         if (savedInstanceState == null) {
             getSupportFragmentManager()
                 .beginTransaction()
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxSessionsListViewController.java b/app/src/main/java/com/termux/app/terminal/TermuxSessionsListViewController.java
index 1216193a59..9951b07132 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxSessionsListViewController.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxSessionsListViewController.java
@@ -32,7 +32,7 @@ public class TermuxSessionsListViewController extends ArrayAdapter<TerminalSessi
     final StyleSpan italicSpan = new StyleSpan(Typeface.ITALIC);
 
     public TermuxSessionsListViewController(TermuxActivity activity, List<TerminalSession> sessionList) {
-        super(activity.getApplicationContext(), R.layout.terminal_sessions_list_item, sessionList);
+        super(activity.getApplicationContext(), R.layout.item_terminal_sessions_list, sessionList);
         this.mActivity = activity;
     }
 
@@ -43,7 +43,7 @@ public View getView(int position, View convertView, @NonNull ViewGroup parent) {
         View sessionRowView = convertView;
         if (sessionRowView == null) {
             LayoutInflater inflater = mActivity.getLayoutInflater();
-            sessionRowView = inflater.inflate(R.layout.terminal_sessions_list_item, parent, false);
+            sessionRowView = inflater.inflate(R.layout.item_terminal_sessions_list, parent, false);
         }
 
         TextView sessionTitleView = sessionRowView.findViewById(R.id.session_title);
@@ -58,7 +58,7 @@ public View getView(int position, View convertView, @NonNull ViewGroup parent) {
 
         if (isUsingBlackUI) {
             sessionTitleView.setBackground(
-                ContextCompat.getDrawable(mActivity, R.drawable.selected_session_background_black)
+                ContextCompat.getDrawable(mActivity, R.drawable.session_background_black_selected)
             );
         }
 
diff --git a/app/src/main/java/com/termux/app/terminal/io/TerminalToolbarViewPager.java b/app/src/main/java/com/termux/app/terminal/io/TerminalToolbarViewPager.java
index e53fbbcd07..1e23220d5f 100644
--- a/app/src/main/java/com/termux/app/terminal/io/TerminalToolbarViewPager.java
+++ b/app/src/main/java/com/termux/app/terminal/io/TerminalToolbarViewPager.java
@@ -42,7 +42,7 @@ public Object instantiateItem(@NonNull ViewGroup collection, int position) {
             LayoutInflater inflater = LayoutInflater.from(mActivity);
             View layout;
             if (position == 0) {
-                layout = inflater.inflate(R.layout.terminal_toolbar_extra_keys_view, collection, false);
+                layout = inflater.inflate(R.layout.view_terminal_toolbar_extra_keys, collection, false);
                 ExtraKeysView extraKeysView = (ExtraKeysView) layout;
                 mActivity.setExtraKeysView(extraKeysView);
                 extraKeysView.reload(mActivity.getProperties().getExtraKeysInfo());
@@ -53,7 +53,7 @@ public Object instantiateItem(@NonNull ViewGroup collection, int position) {
                 }
 
             } else {
-                layout = inflater.inflate(R.layout.terminal_toolbar_text_input_view, collection, false);
+                layout = inflater.inflate(R.layout.view_terminal_toolbar_text_input, collection, false);
                 final EditText editText = layout.findViewById(R.id.terminal_toolbar_text_input);
 
                 if(mSavedTextInput != null) {
diff --git a/app/src/main/res/drawable/selected_session_background_black.xml b/app/src/main/res/drawable/session_background_black_selected.xml
similarity index 100%
rename from app/src/main/res/drawable/selected_session_background_black.xml
rename to app/src/main/res/drawable/session_background_black_selected.xml
diff --git a/app/src/main/res/drawable/selected_session_background.xml b/app/src/main/res/drawable/session_background_selected.xml
similarity index 100%
rename from app/src/main/res/drawable/selected_session_background.xml
rename to app/src/main/res/drawable/session_background_selected.xml
diff --git a/app/src/main/res/layout/activity_report.xml b/app/src/main/res/layout/activity_report.xml
index b442a324d8..43fff0351d 100644
--- a/app/src/main/res/layout/activity_report.xml
+++ b/app/src/main/res/layout/activity_report.xml
@@ -5,7 +5,7 @@
     android:orientation="vertical">
 
     <include
-        layout="@layout/toolbar_layout"
+        layout="@layout/partial_toolbar"
         android:id="@+id/toolbar_layout"/>
 
     <androidx.recyclerview.widget.RecyclerView
diff --git a/app/src/main/res/layout/settings_activity.xml b/app/src/main/res/layout/activity_settings.xml
similarity index 100%
rename from app/src/main/res/layout/settings_activity.xml
rename to app/src/main/res/layout/activity_settings.xml
diff --git a/app/src/main/res/layout/termux_activity.xml b/app/src/main/res/layout/activity_termux.xml
similarity index 100%
rename from app/src/main/res/layout/termux_activity.xml
rename to app/src/main/res/layout/activity_termux.xml
diff --git a/app/src/main/res/layout/terminal_sessions_list_item.xml b/app/src/main/res/layout/item_terminal_sessions_list.xml
similarity index 84%
rename from app/src/main/res/layout/terminal_sessions_list_item.xml
rename to app/src/main/res/layout/item_terminal_sessions_list.xml
index 61842a3708..cbeb5b4531 100644
--- a/app/src/main/res/layout/terminal_sessions_list_item.xml
+++ b/app/src/main/res/layout/item_terminal_sessions_list.xml
@@ -2,7 +2,7 @@
     android:id="@+id/session_title"
     android:layout_width="fill_parent"
     android:layout_height="?android:attr/listPreferredItemHeight"
-    android:background="@drawable/selected_session_background"
+    android:background="@drawable/session_background_selected"
     android:ellipsize="marquee"
     android:gravity="start|center_vertical"
     android:padding="6dip"
diff --git a/app/src/main/res/layout/toolbar_layout.xml b/app/src/main/res/layout/partial_toolbar.xml
similarity index 100%
rename from app/src/main/res/layout/toolbar_layout.xml
rename to app/src/main/res/layout/partial_toolbar.xml
diff --git a/app/src/main/res/layout/terminal_toolbar_extra_keys_view.xml b/app/src/main/res/layout/view_terminal_toolbar_extra_keys.xml
similarity index 100%
rename from app/src/main/res/layout/terminal_toolbar_extra_keys_view.xml
rename to app/src/main/res/layout/view_terminal_toolbar_extra_keys.xml
diff --git a/app/src/main/res/layout/terminal_toolbar_text_input_view.xml b/app/src/main/res/layout/view_terminal_toolbar_text_input.xml
similarity index 100%
rename from app/src/main/res/layout/terminal_toolbar_text_input_view.xml
rename to app/src/main/res/layout/view_terminal_toolbar_text_input.xml

From eeb85545354076ce1308bfa3c018b2df4cca0adf Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 24 Mar 2021 06:15:45 +0500
Subject: [PATCH 272/912] Fix string resources naming convention

---
 app/src/main/AndroidManifest.xml              |   4 +-
 .../com/termux/app/RunCommandService.java     |   8 +-
 .../java/com/termux/app/TermuxActivity.java   |  30 ++--
 .../termux/app/activities/ReportActivity.java |   2 +-
 .../app/terminal/TermuxSessionClient.java     |   4 +-
 .../termux/app/terminal/TermuxViewClient.java |  10 +-
 .../java/com/termux/app/utils/FileUtils.java  |  28 +--
 .../com/termux/app/utils/PluginUtils.java     |   2 +-
 .../java/com/termux/app/utils/ShareUtils.java |   2 +-
 .../filepicker/TermuxDocumentsProvider.java   |   4 +-
 .../TermuxFileReceiverActivity.java           |   4 +-
 app/src/main/res/layout/activity_termux.xml   |   4 +-
 app/src/main/res/menu/menu_report.xml         |   4 +-
 app/src/main/res/values/strings.xml           | 159 +++++++++++-------
 app/src/main/res/xml/shortcuts.xml            |   4 +-
 15 files changed, 152 insertions(+), 117 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e986f0c4e2..888d269458 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -15,9 +15,9 @@
 
     <permission
         android:name="${TERMUX_PACKAGE_NAME}.permission.RUN_COMMAND"
-        android:description="@string/run_command_permission_description"
+        android:description="@string/permission_run_command_description"
         android:icon="@mipmap/ic_launcher"
-        android:label="@string/run_command_permission_label"
+        android:label="@string/permission_run_command_label"
         android:protectionLevel="dangerous" />
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
diff --git a/app/src/main/java/com/termux/app/RunCommandService.java b/app/src/main/java/com/termux/app/RunCommandService.java
index f8abb0a986..d91ed52cec 100644
--- a/app/src/main/java/com/termux/app/RunCommandService.java
+++ b/app/src/main/java/com/termux/app/RunCommandService.java
@@ -186,13 +186,13 @@ public int onStartCommand(Intent intent, int flags, int startId) {
         runStartForeground();
 
         ExecutionCommand executionCommand = new ExecutionCommand();
-        executionCommand.pluginAPIHelp = this.getString(R.string.run_command_service_api_help);
+        executionCommand.pluginAPIHelp = this.getString(R.string.error_run_command_service_api_help);
 
         String errmsg;
 
         // If invalid action passed, then just return
         if (!RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND.equals(intent.getAction())) {
-            errmsg = this.getString(R.string.run_command_service_invalid_action, intent.getAction());
+            errmsg = this.getString(R.string.error_run_command_service_invalid_intent_action, intent.getAction());
             executionCommand.setStateFailed(1, errmsg, null);
             PluginUtils.processPluginExecutionCommandError(this, LOG_TAG, executionCommand);
             return Service.START_NOT_STICKY;
@@ -227,7 +227,7 @@ public int onStartCommand(Intent intent, int flags, int startId) {
             null, PluginUtils.PLUGIN_EXECUTABLE_FILE_PERMISSIONS,
             false, false);
         if (errmsg != null) {
-            errmsg  += "\n" + this.getString(R.string.executable_absolute_path, executionCommand.executable);
+            errmsg  += "\n" + this.getString(R.string.msg_executable_absolute_path, executionCommand.executable);
             executionCommand.setStateFailed(1, errmsg, null);
             PluginUtils.processPluginExecutionCommandError(this, LOG_TAG, executionCommand);
             return Service.START_NOT_STICKY;
@@ -248,7 +248,7 @@ public int onStartCommand(Intent intent, int flags, int startId) {
                 true, true, false,
                 true);
             if (errmsg != null) {
-                errmsg  += "\n" + this.getString(R.string.working_directory_absolute_path, executionCommand.workingDirectory);
+                errmsg  += "\n" + this.getString(R.string.msg_working_directory_absolute_path, executionCommand.workingDirectory);
                 executionCommand.setStateFailed(1, errmsg, null);
                 PluginUtils.processPluginExecutionCommandError(this, LOG_TAG, executionCommand);
                 return Service.START_NOT_STICKY;
diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index b87ba14515..dd6f5058b6 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -395,8 +395,8 @@ private void setNewSessionButtonView() {
         View newSessionButton = findViewById(R.id.new_session_button);
         newSessionButton.setOnClickListener(v -> mTermuxSessionClient.addNewSession(false, null));
         newSessionButton.setOnLongClickListener(v -> {
-            DialogUtils.textInput(TermuxActivity.this, R.string.session_new_named_title, null, R.string.session_new_named_positive_button,
-                text -> mTermuxSessionClient.addNewSession(false, text), R.string.new_session_failsafe, text -> mTermuxSessionClient.addNewSession(true, text)
+            DialogUtils.textInput(TermuxActivity.this, R.string.title_create_named_session, null, R.string.action_create_named_session_confirm,
+                text -> mTermuxSessionClient.addNewSession(false, text), R.string.action_new_session_failsafe, text -> mTermuxSessionClient.addNewSession(true, text)
                 , -1, null, null);
             return true;
         });
@@ -489,15 +489,15 @@ public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuIn
             }
         }
 
-        menu.add(Menu.NONE, CONTEXT_MENU_SELECT_URL_ID, Menu.NONE, R.string.select_url);
-        menu.add(Menu.NONE, CONTEXT_MENU_SHARE_TRANSCRIPT_ID, Menu.NONE, R.string.select_all_and_share);
-        if (addAutoFillMenu) menu.add(Menu.NONE, CONTEXT_MENU_AUTOFILL_ID, Menu.NONE, R.string.autofill_password);
-        menu.add(Menu.NONE, CONTEXT_MENU_RESET_TERMINAL_ID, Menu.NONE, R.string.reset_terminal);
-        menu.add(Menu.NONE, CONTEXT_MENU_KILL_PROCESS_ID, Menu.NONE, getResources().getString(R.string.kill_process, getCurrentSession().getPid())).setEnabled(currentSession.isRunning());
-        menu.add(Menu.NONE, CONTEXT_MENU_STYLING_ID, Menu.NONE, R.string.style_terminal);
-        menu.add(Menu.NONE, CONTEXT_MENU_TOGGLE_KEEP_SCREEN_ON, Menu.NONE, R.string.toggle_keep_screen_on).setCheckable(true).setChecked(mPreferences.getKeepScreenOn());
-        menu.add(Menu.NONE, CONTEXT_MENU_HELP_ID, Menu.NONE, R.string.help);
-        menu.add(Menu.NONE, CONTEXT_MENU_SETTINGS_ID, Menu.NONE, R.string.settings);
+        menu.add(Menu.NONE, CONTEXT_MENU_SELECT_URL_ID, Menu.NONE, R.string.action_select_url);
+        menu.add(Menu.NONE, CONTEXT_MENU_SHARE_TRANSCRIPT_ID, Menu.NONE, R.string.action_share_transcript);
+        if (addAutoFillMenu) menu.add(Menu.NONE, CONTEXT_MENU_AUTOFILL_ID, Menu.NONE, R.string.action_autofill_password);
+        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.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);
     }
 
     /** Hook system menu to show context menu instead. */
@@ -552,7 +552,7 @@ private void showKillSessionDialog(TerminalSession session) {
 
         final AlertDialog.Builder b = new AlertDialog.Builder(this);
         b.setIcon(android.R.drawable.ic_dialog_alert);
-        b.setMessage(R.string.confirm_kill_process);
+        b.setMessage(R.string.title_confirm_kill_process);
         b.setPositiveButton(android.R.string.yes, (dialog, id) -> {
             dialog.dismiss();
             session.finishIfRunning();
@@ -564,7 +564,7 @@ private void showKillSessionDialog(TerminalSession session) {
     private void resetSession(TerminalSession session) {
         if (session != null) {
             session.reset();
-            showToast(getResources().getString(R.string.reset_toast_notification), true);
+            showToast(getResources().getString(R.string.msg_terminal_reset), true);
         }
     }
 
@@ -576,8 +576,8 @@ private void showStylingDialog() {
         } catch (ActivityNotFoundException | IllegalArgumentException e) {
             // The startActivity() call is not documented to throw IllegalArgumentException.
             // However, crash reporting shows that it sometimes does, so catch it here.
-            new AlertDialog.Builder(this).setMessage(getString(R.string.styling_not_installed))
-                .setPositiveButton(R.string.styling_install, (dialog, which) -> startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://f-droid.org/en/packages/" + TermuxConstants.TERMUX_STYLING_PACKAGE_NAME + " /")))).setNegativeButton(android.R.string.cancel, null).show();
+            new AlertDialog.Builder(this).setMessage(getString(R.string.error_styling_not_installed))
+                .setPositiveButton(R.string.action_styling_install, (dialog, which) -> startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://f-droid.org/en/packages/" + TermuxConstants.TERMUX_STYLING_PACKAGE_NAME + " /")))).setNegativeButton(android.R.string.cancel, null).show();
         }
     }
     private void toggleKeepScreenOn() {
diff --git a/app/src/main/java/com/termux/app/activities/ReportActivity.java b/app/src/main/java/com/termux/app/activities/ReportActivity.java
index 5b033b56dc..cf4ccdd346 100644
--- a/app/src/main/java/com/termux/app/activities/ReportActivity.java
+++ b/app/src/main/java/com/termux/app/activities/ReportActivity.java
@@ -129,7 +129,7 @@ public boolean onOptionsItemSelected(final MenuItem item) {
         int id = item.getItemId();
         if (id == R.id.menu_item_share_report) {
             if (mReportInfo != null)
-                ShareUtils.shareText(this, getString(R.string.report_text), mReportInfo.reportString);
+                ShareUtils.shareText(this, getString(R.string.title_report_text), mReportInfo.reportString);
         } else if (id == R.id.menu_item_copy_report) {
             if (mReportInfo != null)
                 ShareUtils.copyTextToClipboard(this, mReportInfo.reportString, null);
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxSessionClient.java b/app/src/main/java/com/termux/app/terminal/TermuxSessionClient.java
index 4229cc9140..c3e4df7fd3 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxSessionClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxSessionClient.java
@@ -176,7 +176,7 @@ public void switchToSession(boolean forward) {
     public void renameSession(final TerminalSession sessionToRename) {
         if (sessionToRename == null) return;
 
-        DialogUtils.textInput(mActivity, R.string.session_rename_title, sessionToRename.mSessionName, R.string.session_rename_positive_button, text -> {
+        DialogUtils.textInput(mActivity, R.string.title_rename_session, sessionToRename.mSessionName, R.string.action_rename_session_confirm, text -> {
             sessionToRename.mSessionName = text;
             terminalSessionListNotifyUpdated();
         }, -1, null, -1, null, null);
@@ -184,7 +184,7 @@ public void renameSession(final TerminalSession sessionToRename) {
 
     public void addNewSession(boolean isFailSafe, String sessionName) {
         if (mActivity.getTermuxService().getSessions().size() >= MAX_SESSIONS) {
-            new AlertDialog.Builder(mActivity).setTitle(R.string.max_terminals_reached_title).setMessage(R.string.max_terminals_reached_message)
+            new AlertDialog.Builder(mActivity).setTitle(R.string.title_max_terminals_reached).setMessage(R.string.msg_max_terminals_reached)
                 .setPositiveButton(android.R.string.ok, null).show();
         } else {
             TerminalSession currentSession = mActivity.getCurrentSession();
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxViewClient.java b/app/src/main/java/com/termux/app/terminal/TermuxViewClient.java
index 6f3e29cb43..98d5d14675 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxViewClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxViewClient.java
@@ -346,8 +346,8 @@ public void shareSessionTranscript() {
             intent.setType("text/plain");
             transcriptText = TextDataUtils.getTruncatedCommandOutput(transcriptText, 100_000);
             intent.putExtra(Intent.EXTRA_TEXT, transcriptText);
-            intent.putExtra(Intent.EXTRA_SUBJECT, mActivity.getString(R.string.share_transcript_title));
-            mActivity.startActivity(Intent.createChooser(intent, mActivity.getString(R.string.share_transcript_chooser_title)));
+            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("Failed to get share session transcript of length " + transcriptText.length(), e);
         }
@@ -361,7 +361,7 @@ public void showUrlSelection() {
 
         LinkedHashSet<CharSequence> urlSet = TextDataUtils.extractUrls(text);
         if (urlSet.isEmpty()) {
-            new AlertDialog.Builder(mActivity).setMessage(R.string.select_url_no_found).show();
+            new AlertDialog.Builder(mActivity).setMessage(R.string.title_select_url_none_found).show();
             return;
         }
 
@@ -373,8 +373,8 @@ public void showUrlSelection() {
             String url = (String) urls[which];
             ClipboardManager clipboard = (ClipboardManager) mActivity.getSystemService(Context.CLIPBOARD_SERVICE);
             clipboard.setPrimaryClip(new ClipData(null, new String[]{"text/plain"}, new ClipData.Item(url)));
-            Toast.makeText(mActivity, R.string.select_url_copied_to_clipboard, Toast.LENGTH_LONG).show();
-        }).setTitle(R.string.select_url_dialog_title).create();
+            Toast.makeText(mActivity, R.string.msg_select_url_copied_to_clipboard, Toast.LENGTH_LONG).show();
+        }).setTitle(R.string.title_select_url_dialog).create();
 
         // Long press to open URL:
         dialog.setOnShowListener(di -> {
diff --git a/app/src/main/java/com/termux/app/utils/FileUtils.java b/app/src/main/java/com/termux/app/utils/FileUtils.java
index f50ea91c59..194e37f920 100644
--- a/app/src/main/java/com/termux/app/utils/FileUtils.java
+++ b/app/src/main/java/com/termux/app/utils/FileUtils.java
@@ -156,14 +156,14 @@ public static boolean isPathInDirPath(String path, String dirPath, boolean ensur
      * failed, otherwise {@code null}.
      */
     public static String validateRegularFileExistenceAndPermissions(final Context context, final String path, final String parentDirPath, String permissionsToCheck, final boolean setMissingPermissions, final boolean ignoreErrorsIfPathIsUnderParentDirPath) {
-        if (path == null || path.isEmpty()) return context.getString(R.string.null_or_empty_file);
+        if (path == null || path.isEmpty()) return context.getString(R.string.error_null_or_empty_file);
 
         try {
             File file = new File(path);
 
             // If file exits but not a regular file
             if (file.exists() && !file.isFile()) {
-                return context.getString(R.string.non_regular_file_found);
+                return context.getString(R.string.error_non_regular_file_found);
             }
 
             boolean isPathUnderParentDirPath = false;
@@ -183,7 +183,7 @@ public static String validateRegularFileExistenceAndPermissions(final Context co
             // If path is not a regular file
             // Regular files cannot be automatically created so we do not ignore if missing
             if (!file.isFile()) {
-                return context.getString(R.string.no_regular_file_found);
+                return context.getString(R.string.error_no_regular_file_found);
             }
 
             // If there is not parentDirPath restriction or path is not under parentDirPath or
@@ -197,7 +197,7 @@ public static String validateRegularFileExistenceAndPermissions(final Context co
         }
         // Some function calls may throw SecurityException, etc
         catch (Exception e) {
-            return context.getString(R.string.validate_file_existence_and_permissions_failed_with_exception, path, e.getMessage());
+            return context.getString(R.string.error_validate_file_existence_and_permissions_failed_with_exception, path, e.getMessage());
         }
 
         return null;
@@ -230,14 +230,14 @@ public static String validateRegularFileExistenceAndPermissions(final Context co
      * failed, otherwise {@code null}.
      */
     public static String validateDirectoryExistenceAndPermissions(final Context context, final String path, final String parentDirPath, String permissionsToCheck, final boolean createDirectoryIfMissing, final boolean setMissingPermissions, final boolean ignoreErrorsIfPathIsInParentDirPath, final boolean ignoreIfNotExecutable) {
-        if (path == null || path.isEmpty()) return context.getString(R.string.null_or_empty_directory);
+        if (path == null || path.isEmpty()) return context.getString(R.string.error_null_or_empty_directory);
 
         try {
             File file = new File(path);
 
             // If file exits but not a directory file
             if (file.exists() && !file.isDirectory()) {
-                return context.getString(R.string.non_directory_file_found);
+                return context.getString(R.string.error_non_directory_file_found);
             }
 
             boolean isPathInParentDirPath = false;
@@ -254,7 +254,7 @@ public static String validateDirectoryExistenceAndPermissions(final Context cont
                         Logger.logVerbose(LOG_TAG, "Creating missing directory at path: \"" + path + "\"");
                         // If failed to create directory
                         if (!file.mkdirs()) {
-                            return context.getString(R.string.creating_missing_directory_failed, path);
+                            return context.getString(R.string.error_creating_missing_directory_failed, path);
                         }
                     }
 
@@ -271,7 +271,7 @@ public static String validateDirectoryExistenceAndPermissions(final Context cont
                 // If path is not a directory
                 // Directories can be automatically created so we can ignore if missing with above check
                 if (!file.isDirectory()) {
-                    return context.getString(R.string.no_directory_found);
+                    return context.getString(R.string.error_no_directory_found);
                 }
 
                 if (permissionsToCheck != null) {
@@ -282,7 +282,7 @@ public static String validateDirectoryExistenceAndPermissions(final Context cont
         }
         // Some function calls may throw SecurityException, etc
         catch (Exception e) {
-            return context.getString(R.string.validate_directory_existence_and_permissions_failed_with_exception, path, e.getMessage());
+            return context.getString(R.string.error_validate_directory_existence_and_permissions_failed_with_exception, path, e.getMessage());
         }
 
         return null;
@@ -332,11 +332,11 @@ public static void setMissingFilePermissions(String path, String permissionsToSe
      * @return Returns the {@code errmsg} if validating permissions failed, otherwise {@code null}.
      */
     public static String checkMissingFilePermissions(Context context, String path, String permissionsToCheck, String fileType, boolean ignoreIfNotExecutable) {
-        if (path == null || path.isEmpty()) return context.getString(R.string.null_or_empty_path);
+        if (path == null || path.isEmpty()) return context.getString(R.string.error_null_or_empty_path);
 
         if (!isValidPermissingString(permissionsToCheck)) {
             Logger.logError(LOG_TAG, "Invalid permissionsToCheck passed to checkMissingFilePermissions: \"" + permissionsToCheck + "\"");
-            return context.getString(R.string.invalid_file_permissions_string_to_check);
+            return context.getString(R.string.error_invalid_file_permissions_string_to_check);
         }
 
         if (fileType == null || fileType.isEmpty()) fileType = "File";
@@ -345,17 +345,17 @@ public static String checkMissingFilePermissions(Context context, String path, S
 
         // If file is not readable
         if (permissionsToCheck.contains("r") && !file.canRead()) {
-            return context.getString(R.string.file_not_readable, fileType);
+            return context.getString(R.string.error_file_not_readable, fileType);
         }
 
         // If file is not writable
         if (permissionsToCheck.contains("w") && !file.canWrite()) {
-            return context.getString(R.string.file_not_writable, fileType);
+            return context.getString(R.string.error_file_not_writable, fileType);
         }
         // If file is not executable
         // This canExecute() will give "avc: granted { execute }" warnings for target sdk 29
         else if (permissionsToCheck.contains("x") && !file.canExecute() && !ignoreIfNotExecutable) {
-            return context.getString(R.string.file_not_executable, fileType);
+            return context.getString(R.string.error_file_not_executable, fileType);
         }
 
         return null;
diff --git a/app/src/main/java/com/termux/app/utils/PluginUtils.java b/app/src/main/java/com/termux/app/utils/PluginUtils.java
index 0fd2a7e9c1..387c156046 100644
--- a/app/src/main/java/com/termux/app/utils/PluginUtils.java
+++ b/app/src/main/java/com/termux/app/utils/PluginUtils.java
@@ -96,7 +96,7 @@ public static void sendExecuteResultToResultsService(final Context context, fina
     public static String checkIfRunCommandServiceAllowExternalAppsPolicyIsViolated(final Context context) {
         String errmsg = null;
         if (!SharedProperties.isPropertyValueTrue(context, TermuxPropertyConstants.getTermuxPropertiesFile(), TermuxConstants.PROP_ALLOW_EXTERNAL_APPS)) {
-            errmsg = context.getString(R.string.run_command_service_allow_external_apps_ungranted_warning);
+            errmsg = context.getString(R.string.error_run_command_service_allow_external_apps_ungranted);
         }
 
         return errmsg;
diff --git a/app/src/main/java/com/termux/app/utils/ShareUtils.java b/app/src/main/java/com/termux/app/utils/ShareUtils.java
index 4f8b628e22..07b961cd0f 100644
--- a/app/src/main/java/com/termux/app/utils/ShareUtils.java
+++ b/app/src/main/java/com/termux/app/utils/ShareUtils.java
@@ -43,7 +43,7 @@ public static void shareText(final Context context, final String subject, final
         shareTextIntent.putExtra(Intent.EXTRA_SUBJECT, subject);
         shareTextIntent.putExtra(Intent.EXTRA_TEXT, text);
 
-        openSystemAppChooser(context, shareTextIntent, context.getString(R.string.share_with));
+        openSystemAppChooser(context, shareTextIntent, context.getString(R.string.title_share_with));
     }
 
     /**
diff --git a/app/src/main/java/com/termux/filepicker/TermuxDocumentsProvider.java b/app/src/main/java/com/termux/filepicker/TermuxDocumentsProvider.java
index 3bb1433423..0a4de74f69 100644
--- a/app/src/main/java/com/termux/filepicker/TermuxDocumentsProvider.java
+++ b/app/src/main/java/com/termux/filepicker/TermuxDocumentsProvider.java
@@ -22,7 +22,7 @@
 
 /**
  * A document provider for the Storage Access Framework which exposes the files in the
- * $HOME/ folder to other apps.
+ * $HOME/ directory to other apps.
  * <p/>
  * Note that this replaces providing an activity matching the ACTION_GET_CONTENT intent:
  * <p/>
@@ -167,7 +167,7 @@ public Cursor querySearchDocuments(String rootId, String query, String[] project
         final int MAX_SEARCH_RESULTS = 50;
         while (!pending.isEmpty() && result.getCount() < MAX_SEARCH_RESULTS) {
             final File file = pending.removeFirst();
-            // Avoid folders outside the $HOME folders linked in to symlinks (to avoid e.g. search
+            // Avoid directories outside the $HOME directory linked with symlinks (to avoid e.g. search
             // through the whole SD card).
             boolean isInsideHome;
             try {
diff --git a/app/src/main/java/com/termux/filepicker/TermuxFileReceiverActivity.java b/app/src/main/java/com/termux/filepicker/TermuxFileReceiverActivity.java
index 94194f27a4..8a279fcae1 100644
--- a/app/src/main/java/com/termux/filepicker/TermuxFileReceiverActivity.java
+++ b/app/src/main/java/com/termux/filepicker/TermuxFileReceiverActivity.java
@@ -118,7 +118,7 @@ void handleContentUri(final Uri uri, String subjectFromIntent) {
     }
 
     void promptNameAndSave(final InputStream in, final String attachmentFileName) {
-        DialogUtils.textInput(this, R.string.file_received_title, attachmentFileName, R.string.file_received_edit_button, 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;
 
@@ -141,7 +141,7 @@ void promptNameAndSave(final InputStream in, final String attachmentFileName) {
             startService(executeIntent);
             finish();
         },
-            R.string.file_received_open_folder_button, text -> {
+            R.string.action_file_received_open_directory, text -> {
                 if (saveStreamWithName(in, text) == null) return;
 
                 Intent executeIntent = new Intent(TERMUX_SERVICE.ACTION_SERVICE_EXECUTE);
diff --git a/app/src/main/res/layout/activity_termux.xml b/app/src/main/res/layout/activity_termux.xml
index 2faa7d3120..604d17b4b4 100644
--- a/app/src/main/res/layout/activity_termux.xml
+++ b/app/src/main/res/layout/activity_termux.xml
@@ -56,7 +56,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:text="@string/toggle_soft_keyboard" />
+                    android:text="@string/action_toggle_soft_keyboard" />
 
                 <Button
                     android:id="@+id/new_session_button"
@@ -64,7 +64,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:text="@string/new_session" />
+                    android:text="@string/acton_new_session" />
             </LinearLayout>
         </LinearLayout>
 
diff --git a/app/src/main/res/menu/menu_report.xml b/app/src/main/res/menu/menu_report.xml
index 513508a5b8..cb851713eb 100644
--- a/app/src/main/res/menu/menu_report.xml
+++ b/app/src/main/res/menu/menu_report.xml
@@ -5,11 +5,11 @@
     <item
         android:id="@+id/menu_item_share_report"
         android:icon="@drawable/ic_share"
-        android:title="@string/share"
+        android:title="@string/action_share"
         app:showAsAction="never" />
     <item
         android:id="@+id/menu_item_copy_report"
         android:icon="@drawable/ic_copy"
-        android:title="@string/copy"
+        android:title="@string/action_copy"
         app:showAsAction="never" />
 </menu>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 73793195e7..c2cad6bd74 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -15,19 +15,17 @@
 <resources>
     <string name="application_name">&TERMUX_APP_NAME;</string>
     <string name="shared_user_label">&TERMUX_APP_NAME; user</string>
-    <string name="run_command_permission_label">Run commands in &TERMUX_APP_NAME; environment</string>
-    <string name="run_command_permission_description">execute arbitrary commands within &TERMUX_APP_NAME;
+
+
+
+    <!-- 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</string>
-    <string name="new_session">New session</string>
-    <string name="new_session_failsafe">Failsafe</string>
-    <string name="toggle_soft_keyboard">Keyboard</string>
-    <string name="reset_terminal">Reset</string>
-    <string name="style_terminal">Style</string>
-    <string name="share_transcript_title">Terminal transcript</string>
-    <string name="help">Help</string>
-    <string name="toggle_keep_screen_on">Keep screen on</string>
-    <string name="autofill_password">Autofill password</string>
 
+
+
+    <!-- Termux Bootstrap Packages Installation -->
     <string name="bootstrap_installer_body">Installing bootstrap packages…</string>
     <string name="bootstrap_error_title">Unable to install bootstrap</string>
     <string name="bootstrap_error_body">&TERMUX_APP_NAME; was unable to install the bootstrap packages.</string>
@@ -35,71 +33,108 @@
     <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="max_terminals_reached_title">Max terminals reached</string>
-    <string name="max_terminals_reached_message">Close down existing ones before creating new.</string>
 
-    <string name="reset_toast_notification">Terminal reset.</string>
 
-    <string name="select_url">Select URL</string>
-    <string name="select_url_dialog_title">Click URL to copy or long press to open</string>
-    <string name="select_all_and_share">Share transcript</string>
-    <string name="select_url_no_found">No URL found in the terminal.</string>
-    <string name="select_url_copied_to_clipboard">URL copied to clipboard</string>
-    <string name="share_transcript_chooser_title">Send text to:</string>
+    <!-- Terminal Sidebar and Shortcuts -->
+    <string name="acton_new_session">New session</string>
+    <string name="action_new_session_failsafe">Failsafe</string>
+    <string name="title_max_terminals_reached">Max terminals reached</string>
+    <string name="msg_max_terminals_reached">Close down existing ones before creating new.</string>
+
+    <string name="title_rename_session">Set session name</string>
+    <string name="action_rename_session_confirm">Set</string>
+    <string name="title_create_named_session">New named session</string>
+    <string name="action_create_named_session_confirm">Create</string>
+
+    <string name="action_toggle_soft_keyboard">Keyboard</string>
+
+
+
+    <!-- Terminal Popup -->
+    <string name="action_select_url">Select URL</string>
+    <string name="title_select_url_dialog">Click URL to copy or long press to open</string>
+    <string name="title_select_url_none_found">No URL found in the terminal.</string>
+    <string name="msg_select_url_copied_to_clipboard">URL copied to clipboard</string>
+
+    <string name="action_share_transcript">Share transcript</string>
+    <string name="title_share_transcript">Terminal transcript</string>
+    <string name="title_share_transcript_with">Send transcript to:</string>
+
+    <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="action_kill_process">Kill process (%d)</string>
+    <string name="title_confirm_kill_process">Really kill this session?</string>
+
+    <string name="action_style_terminal">Style</string>
+    <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="kill_process">Kill process (%d)</string>
-    <string name="confirm_kill_process">Really kill this session?</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>
 
-    <string name="session_rename_title">Set session name</string>
-    <string name="session_rename_positive_button">Set</string>
-    <string name="session_new_named_title">New named session</string>
-    <string name="session_new_named_positive_button">Create</string>
 
-    <string name="styling_not_installed">The &TERMUX_STYLING_APP_NAME; Plugin App is not installed.</string>
-    <string name="styling_install">Install</string>
 
+    <!-- Termux Notifications -->
     <string name="notification_action_exit">Exit</string>
     <string name="notification_action_wake_lock">Acquire wakelock</string>
     <string name="notification_action_wake_unlock">Release wakelock</string>
 
-    <string name="file_received_title">Save file in ~/downloads/</string>
-    <string name="file_received_edit_button">Edit</string>
-    <string name="file_received_open_folder_button">Open folder</string>
-
-    <string name="executable_absolute_path">Executable Absolute Path: \"%1$s\"</string>
-    <string name="working_directory_absolute_path">Working Directory Absolute Path: \"%1$s\"</string>
-
-    <string name="executable_required">Executable required.</string>
-    <string name="null_or_empty_path">The path is null or empty.</string>
-    <string name="null_or_empty_file">The file is null or empty.</string>
-    <string name="null_or_empty_executable">The executable is null or empty.</string>
-    <string name="null_or_empty_directory">The directory is null or empty.</string>
-    <string name="invalid_file_permissions_string_to_check">The file permission string to check is invalid.</string>
-    <string name="no_regular_file_found">Regular file not found at path.</string>
-    <string name="no_directory_found">Directory not found at path.</string>
-    <string name="file_not_readable">%1$s at path is not readable. Permission Denied.</string>
-    <string name="file_not_writable">%1$s at path is not writable. Permission Denied.</string>
-    <string name="file_not_executable">%1$s at path is not executable. Permission Denied.</string>
-    <string name="non_regular_file_found">Non-regular file found at path.</string>
-    <string name="non_directory_file_found">Non-directory file found at path.</string>
-    <string name="creating_missing_directory_failed">Failed to create missing directory at path: \"%1$s\"</string>
-    <string name="validate_file_existence_and_permissions_failed_with_exception">Validating file existence and permissions fafiled: \"%1$s\"\nException: %2$s</string>
-    <string name="validate_directory_existence_and_permissions_failed_with_exception">Validating directory existence and permissions fafiled: \"%1$s\"\nException: %2$s</string>
-
-    <string name="run_command_service_invalid_action">Invalid intent action to RunCommandService: `%1$s`</string>
-    <string name="run_command_service_invalid_command_path">Invalid coommand path to RunCommandService: `%1$s`</string>
-    <string name="run_command_service_allow_external_apps_ungranted_warning">RunCommandService require `allow-external-apps` property to be set to `true` in `&TERMUX_PROPERTIES_PRIMARY_PATH_SHORT;` file.</string>
-    <string name="run_command_service_api_help">Visit https://github.com/termux/termux-app/blob/master/app/src/main/java/com/termux/app/RunCommandService.java for more info on RUN_COMMAND Intent usage.</string>
-
-    <string name="share">Share</string>
-    <string name="share_with">Share With</string>
-    <string name="copy">Copy</string>
-    <string name="report_text">Report Text</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_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 https://github.com/termux/termux-app/blob/master/app/src/main/java/com/termux/app/RunCommandService.java 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 FileUtils -->
+    <string name="error_executable_required">Executable required.</string>
+    <string name="error_null_or_empty_path">The path is null or empty.</string>
+    <string name="error_null_or_empty_file">The file is null or empty.</string>
+    <string name="error_null_or_empty_executable">The executable is null or empty.</string>
+    <string name="error_null_or_empty_directory">The directory is null or empty.</string>
+    <string name="error_invalid_file_permissions_string_to_check">The file permission string to check is invalid.</string>
+    <string name="error_no_regular_file_found">Regular file not found at path.</string>
+    <string name="error_no_directory_found">Directory not found at path.</string>
+    <string name="error_file_not_readable">%1$s at path is not readable. Permission Denied.</string>
+    <string name="error_file_not_writable">%1$s at path is not writable. Permission Denied.</string>
+    <string name="error_file_not_executable">%1$s at path is not executable. Permission Denied.</string>
+    <string name="error_non_regular_file_found">Non-regular file found at path.</string>
+    <string name="error_non_directory_file_found">Non-directory file found at path.</string>
+    <string name="error_creating_missing_directory_failed">Failed to create missing directory at path: \"%1$s\"</string>
+    <string name="error_validate_file_existence_and_permissions_failed_with_exception">Validating file existence and permissions fafiled: \"%1$s\"\nException: %2$s</string>
+    <string name="error_validate_directory_existence_and_permissions_failed_with_exception">Validating directory existence and permissions fafiled: \"%1$s\"\nException: %2$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>
+    <string name="action_file_received_open_directory">Open directory</string>
 
 
 
     <!-- Termux Settings -->
-    <string name="settings">Settings</string>
     <string name="title_activity_termux_settings">&TERMUX_APP_NAME; Settings</string>
 
     <!-- Debugging Preferences -->
diff --git a/app/src/main/res/xml/shortcuts.xml b/app/src/main/res/xml/shortcuts.xml
index dfdab62a91..ea0e38ea05 100644
--- a/app/src/main/res/xml/shortcuts.xml
+++ b/app/src/main/res/xml/shortcuts.xml
@@ -13,7 +13,7 @@
         android:shortcutId="new_session"
         android:enabled="true"
         android:icon="@drawable/ic_new_session"
-        android:shortcutShortLabel="@string/new_session"
+        android:shortcutShortLabel="@string/acton_new_session"
         tools:targetApi="n_mr1">
         <intent
             android:action="android.intent.action.RUN"
@@ -25,7 +25,7 @@
         android:shortcutId="new_failsafe_session"
         android:enabled="true"
         android:icon="@drawable/ic_new_session"
-        android:shortcutShortLabel="@string/new_session_failsafe"
+        android:shortcutShortLabel="@string/action_new_session_failsafe"
         tools:targetApi="n_mr1">
         <intent
             android:action="android.intent.action.RUN"

From 7aa957c6840f2a0203bff940f93071b79a0ed999 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 24 Mar 2021 06:30:26 +0500
Subject: [PATCH 273/912] Fix typos

---
 app/src/main/res/layout/activity_report.xml                     | 2 +-
 .../main/res/layout/activity_report_adapter_node_default.xml    | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/src/main/res/layout/activity_report.xml b/app/src/main/res/layout/activity_report.xml
index 43fff0351d..a4e133bbbd 100644
--- a/app/src/main/res/layout/activity_report.xml
+++ b/app/src/main/res/layout/activity_report.xml
@@ -6,7 +6,7 @@
 
     <include
         layout="@layout/partial_toolbar"
-        android:id="@+id/toolbar_layout"/>
+        android:id="@+id/partial_toolbar"/>
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recycler_view"
diff --git a/app/src/main/res/layout/activity_report_adapter_node_default.xml b/app/src/main/res/layout/activity_report_adapter_node_default.xml
index 414eec1228..79e13bd905 100644
--- a/app/src/main/res/layout/activity_report_adapter_node_default.xml
+++ b/app/src/main/res/layout/activity_report_adapter_node_default.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/text_view"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"

From 9bbcc08ff306a93a05eee1fc29cb800f189c2344 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 24 Mar 2021 06:33:09 +0500
Subject: [PATCH 274/912] Fix variable prefix for intent extra

---
 .../java/com/termux/app/activities/ReportActivity.java    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/termux/app/activities/ReportActivity.java b/app/src/main/java/com/termux/app/activities/ReportActivity.java
index cf4ccdd346..2945ee4114 100644
--- a/app/src/main/java/com/termux/app/activities/ReportActivity.java
+++ b/app/src/main/java/com/termux/app/activities/ReportActivity.java
@@ -29,7 +29,7 @@
 
 public class ReportActivity extends AppCompatActivity {
 
-    private static final String ARG_REPORT_INFO = "report_info";
+    private static final String EXTRA_REPORT_INFO = "report_info";
 
     ReportInfo mReportInfo;
 
@@ -70,7 +70,7 @@ private void updateUI(Bundle bundle) {
             return;
         }
 
-        mReportInfo = (ReportInfo) bundle.getSerializable(ARG_REPORT_INFO);
+        mReportInfo = (ReportInfo) bundle.getSerializable(EXTRA_REPORT_INFO);
 
         if (mReportInfo == null) {
             finish();
@@ -108,7 +108,7 @@ private void updateUI(Bundle bundle) {
     public void onSaveInstanceState(@NonNull Bundle outState) {
         super.onSaveInstanceState(outState);
 
-        outState.putSerializable(ARG_REPORT_INFO, mReportInfo);
+        outState.putSerializable(EXTRA_REPORT_INFO, mReportInfo);
     }
 
     @Override
@@ -176,7 +176,7 @@ public static Intent newInstance(@NonNull final Context context, @NonNull final
 
         Intent intent = new Intent(context, ReportActivity.class);
         Bundle bundle = new Bundle();
-        bundle.putSerializable(ARG_REPORT_INFO, reportInfo);
+        bundle.putSerializable(EXTRA_REPORT_INFO, reportInfo);
         intent.putExtras(bundle);
 
         // Note that ReportActivity task has documentLaunchMode="intoExisting" set in AndroidManifest.xml

From d3d6731d6fbac984b8614b87193320a066ab1b5e Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 24 Mar 2021 06:47:12 +0500
Subject: [PATCH 275/912] Fix typos

---
 app/src/main/res/layout/activity_termux.xml | 2 +-
 app/src/main/res/values/strings.xml         | 2 +-
 app/src/main/res/xml/shortcuts.xml          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/layout/activity_termux.xml b/app/src/main/res/layout/activity_termux.xml
index 604d17b4b4..12ee0d46c0 100644
--- a/app/src/main/res/layout/activity_termux.xml
+++ b/app/src/main/res/layout/activity_termux.xml
@@ -64,7 +64,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:text="@string/acton_new_session" />
+                    android:text="@string/action_new_session" />
             </LinearLayout>
         </LinearLayout>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c2cad6bd74..14b4392f93 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -36,7 +36,7 @@
 
 
     <!-- Terminal Sidebar and Shortcuts -->
-    <string name="acton_new_session">New session</string>
+    <string name="action_new_session">New session</string>
     <string name="action_new_session_failsafe">Failsafe</string>
     <string name="title_max_terminals_reached">Max terminals reached</string>
     <string name="msg_max_terminals_reached">Close down existing ones before creating new.</string>
diff --git a/app/src/main/res/xml/shortcuts.xml b/app/src/main/res/xml/shortcuts.xml
index ea0e38ea05..302a2115af 100644
--- a/app/src/main/res/xml/shortcuts.xml
+++ b/app/src/main/res/xml/shortcuts.xml
@@ -13,7 +13,7 @@
         android:shortcutId="new_session"
         android:enabled="true"
         android:icon="@drawable/ic_new_session"
-        android:shortcutShortLabel="@string/acton_new_session"
+        android:shortcutShortLabel="@string/action_new_session"
         tools:targetApi="n_mr1">
         <intent
             android:action="android.intent.action.RUN"

From 2b3f6817235a44fd119e209623ef4b08439f03d2 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 24 Mar 2021 06:48:47 +0500
Subject: [PATCH 276/912] Add SettingsActivity to launcher shortcuts

---
 app/src/main/res/drawable/ic_settings.xml |  5 +++++
 app/src/main/res/xml/shortcuts.xml        | 14 +++++++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/res/drawable/ic_settings.xml

diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml
new file mode 100644
index 0000000000..e5d1108b0f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_settings.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FF000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M19.14,12.94c0.04,-0.3 0.06,-0.61 0.06,-0.94c0,-0.32 -0.02,-0.64 -0.07,-0.94l2.03,-1.58c0.18,-0.14 0.23,-0.41 0.12,-0.61l-1.92,-3.32c-0.12,-0.22 -0.37,-0.29 -0.59,-0.22l-2.39,0.96c-0.5,-0.38 -1.03,-0.7 -1.62,-0.94L14.4,2.81c-0.04,-0.24 -0.24,-0.41 -0.48,-0.41h-3.84c-0.24,0 -0.43,0.17 -0.47,0.41L9.25,5.35C8.66,5.59 8.12,5.92 7.63,6.29L5.24,5.33c-0.22,-0.08 -0.47,0 -0.59,0.22L2.74,8.87C2.62,9.08 2.66,9.34 2.86,9.48l2.03,1.58C4.84,11.36 4.8,11.69 4.8,12s0.02,0.64 0.07,0.94l-2.03,1.58c-0.18,0.14 -0.23,0.41 -0.12,0.61l1.92,3.32c0.12,0.22 0.37,0.29 0.59,0.22l2.39,-0.96c0.5,0.38 1.03,0.7 1.62,0.94l0.36,2.54c0.05,0.24 0.24,0.41 0.48,0.41h3.84c0.24,0 0.44,-0.17 0.47,-0.41l0.36,-2.54c0.59,-0.24 1.13,-0.56 1.62,-0.94l2.39,0.96c0.22,0.08 0.47,0 0.59,-0.22l1.92,-3.32c0.12,-0.22 0.07,-0.47 -0.12,-0.61L19.14,12.94zM12,15.6c-1.98,0 -3.6,-1.62 -3.6,-3.6s1.62,-3.6 3.6,-3.6s3.6,1.62 3.6,3.6S13.98,15.6 12,15.6z"/>
+</vector>
diff --git a/app/src/main/res/xml/shortcuts.xml b/app/src/main/res/xml/shortcuts.xml
index 302a2115af..61683ca554 100644
--- a/app/src/main/res/xml/shortcuts.xml
+++ b/app/src/main/res/xml/shortcuts.xml
@@ -1,5 +1,5 @@
 <shortcuts xmlns:tools="http://schemas.android.com/tools"
-           xmlns:android="http://schemas.android.com/apk/res/android">
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!--
         For shortcut.xml:
@@ -35,4 +35,16 @@
         </intent>
     </shortcut>
 
+    <shortcut
+        android:shortcutId="settings"
+        android:enabled="true"
+        android:icon="@drawable/ic_settings"
+        android:shortcutShortLabel="@string/action_open_settings"
+        tools:targetApi="n_mr1">
+        <intent
+            android:action="android.intent.action.RUN"
+            android:targetPackage="com.termux"
+            android:targetClass="com.termux.app.activities.SettingsActivity"/>
+    </shortcut>
+
 </shortcuts>

From 3e0f74a8949fe8a5874773e343d72dcee4492dc3 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 24 Mar 2021 06:52:17 +0500
Subject: [PATCH 277/912] Fixed keep screen on default value

The `TermuxPreferenceConstants` classes has been updated to `v0.6.0`. Check its Changelog sections for info on changes.
---
 .../settings/preferences/TermuxPreferenceConstants.java    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/termux/app/settings/preferences/TermuxPreferenceConstants.java b/app/src/main/java/com/termux/app/settings/preferences/TermuxPreferenceConstants.java
index 51ac344f84..3fed9967bd 100644
--- a/app/src/main/java/com/termux/app/settings/preferences/TermuxPreferenceConstants.java
+++ b/app/src/main/java/com/termux/app/settings/preferences/TermuxPreferenceConstants.java
@@ -1,7 +1,7 @@
 package com.termux.app.settings.preferences;
 
 /*
- * Version: v0.5.0
+ * Version: v0.6.0
  *
  * Changelog
  *
@@ -26,6 +26,9 @@
  * - 0.5.0 (2021-03-24)
  *      - Added following to `TERMUX_APP`:
  *          `KEY_LAST_NOTIFICATION_ID` and `DEFAULT_VALUE_KEY_LAST_NOTIFICATION_ID`.
+ *
+ * - 0.6.0 (2021-03-24)
+ *      - Change `DEFAULT_VALUE_KEEP_SCREEN_ON` value to `false` in `TERMUX_APP`.
  */
 
 /**
@@ -53,7 +56,7 @@ public static final class TERMUX_APP {
          * Defines the key for whether to always keep screen on
          */
         public static final String KEY_KEEP_SCREEN_ON = "screen_always_on";
-        public static final boolean DEFAULT_VALUE_KEEP_SCREEN_ON = true;
+        public static final boolean DEFAULT_VALUE_KEEP_SCREEN_ON = false;
 
 
         /**

From dff27945011480e169825aa01c8d5fda5693a0fb Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 25 Mar 2021 01:13:51 +0500
Subject: [PATCH 278/912] Add ShellUtils to define shell related utils since
 they don't belong in BackgroundJob

---
 .../java/com/termux/app/BackgroundJob.java    | 127 +---------------
 .../java/com/termux/app/utils/ShellUtils.java | 136 ++++++++++++++++++
 2 files changed, 140 insertions(+), 123 deletions(-)
 create mode 100644 app/src/main/java/com/termux/app/utils/ShellUtils.java

diff --git a/app/src/main/java/com/termux/app/BackgroundJob.java b/app/src/main/java/com/termux/app/BackgroundJob.java
index 171fedffa1..6a5499afc8 100644
--- a/app/src/main/java/com/termux/app/BackgroundJob.java
+++ b/app/src/main/java/com/termux/app/BackgroundJob.java
@@ -5,23 +5,18 @@
 import android.content.Intent;
 import android.os.Bundle;
 
-import com.termux.BuildConfig;
 import com.termux.app.utils.Logger;
+import com.termux.app.utils.ShellUtils;
 import com.termux.models.ExecutionCommand;
 import com.termux.models.ExecutionCommand.ExecutionState;
 
 import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.lang.reflect.Field;
 import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
 
 /**
  * A background job launched by Termux.
@@ -37,12 +32,12 @@ public BackgroundJob(String executable, final String[] arguments, String working
     }
 
     public BackgroundJob(ExecutionCommand executionCommand, final TermuxService service) {
-        String[] env = buildEnvironment(false, executionCommand.workingDirectory);
+        String[] env = ShellUtils.buildEnvironment(false, executionCommand.workingDirectory);
 
         if (executionCommand.workingDirectory == null || executionCommand.workingDirectory.isEmpty())
             executionCommand.workingDirectory = TermuxConstants.TERMUX_HOME_DIR_PATH;
 
-        final String[] commandArray = setupProcessArgs(executionCommand.executable, executionCommand.arguments);
+        final String[] commandArray = ShellUtils.setupProcessArgs(executionCommand.executable, executionCommand.arguments);
         final String commandDescription = Arrays.toString(commandArray);
 
         if(!executionCommand.setState(ExecutionState.EXECUTING))
@@ -59,7 +54,7 @@ public BackgroundJob(ExecutionCommand executionCommand, final TermuxService serv
         }
 
         mProcess = process;
-        final int pid = getPid(mProcess);
+        final int pid = ShellUtils.getPid(mProcess);
         final Bundle result = new Bundle();
         final StringBuilder outResult = new StringBuilder();
         final StringBuilder errResult = new StringBuilder();
@@ -138,118 +133,4 @@ public void run() {
         }.start();
     }
 
-    private static void addToEnvIfPresent(List<String> environment, String name) {
-        String value = System.getenv(name);
-        if (value != null) {
-            environment.add(name + "=" + value);
-        }
-    }
-
-    static String[] buildEnvironment(boolean isFailSafe, String workingDirectory) {
-        TermuxConstants.TERMUX_HOME_DIR.mkdirs();
-
-        if (workingDirectory == null || workingDirectory.isEmpty()) workingDirectory = TermuxConstants.TERMUX_HOME_DIR_PATH;
-
-        List<String> environment = new ArrayList<>();
-
-        environment.add("TERMUX_VERSION=" + BuildConfig.VERSION_NAME);
-        environment.add("TERM=xterm-256color");
-        environment.add("COLORTERM=truecolor");
-        environment.add("HOME=" + TermuxConstants.TERMUX_HOME_DIR_PATH);
-        environment.add("PREFIX=" + TermuxConstants.TERMUX_PREFIX_DIR_PATH);
-        environment.add("BOOTCLASSPATH=" + System.getenv("BOOTCLASSPATH"));
-        environment.add("ANDROID_ROOT=" + System.getenv("ANDROID_ROOT"));
-        environment.add("ANDROID_DATA=" + System.getenv("ANDROID_DATA"));
-        // EXTERNAL_STORAGE is needed for /system/bin/am to work on at least
-        // Samsung S7 - see https://plus.google.com/110070148244138185604/posts/gp8Lk3aCGp3.
-        environment.add("EXTERNAL_STORAGE=" + System.getenv("EXTERNAL_STORAGE"));
-
-        // These variables are needed if running on Android 10 and higher.
-        addToEnvIfPresent(environment, "ANDROID_ART_ROOT");
-        addToEnvIfPresent(environment, "DEX2OATBOOTCLASSPATH");
-        addToEnvIfPresent(environment, "ANDROID_I18N_ROOT");
-        addToEnvIfPresent(environment, "ANDROID_RUNTIME_ROOT");
-        addToEnvIfPresent(environment, "ANDROID_TZDATA_ROOT");
-
-        if (isFailSafe) {
-            // Keep the default path so that system binaries can be used in the failsafe session.
-            environment.add("PATH= " + System.getenv("PATH"));
-        } else {
-            environment.add("LANG=en_US.UTF-8");
-            environment.add("PATH=" + TermuxConstants.TERMUX_BIN_PREFIX_DIR_PATH);
-            environment.add("PWD=" + workingDirectory);
-            environment.add("TMPDIR=" + TermuxConstants.TERMUX_TMP_PREFIX_DIR_PATH);
-        }
-
-        return environment.toArray(new String[0]);
-    }
-
-    public static int getPid(Process p) {
-        try {
-            Field f = p.getClass().getDeclaredField("pid");
-            f.setAccessible(true);
-            try {
-                return f.getInt(p);
-            } finally {
-                f.setAccessible(false);
-            }
-        } catch (Throwable e) {
-            return -1;
-        }
-    }
-
-    static String[] setupProcessArgs(String fileToExecute, String[] arguments) {
-        // The file to execute may either be:
-        // - An elf file, in which we execute it directly.
-        // - A script file without shebang, which we execute with our standard shell $PREFIX/bin/sh instead of the
-        //   system /system/bin/sh. The system shell may vary and may not work at all due to LD_LIBRARY_PATH.
-        // - A file with shebang, which we try to handle with e.g. /bin/foo -> $PREFIX/bin/foo.
-        String interpreter = null;
-        try {
-            File file = new File(fileToExecute);
-            try (FileInputStream in = new FileInputStream(file)) {
-                byte[] buffer = new byte[256];
-                int bytesRead = in.read(buffer);
-                if (bytesRead > 4) {
-                    if (buffer[0] == 0x7F && buffer[1] == 'E' && buffer[2] == 'L' && buffer[3] == 'F') {
-                        // Elf file, do nothing.
-                    } else if (buffer[0] == '#' && buffer[1] == '!') {
-                        // Try to parse shebang.
-                        StringBuilder builder = new StringBuilder();
-                        for (int i = 2; i < bytesRead; i++) {
-                            char c = (char) buffer[i];
-                            if (c == ' ' || c == '\n') {
-                                if (builder.length() == 0) {
-                                    // Skip whitespace after shebang.
-                                } else {
-                                    // End of shebang.
-                                    String executable = builder.toString();
-                                    if (executable.startsWith("/usr") || executable.startsWith("/bin")) {
-                                        String[] parts = executable.split("/");
-                                        String binary = parts[parts.length - 1];
-                                        interpreter = TermuxConstants.TERMUX_BIN_PREFIX_DIR_PATH + "/" + binary;
-                                    }
-                                    break;
-                                }
-                            } else {
-                                builder.append(c);
-                            }
-                        }
-                    } else {
-                        // No shebang and no ELF, use standard shell.
-                        interpreter = TermuxConstants.TERMUX_BIN_PREFIX_DIR_PATH + "/sh";
-                    }
-                }
-            }
-        } catch (IOException e) {
-            // Ignore.
-        }
-
-        List<String> result = new ArrayList<>();
-        if (interpreter != null) result.add(interpreter);
-        result.add(fileToExecute);
-        if (arguments != null) Collections.addAll(result, arguments);
-        return result.toArray(new String[0]);
-    }
-
 }
diff --git a/app/src/main/java/com/termux/app/utils/ShellUtils.java b/app/src/main/java/com/termux/app/utils/ShellUtils.java
new file mode 100644
index 0000000000..341a01c791
--- /dev/null
+++ b/app/src/main/java/com/termux/app/utils/ShellUtils.java
@@ -0,0 +1,136 @@
+package com.termux.app.utils;
+
+import com.termux.BuildConfig;
+import com.termux.app.TermuxConstants;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public class ShellUtils {
+
+    public static String[] buildEnvironment(boolean isFailSafe, String workingDirectory) {
+        TermuxConstants.TERMUX_HOME_DIR.mkdirs();
+
+        if (workingDirectory == null || workingDirectory.isEmpty()) workingDirectory = TermuxConstants.TERMUX_HOME_DIR_PATH;
+
+        List<String> environment = new ArrayList<>();
+
+        environment.add("TERMUX_VERSION=" + BuildConfig.VERSION_NAME);
+        environment.add("TERM=xterm-256color");
+        environment.add("COLORTERM=truecolor");
+        environment.add("HOME=" + TermuxConstants.TERMUX_HOME_DIR_PATH);
+        environment.add("PREFIX=" + TermuxConstants.TERMUX_PREFIX_DIR_PATH);
+        environment.add("BOOTCLASSPATH=" + System.getenv("BOOTCLASSPATH"));
+        environment.add("ANDROID_ROOT=" + System.getenv("ANDROID_ROOT"));
+        environment.add("ANDROID_DATA=" + System.getenv("ANDROID_DATA"));
+        // EXTERNAL_STORAGE is needed for /system/bin/am to work on at least
+        // Samsung S7 - see https://plus.google.com/110070148244138185604/posts/gp8Lk3aCGp3.
+        environment.add("EXTERNAL_STORAGE=" + System.getenv("EXTERNAL_STORAGE"));
+
+        // These variables are needed if running on Android 10 and higher.
+        addToEnvIfPresent(environment, "ANDROID_ART_ROOT");
+        addToEnvIfPresent(environment, "DEX2OATBOOTCLASSPATH");
+        addToEnvIfPresent(environment, "ANDROID_I18N_ROOT");
+        addToEnvIfPresent(environment, "ANDROID_RUNTIME_ROOT");
+        addToEnvIfPresent(environment, "ANDROID_TZDATA_ROOT");
+
+        if (isFailSafe) {
+            // Keep the default path so that system binaries can be used in the failsafe session.
+            environment.add("PATH= " + System.getenv("PATH"));
+        } else {
+            environment.add("LANG=en_US.UTF-8");
+            environment.add("PATH=" + TermuxConstants.TERMUX_BIN_PREFIX_DIR_PATH);
+            environment.add("PWD=" + workingDirectory);
+            environment.add("TMPDIR=" + TermuxConstants.TERMUX_TMP_PREFIX_DIR_PATH);
+        }
+
+        return environment.toArray(new String[0]);
+    }
+
+    public static void addToEnvIfPresent(List<String> environment, String name) {
+        String value = System.getenv(name);
+        if (value != null) {
+            environment.add(name + "=" + value);
+        }
+    }
+
+    public static int getPid(Process p) {
+        try {
+            Field f = p.getClass().getDeclaredField("pid");
+            f.setAccessible(true);
+            try {
+                return f.getInt(p);
+            } finally {
+                f.setAccessible(false);
+            }
+        } catch (Throwable e) {
+            return -1;
+        }
+    }
+
+    public static String[] setupProcessArgs(String fileToExecute, String[] arguments) {
+        // The file to execute may either be:
+        // - An elf file, in which we execute it directly.
+        // - A script file without shebang, which we execute with our standard shell $PREFIX/bin/sh instead of the
+        //   system /system/bin/sh. The system shell may vary and may not work at all due to LD_LIBRARY_PATH.
+        // - A file with shebang, which we try to handle with e.g. /bin/foo -> $PREFIX/bin/foo.
+        String interpreter = null;
+        try {
+            File file = new File(fileToExecute);
+            try (FileInputStream in = new FileInputStream(file)) {
+                byte[] buffer = new byte[256];
+                int bytesRead = in.read(buffer);
+                if (bytesRead > 4) {
+                    if (buffer[0] == 0x7F && buffer[1] == 'E' && buffer[2] == 'L' && buffer[3] == 'F') {
+                        // Elf file, do nothing.
+                    } else if (buffer[0] == '#' && buffer[1] == '!') {
+                        // Try to parse shebang.
+                        StringBuilder builder = new StringBuilder();
+                        for (int i = 2; i < bytesRead; i++) {
+                            char c = (char) buffer[i];
+                            if (c == ' ' || c == '\n') {
+                                if (builder.length() == 0) {
+                                    // Skip whitespace after shebang.
+                                } else {
+                                    // End of shebang.
+                                    String executable = builder.toString();
+                                    if (executable.startsWith("/usr") || executable.startsWith("/bin")) {
+                                        String[] parts = executable.split("/");
+                                        String binary = parts[parts.length - 1];
+                                        interpreter = TermuxConstants.TERMUX_BIN_PREFIX_DIR_PATH + "/" + binary;
+                                    }
+                                    break;
+                                }
+                            } else {
+                                builder.append(c);
+                            }
+                        }
+                    } else {
+                        // No shebang and no ELF, use standard shell.
+                        interpreter = TermuxConstants.TERMUX_BIN_PREFIX_DIR_PATH + "/sh";
+                    }
+                }
+            }
+        } catch (IOException e) {
+            // Ignore.
+        }
+
+        List<String> result = new ArrayList<>();
+        if (interpreter != null) result.add(interpreter);
+        result.add(fileToExecute);
+        if (arguments != null) Collections.addAll(result, arguments);
+        return result.toArray(new String[0]);
+    }
+
+    public static String getExecutableBasename(String executable) {
+        if(executable == null) return null;
+        int lastSlash = executable.lastIndexOf('/');
+        return (lastSlash == -1) ? executable : executable.substring(lastSlash + 1);
+    }
+
+}

From 78a99fddfd3d0be58fc478d176f8b93fc1716972 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 25 Mar 2021 01:18:13 +0500
Subject: [PATCH 279/912] Add the TermuxSession class for linking a
 TerminalSession to an ExecutionCommand.

TermuxSession will maintain info for foreground Termux sessions. Each terminal session started by TermuxService will now be linked to a ExectionCommand that started it.

This also fixes bugs where newly created session in some cases were not being automatically selected and scrolled to, like when adding a named or failsafe session or those which were created for executable intents.
---
 .../java/com/termux/app/TermuxActivity.java   |  23 +-
 .../java/com/termux/app/TermuxService.java    | 298 ++++++++++--------
 .../termux/app/terminal/TermuxSession.java    |  87 +++++
 .../app/terminal/TermuxSessionClient.java     | 116 ++++---
 .../TermuxSessionsListViewController.java     |  14 +-
 .../termux/app/terminal/TermuxViewClient.java |   7 +-
 6 files changed, 356 insertions(+), 189 deletions(-)
 create mode 100644 app/src/main/java/com/termux/app/terminal/TermuxSession.java

diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index dd6f5058b6..3f60c0df70 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -214,7 +214,7 @@ public void onStart() {
             // Get the session stored in shared preferences stored by {@link #onStop} if its valid,
             // otherwise get the last session currently running.
             mTermuxSessionClient.setCurrentSession(mTermuxSessionClient.getCurrentStoredSessionOrLast());
-            terminalSessionListNotifyUpdated();
+            termuxSessionListNotifyUpdated();
         }
 
         registerReceiver(mTermuxActivityBroadcastReceiever, new IntentFilter(TERMUX_ACTIVITY.ACTION_RELOAD_STYLE));
@@ -242,7 +242,7 @@ public void onServiceConnected(ComponentName componentName, IBinder service) {
 
         setTermuxSessionsListView();
 
-        if (mTermuxService.getSessions().isEmpty()) {
+        if (mTermuxService.isTermuxSessionsEmpty()) {
             if (mIsVisible) {
                 TermuxInstaller.setupIfNeeded(TermuxActivity.this, () -> {
                     if (mTermuxService == null) return; // Activity might have been destroyed.
@@ -395,9 +395,10 @@ private void setNewSessionButtonView() {
         View newSessionButton = findViewById(R.id.new_session_button);
         newSessionButton.setOnClickListener(v -> mTermuxSessionClient.addNewSession(false, null));
         newSessionButton.setOnLongClickListener(v -> {
-            DialogUtils.textInput(TermuxActivity.this, R.string.title_create_named_session, null, R.string.action_create_named_session_confirm,
-                text -> mTermuxSessionClient.addNewSession(false, text), R.string.action_new_session_failsafe, text -> mTermuxSessionClient.addNewSession(true, text)
-                , -1, null, null);
+            DialogUtils.textInput(TermuxActivity.this, R.string.title_create_named_session, null,
+                R.string.action_create_named_session_confirm, text -> mTermuxSessionClient.addNewSession(false, text),
+                R.string.action_new_session_failsafe, text -> mTermuxSessionClient.addNewSession(true, text),
+                -1, null, null);
             return true;
         });
     }
@@ -439,7 +440,7 @@ private void setTermuxTerminalViewAndClients() {
 
     private void setTermuxSessionsListView() {
         ListView termuxSessionsListView = findViewById(R.id.terminal_sessions_list);
-        mTermuxSessionListViewController = new TermuxSessionsListViewController(this, mTermuxService.getSessions());
+        mTermuxSessionListViewController = new TermuxSessionsListViewController(this, mTermuxService.getTermuxSessions());
         termuxSessionsListView.setAdapter(mTermuxSessionListViewController);
         termuxSessionsListView.setOnItemClickListener(mTermuxSessionListViewController);
         termuxSessionsListView.setOnItemLongClickListener(mTermuxSessionListViewController);
@@ -468,6 +469,7 @@ public void finishActivityIfNotFinishing() {
 
     /** Show a toast and dismiss the last one if still visible. */
     public void showToast(String text, boolean longDuration) {
+        if(text == null || text.isEmpty()) return;
         if (mLastToast != null) mLastToast.cancel();
         mLastToast = Toast.makeText(TermuxActivity.this, text, longDuration ? Toast.LENGTH_LONG : Toast.LENGTH_SHORT);
         mLastToast.setGravity(Gravity.TOP, 0, 0);
@@ -642,7 +644,7 @@ public DrawerLayout getDrawer() {
         return (DrawerLayout) findViewById(R.id.drawer_layout);
     }
 
-    public void terminalSessionListNotifyUpdated() {
+    public void termuxSessionListNotifyUpdated() {
         mTermuxSessionListViewController.notifyDataSetChanged();
     }
 
@@ -683,6 +685,13 @@ public TermuxSharedProperties getProperties() {
 
 
 
+    public static void updateTermuxActivityStyling(Context context) {
+        // Make sure that terminal styling is always applied.
+        Intent stylingIntent = new Intent(TERMUX_ACTIVITY.ACTION_RELOAD_STYLE);
+        stylingIntent.putExtra(TERMUX_ACTIVITY.EXTRA_RELOAD_STYLE, "styling");
+        context.sendBroadcast(stylingIntent);
+    }
+
     class TermuxActivityBroadcastReceiever extends BroadcastReceiver {
         @Override
         public void onReceive(Context context, Intent intent) {
diff --git a/app/src/main/java/com/termux/app/TermuxService.java b/app/src/main/java/com/termux/app/TermuxService.java
index 01feb00596..379bcdafc6 100644
--- a/app/src/main/java/com/termux/app/TermuxService.java
+++ b/app/src/main/java/com/termux/app/TermuxService.java
@@ -24,9 +24,11 @@
 import com.termux.app.TermuxConstants.TERMUX_APP.TERMUX_ACTIVITY;
 import com.termux.app.TermuxConstants.TERMUX_APP.TERMUX_SERVICE;
 import com.termux.app.settings.preferences.TermuxAppSharedPreferences;
+import com.termux.app.terminal.TermuxSession;
 import com.termux.app.terminal.TermuxSessionClient;
 import com.termux.app.terminal.TermuxSessionClientBase;
 import com.termux.app.utils.Logger;
+import com.termux.app.utils.ShellUtils;
 import com.termux.app.utils.TextDataUtils;
 import com.termux.models.ExecutionCommand;
 import com.termux.models.ExecutionCommand.ExecutionState;
@@ -38,8 +40,10 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.annotation.Nullable;
+
 /**
- * A service holding a list of terminal sessions, {@link #mTerminalSessions}, showing a foreground notification while
+ * A service holding a list of termux sessions, {@link #mTermuxSessions}, showing a foreground notification while
  * running so that it is not terminated. The user interacts with the session through {@link TermuxActivity}, but this
  * service may outlive the activity when the user or the system disposes of the activity. In that case the user may
  * restart {@link TermuxActivity} later to yet again access the sessions.
@@ -67,12 +71,12 @@ class LocalBinder extends Binder {
     private final Handler mHandler = new Handler();
 
     /**
-     * The terminal sessions which this service manages.
+     * The termux sessions which this service manages.
      * Note that this list is observed by {@link TermuxActivity#mTermuxSessionListViewController},
      * so any changes must be made on the UI thread and followed by a call to
      * {@link ArrayAdapter#notifyDataSetChanged()} }.
      */
-    final List<TerminalSession> mTerminalSessions = new ArrayList<>();
+    final List<TermuxSession> mTermuxSessions = new ArrayList<>();
 
     /**
      * The background jobs which this service manages.
@@ -160,7 +164,7 @@ public void onDestroy() {
         }
 
         actionReleaseWakeLock(false);
-        finishAllTerminalSessions();
+        finishAllTermuxSessions();
         runStopForeground();
     }
 
@@ -205,7 +209,7 @@ private void requestStopService() {
     /** Process action to stop service. */
     private void actionStopService() {
         mWantsToStop = true;
-        finishAllTerminalSessions();
+        finishAllTermuxSessions();
         requestStopService();
     }
 
@@ -273,7 +277,8 @@ private void actionReleaseWakeLock(boolean updateNotification) {
         Logger.logDebug(LOG_TAG, "WakeLocks released successfully");
     }
 
-    /** Process action to execute a shell command in a foreground session or in background. */
+    /** Process {@link TERMUX_SERVICE#ACTION_SERVICE_EXECUTE} intent to execute a shell command in
+     * a foreground termux session or in background. */
     private void actionServiceExecute(Intent intent) {
         if (intent == null){
             Logger.logError(LOG_TAG, "Ignoring null intent to actionServiceExecute");
@@ -303,15 +308,18 @@ private void actionServiceExecute(Intent intent) {
         if (executionCommand.inBackground) {
             executeBackgroundCommand(executionCommand);
         } else {
-            executeForegroundCommand(executionCommand);
+            executeTermuxSessionCommand(executionCommand);
         }
     }
 
     /** Execute a shell command in background with {@link BackgroundJob}. */
     private void executeBackgroundCommand(ExecutionCommand executionCommand) {
+        if (executionCommand == null) return;
+        
         Logger.logDebug(LOG_TAG, "Starting background command");
 
-        Logger.logDebug(LOG_TAG, executionCommand.toString());
+        if(Logger.getLogLevel() >= Logger.LOG_LEVEL_VERBOSE)
+            Logger.logVerbose(LOG_TAG, executionCommand.toString());
 
         BackgroundJob task = new BackgroundJob(executionCommand, this);
 
@@ -328,65 +336,134 @@ public void onBackgroundJobExited(final BackgroundJob task) {
     }
 
     /** Execute a shell command in a foreground terminal session. */
-    private void executeForegroundCommand(ExecutionCommand executionCommand) {
-        Logger.logDebug(LOG_TAG, "Starting foreground command");
-
-        if(!executionCommand.setState(ExecutionState.EXECUTING))
-            return;
+    private void executeTermuxSessionCommand(ExecutionCommand executionCommand) {
+        if (executionCommand == null) return;
+        
+        Logger.logDebug(LOG_TAG, "Starting foreground termux session command");
 
-        Logger.logDebug(LOG_TAG, executionCommand.toString());
-
-        TerminalSession newSession = createTerminalSession(executionCommand.executable, executionCommand.arguments, executionCommand.workingDirectory, executionCommand.isFailsafe);
+        String sessionName = null;
 
         // Transform executable path to session name, e.g. "/bin/do-something.sh" => "do something.sh".
         if (executionCommand.executable != null) {
-            int lastSlash = executionCommand.executable.lastIndexOf('/');
-            String name = (lastSlash == -1) ? executionCommand.executable : executionCommand.executable.substring(lastSlash + 1);
-            name = name.replace('-', ' ');
-            newSession.mSessionName = name;
+            sessionName = ShellUtils.getExecutableBasename(executionCommand.executable).replace('-', ' ');
         }
 
+        TermuxSession newTermuxSession = createTermuxSession(executionCommand, sessionName);
+        if (newTermuxSession == null) return;
+
+        handleSessionAction(TextDataUtils.getIntFromString(executionCommand.sessionAction,
+            TERMUX_SERVICE.VALUE_EXTRA_SESSION_ACTION_SWITCH_TO_NEW_SESSION_AND_OPEN_ACTIVITY),
+            newTermuxSession.getTerminalSession());
+    }
+
+    /**
+     * Create a termux session.
+     * Currently called by {@link TermuxSessionClient#addNewSession(boolean, String)} to add a new termux session.
+     */
+    @Nullable
+    public TermuxSession createTermuxSession(String executablePath, String[] arguments, String workingDirectory, boolean isFailSafe, String sessionName) {
+        return createTermuxSession(new ExecutionCommand(getNextExecutionId(), executablePath, arguments, workingDirectory, false, isFailSafe), sessionName);
+    }
+
+    /** Create a termux session. */
+    @Nullable
+    public synchronized TermuxSession createTermuxSession(ExecutionCommand executionCommand, String sessionName) {
+        if (executionCommand == null) return null;
+
+        Logger.logDebug(LOG_TAG, "Creating termux session");
+
+        if (executionCommand.inBackground) {
+            Logger.logDebug(LOG_TAG, "Ignoring a background execution command passed to createTermuxSession()");
+            return null;
+        }
+
+        if(Logger.getLogLevel() >= Logger.LOG_LEVEL_VERBOSE)
+            Logger.logVerbose(LOG_TAG, executionCommand.toString());
+        
+        TermuxSession newTermuxSession = TermuxSession.create(executionCommand, getTermuxSessionClient(), sessionName);
+        if (newTermuxSession == null) {
+            Logger.logError(LOG_TAG, "Failed to execute new termux session command for:\n" + executionCommand.toString());
+            return null;
+        };
+
+        mTermuxSessions.add(newTermuxSession);
+
         // Notify {@link TermuxSessionsListViewController} that sessions list has been updated if
         // activity in is foreground
         if(mTermuxSessionClient != null)
-            mTermuxSessionClient.terminalSessionListNotifyUpdated();
+            mTermuxSessionClient.termuxSessionListNotifyUpdated();
 
-        handleSessionAction(TextDataUtils.getIntFromString(executionCommand.sessionAction, TERMUX_SERVICE.VALUE_EXTRA_SESSION_ACTION_SWITCH_TO_NEW_SESSION_AND_OPEN_ACTIVITY), newSession);
+        updateNotification();
+        TermuxActivity.updateTermuxActivityStyling(this);
+
+        return newTermuxSession;
     }
 
-    private void setCurrentStoredSession(TerminalSession newSession) {
-        // Make the newly created session the current one to be displayed:
-        TermuxAppSharedPreferences preferences = new TermuxAppSharedPreferences(this);
-        preferences.setCurrentSession(newSession.mHandle);
+    /** Remove a termux session. */
+    public synchronized int removeTermuxSession(TerminalSession sessionToRemove) {
+        int index = getIndexOfSession(sessionToRemove);
+
+        if(index >= 0) {
+            TermuxSession termuxSession = mTermuxSessions.get(index);
+
+            if (termuxSession.getExecutionCommand().setState(ExecutionState.EXECUTED)) {
+                ;
+            }
+
+            mTermuxSessions.remove(termuxSession);
+
+            // Notify {@link TermuxSessionsListViewController} that sessions list has been updated if
+            // activity in is foreground
+            if(mTermuxSessionClient != null)
+                mTermuxSessionClient.termuxSessionListNotifyUpdated();
+        }
+
+        if (mTermuxSessions.isEmpty() && mWakeLock == null) {
+            // Finish if there are no sessions left and the wake lock is not held, otherwise keep the service alive if
+            // holding wake lock since there may be daemon processes (e.g. sshd) running.
+            requestStopService();
+        } else {
+            updateNotification();
+        }
+        return index;
     }
 
+    /** Finish all termux sessions by sending SIGKILL to their shells. */
+    private synchronized void finishAllTermuxSessions() {
+        for (int i = 0; i < mTermuxSessions.size(); i++)
+            mTermuxSessions.get(i).getTerminalSession().finishIfRunning();
+    }
+
+
+
     /** Process session action for new session. */
-    private void handleSessionAction(int sessionAction, TerminalSession newSession) {
-        Logger.logDebug(LOG_TAG, "Processing sessionAction \"" + sessionAction + "\" for session \"" + newSession.mSessionName + "\"");
+    private void handleSessionAction(int sessionAction, TerminalSession newTerminalSession) {
+        Logger.logDebug(LOG_TAG, "Processing sessionAction \"" + sessionAction + "\" for session \"" + newTerminalSession.mSessionName + "\"");
 
         switch (sessionAction) {
             case TERMUX_SERVICE.VALUE_EXTRA_SESSION_ACTION_SWITCH_TO_NEW_SESSION_AND_OPEN_ACTIVITY:
-                setCurrentStoredSession(newSession);
+                setCurrentStoredTerminalSession(newTerminalSession);
                 if(mTermuxSessionClient != null)
-                    mTermuxSessionClient.setCurrentSession(newSession);
+                    mTermuxSessionClient.setCurrentSession(newTerminalSession);
                 startTermuxActivity();
                 break;
             case TERMUX_SERVICE.VALUE_EXTRA_SESSION_ACTION_KEEP_CURRENT_SESSION_AND_OPEN_ACTIVITY:
-                if(mTerminalSessions.size() == 1)
-                    setCurrentStoredSession(newSession);
+                if(getTermuxSessionsSize() == 1)
+                    setCurrentStoredTerminalSession(newTerminalSession);
                 startTermuxActivity();
                 break;
             case TERMUX_SERVICE.VALUE_EXTRA_SESSION_ACTION_SWITCH_TO_NEW_SESSION_AND_DONT_OPEN_ACTIVITY:
-                setCurrentStoredSession(newSession);
+                setCurrentStoredTerminalSession(newTerminalSession);
                 if(mTermuxSessionClient != null)
-                    mTermuxSessionClient.setCurrentSession(newSession);
+                    mTermuxSessionClient.setCurrentSession(newTerminalSession);
                 break;
             case TERMUX_SERVICE.VALUE_EXTRA_SESSION_ACTION_KEEP_CURRENT_SESSION_AND_DONT_OPEN_ACTIVITY:
-                if(mTerminalSessions.size() == 1)
-                    setCurrentStoredSession(newSession);
+                if(getTermuxSessionsSize() == 1)
+                    setCurrentStoredTerminalSession(newTerminalSession);
                 break;
             default:
-                Logger.logError(LOG_TAG, "Invalid sessionAction: \"" + sessionAction + "\"");
+                Logger.logError(LOG_TAG, "Invalid sessionAction: \"" + sessionAction + "\". Force using default sessionAction.");
+                handleSessionAction(TERMUX_SERVICE.VALUE_EXTRA_SESSION_ACTION_SWITCH_TO_NEW_SESSION_AND_OPEN_ACTIVITY, newTerminalSession);
                 break;
         }
     }
@@ -396,78 +473,6 @@ private void startTermuxActivity() {
         startActivity(new Intent(this, TermuxActivity.class).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
     }
 
-    /** Create a terminal session. */
-    public TerminalSession createTerminalSession(String executablePath, String[] arguments, String workingDirectory, boolean isFailSafe) {
-        TermuxConstants.TERMUX_HOME_DIR.mkdirs();
-
-        if (workingDirectory == null || workingDirectory.isEmpty()) workingDirectory = TermuxConstants.TERMUX_HOME_DIR_PATH;
-
-        String[] env = BackgroundJob.buildEnvironment(isFailSafe, workingDirectory);
-        boolean isLoginShell = false;
-
-        if (executablePath == null) {
-            if (!isFailSafe) {
-                for (String shellBinary : new String[]{"login", "bash", "zsh"}) {
-                    File shellFile = new File(TermuxConstants.TERMUX_BIN_PREFIX_DIR_PATH, shellBinary);
-                    if (shellFile.canExecute()) {
-                        executablePath = shellFile.getAbsolutePath();
-                        break;
-                    }
-                }
-            }
-
-            if (executablePath == null) {
-                // Fall back to system shell as last resort:
-                executablePath = "/system/bin/sh";
-            }
-            isLoginShell = true;
-        }
-
-        String[] processArgs = BackgroundJob.setupProcessArgs(executablePath, arguments);
-        executablePath = processArgs[0];
-        int lastSlashIndex = executablePath.lastIndexOf('/');
-        String processName = (isLoginShell ? "-" : "") +
-            (lastSlashIndex == -1 ? executablePath : executablePath.substring(lastSlashIndex + 1));
-
-        String[] args = new String[processArgs.length];
-        args[0] = processName;
-        if (processArgs.length > 1) System.arraycopy(processArgs, 1, args, 1, processArgs.length - 1);
-
-        TerminalSession session = new TerminalSession(executablePath, workingDirectory, args, env, getTermuxSessionClient());
-        mTerminalSessions.add(session);
-        updateNotification();
-
-        // Make sure that terminal styling is always applied.
-        Intent stylingIntent = new Intent(TERMUX_ACTIVITY.ACTION_RELOAD_STYLE);
-        stylingIntent.putExtra(TERMUX_ACTIVITY.EXTRA_RELOAD_STYLE, "styling");
-        sendBroadcast(stylingIntent);
-
-        return session;
-    }
-
-    /** Remove a terminal session. */
-    public int removeTerminalSession(TerminalSession sessionToRemove) {
-        int indexOfRemoved = mTerminalSessions.indexOf(sessionToRemove);
-        mTerminalSessions.remove(indexOfRemoved);
-
-        if (mTerminalSessions.isEmpty() && mWakeLock == null) {
-            // Finish if there are no sessions left and the wake lock is not held, otherwise keep the service alive if
-            // holding wake lock since there may be daemon processes (e.g. sshd) running.
-            requestStopService();
-        } else {
-            updateNotification();
-        }
-        return indexOfRemoved;
-    }
-
-    /** Finish all terminal sessions by sending SIGKILL to their shells. */
-    private void finishAllTerminalSessions() {
-        for (int i = 0; i < mTerminalSessions.size(); i++)
-            mTerminalSessions.get(i).finishIfRunning();
-    }
-
-
-
     /** If {@link TermuxActivity} has not bound to the {@link TermuxService} yet or is destroyed, then
      * interface functions requiring the activity should not be available to the terminal sessions,
      * so we just return the {@link #mTermuxSessionClientBase}. Once {@link TermuxActivity} bind
@@ -479,7 +484,7 @@ private void finishAllTerminalSessions() {
      * @return Returns the {@link TermuxSessionClient} if {@link TermuxActivity} has bound with
      * {@link TermuxService}, otherwise {@link TermuxSessionClientBase}.
      */
-    public TermuxSessionClientBase getTermuxSessionClient() {
+    public synchronized TermuxSessionClientBase getTermuxSessionClient() {
         if (mTermuxSessionClient != null)
             return mTermuxSessionClient;
         else
@@ -494,20 +499,20 @@ public TermuxSessionClientBase getTermuxSessionClient() {
      * @param termuxSessionClient The {@link TermuxSessionClient} object that fully
      * implements the {@link TerminalSessionClient} interface.
      */
-    public void setTermuxSessionClient(TermuxSessionClient termuxSessionClient) {
+    public synchronized void setTermuxSessionClient(TermuxSessionClient termuxSessionClient) {
         mTermuxSessionClient = termuxSessionClient;
 
-        for (int i = 0; i < mTerminalSessions.size(); i++)
-            mTerminalSessions.get(i).updateTerminalSessionClient(mTermuxSessionClient);
+        for (int i = 0; i < mTermuxSessions.size(); i++)
+            mTermuxSessions.get(i).getTerminalSession().updateTerminalSessionClient(mTermuxSessionClient);
     }
 
     /** This should be called when {@link TermuxActivity} has been destroyed and in {@link #onUnbind(Intent)}
      * so that the {@link TermuxService} and {@link TerminalSession} and {@link TerminalEmulator}
      * clients do not hold an activity references.
      */
-    public void unsetTermuxSessionClient() {
-        for (int i = 0; i < mTerminalSessions.size(); i++)
-            mTerminalSessions.get(i).updateTerminalSessionClient(mTermuxSessionClientBase);
+    public synchronized void unsetTermuxSessionClient() {
+        for (int i = 0; i < mTermuxSessions.size(); i++)
+            mTermuxSessions.get(i).getTerminalSession().updateTerminalSessionClient(mTermuxSessionClientBase);
 
         mTermuxSessionClient = null;
     }
@@ -521,7 +526,7 @@ private Notification buildNotification() {
         notifyIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         PendingIntent pendingIntent = PendingIntent.getActivity(this, 0, notifyIntent, 0);
 
-        int sessionCount = mTerminalSessions.size();
+        int sessionCount = getTermuxSessionsSize();
         int taskCount = mBackgroundTasks.size();
         String contentText = sessionCount + " session" + (sessionCount == 1 ? "" : "s");
         if (taskCount > 0) {
@@ -582,7 +587,7 @@ private void setupNotificationChannel() {
 
     /** Update the shown foreground service notification after making any changes that affect it. */
     void updateNotification() {
-        if (mWakeLock == null && mTerminalSessions.isEmpty() && mBackgroundTasks.isEmpty()) {
+        if (mWakeLock == null && mTermuxSessions.isEmpty() && mBackgroundTasks.isEmpty()) {
             // Exit if we are updating after the user disabled all locks with no sessions or tasks running.
             requestStopService();
         } else {
@@ -592,16 +597,63 @@ void updateNotification() {
 
 
 
-    public boolean wantsToStop() {
-        return mWantsToStop;
+    private void setCurrentStoredTerminalSession(TerminalSession session) {
+        if(session == null) return;
+        // Make the newly created session the current one to be displayed:
+        TermuxAppSharedPreferences preferences = new TermuxAppSharedPreferences(this);
+        preferences.setCurrentSession(session.mHandle);
+    }
+
+    public synchronized boolean isTermuxSessionsEmpty() {
+        return mTermuxSessions.isEmpty();
+    }
+
+    public synchronized int getTermuxSessionsSize() {
+        return mTermuxSessions.size();
     }
 
-    public List<TerminalSession> getSessions() {
-        return mTerminalSessions;
+    public synchronized List<TermuxSession> getTermuxSessions() {
+        return mTermuxSessions;
     }
 
-    synchronized public static int getNextExecutionId() {
+    @Nullable
+    public synchronized TermuxSession getTermuxSession(int index) {
+        if(index >= 0 && index < mTermuxSessions.size())
+            return mTermuxSessions.get(index);
+        else
+            return null;
+    }
+
+    public synchronized TermuxSession getLastTermuxSession() {
+        return mTermuxSessions.isEmpty() ? null : mTermuxSessions.get(mTermuxSessions.size() - 1);
+    }
+
+    public synchronized int getIndexOfSession(TerminalSession terminalSession) {
+        for (int i = 0; i < mTermuxSessions.size(); i++) {
+            if (mTermuxSessions.get(i).getTerminalSession().equals(terminalSession))
+                return i;
+        }
+        return -1;
+    }
+
+    public synchronized TerminalSession getTerminalSessionForHandle(String sessionHandle) {
+        TerminalSession terminalSession;
+        for (int i = 0, len = mTermuxSessions.size(); i < len; i++) {
+            terminalSession = mTermuxSessions.get(i).getTerminalSession();
+            if (terminalSession.mHandle.equals(sessionHandle))
+                return terminalSession;
+        }
+        return null;
+    }
+
+
+
+    public static synchronized int getNextExecutionId() {
         return EXECUTION_ID++;
     }
 
+    public boolean wantsToStop() {
+        return mWantsToStop;
+    }
+
 }
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxSession.java b/app/src/main/java/com/termux/app/terminal/TermuxSession.java
new file mode 100644
index 0000000000..3af9f73df4
--- /dev/null
+++ b/app/src/main/java/com/termux/app/terminal/TermuxSession.java
@@ -0,0 +1,87 @@
+package com.termux.app.terminal;
+
+import com.termux.app.TermuxConstants;
+import com.termux.app.utils.Logger;
+import com.termux.app.utils.ShellUtils;
+import com.termux.models.ExecutionCommand;
+import com.termux.terminal.TerminalSession;
+
+import java.io.File;
+
+/**
+ * A class that maintains info for foreground Termux sessions.
+ * It also provides a way to link each {@link TerminalSession} with the {@link ExecutionCommand}
+ * that started it.
+ */
+public class TermuxSession {
+
+    private final TerminalSession mTerminalSession;
+    private final ExecutionCommand mExecutionCommand;
+
+    private static final String LOG_TAG = "TermuxSession";
+
+    private TermuxSession(TerminalSession terminalSession, ExecutionCommand executionCommand) {
+        this.mTerminalSession = terminalSession;
+        this.mExecutionCommand = executionCommand;
+    }
+
+    public static TermuxSession create(ExecutionCommand executionCommand, TermuxSessionClientBase termuxSessionClient, String sessionName) {
+        TermuxConstants.TERMUX_HOME_DIR.mkdirs();
+
+        if (executionCommand.workingDirectory == null || executionCommand.workingDirectory.isEmpty()) executionCommand.workingDirectory = TermuxConstants.TERMUX_HOME_DIR_PATH;
+
+        String[] environment = ShellUtils.buildEnvironment(executionCommand.isFailsafe, executionCommand.workingDirectory);
+        boolean isLoginShell = false;
+
+        if (executionCommand.executable == null) {
+            if (!executionCommand.isFailsafe) {
+                for (String shellBinary : new String[]{"login", "bash", "zsh"}) {
+                    File shellFile = new File(TermuxConstants.TERMUX_BIN_PREFIX_DIR_PATH, shellBinary);
+                    if (shellFile.canExecute()) {
+                        executionCommand.executable = shellFile.getAbsolutePath();
+                        break;
+                    }
+                }
+            }
+
+            if (executionCommand.executable == null) {
+                // Fall back to system shell as last resort:
+                executionCommand.executable = "/system/bin/sh";
+            }
+            isLoginShell = true;
+        }
+
+        String[] processArgs = ShellUtils.setupProcessArgs(executionCommand.executable, executionCommand.arguments);
+
+        executionCommand.executable = processArgs[0];
+        String processName = (isLoginShell ? "-" : "") + ShellUtils.getExecutableBasename(executionCommand.executable);
+
+        String[] arguments = new String[processArgs.length];
+        arguments[0] = processName;
+        if (processArgs.length > 1) System.arraycopy(processArgs, 1, arguments, 1, processArgs.length - 1);
+
+        executionCommand.arguments = arguments;
+
+        if(!executionCommand.setState(ExecutionCommand.ExecutionState.EXECUTING))
+            return null;
+
+        Logger.logDebug(LOG_TAG, executionCommand.toString());
+
+        TerminalSession terminalSession = new TerminalSession(executionCommand.executable, executionCommand.workingDirectory, executionCommand.arguments, environment, termuxSessionClient);
+
+        if (sessionName != null) {
+            terminalSession.mSessionName = sessionName;
+        }
+
+        return new TermuxSession(terminalSession, executionCommand);
+    }
+
+    public TerminalSession getTerminalSession() {
+        return mTerminalSession;
+    }
+
+    public ExecutionCommand getExecutionCommand() {
+        return mExecutionCommand;
+    }
+
+}
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxSessionClient.java b/app/src/main/java/com/termux/app/terminal/TermuxSessionClient.java
index c3e4df7fd3..8901e1f469 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxSessionClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxSessionClient.java
@@ -27,7 +27,6 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.InputStream;
-import java.util.List;
 import java.util.Properties;
 
 public class TermuxSessionClient extends TermuxSessionClientBase {
@@ -68,7 +67,7 @@ public void onTitleChanged(TerminalSession updatedSession) {
             mActivity.showToast(toToastTitle(updatedSession), true);
         }
 
-        terminalSessionListNotifyUpdated();
+        termuxSessionListNotifyUpdated();
     }
 
     @Override
@@ -81,7 +80,7 @@ public void onSessionFinished(final TerminalSession finishedSession) {
 
         if (mActivity.isVisible() && finishedSession != mActivity.getCurrentSession()) {
             // Show toast for non-current sessions that exit.
-            int indexOfSession = mActivity.getTermuxService().getSessions().indexOf(finishedSession);
+            int indexOfSession = mActivity.getTermuxService().getIndexOfSession(finishedSession);
             // Verify that session was not removed before we got told about it finishing:
             if (indexOfSession >= 0)
                 mActivity.showToast(toToastTitle(finishedSession) + " - exited", true);
@@ -90,7 +89,7 @@ public void onSessionFinished(final TerminalSession finishedSession) {
         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 (mActivity.getTermuxService().getSessions().size() > 1) {
+            if (mActivity.getTermuxService().getTermuxSessionsSize() > 1) {
                 removeFinishedSession(finishedSession);
             }
         } else {
@@ -100,8 +99,6 @@ public void onSessionFinished(final TerminalSession finishedSession) {
                 removeFinishedSession(finishedSession);
             }
         }
-
-        terminalSessionListNotifyUpdated();
     }
 
     @Override
@@ -138,38 +135,49 @@ public void onColorsChanged(TerminalSession changedSession) {
 
 
 
-    /** Try switching to session and note about it, but do nothing if already displaying the session. */
+    /** Try switching to session. */
     public void setCurrentSession(TerminalSession session) {
+        if(session == null) return;
+
         if (mActivity.getTerminalView().attachSession(session)) {
-            noteSessionInfo();
-            updateBackgroundColor();
+            // notify about switched session if not already displaying the session
+            notifyOfSessionChange();
         }
+
+        // We call the following even when the session is already being displayed since config may
+        // be stale, like current session not selected or scrolled to.
+        checkAndScrollToSession(session);
+        updateBackgroundColor();
     }
 
-    void noteSessionInfo() {
+    void notifyOfSessionChange() {
         if (!mActivity.isVisible()) return;
 
         TerminalSession session = mActivity.getCurrentSession();
-        final int indexOfSession = mActivity.getTermuxService().getSessions().indexOf(session);
         mActivity.showToast(toToastTitle(session), false);
-        terminalSessionListNotifyUpdated();
-
-        final ListView termuxSessionsListView = mActivity.findViewById(R.id.terminal_sessions_list);
-        termuxSessionsListView.setItemChecked(indexOfSession, true);
-        termuxSessionsListView.smoothScrollToPosition(indexOfSession);
     }
 
     public void switchToSession(boolean forward) {
         TermuxService service = mActivity.getTermuxService();
 
-        TerminalSession currentSession = mActivity.getCurrentSession();
-        int index = service.getSessions().indexOf(currentSession);
+        TerminalSession currentTerminalSession = mActivity.getCurrentSession();
+        int index = service.getIndexOfSession(currentTerminalSession);
+        int size = service.getTermuxSessionsSize();
         if (forward) {
-            if (++index >= service.getSessions().size()) index = 0;
+            if (++index >= size) index = 0;
         } else {
-            if (--index < 0) index = service.getSessions().size() - 1;
+            if (--index < 0) index = size - 1;
         }
-        setCurrentSession(service.getSessions().get(index));
+
+        TermuxSession termuxSession = service.getTermuxSession(index);
+        if(termuxSession != null)
+            setCurrentSession(termuxSession.getTerminalSession());
+    }
+
+    public void switchToSession(int index) {
+        TermuxSession termuxSession = mActivity.getTermuxService().getTermuxSession(index);
+        if(termuxSession != null)
+            setCurrentSession(termuxSession.getTerminalSession());
     }
 
     @SuppressLint("InflateParams")
@@ -178,12 +186,12 @@ public void renameSession(final TerminalSession sessionToRename) {
 
         DialogUtils.textInput(mActivity, R.string.title_rename_session, sessionToRename.mSessionName, R.string.action_rename_session_confirm, text -> {
             sessionToRename.mSessionName = text;
-            terminalSessionListNotifyUpdated();
+            termuxSessionListNotifyUpdated();
         }, -1, null, -1, null, null);
     }
 
     public void addNewSession(boolean isFailSafe, String sessionName) {
-        if (mActivity.getTermuxService().getSessions().size() >= MAX_SESSIONS) {
+        if (mActivity.getTermuxService().getTermuxSessionsSize() >= MAX_SESSIONS) {
             new AlertDialog.Builder(mActivity).setTitle(R.string.title_max_terminals_reached).setMessage(R.string.msg_max_terminals_reached)
                 .setPositiveButton(android.R.string.ok, null).show();
         } else {
@@ -196,11 +204,12 @@ public void addNewSession(boolean isFailSafe, String sessionName) {
                 workingDirectory = currentSession.getCwd();
             }
 
-            TerminalSession newSession = mActivity.getTermuxService().createTerminalSession(null, null, workingDirectory, isFailSafe);
-            if (sessionName != null) {
-                newSession.mSessionName = sessionName;
-            }
-            setCurrentSession(newSession);
+            TermuxSession newTermuxSession = mActivity.getTermuxService().createTermuxSession(null, null, workingDirectory, isFailSafe, sessionName);
+            if (newTermuxSession == null) return;
+
+            TerminalSession newTerminalSession = newTermuxSession.getTerminalSession();
+            setCurrentSession(newTerminalSession);
+
             mActivity.getDrawer().closeDrawers();
         }
     }
@@ -222,8 +231,11 @@ public TerminalSession getCurrentStoredSessionOrLast() {
             return stored;
         } else {
             // Else return the last session currently running
-            List<TerminalSession> sessions = mActivity.getTermuxService().getSessions();
-            return sessions.isEmpty() ? null : sessions.get(sessions.size() - 1);
+            TermuxSession termuxSession = mActivity.getTermuxService().getLastTermuxSession();
+            if(termuxSession != null)
+                return termuxSession.getTerminalSession();
+            else
+                return null;
         }
     }
 
@@ -235,41 +247,50 @@ private TerminalSession getCurrentStoredSession(TermuxActivity context) {
             return null;
 
         // Check if the session handle found matches one of the currently running sessions
-        List<TerminalSession> sessions = context.getTermuxService().getSessions();
-        for (int i = 0, len = sessions.size(); i < len; i++) {
-            TerminalSession session = sessions.get(i);
-            if (session.mHandle.equals(sessionHandle))
-                return session;
-        }
-
-        return null;
+        return context.getTermuxService().getTerminalSessionForHandle(sessionHandle);
     }
 
     public void removeFinishedSession(TerminalSession finishedSession) {
         // Return pressed with finished session - remove it.
         TermuxService service = mActivity.getTermuxService();
 
-        int index = service.removeTerminalSession(finishedSession);
-        terminalSessionListNotifyUpdated();
-        if (mActivity.getTermuxService().getSessions().isEmpty()) {
+        int index = service.removeTermuxSession(finishedSession);
+        int size = mActivity.getTermuxService().getTermuxSessionsSize();
+        if (size == 0) {
             // There are no sessions to show, so finish the activity.
             mActivity.finishActivityIfNotFinishing();
         } else {
-            if (index >= service.getSessions().size()) {
-                index = service.getSessions().size() - 1;
+            if (index >= size) {
+                index = size - 1;
             }
-            setCurrentSession(service.getSessions().get(index));
+            TermuxSession termuxSession = service.getTermuxSession(index);
+            if(termuxSession != null)
+                setCurrentSession(termuxSession.getTerminalSession());
         }
     }
 
-    public void terminalSessionListNotifyUpdated() {
-        mActivity.terminalSessionListNotifyUpdated();
+    public void termuxSessionListNotifyUpdated() {
+        mActivity.termuxSessionListNotifyUpdated();
     }
 
+    public void checkAndScrollToSession(TerminalSession session) {
+        if (!mActivity.isVisible()) return;
+        final int indexOfSession = mActivity.getTermuxService().getIndexOfSession(session);
+        if (indexOfSession < 0) return;
+        final ListView termuxSessionsListView = mActivity.findViewById(R.id.terminal_sessions_list);
+        if(termuxSessionsListView == null) return;
+
+        termuxSessionsListView.setItemChecked(indexOfSession, true);
+        // Delay is necessary otherwise sometimes scroll to newly added session does not happen
+        termuxSessionsListView.postDelayed(() -> termuxSessionsListView.smoothScrollToPosition(indexOfSession), 1000);
+
+        Logger.logError("scrolled to " + indexOfSession);
+    }
 
 
     String toToastTitle(TerminalSession session) {
-        final int indexOfSession = mActivity.getTermuxService().getSessions().indexOf(session);
+        final int indexOfSession = mActivity.getTermuxService().getIndexOfSession(session);
+        if (indexOfSession < 0) return null;
         StringBuilder toastTitle = new StringBuilder("[" + (indexOfSession + 1) + "]");
         if (!TextUtils.isEmpty(session.mSessionName)) {
             toastTitle.append(" ").append(session.mSessionName);
@@ -311,6 +332,7 @@ public void checkForFontAndColors() {
     }
 
     public void updateBackgroundColor() {
+        if (!mActivity.isVisible()) return;
         TerminalSession session = mActivity.getCurrentSession();
         if (session != null && session.getEmulator() != null) {
             mActivity.getWindow().getDecorView().setBackgroundColor(session.getEmulator().mColors.mCurrentColors[TextStyle.COLOR_INDEX_BACKGROUND]);
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxSessionsListViewController.java b/app/src/main/java/com/termux/app/terminal/TermuxSessionsListViewController.java
index 9951b07132..94ea9de541 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxSessionsListViewController.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxSessionsListViewController.java
@@ -24,14 +24,14 @@
 
 import java.util.List;
 
-public class TermuxSessionsListViewController extends ArrayAdapter<TerminalSession> implements AdapterView.OnItemClickListener, AdapterView.OnItemLongClickListener {
+public class TermuxSessionsListViewController extends ArrayAdapter<TermuxSession> implements AdapterView.OnItemClickListener, AdapterView.OnItemLongClickListener {
 
     final TermuxActivity mActivity;
 
     final StyleSpan boldSpan = new StyleSpan(Typeface.BOLD);
     final StyleSpan italicSpan = new StyleSpan(Typeface.ITALIC);
 
-    public TermuxSessionsListViewController(TermuxActivity activity, List<TerminalSession> sessionList) {
+    public TermuxSessionsListViewController(TermuxActivity activity, List<TermuxSession> sessionList) {
         super(activity.getApplicationContext(), R.layout.item_terminal_sessions_list, sessionList);
         this.mActivity = activity;
     }
@@ -48,7 +48,7 @@ public View getView(int position, View convertView, @NonNull ViewGroup parent) {
 
         TextView sessionTitleView = sessionRowView.findViewById(R.id.session_title);
 
-        TerminalSession sessionAtRow = getItem(position);
+        TerminalSession sessionAtRow = getItem(position).getTerminalSession();
         if (sessionAtRow == null) {
             sessionTitleView.setText("null session");
             return sessionRowView;
@@ -91,16 +91,16 @@ public View getView(int position, View convertView, @NonNull ViewGroup parent) {
 
     @Override
     public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-        TerminalSession clickedSession = getItem(position);
-        mActivity.getTermuxSessionClient().setCurrentSession(clickedSession);
+        TermuxSession clickedSession = getItem(position);
+        mActivity.getTermuxSessionClient().setCurrentSession(clickedSession.getTerminalSession());
         mActivity.getDrawer().closeDrawers();
 
     }
 
     @Override
     public boolean onItemLongClick(AdapterView<?> parent, View view, int position, long id) {
-        final TerminalSession selectedSession = getItem(position);
-        mActivity.getTermuxSessionClient().renameSession(selectedSession);
+        final TermuxSession selectedSession = getItem(position);
+        mActivity.getTermuxSessionClient().renameSession(selectedSession.getTerminalSession());
         return true;
     }
 
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxViewClient.java b/app/src/main/java/com/termux/app/terminal/TermuxViewClient.java
index 98d5d14675..9bcf48d8fb 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxViewClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxViewClient.java
@@ -20,7 +20,6 @@
 
 import com.termux.R;
 import com.termux.app.TermuxActivity;
-import com.termux.app.TermuxService;
 import com.termux.app.terminal.io.KeyboardShortcut;
 import com.termux.app.terminal.io.extrakeys.ExtraKeysView;
 import com.termux.app.settings.properties.TermuxPropertyConstants;
@@ -135,10 +134,8 @@ public boolean onKeyDown(int keyCode, KeyEvent e, TerminalSession currentSession
             } else if (unicodeChar == '-') {
                 changeFontSize(false);
             } else if (unicodeChar >= '1' && unicodeChar <= '9') {
-                int num = unicodeChar - '1';
-                TermuxService service = mActivity.getTermuxService();
-                if (service.getSessions().size() > num)
-                    mTermuxSessionClient.setCurrentSession(service.getSessions().get(num));
+                int index = unicodeChar - '1';
+                mTermuxSessionClient.switchToSession(index);
             }
             return true;
         }

From 249f7c6b7cd427e6f252040979e661a70d932d1d Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 25 Mar 2021 09:02:35 +0500
Subject: [PATCH 280/912] Remove BackgroundJob

---
 .../java/com/termux/app/BackgroundJob.java    | 136 ------------------
 1 file changed, 136 deletions(-)
 delete mode 100644 app/src/main/java/com/termux/app/BackgroundJob.java

diff --git a/app/src/main/java/com/termux/app/BackgroundJob.java b/app/src/main/java/com/termux/app/BackgroundJob.java
deleted file mode 100644
index 6a5499afc8..0000000000
--- a/app/src/main/java/com/termux/app/BackgroundJob.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.termux.app;
-
-import android.app.Activity;
-import android.app.PendingIntent;
-import android.content.Intent;
-import android.os.Bundle;
-
-import com.termux.app.utils.Logger;
-import com.termux.app.utils.ShellUtils;
-import com.termux.models.ExecutionCommand;
-import com.termux.models.ExecutionCommand.ExecutionState;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
-
-/**
- * A background job launched by Termux.
- */
-public final class BackgroundJob {
-
-    Process mProcess;
-
-    private static final String LOG_TAG = "BackgroundJob";
-
-    public BackgroundJob(String executable, final String[] arguments, String workingDirectory, final TermuxService service){
-        this(new ExecutionCommand(TermuxService.getNextExecutionId(), executable, arguments, workingDirectory, false, false), service);
-    }
-
-    public BackgroundJob(ExecutionCommand executionCommand, final TermuxService service) {
-        String[] env = ShellUtils.buildEnvironment(false, executionCommand.workingDirectory);
-
-        if (executionCommand.workingDirectory == null || executionCommand.workingDirectory.isEmpty())
-            executionCommand.workingDirectory = TermuxConstants.TERMUX_HOME_DIR_PATH;
-
-        final String[] commandArray = ShellUtils.setupProcessArgs(executionCommand.executable, executionCommand.arguments);
-        final String commandDescription = Arrays.toString(commandArray);
-
-        if(!executionCommand.setState(ExecutionState.EXECUTING))
-            return;
-
-        Process process;
-        try {
-            process = Runtime.getRuntime().exec(commandArray, env, new File(executionCommand.workingDirectory));
-        } catch (IOException e) {
-            mProcess = null;
-            // TODO: Visible error message?
-            Logger.logStackTraceWithMessage(LOG_TAG, "Failed running background job: " + commandDescription, e);
-            return;
-        }
-
-        mProcess = process;
-        final int pid = ShellUtils.getPid(mProcess);
-        final Bundle result = new Bundle();
-        final StringBuilder outResult = new StringBuilder();
-        final StringBuilder errResult = new StringBuilder();
-
-        Thread errThread = new Thread() {
-            @Override
-            public void run() {
-                InputStream stderr = mProcess.getErrorStream();
-                BufferedReader reader = new BufferedReader(new InputStreamReader(stderr, StandardCharsets.UTF_8));
-                String line;
-                try {
-                    // FIXME: Long lines.
-                    while ((line = reader.readLine()) != null) {
-                        errResult.append(line).append('\n');
-                        Logger.logDebug(LOG_TAG, "[" + pid + "] stderr: " + line);
-                    }
-                } catch (IOException e) {
-                    // Ignore.
-                }
-            }
-        };
-        errThread.start();
-
-        new Thread() {
-            @Override
-            public void run() {
-                Logger.logDebug(LOG_TAG, "[" + pid + "] starting: " + commandDescription);
-                InputStream stdout = mProcess.getInputStream();
-                BufferedReader reader = new BufferedReader(new InputStreamReader(stdout, StandardCharsets.UTF_8));
-
-                String line;
-                try {
-                    // FIXME: Long lines.
-                    while ((line = reader.readLine()) != null) {
-                        Logger.logDebug(LOG_TAG, "[" + pid + "] stdout: " + line);
-                        outResult.append(line).append('\n');
-                    }
-                } catch (IOException e) {
-                    Logger.logStackTraceWithMessage(LOG_TAG, "Error reading output", e);
-                }
-
-                try {
-                    int exitCode = mProcess.waitFor();
-                    service.onBackgroundJobExited(BackgroundJob.this);
-                    if (exitCode == 0) {
-                        Logger.logDebug(LOG_TAG, "[" + pid + "] exited normally");
-                    } else {
-                        Logger.logDebug(LOG_TAG, "[" + pid + "] exited with code: " + exitCode);
-                    }
-
-                    result.putString("stdout", outResult.toString());
-                    result.putInt("exitCode", exitCode);
-
-                    errThread.join();
-                    result.putString("stderr", errResult.toString());
-
-                    if(!executionCommand.setState(ExecutionState.EXECUTED))
-                        return;
-
-                    Intent data = new Intent();
-                    data.putExtra("result", result);
-
-                    if(executionCommand.pluginPendingIntent != null) {
-                        try {
-                            executionCommand.pluginPendingIntent.send(service.getApplicationContext(), Activity.RESULT_OK, data);
-                        } catch (PendingIntent.CanceledException e) {
-                            // The caller doesn't want the result? That's fine, just ignore
-                        }
-                    }
-
-                    executionCommand.setState(ExecutionState.SUCCESS);
-                } catch (InterruptedException e) {
-                    // Ignore
-                }
-            }
-        }.start();
-    }
-
-}

From df03f0b7d6cb672c84e6e013e27dc072d9072523 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 25 Mar 2021 09:02:59 +0500
Subject: [PATCH 281/912] Update TermuxConstants

The `TermuxConstants` classes has been updated to `v0.12.0`. Check its Changelog sections for info on changes.
---
 app/src/main/java/com/termux/app/TermuxConstants.java | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/termux/app/TermuxConstants.java b/app/src/main/java/com/termux/app/TermuxConstants.java
index f578509002..202514e641 100644
--- a/app/src/main/java/com/termux/app/TermuxConstants.java
+++ b/app/src/main/java/com/termux/app/TermuxConstants.java
@@ -5,7 +5,7 @@
 import java.io.File;
 
 /*
- * Version: v0.11.0
+ * Version: v0.12.0
  *
  * Changelog
  *
@@ -76,6 +76,11 @@
  *      - Added following to `RUN_COMMAND_SERVICE`:
  *          `EXTRA_COMMAND_LABEL`, `EXTRA_COMMAND_DESCRIPTION`, `EXTRA_COMMAND_HELP`.
  *      - Updated `RESULT_BUNDLE` related extras with `PLUGIN_RESULT_BUNDLE` prefixes.
+ *
+ * - 0.12.0 (2021-03-25)
+ *      - Added following to `TERMUX_SERVICE`:
+ *          `EXTRA_PLUGIN_RESULT_BUNDLE_STDOUT_ORIGINAL_LENGTH`,
+ *          `EXTRA_PLUGIN_RESULT_BUNDLE_STDERR_ORIGINAL_LENGTH`.
  */
 
 /**
@@ -486,8 +491,12 @@ public static final class TERMUX_SERVICE {
             public static final String EXTRA_PLUGIN_RESULT_BUNDLE = "result"; // Default: "result"
             /** Intent {@code String} extra for stdout value of execute command of the {@link #EXTRA_PLUGIN_RESULT_BUNDLE} */
             public static final String EXTRA_PLUGIN_RESULT_BUNDLE_STDOUT = "stdout"; // Default: "stdout"
+            /** Intent {@code String} extra for original length of stdout value of execute command of the {@link #EXTRA_PLUGIN_RESULT_BUNDLE} */
+            public static final String EXTRA_PLUGIN_RESULT_BUNDLE_STDOUT_ORIGINAL_LENGTH = "stdout_original_length"; // Default: "stdout_original_length"
             /** Intent {@code String} extra for stderr value of execute command of the {@link #EXTRA_PLUGIN_RESULT_BUNDLE} */
             public static final String EXTRA_PLUGIN_RESULT_BUNDLE_STDERR = "stderr"; // Default: "stderr"
+            /** Intent {@code String} extra for original length of stderr value of execute command of the {@link #EXTRA_PLUGIN_RESULT_BUNDLE} */
+            public static final String EXTRA_PLUGIN_RESULT_BUNDLE_STDERR_ORIGINAL_LENGTH = "stderr_original_length"; // Default: "stderr_original_length"
             /** Intent {@code int} extra for exit code value of execute command of the {@link #EXTRA_PLUGIN_RESULT_BUNDLE} */
             public static final String EXTRA_PLUGIN_RESULT_BUNDLE_EXIT_CODE = "exitCode"; // Default: "exitCode"
             /** Intent {@code int} extra for err value of execute command of the {@link #EXTRA_PLUGIN_RESULT_BUNDLE} */

From 922f4f4ae5f201c8737c6d70e3f49ca1b4ab564d Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 25 Mar 2021 09:08:45 +0500
Subject: [PATCH 282/912] Update TextDataUtils.getTruncatedCommandOutput() to
 support truncation from start or end and for (truncated) prefix

---
 .../termux/app/terminal/TermuxViewClient.java |  3 +-
 .../com/termux/app/utils/TextDataUtils.java   | 34 ++++++++++++++-----
 2 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/termux/app/terminal/TermuxViewClient.java b/app/src/main/java/com/termux/app/terminal/TermuxViewClient.java
index 9bcf48d8fb..1f72349353 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxViewClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxViewClient.java
@@ -336,12 +336,13 @@ public void shareSessionTranscript() {
         if (session == null) return;
 
         String transcriptText = session.getEmulator().getScreen().getTranscriptTextWithoutJoinedLines().trim();
+        if (transcriptText == null) return;
 
         try {
             // See https://github.com/termux/termux-app/issues/1166.
             Intent intent = new Intent(Intent.ACTION_SEND);
             intent.setType("text/plain");
-            transcriptText = TextDataUtils.getTruncatedCommandOutput(transcriptText, 100_000);
+            transcriptText = TextDataUtils.getTruncatedCommandOutput(transcriptText, TextDataUtils.TRANSACTION_SIZE_LIMIT_IN_BYTES, false, true, false).trim();
             intent.putExtra(Intent.EXTRA_TEXT, transcriptText);
             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)));
diff --git a/app/src/main/java/com/termux/app/utils/TextDataUtils.java b/app/src/main/java/com/termux/app/utils/TextDataUtils.java
index fdde1b072c..2ab2a01551 100644
--- a/app/src/main/java/com/termux/app/utils/TextDataUtils.java
+++ b/app/src/main/java/com/termux/app/utils/TextDataUtils.java
@@ -8,18 +8,36 @@
 
 public class TextDataUtils {
 
-    // https://cs.android.com/androidx/platform/frameworks/support/+/androidx-main:media2/media2-session/src/main/java/androidx/media2/session/MediaUtils.java
-    public static final int TRANSACTION_SIZE_LIMIT_IN_BYTES = 256 * 1024; // 256KB
+    public static final int TRANSACTION_SIZE_LIMIT_IN_BYTES = 100 * 1024; // 100KB
+    public static final int LOGGER_ENTRY_SIZE_LIMIT_IN_BYTES = 4 * 1024; // 4KB
 
-    public static String getTruncatedCommandOutput(String text, int maxLength) {
-        if (text.length() > maxLength) {
+    public static String getTruncatedCommandOutput(String text, int maxLength, boolean fromEnd, boolean onNewline, boolean addPrefix) {
+        if(text == null) return null;
+
+        String prefix = "(truncated) ";
+
+        if(addPrefix)
+            maxLength = maxLength - prefix.length();
+
+        if(maxLength < 0 || text.length() < maxLength) return text;
+
+        if (fromEnd) {
+            text = text.substring(0, Math.min(text.length(), maxLength));
+        } else {
             int cutOffIndex = text.length() - maxLength;
-            int nextNewlineIndex = text.indexOf('\n', cutOffIndex);
-            if (nextNewlineIndex != -1 && nextNewlineIndex != text.length() - 1) {
-                cutOffIndex = nextNewlineIndex + 1;
+
+            if(onNewline) {
+                int nextNewlineIndex = text.indexOf('\n', cutOffIndex);
+                if (nextNewlineIndex != -1 && nextNewlineIndex != text.length() - 1) {
+                    cutOffIndex = nextNewlineIndex + 1;
+                }
             }
-            text = text.substring(cutOffIndex).trim();
+            text = text.substring(cutOffIndex);
         }
+
+        if(addPrefix)
+            text = prefix + text;
+
         return text;
     }
 

From 7ca20fdeb3c7d6262fab9f32b3887d67345bcd75 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 25 Mar 2021 09:20:09 +0500
Subject: [PATCH 283/912] Update ExecutionCommand to make current and previous
 state private to prevent direct modification

- Helper functions are now provided to check for common states. The currentState and previousState must only be modified via setState()
- Some errCode values are also provided to prevent hardcoded value usage.
- The stdout, stderr and arguments will now be truncated for logcat to honour its LOGGER_ENTRY_MAX_LEN limits
---
 .../com/termux/app/RunCommandService.java     |  8 +--
 .../com/termux/models/ExecutionCommand.java   | 66 ++++++++++++++-----
 2 files changed, 52 insertions(+), 22 deletions(-)

diff --git a/app/src/main/java/com/termux/app/RunCommandService.java b/app/src/main/java/com/termux/app/RunCommandService.java
index d91ed52cec..9bc1326a39 100644
--- a/app/src/main/java/com/termux/app/RunCommandService.java
+++ b/app/src/main/java/com/termux/app/RunCommandService.java
@@ -193,7 +193,7 @@ public int onStartCommand(Intent intent, int flags, int startId) {
         // 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(1, errmsg, null);
+            executionCommand.setStateFailed(ExecutionCommand.RESULT_CODE_FAILED, errmsg, null);
             PluginUtils.processPluginExecutionCommandError(this, LOG_TAG, executionCommand);
             return Service.START_NOT_STICKY;
         }
@@ -213,7 +213,7 @@ public int onStartCommand(Intent intent, int flags, int startId) {
         // If "allow-external-apps" property to not set to "true", then just return
         errmsg = PluginUtils.checkIfRunCommandServiceAllowExternalAppsPolicyIsViolated(this);
         if (errmsg != null) {
-            executionCommand.setStateFailed(1, errmsg, null);
+            executionCommand.setStateFailed(ExecutionCommand.RESULT_CODE_FAILED, errmsg, null);
             PluginUtils.processPluginExecutionCommandError(this, LOG_TAG, executionCommand);
             return Service.START_NOT_STICKY;
         }
@@ -228,7 +228,7 @@ public int onStartCommand(Intent intent, int flags, int startId) {
             false, false);
         if (errmsg != null) {
             errmsg  += "\n" + this.getString(R.string.msg_executable_absolute_path, executionCommand.executable);
-            executionCommand.setStateFailed(1, errmsg, null);
+            executionCommand.setStateFailed(ExecutionCommand.RESULT_CODE_FAILED, errmsg, null);
             PluginUtils.processPluginExecutionCommandError(this, LOG_TAG, executionCommand);
             return Service.START_NOT_STICKY;
         }
@@ -249,7 +249,7 @@ public int onStartCommand(Intent intent, int flags, int startId) {
                 true);
             if (errmsg != null) {
                 errmsg  += "\n" + this.getString(R.string.msg_working_directory_absolute_path, executionCommand.workingDirectory);
-                executionCommand.setStateFailed(1, errmsg, null);
+                executionCommand.setStateFailed(ExecutionCommand.RESULT_CODE_FAILED, errmsg, null);
                 PluginUtils.processPluginExecutionCommandError(this, LOG_TAG, executionCommand);
                 return Service.START_NOT_STICKY;
             }
diff --git a/app/src/main/java/com/termux/models/ExecutionCommand.java b/app/src/main/java/com/termux/models/ExecutionCommand.java
index fa94498c71..b306bfdd9e 100644
--- a/app/src/main/java/com/termux/models/ExecutionCommand.java
+++ b/app/src/main/java/com/termux/models/ExecutionCommand.java
@@ -1,5 +1,6 @@
 package com.termux.models;
 
+import android.app.Activity;
 import android.app.PendingIntent;
 import android.net.Uri;
 
@@ -49,14 +50,20 @@ public int getValue() {
 
     }
 
+    // Define errCode values
+    // TODO: Define custom values for different cases
+    public final static int	RESULT_CODE_OK = Activity.RESULT_OK;
+    public final static int	RESULT_CODE_OK_MINOR_FAILURES = Activity.RESULT_FIRST_USER;
+    public final static int	RESULT_CODE_FAILED = Activity.RESULT_FIRST_USER + 1;
+
     /** The optional unique id for the {@link ExecutionCommand}. */
     public Integer id;
 
 
     /** The current state of the {@link ExecutionCommand}. */
-    public ExecutionState currentState = ExecutionState.PRE_EXECUTION;
+    private ExecutionState currentState = ExecutionState.PRE_EXECUTION;
     /** The previous state of the {@link ExecutionCommand}. */
-    public ExecutionState previousState = ExecutionState.PRE_EXECUTION;
+    private ExecutionState previousState = ExecutionState.PRE_EXECUTION;
 
 
     /** The executable for the {@link ExecutionCommand}. */
@@ -110,7 +117,7 @@ public int getValue() {
 
 
     /** The internal error code of {@link ExecutionCommand}. */
-    public Integer errCode;
+    public Integer errCode = RESULT_CODE_OK;
     /** The internal error message of {@link ExecutionCommand}. */
     public String errmsg;
     /** The internal exceptions of {@link ExecutionCommand}. */
@@ -137,7 +144,7 @@ public ExecutionCommand(Integer id, String executable, String[] arguments, Strin
     @NonNull
     @Override
     public String toString() {
-        if(currentState.getValue() < ExecutionState.EXECUTED.getValue())
+        if(!hasExecuted())
             return getExecutionInputLogString(this, true);
         else {
             return getExecutionOutputLogString(this, true);
@@ -156,8 +163,7 @@ public static String getExecutionInputLogString(ExecutionCommand executionComman
 
         StringBuilder logString = new StringBuilder();
 
-        logString.append(executionCommand.getIdLogString());
-        logString.append(executionCommand.getCommandLabelLogString()).append(":");
+        logString.append(executionCommand.getCommandIdAndLabelLogString()).append(":");
 
         if(executionCommand.previousState != ExecutionState.PRE_EXECUTION)
             logString.append("\n").append(executionCommand.getPreviousStateLogString());
@@ -194,8 +200,7 @@ public static String getExecutionOutputLogString(ExecutionCommand executionComma
 
         StringBuilder logString = new StringBuilder();
 
-        logString.append(executionCommand.getIdLogString());
-        logString.append(executionCommand.getCommandLabelLogString()).append(":");
+        logString.append(executionCommand.getCommandIdAndLabelLogString()).append(":");
 
         logString.append("\n").append(executionCommand.getPreviousStateLogString());
         logString.append("\n").append(executionCommand.getCurrentStateLogString());
@@ -219,7 +224,7 @@ public static String getExecutionOutputLogString(ExecutionCommand executionComma
     public static String getExecutionErrLogString(ExecutionCommand executionCommand, boolean ignoreNull) {
         StringBuilder logString = new StringBuilder();
 
-        if(!ignoreNull || (executionCommand.errCode != null && executionCommand.errCode != 0)) {
+        if(!ignoreNull || (executionCommand.isStateFailed())) {
             logString.append("\n").append(executionCommand.getErrCodeLogString());
             logString.append("\n").append(executionCommand.getErrmsgLogString());
             logString.append("\n").append(executionCommand.geStackTracesLogString());
@@ -332,6 +337,10 @@ public String getCommandLabelLogString() {
             return "Execution Command";
     }
 
+    public String getCommandIdAndLabelLogString() {
+        return getIdLogString() + getCommandLabelLogString();
+    }
+
     public String getExecutableLogString() {
         return "Executable: `" + executable + "`";
     }
@@ -380,11 +389,11 @@ public String getPluginAPIHelpLogString() {
     }
 
     public String getStdoutLogString() {
-        return getMultiLineLogStringEntry("Stdout", stdout, "-");
+        return getMultiLineLogStringEntry("Stdout", TextDataUtils.getTruncatedCommandOutput(stdout, TextDataUtils.LOGGER_ENTRY_SIZE_LIMIT_IN_BYTES / 5, false, false, true), "-");
     }
 
     public String getStderrLogString() {
-        return getMultiLineLogStringEntry("Stderr", stderr, "-");
+        return getMultiLineLogStringEntry("Stderr", TextDataUtils.getTruncatedCommandOutput(stderr, TextDataUtils.LOGGER_ENTRY_SIZE_LIMIT_IN_BYTES / 5, false, false, true), "-");
     }
 
     public String getExitCodeLogString() {
@@ -464,7 +473,9 @@ public static String getArgumentsLogString(String[] argumentsArray) {
         if (argumentsArray != null && argumentsArray.length != 0) {
             argumentsString.append("\n```\n");
             for (int i = 0; i != argumentsArray.length; i++) {
-                argumentsString.append(getSingleLineLogStringEntry("Arg " + (i + 1), argumentsArray[i], "-")).append("`\n");
+                argumentsString.append(getSingleLineLogStringEntry("Arg " + (i + 1),
+                    TextDataUtils.getTruncatedCommandOutput(argumentsArray[i], TextDataUtils.LOGGER_ENTRY_SIZE_LIMIT_IN_BYTES / 5, true, false, true),
+                    "-")).append("`\n");
             }
             argumentsString.append("```");
         } else{
@@ -495,7 +506,7 @@ public static String getMultiLineLogStringEntry( String label, Object object,Str
     public boolean setState(ExecutionState newState) {
         // The state transition cannot go back or change if already at {@link ExecutionState#SUCCESS}
         if(newState.getValue() < currentState.getValue() || currentState == ExecutionState.SUCCESS) {
-            Logger.logError("Invalid ExecutionCommand state transition from \"" + currentState.getName() + "\" to " +  "\"" + newState.getName() + "\"");
+            Logger.logError("Invalid "+ getCommandIdAndLabelLogString() + " state transition from \"" + currentState.getName() + "\" to " +  "\"" + newState.getName() + "\"");
             return false;
         }
 
@@ -510,15 +521,18 @@ public boolean setState(ExecutionState newState) {
     }
 
     public boolean setStateFailed(int errCode, String errmsg,  Throwable throwable) {
-        if(errCode < 1)
-            return false;
+        if (errCode > RESULT_CODE_OK) {
+            this.errCode = errCode;
+        } else {
+            Logger.logWarn("Ignoring invalid "  + getCommandIdAndLabelLogString() + " errCode value \"" + errCode + "\". Force setting it to RESULT_CODE_FAILED \"" + RESULT_CODE_FAILED + "\"");
+            this.errCode = RESULT_CODE_FAILED;
+        }
+
+        this.errmsg = errmsg;
 
         if(!setState(ExecutionState.FAILED))
             return false;
 
-        this.errCode = errCode;
-        this.errmsg = errmsg;
-
         if(this.throwableList == null)
             this.throwableList =  new ArrayList<>();
 
@@ -528,4 +542,20 @@ public boolean setStateFailed(int errCode, String errmsg,  Throwable throwable)
         return true;
     }
 
+    public boolean isStateFailed() {
+        if(currentState != ExecutionState.FAILED)
+            return false;
+
+        if(errCode <= RESULT_CODE_OK) {
+            Logger.logWarn("The "  + getCommandIdAndLabelLogString() + " has an invalid errCode value \"" + errCode + "\" while having ExecutionState.FAILED state.");
+            return false;
+        } else {
+            return true;
+        }
+    }
+
+    public boolean hasExecuted() {
+        return currentState.getValue() >= ExecutionState.EXECUTED.getValue();
+    }
+
 }

From f62febbfb7b2221d66413fe588c7ad5b631d4b20 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 25 Mar 2021 09:47:59 +0500
Subject: [PATCH 284/912] Add the TermuxTask class for linking a Process to an
 ExecutionCommand.

TermuxTask will maintain info for background Termux tasks. Each task started by TermuxService will now be linked to a ExecutionCommand that started it.

- StreamGobbler class has also been imported from https://github.com/Chainfire/libsuperuser and partially modified to read stdout and stderr of background commands. This should likely be much safer and efficient.
- Logging of every line has been disabled unless log level is set to verbose. This should have a performance increase and also prevent potentially private user data to be sent to logcat.
- This also solves the bug where Termux:Tasker would hang indefinitely if Runtime.getRuntime().exec raised an exception, like for invalid or missing interpreter errors and Termux:Tasker wasn't notified of it. Now the errmsg will be used to send any exceptions back to Termux:Tasker and other 3rd party calls.
- This also solves the bug where stdout or stderr were too large in size and TransactionTooLargeException exception was raised and result TERMUX_SERVICE.EXTRA_PENDING_INTENT pending intent failed to be sent to the caller. This would have also hung up Termux:Tasker. Now the stdout and stderr sent back in TERMUX_SERVICE.EXTRA_PLUGIN_RESULT_BUNDLE bundle will be truncated from the start to max 100KB combined. The original size of stdout and stderr will be provided in TERMUX_SERVICE.EXTRA_PLUGIN_RESULT_BUNDLE_STDOUT_ORIGINAL_LENGTH and TERMUX_SERVICE.EXTRA_PLUGIN_RESULT_BUNDLE_STDERR_ORIGINAL_LENGTH extras respectively so that the caller can check if either of them were truncated. The errmsg will also be truncated from end to max 25KB to preserve start of stacktraces.
- The PluginUtils.processPluginExecutionCommandResult() has been updated to fully handle the result of plugin execution intents.
---
 .../java/com/termux/app/TermuxService.java    | 100 ++++--
 .../termux/app/terminal/StreamGobbler.java    | 298 ++++++++++++++++++
 .../com/termux/app/terminal/TermuxTask.java   | 140 ++++++++
 .../com/termux/app/utils/PluginUtils.java     | 152 ++++++---
 4 files changed, 619 insertions(+), 71 deletions(-)
 create mode 100644 app/src/main/java/com/termux/app/terminal/StreamGobbler.java
 create mode 100644 app/src/main/java/com/termux/app/terminal/TermuxTask.java

diff --git a/app/src/main/java/com/termux/app/TermuxService.java b/app/src/main/java/com/termux/app/TermuxService.java
index 379bcdafc6..35058c133b 100644
--- a/app/src/main/java/com/termux/app/TermuxService.java
+++ b/app/src/main/java/com/termux/app/TermuxService.java
@@ -32,6 +32,7 @@
 import com.termux.app.utils.TextDataUtils;
 import com.termux.models.ExecutionCommand;
 import com.termux.models.ExecutionCommand.ExecutionState;
+import com.termux.app.terminal.TermuxTask;
 import com.termux.terminal.TerminalEmulator;
 import com.termux.terminal.TerminalSession;
 import com.termux.terminal.TerminalSessionClient;
@@ -71,7 +72,7 @@ class LocalBinder extends Binder {
     private final Handler mHandler = new Handler();
 
     /**
-     * The termux sessions which this service manages.
+     * The foreground termux sessions which this service manages.
      * Note that this list is observed by {@link TermuxActivity#mTermuxSessionListViewController},
      * so any changes must be made on the UI thread and followed by a call to
      * {@link ArrayAdapter#notifyDataSetChanged()} }.
@@ -79,9 +80,9 @@ class LocalBinder extends Binder {
     final List<TermuxSession> mTermuxSessions = new ArrayList<>();
 
     /**
-     * The background jobs which this service manages.
+     * The background termux tasks which this service manages.
      */
-    final List<BackgroundJob> mBackgroundTasks = new ArrayList<>();
+    final List<TermuxTask> mTermuxTasks = new ArrayList<>();
 
     /** The full implementation of the {@link TerminalSessionClient} interface to be used by {@link TerminalSession}
      * that holds activity references for activity related functions.
@@ -204,8 +205,6 @@ private void requestStopService() {
         stopSelf();
     }
 
-
-
     /** Process action to stop service. */
     private void actionStopService() {
         mWantsToStop = true;
@@ -213,6 +212,17 @@ private void actionStopService() {
         requestStopService();
     }
 
+    /** Finish all termux sessions by sending SIGKILL to their shells. */
+    private synchronized void finishAllTermuxSessions() {
+        // TODO: Should SIGKILL also be send to background processes maintained by mTermuxTasks?
+        for (int i = 0; i < mTermuxSessions.size(); i++)
+            mTermuxSessions.get(i).getTerminalSession().finishIfRunning();
+    }
+
+
+
+
+
     /** Process action to acquire Power and Wi-Fi WakeLocks. */
     @SuppressLint({"WakelockTimeout", "BatteryLife"})
     private void actionAcquireWakeLock() {
@@ -306,36 +316,72 @@ private void actionServiceExecute(Intent intent) {
         executionCommand.pluginPendingIntent = intent.getParcelableExtra(TERMUX_SERVICE.EXTRA_PENDING_INTENT);
 
         if (executionCommand.inBackground) {
-            executeBackgroundCommand(executionCommand);
+            executeTermuxTaskCommand(executionCommand);
         } else {
             executeTermuxSessionCommand(executionCommand);
         }
     }
 
-    /** Execute a shell command in background with {@link BackgroundJob}. */
-    private void executeBackgroundCommand(ExecutionCommand executionCommand) {
+
+
+
+
+    /** Execute a shell command in background {@link TermuxTask}. */
+    private void executeTermuxTaskCommand(ExecutionCommand executionCommand) {
         if (executionCommand == null) return;
-        
-        Logger.logDebug(LOG_TAG, "Starting background command");
+
+        Logger.logDebug(LOG_TAG, "Starting background termux task command");
+
+        TermuxTask newTermuxTask = createTermuxTask(executionCommand);
+    }
+
+    /** Create a {@link TermuxTask}. */
+    @Nullable
+    public TermuxTask createTermuxTask(String executablePath, String[] arguments, String workingDirectory) {
+        return createTermuxTask(new ExecutionCommand(getNextExecutionId(), executablePath, arguments, workingDirectory, true, false));
+    }
+
+    /** Create a {@link TermuxTask}. */
+    @Nullable
+    public synchronized TermuxTask createTermuxTask(ExecutionCommand executionCommand) {
+        if (executionCommand == null) return null;
+
+        Logger.logDebug(LOG_TAG, "Creating termux task");
+
+        if (!executionCommand.inBackground) {
+            Logger.logDebug(LOG_TAG, "Ignoring a foreground execution command passed to createTermuxTask()");
+            return null;
+        }
 
         if(Logger.getLogLevel() >= Logger.LOG_LEVEL_VERBOSE)
             Logger.logVerbose(LOG_TAG, executionCommand.toString());
 
-        BackgroundJob task = new BackgroundJob(executionCommand, this);
+        TermuxTask newTermuxTask = TermuxTask.create(this, executionCommand);
+        if (newTermuxTask == null) {
+            // Logger.logError(LOG_TAG, "Failed to execute new termux task command for:\n" + executionCommand.toString());
+            return null;
+        };
+
+        mTermuxTasks.add(newTermuxTask);
 
-        mBackgroundTasks.add(task);
         updateNotification();
+
+        return newTermuxTask;
     }
 
-    /** Callback received when a {@link BackgroundJob} finishes. */
-    public void onBackgroundJobExited(final BackgroundJob task) {
+    /** Callback received when a {@link TermuxTask} finishes. */
+    public synchronized void onTermuxTaskExited(final TermuxTask task) {
         mHandler.post(() -> {
-            mBackgroundTasks.remove(task);
+            mTermuxTasks.remove(task);
             updateNotification();
         });
     }
 
-    /** Execute a shell command in a foreground terminal session. */
+
+
+
+
+    /** Execute a shell command in a foreground {@link TermuxSession}. */
     private void executeTermuxSessionCommand(ExecutionCommand executionCommand) {
         if (executionCommand == null) return;
         
@@ -357,7 +403,7 @@ private void executeTermuxSessionCommand(ExecutionCommand executionCommand) {
     }
 
     /**
-     * Create a termux session.
+     * Create a {@link TermuxSession}.
      * Currently called by {@link TermuxSessionClient#addNewSession(boolean, String)} to add a new termux session.
      */
     @Nullable
@@ -365,7 +411,7 @@ public TermuxSession createTermuxSession(String executablePath, String[] argumen
         return createTermuxSession(new ExecutionCommand(getNextExecutionId(), executablePath, arguments, workingDirectory, false, isFailSafe), sessionName);
     }
 
-    /** Create a termux session. */
+    /** Create a {@link TermuxSession}. */
     @Nullable
     public synchronized TermuxSession createTermuxSession(ExecutionCommand executionCommand, String sessionName) {
         if (executionCommand == null) return null;
@@ -428,11 +474,7 @@ public synchronized int removeTermuxSession(TerminalSession sessionToRemove) {
         return index;
     }
 
-    /** Finish all termux sessions by sending SIGKILL to their shells. */
-    private synchronized void finishAllTermuxSessions() {
-        for (int i = 0; i < mTermuxSessions.size(); i++)
-            mTermuxSessions.get(i).getTerminalSession().finishIfRunning();
-    }
+
 
 
 
@@ -473,6 +515,10 @@ private void startTermuxActivity() {
         startActivity(new Intent(this, TermuxActivity.class).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
     }
 
+
+
+
+
     /** If {@link TermuxActivity} has not bound to the {@link TermuxService} yet or is destroyed, then
      * interface functions requiring the activity should not be available to the terminal sessions,
      * so we just return the {@link #mTermuxSessionClientBase}. Once {@link TermuxActivity} bind
@@ -519,6 +565,8 @@ public synchronized void unsetTermuxSessionClient() {
 
 
 
+
+
     private Notification buildNotification() {
         Intent notifyIntent = new Intent(this, TermuxActivity.class);
         // PendingIntent#getActivity(): "Note that the activity will be started outside of the context of an existing
@@ -527,7 +575,7 @@ private Notification buildNotification() {
         PendingIntent pendingIntent = PendingIntent.getActivity(this, 0, notifyIntent, 0);
 
         int sessionCount = getTermuxSessionsSize();
-        int taskCount = mBackgroundTasks.size();
+        int taskCount = mTermuxTasks.size();
         String contentText = sessionCount + " session" + (sessionCount == 1 ? "" : "s");
         if (taskCount > 0) {
             contentText += ", " + taskCount + " task" + (taskCount == 1 ? "" : "s");
@@ -587,7 +635,7 @@ private void setupNotificationChannel() {
 
     /** Update the shown foreground service notification after making any changes that affect it. */
     void updateNotification() {
-        if (mWakeLock == null && mTermuxSessions.isEmpty() && mBackgroundTasks.isEmpty()) {
+        if (mWakeLock == null && mTermuxSessions.isEmpty() && mTermuxTasks.isEmpty()) {
             // Exit if we are updating after the user disabled all locks with no sessions or tasks running.
             requestStopService();
         } else {
@@ -597,6 +645,8 @@ void updateNotification() {
 
 
 
+
+
     private void setCurrentStoredTerminalSession(TerminalSession session) {
         if(session == null) return;
         // Make the newly created session the current one to be displayed:
diff --git a/app/src/main/java/com/termux/app/terminal/StreamGobbler.java b/app/src/main/java/com/termux/app/terminal/StreamGobbler.java
new file mode 100644
index 0000000000..48536eeb23
--- /dev/null
+++ b/app/src/main/java/com/termux/app/terminal/StreamGobbler.java
@@ -0,0 +1,298 @@
+/*
+ * Copyright (C) 2012-2019 Jorrit "Chainfire" Jongma
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.termux.app.terminal;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.List;
+import java.util.Locale;
+
+import androidx.annotation.AnyThread;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.WorkerThread;
+
+import com.termux.app.utils.Logger;
+
+/**
+ * Thread utility class continuously reading from an InputStream
+ */
+@SuppressWarnings({"WeakerAccess"})
+public class StreamGobbler extends Thread {
+    private static int threadCounter = 0;
+    private static int incThreadCounter() {
+        synchronized (StreamGobbler.class) {
+            int ret = threadCounter;
+            threadCounter++;
+            return ret;
+        }
+    }
+
+    /**
+     * Line callback interface
+     */
+    public interface OnLineListener {
+        /**
+         * <p>Line callback</p>
+         *
+         * <p>This callback should process the line as quickly as possible.
+         * Delays in this callback may pause the native process or even
+         * result in a deadlock</p>
+         *
+         * @param line String that was gobbled
+         */
+        void onLine(String line);
+    }
+
+    /**
+     * Stream closed callback interface
+     */
+    public interface OnStreamClosedListener {
+        /**
+         * <p>Stream closed callback</p>
+         */
+        void onStreamClosed();
+    }
+
+    @NonNull
+    private final String shell;
+    @NonNull
+    private final InputStream inputStream;
+    @NonNull
+    private final BufferedReader reader;
+    @Nullable
+    private final List<String> listWriter;
+    @Nullable
+    private final StringBuilder stringWriter;
+    @Nullable
+    private final OnLineListener lineListener;
+    @Nullable
+    private final OnStreamClosedListener streamClosedListener;
+    private volatile boolean active = true;
+    private volatile boolean calledOnClose = false;
+
+    private static final String LOG_TAG = "StreamGobbler";
+
+    /**
+     * <p>StreamGobbler constructor</p>
+     *
+     * <p>We use this class because shell STDOUT and STDERR should be read as quickly as
+     * possible to prevent a deadlock from occurring, or Process.waitFor() never
+     * returning (as the buffer is full, pausing the native process)</p>
+     *
+     * @param shell Name of the shell
+     * @param inputStream InputStream to read from
+     * @param outputList {@literal List<String>} to write to, or null
+     */
+    @AnyThread
+    public StreamGobbler(@NonNull String shell, @NonNull InputStream inputStream, @Nullable List<String> outputList) {
+        super("Gobbler#" + incThreadCounter());
+        this.shell = shell;
+        this.inputStream = inputStream;
+        reader = new BufferedReader(new InputStreamReader(inputStream));
+        streamClosedListener = null;
+
+        listWriter = outputList;
+        stringWriter = null;
+        lineListener = null;
+    }
+
+    /**
+     * <p>StreamGobbler constructor</p>
+     *
+     * <p>We use this class because shell STDOUT and STDERR should be read as quickly as
+     * possible to prevent a deadlock from occurring, or Process.waitFor() never
+     * returning (as the buffer is full, pausing the native process)</p>
+     * Do not use this for concurrent reading for STDOUT and STDERR for the same StringBuilder since
+     * its not synchronized.
+     *
+     * @param shell Name of the shell
+     * @param inputStream InputStream to read from
+     * @param outputString {@literal List<String>} to write to, or null
+     */
+    @AnyThread
+    public StreamGobbler(@NonNull String shell, @NonNull InputStream inputStream, @Nullable StringBuilder outputString) {
+        super("Gobbler#" + incThreadCounter());
+        this.shell = shell;
+        this.inputStream = inputStream;
+        reader = new BufferedReader(new InputStreamReader(inputStream));
+        streamClosedListener = null;
+
+        listWriter = null;
+        stringWriter = outputString;
+        lineListener = null;
+    }
+
+    /**
+     * <p>StreamGobbler constructor</p>
+     *
+     * <p>We use this class because shell STDOUT and STDERR should be read as quickly as
+     * possible to prevent a deadlock from occurring, or Process.waitFor() never
+     * returning (as the buffer is full, pausing the native process)</p>
+     *
+     * @param shell Name of the shell
+     * @param inputStream InputStream to read from
+     * @param onLineListener OnLineListener callback
+     * @param onStreamClosedListener OnStreamClosedListener callback
+     */
+    @AnyThread
+    public StreamGobbler(@NonNull String shell, @NonNull InputStream inputStream, @Nullable OnLineListener onLineListener, @Nullable OnStreamClosedListener onStreamClosedListener) {
+        super("Gobbler#" + incThreadCounter());
+        this.shell = shell;
+        this.inputStream = inputStream;
+        reader = new BufferedReader(new InputStreamReader(inputStream));
+        streamClosedListener = onStreamClosedListener;
+
+        listWriter = null;
+        stringWriter = null;
+        lineListener = onLineListener;
+    }
+
+    @Override
+    public void run() {
+        // keep reading the InputStream until it ends (or an error occurs)
+        // optionally pausing when a command is executed that consumes the InputStream itself
+        int logLevel = Logger.getLogLevel();
+        try {
+            String line;
+            while ((line = reader.readLine()) != null) {
+
+                if(logLevel >= Logger.LOG_LEVEL_VERBOSE)
+                    Logger.logVerbose(LOG_TAG, String.format(Locale.ENGLISH, "[%s] %s", shell, line)); // This will get truncated by LOGGER_ENTRY_MAX_LEN, likely 4KB
+
+                if (stringWriter != null) stringWriter.append(line).append("\n");
+                if (listWriter != null) listWriter.add(line);
+                if (lineListener != null) lineListener.onLine(line);
+                while (!active) {
+                    synchronized (this) {
+                        try {
+                            this.wait(128);
+                        } catch (InterruptedException e) {
+                            // no action
+                        }
+                    }
+                }
+            }
+        } catch (IOException e) {
+            // reader probably closed, expected exit condition
+            if (streamClosedListener != null) {
+                calledOnClose = true;
+                streamClosedListener.onStreamClosed();
+            }
+        }
+
+        // make sure our stream is closed and resources will be freed
+        try {
+            reader.close();
+        } catch (IOException e) {
+            // read already closed
+        }
+
+        if (!calledOnClose) {
+            if (streamClosedListener != null) {
+                calledOnClose = true;
+                streamClosedListener.onStreamClosed();
+            }
+        }
+    }
+
+    /**
+     * <p>Resume consuming the input from the stream</p>
+     */
+    @AnyThread
+    public void resumeGobbling() {
+        if (!active) {
+            synchronized (this) {
+                active = true;
+                this.notifyAll();
+            }
+        }
+    }
+
+    /**
+     * <p>Suspend gobbling, so other code may read from the InputStream instead</p>
+     *
+     * <p>This should <i>only</i> be called from the OnLineListener callback!</p>
+     */
+    @AnyThread
+    public void suspendGobbling() {
+        synchronized (this) {
+            active = false;
+            this.notifyAll();
+        }
+    }
+
+    /**
+     * <p>Wait for gobbling to be suspended</p>
+     *
+     * <p>Obviously this cannot be called from the same thread as {@link #suspendGobbling()}</p>
+     */
+    @WorkerThread
+    public void waitForSuspend() {
+        synchronized (this) {
+            while (active) {
+                try {
+                    this.wait(32);
+                } catch (InterruptedException e) {
+                    // no action
+                }
+            }
+        }
+    }
+
+    /**
+     * <p>Is gobbling suspended ?</p>
+     *
+     * @return is gobbling suspended?
+     */
+    @AnyThread
+    public boolean isSuspended() {
+        synchronized (this) {
+            return !active;
+        }
+    }
+
+    /**
+     * <p>Get current source InputStream</p>
+     *
+     * @return source InputStream
+     */
+    @NonNull
+    @AnyThread
+    public InputStream getInputStream() {
+        return inputStream;
+    }
+
+    /**
+     * <p>Get current OnLineListener</p>
+     *
+     * @return OnLineListener
+     */
+    @Nullable
+    @AnyThread
+    public OnLineListener getOnLineListener() {
+        return lineListener;
+    }
+
+    void conditionalJoin() throws InterruptedException {
+        if (calledOnClose) return; // deadlock from callback, we're inside exit procedure
+        if (Thread.currentThread() == this) return; // can't join self
+        join();
+    }
+}
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTask.java b/app/src/main/java/com/termux/app/terminal/TermuxTask.java
new file mode 100644
index 0000000000..547066b72b
--- /dev/null
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTask.java
@@ -0,0 +1,140 @@
+package com.termux.app.terminal;
+
+import androidx.annotation.NonNull;
+
+import com.termux.app.TermuxConstants;
+import com.termux.app.TermuxService;
+import com.termux.app.utils.Logger;
+import com.termux.app.utils.PluginUtils;
+import com.termux.app.utils.ShellUtils;
+import com.termux.models.ExecutionCommand;
+import com.termux.models.ExecutionCommand.ExecutionState;
+
+import java.io.File;
+import java.io.IOException;
+
+/**
+ * A class that maintains info for background Termux tasks.
+ * It also provides a way to link each {@link Process} with the {@link ExecutionCommand}
+ * that started it.
+ */
+public final class TermuxTask {
+
+    private final Process mProcess;
+    private final ExecutionCommand mExecutionCommand;
+
+    private static final String LOG_TAG = "TermuxTask";
+
+    private TermuxTask(Process process, ExecutionCommand executionCommand) {
+        this.mProcess = process;
+        this.mExecutionCommand = executionCommand;
+    }
+
+    public static TermuxTask create(@NonNull final TermuxService service, @NonNull ExecutionCommand executionCommand) {
+        if (executionCommand.workingDirectory == null || executionCommand.workingDirectory.isEmpty()) executionCommand.workingDirectory = TermuxConstants.TERMUX_HOME_DIR_PATH;
+
+        String[] env = ShellUtils.buildEnvironment(false, executionCommand.workingDirectory);
+
+        final String[] commandArray = ShellUtils.setupProcessArgs(executionCommand.executable, executionCommand.arguments);
+        // final String commandDescription = Arrays.toString(commandArray);
+
+        if(!executionCommand.setState(ExecutionState.EXECUTING))
+            return null;
+
+        Logger.logDebug(LOG_TAG, executionCommand.toString());
+
+        String taskName = ShellUtils.getExecutableBasename(executionCommand.executable);
+
+        if(executionCommand.commandLabel == null)
+            executionCommand.commandLabel = taskName;
+
+        // Exec the process
+        final Process process;
+        try {
+            process = Runtime.getRuntime().exec(commandArray, env, new File(executionCommand.workingDirectory));
+        } catch (IOException e) {
+            executionCommand.setStateFailed(ExecutionCommand.RESULT_CODE_FAILED, "Failed to run \"" + executionCommand.commandLabel + "\" background task", e);
+            TermuxTask.processTermuxTaskResult(service, null, executionCommand);
+            return null;
+        }
+
+        final int pid = ShellUtils.getPid(process);
+
+        Logger.logDebug(LOG_TAG, "Running \"" + executionCommand.commandLabel + "\" background task with pid " + pid);
+
+        final TermuxTask termuxTask = new TermuxTask(process, executionCommand);
+
+        StringBuilder stdout = new StringBuilder();
+        StringBuilder stderr = new StringBuilder();
+
+        new Thread() {
+            @Override
+            public void run() {
+                try {
+                    // setup stdout and stderr gobblers
+                    StreamGobbler STDOUT = new StreamGobbler(pid + "-stdout", process.getInputStream(), stdout);
+                    StreamGobbler STDERR = new StreamGobbler(pid + "-stderr", process.getErrorStream(), stderr);
+
+                    // start gobbling
+                    STDOUT.start();
+                    STDERR.start();
+
+                    // wait for our process to finish, while we gobble away in the
+                    // background
+                    int exitCode = process.waitFor();
+
+                    // make sure our threads are done gobbling
+                    // and the process is destroyed - while the latter shouldn't be
+                    // needed in theory, and may even produce warnings, in "normal" Java
+                    // they are required for guaranteed cleanup of resources, so lets be
+                    // safe and do this on Android as well
+                    STDOUT.join();
+                    STDERR.join();
+                    process.destroy();
+
+
+                    // Process result
+                    if (exitCode == 0)
+                        Logger.logDebug(LOG_TAG, "The \"" + executionCommand.commandLabel + "\" background task with pid " + pid + " exited normally");
+                    else
+                        Logger.logDebug(LOG_TAG, "The \"" + executionCommand.commandLabel + "\" background task with pid " + pid + " exited with code: " + exitCode);
+
+                    executionCommand.stdout = stdout.toString();
+                    executionCommand.stderr = stderr.toString();
+                    executionCommand.exitCode = exitCode;
+
+                    if(!executionCommand.setState(ExecutionState.EXECUTED))
+                        return;
+
+                    TermuxTask.processTermuxTaskResult(service, termuxTask, null);
+
+                } catch (IllegalThreadStateException | InterruptedException e) {
+                    // TODO: Should either of these be handled or returned?
+                }
+            }
+        }.start();
+
+        return termuxTask;
+    }
+
+    public static void processTermuxTaskResult(final TermuxService service, final TermuxTask termuxTask, ExecutionCommand executionCommand) {
+        if(termuxTask != null)
+            executionCommand = termuxTask.mExecutionCommand;
+
+        if(executionCommand == null) return;
+
+        PluginUtils.processPluginExecutionCommandResult(service.getApplicationContext(), LOG_TAG, executionCommand);
+
+        if(termuxTask != null && service != null)
+            service.onTermuxTaskExited(termuxTask);
+    }
+
+    public Process getTerminalSession() {
+        return mProcess;
+    }
+
+    public ExecutionCommand getExecutionCommand() {
+        return mExecutionCommand;
+    }
+
+}
diff --git a/app/src/main/java/com/termux/app/utils/PluginUtils.java b/app/src/main/java/com/termux/app/utils/PluginUtils.java
index 387c156046..f64142f519 100644
--- a/app/src/main/java/com/termux/app/utils/PluginUtils.java
+++ b/app/src/main/java/com/termux/app/utils/PluginUtils.java
@@ -36,75 +36,116 @@ public class PluginUtils {
     private static final String LOG_TAG = "PluginUtils";
 
     /**
-     * Send execution result of commands to the {@link PendingIntent} creator received by
-     * execution service if {@code pendingIntent} is not {@code null}.
+     * Process {@link ExecutionCommand} result.
+     *
+     * The ExecutionCommand currentState must be greater or equal to {@link ExecutionCommand.ExecutionState#EXECUTED}.
+     * If the {@link ExecutionCommand#isPluginExecutionCommand} is {@code true} and {@link ExecutionCommand#pluginPendingIntent}
+     * is not {@code null}, then the result of commands is 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 logLevel The log level to dump the result.
      * @param logTag The log tag to use for logging.
-     * @param pendingIntent The {@link PendingIntent} sent by creator to the execution service.
-     * @param stdout The value for {@link TERMUX_SERVICE#EXTRA_PLUGIN_RESULT_BUNDLE_STDOUT} extra of {@link TERMUX_SERVICE#EXTRA_PLUGIN_RESULT_BUNDLE} bundle of intent.
-     * @param stderr The value for {@link TERMUX_SERVICE#EXTRA_PLUGIN_RESULT_BUNDLE_STDERR} extra of {@link TERMUX_SERVICE#EXTRA_PLUGIN_RESULT_BUNDLE} bundle of intent.
-     * @param exitCode The value for {@link TERMUX_SERVICE#EXTRA_PLUGIN_RESULT_BUNDLE_EXIT_CODE} extra of {@link TERMUX_SERVICE#EXTRA_PLUGIN_RESULT_BUNDLE} bundle of intent.
-     * @param errCode The value for {@link TERMUX_SERVICE#EXTRA_PLUGIN_RESULT_BUNDLE_ERR} extra of {@link TERMUX_SERVICE#EXTRA_PLUGIN_RESULT_BUNDLE} bundle of intent.
-     * @param errmsg The value for {@link TERMUX_SERVICE#EXTRA_PLUGIN_RESULT_BUNDLE_ERRMSG} extra of {@link TERMUX_SERVICE#EXTRA_PLUGIN_RESULT_BUNDLE} bundle of intent.
+     * @param executionCommand The {@link ExecutionCommand} to process.
      */
-    public static void sendExecuteResultToResultsService(final Context context, final int logLevel, final String logTag, final PendingIntent pendingIntent, final String stdout, final String stderr, final String exitCode, final String errCode, final String errmsg) {
-        String label;
+    public static void processPluginExecutionCommandResult(final Context context, String logTag, final ExecutionCommand executionCommand) {
+        if (executionCommand == null) return;
+
+        if(!executionCommand.hasExecuted()) {
+            Logger.logWarn(LOG_TAG, "Ignoring call to processPluginExecutionCommandResult() since the execution command has not been ExecutionState.EXECUTED");
+            return;
+        }
+
+        // Must be a normal command like foreground terminal session started by user
+        if(!executionCommand.isPluginExecutionCommand)
+            return;
+
+        logTag = TextDataUtils.getDefaultIfNull(logTag, LOG_TAG);
 
-        if(pendingIntent == null)
-            label = "Execution Result";
-        else
-            label = "Sending execution result to " + pendingIntent.getCreatorPackage();
+        Logger.logDebug(LOG_TAG, executionCommand.toString());
 
-        Logger.logMesssage(logLevel, logTag, label + ":\n" +
-            TERMUX_SERVICE.EXTRA_PLUGIN_RESULT_BUNDLE_STDOUT + ":\n```\n" + stdout + "\n```\n" +
-            TERMUX_SERVICE.EXTRA_PLUGIN_RESULT_BUNDLE_STDERR + ":\n```\n" + stderr + "\n```\n" +
-            TERMUX_SERVICE.EXTRA_PLUGIN_RESULT_BUNDLE_EXIT_CODE + ": `" + exitCode + "`\n" +
-            TERMUX_SERVICE.EXTRA_PLUGIN_RESULT_BUNDLE_ERR + ": `" + errCode + "`\n" +
-            TERMUX_SERVICE.EXTRA_PLUGIN_RESULT_BUNDLE_ERRMSG + ": `" + errmsg + "`");
 
-        // If pendingIntent is null, then just return
-        if(pendingIntent == null) return;
+        // If pluginPendingIntent is null, then just return
+        if(executionCommand.pluginPendingIntent == null) return;
 
+
+
+        // Send pluginPendingIntent to its creator
         final Bundle resultBundle = new Bundle();
 
-        resultBundle.putString(TERMUX_SERVICE.EXTRA_PLUGIN_RESULT_BUNDLE_STDOUT, stdout);
-        resultBundle.putString(TERMUX_SERVICE.EXTRA_PLUGIN_RESULT_BUNDLE_STDERR, stderr);
-        if (exitCode != null && !exitCode.isEmpty()) resultBundle.putInt(TERMUX_SERVICE.EXTRA_PLUGIN_RESULT_BUNDLE_EXIT_CODE, Integer.parseInt(exitCode));
-        if (errCode != null && !errCode.isEmpty()) resultBundle.putInt(TERMUX_SERVICE.EXTRA_PLUGIN_RESULT_BUNDLE_ERR, Integer.parseInt(errCode));
-        resultBundle.putString(TERMUX_SERVICE.EXTRA_PLUGIN_RESULT_BUNDLE_ERRMSG, errmsg);
+        Logger.logDebug(LOG_TAG,  "Sending execution result for Execution Command \"" + executionCommand.getCommandIdAndLabelLogString() +  "\" to " + executionCommand.pluginPendingIntent.getCreatorPackage());
+
+        String truncatedStdout = null;
+        String truncatedStderr = null;
+        String truncatedErrmsg = null;
+
+        String stdoutOriginalLength = (executionCommand.stdout == null) ? null: String.valueOf(executionCommand.stdout.length());
+        String stderrOriginalLength = (executionCommand.stderr == null) ? null: String.valueOf(executionCommand.stderr.length());
+
+        if(executionCommand.stderr == null || executionCommand.stderr.isEmpty()) {
+            truncatedStdout = TextDataUtils.getTruncatedCommandOutput(executionCommand.stdout, TextDataUtils.TRANSACTION_SIZE_LIMIT_IN_BYTES, false, false, false);
+        } else if (executionCommand.stdout == null || executionCommand.stdout.isEmpty()) {
+            truncatedStderr = TextDataUtils.getTruncatedCommandOutput(executionCommand.stderr, TextDataUtils.TRANSACTION_SIZE_LIMIT_IN_BYTES, false, false, false);
+        } else {
+            truncatedStdout = TextDataUtils.getTruncatedCommandOutput(executionCommand.stdout, TextDataUtils.TRANSACTION_SIZE_LIMIT_IN_BYTES / 2, false, false, false);
+            truncatedStderr = TextDataUtils.getTruncatedCommandOutput(executionCommand.stderr, TextDataUtils.TRANSACTION_SIZE_LIMIT_IN_BYTES / 2, false, false, false);
+        }
+
+        if(truncatedStdout != null && executionCommand.stdout != null && truncatedStdout.length() < executionCommand.stdout.length()){
+            Logger.logWarn(logTag, "Execution Result for Execution Command \"" + executionCommand.getCommandIdAndLabelLogString() +  "\" stdout length truncated from " + stdoutOriginalLength + " to " + truncatedStdout.length());
+            executionCommand.stdout = truncatedStdout;
+        }
+
+        if(truncatedStderr != null && executionCommand.stderr != null && truncatedStderr.length() < executionCommand.stderr.length()){
+            Logger.logWarn(logTag, "Execution Result for Execution Command \"" + executionCommand.getCommandIdAndLabelLogString() +  "\" stderr length truncated from " + stderrOriginalLength + " to " + truncatedStderr.length());
+            executionCommand.stderr = truncatedStderr;
+        }
+
+
+        //Combine errmsg and stacktraces
+        if(executionCommand.isStateFailed()) {
+            executionCommand.errmsg = Logger.getMessageAndStackTracesString(executionCommand.errmsg, executionCommand.throwableList);
+        }
+
+        String errmsgOriginalLength = (executionCommand.errmsg == null) ? null: String.valueOf(executionCommand.errmsg.length());
+
+        // trim from end to preseve start of stacktraces
+        truncatedErrmsg = TextDataUtils.getTruncatedCommandOutput(executionCommand.errmsg, TextDataUtils.TRANSACTION_SIZE_LIMIT_IN_BYTES / 4, true, false, false);
+        if(truncatedErrmsg != null && executionCommand.errmsg != null && truncatedErrmsg.length() < executionCommand.errmsg.length()){
+            Logger.logWarn(logTag, "Execution Result for Execution Command \"" + executionCommand.getCommandIdAndLabelLogString() +  "\" errmsg length truncated from " + errmsgOriginalLength + " to " + truncatedErrmsg.length());
+            executionCommand.errmsg = truncatedErrmsg;
+        }
+
+
+        resultBundle.putString(TERMUX_SERVICE.EXTRA_PLUGIN_RESULT_BUNDLE_STDOUT, executionCommand.stdout);
+        resultBundle.putString(TERMUX_SERVICE.EXTRA_PLUGIN_RESULT_BUNDLE_STDOUT_ORIGINAL_LENGTH, stdoutOriginalLength);
+        resultBundle.putString(TERMUX_SERVICE.EXTRA_PLUGIN_RESULT_BUNDLE_STDERR, executionCommand.stderr);
+        resultBundle.putString(TERMUX_SERVICE.EXTRA_PLUGIN_RESULT_BUNDLE_STDERR_ORIGINAL_LENGTH, stderrOriginalLength);
+        if (executionCommand.exitCode != null) resultBundle.putInt(TERMUX_SERVICE.EXTRA_PLUGIN_RESULT_BUNDLE_EXIT_CODE, executionCommand.exitCode);
+        if (executionCommand.errCode != null) resultBundle.putInt(TERMUX_SERVICE.EXTRA_PLUGIN_RESULT_BUNDLE_ERR, executionCommand.errCode);
+        resultBundle.putString(TERMUX_SERVICE.EXTRA_PLUGIN_RESULT_BUNDLE_ERRMSG, executionCommand.errmsg);
 
         Intent resultIntent = new Intent();
         resultIntent.putExtra(TERMUX_SERVICE.EXTRA_PLUGIN_RESULT_BUNDLE, resultBundle);
 
         if(context != null) {
             try {
-                pendingIntent.send(context, Activity.RESULT_OK, resultIntent);
+                executionCommand.pluginPendingIntent.send(context, Activity.RESULT_OK, resultIntent);
             } catch (PendingIntent.CanceledException e) {
                 // The caller doesn't want the result? That's fine, just ignore
             }
         }
-    }
 
-    /**
-     * 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 errmsg} if policy is violated, otherwise {@code null}.
-     */
-    public static String checkIfRunCommandServiceAllowExternalAppsPolicyIsViolated(final Context context) {
-        String errmsg = null;
-        if (!SharedProperties.isPropertyValueTrue(context, TermuxPropertyConstants.getTermuxPropertiesFile(), TermuxConstants.PROP_ALLOW_EXTERNAL_APPS)) {
-            errmsg = context.getString(R.string.error_run_command_service_allow_external_apps_ungranted);
-        }
+        if(!executionCommand.isStateFailed())
+            executionCommand.setState(ExecutionCommand.ExecutionState.SUCCESS);
 
-        return errmsg;
     }
 
+
+
     /**
      * Proceses {@link ExecutionCommand} error.
-     * The {@link ExecutionCommand#errCode} must have been set to a non-zero value.
+     *
+     * The ExecutionCommand currentState must be equal to {@link ExecutionCommand.ExecutionState#FAILED}.
+     * 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 TermuxPreferenceConstants.TERMUX_APP#KEY_PLUGIN_ERROR_NOTIFICATIONS_ENABLED} is
@@ -118,14 +159,14 @@ public static String checkIfRunCommandServiceAllowExternalAppsPolicyIsViolated(f
     public static void processPluginExecutionCommandError(final Context context, String logTag, final ExecutionCommand executionCommand) {
         if(context == null || executionCommand == null) return;
 
-        if(executionCommand.errCode == null || executionCommand.errCode == 0) {
-            Logger.logWarn(LOG_TAG, "Ignoring call to processPluginExecutionCommandError() since the execution command errCode has not been set to a non-zero value");
+        if(!executionCommand.isStateFailed()) {
+            Logger.logWarn(LOG_TAG, "Ignoring call to processPluginExecutionCommandError() since the execution command does not have ExecutionState.FAILED state");
             return;
         }
 
         // Log the error and any exception
         logTag = TextDataUtils.getDefaultIfNull(logTag, LOG_TAG);
-        Logger.logStackTracesWithMessage(logTag, executionCommand.errmsg, executionCommand.throwableList);
+        Logger.logStackTracesWithMessage(logTag, "(" + executionCommand.errCode + ") " + executionCommand.errmsg, executionCommand.throwableList);
 
         TermuxAppSharedPreferences preferences = new TermuxAppSharedPreferences(context);
         // If user has disabled notifications for plugin, then just return
@@ -160,6 +201,8 @@ public static void processPluginExecutionCommandError(final Context context, Str
             notificationManager.notify(nextNotificationId, builder.build());
     }
 
+
+
     /**
      * Get {@link Notification.Builder} for {@link #NOTIFICATION_CHANNEL_ID_PLUGIN_COMMAND_ERRORS}
      * and {@link #NOTIFICATION_CHANNEL_NAME_PLUGIN_COMMAND_ERRORS}.
@@ -207,4 +250,21 @@ public static void setupPluginCommandErrorsNotificationChannel(final Context con
             NOTIFICATION_CHANNEL_NAME_PLUGIN_COMMAND_ERRORS, NotificationManager.IMPORTANCE_HIGH);
     }
 
+
+
+    /**
+     * 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 errmsg} if policy is violated, otherwise {@code null}.
+     */
+    public static String checkIfRunCommandServiceAllowExternalAppsPolicyIsViolated(final Context context) {
+        String errmsg = null;
+        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;
+    }
+
 }

From 977cb34fc741dc18c04c2cd492dc7e0c97f620df Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 25 Mar 2021 10:10:19 +0500
Subject: [PATCH 285/912] Provide better errmsg if executable passed to
 RunCommandService is null or empty

Previously, the null or empty executable would be expanded to the literal root "/" string path by FileUtils.getCanonicalPath and then FileUtils.validateRegularFileExistenceAndPermissions() validation would fail since path will not be a regular file. So a user will be shown that "/" is not a regular file. Now we show that executable was not even passed.
---
 .../java/com/termux/app/RunCommandService.java   | 16 ++++++++++++++++
 app/src/main/res/values/strings.xml              |  1 +
 2 files changed, 17 insertions(+)

diff --git a/app/src/main/java/com/termux/app/RunCommandService.java b/app/src/main/java/com/termux/app/RunCommandService.java
index 9bc1326a39..59b52b141a 100644
--- a/app/src/main/java/com/termux/app/RunCommandService.java
+++ b/app/src/main/java/com/termux/app/RunCommandService.java
@@ -210,6 +210,8 @@ public int onStartCommand(Intent intent, int flags, int startId) {
         if(!executionCommand.setState(ExecutionState.PRE_EXECUTION))
             return Service.START_NOT_STICKY;
 
+
+
         // If "allow-external-apps" property to not set to "true", then just return
         errmsg = PluginUtils.checkIfRunCommandServiceAllowExternalAppsPolicyIsViolated(this);
         if (errmsg != null) {
@@ -218,6 +220,16 @@ public int onStartCommand(Intent intent, int flags, int startId) {
             return Service.START_NOT_STICKY;
         }
 
+
+
+        // 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(ExecutionCommand.RESULT_CODE_FAILED, errmsg, null);
+            PluginUtils.processPluginExecutionCommandError(this, LOG_TAG, executionCommand);
+            return Service.START_NOT_STICKY;
+        }
+
         // Get canonical path of executable
         executionCommand.executable = FileUtils.getCanonicalPath(executionCommand.executable, null, true);
 
@@ -233,6 +245,8 @@ public int onStartCommand(Intent intent, int flags, int startId) {
             return Service.START_NOT_STICKY;
         }
 
+
+
         // If workingDirectory is not null or empty
         if (executionCommand.workingDirectory != null && !executionCommand.workingDirectory.isEmpty()) {
             // Get canonical path of workingDirectory
@@ -255,6 +269,8 @@ public int onStartCommand(Intent intent, int flags, int startId) {
             }
         }
 
+
+
         executionCommand.executableUri = new Uri.Builder().scheme(TERMUX_SERVICE.URI_SCHEME_SERVICE_EXECUTE).path(FileUtils.getExpandedTermuxPath(executionCommand.executable)).build();
 
         Logger.logVerbose(LOG_TAG, executionCommand.toString());
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 14b4392f93..dc1e5c6852 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -87,6 +87,7 @@
 
     <!-- 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 https://github.com/termux/termux-app/blob/master/app/src/main/java/com/termux/app/RunCommandService.java for more info on RUN_COMMAND Intent usage.</string>
 

From 023069849445182a022af6cf960804117c920a4a Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 25 Mar 2021 10:11:43 +0500
Subject: [PATCH 286/912] Fix unintentional wordwrap of ExecutionCommand
 arguments markdown

---
 app/src/main/java/com/termux/models/ExecutionCommand.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/termux/models/ExecutionCommand.java b/app/src/main/java/com/termux/models/ExecutionCommand.java
index b306bfdd9e..0205f01832 100644
--- a/app/src/main/java/com/termux/models/ExecutionCommand.java
+++ b/app/src/main/java/com/termux/models/ExecutionCommand.java
@@ -446,7 +446,7 @@ public static String getArgumentsMarkdownString(String[] argumentsArray) {
                 argumentsString.append(MarkdownUtils.getMultiLineMarkdownStringEntry("Arg " + (i + 1), argumentsArray[i], "-")).append("\n");
             }
         } else{
-            argumentsString.append(" -");
+            argumentsString.append(" -  ");
         }
 
         return argumentsString.toString();

From 4e5d14e4a272ff21ad70a520e755d8d3bb5f7e46 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 25 Mar 2021 11:00:00 +0500
Subject: [PATCH 287/912] Use NotificationUtils to handle TermuxService and
 RunCommandService notifications

---
 .../com/termux/app/RunCommandService.java     | 33 ++++-----
 .../java/com/termux/app/TermuxActivity.java   | 12 ++++
 .../java/com/termux/app/TermuxService.java    | 70 ++++++++++---------
 .../termux/app/activities/ReportActivity.java |  3 -
 4 files changed, 63 insertions(+), 55 deletions(-)

diff --git a/app/src/main/java/com/termux/app/RunCommandService.java b/app/src/main/java/com/termux/app/RunCommandService.java
index 59b52b141a..c18ed3f676 100644
--- a/app/src/main/java/com/termux/app/RunCommandService.java
+++ b/app/src/main/java/com/termux/app/RunCommandService.java
@@ -1,10 +1,8 @@
 package com.termux.app;
 
 import android.app.Notification;
-import android.app.NotificationChannel;
 import android.app.NotificationManager;
 import android.app.Service;
-import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Binder;
@@ -16,6 +14,7 @@
 import com.termux.app.TermuxConstants.TERMUX_APP.TERMUX_SERVICE;
 import com.termux.app.utils.FileUtils;
 import com.termux.app.utils.Logger;
+import com.termux.app.utils.NotificationUtils;
 import com.termux.app.utils.PluginUtils;
 import com.termux.app.utils.TextDataUtils;
 import com.termux.models.ExecutionCommand;
@@ -157,6 +156,7 @@
 public class RunCommandService extends Service {
 
     private static final String NOTIFICATION_CHANNEL_ID = "termux_run_command_notification_channel";
+    private static final String NOTIFICATION_CHANNEL_NAME = TermuxConstants.TERMUX_APP_NAME + " RunCommandService";
     public static final int NOTIFICATION_ID = 1338;
 
     private static final String LOG_TAG = "RunCommandService";
@@ -313,22 +313,21 @@ private void runStopForeground() {
     }
 
     private Notification buildNotification() {
-        Notification.Builder builder = new Notification.Builder(this);
-        builder.setContentTitle(TermuxConstants.TERMUX_APP_NAME + " Run Command");
-        builder.setSmallIcon(R.drawable.ic_service_notification);
-
-        // Use a low priority:
-        builder.setPriority(Notification.PRIORITY_LOW);
+        // Build the notification
+        Notification.Builder builder =  NotificationUtils.geNotificationBuilder(this,
+            NOTIFICATION_CHANNEL_ID, Notification.PRIORITY_LOW,
+            NOTIFICATION_CHANNEL_NAME, null, null,
+            null, NotificationUtils.NOTIFICATION_MODE_SILENT);
+        if(builder == null)  return null;
 
         // No need to show a timestamp:
         builder.setShowWhen(false);
 
-        // Background color for small notification icon:
-        builder.setColor(0xFF607D8B);
+        // Set notification icon
+        builder.setSmallIcon(R.drawable.ic_service_notification);
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            builder.setChannelId(NOTIFICATION_CHANNEL_ID);
-        }
+        // Set background color for small notification icon
+        builder.setColor(0xFF607D8B);
 
         return builder.build();
     }
@@ -336,12 +335,8 @@ private Notification buildNotification() {
     private void setupNotificationChannel() {
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) return;
 
-        String channelName = TermuxConstants.TERMUX_APP_NAME + " Run Command";
-        int importance = NotificationManager.IMPORTANCE_LOW;
-
-        NotificationChannel channel = new NotificationChannel(NOTIFICATION_CHANNEL_ID, channelName, importance);
-        NotificationManager notificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
-        notificationManager.createNotificationChannel(channel);
+        NotificationUtils.setupNotificationChannel(this, NOTIFICATION_CHANNEL_ID,
+            NOTIFICATION_CHANNEL_NAME, NotificationManager.IMPORTANCE_LOW);
     }
 
 }
diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index 3f60c0df70..0b311e8c7e 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -729,4 +729,16 @@ public void onReceive(Context context, Intent intent) {
         }
     };
 
+
+
+    public static void startTermuxActivity(@NonNull final Context context) {
+        context.startActivity(newInstance(context));
+    }
+
+    public static Intent newInstance(@NonNull final Context context) {
+        Intent intent = new Intent(context, TermuxActivity.class);
+        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        return intent;
+    }
+
 }
diff --git a/app/src/main/java/com/termux/app/TermuxService.java b/app/src/main/java/com/termux/app/TermuxService.java
index 35058c133b..e5960e3789 100644
--- a/app/src/main/java/com/termux/app/TermuxService.java
+++ b/app/src/main/java/com/termux/app/TermuxService.java
@@ -2,7 +2,6 @@
 
 import android.annotation.SuppressLint;
 import android.app.Notification;
-import android.app.NotificationChannel;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.app.Service;
@@ -28,6 +27,7 @@
 import com.termux.app.terminal.TermuxSessionClient;
 import com.termux.app.terminal.TermuxSessionClientBase;
 import com.termux.app.utils.Logger;
+import com.termux.app.utils.NotificationUtils;
 import com.termux.app.utils.ShellUtils;
 import com.termux.app.utils.TextDataUtils;
 import com.termux.models.ExecutionCommand;
@@ -58,6 +58,7 @@
 public final class TermuxService extends Service {
 
     private static final String NOTIFICATION_CHANNEL_ID = "termux_notification_channel";
+    private static final String NOTIFICATION_CHANNEL_NAME = TermuxConstants.TERMUX_APP_NAME + " App";
     public static final int NOTIFICATION_ID = 1337;
 
     private static int EXECUTION_ID = 1000;
@@ -512,7 +513,7 @@ private void handleSessionAction(int sessionAction, TerminalSession newTerminalS
 
     /** Launch the {@link }TermuxActivity} to bring it to foreground. */
     private void startTermuxActivity() {
-        startActivity(new Intent(this, TermuxActivity.class).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
+        TermuxActivity.startTermuxActivity(this);
     }
 
 
@@ -568,69 +569,72 @@ public synchronized void unsetTermuxSessionClient() {
 
 
     private Notification buildNotification() {
-        Intent notifyIntent = new Intent(this, TermuxActivity.class);
-        // PendingIntent#getActivity(): "Note that the activity will be started outside of the context of an existing
-        // activity, so you must use the Intent.FLAG_ACTIVITY_NEW_TASK launch flag in the Intent":
-        notifyIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        PendingIntent pendingIntent = PendingIntent.getActivity(this, 0, notifyIntent, 0);
+        Resources res = getResources();
+
+        // Set pending intent to be launched when notification is clicked
+        Intent notificationIntent = TermuxActivity.newInstance(this);
+        PendingIntent pendingIntent = PendingIntent.getActivity(this, 0, notificationIntent, 0);
 
+
+        // Set notification text
         int sessionCount = getTermuxSessionsSize();
         int taskCount = mTermuxTasks.size();
-        String contentText = sessionCount + " session" + (sessionCount == 1 ? "" : "s");
+        String notifiationText = sessionCount + " session" + (sessionCount == 1 ? "" : "s");
         if (taskCount > 0) {
-            contentText += ", " + taskCount + " task" + (taskCount == 1 ? "" : "s");
+            notifiationText += ", " + taskCount + " task" + (taskCount == 1 ? "" : "s");
         }
 
         final boolean wakeLockHeld = mWakeLock != null;
-        if (wakeLockHeld) contentText += " (wake lock held)";
+        if (wakeLockHeld) notifiationText += " (wake lock held)";
 
-        Notification.Builder builder = new Notification.Builder(this);
-        builder.setContentTitle(getText(R.string.application_name));
-        builder.setContentText(contentText);
-        builder.setSmallIcon(R.drawable.ic_service_notification);
-        builder.setContentIntent(pendingIntent);
-        builder.setOngoing(true);
 
+        // Set notification priority
         // If holding a wake or wifi lock consider the notification of high priority since it's using power,
         // otherwise use a low priority
-        builder.setPriority((wakeLockHeld) ? Notification.PRIORITY_HIGH : Notification.PRIORITY_LOW);
+        int priority = (wakeLockHeld) ? Notification.PRIORITY_HIGH : Notification.PRIORITY_LOW;
+
+
+        // Build the notification
+        Notification.Builder builder =  NotificationUtils.geNotificationBuilder(this,
+            NOTIFICATION_CHANNEL_ID, priority,
+            getText(R.string.application_name), notifiationText, null,
+            pendingIntent, NotificationUtils.NOTIFICATION_MODE_SILENT);
+        if(builder == null)  return null;
 
         // No need to show a timestamp:
         builder.setShowWhen(false);
 
-        // Background color for small notification icon:
+        // Set notification icon
+        builder.setSmallIcon(R.drawable.ic_service_notification);
+
+        // Set background color for small notification icon
         builder.setColor(0xFF607D8B);
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            builder.setChannelId(NOTIFICATION_CHANNEL_ID);
-        }
+        // Termux sessions are always ongoing
+        builder.setOngoing(true);
 
-        Resources res = getResources();
+
+        // Set Exit button action
         Intent exitIntent = new Intent(this, TermuxService.class).setAction(TERMUX_SERVICE.ACTION_STOP_SERVICE);
         builder.addAction(android.R.drawable.ic_delete, res.getString(R.string.notification_action_exit), PendingIntent.getService(this, 0, exitIntent, 0));
 
+
+        // Set Wakelock button actions
         String newWakeAction = wakeLockHeld ? TERMUX_SERVICE.ACTION_WAKE_UNLOCK : TERMUX_SERVICE.ACTION_WAKE_LOCK;
         Intent toggleWakeLockIntent = new Intent(this, TermuxService.class).setAction(newWakeAction);
-        String actionTitle = res.getString(wakeLockHeld ?
-            R.string.notification_action_wake_unlock :
-            R.string.notification_action_wake_lock);
+        String actionTitle = res.getString(wakeLockHeld ? R.string.notification_action_wake_unlock : R.string.notification_action_wake_lock);
         int actionIcon = wakeLockHeld ? android.R.drawable.ic_lock_idle_lock : android.R.drawable.ic_lock_lock;
         builder.addAction(actionIcon, actionTitle, PendingIntent.getService(this, 0, toggleWakeLockIntent, 0));
 
+
         return builder.build();
     }
 
     private void setupNotificationChannel() {
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) return;
 
-        String channelName = TermuxConstants.TERMUX_APP_NAME;
-        String channelDescription = "Notifications from " + TermuxConstants.TERMUX_APP_NAME;
-        int importance = NotificationManager.IMPORTANCE_LOW;
-
-        NotificationChannel channel = new NotificationChannel(NOTIFICATION_CHANNEL_ID, channelName,importance);
-        channel.setDescription(channelDescription);
-        NotificationManager notificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
-        notificationManager.createNotificationChannel(channel);
+        NotificationUtils.setupNotificationChannel(this, NOTIFICATION_CHANNEL_ID,
+            NOTIFICATION_CHANNEL_NAME, NotificationManager.IMPORTANCE_LOW);
     }
 
     /** Update the shown foreground service notification after making any changes that affect it. */
diff --git a/app/src/main/java/com/termux/app/activities/ReportActivity.java b/app/src/main/java/com/termux/app/activities/ReportActivity.java
index 2945ee4114..b0affe242b 100644
--- a/app/src/main/java/com/termux/app/activities/ReportActivity.java
+++ b/app/src/main/java/com/termux/app/activities/ReportActivity.java
@@ -167,13 +167,10 @@ private String getReportAndDeviceDetailsMarkdownString() {
 
 
     public static void startReportActivity(@NonNull final Context context, @NonNull final ReportInfo reportInfo) {
-        if(context == null) return;
         context.startActivity(newInstance(context, reportInfo));
     }
 
     public static Intent newInstance(@NonNull final Context context, @NonNull final ReportInfo reportInfo) {
-        if(context == null) return null;
-
         Intent intent = new Intent(context, ReportActivity.class);
         Bundle bundle = new Bundle();
         bundle.putSerializable(EXTRA_REPORT_INFO, reportInfo);

From 8e80e889f0c624ccbf8dcd59f1ee00ffed20f272 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 25 Mar 2021 11:52:26 +0500
Subject: [PATCH 288/912] Set compileSdkVersion (NOT targetSdkVersion) to 29 so
 that Build.VERSION_CODES.Q checks can be made

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 4cb3411fac..663d831306 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -18,4 +18,4 @@ android.useAndroidX=true
 minSdkVersion=24
 targetSdkVersion=28
 ndkVersion=22.0.7026061
-compileSdkVersion=28
+compileSdkVersion=29

From d3ddb21716c5cd43141fdea960961733b72e2e60 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 25 Mar 2021 12:04:09 +0500
Subject: [PATCH 289/912] Warn users if Draw over other apps permission is
 missing

For android version >= 10(Q), a flash will be shown to users requesting them to grant the permission if they attempt to start a foreground terminal session command from background, like with the RUN_COMMAND intent. The flash will only be shown if "Plugin Error Notifications" toggle is enabled in settings.
---
 .../java/com/termux/app/TermuxService.java    |  8 +-
 .../com/termux/app/utils/PermissionUtils.java | 86 +++++++++++++++++++
 app/src/main/res/values/strings.xml           |  6 ++
 3 files changed, 99 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/java/com/termux/app/utils/PermissionUtils.java

diff --git a/app/src/main/java/com/termux/app/TermuxService.java b/app/src/main/java/com/termux/app/TermuxService.java
index e5960e3789..f81d26dc1e 100644
--- a/app/src/main/java/com/termux/app/TermuxService.java
+++ b/app/src/main/java/com/termux/app/TermuxService.java
@@ -28,6 +28,7 @@
 import com.termux.app.terminal.TermuxSessionClientBase;
 import com.termux.app.utils.Logger;
 import com.termux.app.utils.NotificationUtils;
+import com.termux.app.utils.PermissionUtils;
 import com.termux.app.utils.ShellUtils;
 import com.termux.app.utils.TextDataUtils;
 import com.termux.models.ExecutionCommand;
@@ -513,7 +514,12 @@ private void handleSessionAction(int sessionAction, TerminalSession newTerminalS
 
     /** Launch the {@link }TermuxActivity} to bring it to foreground. */
     private void startTermuxActivity() {
-        TermuxActivity.startTermuxActivity(this);
+        // For android >= 10, apps require Display over other apps permission to start foreground activities
+        // from background (services). If it is not granted, then termux sessions that are started will
+        // show in Termux notification but will not run until user manually clicks the notification.
+        if(PermissionUtils.validateDisplayOverOtherAppsPermissionForPostAndroid10(this)) {
+            TermuxActivity.startTermuxActivity(this);
+        }
     }
 
 
diff --git a/app/src/main/java/com/termux/app/utils/PermissionUtils.java b/app/src/main/java/com/termux/app/utils/PermissionUtils.java
new file mode 100644
index 0000000000..2b8614c9a4
--- /dev/null
+++ b/app/src/main/java/com/termux/app/utils/PermissionUtils.java
@@ -0,0 +1,86 @@
+package com.termux.app.utils;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.net.Uri;
+import android.os.Build;
+import android.provider.Settings;
+
+import androidx.core.content.ContextCompat;
+
+import com.termux.R;
+import com.termux.app.TermuxConstants;
+import com.termux.app.settings.preferences.TermuxAppSharedPreferences;
+
+import java.util.Arrays;
+
+public class PermissionUtils {
+
+    public static final int ACTION_MANAGE_OVERLAY_PERMISSION_REQUEST_CODE = 0;
+
+    private static final String LOG_TAG = "PluginUtils";
+
+    public static boolean checkPermissions(Context context, String[] permissions) {
+        int result;
+
+        for (String p:permissions) {
+            result = ContextCompat.checkSelfPermission(context,p);
+            if (result != PackageManager.PERMISSION_GRANTED) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public static void askPermissions(Activity context, String[] permissions) {
+        if(context == null || permissions == null) return;
+
+        int result;
+        Logger.showToast(context, context.getString(R.string.message_sudo_please_grant_permissions), true);
+        try {Thread.sleep(1000);} catch (InterruptedException e) {e.printStackTrace();}
+
+        for (String permission:permissions) {
+            result = ContextCompat.checkSelfPermission(context, permission);
+            if (result != PackageManager.PERMISSION_GRANTED) {
+                Logger.logDebug(LOG_TAG, "Requesting Permissions: " + Arrays.toString(permissions));
+                context.requestPermissions(new String[]{permission}, 0);
+            }
+        }
+    }
+
+
+
+    public static boolean checkDisplayOverOtherAppsPermission(Context context) {
+        boolean permissionGranted;
+
+        permissionGranted = Settings.canDrawOverlays(context);
+        if (!permissionGranted) {
+            Logger.logWarn(LOG_TAG, TermuxConstants.TERMUX_APP_NAME + " App does not have Display over other apps (SYSTEM_ALERT_WINDOW) permission");
+            return false;
+        } else {
+            Logger.logDebug(LOG_TAG, TermuxConstants.TERMUX_APP_NAME + " App already has Display over other apps (SYSTEM_ALERT_WINDOW) permission");
+            return true;
+        }
+    }
+
+    public static void askDisplayOverOtherAppsPermission(Activity context) {
+        Intent intent = new Intent(Settings.ACTION_MANAGE_OVERLAY_PERMISSION, Uri.parse("package:" + context.getPackageName()));
+        context.startActivityForResult(intent, ACTION_MANAGE_OVERLAY_PERMISSION_REQUEST_CODE);
+    }
+
+    public static boolean validateDisplayOverOtherAppsPermissionForPostAndroid10(Context context) {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) return true;
+        
+        if(!PermissionUtils.checkDisplayOverOtherAppsPermission(context)) {
+            TermuxAppSharedPreferences preferences = new TermuxAppSharedPreferences(context);
+            if(preferences.getPluginErrorNotificationsEnabled())
+                Logger.showToast(context, context.getString(R.string.error_display_over_other_apps_permission_not_granted), true);
+            return false;
+        } else {
+            return true;
+        }
+    }
+
+}
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index dc1e5c6852..967650ead8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -128,6 +128,12 @@
 
 
 
+    <!-- Termux PermissionUtils -->
+    <string name="message_sudo_please_grant_permissions">Please grant permissions on next screen</string>
+    <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 File Receiver -->
     <string name="title_file_received">Save file in ~/downloads/</string>
     <string name="action_file_received_edit">Edit</string>

From 1ef8eb92191985b23cb38c230c9f6ca39b8733b0 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 25 Mar 2021 12:30:59 +0500
Subject: [PATCH 290/912] Add hide-soft-keyboard-on-startup property

If its set to `true` in termux.properties file, then soft keyboard will automatically be hidden on Termux App start to solve issues for when users use hardware keyboard and soft keyboard is automatically opened and wastes terminal screen space.

The `TermuxPropertyConstants` classes has been updated to `v0.5.0`. Check its Changelog sections for info on changes.

Fixes #1978
---
 .../java/com/termux/app/TermuxActivity.java   |  9 +++++++--
 .../properties/TermuxPropertyConstants.java   | 20 ++++++++++++++-----
 .../properties/TermuxSharedProperties.java    |  4 ++++
 3 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index 0b311e8c7e..8684506147 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -405,8 +405,8 @@ private void setNewSessionButtonView() {
 
     private void setToggleKeyboardView() {
         findViewById(R.id.toggle_keyboard_button).setOnClickListener(v -> {
-            InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
-            imm.toggleSoftInput(InputMethodManager.SHOW_IMPLICIT, 0);
+            InputMethodManager inputMethodManager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+            inputMethodManager.toggleSoftInput(InputMethodManager.SHOW_IMPLICIT, 0);
             getDrawer().closeDrawers();
         });
 
@@ -414,6 +414,11 @@ private void setToggleKeyboardView() {
             toggleTerminalToolbar();
             return true;
         });
+
+        // If soft keyboard is to be hidden on startup
+        if(mProperties.shouldSoftKeyboardBeHiddenOnStartup()) {
+            getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN);
+        }
     }
 
 
diff --git a/app/src/main/java/com/termux/app/settings/properties/TermuxPropertyConstants.java b/app/src/main/java/com/termux/app/settings/properties/TermuxPropertyConstants.java
index b3acbb3973..fefe4246cf 100644
--- a/app/src/main/java/com/termux/app/settings/properties/TermuxPropertyConstants.java
+++ b/app/src/main/java/com/termux/app/settings/properties/TermuxPropertyConstants.java
@@ -10,7 +10,7 @@
 import java.util.Set;
 
 /*
- * Version: v0.4.0
+ * Version: v0.5.0
  *
  * Changelog
  *
@@ -18,15 +18,18 @@
  *      - Initial Release.
  *
  * - 0.2.0 (2021-03-11)
- *      - Renamed `HOME_PATH` to `TERMUX_HOME_DIR_PATH`
- *      - Renamed `TERMUX_PROPERTIES_PRIMARY_PATH` to `TERMUX_PROPERTIES_PRIMARY_FILE_PATH`
- *      - Renamed `TERMUX_PROPERTIES_SECONDARY_FILE_PATH` to `TERMUX_PROPERTIES_SECONDARY_FILE_PATH`
+ *      - Renamed `HOME_PATH` to `TERMUX_HOME_DIR_PATH`.
+ *      - Renamed `TERMUX_PROPERTIES_PRIMARY_PATH` to `TERMUX_PROPERTIES_PRIMARY_FILE_PATH`.
+ *      - Renamed `TERMUX_PROPERTIES_SECONDARY_FILE_PATH` to `TERMUX_PROPERTIES_SECONDARY_FILE_PATH`.
  *
  * - 0.3.0 (2021-03-16)
- *      - Add `*TERMINAL_TOOLBAR_HEIGHT_SCALE_FACTOR*`
+ *      - Add `*TERMINAL_TOOLBAR_HEIGHT_SCALE_FACTOR*`.
  *
  * - 0.4.0 (2021-03-16)
  *      - Removed `MAP_GENERIC_BOOLEAN` and `MAP_GENERIC_INVERTED_BOOLEAN`.
+ *
+ * - 0.5.0 (2021-03-25)
+ *      - Add `KEY_HIDE_SOFT_KEYBOARD_ON_STARTUP`.
  */
 
 /**
@@ -55,6 +58,11 @@ public final class TermuxPropertyConstants {
 
 
 
+    /** Defines the key for whether to hide soft keyboard when termux app is started */
+    public static final String KEY_HIDE_SOFT_KEYBOARD_ON_STARTUP =  "hide-soft-keyboard-on-startup"; // Default: "hide-soft-keyboard-on-startup"
+
+
+
     /** Defines the key for whether to use black UI */
     public static final String KEY_USE_BLACK_UI =  "use-black-ui"; // Default: "use-black-ui"
 
@@ -163,6 +171,7 @@ public final class TermuxPropertyConstants {
     public static final Set<String> TERMUX_PROPERTIES_LIST = new HashSet<>(Arrays.asList(
         // boolean
         KEY_ENFORCE_CHAR_BASED_INPUT,
+        KEY_HIDE_SOFT_KEYBOARD_ON_STARTUP,
         KEY_USE_BACK_KEY_AS_ESCAPE_KEY,
         KEY_USE_BLACK_UI,
         KEY_USE_CTRL_SPACE_WORKAROUND,
@@ -196,6 +205,7 @@ public final class TermuxPropertyConstants {
      * */
     public static final Set<String> TERMUX_DEFAULT_BOOLEAN_BEHAVIOUR_PROPERTIES_LIST = new HashSet<>(Arrays.asList(
         KEY_ENFORCE_CHAR_BASED_INPUT,
+        KEY_HIDE_SOFT_KEYBOARD_ON_STARTUP,
         KEY_USE_CTRL_SPACE_WORKAROUND,
         KEY_USE_FULLSCREEN,
         KEY_USE_FULLSCREEN_WORKAROUND,
diff --git a/app/src/main/java/com/termux/app/settings/properties/TermuxSharedProperties.java b/app/src/main/java/com/termux/app/settings/properties/TermuxSharedProperties.java
index a39c273b4a..0943a2f80a 100644
--- a/app/src/main/java/com/termux/app/settings/properties/TermuxSharedProperties.java
+++ b/app/src/main/java/com/termux/app/settings/properties/TermuxSharedProperties.java
@@ -437,6 +437,10 @@ public boolean isEnforcingCharBasedInput() {
         return (boolean) getInternalPropertyValue(TermuxPropertyConstants.KEY_ENFORCE_CHAR_BASED_INPUT, true);
     }
 
+    public boolean shouldSoftKeyboardBeHiddenOnStartup() {
+        return (boolean) getInternalPropertyValue(TermuxPropertyConstants.KEY_HIDE_SOFT_KEYBOARD_ON_STARTUP, true);
+    }
+
     public boolean isBackKeyTheEscapeKey() {
         return (boolean) getInternalPropertyValue(TermuxPropertyConstants.KEY_USE_BACK_KEY_AS_ESCAPE_KEY, true);
     }

From 5dee839230179ce0f33426ffb348aac229d5448b Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 25 Mar 2021 21:17:54 +0500
Subject: [PATCH 291/912] Update TermuxConstants

The `TermuxConstants` classes has been updated to `v0.13.0`. Check its Changelog sections for info on changes.
---
 .../main/java/com/termux/app/TermuxConstants.java | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxConstants.java b/app/src/main/java/com/termux/app/TermuxConstants.java
index 202514e641..89722f3d8e 100644
--- a/app/src/main/java/com/termux/app/TermuxConstants.java
+++ b/app/src/main/java/com/termux/app/TermuxConstants.java
@@ -5,7 +5,7 @@
 import java.io.File;
 
 /*
- * Version: v0.12.0
+ * Version: v0.13.0
  *
  * Changelog
  *
@@ -81,6 +81,10 @@
  *      - Added following to `TERMUX_SERVICE`:
  *          `EXTRA_PLUGIN_RESULT_BUNDLE_STDOUT_ORIGINAL_LENGTH`,
  *          `EXTRA_PLUGIN_RESULT_BUNDLE_STDERR_ORIGINAL_LENGTH`.
+ *
+ * - 0.13.0 (2021-03-25)
+ *      - Added following to `RUN_COMMAND_SERVICE`:
+ *          `EXTRA_PENDING_INTENT`.
  */
 
 /**
@@ -106,7 +110,8 @@
  *       use and is also the final package name stored in "AndroidManifest.xml".
  * - The "manifestPlaceholders" values for {@link #TERMUX_PACKAGE_NAME} and *_APP_NAME in "build.gradle".
  * - The "ENTITY" values for {@link #TERMUX_PACKAGE_NAME} and *_APP_NAME in "strings.xml".
- * - The "shortcut.xml" files like in termux-app since dynamic variables don't work in it.
+ * - The "shortcut.xml" and "*_preferences.xml" files like in termux-app since dynamic variables don't
+ *      work in it.
  * - Optionally the "package" in "AndroidManifest.xml" if modifying project structure. This is
  *      package name for java classes project structure and is prefixed if activity and service
  *      names use dot (.) notation.
@@ -441,8 +446,6 @@ public static final class TERMUX_SERVICE {
             public static final String EXTRA_BACKGROUND = TERMUX_PACKAGE_NAME + ".execute.background"; // Default: "com.termux.execute.background"
             /** Intent {@code String} extra for session action for foreground commands for the TERMUX_SERVICE.ACTION_SERVICE_EXECUTE intent */
             public static final String EXTRA_SESSION_ACTION = TERMUX_PACKAGE_NAME + ".execute.session_action"; // Default: "com.termux.execute.session_action"
-            /** Intent {@code Parcelable} extra containing pending intent for the execute command caller */
-            public static final String EXTRA_PENDING_INTENT = "pendingIntent"; // Default: "pendingIntent"
             /** Intent {@code String} extra for label of the command for the TERMUX_SERVICE.ACTION_SERVICE_EXECUTE intent */
             public static final String EXTRA_COMMAND_LABEL = TERMUX_PACKAGE_NAME + ".execute.command_label"; // Default: "com.termux.execute.command_label"
             /** Intent markdown {@code String} extra for description of the command for the TERMUX_SERVICE.ACTION_SERVICE_EXECUTE intent */
@@ -451,6 +454,8 @@ public static final class TERMUX_SERVICE {
             public static final String EXTRA_COMMAND_HELP = TERMUX_PACKAGE_NAME + ".execute.command_help"; // Default: "com.termux.execute.command_help"
             /** Intent markdown {@code String} extra for help of the plugin API for the TERMUX_SERVICE.ACTION_SERVICE_EXECUTE intent (Internal Use Only) */
             public static final String EXTRA_PLUGIN_API_HELP = TERMUX_PACKAGE_NAME + ".execute.plugin_api_help"; // Default: "com.termux.execute.plugin_help"
+            /** Intent {@code Parcelable} extra containing pending intent for the execute command caller */
+            public static final String EXTRA_PENDING_INTENT = "pendingIntent"; // Default: "pendingIntent"
 
 
 
@@ -536,6 +541,8 @@ public static final class RUN_COMMAND_SERVICE {
             public static final String EXTRA_COMMAND_DESCRIPTION = TERMUX_PACKAGE_NAME + ".RUN_COMMAND_COMMAND_DESCRIPTION"; // Default: "com.termux.RUN_COMMAND_COMMAND_DESCRIPTION"
             /** Intent markdown {@code String} extra for help of the command for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent */
             public static final String EXTRA_COMMAND_HELP = TERMUX_PACKAGE_NAME + ".RUN_COMMAND_COMMAND_HELP"; // Default: "com.termux.RUN_COMMAND_COMMAND_HELP"
+            /** Intent {@code Parcelable} extra containing pending intent for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent */
+            public static final String EXTRA_PENDING_INTENT = TERMUX_PACKAGE_NAME + ".RUN_COMMAND_PENDING_INTENT"; // Default: "com.termux.RUN_COMMAND_PENDING_INTENT"
 
         }
     }

From 2cc6285a81b1d1dc641c081eb8c5f3d5b28649e0 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 25 Mar 2021 23:01:45 +0500
Subject: [PATCH 292/912] Remove leftover log entry from TermuxSessionClient

---
 .../main/java/com/termux/app/terminal/TermuxSessionClient.java  | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/src/main/java/com/termux/app/terminal/TermuxSessionClient.java b/app/src/main/java/com/termux/app/terminal/TermuxSessionClient.java
index 8901e1f469..110b556402 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxSessionClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxSessionClient.java
@@ -283,8 +283,6 @@ public void checkAndScrollToSession(TerminalSession session) {
         termuxSessionsListView.setItemChecked(indexOfSession, true);
         // Delay is necessary otherwise sometimes scroll to newly added session does not happen
         termuxSessionsListView.postDelayed(() -> termuxSessionsListView.smoothScrollToPosition(indexOfSession), 1000);
-
-        Logger.logError("scrolled to " + indexOfSession);
     }
 
 

From a2209ddd5efb26f45c84b0b8401bef9c15b20a56 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 25 Mar 2021 23:05:55 +0500
Subject: [PATCH 293/912] Add support for sending back background and
 foreground command results for RUN_COMMAND intent and foreground command
 results for Termux:Tasker

Previously, termux only supported getting result of BACKGROUND commands back if they were started via Termux:Tasker plugin. Getting back result of foreground commands was not possible with any way.

Now with RUN_COMMAND intent or Termux:Tasker, the third party apps and users can get the foreground command results as well. Note that by "foreground results" we only mean the session transcript. The session transcript will contain both stdout and stderr combined, basically anything sent to the the pseudo terminal /dev/pts, including PS1 prefixes for interactive sessions. Getting separate stdout and stderr can currently only be done with background commands.

Moreover, with RUN_COMMAND intent, third party apps and users can get the background commands results as well. This means separate extras for stdout and stderr.

The exit code will also be returned for either case.

### RUN_COMMAND intent

The result extras are returned in the TERMUX_SERVICE.EXTRA_PLUGIN_RESULT_BUNDLE bundle via the pending intent received.

The RUN_COMMAND_SERVICE.EXTRA_PENDING_INTENT extra can be used to send the pending intent with which termux should return the result bundle. The pending intent can be received back by the app with an IntentService. Check RunCommandService for reference implementation.

For foreground commands (RUN_COMMAND_SERVICE.EXTRA_BACKGROUND is false):
- EXTRA_PLUGIN_RESULT_BUNDLE_STDOUT will contain session transcript.
- EXTRA_PLUGIN_RESULT_BUNDLE_STDERR will be null since its not used.
- EXTRA_PLUGIN_RESULT_BUNDLE_EXIT_CODE will contain exit code of session.

For background commands (RUN_COMMAND_SERVICE.EXTRA_BACKGROUND is true):
- EXTRA_PLUGIN_RESULT_BUNDLE_STDOUT will contain stdout of commands.
- EXTRA_PLUGIN_RESULT_BUNDLE_STDERR will contain stderr of commands.
- EXTRA_PLUGIN_RESULT_BUNDLE_EXIT_CODE will contain exit code of command.

The internal errors raised by termux outside the shell will be sent in the the EXTRA_PLUGIN_RESULT_BUNDLE_ERR and EXTRA_PLUGIN_RESULT_BUNDLE_ERRMSG extras. These will contain errors like if starting a termux command failed or if the user manually exited the termux sessions or android killed the termux service before the commands had finished executing. The err value will be Activity.RESULT_OK(-1) if no internal errors are raised.

The stdout and stderr will be truncated from the start to max 100KB combined and errmsg will also be truncated from end to max 25KB. This is necessary to prevent TransactionTooLargeException exceptions from being raised if stdout or stderr are too large in length. The original length of stdout and stderr will be provided in EXTRA_PLUGIN_RESULT_BUNDLE_STDOUT_ORIGINAL_LENGTH and EXTRA_PLUGIN_RESULT_BUNDLE_STDERR_ORIGINAL_LENGTH extras respectively, so that the caller can check if either of them were truncated.

### Termux:Tasker

Support for Termux:Tasker for getting back result of foreground commands will require an update to it since it currently immediately returns control to plugin host app like Tasker without waiting if a foreground command is to be executed.
---
 .../com/termux/app/RunCommandService.java     | 137 ++++++++++++++++--
 .../java/com/termux/app/TermuxService.java    |  29 +++-
 .../termux/app/terminal/TermuxSession.java    |  38 ++++-
 .../com/termux/app/terminal/TermuxTask.java   |   9 +-
 .../com/termux/models/ExecutionCommand.java   |  18 ++-
 app/src/main/res/values/strings.xml           |   3 +
 6 files changed, 204 insertions(+), 30 deletions(-)

diff --git a/app/src/main/java/com/termux/app/RunCommandService.java b/app/src/main/java/com/termux/app/RunCommandService.java
index c18ed3f676..0b206bd862 100644
--- a/app/src/main/java/com/termux/app/RunCommandService.java
+++ b/app/src/main/java/com/termux/app/RunCommandService.java
@@ -1,5 +1,7 @@
 package com.termux.app;
 
+import android.app.Activity;
+import android.app.IntentService;
 import android.app.Notification;
 import android.app.NotificationManager;
 import android.app.Service;
@@ -104,6 +106,10 @@
  *      the command. This can add details about the command. 3rd party apps can provide more info
  *      to users for setting up commands. Ideally a url link should be provided that goes into full
  *      details.
+ * 9. The {@code Parcelable} {@link RUN_COMMAND_SERVICE#EXTRA_PENDING_INTENT} extra containing the
+ *      pending intent with which result of commands should be returned to the caller. The results
+ *      will be sent in the {@link TERMUX_SERVICE#EXTRA_PLUGIN_RESULT_BUNDLE} bundle. This is optional
+ *      and only needed if caller wants the results back.
  *
  *
  * The {@link RUN_COMMAND_SERVICE#EXTRA_COMMAND_PATH} and {@link RUN_COMMAND_SERVICE#EXTRA_WORKDIR}
@@ -132,19 +138,23 @@
  * https://developer.android.com/training/basics/intents/package-visibility#package-name
  *
  *
+ * Its probably wiser for apps to import the {@link TermuxConstants} class and use the variables
+ * provided for actions and extras instead of using hardcoded string values.
  *
  * Sample code to run command "top" with java:
- *   Intent intent = new Intent();
- *   intent.setClassName("com.termux", "com.termux.app.RunCommandService");
- *   intent.setAction("com.termux.RUN_COMMAND");
- *   intent.putExtra("com.termux.RUN_COMMAND_PATH", "/data/data/com.termux/files/usr/bin/top");
- *   intent.putExtra("com.termux.RUN_COMMAND_ARGUMENTS", new String[]{"-n", "5"});
- *   intent.putExtra("com.termux.RUN_COMMAND_WORKDIR", "/data/data/com.termux/files/home");
- *   intent.putExtra("com.termux.RUN_COMMAND_BACKGROUND", false);
- *   intent.putExtra("com.termux.RUN_COMMAND_SESSION_ACTION", "0");
- *   startService(intent);
+ * ```
+ * intent.setClassName("com.termux", "com.termux.app.RunCommandService");
+ * intent.setAction("com.termux.RUN_COMMAND");
+ * intent.putExtra("com.termux.RUN_COMMAND_PATH", "/data/data/com.termux/files/usr/bin/top");
+ * intent.putExtra("com.termux.RUN_COMMAND_ARGUMENTS", new String[]{"-n", "5"});
+ * intent.putExtra("com.termux.RUN_COMMAND_WORKDIR", "/data/data/com.termux/files/home");
+ * intent.putExtra("com.termux.RUN_COMMAND_BACKGROUND", false);
+ * intent.putExtra("com.termux.RUN_COMMAND_SESSION_ACTION", "0");
+ * startService(intent);
+ * ```
  *
  * Sample code to run command "top" with "am startservice" command:
+ * ```
  * am startservice --user 0 -n com.termux/com.termux.app.RunCommandService \
  * -a com.termux.RUN_COMMAND \
  * --es com.termux.RUN_COMMAND_PATH '/data/data/com.termux/files/usr/bin/top' \
@@ -152,6 +162,111 @@
  * --es com.termux.RUN_COMMAND_WORKDIR '/data/data/com.termux/files/home' \
  * --ez com.termux.RUN_COMMAND_BACKGROUND 'false' \
  * --es com.termux.RUN_COMMAND_SESSION_ACTION '0'
+ *
+ *
+ *
+ *
+ * The {@link RUN_COMMAND_SERVICE#ACTION_RUN_COMMAND} intent returns the following extras
+ * in the {@link TERMUX_SERVICE#EXTRA_PLUGIN_RESULT_BUNDLE} bundle if a pending intent is sent by the
+ * called in {@code Parcelable} {@link RUN_COMMAND_SERVICE#EXTRA_PENDING_INTENT} extra:
+ *
+ * For foreground commands ({@link RUN_COMMAND_SERVICE#EXTRA_BACKGROUND} is `false`):
+ * - {@link TERMUX_SERVICE#EXTRA_PLUGIN_RESULT_BUNDLE_STDOUT} will contain session transcript.
+ * - {@link TERMUX_SERVICE#EXTRA_PLUGIN_RESULT_BUNDLE_STDERR} will be null since its not used.
+ * - {@link TERMUX_SERVICE#EXTRA_PLUGIN_RESULT_BUNDLE_EXIT_CODE} will contain exit code of session.
+
+ * For background commands ({@link RUN_COMMAND_SERVICE#EXTRA_BACKGROUND} is `true`):
+ * - {@link TERMUX_SERVICE#EXTRA_PLUGIN_RESULT_BUNDLE_STDOUT} will contain stdout of commands.
+ * - {@link TERMUX_SERVICE#EXTRA_PLUGIN_RESULT_BUNDLE_STDERR} will contain stderr of commands.
+ * - {@link TERMUX_SERVICE#EXTRA_PLUGIN_RESULT_BUNDLE_EXIT_CODE} will contain exit code of command.
+ *
+ * The {@link TERMUX_SERVICE#EXTRA_PLUGIN_RESULT_BUNDLE_STDOUT_ORIGINAL_LENGTH} and
+ * {@link TERMUX_SERVICE#EXTRA_PLUGIN_RESULT_BUNDLE_STDERR_ORIGINAL_LENGTH} will contain
+ * the original length of stdout and stderr respectively. This is useful to detect cases where
+ * stdout and stderr was too large to be sent back via an intent, otherwise
+ *
+ * The internal errors raised by termux outside the shell will be sent in the the
+ * {@link TERMUX_SERVICE#EXTRA_PLUGIN_RESULT_BUNDLE_ERR} and {@link TERMUX_SERVICE#EXTRA_PLUGIN_RESULT_BUNDLE_ERRMSG}
+ * extras. These will contain errors like if starting a termux command failed or if the user manually
+ * exited the termux sessions or android killed the termux service before the commands had finished executing.
+ * The err value will be {@link Activity#RESULT_OK}(-1) if no internal errors are raised.
+ *
+ * Note that if stdout or stderr are too large in length, then a {@link android.os.TransactionTooLargeException}
+ * exception will be raised when the pending intent is sent back containing the results, But it cannot
+ * be caught by the intent sender and intent will silently fail with logcat entries for the exception
+ * raised internally by android os components. To prevent this, the stdout and stderr sent
+ * back will be truncated from the start to max 100KB combined. The original length of stdout and
+ * stderr will be provided in
+ * {@link TERMUX_SERVICE#EXTRA_PLUGIN_RESULT_BUNDLE_STDOUT_ORIGINAL_LENGTH} and
+ * {@link TERMUX_SERVICE#EXTRA_PLUGIN_RESULT_BUNDLE_STDERR_ORIGINAL_LENGTH} extras respectively, so
+ * that the caller can check if either of them were truncated. The errmsg will also be truncated
+ * from end to max 25KB to preserve start of stacktraces.
+ *
+ *
+ *
+ * If your app (not shell) wants to receive termux session command results, then put the
+ * pending intent for your app like for an {@link IntentService} in the "com.termux.RUN_COMMAND_PENDING_INTENT"
+ * extra.
+ * ```
+ * // Create intent for your IntentService class
+ * Intent pluginResultsServiceIntent = new Intent(MainActivity.this, PluginResultsService.class);
+ * // Create PendingIntent that will be used by termux service to send result of commands back to PluginResultsService
+ * PendingIntent pendingIntent = PendingIntent.getService(context, 1, pluginResultsServiceIntent, PendingIntent.FLAG_ONE_SHOT);
+ * intent.putExtra("com.termux.RUN_COMMAND_PENDING_INTENT", pendingIntent);
+ * ```
+ *
+ *
+ * Declare `PluginResultsService` entry in AndroidManifest.xml
+ * ```
+ * <service android:name=".PluginResultsService" />
+ * ```
+ *
+ *
+ * Define the `PluginResultsService` class
+ * ```
+ * public class PluginResultsService extends IntentService {
+ *
+ *     public static final String PLUGIN_SERVICE_LABEL = "PluginResultsService";
+ *
+ *     private static final String LOG_TAG = "PluginResultsService";
+ *
+ *     public PluginResultsService(){
+ *         super(PLUGIN_SERVICE_LABEL);
+ *     }
+ *
+ *     @Override
+ *     protected void onHandleIntent(@Nullable Intent intent) {
+ *         if (intent == null) return;
+ *
+ *         if(intent.getComponent() != null)
+ *             Log.d(LOG_TAG, PLUGIN_SERVICE_LABEL + " received execution result from " + intent.getComponent().toString());
+ *
+ *
+ *         final Bundle resultBundle = intent.getBundleExtra("result");
+ *         if (resultBundle == null) {
+ *             Log.e(LOG_TAG, "The intent does not contain the result bundle at the \"result\" key.");
+ *             return;
+ *         }
+ *
+ *         Log.d(LOG_TAG, "stdout:\n```\n" + resultBundle.getString("stdout", "") + "\n```\n" +
+ *                 "stdout_original_length: `" + resultBundle.getString("stdout_original_length") + "`\n" +
+ *                 "stderr:\n```\n" + resultBundle.getString("stderr", "") + "\n```\n" +
+ *                 "stderr_original_length: `" + resultBundle.getString("stderr_original_length") + "`\n" +
+ *                 "exitCode: `" + resultBundle.getInt("exitCode") + "`\n" +
+ *                 "errCode: `" + resultBundle.getInt("err") + "`\n" +
+ *                 "errmsg: `" + resultBundle.getString("errmsg", "") + "`");
+ *     }
+ *
+ * }
+ *```
+ *
+ *
+ *
+ *
+ *
+ * A service that receives {@link RUN_COMMAND_SERVICE#ACTION_RUN_COMMAND} intent from third party apps and
+ * plugins that contains info on command execution and forwards the extras to {@link TermuxService}
+ * for the actual execution.
  */
 public class RunCommandService extends Service {
 
@@ -206,6 +321,9 @@ public int onStartCommand(Intent intent, int flags, int startId) {
         executionCommand.commandLabel = TextDataUtils.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.pluginPendingIntent = intent.getParcelableExtra(RUN_COMMAND_SERVICE.EXTRA_PENDING_INTENT);
+
+
 
         if(!executionCommand.setState(ExecutionState.PRE_EXECUTION))
             return Service.START_NOT_STICKY;
@@ -286,6 +404,7 @@ public int onStartCommand(Intent intent, int flags, int startId) {
         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.pluginPendingIntent);
 
         // Start TERMUX_SERVICE and pass it execution intent
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
diff --git a/app/src/main/java/com/termux/app/TermuxService.java b/app/src/main/java/com/termux/app/TermuxService.java
index f81d26dc1e..5277a4e65d 100644
--- a/app/src/main/java/com/termux/app/TermuxService.java
+++ b/app/src/main/java/com/termux/app/TermuxService.java
@@ -216,9 +216,22 @@ private void actionStopService() {
 
     /** Finish all termux sessions by sending SIGKILL to their shells. */
     private synchronized void finishAllTermuxSessions() {
+        ExecutionCommand executionCommand;
+
         // TODO: Should SIGKILL also be send to background processes maintained by mTermuxTasks?
-        for (int i = 0; i < mTermuxSessions.size(); i++)
-            mTermuxSessions.get(i).getTerminalSession().finishIfRunning();
+        for (int i = 0; i < mTermuxSessions.size(); i++) {
+            TermuxSession termuxSession = mTermuxSessions.get(i);
+            executionCommand = termuxSession.getExecutionCommand();
+
+            // If the execution command was started for a plugin and is currently executing, then notify the callers
+            if(executionCommand.isPluginExecutionCommand && executionCommand.isExecuting()) {
+                if (executionCommand.setStateFailed(ExecutionCommand.RESULT_CODE_FAILED, this.getString(R.string.error_sending_sigkill_to_process), null)) {
+                    TermuxSession.processTermuxSessionResult(this, termuxSession, null);
+                }
+            }
+
+            termuxSession.getTerminalSession().finishIfRunning();
+        }
     }
 
 
@@ -360,7 +373,7 @@ public synchronized TermuxTask createTermuxTask(ExecutionCommand executionComman
 
         TermuxTask newTermuxTask = TermuxTask.create(this, executionCommand);
         if (newTermuxTask == null) {
-            // Logger.logError(LOG_TAG, "Failed to execute new termux task command for:\n" + executionCommand.toString());
+            Logger.logError(LOG_TAG, "Failed to execute new termux task command for:\n" + executionCommand.getCommandIdAndLabelLogString());
             return null;
         };
 
@@ -428,9 +441,9 @@ public synchronized TermuxSession createTermuxSession(ExecutionCommand execution
         if(Logger.getLogLevel() >= Logger.LOG_LEVEL_VERBOSE)
             Logger.logVerbose(LOG_TAG, executionCommand.toString());
         
-        TermuxSession newTermuxSession = TermuxSession.create(executionCommand, getTermuxSessionClient(), sessionName);
+        TermuxSession newTermuxSession = TermuxSession.create(this, executionCommand, getTermuxSessionClient(), sessionName);
         if (newTermuxSession == null) {
-            Logger.logError(LOG_TAG, "Failed to execute new termux session command for:\n" + executionCommand.toString());
+            Logger.logError(LOG_TAG, "Failed to execute new termux session command for:\n" + executionCommand.getCommandIdAndLabelLogString());
             return null;
         };
 
@@ -455,7 +468,11 @@ public synchronized int removeTermuxSession(TerminalSession sessionToRemove) {
             TermuxSession termuxSession = mTermuxSessions.get(index);
 
             if (termuxSession.getExecutionCommand().setState(ExecutionState.EXECUTED)) {
-                ;
+                // If the execution command was started for a plugin and is currently executing, then process the result
+                if(termuxSession.getExecutionCommand().isPluginExecutionCommand)
+                    TermuxSession.processTermuxSessionResult(this, termuxSession, null);
+                else
+                    termuxSession.getExecutionCommand().setState(ExecutionState.SUCCESS);
             }
 
             mTermuxSessions.remove(termuxSession);
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxSession.java b/app/src/main/java/com/termux/app/terminal/TermuxSession.java
index 3af9f73df4..e085cf5e05 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxSession.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxSession.java
@@ -1,7 +1,12 @@
 package com.termux.app.terminal;
 
+import androidx.annotation.NonNull;
+
+import com.termux.R;
 import com.termux.app.TermuxConstants;
+import com.termux.app.TermuxService;
 import com.termux.app.utils.Logger;
+import com.termux.app.utils.PluginUtils;
 import com.termux.app.utils.ShellUtils;
 import com.termux.models.ExecutionCommand;
 import com.termux.terminal.TerminalSession;
@@ -25,14 +30,12 @@ private TermuxSession(TerminalSession terminalSession, ExecutionCommand executio
         this.mExecutionCommand = executionCommand;
     }
 
-    public static TermuxSession create(ExecutionCommand executionCommand, TermuxSessionClientBase termuxSessionClient, String sessionName) {
-        TermuxConstants.TERMUX_HOME_DIR.mkdirs();
-
+    public static TermuxSession create(@NonNull final TermuxService service, @NonNull ExecutionCommand executionCommand, @NonNull TermuxSessionClientBase termuxSessionClient, String sessionName) {
         if (executionCommand.workingDirectory == null || executionCommand.workingDirectory.isEmpty()) executionCommand.workingDirectory = TermuxConstants.TERMUX_HOME_DIR_PATH;
 
         String[] environment = ShellUtils.buildEnvironment(executionCommand.isFailsafe, executionCommand.workingDirectory);
-        boolean isLoginShell = false;
 
+        boolean isLoginShell = false;
         if (executionCommand.executable == null) {
             if (!executionCommand.isFailsafe) {
                 for (String shellBinary : new String[]{"login", "bash", "zsh"}) {
@@ -62,8 +65,13 @@ public static TermuxSession create(ExecutionCommand executionCommand, TermuxSess
 
         executionCommand.arguments = arguments;
 
-        if(!executionCommand.setState(ExecutionCommand.ExecutionState.EXECUTING))
+        if(!executionCommand.setState(ExecutionCommand.ExecutionState.EXECUTING)) {
+            executionCommand.setStateFailed(ExecutionCommand.RESULT_CODE_FAILED, service.getString(R.string.error_failed_to_execute_termux_session_command, executionCommand.getCommandIdAndLabelLogString()), null);
+            if(executionCommand.isPluginExecutionCommand) {
+                TermuxSession.processTermuxSessionResult(service, null, executionCommand);
+            }
             return null;
+        }
 
         Logger.logDebug(LOG_TAG, executionCommand.toString());
 
@@ -76,6 +84,26 @@ public static TermuxSession create(ExecutionCommand executionCommand, TermuxSess
         return new TermuxSession(terminalSession, executionCommand);
     }
 
+    public static void processTermuxSessionResult(@NonNull final TermuxService service, final TermuxSession termuxSession, ExecutionCommand executionCommand) {
+        TerminalSession terminalSession = null;
+        if(termuxSession != null) {
+            executionCommand = termuxSession.mExecutionCommand;
+            terminalSession = termuxSession.mTerminalSession;
+        }
+
+        if(executionCommand == null) return;
+
+        if(!executionCommand.isPluginExecutionCommand) return;
+
+        if(terminalSession != null && !terminalSession.isRunning() && executionCommand.hasExecuted() && !executionCommand.isStateFailed()) {
+            executionCommand.stdout = terminalSession.getEmulator().getScreen().getTranscriptTextWithFullLinesJoined();
+            executionCommand.stderr = null;
+            executionCommand.exitCode = terminalSession.getExitStatus();
+        }
+
+        PluginUtils.processPluginExecutionCommandResult(service.getApplicationContext(), LOG_TAG, executionCommand);
+    }
+
     public TerminalSession getTerminalSession() {
         return mTerminalSession;
     }
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTask.java b/app/src/main/java/com/termux/app/terminal/TermuxTask.java
index 547066b72b..c6e505e352 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTask.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTask.java
@@ -2,6 +2,7 @@
 
 import androidx.annotation.NonNull;
 
+import com.termux.R;
 import com.termux.app.TermuxConstants;
 import com.termux.app.TermuxService;
 import com.termux.app.utils.Logger;
@@ -53,8 +54,8 @@ public static TermuxTask create(@NonNull final TermuxService service, @NonNull E
         try {
             process = Runtime.getRuntime().exec(commandArray, env, new File(executionCommand.workingDirectory));
         } catch (IOException e) {
-            executionCommand.setStateFailed(ExecutionCommand.RESULT_CODE_FAILED, "Failed to run \"" + executionCommand.commandLabel + "\" background task", e);
-            TermuxTask.processTermuxTaskResult(service, null, executionCommand);
+            executionCommand.setStateFailed(ExecutionCommand.RESULT_CODE_FAILED, service.getString(R.string.error_failed_to_execute_termux_task_command, executionCommand.getCommandIdAndLabelLogString()), e);
+            TermuxSession.processTermuxSessionResult(service, null, executionCommand);
             return null;
         }
 
@@ -117,7 +118,7 @@ public void run() {
         return termuxTask;
     }
 
-    public static void processTermuxTaskResult(final TermuxService service, final TermuxTask termuxTask, ExecutionCommand executionCommand) {
+    public static void processTermuxTaskResult(@NonNull final TermuxService service, final TermuxTask termuxTask, ExecutionCommand executionCommand) {
         if(termuxTask != null)
             executionCommand = termuxTask.mExecutionCommand;
 
@@ -125,7 +126,7 @@ public static void processTermuxTaskResult(final TermuxService service, final Te
 
         PluginUtils.processPluginExecutionCommandResult(service.getApplicationContext(), LOG_TAG, executionCommand);
 
-        if(termuxTask != null && service != null)
+        if(termuxTask != null)
             service.onTermuxTaskExited(termuxTask);
     }
 
diff --git a/app/src/main/java/com/termux/models/ExecutionCommand.java b/app/src/main/java/com/termux/models/ExecutionCommand.java
index 0205f01832..8d4b9b333e 100644
--- a/app/src/main/java/com/termux/models/ExecutionCommand.java
+++ b/app/src/main/java/com/termux/models/ExecutionCommand.java
@@ -6,6 +6,7 @@
 
 import androidx.annotation.NonNull;
 
+import com.termux.app.TermuxConstants.TERMUX_APP.TERMUX_SERVICE;
 import com.termux.app.utils.Logger;
 import com.termux.app.utils.MarkdownUtils;
 import com.termux.app.utils.TextDataUtils;
@@ -101,8 +102,9 @@ public int getValue() {
     public String pluginAPIHelp;
 
 
-    /** Defines if {@link ExecutionCommand} was started because of an external plugin request or from
-     * within Termux app itself. */
+    /** Defines if {@link ExecutionCommand} was started because of an external plugin request
+     * like {@link TERMUX_SERVICE#ACTION_SERVICE_EXECUTE} intent or from within Termux app itself.
+     */
     public boolean isPluginExecutionCommand;
     /** Defines {@link PendingIntent} that should be sent if an external plugin requested the execution. */
     public PendingIntent pluginPendingIntent;
@@ -503,7 +505,7 @@ public static String getMultiLineLogStringEntry( String label, Object object,Str
 
 
 
-    public boolean setState(ExecutionState newState) {
+    public synchronized boolean setState(ExecutionState newState) {
         // The state transition cannot go back or change if already at {@link ExecutionState#SUCCESS}
         if(newState.getValue() < currentState.getValue() || currentState == ExecutionState.SUCCESS) {
             Logger.logError("Invalid "+ getCommandIdAndLabelLogString() + " state transition from \"" + currentState.getName() + "\" to " +  "\"" + newState.getName() + "\"");
@@ -520,7 +522,7 @@ public boolean setState(ExecutionState newState) {
         return  true;
     }
 
-    public boolean setStateFailed(int errCode, String errmsg,  Throwable throwable) {
+    public synchronized boolean setStateFailed(int errCode, String errmsg,  Throwable throwable) {
         if (errCode > RESULT_CODE_OK) {
             this.errCode = errCode;
         } else {
@@ -542,7 +544,7 @@ public boolean setStateFailed(int errCode, String errmsg,  Throwable throwable)
         return true;
     }
 
-    public boolean isStateFailed() {
+    public synchronized boolean isStateFailed() {
         if(currentState != ExecutionState.FAILED)
             return false;
 
@@ -554,8 +556,12 @@ public boolean isStateFailed() {
         }
     }
 
-    public boolean hasExecuted() {
+    public synchronized boolean hasExecuted() {
         return currentState.getValue() >= ExecutionState.EXECUTED.getValue();
     }
 
+    public synchronized boolean isExecuting() {
+        return currentState == ExecutionState.EXECUTING;
+    }
+
 }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 967650ead8..4f290d517c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -96,6 +96,9 @@
     <!-- 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>
+    <string name="error_sending_sigkill_to_process">Sending SIGKILL to process on user request or because android is killing the service</string>
+    <string name="error_failed_to_execute_termux_session_command">"Failed to execute \"%1$s\" termux session command"</string>
+    <string name="error_failed_to_execute_termux_task_command">"Failed to execute \"%1$s\" termux task command"</string>
 
 
 

From 2afa4b4351c1c95f762cbff46bb37b962442bec0 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 25 Mar 2021 23:30:36 +0500
Subject: [PATCH 294/912] Update TermuxConstants

The `TermuxConstants` classes has been updated to `v0.14.0`. Check its Changelog sections for info on changes.
---
 .../java/com/termux/app/TermuxConstants.java  | 80 +++++++++++++++++--
 1 file changed, 74 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxConstants.java b/app/src/main/java/com/termux/app/TermuxConstants.java
index 89722f3d8e..1038b08274 100644
--- a/app/src/main/java/com/termux/app/TermuxConstants.java
+++ b/app/src/main/java/com/termux/app/TermuxConstants.java
@@ -5,7 +5,7 @@
 import java.io.File;
 
 /*
- * Version: v0.13.0
+ * Version: v0.14.0
  *
  * Changelog
  *
@@ -85,6 +85,17 @@
  * - 0.13.0 (2021-03-25)
  *      - Added following to `RUN_COMMAND_SERVICE`:
  *          `EXTRA_PENDING_INTENT`.
+ *
+ * - 0.14.0 (2021-03-25)
+ *      - Added `FDROID_PACKAGES_BASE_URL`,
+ *          `TERMUX_GITHUB_ORGANIZATION_NAME`, `TERMUX_GITHUB_ORGANIZATION_URL`,
+ *          `TERMUX_GITHUB_REPO_NAME`, `TERMUX_GITHUB_REPO_URL`, `TERMUX_FDROID_PACKAGE_URL`,
+ *          `TERMUX_API_GITHUB_REPO_NAME`,`TERMUX_API_GITHUB_REPO_URL`, `TERMUX_API_FDROID_PACKAGE_URL`,
+ *          `TERMUX_BOOT_GITHUB_REPO_NAME`, `TERMUX_BOOT_GITHUB_REPO_URL`, `TERMUX_BOOT_FDROID_PACKAGE_URL`,
+ *          `TERMUX_FLOAT_GITHUB_REPO_NAME`, `TERMUX_FLOAT_GITHUB_REPO_URL`, `TERMUX_FLOAT_FDROID_PACKAGE_URL`,
+ *          `TERMUX_STYLING_GITHUB_REPO_NAME`, `TERMUX_STYLING_GITHUB_REPO_URL`, `TERMUX_STYLING_FDROID_PACKAGE_URL`,
+ *          `TERMUX_TASKER_GITHUB_REPO_NAME`, `TERMUX_TASKER_GITHUB_REPO_URL`, `TERMUX_TASKER_FDROID_PACKAGE_URL`,
+ *          `TERMUX_WIDGET_GITHUB_REPO_NAME`, `TERMUX_WIDGET_GITHUB_REPO_URL` `TERMUX_WIDGET_FDROID_PACKAGE_URL`.
  */
 
 /**
@@ -125,50 +136,107 @@
  */
 public final class TermuxConstants {
 
+
+    /*
+     * Termux organization variables.
+     */
+
+    /** Termux Github organization name */
+    public static final String TERMUX_GITHUB_ORGANIZATION_NAME = "termux"; // Default: "termux"
+    /** Termux Github organization url */
+    public static final String TERMUX_GITHUB_ORGANIZATION_URL = "https://github.com" + "/" + TERMUX_GITHUB_ORGANIZATION_NAME; // Default: "https://github.com/termux"
+
+    /** F-Droid packages base url */
+    public static final String FDROID_PACKAGES_BASE_URL = "https://f-droid.org/en/packages"; // Default: "https://f-droid.org/en/packages"
+
+
+
     /*
      * Termux and its plugin app and package names.
      */
 
     /** Termux app name */
     public static final String TERMUX_APP_NAME = "Termux"; // Default: "Termux"
-    /** Termux app package name */
+    /** Termux package name */
     public static final String TERMUX_PACKAGE_NAME = "com.termux"; // Default: "com.termux"
+    /** Termux Github repo name */
+    public static final String TERMUX_GITHUB_REPO_NAME = "termux-app"; // Default: "termux-app"
+    /** Termux Github repo url */
+    public static final String TERMUX_GITHUB_REPO_URL = TERMUX_GITHUB_ORGANIZATION_URL + "/" + TERMUX_GITHUB_REPO_NAME; // Default: "https://github.com/termux/termux-app"
+    /** Termux F-Droid package url */
+    public static final String TERMUX_FDROID_PACKAGE_URL = FDROID_PACKAGES_BASE_URL + "/" + TERMUX_PACKAGE_NAME; // Default: "https://f-droid.org/en/packages/com.termux"
 
 
     /** Termux API app name */
     public static final String TERMUX_API_APP_NAME = "Termux:API"; // Default: "Termux:API"
     /** Termux API app package name */
     public static final String TERMUX_API_PACKAGE_NAME = TERMUX_PACKAGE_NAME + ".api"; // Default: "com.termux.api"
+    /** Termux API Github repo name */
+    public static final String TERMUX_API_GITHUB_REPO_NAME = "termux-api"; // Default: "termux-api"
+    /** Termux API Github repo url */
+    public static final String TERMUX_API_GITHUB_REPO_URL = TERMUX_GITHUB_ORGANIZATION_URL + "/" + TERMUX_API_GITHUB_REPO_NAME; // Default: "https://github.com/termux/termux-api"
+    /** Termux API F-Droid package url */
+    public static final String TERMUX_API_FDROID_PACKAGE_URL = FDROID_PACKAGES_BASE_URL + "/" + TERMUX_API_PACKAGE_NAME; // Default: "https://f-droid.org/en/packages/com.termux.api"
 
 
     /** Termux Boot app name */
     public static final String TERMUX_BOOT_APP_NAME = "Termux:Boot"; // Default: "Termux:Boot"
     /** Termux Boot app package name */
     public static final String TERMUX_BOOT_PACKAGE_NAME = TERMUX_PACKAGE_NAME + ".boot"; // Default: "com.termux.boot"
+    /** Termux Boot Github repo name */
+    public static final String TERMUX_BOOT_GITHUB_REPO_NAME = "termux-boot"; // Default: "termux-boot"
+    /** Termux Boot Github repo url */
+    public static final String TERMUX_BOOT_GITHUB_REPO_URL = TERMUX_GITHUB_ORGANIZATION_URL + "/" + TERMUX_BOOT_GITHUB_REPO_NAME; // Default: "https://github.com/termux/termux-boot"
+    /** Termux Boot F-Droid package url */
+    public static final String TERMUX_BOOT_FDROID_PACKAGE_URL = FDROID_PACKAGES_BASE_URL + "/" + TERMUX_BOOT_PACKAGE_NAME; // Default: "https://f-droid.org/en/packages/com.termux.boot"
 
 
     /** Termux Float app name */
     public static final String TERMUX_FLOAT_APP_NAME = "Termux:Float"; // Default: "Termux:Float"
     /** Termux Float app package name */
     public static final String TERMUX_FLOAT_PACKAGE_NAME = TERMUX_PACKAGE_NAME + ".window"; // Default: "com.termux.window"
+    /** Termux Float Github repo name */
+    public static final String TERMUX_FLOAT_GITHUB_REPO_NAME = "termux-float"; // Default: "termux-float"
+    /** Termux Float Github repo url */
+    public static final String TERMUX_FLOAT_GITHUB_REPO_URL = TERMUX_GITHUB_ORGANIZATION_URL + "/" + TERMUX_FLOAT_GITHUB_REPO_NAME; // Default: "https://github.com/termux/termux-float"
+    /** Termux Float F-Droid package url */
+    public static final String TERMUX_FLOAT_FDROID_PACKAGE_URL = FDROID_PACKAGES_BASE_URL + "/" + TERMUX_FLOAT_PACKAGE_NAME; // Default: "https://f-droid.org/en/packages/com.termux.window"
 
 
     /** Termux Styling app name */
     public static final String TERMUX_STYLING_APP_NAME = "Termux:Styling"; // Default: "Termux:Styling"
     /** Termux Styling app package name */
     public static final String TERMUX_STYLING_PACKAGE_NAME = TERMUX_PACKAGE_NAME + ".styling"; // Default: "com.termux.styling"
+    /** Termux Styling Github repo name */
+    public static final String TERMUX_STYLING_GITHUB_REPO_NAME = "termux-styling"; // Default: "termux-styling"
+    /** Termux Styling Github repo url */
+    public static final String TERMUX_STYLING_GITHUB_REPO_URL = TERMUX_GITHUB_ORGANIZATION_URL + "/" + TERMUX_STYLING_GITHUB_REPO_NAME; // Default: "https://github.com/termux/termux-styling"
+    /** Termux Styling F-Droid package url */
+    public static final String TERMUX_STYLING_FDROID_PACKAGE_URL = FDROID_PACKAGES_BASE_URL + "/" + TERMUX_STYLING_PACKAGE_NAME; // Default: "https://f-droid.org/en/packages/com.termux.styling"
 
 
     /** Termux Tasker app name */
     public static final String TERMUX_TASKER_APP_NAME = "Termux:Tasker"; // Default: "Termux:Tasker"
     /** Termux Tasker app package name */
     public static final String TERMUX_TASKER_PACKAGE_NAME = TERMUX_PACKAGE_NAME + ".tasker"; // Default: "com.termux.tasker"
+    /** Termux Tasker Github repo name */
+    public static final String TERMUX_TASKER_GITHUB_REPO_NAME = "termux-tasker"; // Default: "termux-tasker"
+    /** Termux Tasker Github repo url */
+    public static final String TERMUX_TASKER_GITHUB_REPO_URL = TERMUX_GITHUB_ORGANIZATION_URL + "/" + TERMUX_TASKER_GITHUB_REPO_NAME; // Default: "https://github.com/termux/termux-tasker"
+    /** Termux Tasker F-Droid package url */
+    public static final String TERMUX_TASKER_FDROID_PACKAGE_URL = FDROID_PACKAGES_BASE_URL + "/" + TERMUX_TASKER_PACKAGE_NAME; // Default: "https://f-droid.org/en/packages/com.termux.tasker"
 
 
     /** Termux Widget app name */
     public static final String TERMUX_WIDGET_APP_NAME = "Termux:Widget"; // Default: "Termux:Widget"
     /** Termux Widget app package name */
     public static final String TERMUX_WIDGET_PACKAGE_NAME = TERMUX_PACKAGE_NAME + ".widget"; // Default: "com.termux.widget"
+    /** Termux Widget Github repo name */
+    public static final String TERMUX_WIDGET_GITHUB_REPO_NAME = "termux-widget"; // Default: "termux-widget"
+    /** Termux Widget Github repo url */
+    public static final String TERMUX_WIDGET_GITHUB_REPO_URL = TERMUX_GITHUB_ORGANIZATION_URL + "/" + TERMUX_WIDGET_GITHUB_REPO_NAME; // Default: "https://github.com/termux/termux-widget"
+    /** Termux Widget F-Droid package url */
+    public static final String TERMUX_WIDGET_FDROID_PACKAGE_URL = FDROID_PACKAGES_BASE_URL + "/" + TERMUX_WIDGET_PACKAGE_NAME; // Default: "https://f-droid.org/en/packages/com.termux.widget"
 
 
 
@@ -337,7 +405,7 @@ public final class TermuxConstants {
      * Termux app plugin specific paths.
      */
 
-     /** Termux app directory path to store scripts to be run at boot by Termux:Boot */
+    /** Termux app directory path to store scripts to be run at boot by Termux:Boot */
     public static final String TERMUX_BOOT_SCRIPTS_DIR_PATH = TERMUX_DATA_HOME_DIR_PATH + "/boot"; // Default: "/data/data/com.termux/files/home/.termux/boot"
     /** Termux app directory to store scripts to be run at boot by Termux:Boot */
     public static final File TERMUX_BOOT_SCRIPTS_DIR = new File(TERMUX_BOOT_SCRIPTS_DIR_PATH);
@@ -349,7 +417,7 @@ public final class TermuxConstants {
     public static final File TERMUX_SHORTCUT_SCRIPTS_DIR = new File(TERMUX_SHORTCUT_SCRIPTS_DIR_PATH);
 
 
-     /** Termux app directory path to store background scripts that can be run by the termux launcher widget provided by Termux:Widget */
+    /** Termux app directory path to store background scripts that can be run by the termux launcher widget provided by Termux:Widget */
     public static final String TERMUX_SHORTCUT_TASKS_SCRIPTS_DIR_PATH = TERMUX_DATA_HOME_DIR_PATH + "/shortcuts/tasks"; // Default: "/data/data/com.termux/files/home/.termux/shortcuts/tasks"
     /** Termux app directory to store background scripts that can be run by the termux launcher widget provided by Termux:Widget */
     public static final File TERMUX_SHORTCUT_TASKS_SCRIPTS_DIR = new File(TERMUX_SHORTCUT_TASKS_SCRIPTS_DIR_PATH);
@@ -368,10 +436,10 @@ public final class TermuxConstants {
      * Termux app and plugins miscellaneous variables.
      */
 
-     /** Android OS permission declared by Termux app in AndroidManifest.xml which can be requested by 3rd party apps to run various commands in Termux app context */
+    /** Android OS permission declared by Termux app in AndroidManifest.xml which can be requested by 3rd party apps to run various commands in Termux app context */
     public static final String PERMISSION_RUN_COMMAND = TERMUX_PACKAGE_NAME + ".permission.RUN_COMMAND"; // Default: "com.termux.permission.RUN_COMMAND"
 
-     /** Termux property defined in termux.properties file as a secondary check to PERMISSION_RUN_COMMAND to allow 3rd party apps to run various commands in Termux app context */
+    /** Termux property defined in termux.properties file as a secondary check to PERMISSION_RUN_COMMAND to allow 3rd party apps to run various commands in Termux app context */
     public static final String PROP_ALLOW_EXTERNAL_APPS = "allow-external-apps"; // Default: "allow-external-apps"
     /** Default value for {@link #PROP_ALLOW_EXTERNAL_APPS} */
     public static final String PROP_DEFAULT_VALUE_ALLOW_EXTERNAL_APPS = "false"; // Default: "false"

From 480bad181b3302c847412c9d701a23f528626a56 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Fri, 26 Mar 2021 01:25:15 +0500
Subject: [PATCH 295/912] Use TermuxConstants for getting urls instead of using
 hardcoded strings

---
 app/src/main/java/com/termux/app/RunCommandService.java | 2 +-
 app/src/main/java/com/termux/app/TermuxActivity.java    | 2 +-
 app/src/main/res/values/strings.xml                     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/termux/app/RunCommandService.java b/app/src/main/java/com/termux/app/RunCommandService.java
index 0b206bd862..e9dd8f00cd 100644
--- a/app/src/main/java/com/termux/app/RunCommandService.java
+++ b/app/src/main/java/com/termux/app/RunCommandService.java
@@ -301,7 +301,7 @@ public int onStartCommand(Intent intent, int flags, int startId) {
         runStartForeground();
 
         ExecutionCommand executionCommand = new ExecutionCommand();
-        executionCommand.pluginAPIHelp = this.getString(R.string.error_run_command_service_api_help);
+        executionCommand.pluginAPIHelp = this.getString(R.string.error_run_command_service_api_help, TermuxConstants.TERMUX_GITHUB_REPO_URL);
 
         String errmsg;
 
diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index 8684506147..addd0ac4ea 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -584,7 +584,7 @@ private void showStylingDialog() {
             // The startActivity() call is not documented to throw IllegalArgumentException.
             // However, crash reporting shows that it sometimes does, so catch it here.
             new AlertDialog.Builder(this).setMessage(getString(R.string.error_styling_not_installed))
-                .setPositiveButton(R.string.action_styling_install, (dialog, which) -> startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://f-droid.org/en/packages/" + TermuxConstants.TERMUX_STYLING_PACKAGE_NAME + " /")))).setNegativeButton(android.R.string.cancel, null).show();
+                .setPositiveButton(R.string.action_styling_install, (dialog, which) -> startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(TermuxConstants.TERMUX_STYLING_FDROID_PACKAGE_URL)))).setNegativeButton(android.R.string.cancel, null).show();
         }
     }
     private void toggleKeepScreenOn() {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4f290d517c..52a43ae78d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -89,7 +89,7 @@
     <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 https://github.com/termux/termux-app/blob/master/app/src/main/java/com/termux/app/RunCommandService.java for more info on RUN_COMMAND Intent usage.</string>
+    <string name="error_run_command_service_api_help">Visit %1$s/blob/master/app/src/main/java/com/termux/app/RunCommandService.java for more info on RUN_COMMAND Intent usage.</string>
 
 
 

From 006d5abb783f926eb18d5387111b93875160f1ab Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Fri, 26 Mar 2021 01:26:53 +0500
Subject: [PATCH 296/912] Disable markdown text selection for now since it
 stops URL clicks from working

---
 .../main/java/com/termux/app/activities/ReportActivity.java  | 2 +-
 .../res/layout/activity_report_adapter_node_code_block.xml   | 5 ++---
 .../main/res/layout/activity_report_adapter_node_default.xml | 5 ++---
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/termux/app/activities/ReportActivity.java b/app/src/main/java/com/termux/app/activities/ReportActivity.java
index b0affe242b..76ce521669 100644
--- a/app/src/main/java/com/termux/app/activities/ReportActivity.java
+++ b/app/src/main/java/com/termux/app/activities/ReportActivity.java
@@ -92,7 +92,7 @@ private void updateUI(Bundle bundle) {
         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.text_view))
+            .include(FencedCodeBlock.class, SimpleEntry.create(R.layout.activity_report_adapter_node_code_block, R.id.code_text_view))
             .build();
 
         recyclerView.setLayoutManager(new LinearLayoutManager(this));
diff --git a/app/src/main/res/layout/activity_report_adapter_node_code_block.xml b/app/src/main/res/layout/activity_report_adapter_node_code_block.xml
index c5a23f3150..a130c35c77 100644
--- a/app/src/main/res/layout/activity_report_adapter_node_code_block.xml
+++ b/app/src/main/res/layout/activity_report_adapter_node_code_block.xml
@@ -10,7 +10,7 @@
     android:scrollbarStyle="outsideInset">
 
     <TextView
-        android:id="@+id/text_view"
+        android:id="@+id/code_text_view"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:background="@color/background_markdown_code_block"
@@ -21,7 +21,6 @@
         android:paddingRight="16dip"
         android:paddingBottom="8dip"
         android:textAppearance="?android:attr/textAppearanceMedium"
-        android:textSize="12sp"
-        android:textIsSelectable="true" />
+        android:textSize="12sp" />
 
 </HorizontalScrollView>
diff --git a/app/src/main/res/layout/activity_report_adapter_node_default.xml b/app/src/main/res/layout/activity_report_adapter_node_default.xml
index 79e13bd905..4466141976 100644
--- a/app/src/main/res/layout/activity_report_adapter_node_default.xml
+++ b/app/src/main/res/layout/activity_report_adapter_node_default.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/text_view"
+    android:id="@+id/default_text_view"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginLeft="16dip"
@@ -12,5 +12,4 @@
     android:paddingBottom="8dip"
     android:textAppearance="?android:attr/textAppearanceMedium"
     android:textColor="#000"
-    android:textSize="12sp"
-    android:textIsSelectable="true" />
+    android:textSize="12sp" />

From 34bacfd5b13752f3a30086da1ee8ae645b9f8ad3 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Fri, 26 Mar 2021 02:11:09 +0500
Subject: [PATCH 297/912] Fix terminal-emulator constructor used in tests

---
 .../src/test/java/com/termux/terminal/TerminalTestCase.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/terminal-emulator/src/test/java/com/termux/terminal/TerminalTestCase.java b/terminal-emulator/src/test/java/com/termux/terminal/TerminalTestCase.java
index 5e5bde92f6..9fc1685795 100644
--- a/terminal-emulator/src/test/java/com/termux/terminal/TerminalTestCase.java
+++ b/terminal-emulator/src/test/java/com/termux/terminal/TerminalTestCase.java
@@ -103,7 +103,8 @@ protected void setUp() throws Exception {
 	}
 
 	protected TerminalTestCase withTerminalSized(int columns, int rows) {
-		mTerminal = new TerminalEmulator(mOutput, columns, rows, rows * 2);
+	    // The tests aren't currently using the client, so a null client will suffice, a dummy client should be implemented if needed
+		mTerminal = new TerminalEmulator(mOutput, columns, rows, rows * 2, null);
 		return this;
 	}
 

From 04da4b22686bb4742ab47dc2924579b00cac06f7 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Fri, 26 Mar 2021 16:33:46 +0500
Subject: [PATCH 298/912] Send PendingIntent back for pre-execution errors
 generated for RUN_COMMAND intent

If the pending intent is not null, then the errors will be sent back to the caller without notifying the user, since we will let the caller handle the errors himself. They will still be logged in logcat.

However, if "allow-external-apps" is not true, then a flash and notification will be shown forcefully (regardless of "Plugin Execution Errors" toggle state), 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.
---
 .../com/termux/app/RunCommandService.java     |  23 +-
 .../termux/app/terminal/TermuxSession.java    |   1 +
 .../com/termux/app/utils/PluginUtils.java     | 232 +++++++++++-------
 3 files changed, 155 insertions(+), 101 deletions(-)

diff --git a/app/src/main/java/com/termux/app/RunCommandService.java b/app/src/main/java/com/termux/app/RunCommandService.java
index e9dd8f00cd..33f79010db 100644
--- a/app/src/main/java/com/termux/app/RunCommandService.java
+++ b/app/src/main/java/com/termux/app/RunCommandService.java
@@ -20,7 +20,6 @@
 import com.termux.app.utils.PluginUtils;
 import com.termux.app.utils.TextDataUtils;
 import com.termux.models.ExecutionCommand;
-import com.termux.models.ExecutionCommand.ExecutionState;
 
 /**
  * Third-party apps that are not part of termux world can run commands in termux context by either
@@ -297,6 +296,8 @@ public void onCreate() {
     public int onStartCommand(Intent intent, int flags, int startId) {
         Logger.logDebug(LOG_TAG, "onStartCommand");
 
+        if(intent == null) return Service.START_NOT_STICKY;;
+
         // Run again in case service is already started and onCreate() is not called
         runStartForeground();
 
@@ -309,7 +310,7 @@ public int onStartCommand(Intent intent, int flags, int startId) {
         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(ExecutionCommand.RESULT_CODE_FAILED, errmsg, null);
-            PluginUtils.processPluginExecutionCommandError(this, LOG_TAG, executionCommand);
+            PluginUtils.processPluginExecutionCommandError(this, LOG_TAG, executionCommand, false);
             return Service.START_NOT_STICKY;
         }
 
@@ -321,20 +322,20 @@ public int onStartCommand(Intent intent, int flags, int startId) {
         executionCommand.commandLabel = TextDataUtils.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.pluginPendingIntent = intent.getParcelableExtra(RUN_COMMAND_SERVICE.EXTRA_PENDING_INTENT);
 
 
 
-        if(!executionCommand.setState(ExecutionState.PRE_EXECUTION))
-            return Service.START_NOT_STICKY;
-
-
-
         // 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.checkIfRunCommandServiceAllowExternalAppsPolicyIsViolated(this);
         if (errmsg != null) {
             executionCommand.setStateFailed(ExecutionCommand.RESULT_CODE_FAILED, errmsg, null);
-            PluginUtils.processPluginExecutionCommandError(this, LOG_TAG, executionCommand);
+            PluginUtils.processPluginExecutionCommandError(this, LOG_TAG, executionCommand, true);
             return Service.START_NOT_STICKY;
         }
 
@@ -344,7 +345,7 @@ public int onStartCommand(Intent intent, int flags, int startId) {
         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(ExecutionCommand.RESULT_CODE_FAILED, errmsg, null);
-            PluginUtils.processPluginExecutionCommandError(this, LOG_TAG, executionCommand);
+            PluginUtils.processPluginExecutionCommandError(this, LOG_TAG, executionCommand, false);
             return Service.START_NOT_STICKY;
         }
 
@@ -359,7 +360,7 @@ public int onStartCommand(Intent intent, int flags, int startId) {
         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);
+            PluginUtils.processPluginExecutionCommandError(this, LOG_TAG, executionCommand, false);
             return Service.START_NOT_STICKY;
         }
 
@@ -382,7 +383,7 @@ public int onStartCommand(Intent intent, int flags, int startId) {
             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);
+                PluginUtils.processPluginExecutionCommandError(this, LOG_TAG, executionCommand, false);
                 return Service.START_NOT_STICKY;
             }
         }
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxSession.java b/app/src/main/java/com/termux/app/terminal/TermuxSession.java
index e085cf5e05..6342ab5395 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxSession.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxSession.java
@@ -93,6 +93,7 @@ public static void processTermuxSessionResult(@NonNull final TermuxService servi
 
         if(executionCommand == null) return;
 
+        // Must be a normal command like foreground terminal session started by user, so just return
         if(!executionCommand.isPluginExecutionCommand) return;
 
         if(terminalSession != null && !terminalSession.isRunning() && executionCommand.hasExecuted() && !executionCommand.isStateFailed()) {
diff --git a/app/src/main/java/com/termux/app/utils/PluginUtils.java b/app/src/main/java/com/termux/app/utils/PluginUtils.java
index f64142f519..2885b6abfc 100644
--- a/app/src/main/java/com/termux/app/utils/PluginUtils.java
+++ b/app/src/main/java/com/termux/app/utils/PluginUtils.java
@@ -15,7 +15,7 @@
 import com.termux.app.TermuxConstants.TERMUX_APP.TERMUX_SERVICE;
 import com.termux.app.activities.ReportActivity;
 import com.termux.app.settings.preferences.TermuxAppSharedPreferences;
-import com.termux.app.settings.preferences.TermuxPreferenceConstants;
+import com.termux.app.settings.preferences.TermuxPreferenceConstants.TERMUX_APP;
 import com.termux.app.settings.properties.SharedProperties;
 import com.termux.app.settings.properties.TermuxPropertyConstants;
 import com.termux.models.ReportInfo;
@@ -38,9 +38,11 @@ public class PluginUtils {
     /**
      * Process {@link ExecutionCommand} result.
      *
-     * The ExecutionCommand currentState must be greater or equal to {@link ExecutionCommand.ExecutionState#EXECUTED}.
-     * If the {@link ExecutionCommand#isPluginExecutionCommand} is {@code true} and {@link ExecutionCommand#pluginPendingIntent}
-     * is not {@code null}, then the result of commands is sent back to the {@link PendingIntent} creator.
+     * The ExecutionCommand currentState must be greater or equal to
+     * {@link ExecutionCommand.ExecutionState#EXECUTED}.
+     * If the {@link ExecutionCommand#isPluginExecutionCommand} is {@code true} and
+     * {@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.
@@ -49,128 +51,95 @@ public class PluginUtils {
     public static void processPluginExecutionCommandResult(final Context context, String logTag, final ExecutionCommand executionCommand) {
         if (executionCommand == null) return;
 
+        logTag = TextDataUtils.getDefaultIfNull(logTag, LOG_TAG);
+
         if(!executionCommand.hasExecuted()) {
-            Logger.logWarn(LOG_TAG, "Ignoring call to processPluginExecutionCommandResult() since the execution command has not been ExecutionState.EXECUTED");
+            Logger.logWarn(logTag, "Ignoring call to processPluginExecutionCommandResult() since the execution command has not been ExecutionState.EXECUTED");
             return;
         }
 
-        // Must be a normal command like foreground terminal session started by user
-        if(!executionCommand.isPluginExecutionCommand)
-            return;
-
-        logTag = TextDataUtils.getDefaultIfNull(logTag, LOG_TAG);
-
         Logger.logDebug(LOG_TAG, executionCommand.toString());
 
+        boolean result = true;
 
-        // If pluginPendingIntent is null, then just return
-        if(executionCommand.pluginPendingIntent == null) return;
-
-
-
-        // Send pluginPendingIntent to its creator
-        final Bundle resultBundle = new Bundle();
-
-        Logger.logDebug(LOG_TAG,  "Sending execution result for Execution Command \"" + executionCommand.getCommandIdAndLabelLogString() +  "\" to " + executionCommand.pluginPendingIntent.getCreatorPackage());
-
-        String truncatedStdout = null;
-        String truncatedStderr = null;
-        String truncatedErrmsg = null;
-
-        String stdoutOriginalLength = (executionCommand.stdout == null) ? null: String.valueOf(executionCommand.stdout.length());
-        String stderrOriginalLength = (executionCommand.stderr == null) ? null: String.valueOf(executionCommand.stderr.length());
-
-        if(executionCommand.stderr == null || executionCommand.stderr.isEmpty()) {
-            truncatedStdout = TextDataUtils.getTruncatedCommandOutput(executionCommand.stdout, TextDataUtils.TRANSACTION_SIZE_LIMIT_IN_BYTES, false, false, false);
-        } else if (executionCommand.stdout == null || executionCommand.stdout.isEmpty()) {
-            truncatedStderr = TextDataUtils.getTruncatedCommandOutput(executionCommand.stderr, TextDataUtils.TRANSACTION_SIZE_LIMIT_IN_BYTES, false, false, false);
-        } else {
-            truncatedStdout = TextDataUtils.getTruncatedCommandOutput(executionCommand.stdout, TextDataUtils.TRANSACTION_SIZE_LIMIT_IN_BYTES / 2, false, false, false);
-            truncatedStderr = TextDataUtils.getTruncatedCommandOutput(executionCommand.stderr, TextDataUtils.TRANSACTION_SIZE_LIMIT_IN_BYTES / 2, false, false, false);
-        }
-
-        if(truncatedStdout != null && executionCommand.stdout != null && truncatedStdout.length() < executionCommand.stdout.length()){
-            Logger.logWarn(logTag, "Execution Result for Execution Command \"" + executionCommand.getCommandIdAndLabelLogString() +  "\" stdout length truncated from " + stdoutOriginalLength + " to " + truncatedStdout.length());
-            executionCommand.stdout = truncatedStdout;
-        }
-
-        if(truncatedStderr != null && executionCommand.stderr != null && truncatedStderr.length() < executionCommand.stderr.length()){
-            Logger.logWarn(logTag, "Execution Result for Execution Command \"" + executionCommand.getCommandIdAndLabelLogString() +  "\" stderr length truncated from " + stderrOriginalLength + " to " + truncatedStderr.length());
-            executionCommand.stderr = truncatedStderr;
-        }
-
-
-        //Combine errmsg and stacktraces
-        if(executionCommand.isStateFailed()) {
-            executionCommand.errmsg = Logger.getMessageAndStackTracesString(executionCommand.errmsg, executionCommand.throwableList);
-        }
-
-        String errmsgOriginalLength = (executionCommand.errmsg == null) ? null: String.valueOf(executionCommand.errmsg.length());
-
-        // trim from end to preseve start of stacktraces
-        truncatedErrmsg = TextDataUtils.getTruncatedCommandOutput(executionCommand.errmsg, TextDataUtils.TRANSACTION_SIZE_LIMIT_IN_BYTES / 4, true, false, false);
-        if(truncatedErrmsg != null && executionCommand.errmsg != null && truncatedErrmsg.length() < executionCommand.errmsg.length()){
-            Logger.logWarn(logTag, "Execution Result for Execution Command \"" + executionCommand.getCommandIdAndLabelLogString() +  "\" errmsg length truncated from " + errmsgOriginalLength + " to " + truncatedErrmsg.length());
-            executionCommand.errmsg = truncatedErrmsg;
-        }
-
-
-        resultBundle.putString(TERMUX_SERVICE.EXTRA_PLUGIN_RESULT_BUNDLE_STDOUT, executionCommand.stdout);
-        resultBundle.putString(TERMUX_SERVICE.EXTRA_PLUGIN_RESULT_BUNDLE_STDOUT_ORIGINAL_LENGTH, stdoutOriginalLength);
-        resultBundle.putString(TERMUX_SERVICE.EXTRA_PLUGIN_RESULT_BUNDLE_STDERR, executionCommand.stderr);
-        resultBundle.putString(TERMUX_SERVICE.EXTRA_PLUGIN_RESULT_BUNDLE_STDERR_ORIGINAL_LENGTH, stderrOriginalLength);
-        if (executionCommand.exitCode != null) resultBundle.putInt(TERMUX_SERVICE.EXTRA_PLUGIN_RESULT_BUNDLE_EXIT_CODE, executionCommand.exitCode);
-        if (executionCommand.errCode != null) resultBundle.putInt(TERMUX_SERVICE.EXTRA_PLUGIN_RESULT_BUNDLE_ERR, executionCommand.errCode);
-        resultBundle.putString(TERMUX_SERVICE.EXTRA_PLUGIN_RESULT_BUNDLE_ERRMSG, executionCommand.errmsg);
+        // 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;
 
-        Intent resultIntent = new Intent();
-        resultIntent.putExtra(TERMUX_SERVICE.EXTRA_PLUGIN_RESULT_BUNDLE, resultBundle);
-
-        if(context != null) {
-            try {
-                executionCommand.pluginPendingIntent.send(context, Activity.RESULT_OK, resultIntent);
-            } catch (PendingIntent.CanceledException e) {
-                // The caller doesn't want the result? That's fine, just ignore
+            //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())
+        if(!executionCommand.isStateFailed() && result)
             executionCommand.setState(ExecutionCommand.ExecutionState.SUCCESS);
-
     }
 
-
-
     /**
-     * Proceses {@link ExecutionCommand} error.
+     * Process {@link ExecutionCommand} error.
      *
      * The ExecutionCommand currentState must be equal to {@link ExecutionCommand.ExecutionState#FAILED}.
-     * The {@link ExecutionCommand#errCode} must have been set to a value greater than {@link ExecutionCommand#RESULT_CODE_OK}.
+     * 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 TermuxPreferenceConstants.TERMUX_APP#KEY_PLUGIN_ERROR_NOTIFICATIONS_ENABLED} is
+     *
+     * If the {@link ExecutionCommand#isPluginExecutionCommand} is {@code true} and
+     * {@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
-     * on the {@link #NOTIFICATION_CHANNEL_NAME_PLUGIN_COMMAND_ERRORS} channel.
+     * on the {@link #NOTIFICATION_CHANNEL_NAME_PLUGIN_COMMAND_ERRORS} channel instead of just logging
+     * the error.
      *
      * @param context The {@link Context} for operations.
      * @param logTag The log tag to use for logging.
      * @param executionCommand The {@link ExecutionCommand} that failed.
+     * @param forceNotification If set to {@code true}, then a flash and notification will be shown
+     *                          regardless of if pending intent is {@code null} or
+     *                          {@link TERMUX_APP#KEY_PLUGIN_ERROR_NOTIFICATIONS_ENABLED}
+     *                          is {@code false}.
      */
-    public static void processPluginExecutionCommandError(final Context context, String logTag, final ExecutionCommand executionCommand) {
+    public static void processPluginExecutionCommandError(final Context context, String logTag, final ExecutionCommand executionCommand, boolean forceNotification) {
         if(context == null || executionCommand == null) return;
 
+        logTag = TextDataUtils.getDefaultIfNull(logTag, LOG_TAG);
+
         if(!executionCommand.isStateFailed()) {
-            Logger.logWarn(LOG_TAG, "Ignoring call to processPluginExecutionCommandError() since the execution command does not have ExecutionState.FAILED state");
+            Logger.logWarn(logTag, "Ignoring call to processPluginExecutionCommandError() since the execution command does not have ExecutionState.FAILED state");
             return;
         }
 
         // Log the error and any exception
-        logTag = TextDataUtils.getDefaultIfNull(logTag, LOG_TAG);
         Logger.logStackTracesWithMessage(logTag, "(" + executionCommand.errCode + ") " + executionCommand.errmsg, executionCommand.throwableList);
 
+
+        // 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;
+
+            //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 = new TermuxAppSharedPreferences(context);
         // If user has disabled notifications for plugin, then just return
-        if (!preferences.getPluginErrorNotificationsEnabled())
+        if (!preferences.getPluginErrorNotificationsEnabled() && !forceNotification)
             return;
 
         // Flash the errmsg
@@ -199,6 +168,89 @@ public static void processPluginExecutionCommandError(final Context context, Str
         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 = TextDataUtils.getDefaultIfNull(logTag, LOG_TAG);
+
+        Logger.logDebug(logTag,  "Sending execution result for Execution Command \"" + label +  "\" to " + pluginPendingIntent.getCreatorPackage());
+
+        String truncatedStdout = null;
+        String truncatedStderr = null;
+        String truncatedErrmsg = 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 = TextDataUtils.getTruncatedCommandOutput(stdout, TextDataUtils.TRANSACTION_SIZE_LIMIT_IN_BYTES, false, false, false);
+        } else if (stdout == null || stdout.isEmpty()) {
+            truncatedStderr = TextDataUtils.getTruncatedCommandOutput(stderr, TextDataUtils.TRANSACTION_SIZE_LIMIT_IN_BYTES, false, false, false);
+        } else {
+            truncatedStdout = TextDataUtils.getTruncatedCommandOutput(stdout, TextDataUtils.TRANSACTION_SIZE_LIMIT_IN_BYTES / 2, false, false, false);
+            truncatedStderr = TextDataUtils.getTruncatedCommandOutput(stderr, TextDataUtils.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
+        truncatedErrmsg = TextDataUtils.getTruncatedCommandOutput(errmsg, TextDataUtils.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
+        }
+
+        return true;
     }
 
 

From 2a8d5e292d26d153691845c741d3193dbe70e53c Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 27 Mar 2021 07:52:12 +0500
Subject: [PATCH 299/912] Add support for disabling soft keyboard completely
 with the "soft_keyboard_enabled" SharedPreferences key

Users can toggle the state from Settings -> Keyboard I/O -> Soft Keyboard toggle.

Android phone should also have an internal setting for disabling soft keyboard when a hardware keyboard is connected in Language and Input android settings or from the input mode selection notification, but the above setting will be Termux app specific and will allow soft keyboard to still be shown in other apps.

The `TermuxPreferenceConstants` classes has been updated to `v0.7.0`. Check its Changelog section for info on changes.
---
 .../java/com/termux/app/TermuxActivity.java   | 18 +++++
 .../DebuggingPreferencesFragment.java         |  2 +
 .../TerminalIOPreferencesFragment.java        | 71 +++++++++++++++++++
 .../TermuxAppSharedPreferences.java           | 10 +++
 .../TermuxPreferenceConstants.java            | 30 +++++---
 app/src/main/res/values/strings.xml           | 13 ++++
 app/src/main/res/xml/root_preferences.xml     |  5 ++
 .../main/res/xml/terminal_io_preferences.xml  | 15 ++++
 8 files changed, 155 insertions(+), 9 deletions(-)
 create mode 100644 app/src/main/java/com/termux/app/fragments/settings/TerminalIOPreferencesFragment.java
 create mode 100644 app/src/main/res/xml/terminal_io_preferences.xml

diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index addd0ac4ea..7d5c352d50 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -228,6 +228,13 @@ public void onStart() {
         mTerminalView.onScreenUpdated();
     }
 
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        setSoftKeyboardState();
+    }
+
     /**
      * 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
@@ -414,6 +421,15 @@ private void setToggleKeyboardView() {
             toggleTerminalToolbar();
             return true;
         });
+    }
+
+    private void setSoftKeyboardState() {
+        // If soft keyboard is to disabled
+        if(!mPreferences.getSoftKeyboardEnabled()) {
+            getWindow().setFlags(WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM, WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM);
+        } else {
+            getWindow().clearFlags(WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM);
+        }
 
         // If soft keyboard is to be hidden on startup
         if(mProperties.shouldSoftKeyboardBeHiddenOnStartup()) {
@@ -723,6 +739,8 @@ public void onReceive(Context context, Intent intent) {
 
                 setTerminalToolbarHeight();
 
+                setSoftKeyboardState();
+
                 // To change the activity and drawer theme, activity needs to be recreated.
                 // But this will destroy the activity, and will call the onCreate() again.
                 // We need to investigate if enabling this is wise, since all stored variables and
diff --git a/app/src/main/java/com/termux/app/fragments/settings/DebuggingPreferencesFragment.java b/app/src/main/java/com/termux/app/fragments/settings/DebuggingPreferencesFragment.java
index d7a3aa600c..d8841eb477 100644
--- a/app/src/main/java/com/termux/app/fragments/settings/DebuggingPreferencesFragment.java
+++ b/app/src/main/java/com/termux/app/fragments/settings/DebuggingPreferencesFragment.java
@@ -15,6 +15,7 @@
 import com.termux.app.utils.Logger;
 
 public class DebuggingPreferencesFragment extends PreferenceFragmentCompat {
+
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         PreferenceManager preferenceManager = getPreferenceManager();
@@ -126,4 +127,5 @@ public boolean getBoolean(String key, boolean defValue) {
                 return false;
         }
     }
+
 }
diff --git a/app/src/main/java/com/termux/app/fragments/settings/TerminalIOPreferencesFragment.java b/app/src/main/java/com/termux/app/fragments/settings/TerminalIOPreferencesFragment.java
new file mode 100644
index 0000000000..874a87b4b0
--- /dev/null
+++ b/app/src/main/java/com/termux/app/fragments/settings/TerminalIOPreferencesFragment.java
@@ -0,0 +1,71 @@
+package com.termux.app.fragments.settings;
+
+import android.content.Context;
+import android.os.Bundle;
+
+import androidx.annotation.Nullable;
+
+import androidx.preference.PreferenceDataStore;
+import androidx.preference.PreferenceFragmentCompat;
+import androidx.preference.PreferenceManager;
+
+import com.termux.R;
+import com.termux.app.settings.preferences.TermuxAppSharedPreferences;
+
+public class TerminalIOPreferencesFragment extends PreferenceFragmentCompat {
+
+    @Override
+    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
+        PreferenceManager preferenceManager = getPreferenceManager();
+        preferenceManager.setPreferenceDataStore(TerminalIOPreferencesDataStore.getInstance(getContext()));
+
+        setPreferencesFromResource(R.xml.terminal_io_preferences, rootKey);
+    }
+
+}
+
+class TerminalIOPreferencesDataStore extends PreferenceDataStore {
+
+    private final Context mContext;
+    private final TermuxAppSharedPreferences mPreferences;
+
+    private static TerminalIOPreferencesDataStore mInstance;
+
+    private TerminalIOPreferencesDataStore(Context context) {
+        mContext = context;
+        mPreferences = new TermuxAppSharedPreferences(context);
+    }
+
+    public static synchronized TerminalIOPreferencesDataStore getInstance(Context context) {
+        if (mInstance == null) {
+            mInstance = new TerminalIOPreferencesDataStore(context.getApplicationContext());
+        }
+        return mInstance;
+    }
+
+
+
+    @Override
+    public void putBoolean(String key, boolean value) {
+        if(key == null) return;
+
+        switch (key) {
+            case "soft_keyboard_enabled":
+                    mPreferences.setSoftKeyboardEnabled(value);
+                break;
+            default:
+                break;
+        }
+    }
+
+    @Override
+    public boolean getBoolean(String key, boolean defValue) {
+        switch (key) {
+            case "soft_keyboard_enabled":
+                return mPreferences.getSoftKeyboardEnabled();
+            default:
+                return false;
+        }
+    }
+
+}
diff --git a/app/src/main/java/com/termux/app/settings/preferences/TermuxAppSharedPreferences.java b/app/src/main/java/com/termux/app/settings/preferences/TermuxAppSharedPreferences.java
index a1e663d7bc..de469143a6 100644
--- a/app/src/main/java/com/termux/app/settings/preferences/TermuxAppSharedPreferences.java
+++ b/app/src/main/java/com/termux/app/settings/preferences/TermuxAppSharedPreferences.java
@@ -53,6 +53,16 @@ public boolean toogleShowTerminalToolbar() {
 
 
 
+    public boolean getSoftKeyboardEnabled() {
+        return SharedPreferenceUtils.getBoolean(mSharedPreferences, TERMUX_APP.KEY_SOFT_KEYBOARD_ENABLED, TERMUX_APP.DEFAULT_VALUE_KEY_SOFT_KEYBOARD_ENABLED);
+    }
+
+    public void setSoftKeyboardEnabled(boolean value) {
+        SharedPreferenceUtils.setBoolean(mSharedPreferences, TERMUX_APP.KEY_SOFT_KEYBOARD_ENABLED, value, false);
+    }
+
+
+
     public boolean getKeepScreenOn() {
         return SharedPreferenceUtils.getBoolean(mSharedPreferences, TERMUX_APP.KEY_KEEP_SCREEN_ON, TERMUX_APP.DEFAULT_VALUE_KEEP_SCREEN_ON);
     }
diff --git a/app/src/main/java/com/termux/app/settings/preferences/TermuxPreferenceConstants.java b/app/src/main/java/com/termux/app/settings/preferences/TermuxPreferenceConstants.java
index 3fed9967bd..fd4aef0722 100644
--- a/app/src/main/java/com/termux/app/settings/preferences/TermuxPreferenceConstants.java
+++ b/app/src/main/java/com/termux/app/settings/preferences/TermuxPreferenceConstants.java
@@ -1,7 +1,7 @@
 package com.termux.app.settings.preferences;
 
 /*
- * Version: v0.6.0
+ * Version: v0.7.0
  *
  * Changelog
  *
@@ -29,6 +29,10 @@
  *
  * - 0.6.0 (2021-03-24)
  *      - Change `DEFAULT_VALUE_KEEP_SCREEN_ON` value to `false` in `TERMUX_APP`.
+ *
+ * - 0.7.0 (2021-03-27)
+ *      - Added following to `TERMUX_APP`:
+ *          `KEY_SOFT_KEYBOARD_ENABLED` and `DEFAULT_VALUE_KEY_SOFT_KEYBOARD_ENABLED`.
  */
 
 /**
@@ -46,39 +50,47 @@ public final class TermuxPreferenceConstants {
     public static final class TERMUX_APP {
 
         /**
-         * Defines the key for whether to show terminal toolbar containing extra keys and text input field
+         * Defines the key for whether to show terminal toolbar containing extra keys and text input field.
          */
         public static final String KEY_SHOW_TERMINAL_TOOLBAR = "show_extra_keys";
         public static final boolean DEFAULT_VALUE_SHOW_TERMINAL_TOOLBAR = true;
 
 
         /**
-         * Defines the key for whether to always keep screen on
+         * Defines the key for whether the soft keyboard will be enabled, for cases where users want
+         * to use a hardware keyboard instead.
+         */
+        public static final String KEY_SOFT_KEYBOARD_ENABLED = "soft_keyboard_enabled";
+        public static final boolean DEFAULT_VALUE_KEY_SOFT_KEYBOARD_ENABLED = true;
+
+
+        /**
+         * Defines the key for whether to always keep screen on.
          */
         public static final String KEY_KEEP_SCREEN_ON = "screen_always_on";
         public static final boolean DEFAULT_VALUE_KEEP_SCREEN_ON = false;
 
 
         /**
-         * Defines the key for font size of termux terminal view
+         * Defines the key for font size of termux terminal view.
          */
         public static final String KEY_FONTSIZE = "fontsize";
 
 
         /**
-         * Defines the key for current termux terminal session
+         * Defines the key for current termux terminal session.
          */
         public static final String KEY_CURRENT_SESSION = "current_session";
 
 
         /**
-         * Defines the key for current termux log level
+         * Defines the key for current termux log level.
          */
         public static final String KEY_LOG_LEVEL = "log_level";
 
 
         /**
-         * Defines the key for last used notification id
+         * Defines the key for last used notification id.
          */
         public static final String KEY_LAST_NOTIFICATION_ID = "last_notification_id";
         public static final int DEFAULT_VALUE_KEY_LAST_NOTIFICATION_ID = 0;
@@ -91,7 +103,7 @@ public static final class TERMUX_APP {
         public static final boolean DEFAULT_VALUE_TERMINAL_VIEW_KEY_LOGGING_ENABLED = false;
 
         /**
-         * Defines the key for whether flashes and notifications for plugin errors are enabled or not
+         * Defines the key for whether flashes and notifications for plugin errors are enabled or not.
          */
         public static final String KEY_PLUGIN_ERROR_NOTIFICATIONS_ENABLED = "plugin_error_notifications_enabled";
         public static final boolean DEFAULT_VALUE_PLUGIN_ERROR_NOTIFICATIONS_ENABLED = true;
@@ -104,7 +116,7 @@ public static final class TERMUX_APP {
     public static final class TERMUX_TASKER_APP {
 
         /**
-         * Defines the key for current termux log level
+         * Defines the key for current termux log level.
          */
         public static final String KEY_LOG_LEVEL = "log_level";
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 52a43ae78d..211fa379c8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -172,4 +172,17 @@
             <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 IO Preferences -->
+    <string name="terminal_io_preferences">Terminal I/O</string>
+
+        <!-- Keyboard Category -->
+        <string name="keyboard_header">Keyboard</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>
diff --git a/app/src/main/res/xml/root_preferences.xml b/app/src/main/res/xml/root_preferences.xml
index 39c731ebf8..75dd8826ac 100644
--- a/app/src/main/res/xml/root_preferences.xml
+++ b/app/src/main/res/xml/root_preferences.xml
@@ -5,4 +5,9 @@
         app:summary="Preferences for debugging"
         app:fragment="com.termux.app.fragments.settings.DebuggingPreferencesFragment"/>
 
+    <Preference
+        app:title="@string/terminal_io_preferences"
+        app:summary="Preferences for terminal I/O"
+        app:fragment="com.termux.app.fragments.settings.TerminalIOPreferencesFragment"/>
+
 </PreferenceScreen>
diff --git a/app/src/main/res/xml/terminal_io_preferences.xml b/app/src/main/res/xml/terminal_io_preferences.xml
new file mode 100644
index 0000000000..d20e7c58bf
--- /dev/null
+++ b/app/src/main/res/xml/terminal_io_preferences.xml
@@ -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>

From d7ea770d47e48f977d54c9e6eb39b5a0876dffe3 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 27 Mar 2021 19:08:26 +0500
Subject: [PATCH 300/912] Move com.termux.models to com.termux.app.models
 package

---
 app/src/main/java/com/termux/app/RunCommandService.java     | 2 +-
 app/src/main/java/com/termux/app/TermuxService.java         | 4 ++--
 .../main/java/com/termux/app/activities/ReportActivity.java | 2 +-
 .../java/com/termux/{ => app}/models/ExecutionCommand.java  | 2 +-
 .../main/java/com/termux/{ => app}/models/ReportInfo.java   | 2 +-
 .../main/java/com/termux/{ => app}/models/UserAction.java   | 2 +-
 .../main/java/com/termux/app/terminal/TermuxSession.java    | 2 +-
 app/src/main/java/com/termux/app/terminal/TermuxTask.java   | 4 ++--
 app/src/main/java/com/termux/app/utils/PluginUtils.java     | 6 +++---
 9 files changed, 13 insertions(+), 13 deletions(-)
 rename app/src/main/java/com/termux/{ => app}/models/ExecutionCommand.java (99%)
 rename app/src/main/java/com/termux/{ => app}/models/ReportInfo.java (96%)
 rename app/src/main/java/com/termux/{ => app}/models/UserAction.java (88%)

diff --git a/app/src/main/java/com/termux/app/RunCommandService.java b/app/src/main/java/com/termux/app/RunCommandService.java
index 33f79010db..3ad92123a7 100644
--- a/app/src/main/java/com/termux/app/RunCommandService.java
+++ b/app/src/main/java/com/termux/app/RunCommandService.java
@@ -19,7 +19,7 @@
 import com.termux.app.utils.NotificationUtils;
 import com.termux.app.utils.PluginUtils;
 import com.termux.app.utils.TextDataUtils;
-import com.termux.models.ExecutionCommand;
+import com.termux.app.models.ExecutionCommand;
 
 /**
  * Third-party apps that are not part of termux world can run commands in termux context by either
diff --git a/app/src/main/java/com/termux/app/TermuxService.java b/app/src/main/java/com/termux/app/TermuxService.java
index 5277a4e65d..8e808ae4f8 100644
--- a/app/src/main/java/com/termux/app/TermuxService.java
+++ b/app/src/main/java/com/termux/app/TermuxService.java
@@ -31,8 +31,8 @@
 import com.termux.app.utils.PermissionUtils;
 import com.termux.app.utils.ShellUtils;
 import com.termux.app.utils.TextDataUtils;
-import com.termux.models.ExecutionCommand;
-import com.termux.models.ExecutionCommand.ExecutionState;
+import com.termux.app.models.ExecutionCommand;
+import com.termux.app.models.ExecutionCommand.ExecutionState;
 import com.termux.app.terminal.TermuxTask;
 import com.termux.terminal.TerminalEmulator;
 import com.termux.terminal.TerminalSession;
diff --git a/app/src/main/java/com/termux/app/activities/ReportActivity.java b/app/src/main/java/com/termux/app/activities/ReportActivity.java
index 76ce521669..6d6651db44 100644
--- a/app/src/main/java/com/termux/app/activities/ReportActivity.java
+++ b/app/src/main/java/com/termux/app/activities/ReportActivity.java
@@ -19,7 +19,7 @@
 import com.termux.app.utils.MarkdownUtils;
 import com.termux.app.utils.ShareUtils;
 import com.termux.app.utils.TermuxUtils;
-import com.termux.models.ReportInfo;
+import com.termux.app.models.ReportInfo;
 
 import org.commonmark.node.FencedCodeBlock;
 
diff --git a/app/src/main/java/com/termux/models/ExecutionCommand.java b/app/src/main/java/com/termux/app/models/ExecutionCommand.java
similarity index 99%
rename from app/src/main/java/com/termux/models/ExecutionCommand.java
rename to app/src/main/java/com/termux/app/models/ExecutionCommand.java
index 8d4b9b333e..b81badc868 100644
--- a/app/src/main/java/com/termux/models/ExecutionCommand.java
+++ b/app/src/main/java/com/termux/app/models/ExecutionCommand.java
@@ -1,4 +1,4 @@
-package com.termux.models;
+package com.termux.app.models;
 
 import android.app.Activity;
 import android.app.PendingIntent;
diff --git a/app/src/main/java/com/termux/models/ReportInfo.java b/app/src/main/java/com/termux/app/models/ReportInfo.java
similarity index 96%
rename from app/src/main/java/com/termux/models/ReportInfo.java
rename to app/src/main/java/com/termux/app/models/ReportInfo.java
index 8572f3a474..4f8b4cef0e 100644
--- a/app/src/main/java/com/termux/models/ReportInfo.java
+++ b/app/src/main/java/com/termux/app/models/ReportInfo.java
@@ -1,4 +1,4 @@
-package com.termux.models;
+package com.termux.app.models;
 
 import java.io.Serializable;
 
diff --git a/app/src/main/java/com/termux/models/UserAction.java b/app/src/main/java/com/termux/app/models/UserAction.java
similarity index 88%
rename from app/src/main/java/com/termux/models/UserAction.java
rename to app/src/main/java/com/termux/app/models/UserAction.java
index 270a14a6d5..611304ea2f 100644
--- a/app/src/main/java/com/termux/models/UserAction.java
+++ b/app/src/main/java/com/termux/app/models/UserAction.java
@@ -1,4 +1,4 @@
-package com.termux.models;
+package com.termux.app.models;
 
 public enum UserAction {
 
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxSession.java b/app/src/main/java/com/termux/app/terminal/TermuxSession.java
index 6342ab5395..6b1ed7488b 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxSession.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxSession.java
@@ -8,7 +8,7 @@
 import com.termux.app.utils.Logger;
 import com.termux.app.utils.PluginUtils;
 import com.termux.app.utils.ShellUtils;
-import com.termux.models.ExecutionCommand;
+import com.termux.app.models.ExecutionCommand;
 import com.termux.terminal.TerminalSession;
 
 import java.io.File;
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTask.java b/app/src/main/java/com/termux/app/terminal/TermuxTask.java
index c6e505e352..d02a4e1a08 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTask.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTask.java
@@ -8,8 +8,8 @@
 import com.termux.app.utils.Logger;
 import com.termux.app.utils.PluginUtils;
 import com.termux.app.utils.ShellUtils;
-import com.termux.models.ExecutionCommand;
-import com.termux.models.ExecutionCommand.ExecutionState;
+import com.termux.app.models.ExecutionCommand;
+import com.termux.app.models.ExecutionCommand.ExecutionState;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/app/src/main/java/com/termux/app/utils/PluginUtils.java b/app/src/main/java/com/termux/app/utils/PluginUtils.java
index 2885b6abfc..059457b512 100644
--- a/app/src/main/java/com/termux/app/utils/PluginUtils.java
+++ b/app/src/main/java/com/termux/app/utils/PluginUtils.java
@@ -18,9 +18,9 @@
 import com.termux.app.settings.preferences.TermuxPreferenceConstants.TERMUX_APP;
 import com.termux.app.settings.properties.SharedProperties;
 import com.termux.app.settings.properties.TermuxPropertyConstants;
-import com.termux.models.ReportInfo;
-import com.termux.models.ExecutionCommand;
-import com.termux.models.UserAction;
+import com.termux.app.models.ReportInfo;
+import com.termux.app.models.ExecutionCommand;
+import com.termux.app.models.UserAction;
 
 public class PluginUtils {
 

From 15eb56d4dd2ed23afbea78178a3854ba30bc0323 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sun, 28 Mar 2021 09:06:17 +0500
Subject: [PATCH 301/912] Add PackageUtils and fix ReportActivity

- PackageUtils has been added to get various package related info. This will be used to get info based on Context objects instead of using BuildConfig which wouldn't have been available across termux plugins.

- Support for getting Context objects of all termux plugin apps have been added to TermuxUtils.

- Support for showing more details for the app has been added for ReportActivity. This will also allow app info of Termux app to be generated when TermuxUtils.getAppInfoMarkdownString() is called by a termux plugin so that both are shown so that devs/users can more easily detect compatibility issues.

- ReportActivity has been fixed to also include report and device info instead of just the ExecutionCommand info when copying and sharing.

- Moved the generation of markdown for ReportInfo to its own class and added creationTimestamp field.

- Increased markdown headings size for some cases.
---
 .../termux/app/activities/ReportActivity.java |  34 +--
 .../termux/app/models/ExecutionCommand.java   |  22 +-
 .../com/termux/app/models/ReportInfo.java     |  46 +++-
 .../TermuxAppSharedPreferences.java           |   3 +-
 .../java/com/termux/app/utils/Logger.java     |   4 +-
 .../com/termux/app/utils/PackageUtils.java    | 108 +++++++++
 .../com/termux/app/utils/PluginUtils.java     |   2 +-
 .../com/termux/app/utils/TermuxUtils.java     | 225 +++++++++++++-----
 8 files changed, 346 insertions(+), 98 deletions(-)
 create mode 100644 app/src/main/java/com/termux/app/utils/PackageUtils.java

diff --git a/app/src/main/java/com/termux/app/activities/ReportActivity.java b/app/src/main/java/com/termux/app/activities/ReportActivity.java
index 6d6651db44..ae3b5db03a 100644
--- a/app/src/main/java/com/termux/app/activities/ReportActivity.java
+++ b/app/src/main/java/com/termux/app/activities/ReportActivity.java
@@ -32,6 +32,7 @@ public class ReportActivity extends AppCompatActivity {
     private static final String EXTRA_REPORT_INFO = "report_info";
 
     ReportInfo mReportInfo;
+    String mReportActivityMarkdownString;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -98,7 +99,9 @@ private void updateUI(Bundle bundle) {
         recyclerView.setLayoutManager(new LinearLayoutManager(this));
         recyclerView.setAdapter(adapter);
 
-        adapter.setMarkdown(markwon, mReportInfo.reportString + getReportAndDeviceDetailsMarkdownString());
+
+        generateReportActivityMarkdownString();
+        adapter.setMarkdown(markwon, mReportActivityMarkdownString);
         adapter.notifyDataSetChanged();
     }
 
@@ -129,39 +132,20 @@ public boolean onOptionsItemSelected(final MenuItem item) {
         int id = item.getItemId();
         if (id == R.id.menu_item_share_report) {
             if (mReportInfo != null)
-                ShareUtils.shareText(this, getString(R.string.title_report_text), mReportInfo.reportString);
+                ShareUtils.shareText(this, getString(R.string.title_report_text), mReportActivityMarkdownString);
         } else if (id == R.id.menu_item_copy_report) {
             if (mReportInfo != null)
-                ShareUtils.copyTextToClipboard(this, mReportInfo.reportString, null);
+                ShareUtils.copyTextToClipboard(this, mReportActivityMarkdownString, null);
         }
 
         return false;
     }
 
     /**
-     * Get a markdown {@link String} for {@link #mReportInfo} and device details.
-     *
-     * @return Returns the markdown {@link String}.
+     * Generate the markdown {@link String} to be shown in {@link ReportActivity}.
      */
-    private String getReportAndDeviceDetailsMarkdownString() {
-        if(!mReportInfo.addReportAndDeviceDetails) return "";
-
-        StringBuilder markdownString = new StringBuilder();
-
-        markdownString.append("\n\n### Report And Device Details\n\n");
-
-        if (mReportInfo != null) {
-            markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("User Action", mReportInfo.userAction, "-"));
-            markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Sender", mReportInfo.sender, "-"));
-        }
-
-        markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Timestamp", TermuxUtils.getCurrentTimeStamp(), "-"));
-
-        markdownString.append("\n\n").append(TermuxUtils.getDeviceDetailsMarkdownString(this));
-
-        markdownString.append("\n##\n");
-
-        return markdownString.toString();
+    private void generateReportActivityMarkdownString() {
+        mReportActivityMarkdownString = ReportInfo.getReportInfoMarkdownString(this, mReportInfo);
     }
 
 
diff --git a/app/src/main/java/com/termux/app/models/ExecutionCommand.java b/app/src/main/java/com/termux/app/models/ExecutionCommand.java
index b81badc868..44485921d2 100644
--- a/app/src/main/java/com/termux/app/models/ExecutionCommand.java
+++ b/app/src/main/java/com/termux/app/models/ExecutionCommand.java
@@ -160,7 +160,7 @@ public String toString() {
      * @param ignoreNull Set to {@code true} if non-critical {@code null} values are to be ignored.
      * @return Returns the log friendly {@link String}.
      */
-    public static String getExecutionInputLogString(ExecutionCommand executionCommand, boolean ignoreNull) {
+    public static String getExecutionInputLogString(final ExecutionCommand executionCommand, boolean ignoreNull) {
         if (executionCommand == null) return "null";
 
         StringBuilder logString = new StringBuilder();
@@ -197,7 +197,7 @@ public static String getExecutionInputLogString(ExecutionCommand executionComman
      * @param ignoreNull Set to {@code true} if non-critical {@code null} values are to be ignored.
      * @return Returns the log friendly {@link String}.
      */
-    public static String getExecutionOutputLogString(ExecutionCommand executionCommand, boolean ignoreNull) {
+    public static String getExecutionOutputLogString(final ExecutionCommand executionCommand, boolean ignoreNull) {
         if (executionCommand == null) return "null";
 
         StringBuilder logString = new StringBuilder();
@@ -223,7 +223,7 @@ public static String getExecutionOutputLogString(ExecutionCommand executionComma
      * @param ignoreNull Set to {@code true} if non-critical {@code null} values are to be ignored.
      * @return Returns the log friendly {@link String}.
      */
-    public static String getExecutionErrLogString(ExecutionCommand executionCommand, boolean ignoreNull) {
+    public static String getExecutionErrLogString(final ExecutionCommand executionCommand, boolean ignoreNull) {
         StringBuilder logString = new StringBuilder();
 
         if(!ignoreNull || (executionCommand.isStateFailed())) {
@@ -243,7 +243,7 @@ public static String getExecutionErrLogString(ExecutionCommand executionCommand,
      * @param executionCommand The {@link ExecutionCommand} to convert.
      * @return Returns the log friendly {@link String}.
      */
-    public static String getDetailedLogString(ExecutionCommand executionCommand) {
+    public static String getDetailedLogString(final ExecutionCommand executionCommand) {
         if (executionCommand == null) return "null";
 
         StringBuilder logString = new StringBuilder();
@@ -264,14 +264,14 @@ public static String getDetailedLogString(ExecutionCommand executionCommand) {
      * @param executionCommand The {@link ExecutionCommand} to convert.
      * @return Returns the markdown {@link String}.
      */
-    public static String getDetailedMarkdownString(ExecutionCommand executionCommand) {
+    public static String getExecutionCommandMarkdownString(final ExecutionCommand executionCommand) {
         if (executionCommand == null) return "null";
 
         if (executionCommand.commandLabel == null) executionCommand.commandLabel = "Execution Command";
 
         StringBuilder markdownString = new StringBuilder();
 
-        markdownString.append("### ").append(executionCommand.commandLabel).append("\n");
+        markdownString.append("## ").append(executionCommand.commandLabel).append("\n");
 
 
         markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Previous State", executionCommand.previousState.getName(), "-"));
@@ -301,14 +301,14 @@ public static String getDetailedMarkdownString(ExecutionCommand executionCommand
 
         if(executionCommand.commandDescription != null || executionCommand.commandHelp != null) {
             if (executionCommand.commandDescription != null)
-                markdownString.append("\n\n#### Command Description\n\n").append(executionCommand.commandDescription).append("\n");
+                markdownString.append("\n\n### Command Description\n\n").append(executionCommand.commandDescription).append("\n");
             if (executionCommand.commandHelp != null)
-                markdownString.append("\n\n#### Command Help\n\n").append(executionCommand.commandHelp).append("\n");
+                markdownString.append("\n\n### Command Help\n\n").append(executionCommand.commandHelp).append("\n");
             markdownString.append("\n##\n");
         }
 
         if(executionCommand.pluginAPIHelp != null) {
-            markdownString.append("\n\n#### Plugin API Help\n\n").append(executionCommand.pluginAPIHelp);
+            markdownString.append("\n\n### Plugin API Help\n\n").append(executionCommand.pluginAPIHelp);
             markdownString.append("\n##\n");
         }
 
@@ -439,7 +439,7 @@ public String geStackTracesMarkdownString() {
      * @param argumentsArray The {@link String[]} argumentsArray to convert.
      * @return Returns the markdown {@link String}.
      */
-    public static String getArgumentsMarkdownString(String[] argumentsArray) {
+    public static String getArgumentsMarkdownString(final String[] argumentsArray) {
         StringBuilder argumentsString = new StringBuilder("**Arguments:**");
 
         if (argumentsArray != null && argumentsArray.length != 0) {
@@ -469,7 +469,7 @@ public static String getArgumentsMarkdownString(String[] argumentsArray) {
      * @param argumentsArray The {@link String[]} argumentsArray to convert.
      * @return Returns the log friendly {@link String}.
      */
-    public static String getArgumentsLogString(String[] argumentsArray) {
+    public static String getArgumentsLogString(final String[] argumentsArray) {
         StringBuilder argumentsString = new StringBuilder("Arguments:");
 
         if (argumentsArray != null && argumentsArray.length != 0) {
diff --git a/app/src/main/java/com/termux/app/models/ReportInfo.java b/app/src/main/java/com/termux/app/models/ReportInfo.java
index 4f8b4cef0e..7832d64602 100644
--- a/app/src/main/java/com/termux/app/models/ReportInfo.java
+++ b/app/src/main/java/com/termux/app/models/ReportInfo.java
@@ -1,5 +1,10 @@
 package com.termux.app.models;
 
+import android.content.Context;
+
+import com.termux.app.utils.MarkdownUtils;
+import com.termux.app.utils.TermuxUtils;
+
 import java.io.Serializable;
 
 public class ReportInfo implements Serializable {
@@ -12,15 +17,48 @@ public class ReportInfo implements Serializable {
     public String reportTitle;
     /** The markdown text for the report. */
     public String reportString;
-    /** If set to {@code true}, then report and device details will be added to the report. */
-    public boolean addReportAndDeviceDetails;
+    /** If set to {@code true}, then report, app and device info will be added to the report when
+     * markdown is generated.
+     */
+    public boolean addReportInfoToMarkdown;
+    /** The timestamp for the report. */
+    public String creationTimestammp;
 
-    public ReportInfo(UserAction userAction, String sender, String reportTitle, String reportString, boolean addReportAndDeviceDetails) {
+    public ReportInfo(UserAction userAction, String sender, String reportTitle, String reportString, boolean addReportInfoToMarkdown) {
         this.userAction = userAction;
         this.sender = sender;
         this.reportTitle = reportTitle;
         this.reportString = reportString;
-        this.addReportAndDeviceDetails = addReportAndDeviceDetails;
+        this.addReportInfoToMarkdown = addReportInfoToMarkdown;
+        this.creationTimestammp = TermuxUtils.getCurrentTimeStamp();
+    }
+
+    /**
+     * Get a markdown {@link String} for {@link ReportInfo}.
+     *
+     * @param currentPackageContext The context of current package.
+     * @param reportInfo The {@link ReportInfo} to convert.
+     * @return Returns the markdown {@link String}.
+     */
+    public static String getReportInfoMarkdownString(final Context currentPackageContext, final ReportInfo reportInfo) {
+        if (reportInfo == null) return "null";
+
+        StringBuilder markdownString = new StringBuilder();
+
+        markdownString.append(reportInfo.reportString);
+
+        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, "-"));
+            markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Creation Timestamp", reportInfo.creationTimestammp, "-"));
+            markdownString.append("\n##\n");
+
+            markdownString.append("\n\n").append(TermuxUtils.getAppInfoMarkdownString(currentPackageContext, true));
+            markdownString.append("\n\n").append(TermuxUtils.getDeviceInfoMarkdownString(currentPackageContext));
+        }
+
+        return markdownString.toString();
     }
 
 }
diff --git a/app/src/main/java/com/termux/app/settings/preferences/TermuxAppSharedPreferences.java b/app/src/main/java/com/termux/app/settings/preferences/TermuxAppSharedPreferences.java
index de469143a6..5ada86440e 100644
--- a/app/src/main/java/com/termux/app/settings/preferences/TermuxAppSharedPreferences.java
+++ b/app/src/main/java/com/termux/app/settings/preferences/TermuxAppSharedPreferences.java
@@ -25,7 +25,8 @@ public class TermuxAppSharedPreferences {
     private static final String LOG_TAG = "TermuxAppSharedPreferences";
 
     public TermuxAppSharedPreferences(@Nonnull Context context) {
-        mContext = TermuxUtils.getTermuxPackageContext(context);
+        // We use the default context if failed to get termux package context
+        mContext = TextDataUtils.getDefaultIfNull(TermuxUtils.getTermuxPackageContext(context), context);
         mSharedPreferences = getPrivateSharedPreferences(mContext);
 
         setFontVariables(context);
diff --git a/app/src/main/java/com/termux/app/utils/Logger.java b/app/src/main/java/com/termux/app/utils/Logger.java
index 40a4b68b21..0ff5b940a1 100644
--- a/app/src/main/java/com/termux/app/utils/Logger.java
+++ b/app/src/main/java/com/termux/app/utils/Logger.java
@@ -216,13 +216,13 @@ public static String getStackTracesString(String label, String[] stackTraceStrin
 
     public static String getStackTracesMarkdownString(String label, String[] stackTraceStringArray) {
         if(label == null) label = "StackTraces:";
-        StringBuilder stackTracesString = new StringBuilder("#### " + label);
+        StringBuilder stackTracesString = new StringBuilder("### " + label);
 
         if (stackTraceStringArray == null || stackTraceStringArray.length == 0) {
             stackTracesString.append("\n\n`-`");
         } else {
             for (int i = 0; i != stackTraceStringArray.length; i++) {
-                stackTracesString.append("\n\n\n##### Stacktrace ").append(i + 1).append("\n\n```\n").append(stackTraceStringArray[i]).append("\n```");
+                stackTracesString.append("\n\n\n#### Stacktrace ").append(i + 1).append("\n\n```\n").append(stackTraceStringArray[i]).append("\n```");
             }
         }
 
diff --git a/app/src/main/java/com/termux/app/utils/PackageUtils.java b/app/src/main/java/com/termux/app/utils/PackageUtils.java
new file mode 100644
index 0000000000..96e9609904
--- /dev/null
+++ b/app/src/main/java/com/termux/app/utils/PackageUtils.java
@@ -0,0 +1,108 @@
+package com.termux.app.utils;
+
+import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageInfo;
+
+import androidx.annotation.NonNull;
+
+public class PackageUtils {
+
+    /**
+     * Get the {@link Context} for the package name.
+     *
+     * @param context The {@link Context} to use to get the {@link Context} of the {@code packageName}.
+     * @return Returns the {@link Context}. This will {@code null} if an exception is raised.
+     */
+    public static Context getContextForPackage(@NonNull final Context context, String packageName) {
+        try {
+            return context.createPackageContext(packageName, Context.CONTEXT_RESTRICTED);
+        } catch (Exception e) {
+            Logger.logStackTraceWithMessage("Failed to get \"" + packageName + "\" package context.", e);
+            return null;
+        }
+    }
+
+    /**
+     * Get the {@link PackageInfo} for the package associated with the {@code context}.
+     *
+     * @param context The {@link Context} for the package.
+     * @return Returns the {@link PackageInfo}. This will be {@code null} if an exception is raised.
+     */
+    public static PackageInfo getPackageInfoForPackage(@NonNull final Context context) {
+        try {
+            return context.getPackageManager().getPackageInfo(context.getPackageName(), 0);
+        } catch (final Exception e) {
+            return null;
+        }
+    }
+
+    /**
+     * Get the app name for the package associated with the {@code context}.
+     *
+     * @param context The {@link Context} for the package.
+     * @return Returns the {@code android:name} attribute.
+     */
+    public static String getAppNameForPackage(@NonNull final Context context) {
+        return context.getApplicationInfo().loadLabel(context.getPackageManager()).toString();
+    }
+
+    /**
+     * Get the package name for the package associated with the {@code context}.
+     *
+     * @param context The {@link Context} for the package.
+     * @return Returns the package name.
+     */
+    public static String getPackageNameForPackage(@NonNull final Context context) {
+        return context.getApplicationInfo().packageName;
+    }
+
+    /**
+     * Get the {@code targetSdkVersion} for the package associated with the {@code context}.
+     *
+     * @param context The {@link Context} for the package.
+     * @return Returns the {@code targetSdkVersion}.
+     */
+    public static int getTargetSDKForPackage(@NonNull final Context context) {
+        return context.getApplicationInfo().targetSdkVersion;
+    }
+
+    /**
+     * Get the {@code versionName} for the package associated with the {@code context}.
+     *
+     * @param context The {@link Context} for the package.
+     * @return Returns the {@code versionName}. This will be {@code null} if an exception is raised.
+     */
+    public static Boolean isAppForPackageADebugBuild(@NonNull final Context context) {
+        return ( 0 != ( context.getApplicationInfo().flags & ApplicationInfo.FLAG_DEBUGGABLE ) );
+    }
+
+    /**
+     * Get the {@code versionCode} for the package associated with the {@code context}.
+     *
+     * @param context The {@link Context} for the package.
+     * @return Returns the {@code versionCode}. This will be {@code null} if an exception is raised.
+     */
+    public static Integer getVersionCodeForPackage(@NonNull final Context context) {
+        try {
+            return getPackageInfoForPackage(context).versionCode;
+        } catch (final Exception e) {
+            return null;
+        }
+    }
+
+    /**
+     * Get the {@code versionName} for the package associated with the {@code context}.
+     *
+     * @param context The {@link Context} for the package.
+     * @return Returns the {@code versionName}. This will be {@code null} if an exception is raised.
+     */
+    public static String getVersionNameForPackage(@NonNull final Context context) {
+        try {
+            return getPackageInfoForPackage(context).versionName;
+        } catch (final Exception e) {
+            return null;
+        }
+    }
+
+}
diff --git a/app/src/main/java/com/termux/app/utils/PluginUtils.java b/app/src/main/java/com/termux/app/utils/PluginUtils.java
index 059457b512..bb7e6b7dd0 100644
--- a/app/src/main/java/com/termux/app/utils/PluginUtils.java
+++ b/app/src/main/java/com/termux/app/utils/PluginUtils.java
@@ -149,7 +149,7 @@ public static void processPluginExecutionCommandError(final Context context, Str
         // to show the details of the error
         String title = TermuxConstants.TERMUX_APP_NAME + " Plugin Execution Command Error";
 
-        Intent notificationIntent = ReportActivity.newInstance(context, new ReportInfo(UserAction.PLUGIN_EXECUTION_COMMAND, logTag, title, ExecutionCommand.getDetailedMarkdownString(executionCommand), true));
+        Intent notificationIntent = ReportActivity.newInstance(context, new ReportInfo(UserAction.PLUGIN_EXECUTION_COMMAND, logTag, title, ExecutionCommand.getExecutionCommandMarkdownString(executionCommand), true));
         PendingIntent pendingIntent = PendingIntent.getActivity(context, 0, notificationIntent, PendingIntent.FLAG_UPDATE_CURRENT);
 
         // Setup the notification channel if not already set up
diff --git a/app/src/main/java/com/termux/app/utils/TermuxUtils.java b/app/src/main/java/com/termux/app/utils/TermuxUtils.java
index 8e40fcbd2e..9640b63fed 100644
--- a/app/src/main/java/com/termux/app/utils/TermuxUtils.java
+++ b/app/src/main/java/com/termux/app/utils/TermuxUtils.java
@@ -10,7 +10,6 @@
 import androidx.annotation.NonNull;
 
 import com.google.common.base.Joiner;
-import com.termux.BuildConfig;
 
 import com.termux.app.TermuxConstants;
 
@@ -28,23 +27,87 @@
 
 public class TermuxUtils {
 
-    public static Context getTermuxPackageContext(Context context) {
-        try {
-            return context.createPackageContext(TermuxConstants.TERMUX_PACKAGE_NAME, Context.CONTEXT_RESTRICTED);
-        } catch (Exception e) {
-            Logger.logStackTraceWithMessage("Failed to get \"" + TermuxConstants.TERMUX_PACKAGE_NAME + "\" package context. Force using current context.", e);
-            Logger.logError("Force using current context");
-            return context;
-        }
+    /**
+     * Get the {@link Context} for {@link TermuxConstants#TERMUX_PACKAGE_NAME} package.
+     *
+     * @param context The {@link Context} to use to get the {@link Context} of the package.
+     * @return Returns the {@link Context}. This will {@code null} if an exception is raised.
+     */
+    public static Context getTermuxPackageContext(@NonNull Context context) {
+        return PackageUtils.getContextForPackage(context, TermuxConstants.TERMUX_PACKAGE_NAME);
+    }
+
+    /**
+     * Get the {@link Context} for {@link TermuxConstants#TERMUX_API_PACKAGE_NAME} package.
+     *
+     * @param context The {@link Context} to use to get the {@link Context} of the package.
+     * @return Returns the {@link Context}. This will {@code null} if an exception is raised.
+     */
+    public static Context getTermuxAPIPackageContext(@NonNull Context context) {
+        return PackageUtils.getContextForPackage(context, TermuxConstants.TERMUX_API_PACKAGE_NAME);
+    }
+
+    /**
+     * Get the {@link Context} for {@link TermuxConstants#TERMUX_BOOT_PACKAGE_NAME} package.
+     *
+     * @param context The {@link Context} to use to get the {@link Context} of the package.
+     * @return Returns the {@link Context}. This will {@code null} if an exception is raised.
+     */
+    public static Context getTermuxBootPackageContext(@NonNull Context context) {
+        return PackageUtils.getContextForPackage(context, TermuxConstants.TERMUX_BOOT_PACKAGE_NAME);
     }
 
+    /**
+     * Get the {@link Context} for {@link TermuxConstants#TERMUX_FLOAT_PACKAGE_NAME} package.
+     *
+     * @param context The {@link Context} to use to get the {@link Context} of the package.
+     * @return Returns the {@link Context}. This will {@code null} if an exception is raised.
+     */
+    public static Context getTermuxFloatPackageContext(@NonNull Context context) {
+        return PackageUtils.getContextForPackage(context, TermuxConstants.TERMUX_FLOAT_PACKAGE_NAME);
+    }
+
+    /**
+     * Get the {@link Context} for {@link TermuxConstants#TERMUX_STYLING_PACKAGE_NAME} package.
+     *
+     * @param context The {@link Context} to use to get the {@link Context} of the package.
+     * @return Returns the {@link Context}. This will {@code null} if an exception is raised.
+     */
+    public static Context getTermuxStylingPackageContext(@NonNull Context context) {
+        return PackageUtils.getContextForPackage(context, TermuxConstants.TERMUX_STYLING_PACKAGE_NAME);
+    }
+
+    /**
+     * Get the {@link Context} for {@link TermuxConstants#TERMUX_TASKER_PACKAGE_NAME} package.
+     *
+     * @param context The {@link Context} to use to get the {@link Context} of the package.
+     * @return Returns the {@link Context}. This will {@code null} if an exception is raised.
+     */
+    public static Context getTermuxTaskerPackageContext(@NonNull Context context) {
+        return PackageUtils.getContextForPackage(context, TermuxConstants.TERMUX_TASKER_PACKAGE_NAME);
+    }
+
+    /**
+     * Get the {@link Context} for {@link TermuxConstants#TERMUX_WIDGET_PACKAGE_NAME} package.
+     *
+     * @param context The {@link Context} to use to get the {@link Context} of the package.
+     * @return Returns the {@link Context}. This will {@code null} if an exception is raised.
+     */
+    public static Context getTermuxWidgetPackageContext(@NonNull Context context) {
+        return PackageUtils.getContextForPackage(context, TermuxConstants.TERMUX_WIDGET_PACKAGE_NAME);
+    }
+
+
+
     /**
      * Send the {@link TermuxConstants#BROADCAST_TERMUX_OPENED} broadcast to notify apps that Termux
      * app has been opened.
      *
      * @param context The Context to send the broadcast.
      */
-    public static void sendTermuxOpenedBroadcast(Context context) {
+    public static void sendTermuxOpenedBroadcast(@NonNull Context context) {
+        if (context == null) return;
+
         Intent broadcast = new Intent(TermuxConstants.BROADCAST_TERMUX_OPENED);
         List<ResolveInfo> matches = context.getPackageManager().queryBroadcastReceivers(broadcast, 0);
 
@@ -60,12 +123,78 @@ public static void sendTermuxOpenedBroadcast(Context context) {
     }
 
     /**
-     * Get a markdown {@link String} for the device details.
+     * Get a markdown {@link String} for the app info. If the {@code context} passed is different
+     * from the {@link TermuxConstants#TERMUX_PACKAGE_NAME} package context, then this function
+     * must have been called by a different package like a plugin, so we return info for both packages
+     * if {@code returnTermuxPackageInfoToo} is {@code true}.
+     *
+     * @param currentPackageContext The context of current package.
+     * @param returnTermuxPackageInfoToo If set to {@code true}, then will return info of the
+     * {@link TermuxConstants#TERMUX_PACKAGE_NAME} package as well if its different from current package.
+     * @return Returns the markdown {@link String}.
+     */
+    public static String getAppInfoMarkdownString(@NonNull final Context currentPackageContext, final boolean returnTermuxPackageInfoToo) {
+        if (currentPackageContext == null) return "null";
+
+        StringBuilder markdownString = new StringBuilder();
+
+        Context termuxPackageContext = getTermuxPackageContext(currentPackageContext);
+
+        String termuxPackageName = null;
+        String termuxAppName = null;
+        if(termuxPackageContext != null) {
+            termuxPackageName = PackageUtils.getPackageNameForPackage(termuxPackageContext);
+            termuxAppName = PackageUtils.getAppNameForPackage(termuxPackageContext);
+        }
+
+        String currentPackageName = PackageUtils.getPackageNameForPackage(currentPackageContext);
+        String currentAppName = PackageUtils.getAppNameForPackage(currentPackageContext);
+
+        boolean isTermuxPackage = (termuxPackageName != null && termuxPackageName.equals(currentPackageName));
+
+
+        if(returnTermuxPackageInfoToo && !isTermuxPackage)
+            markdownString.append("## ").append(currentAppName).append(" App Info (Current)\n");
+        else
+            markdownString.append("## ").append(currentAppName).append(" App Info\n");
+        markdownString.append(getAppInfoMarkdownStringInner(currentPackageContext));
+
+        if(returnTermuxPackageInfoToo && !isTermuxPackage) {
+            markdownString.append("\n\n## ").append(termuxAppName).append(" App Info\n");
+            markdownString.append(getAppInfoMarkdownStringInner(termuxPackageContext));
+        }
+
+        markdownString.append("\n##\n");
+
+        return markdownString.toString();
+    }
+
+    /**
+     * Get a markdown {@link String} for the app info for the package associated with the {@code context}.
+     *
+     * @param context The context for operations for the package.
+     * @return Returns the markdown {@link String}.
+     */
+    public static String getAppInfoMarkdownStringInner(@NonNull final Context context) {
+        StringBuilder markdownString = new StringBuilder();
+
+        appendPropertyToMarkdown(markdownString,"APP_NAME", PackageUtils.getAppNameForPackage(context));
+        appendPropertyToMarkdown(markdownString,"PACKAGE_NAME", PackageUtils.getPackageNameForPackage(context));
+        appendPropertyToMarkdown(markdownString,"VERSION_NAME", PackageUtils.getVersionNameForPackage(context));
+        appendPropertyToMarkdown(markdownString,"VERSION_CODE", PackageUtils.getVersionCodeForPackage(context));
+        appendPropertyToMarkdown(markdownString,"TARGET_SDK", PackageUtils.getTargetSDKForPackage(context));
+        appendPropertyToMarkdown(markdownString,"IS_DEBUG_BUILD", PackageUtils.isAppForPackageADebugBuild(context));
+
+        return markdownString.toString();
+    }
+
+    /**
+     * Get a markdown {@link String} for the device info.
      *
      * @param context The context for operations.
      * @return Returns the markdown {@link String}.
      */
-    public static String getDeviceDetailsMarkdownString(final Context context) {
+    public static String getDeviceInfoMarkdownString(@NonNull final Context context) {
         if (context == null) return "null";
 
         // Some properties cannot be read with {@link System#getProperty(String)} but can be read
@@ -74,36 +203,37 @@ public static String getDeviceDetailsMarkdownString(final Context context) {
 
         StringBuilder markdownString = new StringBuilder();
 
-        markdownString.append("#### Software\n");
-        appendPropertyMarkdown(markdownString,
-            TermuxConstants.TERMUX_APP_NAME.toUpperCase() + "_VERSION", getTermuxAppVersionName() + "(" + getTermuxAppVersionCode() + ")");
-        appendPropertyMarkdown(markdownString,TermuxConstants.TERMUX_APP_NAME.toUpperCase() + "_DEBUG_BUILD", isTermuxAppDebugBuild());
-        appendPropertyMarkdown(markdownString,"OS_VERSION", getSystemPropertyWithAndroidAPI("os.version"));
-        appendPropertyMarkdown(markdownString, "SDK_INT", Build.VERSION.SDK_INT);
+        markdownString.append("## Device Info");
+
+        markdownString.append("\n\n### Software\n");
+        appendPropertyToMarkdown(markdownString,"OS_VERSION", getSystemPropertyWithAndroidAPI("os.version"));
+        appendPropertyToMarkdown(markdownString, "SDK_INT", Build.VERSION.SDK_INT);
         // If its a release version
         if ("REL".equals(Build.VERSION.CODENAME))
-            appendPropertyMarkdown(markdownString, "RELEASE", Build.VERSION.RELEASE);
+            appendPropertyToMarkdown(markdownString, "RELEASE", Build.VERSION.RELEASE);
         else
-            appendPropertyMarkdown(markdownString, "CODENAME", Build.VERSION.CODENAME);
-        appendPropertyMarkdown(markdownString, "INCREMENTAL", Build.VERSION.INCREMENTAL);
-        appendPropertyMarkdownIfSet(markdownString, "SECURITY_PATCH", systemProperties.getProperty("ro.build.version.security_patch"));
-        appendPropertyMarkdownIfSet(markdownString, "IS_DEBUGGABLE", systemProperties.getProperty("ro.debuggable"));
-        appendPropertyMarkdownIfSet(markdownString, "IS_EMULATOR", systemProperties.getProperty("ro.boot.qemu"));
-        appendPropertyMarkdownIfSet(markdownString, "IS_TREBLE_ENABLED", systemProperties.getProperty("ro.treble.enabled"));
-        appendPropertyMarkdown(markdownString, "TYPE", Build.TYPE);
-        appendPropertyMarkdown(markdownString, "TAGS", Build.TAGS);
-
-        markdownString.append("\n\n#### Hardware\n");
-        appendPropertyMarkdown(markdownString, "MANUFACTURER", Build.MANUFACTURER);
-        appendPropertyMarkdown(markdownString, "BRAND", Build.BRAND);
-        appendPropertyMarkdown(markdownString, "MODEL", Build.MODEL);
-        appendPropertyMarkdown(markdownString, "PRODUCT", Build.PRODUCT);
-        appendPropertyMarkdown(markdownString, "DISPLAY", Build.DISPLAY);
-        appendPropertyMarkdown(markdownString, "ID", Build.ID);
-        appendPropertyMarkdown(markdownString, "BOARD", Build.BOARD);
-        appendPropertyMarkdown(markdownString, "HARDWARE", Build.HARDWARE);
-        appendPropertyMarkdown(markdownString, "DEVICE", Build.DEVICE);
-        appendPropertyMarkdown(markdownString, "SUPPORTED_ABIS", Joiner.on(", ").skipNulls().join(Build.SUPPORTED_ABIS));
+            appendPropertyToMarkdown(markdownString, "CODENAME", Build.VERSION.CODENAME);
+        appendPropertyToMarkdown(markdownString, "INCREMENTAL", Build.VERSION.INCREMENTAL);
+        appendPropertyToMarkdownIfSet(markdownString, "SECURITY_PATCH", systemProperties.getProperty("ro.build.version.security_patch"));
+        appendPropertyToMarkdownIfSet(markdownString, "IS_DEBUGGABLE", systemProperties.getProperty("ro.debuggable"));
+        appendPropertyToMarkdownIfSet(markdownString, "IS_EMULATOR", systemProperties.getProperty("ro.boot.qemu"));
+        appendPropertyToMarkdownIfSet(markdownString, "IS_TREBLE_ENABLED", systemProperties.getProperty("ro.treble.enabled"));
+        appendPropertyToMarkdown(markdownString, "TYPE", Build.TYPE);
+        appendPropertyToMarkdown(markdownString, "TAGS", Build.TAGS);
+
+        markdownString.append("\n\n### Hardware\n");
+        appendPropertyToMarkdown(markdownString, "MANUFACTURER", Build.MANUFACTURER);
+        appendPropertyToMarkdown(markdownString, "BRAND", Build.BRAND);
+        appendPropertyToMarkdown(markdownString, "MODEL", Build.MODEL);
+        appendPropertyToMarkdown(markdownString, "PRODUCT", Build.PRODUCT);
+        appendPropertyToMarkdown(markdownString, "DISPLAY", Build.DISPLAY);
+        appendPropertyToMarkdown(markdownString, "ID", Build.ID);
+        appendPropertyToMarkdown(markdownString, "BOARD", Build.BOARD);
+        appendPropertyToMarkdown(markdownString, "HARDWARE", Build.HARDWARE);
+        appendPropertyToMarkdown(markdownString, "DEVICE", Build.DEVICE);
+        appendPropertyToMarkdown(markdownString, "SUPPORTED_ABIS", Joiner.on(", ").skipNulls().join(Build.SUPPORTED_ABIS));
+
+        markdownString.append("\n##\n");
 
         return markdownString.toString();
     }
@@ -163,13 +293,13 @@ private static String getSystemPropertyWithAndroidAPI(@NonNull String property)
         }
     }
 
-    private static void appendPropertyMarkdownIfSet(StringBuilder markdownString, String label, Object value) {
+    private static void appendPropertyToMarkdownIfSet(StringBuilder markdownString, String label, Object value) {
         if(value == null) return;
         if(value instanceof String && (((String) value).isEmpty()) || "REL".equals(value)) return;
         markdownString.append("\n").append(getPropertyMarkdown(label, value));
     }
 
-    private static void appendPropertyMarkdown(StringBuilder markdownString, String label, Object value) {
+    private static void appendPropertyToMarkdown(StringBuilder markdownString, String label, Object value) {
         markdownString.append("\n").append(getPropertyMarkdown(label, value));
     }
 
@@ -179,18 +309,6 @@ private static String getPropertyMarkdown(String label, Object value) {
 
 
 
-    public static int getTermuxAppVersionCode() {
-        return BuildConfig.VERSION_CODE;
-    }
-
-    public static String getTermuxAppVersionName() {
-        return BuildConfig.VERSION_NAME;
-    }
-
-    public static boolean isTermuxAppDebugBuild() {
-        return BuildConfig.DEBUG;
-    }
-
     public static String getCurrentTimeStamp() {
         @SuppressLint("SimpleDateFormat")
         final SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm");
@@ -198,5 +316,4 @@ public static String getCurrentTimeStamp() {
         return df.format(new Date());
     }
 
-
 }

From 49f53f55f31d9852ad1d72f5f3f89df6666c177d Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sun, 28 Mar 2021 09:08:45 +0500
Subject: [PATCH 302/912] Renamed TextDataUtils to DataUtils

---
 .../java/com/termux/app/RunCommandService.java   |  4 ++--
 .../main/java/com/termux/app/TermuxService.java  |  6 +++---
 .../com/termux/app/models/ExecutionCommand.java  | 10 +++++-----
 .../preferences/TermuxAppSharedPreferences.java  |  6 +++---
 .../properties/TermuxSharedProperties.java       |  6 +++---
 .../termux/app/terminal/TermuxViewClient.java    |  6 +++---
 .../utils/{TextDataUtils.java => DataUtils.java} |  2 +-
 .../java/com/termux/app/utils/PluginUtils.java   | 16 ++++++++--------
 .../java/com/termux/app/TermuxActivityTest.java  |  4 ++--
 9 files changed, 30 insertions(+), 30 deletions(-)
 rename app/src/main/java/com/termux/app/utils/{TextDataUtils.java => DataUtils.java} (99%)

diff --git a/app/src/main/java/com/termux/app/RunCommandService.java b/app/src/main/java/com/termux/app/RunCommandService.java
index 3ad92123a7..5c2362588d 100644
--- a/app/src/main/java/com/termux/app/RunCommandService.java
+++ b/app/src/main/java/com/termux/app/RunCommandService.java
@@ -18,7 +18,7 @@
 import com.termux.app.utils.Logger;
 import com.termux.app.utils.NotificationUtils;
 import com.termux.app.utils.PluginUtils;
-import com.termux.app.utils.TextDataUtils;
+import com.termux.app.utils.DataUtils;
 import com.termux.app.models.ExecutionCommand;
 
 /**
@@ -319,7 +319,7 @@ public int onStartCommand(Intent intent, int flags, int startId) {
         executionCommand.workingDirectory = intent.getStringExtra(RUN_COMMAND_SERVICE.EXTRA_WORKDIR);
         executionCommand.inBackground = intent.getBooleanExtra(RUN_COMMAND_SERVICE.EXTRA_BACKGROUND, false);
         executionCommand.sessionAction = intent.getStringExtra(RUN_COMMAND_SERVICE.EXTRA_SESSION_ACTION);
-        executionCommand.commandLabel = TextDataUtils.getDefaultIfNull(intent.getStringExtra(RUN_COMMAND_SERVICE.EXTRA_COMMAND_LABEL), "RUN_COMMAND Execution Intent Command");
+        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;
diff --git a/app/src/main/java/com/termux/app/TermuxService.java b/app/src/main/java/com/termux/app/TermuxService.java
index 8e808ae4f8..52cc44b581 100644
--- a/app/src/main/java/com/termux/app/TermuxService.java
+++ b/app/src/main/java/com/termux/app/TermuxService.java
@@ -30,7 +30,7 @@
 import com.termux.app.utils.NotificationUtils;
 import com.termux.app.utils.PermissionUtils;
 import com.termux.app.utils.ShellUtils;
-import com.termux.app.utils.TextDataUtils;
+import com.termux.app.utils.DataUtils;
 import com.termux.app.models.ExecutionCommand;
 import com.termux.app.models.ExecutionCommand.ExecutionState;
 import com.termux.app.terminal.TermuxTask;
@@ -323,7 +323,7 @@ private void actionServiceExecute(Intent intent) {
         executionCommand.inBackground = intent.getBooleanExtra(TERMUX_SERVICE.EXTRA_BACKGROUND, false);
         executionCommand.isFailsafe = intent.getBooleanExtra(TERMUX_ACTIVITY.ACTION_FAILSAFE_SESSION, false);
         executionCommand.sessionAction = intent.getStringExtra(TERMUX_SERVICE.EXTRA_SESSION_ACTION);
-        executionCommand.commandLabel = TextDataUtils.getDefaultIfNull(intent.getStringExtra(TERMUX_SERVICE.EXTRA_COMMAND_LABEL), "Execution Intent Command");
+        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);
@@ -412,7 +412,7 @@ private void executeTermuxSessionCommand(ExecutionCommand executionCommand) {
         TermuxSession newTermuxSession = createTermuxSession(executionCommand, sessionName);
         if (newTermuxSession == null) return;
 
-        handleSessionAction(TextDataUtils.getIntFromString(executionCommand.sessionAction,
+        handleSessionAction(DataUtils.getIntFromString(executionCommand.sessionAction,
             TERMUX_SERVICE.VALUE_EXTRA_SESSION_ACTION_SWITCH_TO_NEW_SESSION_AND_OPEN_ACTIVITY),
             newTermuxSession.getTerminalSession());
     }
diff --git a/app/src/main/java/com/termux/app/models/ExecutionCommand.java b/app/src/main/java/com/termux/app/models/ExecutionCommand.java
index 44485921d2..3b7e0abc3e 100644
--- a/app/src/main/java/com/termux/app/models/ExecutionCommand.java
+++ b/app/src/main/java/com/termux/app/models/ExecutionCommand.java
@@ -9,7 +9,7 @@
 import com.termux.app.TermuxConstants.TERMUX_APP.TERMUX_SERVICE;
 import com.termux.app.utils.Logger;
 import com.termux.app.utils.MarkdownUtils;
-import com.termux.app.utils.TextDataUtils;
+import com.termux.app.utils.DataUtils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -296,7 +296,7 @@ public static String getExecutionCommandMarkdownString(final ExecutionCommand ex
         markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Exit Code", executionCommand.exitCode, "-"));
 
         markdownString.append("\n\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Err Code", executionCommand.errCode, "-"));
-        markdownString.append("\n").append("**Errmsg:**\n").append(TextDataUtils.getDefaultIfNull(executionCommand.errmsg, "-"));
+        markdownString.append("\n").append("**Errmsg:**\n").append(DataUtils.getDefaultIfNull(executionCommand.errmsg, "-"));
         markdownString.append("\n\n").append(executionCommand.geStackTracesMarkdownString());
 
         if(executionCommand.commandDescription != null || executionCommand.commandHelp != null) {
@@ -391,11 +391,11 @@ public String getPluginAPIHelpLogString() {
     }
 
     public String getStdoutLogString() {
-        return getMultiLineLogStringEntry("Stdout", TextDataUtils.getTruncatedCommandOutput(stdout, TextDataUtils.LOGGER_ENTRY_SIZE_LIMIT_IN_BYTES / 5, false, false, true), "-");
+        return getMultiLineLogStringEntry("Stdout", DataUtils.getTruncatedCommandOutput(stdout, DataUtils.LOGGER_ENTRY_SIZE_LIMIT_IN_BYTES / 5, false, false, true), "-");
     }
 
     public String getStderrLogString() {
-        return getMultiLineLogStringEntry("Stderr", TextDataUtils.getTruncatedCommandOutput(stderr, TextDataUtils.LOGGER_ENTRY_SIZE_LIMIT_IN_BYTES / 5, false, false, true), "-");
+        return getMultiLineLogStringEntry("Stderr", DataUtils.getTruncatedCommandOutput(stderr, DataUtils.LOGGER_ENTRY_SIZE_LIMIT_IN_BYTES / 5, false, false, true), "-");
     }
 
     public String getExitCodeLogString() {
@@ -476,7 +476,7 @@ public static String getArgumentsLogString(final String[] argumentsArray) {
             argumentsString.append("\n```\n");
             for (int i = 0; i != argumentsArray.length; i++) {
                 argumentsString.append(getSingleLineLogStringEntry("Arg " + (i + 1),
-                    TextDataUtils.getTruncatedCommandOutput(argumentsArray[i], TextDataUtils.LOGGER_ENTRY_SIZE_LIMIT_IN_BYTES / 5, true, false, true),
+                    DataUtils.getTruncatedCommandOutput(argumentsArray[i], DataUtils.LOGGER_ENTRY_SIZE_LIMIT_IN_BYTES / 5, true, false, true),
                     "-")).append("`\n");
             }
             argumentsString.append("```");
diff --git a/app/src/main/java/com/termux/app/settings/preferences/TermuxAppSharedPreferences.java b/app/src/main/java/com/termux/app/settings/preferences/TermuxAppSharedPreferences.java
index 5ada86440e..2d7db91596 100644
--- a/app/src/main/java/com/termux/app/settings/preferences/TermuxAppSharedPreferences.java
+++ b/app/src/main/java/com/termux/app/settings/preferences/TermuxAppSharedPreferences.java
@@ -7,7 +7,7 @@
 import com.termux.app.TermuxConstants;
 import com.termux.app.utils.Logger;
 import com.termux.app.utils.TermuxUtils;
-import com.termux.app.utils.TextDataUtils;
+import com.termux.app.utils.DataUtils;
 import com.termux.app.settings.preferences.TermuxPreferenceConstants.TERMUX_APP;
 
 import javax.annotation.Nonnull;
@@ -26,7 +26,7 @@ public class TermuxAppSharedPreferences {
 
     public TermuxAppSharedPreferences(@Nonnull Context context) {
         // We use the default context if failed to get termux package context
-        mContext = TextDataUtils.getDefaultIfNull(TermuxUtils.getTermuxPackageContext(context), context);
+        mContext = DataUtils.getDefaultIfNull(TermuxUtils.getTermuxPackageContext(context), context);
         mSharedPreferences = getPrivateSharedPreferences(mContext);
 
         setFontVariables(context);
@@ -93,7 +93,7 @@ private void setFontVariables(Context context) {
 
     public int getFontSize() {
         int fontSize = SharedPreferenceUtils.getIntStoredAsString(mSharedPreferences, TERMUX_APP.KEY_FONTSIZE, DEFAULT_FONTSIZE);
-        return TextDataUtils.clamp(fontSize, MIN_FONTSIZE, MAX_FONTSIZE);
+        return DataUtils.clamp(fontSize, MIN_FONTSIZE, MAX_FONTSIZE);
     }
 
     public void setFontSize(int value) {
diff --git a/app/src/main/java/com/termux/app/settings/properties/TermuxSharedProperties.java b/app/src/main/java/com/termux/app/settings/properties/TermuxSharedProperties.java
index 0943a2f80a..f3d2d549e5 100644
--- a/app/src/main/java/com/termux/app/settings/properties/TermuxSharedProperties.java
+++ b/app/src/main/java/com/termux/app/settings/properties/TermuxSharedProperties.java
@@ -6,7 +6,7 @@
 import com.termux.app.terminal.io.extrakeys.ExtraKeysInfo;
 import com.termux.app.terminal.io.KeyboardShortcut;
 import com.termux.app.utils.Logger;
-import com.termux.app.utils.TextDataUtils;
+import com.termux.app.utils.DataUtils;
 
 import org.json.JSONException;
 
@@ -339,7 +339,7 @@ public static int getBellBehaviourInternalPropertyValueFromValue(String value) {
      * @return Returns the internal value for value.
      */
     public static float getTerminalToolbarHeightScaleFactorInternalPropertyValueFromValue(String value) {
-        return rangeTerminalToolbarHeightScaleFactorValue(TextDataUtils.getFloatFromString(value, TermuxPropertyConstants.DEFAULT_IVALUE_TERMINAL_TOOLBAR_HEIGHT_SCALE_FACTOR));
+        return rangeTerminalToolbarHeightScaleFactorValue(DataUtils.getFloatFromString(value, TermuxPropertyConstants.DEFAULT_IVALUE_TERMINAL_TOOLBAR_HEIGHT_SCALE_FACTOR));
     }
 
     /**
@@ -352,7 +352,7 @@ public static float getTerminalToolbarHeightScaleFactorInternalPropertyValueFrom
      * @return Returns the clamped value.
      */
     public static float rangeTerminalToolbarHeightScaleFactorValue(float value) {
-        return TextDataUtils.rangedOrDefault(value,
+        return DataUtils.rangedOrDefault(value,
             TermuxPropertyConstants.DEFAULT_IVALUE_TERMINAL_TOOLBAR_HEIGHT_SCALE_FACTOR,
             TermuxPropertyConstants.IVALUE_TERMINAL_TOOLBAR_HEIGHT_SCALE_FACTOR_MIN,
             TermuxPropertyConstants.IVALUE_TERMINAL_TOOLBAR_HEIGHT_SCALE_FACTOR_MAX);
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxViewClient.java b/app/src/main/java/com/termux/app/terminal/TermuxViewClient.java
index 1f72349353..08f8ae7da8 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxViewClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxViewClient.java
@@ -23,7 +23,7 @@
 import com.termux.app.terminal.io.KeyboardShortcut;
 import com.termux.app.terminal.io.extrakeys.ExtraKeysView;
 import com.termux.app.settings.properties.TermuxPropertyConstants;
-import com.termux.app.utils.TextDataUtils;
+import com.termux.app.utils.DataUtils;
 import com.termux.app.utils.Logger;
 import com.termux.terminal.KeyHandler;
 import com.termux.terminal.TerminalEmulator;
@@ -342,7 +342,7 @@ public void shareSessionTranscript() {
             // See https://github.com/termux/termux-app/issues/1166.
             Intent intent = new Intent(Intent.ACTION_SEND);
             intent.setType("text/plain");
-            transcriptText = TextDataUtils.getTruncatedCommandOutput(transcriptText, TextDataUtils.TRANSACTION_SIZE_LIMIT_IN_BYTES, false, true, false).trim();
+            transcriptText = DataUtils.getTruncatedCommandOutput(transcriptText, DataUtils.TRANSACTION_SIZE_LIMIT_IN_BYTES, false, true, false).trim();
             intent.putExtra(Intent.EXTRA_TEXT, transcriptText);
             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)));
@@ -357,7 +357,7 @@ public void showUrlSelection() {
 
         String text = session.getEmulator().getScreen().getTranscriptTextWithFullLinesJoined();
 
-        LinkedHashSet<CharSequence> urlSet = TextDataUtils.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;
diff --git a/app/src/main/java/com/termux/app/utils/TextDataUtils.java b/app/src/main/java/com/termux/app/utils/DataUtils.java
similarity index 99%
rename from app/src/main/java/com/termux/app/utils/TextDataUtils.java
rename to app/src/main/java/com/termux/app/utils/DataUtils.java
index 2ab2a01551..459de336ba 100644
--- a/app/src/main/java/com/termux/app/utils/TextDataUtils.java
+++ b/app/src/main/java/com/termux/app/utils/DataUtils.java
@@ -6,7 +6,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-public class TextDataUtils {
+public class DataUtils {
 
     public static final int TRANSACTION_SIZE_LIMIT_IN_BYTES = 100 * 1024; // 100KB
     public static final int LOGGER_ENTRY_SIZE_LIMIT_IN_BYTES = 4 * 1024; // 4KB
diff --git a/app/src/main/java/com/termux/app/utils/PluginUtils.java b/app/src/main/java/com/termux/app/utils/PluginUtils.java
index bb7e6b7dd0..4c9bc136a4 100644
--- a/app/src/main/java/com/termux/app/utils/PluginUtils.java
+++ b/app/src/main/java/com/termux/app/utils/PluginUtils.java
@@ -51,7 +51,7 @@ public class PluginUtils {
     public static void processPluginExecutionCommandResult(final Context context, String logTag, final ExecutionCommand executionCommand) {
         if (executionCommand == null) return;
 
-        logTag = TextDataUtils.getDefaultIfNull(logTag, LOG_TAG);
+        logTag = DataUtils.getDefaultIfNull(logTag, LOG_TAG);
 
         if(!executionCommand.hasExecuted()) {
             Logger.logWarn(logTag, "Ignoring call to processPluginExecutionCommandResult() since the execution command has not been ExecutionState.EXECUTED");
@@ -109,7 +109,7 @@ public static void processPluginExecutionCommandResult(final Context context, St
     public static void processPluginExecutionCommandError(final Context context, String logTag, final ExecutionCommand executionCommand, boolean forceNotification) {
         if(context == null || executionCommand == null) return;
 
-        logTag = TextDataUtils.getDefaultIfNull(logTag, LOG_TAG);
+        logTag = DataUtils.getDefaultIfNull(logTag, LOG_TAG);
 
         if(!executionCommand.isStateFailed()) {
             Logger.logWarn(logTag, "Ignoring call to processPluginExecutionCommandError() since the execution command does not have ExecutionState.FAILED state");
@@ -190,7 +190,7 @@ public static void processPluginExecutionCommandError(final Context context, Str
     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 = TextDataUtils.getDefaultIfNull(logTag, LOG_TAG);
+        logTag = DataUtils.getDefaultIfNull(logTag, LOG_TAG);
 
         Logger.logDebug(logTag,  "Sending execution result for Execution Command \"" + label +  "\" to " + pluginPendingIntent.getCreatorPackage());
 
@@ -203,12 +203,12 @@ public static boolean sendPluginExecutionCommandResultPendingIntent(Context cont
 
         // Truncate stdout and stdout to max TRANSACTION_SIZE_LIMIT_IN_BYTES
         if(stderr == null || stderr.isEmpty()) {
-            truncatedStdout = TextDataUtils.getTruncatedCommandOutput(stdout, TextDataUtils.TRANSACTION_SIZE_LIMIT_IN_BYTES, false, false, false);
+            truncatedStdout = DataUtils.getTruncatedCommandOutput(stdout, DataUtils.TRANSACTION_SIZE_LIMIT_IN_BYTES, false, false, false);
         } else if (stdout == null || stdout.isEmpty()) {
-            truncatedStderr = TextDataUtils.getTruncatedCommandOutput(stderr, TextDataUtils.TRANSACTION_SIZE_LIMIT_IN_BYTES, false, false, false);
+            truncatedStderr = DataUtils.getTruncatedCommandOutput(stderr, DataUtils.TRANSACTION_SIZE_LIMIT_IN_BYTES, false, false, false);
         } else {
-            truncatedStdout = TextDataUtils.getTruncatedCommandOutput(stdout, TextDataUtils.TRANSACTION_SIZE_LIMIT_IN_BYTES / 2, false, false, false);
-            truncatedStderr = TextDataUtils.getTruncatedCommandOutput(stderr, TextDataUtils.TRANSACTION_SIZE_LIMIT_IN_BYTES / 2, false, false, false);
+            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()){
@@ -225,7 +225,7 @@ public static boolean sendPluginExecutionCommandResultPendingIntent(Context cont
 
         // Truncate errmsg to max TRANSACTION_SIZE_LIMIT_IN_BYTES / 4
         // trim from end to preserve start of stacktraces
-        truncatedErrmsg = TextDataUtils.getTruncatedCommandOutput(errmsg, TextDataUtils.TRANSACTION_SIZE_LIMIT_IN_BYTES / 4, true, false, false);
+        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;
diff --git a/app/src/test/java/com/termux/app/TermuxActivityTest.java b/app/src/test/java/com/termux/app/TermuxActivityTest.java
index ac5ef9093a..66be65fe37 100644
--- a/app/src/test/java/com/termux/app/TermuxActivityTest.java
+++ b/app/src/test/java/com/termux/app/TermuxActivityTest.java
@@ -1,6 +1,6 @@
 package com.termux.app;
 
-import com.termux.app.utils.TextDataUtils;
+import com.termux.app.utils.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, TextDataUtils.extractUrls(text));
+        Assert.assertEquals(expected, DataUtils.extractUrls(text));
     }
 
     @Test

From d4653d0590f2de498741514aafa3bded78c737ed Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Mon, 29 Mar 2021 07:20:39 +0500
Subject: [PATCH 303/912] Get TERMUX_VERSION while building shell environment
 via Termux package context

---
 .../com/termux/app/terminal/TermuxSession.java     |  2 +-
 .../java/com/termux/app/terminal/TermuxTask.java   |  2 +-
 .../main/java/com/termux/app/utils/ShellUtils.java | 14 +++++++++++---
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/termux/app/terminal/TermuxSession.java b/app/src/main/java/com/termux/app/terminal/TermuxSession.java
index 6b1ed7488b..eab5e228dc 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxSession.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxSession.java
@@ -33,7 +33,7 @@ private TermuxSession(TerminalSession terminalSession, ExecutionCommand executio
     public static TermuxSession create(@NonNull final TermuxService service, @NonNull ExecutionCommand executionCommand, @NonNull TermuxSessionClientBase termuxSessionClient, String sessionName) {
         if (executionCommand.workingDirectory == null || executionCommand.workingDirectory.isEmpty()) executionCommand.workingDirectory = TermuxConstants.TERMUX_HOME_DIR_PATH;
 
-        String[] environment = ShellUtils.buildEnvironment(executionCommand.isFailsafe, executionCommand.workingDirectory);
+        String[] environment = ShellUtils.buildEnvironment(service, executionCommand.isFailsafe, executionCommand.workingDirectory);
 
         boolean isLoginShell = false;
         if (executionCommand.executable == null) {
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTask.java b/app/src/main/java/com/termux/app/terminal/TermuxTask.java
index d02a4e1a08..4bd1f002e0 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTask.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTask.java
@@ -34,7 +34,7 @@ private TermuxTask(Process process, ExecutionCommand executionCommand) {
     public static TermuxTask create(@NonNull final TermuxService service, @NonNull ExecutionCommand executionCommand) {
         if (executionCommand.workingDirectory == null || executionCommand.workingDirectory.isEmpty()) executionCommand.workingDirectory = TermuxConstants.TERMUX_HOME_DIR_PATH;
 
-        String[] env = ShellUtils.buildEnvironment(false, executionCommand.workingDirectory);
+        String[] env = ShellUtils.buildEnvironment(service, false, executionCommand.workingDirectory);
 
         final String[] commandArray = ShellUtils.setupProcessArgs(executionCommand.executable, executionCommand.arguments);
         // final String commandDescription = Arrays.toString(commandArray);
diff --git a/app/src/main/java/com/termux/app/utils/ShellUtils.java b/app/src/main/java/com/termux/app/utils/ShellUtils.java
index 341a01c791..e8be304a27 100644
--- a/app/src/main/java/com/termux/app/utils/ShellUtils.java
+++ b/app/src/main/java/com/termux/app/utils/ShellUtils.java
@@ -1,6 +1,7 @@
 package com.termux.app.utils;
 
-import com.termux.BuildConfig;
+import android.content.Context;
+
 import com.termux.app.TermuxConstants;
 
 import java.io.File;
@@ -13,14 +14,21 @@
 
 public class ShellUtils {
 
-    public static String[] buildEnvironment(boolean isFailSafe, String workingDirectory) {
+    public static String[] buildEnvironment(Context currentPackageContext, boolean isFailSafe, String workingDirectory) {
         TermuxConstants.TERMUX_HOME_DIR.mkdirs();
 
         if (workingDirectory == null || workingDirectory.isEmpty()) workingDirectory = TermuxConstants.TERMUX_HOME_DIR_PATH;
 
         List<String> environment = new ArrayList<>();
 
-        environment.add("TERMUX_VERSION=" + BuildConfig.VERSION_NAME);
+        // This function may be called by a different package like a plugin, so we get version for Termux package via its context
+        Context termuxPackageContext = TermuxUtils.getTermuxPackageContext(currentPackageContext);
+        if(termuxPackageContext != null) {
+            String termuxVersionName = PackageUtils.getVersionNameForPackage(termuxPackageContext);
+            if(termuxVersionName != null)
+                environment.add("TERMUX_VERSION=" + termuxVersionName);
+        }
+
         environment.add("TERM=xterm-256color");
         environment.add("COLORTERM=truecolor");
         environment.add("HOME=" + TermuxConstants.TERMUX_HOME_DIR_PATH);

From cdbd38faaa4313da501bbc62a61a53e4a8b83aa0 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Mon, 5 Apr 2021 23:18:43 +0500
Subject: [PATCH 304/912] Move StreamGobbler to shell package

---
 .../java/com/termux/app/{terminal => shell}/StreamGobbler.java  | 2 +-
 app/src/main/java/com/termux/app/terminal/TermuxTask.java       | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
 rename app/src/main/java/com/termux/app/{terminal => shell}/StreamGobbler.java (99%)

diff --git a/app/src/main/java/com/termux/app/terminal/StreamGobbler.java b/app/src/main/java/com/termux/app/shell/StreamGobbler.java
similarity index 99%
rename from app/src/main/java/com/termux/app/terminal/StreamGobbler.java
rename to app/src/main/java/com/termux/app/shell/StreamGobbler.java
index 48536eeb23..daad11768c 100644
--- a/app/src/main/java/com/termux/app/terminal/StreamGobbler.java
+++ b/app/src/main/java/com/termux/app/shell/StreamGobbler.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.termux.app.terminal;
+package com.termux.app.shell;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTask.java b/app/src/main/java/com/termux/app/terminal/TermuxTask.java
index 4bd1f002e0..6cfa96ec3f 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTask.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTask.java
@@ -5,6 +5,7 @@
 import com.termux.R;
 import com.termux.app.TermuxConstants;
 import com.termux.app.TermuxService;
+import com.termux.app.shell.StreamGobbler;
 import com.termux.app.utils.Logger;
 import com.termux.app.utils.PluginUtils;
 import com.termux.app.utils.ShellUtils;

From ada678dfe2c50a2781bf411182650c7c73837d56 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Mon, 5 Apr 2021 23:21:13 +0500
Subject: [PATCH 305/912] Move get*LogStringEntry() functions to logger class

---
 .../termux/app/models/ExecutionCommand.java   | 39 ++++++-------------
 .../java/com/termux/app/utils/DataUtils.java  |  1 -
 .../java/com/termux/app/utils/Logger.java     | 19 ++++++++-
 3 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/app/src/main/java/com/termux/app/models/ExecutionCommand.java b/app/src/main/java/com/termux/app/models/ExecutionCommand.java
index 3b7e0abc3e..2de23ffc9b 100644
--- a/app/src/main/java/com/termux/app/models/ExecutionCommand.java
+++ b/app/src/main/java/com/termux/app/models/ExecutionCommand.java
@@ -368,7 +368,7 @@ public String getIsPluginExecutionCommandLogString() {
     }
 
     public String getSessionActionLogString() {
-        return getSingleLineLogStringEntry("Session Action", sessionAction, "-");
+        return Logger.getSingleLineLogStringEntry("Session Action", sessionAction, "-");
     }
 
     public String getPendingIntentCreatorLogString() {
@@ -379,35 +379,35 @@ public String getPendingIntentCreatorLogString() {
     }
 
     public String getCommandDescriptionLogString() {
-        return getSingleLineLogStringEntry("Command Description", commandDescription, "-");
+        return Logger.getSingleLineLogStringEntry("Command Description", commandDescription, "-");
     }
 
     public String getCommandHelpLogString() {
-        return getSingleLineLogStringEntry("Command Help", commandHelp, "-");
+        return Logger.getSingleLineLogStringEntry("Command Help", commandHelp, "-");
     }
 
     public String getPluginAPIHelpLogString() {
-        return getSingleLineLogStringEntry("Plugin API Help", pluginAPIHelp, "-");
+        return Logger.getSingleLineLogStringEntry("Plugin API Help", pluginAPIHelp, "-");
     }
 
     public String getStdoutLogString() {
-        return getMultiLineLogStringEntry("Stdout", DataUtils.getTruncatedCommandOutput(stdout, DataUtils.LOGGER_ENTRY_SIZE_LIMIT_IN_BYTES / 5, false, false, true), "-");
+        return Logger.getMultiLineLogStringEntry("Stdout", DataUtils.getTruncatedCommandOutput(stdout, Logger.LOGGER_ENTRY_SIZE_LIMIT_IN_BYTES / 5, false, false, true), "-");
     }
 
     public String getStderrLogString() {
-        return getMultiLineLogStringEntry("Stderr", DataUtils.getTruncatedCommandOutput(stderr, DataUtils.LOGGER_ENTRY_SIZE_LIMIT_IN_BYTES / 5, false, false, true), "-");
+        return Logger.getMultiLineLogStringEntry("Stderr", DataUtils.getTruncatedCommandOutput(stderr, Logger.LOGGER_ENTRY_SIZE_LIMIT_IN_BYTES / 5, false, false, true), "-");
     }
 
     public String getExitCodeLogString() {
-        return getSingleLineLogStringEntry("Exit Code", exitCode, "-");
+        return Logger.getSingleLineLogStringEntry("Exit Code", exitCode, "-");
     }
 
     public String getErrCodeLogString() {
-        return getSingleLineLogStringEntry("Err Code", errCode, "-");
+        return Logger.getSingleLineLogStringEntry("Err Code", errCode, "-");
     }
 
     public String getErrmsgLogString() {
-        return getMultiLineLogStringEntry("Errmsg", errmsg, "-");
+        return Logger.getMultiLineLogStringEntry("Errmsg", errmsg, "-");
     }
 
     public String geStackTracesLogString() {
@@ -475,8 +475,8 @@ public static String getArgumentsLogString(final String[] argumentsArray) {
         if (argumentsArray != null && argumentsArray.length != 0) {
             argumentsString.append("\n```\n");
             for (int i = 0; i != argumentsArray.length; i++) {
-                argumentsString.append(getSingleLineLogStringEntry("Arg " + (i + 1),
-                    DataUtils.getTruncatedCommandOutput(argumentsArray[i], DataUtils.LOGGER_ENTRY_SIZE_LIMIT_IN_BYTES / 5, true, false, true),
+                argumentsString.append(Logger.getSingleLineLogStringEntry("Arg " + (i + 1),
+                    DataUtils.getTruncatedCommandOutput(argumentsArray[i], Logger.LOGGER_ENTRY_SIZE_LIMIT_IN_BYTES / 5, true, false, true),
                     "-")).append("`\n");
             }
             argumentsString.append("```");
@@ -488,23 +488,6 @@ public static String getArgumentsLogString(final String[] argumentsArray) {
     }
 
 
-
-    public static String getSingleLineLogStringEntry(String label, Object object, String def) {
-        if (object != null)
-            return label + ": `" + object + "`";
-        else
-            return  label + ": "  +  def;
-    }
-
-    public static String getMultiLineLogStringEntry( String label, Object object,String def) {
-        if (object != null)
-            return label + ":\n```\n" + object + "\n```\n";
-        else
-            return  label + ": "  +  def;
-    }
-
-
-
     public synchronized boolean setState(ExecutionState newState) {
         // The state transition cannot go back or change if already at {@link ExecutionState#SUCCESS}
         if(newState.getValue() < currentState.getValue() || currentState == ExecutionState.SUCCESS) {
diff --git a/app/src/main/java/com/termux/app/utils/DataUtils.java b/app/src/main/java/com/termux/app/utils/DataUtils.java
index 459de336ba..87954ffec0 100644
--- a/app/src/main/java/com/termux/app/utils/DataUtils.java
+++ b/app/src/main/java/com/termux/app/utils/DataUtils.java
@@ -9,7 +9,6 @@
 public class DataUtils {
 
     public static final int TRANSACTION_SIZE_LIMIT_IN_BYTES = 100 * 1024; // 100KB
-    public static final int LOGGER_ENTRY_SIZE_LIMIT_IN_BYTES = 4 * 1024; // 4KB
 
     public static String getTruncatedCommandOutput(String text, int maxLength, boolean fromEnd, boolean onNewline, boolean addPrefix) {
         if(text == null) return null;
diff --git a/app/src/main/java/com/termux/app/utils/Logger.java b/app/src/main/java/com/termux/app/utils/Logger.java
index 0ff5b940a1..cd46288736 100644
--- a/app/src/main/java/com/termux/app/utils/Logger.java
+++ b/app/src/main/java/com/termux/app/utils/Logger.java
@@ -25,9 +25,12 @@ public class Logger {
     public static final int LOG_LEVEL_VERBOSE = 3; // start logging verbose messages
 
     public static final int DEFAULT_LOG_LEVEL = LOG_LEVEL_NORMAL;
-
     private static int CURRENT_LOG_LEVEL = DEFAULT_LOG_LEVEL;
 
+    public static final int LOGGER_ENTRY_SIZE_LIMIT_IN_BYTES = 4 * 1024; // 4KB
+
+
+
     static public void logMesssage(int logLevel, String tag, String message) {
         if(logLevel == Log.ERROR && CURRENT_LOG_LEVEL >= LOG_LEVEL_NORMAL)
             Log.e(getFullTag(tag), message);
@@ -230,6 +233,20 @@ public static String getStackTracesMarkdownString(String label, String[] stackTr
 
         return stackTracesString.toString();
     }
+
+    public static String getSingleLineLogStringEntry(String label, Object object, String def) {
+        if (object != null)
+            return label + ": `" + object + "`";
+        else
+            return  label + ": "  +  def;
+    }
+
+    public static String getMultiLineLogStringEntry(String label, Object object, String def) {
+        if (object != null)
+            return label + ":\n```\n" + object + "\n```\n";
+        else
+            return  label + ": "  +  def;
+    }
     
 
 

From a32309827f03c981e13d351bccdc606cd2e98cba Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Mon, 5 Apr 2021 23:22:04 +0500
Subject: [PATCH 306/912] Update gradle version to 4.1.3

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 82454a202b..78a9f1b233 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.1'
+        classpath 'com.android.tools.build:gradle:4.1.3'
     }
 }
 

From c0323fe816483bff6d7af7d435059dbc92a8c6e7 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Mon, 5 Apr 2021 23:26:47 +0500
Subject: [PATCH 307/912] Move ShellUtils to shell package

---
 app/src/main/java/com/termux/app/TermuxService.java           | 2 +-
 .../main/java/com/termux/app/{utils => shell}/ShellUtils.java | 4 +++-
 app/src/main/java/com/termux/app/terminal/TermuxSession.java  | 2 +-
 app/src/main/java/com/termux/app/terminal/TermuxTask.java     | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)
 rename app/src/main/java/com/termux/app/{utils => shell}/ShellUtils.java (98%)

diff --git a/app/src/main/java/com/termux/app/TermuxService.java b/app/src/main/java/com/termux/app/TermuxService.java
index 52cc44b581..3bdd979d1f 100644
--- a/app/src/main/java/com/termux/app/TermuxService.java
+++ b/app/src/main/java/com/termux/app/TermuxService.java
@@ -29,7 +29,7 @@
 import com.termux.app.utils.Logger;
 import com.termux.app.utils.NotificationUtils;
 import com.termux.app.utils.PermissionUtils;
-import com.termux.app.utils.ShellUtils;
+import com.termux.app.shell.ShellUtils;
 import com.termux.app.utils.DataUtils;
 import com.termux.app.models.ExecutionCommand;
 import com.termux.app.models.ExecutionCommand.ExecutionState;
diff --git a/app/src/main/java/com/termux/app/utils/ShellUtils.java b/app/src/main/java/com/termux/app/shell/ShellUtils.java
similarity index 98%
rename from app/src/main/java/com/termux/app/utils/ShellUtils.java
rename to app/src/main/java/com/termux/app/shell/ShellUtils.java
index e8be304a27..838e7c8483 100644
--- a/app/src/main/java/com/termux/app/utils/ShellUtils.java
+++ b/app/src/main/java/com/termux/app/shell/ShellUtils.java
@@ -1,8 +1,10 @@
-package com.termux.app.utils;
+package com.termux.app.shell;
 
 import android.content.Context;
 
 import com.termux.app.TermuxConstants;
+import com.termux.app.utils.PackageUtils;
+import com.termux.app.utils.TermuxUtils;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxSession.java b/app/src/main/java/com/termux/app/terminal/TermuxSession.java
index eab5e228dc..b282b1f026 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxSession.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxSession.java
@@ -7,7 +7,7 @@
 import com.termux.app.TermuxService;
 import com.termux.app.utils.Logger;
 import com.termux.app.utils.PluginUtils;
-import com.termux.app.utils.ShellUtils;
+import com.termux.app.shell.ShellUtils;
 import com.termux.app.models.ExecutionCommand;
 import com.termux.terminal.TerminalSession;
 
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTask.java b/app/src/main/java/com/termux/app/terminal/TermuxTask.java
index 6cfa96ec3f..0c0143ee63 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTask.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTask.java
@@ -8,7 +8,7 @@
 import com.termux.app.shell.StreamGobbler;
 import com.termux.app.utils.Logger;
 import com.termux.app.utils.PluginUtils;
-import com.termux.app.utils.ShellUtils;
+import com.termux.app.shell.ShellUtils;
 import com.termux.app.models.ExecutionCommand;
 import com.termux.app.models.ExecutionCommand.ExecutionState;
 

From d4fc34ca2d771a4586098707f32f31400b7b3c6e Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Tue, 6 Apr 2021 06:00:05 +0500
Subject: [PATCH 308/912] Move FileUtils to file package and define more file
 util functions

A lot of utils have been defined now that can be used to safely manage files.

The java java.io.File API has poor support for detecting symlinks including broken symlinks. Android implementation also has issues. Check FileTypes.getFileType() function for more info. For this reason, the UnixFileAttributes and related classes has been ported from AOSP to get file attributes and type.

Some file utils and android versions use google's Guava com.google.common.io.MoreFiles library for managing files, specially for safer directory deletion with SecureDirectoryStream.

Some file utils and android versions use org.apache.commons.io.FileUtils for managing files. The library version used is 2.5 and it must not be incremented for compatibility with android version < 8, otherwise runtime crashes will occur.
---
 app/build.gradle                              |   28 +-
 .../com/termux/app/RunCommandService.java     |   15 +-
 .../java/com/termux/app/file/FileUtils.java   | 1627 +++++++++++++++++
 .../app/file/filesystem/FileAttributes.java   |  416 +++++
 .../termux/app/file/filesystem/FileKey.java   |   68 +
 .../app/file/filesystem/FilePermission.java   |   87 +
 .../app/file/filesystem/FilePermissions.java  |  145 ++
 .../termux/app/file/filesystem/FileTime.java  |  156 ++
 .../termux/app/file/filesystem/FileType.java  |   31 +
 .../termux/app/file/filesystem/FileTypes.java |  116 ++
 .../app/file/filesystem/NativeDispatcher.java |   58 +
 .../app/file/filesystem/UnixConstants.java    |  149 ++
 .../termux/app/file/tests/FileUtilsTests.java |  301 +++
 .../java/com/termux/app/utils/FileUtils.java  |  376 ----
 app/src/main/res/values/strings.xml           |   57 +-
 15 files changed, 3219 insertions(+), 411 deletions(-)
 create mode 100644 app/src/main/java/com/termux/app/file/FileUtils.java
 create mode 100644 app/src/main/java/com/termux/app/file/filesystem/FileAttributes.java
 create mode 100644 app/src/main/java/com/termux/app/file/filesystem/FileKey.java
 create mode 100644 app/src/main/java/com/termux/app/file/filesystem/FilePermission.java
 create mode 100644 app/src/main/java/com/termux/app/file/filesystem/FilePermissions.java
 create mode 100644 app/src/main/java/com/termux/app/file/filesystem/FileTime.java
 create mode 100644 app/src/main/java/com/termux/app/file/filesystem/FileType.java
 create mode 100644 app/src/main/java/com/termux/app/file/filesystem/FileTypes.java
 create mode 100644 app/src/main/java/com/termux/app/file/filesystem/NativeDispatcher.java
 create mode 100644 app/src/main/java/com/termux/app/file/filesystem/UnixConstants.java
 create mode 100644 app/src/main/java/com/termux/app/file/tests/FileUtilsTests.java
 delete mode 100644 app/src/main/java/com/termux/app/utils/FileUtils.java

diff --git a/app/build.gradle b/app/build.gradle
index 22bfe3eebe..17691e8abd 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,18 +9,22 @@ android {
     ndkVersion project.properties.ndkVersion
 
     dependencies {
-        implementation "androidx.annotation:annotation:1.1.0"
-        implementation 'androidx.appcompat:appcompat:1.2.0'
-        implementation 'androidx.core:core:1.5.0-beta03'
+        implementation "androidx.annotation:annotation:1.2.0"
+        implementation "androidx.core:core:1.5.0-rc01"
         implementation "androidx.drawerlayout:drawerlayout:1.1.1"
-        implementation 'androidx.preference:preference:1.1.1'
+        implementation "androidx.preference:preference:1.1.1"
         implementation "androidx.viewpager:viewpager:1.0.0"
-        implementation 'com.google.guava:guava:24.1-jre'
-        implementation  "io.noties.markwon:core:$markwon_version"
-        implementation  "io.noties.markwon:ext-strikethrough:$markwon_version"
-        implementation  "io.noties.markwon:linkify:$markwon_version"
-        implementation  "io.noties.markwon:recycler:$markwon_version"
+        implementation "com.google.guava:guava:24.1-jre"
+        implementation "io.noties.markwon:core:$markwon_version"
+        implementation "io.noties.markwon:ext-strikethrough:$markwon_version"
+        implementation "io.noties.markwon:linkify:$markwon_version"
+        implementation "io.noties.markwon:recycler:$markwon_version"
         implementation project(":terminal-view")
+
+        // Do not increment version higher than 2.5 or there
+        // will be runtime exceptions on android < 8
+        // due to missing classes like java.nio.file.Path.
+        implementation "commons-io:commons-io:2.5"
     }
 
     defaultConfig {
@@ -95,10 +99,8 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
-    testImplementation 'junit:junit:4.13.1'
-    testImplementation 'org.robolectric:robolectric:4.4'
+    testImplementation "junit:junit:4.13.1"
+    testImplementation "org.robolectric:robolectric:4.4"
 }
 
 task versionName {
diff --git a/app/src/main/java/com/termux/app/RunCommandService.java b/app/src/main/java/com/termux/app/RunCommandService.java
index 5c2362588d..67339f6f1d 100644
--- a/app/src/main/java/com/termux/app/RunCommandService.java
+++ b/app/src/main/java/com/termux/app/RunCommandService.java
@@ -14,7 +14,7 @@
 import com.termux.R;
 import com.termux.app.TermuxConstants.TERMUX_APP.RUN_COMMAND_SERVICE;
 import com.termux.app.TermuxConstants.TERMUX_APP.TERMUX_SERVICE;
-import com.termux.app.utils.FileUtils;
+import com.termux.app.file.FileUtils;
 import com.termux.app.utils.Logger;
 import com.termux.app.utils.NotificationUtils;
 import com.termux.app.utils.PluginUtils;
@@ -354,9 +354,9 @@ public int onStartCommand(Intent intent, int flags, int startId) {
 
         // 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
-        errmsg = FileUtils.validateRegularFileExistenceAndPermissions(this, executionCommand.executable,
-            null, PluginUtils.PLUGIN_EXECUTABLE_FILE_PERMISSIONS,
-            false, false);
+        errmsg = FileUtils.validateRegularFileExistenceAndPermissions(this, "executable", executionCommand.executable, null,
+            PluginUtils.PLUGIN_EXECUTABLE_FILE_PERMISSIONS, true, true,
+            false);
         if (errmsg != null) {
             errmsg  += "\n" + this.getString(R.string.msg_executable_absolute_path, executionCommand.executable);
             executionCommand.setStateFailed(ExecutionCommand.RESULT_CODE_FAILED, errmsg, null);
@@ -376,10 +376,9 @@ public int onStartCommand(Intent intent, int flags, int startId) {
             // 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.
-            errmsg = FileUtils.validateDirectoryExistenceAndPermissions(this, executionCommand.workingDirectory,
-                TermuxConstants.TERMUX_FILES_DIR_PATH, PluginUtils.PLUGIN_WORKING_DIRECTORY_PERMISSIONS,
-                true, true, false,
-                true);
+            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);
diff --git a/app/src/main/java/com/termux/app/file/FileUtils.java b/app/src/main/java/com/termux/app/file/FileUtils.java
new file mode 100644
index 0000000000..4e5abaddca
--- /dev/null
+++ b/app/src/main/java/com/termux/app/file/FileUtils.java
@@ -0,0 +1,1627 @@
+package com.termux.app.file;
+
+import android.content.Context;
+import android.os.Build;
+import android.system.Os;
+
+import androidx.annotation.NonNull;
+
+import com.google.common.io.RecursiveDeleteOption;
+import com.termux.R;
+import com.termux.app.TermuxConstants;
+import com.termux.app.file.filesystem.FileType;
+import com.termux.app.file.filesystem.FileTypes;
+import com.termux.app.utils.DataUtils;
+import com.termux.app.utils.Logger;
+
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.Closeable;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.nio.charset.Charset;
+import java.nio.file.LinkOption;
+import java.nio.file.StandardCopyOption;
+import java.util.regex.Pattern;
+
+public class FileUtils {
+
+    private static final String LOG_TAG = "FileUtils";
+
+    /**
+     * Replace "$PREFIX/" or "~/" prefix with termux absolute paths.
+     *
+     * @param path The {@code path} to expand.
+     * @return Returns the {@code expand path}.
+     */
+    public static String getExpandedTermuxPath(String path) {
+        if(path != null && !path.isEmpty()) {
+            path = path.replaceAll("^\\$PREFIX$", TermuxConstants.TERMUX_PREFIX_DIR_PATH);
+            path = path.replaceAll("^\\$PREFIX/", TermuxConstants.TERMUX_PREFIX_DIR_PATH + "/");
+            path = path.replaceAll("^~/$", TermuxConstants.TERMUX_HOME_DIR_PATH);
+            path = path.replaceAll("^~/", TermuxConstants.TERMUX_HOME_DIR_PATH + "/");
+        }
+
+        return path;
+    }
+
+    /**
+     * Replace termux absolute paths with "$PREFIX/" or "~/" prefix.
+     *
+     * @param path The {@code path} to unexpand.
+     * @return Returns the {@code unexpand path}.
+     */
+    public static String getUnExpandedTermuxPath(String path) {
+        if(path != null && !path.isEmpty()) {
+            path = path.replaceAll("^" + Pattern.quote(TermuxConstants.TERMUX_PREFIX_DIR_PATH) + "/", "\\$PREFIX/");
+            path = path.replaceAll("^" + Pattern.quote(TermuxConstants.TERMUX_HOME_DIR_PATH) + "/", "~/");
+        }
+
+        return path;
+    }
+
+    /**
+     * If {@code expandPath} is enabled, then input path is first attempted to be expanded by calling
+     * {@link #getExpandedTermuxPath(String)}.
+     *
+     * Then if path is already an absolute path, then it is used as is to get canonical path.
+     * If path is not an absolute path and {code prefixForNonAbsolutePath} is not {@code null}, then
+     * {code prefixForNonAbsolutePath} + "/" is prefixed before path before getting canonical path.
+     * If path is not an absolute path and {code prefixForNonAbsolutePath} is {@code null}, then
+     * "/" is prefixed before path before getting canonical path.
+     *
+     * If an exception is raised to get the canonical path, then absolute path is returned.
+     *
+     * @param path The {@code path} to convert.
+     * @param prefixForNonAbsolutePath Optional prefix path to prefix before non-absolute paths. This
+     *                                 can be set to {@code null} if non-absolute paths should
+     *                                 be prefixed with "/". The call to {@link File#getCanonicalPath()}
+     *                                 will automatically do this anyways.
+     * @return Returns the {@code canonical path}.
+     */
+    public static String getCanonicalPath(String path, final String prefixForNonAbsolutePath, final boolean expandPath) {
+        if (path == null) path = "";
+
+        if(expandPath)
+            path = getExpandedTermuxPath(path);
+
+        String absolutePath;
+
+        // If path is already an absolute path
+        if (path.startsWith("/")) {
+            absolutePath = path;
+        } else {
+            if (prefixForNonAbsolutePath != null)
+                absolutePath = prefixForNonAbsolutePath + "/" + path;
+            else
+                absolutePath = "/" + path;
+        }
+
+        try {
+            return new File(absolutePath).getCanonicalPath();
+        } catch(Exception e) {
+        }
+
+        return absolutePath;
+    }
+
+    /**
+     * Removes one or more forward slashes "//" with single slash "/"
+     * Removes "./"
+     * Removes trailing forward slash "/"
+     *
+     * @param path The {@code path} to convert.
+     * @return Returns the {@code normalized path}.
+     */
+    public static String normalizePath(String path) {
+        if (path == null) return null;
+
+        path = path.replaceAll("/+", "/");
+        path = path.replaceAll("\\./", "");
+
+        if (path.endsWith("/")) {
+            path = path.substring(0, path.length() - 1);
+        }
+
+        return path;
+    }
+
+    /**
+     * Determines whether path is in {@code dirPath}. The {@code dirPath} is not canonicalized and
+     * only normalized.
+     *
+     * @param path The {@code path} to check.
+     * @param dirPath The {@code directory path} to check in.
+     * @param ensureUnder If set to {@code true}, then it will be ensured that {@code path} is
+     *                    under the directory and does not equal it.
+     * @return Returns {@code true} if path in {@code dirPath}, otherwise returns {@code false}.
+     */
+    public static boolean isPathInDirPath(String path, final String dirPath, final boolean ensureUnder) {
+        if (path == null || dirPath == null) return false;
+
+        try {
+            path = new File(path).getCanonicalPath();
+        } catch(Exception e) {
+            return false;
+        }
+
+        String normalizedDirPath = normalizePath(dirPath);
+
+        if(ensureUnder)
+            return !path.equals(normalizedDirPath) && path.startsWith(normalizedDirPath + "/");
+        else
+            return path.startsWith(normalizedDirPath + "/");
+    }
+
+
+
+    /**
+     * Checks whether a regular file exists at {@code filePath}.
+     *
+     * @param filePath The {@code path} for regular file to check.
+     * @param followLinks The {@code boolean} that decides if symlinks will be followed while
+     *                       finding if file exists. Check {@link #getFileType(String, boolean)}
+     *                       for details.
+     * @return Returns {@code true} if regular file exists, otherwise {@code false}.
+     */
+    public static boolean regularFileExists(final String filePath, final boolean followLinks) {
+        return getFileType(filePath, followLinks) == FileType.REGULAR;
+    }
+
+    /**
+     * Checks whether a directory file exists at {@code filePath}.
+     *
+     * @param filePath The {@code path} for directory file to check.
+     * @param followLinks The {@code boolean} that decides if symlinks will be followed while
+     *                       finding if file exists. Check {@link #getFileType(String, boolean)}
+     *                       for details.
+     * @return Returns {@code true} if directory file exists, otherwise {@code false}.
+     */
+    public static boolean directoryFileExists(final String filePath, final boolean followLinks) {
+        return getFileType(filePath, followLinks) == FileType.DIRECTORY;
+    }
+
+    /**
+     * Checks whether a symlink file exists at {@code filePath}.
+     *
+     * @param filePath The {@code path} for symlink file to check.
+     * @return Returns {@code true} if symlink file exists, otherwise {@code false}.
+     */
+    public static boolean symlinkFileExists(final String filePath) {
+        return getFileType(filePath, false) == FileType.SYMLINK;
+    }
+
+    /**
+     * Checks whether any file exists at {@code filePath}.
+     *
+     * @param filePath The {@code path} for file to check.
+     * @param followLinks The {@code boolean} that decides if symlinks will be followed while
+     *                       finding if file exists. Check {@link #getFileType(String, boolean)}
+     *                       for details.
+     * @return Returns {@code true} if file exists, otherwise {@code false}.
+     */
+    public static boolean fileExists(final String filePath, final boolean followLinks) {
+        return getFileType(filePath, followLinks) != FileType.NO_EXIST;
+    }
+
+    /**
+     * Checks the type of file that exists at {@code filePath}.
+     *
+     * This function is a wrapper for
+     * {@link FileTypes#getFileType(String, boolean)}
+     * 
+     * @param filePath The {@code path} for file to check.
+     * @param followLinks The {@code boolean} that decides if symlinks will be followed while
+     *                       finding type. If set to {@code true}, then type of symlink target will
+     *                       be returned if file at {@code filePath} is a symlink. If set to
+     *                       {@code false}, then type of file at {@code filePath} itself will be
+     *                       returned.
+     * @return Returns the {@link FileType} of file.
+     */
+    public static FileType getFileType(final String filePath, final boolean followLinks) {
+        return FileTypes.getFileType(filePath, followLinks);
+    }
+
+
+
+    /**
+     * Validate the existence and permissions of regular file at path.
+     *
+     * If the {@code parentDirPath} is not {@code null}, then setting of missing permissions will
+     * only be done if {@code path} is under {@code parentDirPath}.
+     *
+     * @param context The {@link Context} to get error string.
+     * @param label The optional label for the regular file. This can optionally be {@code null}.
+     * @param filePath The {@code path} for file to validate. Symlinks will not be followed.
+     * @param parentDirPath The optional {@code parent directory path} to restrict operations to.
+     *                      This can optionally be {@code null}. It is not canonicalized and only normalized.
+     * @param permissionsToCheck The 3 character string that contains the "r", "w", "x" or "-" in-order.
+     * @param setPermissions The {@code boolean} that decides if permissions are to be
+     *                              automatically set defined by {@code permissionsToCheck}.
+     * @param setMissingPermissionsOnly The {@code boolean} that decides if only missing permissions
+     *                                  are to be set or if they should be overridden.
+     * @param ignoreErrorsIfPathIsUnderParentDirPath The {@code boolean} that decides if permission
+     *                                               errors are to be ignored if path is under
+     *                                               {@code parentDirPath}.
+     * @return Returns the {@code errmsg} if path is not a regular file, or validating permissions
+     * failed, otherwise {@code null}.
+     */
+    public static String validateRegularFileExistenceAndPermissions(@NonNull final Context context, String label, final String filePath, final String parentDirPath,
+                                                                    final String permissionsToCheck, final boolean setPermissions, final boolean setMissingPermissionsOnly,
+                                                                    final boolean ignoreErrorsIfPathIsUnderParentDirPath) {
+        label = (label == null ? "" : label + " ");
+        if (filePath == null || filePath.isEmpty()) return context.getString(R.string.error_null_or_empty_parameter, label + "regular file path", "validateRegularFileExistenceAndPermissions");
+
+        try {
+            FileType fileType = getFileType(filePath, false);
+
+            // If file exists but not a regular file
+            if (fileType != FileType.NO_EXIST && fileType != FileType.REGULAR) {
+                return context.getString(R.string.error_non_regular_file_found, label + "file");
+            }
+
+            boolean isPathUnderParentDirPath = false;
+            if (parentDirPath != null) {
+                // The path can only be under parent directory path
+                isPathUnderParentDirPath = isPathInDirPath(filePath, parentDirPath, true);
+            }
+
+            // If setPermissions is enabled and path is a regular file
+            if (setPermissions && permissionsToCheck != null && fileType == FileType.REGULAR) {
+                // If there is not parentDirPath restriction or path is under parentDirPath
+                if (parentDirPath == null || (isPathUnderParentDirPath && getFileType(parentDirPath, false) == FileType.DIRECTORY)) {
+                    if(setMissingPermissionsOnly)
+                        setMissingFilePermissions(label + "file", filePath, permissionsToCheck);
+                    else
+                        setFilePermissions(label + "file", filePath, permissionsToCheck);
+                }
+            }
+
+            // If path is not a regular file
+            // Regular files cannot be automatically created so we do not ignore if missing
+            if (fileType != FileType.REGULAR) {
+                return context.getString(R.string.error_no_regular_file_found, label + "file");
+            }
+
+            // If there is not parentDirPath restriction or path is not under parentDirPath or
+            // if permission errors must not be ignored for paths under parentDirPath
+            if (parentDirPath == null || !isPathUnderParentDirPath || !ignoreErrorsIfPathIsUnderParentDirPath) {
+                if (permissionsToCheck != null) {
+                    // Check if permissions are missing
+                    return checkMissingFilePermissions(context, label + "regular", filePath, permissionsToCheck, false);
+                }
+            }
+        } catch (Exception e) {
+            return context.getString(R.string.error_validate_file_existence_and_permissions_failed_with_exception, label + "file", filePath, e.getMessage());
+        }
+
+        return null;
+
+    }
+
+    /**
+     * Validate the existence and permissions of directory file at path.
+     *
+     * If the {@code parentDirPath} is not {@code null}, then creation of missing directory and
+     * setting of missing permissions will only be done if {@code path} is under
+     * {@code parentDirPath} or equals {@code parentDirPath}.
+     *
+     * @param context The {@link Context} to get error string.
+     * @param label The optional label for the directory file. This can optionally be {@code null}.
+     * @param filePath The {@code path} for file to validate or create. Symlinks will not be followed.
+     * @param parentDirPath The optional {@code parent directory path} to restrict operations to.
+     *                      This can optionally be {@code null}. It is not canonicalized and only normalized.
+     * @param createDirectoryIfMissing The {@code boolean} that decides if directory file
+     *                                 should be created if its missing.
+     * @param permissionsToCheck The 3 character string that contains the "r", "w", "x" or "-" in-order.
+     * @param setPermissions The {@code boolean} that decides if permissions are to be
+     *                              automatically set defined by {@code permissionsToCheck}.
+     * @param setMissingPermissionsOnly The {@code boolean} that decides if only missing permissions
+     *                                  are to be set or if they should be overridden.
+     * @param ignoreErrorsIfPathIsInParentDirPath The {@code boolean} that decides if existence
+     *                                  and permission errors are to be ignored if path is
+     *                                  in {@code parentDirPath}.
+     * @param ignoreIfNotExecutable The {@code boolean} that decides if missing executable permission
+     *                              error is to be ignored. This allows making an attempt to set
+     *                              executable permissions, but ignoring if it fails.
+     * @return Returns the {@code errmsg} if path is not a directory file, failed to create it,
+     * or validating permissions failed, otherwise {@code null}.
+     */
+    public static String validateDirectoryFileExistenceAndPermissions(@NonNull final Context context, String label, final String filePath, final String parentDirPath, final boolean createDirectoryIfMissing,
+                                                                      final String permissionsToCheck, final boolean setPermissions, final boolean setMissingPermissionsOnly,
+                                                                      final boolean ignoreErrorsIfPathIsInParentDirPath, final boolean ignoreIfNotExecutable) {
+        label = (label == null ? "" : label + " ");
+        if (filePath == null || filePath.isEmpty()) return context.getString(R.string.error_null_or_empty_parameter, label + "directory file path", "validateDirectoryExistenceAndPermissions");
+
+        try {
+            File file = new File(filePath);
+            FileType fileType = getFileType(filePath, false);
+
+            // If file exists but not a directory file
+            if (fileType != FileType.NO_EXIST && fileType != FileType.DIRECTORY) {
+                return context.getString(R.string.error_non_directory_file_found, label + "directory");
+            }
+
+            boolean isPathInParentDirPath = false;
+            if (parentDirPath != null) {
+                // The path can be equal to parent directory path or under it
+                isPathInParentDirPath = isPathInDirPath(filePath, parentDirPath, false);
+            }
+
+            if (createDirectoryIfMissing || setPermissions) {
+                // If there is not parentDirPath restriction or path is in parentDirPath
+                if (parentDirPath == null || (isPathInParentDirPath && getFileType(parentDirPath, false) == FileType.DIRECTORY)) {
+                    // If createDirectoryIfMissing is enabled and no file exists at path, then create directory
+                    if (createDirectoryIfMissing && fileType == FileType.NO_EXIST) {
+                        Logger.logVerbose(LOG_TAG, "Creating " + label + "directory file at path \"" + filePath + "\"");
+                        // Create directory and update fileType if successful, otherwise return with error
+                        if (file.mkdirs())
+                            fileType = getFileType(filePath, false);
+                        else
+                            return context.getString(R.string.error_creating_file_failed, label + "directory file", filePath);
+                    }
+
+                    // If setPermissions is enabled and path is a directory
+                    if (setPermissions && permissionsToCheck != null && fileType == FileType.DIRECTORY) {
+                        if(setMissingPermissionsOnly)
+                            setMissingFilePermissions(label + "directory", filePath, permissionsToCheck);
+                        else
+                            setFilePermissions(label + "directory", filePath, permissionsToCheck);
+                    }
+                }
+            }
+
+            // If there is not parentDirPath restriction or path is not in parentDirPath or
+            // if existence or permission errors must not be ignored for paths in parentDirPath
+            if (parentDirPath == null || !isPathInParentDirPath || !ignoreErrorsIfPathIsInParentDirPath) {
+                // If path is not a directory
+                // Directories can be automatically created so we can ignore if missing with above check
+                if (fileType != FileType.DIRECTORY) {
+                    return context.getString(R.string.error_file_not_found_at_path, label + "directory", filePath);
+                }
+
+                if (permissionsToCheck != null) {
+                    // Check if permissions are missing
+                    return checkMissingFilePermissions(context, label + "directory", filePath, permissionsToCheck, ignoreIfNotExecutable);
+                }
+            }
+        } catch (Exception e) {
+            return context.getString(R.string.error_validate_directory_existence_and_permissions_failed_with_exception, label + "directory file", filePath, e.getMessage());
+        }
+
+        return null;
+    }
+
+
+
+    /**
+     * Create a regular file at path.
+     *
+     * This function is a wrapper for
+     * {@link #validateDirectoryFileExistenceAndPermissions(Context, String, String, String, boolean, String, boolean, boolean, boolean, boolean)}.
+     *
+     * @param context The {@link Context} to get error string.
+     * @param filePath The {@code path} for regular file to create.
+     * @return Returns the {@code errmsg} if path is not a regular file or failed to create it,
+     * otherwise {@code null}.
+     */
+    public static String createRegularFile(@NonNull final Context context, final String filePath) {
+        return createRegularFile(context, null, filePath);
+    }
+
+    /**
+     * Create a regular file at path.
+     *
+     * This function is a wrapper for
+     * {@link #validateDirectoryFileExistenceAndPermissions(Context, String, String, String, boolean, String, boolean, boolean, boolean, boolean)}.
+     *
+     * @param context The {@link Context} to get error string.
+     * @param label The optional label for the regular file. This can optionally be {@code null}.
+     * @param filePath The {@code path} for regular file to create.
+     * @return Returns the {@code errmsg} if path is not a regular file or failed to create it,
+     * otherwise {@code null}.
+     */
+    public static String createRegularFile(@NonNull final Context context, final String label, final String filePath) {
+        return createRegularFile(context, label, filePath,
+            null, false, false);
+    }
+
+    /**
+     * Create a regular file at path.
+     *
+     * This function is a wrapper for
+     * {@link #validateRegularFileExistenceAndPermissions(Context, String, String, String, String, boolean, boolean, boolean)}.
+     *
+     * @param context The {@link Context} to get error string.
+     * @param label The optional label for the regular file. This can optionally be {@code null}.
+     * @param filePath The {@code path} for regular file to create.
+     * @param permissionsToCheck The 3 character string that contains the "r", "w", "x" or "-" in-order.
+     * @param setPermissions The {@code boolean} that decides if permissions are to be
+     *                              automatically set defined by {@code permissionsToCheck}.
+     * @param setMissingPermissionsOnly The {@code boolean} that decides if only missing permissions
+     *                                  are to be set or if they should be overridden.
+     * @return Returns the {@code errmsg} if path is not a regular file, failed to create it,
+     * or validating permissions failed, otherwise {@code null}.
+     */
+    public static String createRegularFile(@NonNull final Context context, String label, final String filePath,
+                                           final String permissionsToCheck, final boolean setPermissions, final boolean setMissingPermissionsOnly) {
+        label = (label == null ? "" : label + " ");
+        if (filePath == null || filePath.isEmpty()) return context.getString(R.string.error_null_or_empty_parameter, label + "file path", "createRegularFile");
+
+        String errmsg;
+
+        File file = new File(filePath);
+        FileType fileType = getFileType(filePath, false);
+
+        // If file exists but not a regular file
+        if (fileType != FileType.NO_EXIST && fileType != FileType.REGULAR) {
+            return context.getString(R.string.error_non_regular_file_found, label + "file");
+        }
+
+        // If regular file already exists
+        if (fileType == FileType.REGULAR) {
+            return null;
+        }
+
+        // Create the file parent directory
+        errmsg = createParentDirectoryFile(context, label + "regular file parent", filePath);
+        if(errmsg != null)
+            return errmsg;
+
+        try {
+            Logger.logVerbose(LOG_TAG, "Creating " + label + "regular file at path \"" + filePath + "\"");
+
+            if(!file.createNewFile())
+                return context.getString(R.string.error_creating_file_failed, label + "regular file", filePath);
+        } catch (Exception e) {
+            return context.getString(R.string.error_creating_file_failed_with_exception, label + "regular file", filePath, e.getMessage());
+        }
+
+        return validateRegularFileExistenceAndPermissions(context, label, filePath,
+            null,
+            permissionsToCheck, setPermissions, setMissingPermissionsOnly,
+            false);
+    }
+
+
+
+    /**
+     * Create parent directory of file at path.
+     *
+     * This function is a wrapper for
+     * {@link #validateDirectoryFileExistenceAndPermissions(Context, String, String, String, boolean, String, boolean, boolean, boolean, boolean)}.
+     *
+     * @param context The {@link Context} to get error string.
+     * @param label The optional label for the parent directory file. This can optionally be {@code null}.
+     * @param filePath The {@code path} for file whose parent needs to be created.
+     * @return Returns the {@code errmsg} if parent path is not a directory file or failed to create it,
+     * otherwise {@code null}.
+     */
+    public static String createParentDirectoryFile(@NonNull final Context context, final String label, final String filePath) {
+        if (filePath == null || filePath.isEmpty()) return context.getString(R.string.error_null_or_empty_parameter, label + "file path", "createParentDirectoryFile");
+
+        File file = new File(filePath);
+        String fileParentPath = file.getParent();
+
+        if(fileParentPath != null)
+            return createDirectoryFile(context, label, fileParentPath,
+            null, false, false);
+        else
+            return null;
+    }
+
+    /**
+     * Create a directory file at path.
+     *
+     * This function is a wrapper for
+     * {@link #validateDirectoryFileExistenceAndPermissions(Context, String, String, String, boolean, String, boolean, boolean, boolean, boolean)}.
+     *
+     * @param context The {@link Context} to get error string.
+     * @param filePath The {@code path} for directory file to create.
+     * @return Returns the {@code errmsg} if path is not a directory file or failed to create it,
+     * otherwise {@code null}.
+     */
+    public static String createDirectoryFile(@NonNull final Context context, final String filePath) {
+        return createDirectoryFile(context, null, filePath);
+    }
+
+    /**
+     * Create a directory file at path.
+     *
+     * This function is a wrapper for
+     * {@link #validateDirectoryFileExistenceAndPermissions(Context, String, String, String, boolean, String, boolean, boolean, boolean, boolean)}.
+     *
+     * @param context The {@link Context} to get error string.
+     * @param label The optional label for the directory file. This can optionally be {@code null}.
+     * @param filePath The {@code path} for directory file to create.
+     * @return Returns the {@code errmsg} if path is not a directory file or failed to create it,
+     * otherwise {@code null}.
+     */
+    public static String createDirectoryFile(@NonNull final Context context, final String label, final String filePath) {
+        return createDirectoryFile(context, label, filePath,
+            null, false, false);
+    }
+
+    /**
+     * Create a directory file at path.
+     * 
+     * This function is a wrapper for
+     * {@link #validateDirectoryFileExistenceAndPermissions(Context, String, String, String, boolean, String, boolean, boolean, boolean, boolean)}.
+     *
+     * @param context The {@link Context} to get error string.
+     * @param label The optional label for the directory file. This can optionally be {@code null}.
+     * @param filePath The {@code path} for directory file to create.
+     * @param permissionsToCheck The 3 character string that contains the "r", "w", "x" or "-" in-order.
+     * @param setPermissions The {@code boolean} that decides if permissions are to be
+     *                              automatically set defined by {@code permissionsToCheck}.
+     * @param setMissingPermissionsOnly The {@code boolean} that decides if only missing permissions
+     *                                  are to be set or if they should be overridden.
+     * @return Returns the {@code errmsg} if path is not a directory file, failed to create it,
+     * or validating permissions failed, otherwise {@code null}.
+     */
+    public static String createDirectoryFile(@NonNull final Context context, final String label, final String filePath,
+                                             final String permissionsToCheck, final boolean setPermissions, final boolean setMissingPermissionsOnly) {
+        return validateDirectoryFileExistenceAndPermissions(context, label, filePath,
+            null, true,
+            permissionsToCheck, setPermissions, setMissingPermissionsOnly,
+            false, false);
+    }
+
+
+
+    /**
+     * Create a symlink file at path.
+     *
+     * This function is a wrapper for
+     * {@link #createSymlinkFile(Context, String, String, String, boolean, boolean, boolean)}.
+     *
+     * Dangling symlinks will be allowed.
+     * Symlink destination will be overwritten if it already exists but only if its a symlink.
+     *
+     * @param context The {@link Context} to get error string.
+     * @param targetFilePath The {@code path} TO which the symlink file will be created.
+     * @param destFilePath The {@code path} AT which the symlink file will be created.
+     * @return Returns the {@code errmsg} if path is not a symlink file, failed to create it,
+     * otherwise {@code null}.
+     */
+    public static String createSymlinkFile(@NonNull final Context context, final String targetFilePath, final String destFilePath) {
+        return createSymlinkFile(context, null, targetFilePath, destFilePath,
+            true, true, true);
+    }
+
+    /**
+     * Create a symlink file at path.
+     *
+     * This function is a wrapper for
+     * {@link #createSymlinkFile(Context, String, String, String, boolean, boolean, boolean)}.
+     *
+     * Dangling symlinks will be allowed.
+     * Symlink destination will be overwritten if it already exists but only if its a symlink.
+     *
+     * @param context The {@link Context} to get error string.
+     * @param label The optional label for the symlink file. This can optionally be {@code null}.
+     * @param targetFilePath The {@code path} TO which the symlink file will be created.
+     * @param destFilePath The {@code path} AT which the symlink file will be created.
+     * @return Returns the {@code errmsg} if path is not a symlink file, failed to create it,
+     * otherwise {@code null}.
+     */
+    public static String createSymlinkFile(@NonNull final Context context, String label, final String targetFilePath, final String destFilePath) {
+        return createSymlinkFile(context, label, targetFilePath, destFilePath,
+            true, true, true);
+    }
+
+    /**
+     * Create a symlink file at path.
+     *
+     * @param context The {@link Context} to get error string.
+     * @param label The optional label for the symlink file. This can optionally be {@code null}.
+     * @param targetFilePath The {@code path} TO which the symlink file will be created.
+     * @param destFilePath The {@code path} AT which the symlink file will be created.
+     * @param allowDangling The {@code boolean} that decides if it should be considered an
+     *                              error if source file doesn't exist.
+     * @param overwrite The {@code boolean} that decides if destination file should be overwritten if
+     *                  it already exists. If set to {@code true}, then destination file will be
+     *                  deleted before symlink is created.
+     * @param overwriteOnlyIfDestIsASymlink The {@code boolean} that decides if overwrite should
+     *                                         only be done if destination file is also a symlink.
+     * @return Returns the {@code errmsg} if path is not a symlink file, failed to create it,
+     * or validating permissions failed, otherwise {@code null}.
+     */
+    public static String createSymlinkFile(@NonNull final Context context, String label, final String targetFilePath, final String destFilePath,
+                                           final boolean allowDangling, final boolean overwrite, final boolean overwriteOnlyIfDestIsASymlink) {
+        label = (label == null ? "" : label + " ");
+        if (targetFilePath == null || targetFilePath.isEmpty()) return context.getString(R.string.error_null_or_empty_parameter, label + "target file path", "createSymlinkFile");
+        if (destFilePath == null || destFilePath.isEmpty()) return context.getString(R.string.error_null_or_empty_parameter, label + "destination file path", "createSymlinkFile");
+
+        String errmsg;
+
+        try {
+            File destFile = new File(destFilePath);
+
+            String targetFileAbsolutePath = targetFilePath;
+            // If target path is relative instead of absolute
+            if (!targetFilePath.startsWith("/")) {
+                String destFileParentPath = destFile.getParent();
+                if(destFileParentPath != null)
+                    targetFileAbsolutePath = destFileParentPath + "/" +  targetFilePath;
+            }
+
+            FileType targetFileType = getFileType(targetFileAbsolutePath, false);
+            FileType destFileType = getFileType(destFilePath, false);
+
+            // If target file does not exist
+            if (targetFileType == FileType.NO_EXIST) {
+                // If dangling symlink should not be allowed, then return with error
+                if(!allowDangling)
+                    return context.getString(R.string.error_file_not_found_at_path, label + "symlink target file", targetFileAbsolutePath);
+            }
+
+            // If destination exists
+            if(destFileType != FileType.NO_EXIST) {
+                // If destination must not be overwritten
+                if(!overwrite) {
+                    return null;
+                }
+
+                // If overwriteOnlyIfDestIsASymlink is enabled but destination file is not a symlink
+                if(overwriteOnlyIfDestIsASymlink && destFileType != FileType.SYMLINK)
+                    return context.getString(R.string.error_cannot_overwrite_a_non_symlink_file_type, label + " file", destFilePath, targetFilePath, destFileType.getName());
+
+                // Delete the destination file
+                errmsg = deleteFile(context, label + "symlink destination", destFilePath, true);
+                if(errmsg != null)
+                    return errmsg;
+            } else {
+                // Create the destination file parent directory
+                errmsg = createParentDirectoryFile(context, label + "symlink destination file parent", destFilePath);
+                if(errmsg != null)
+                    return errmsg;
+            }
+
+            // create a symlink at destFilePath to targetFilePath
+            Logger.logVerbose(LOG_TAG, "Creating " + label + "symlink file at path \"" + destFilePath + "\" to \"" + targetFilePath + "\"");
+            Os.symlink(targetFilePath, destFilePath);
+        } catch (Exception e) {
+            return context.getString(R.string.error_creating_symlink_file_failed_with_exception, label + "symlink file", destFilePath, targetFilePath, e.getMessage());
+        }
+
+        return null;
+    }
+
+
+
+    /**
+     * Copy a regular file from {@code sourceFilePath} to {@code destFilePath}.
+     *
+     * This function is a wrapper for
+     * {@link #copyOrMoveFile(Context, String, String, String, boolean, boolean, int, boolean, boolean)}.
+     *
+     * If destination file already exists, then it will be overwritten, but only if its a regular
+     * file, otherwise an error will be returned.
+     *
+     * @param context The {@link Context} to get error string.
+     * @param label The optional label for file to copy. This can optionally be {@code null}.
+     * @param srcFilePath The {@code source path} for file to copy.
+     * @param destFilePath The {@code destination path} for file to copy.
+     * @param ignoreNonExistentSrcFile The {@code boolean} that decides if it should be considered an
+     *                              error if source file to copied doesn't exist.
+     * @return Returns the {@code errmsg} if copy was not successful, otherwise {@code null}.
+     */
+    public static String copyRegularFile(@NonNull final Context context, final String label, final String srcFilePath, final String destFilePath, final boolean ignoreNonExistentSrcFile) {
+        return copyOrMoveFile(context, label, srcFilePath, destFilePath,
+            false, ignoreNonExistentSrcFile, FileType.REGULAR.getValue(),
+            true, true);
+    }
+
+    /**
+     * Move a regular file from {@code sourceFilePath} to {@code destFilePath}.
+     *
+     * This function is a wrapper for
+     * {@link #copyOrMoveFile(Context, String, String, String, boolean, boolean, int, boolean, boolean)}.
+     *
+     * If destination file already exists, then it will be overwritten, but only if its a regular
+     * file, otherwise an error will be returned.
+     *
+     * @param context The {@link Context} to get error string.
+     * @param label The optional label for file to move. This can optionally be {@code null}.
+     * @param srcFilePath The {@code source path} for file to move.
+     * @param destFilePath The {@code destination path} for file to move.
+     * @param ignoreNonExistentSrcFile The {@code boolean} that decides if it should be considered an
+     *                              error if source file to moved doesn't exist.
+     * @return Returns the {@code errmsg} if move was not successful, otherwise {@code null}.
+     */
+    public static String moveRegularFile(@NonNull final Context context, final String label, final String srcFilePath, final String destFilePath, final boolean ignoreNonExistentSrcFile) {
+        return copyOrMoveFile(context, label, srcFilePath, destFilePath,
+            true, ignoreNonExistentSrcFile, FileType.REGULAR.getValue(),
+            true, true);
+    }
+
+    /**
+     * Copy a directory file from {@code sourceFilePath} to {@code destFilePath}.
+     *
+     * This function is a wrapper for
+     * {@link #copyOrMoveFile(Context, String, String, String, boolean, boolean, int, boolean, boolean)}.
+     *
+     * If destination file already exists, then it will be overwritten, but only if its a directory
+     * file, otherwise an error will be returned.
+     *
+     * @param context The {@link Context} to get error string.
+     * @param label The optional label for file to copy. This can optionally be {@code null}.
+     * @param srcFilePath The {@code source path} for file to copy.
+     * @param destFilePath The {@code destination path} for file to copy.
+     * @param ignoreNonExistentSrcFile The {@code boolean} that decides if it should be considered an
+     *                              error if source file to copied doesn't exist.
+     * @return Returns the {@code errmsg} if copy was not successful, otherwise {@code null}.
+     */
+    public static String copyDirectoryFile(@NonNull final Context context, final String label, final String srcFilePath, final String destFilePath, final boolean ignoreNonExistentSrcFile) {
+        return copyOrMoveFile(context, label, srcFilePath, destFilePath,
+            false, ignoreNonExistentSrcFile, FileType.DIRECTORY.getValue(),
+            true, true);
+    }
+
+    /**
+     * Move a directory file from {@code sourceFilePath} to {@code destFilePath}.
+     *
+     * This function is a wrapper for
+     * {@link #copyOrMoveFile(Context, String, String, String, boolean, boolean, int, boolean, boolean)}.
+     *
+     * If destination file already exists, then it will be overwritten, but only if its a directory
+     * file, otherwise an error will be returned.
+     *
+     * @param context The {@link Context} to get error string.
+     * @param label The optional label for file to move. This can optionally be {@code null}.
+     * @param srcFilePath The {@code source path} for file to move.
+     * @param destFilePath The {@code destination path} for file to move.
+     * @param ignoreNonExistentSrcFile The {@code boolean} that decides if it should be considered an
+     *                              error if source file to moved doesn't exist.
+     * @return Returns the {@code errmsg} if move was not successful, otherwise {@code null}.
+     */
+    public static String moveDirectoryFile(@NonNull final Context context, final String label, final String srcFilePath, final String destFilePath, final boolean ignoreNonExistentSrcFile) {
+        return copyOrMoveFile(context, label, srcFilePath, destFilePath,
+        true, ignoreNonExistentSrcFile, FileType.DIRECTORY.getValue(),
+            true, true);
+    }
+
+    /**
+     * Copy a symlink file from {@code sourceFilePath} to {@code destFilePath}.
+     *
+     * This function is a wrapper for
+     * {@link #copyOrMoveFile(Context, String, String, String, boolean, boolean, int, boolean, boolean)}.
+     *
+     * If destination file already exists, then it will be overwritten, but only if its a symlink
+     * file, otherwise an error will be returned.
+     *
+     * @param context The {@link Context} to get error string.
+     * @param label The optional label for file to copy. This can optionally be {@code null}.
+     * @param srcFilePath The {@code source path} for file to copy.
+     * @param destFilePath The {@code destination path} for file to copy.
+     * @param ignoreNonExistentSrcFile The {@code boolean} that decides if it should be considered an
+     *                              error if source file to copied doesn't exist.
+     * @return Returns the {@code errmsg} if copy was not successful, otherwise {@code null}.
+     */
+    public static String copySymlinkFile(@NonNull final Context context, final String label, final String srcFilePath, final String destFilePath, final boolean ignoreNonExistentSrcFile) {
+        return copyOrMoveFile(context, label, srcFilePath, destFilePath,
+            false, ignoreNonExistentSrcFile, FileType.SYMLINK.getValue(),
+            true, true);
+    }
+
+    /**
+     * Move a symlink file from {@code sourceFilePath} to {@code destFilePath}.
+     *
+     * This function is a wrapper for
+     * {@link #copyOrMoveFile(Context, String, String, String, boolean, boolean, int, boolean, boolean)}.
+     *
+     * If destination file already exists, then it will be overwritten, but only if its a symlink
+     * file, otherwise an error will be returned.
+     *
+     * @param context The {@link Context} to get error string.
+     * @param label The optional label for file to move. This can optionally be {@code null}.
+     * @param srcFilePath The {@code source path} for file to move.
+     * @param destFilePath The {@code destination path} for file to move.
+     * @param ignoreNonExistentSrcFile The {@code boolean} that decides if it should be considered an
+     *                              error if source file to moved doesn't exist.
+     * @return Returns the {@code errmsg} if move was not successful, otherwise {@code null}.
+     */
+    public static String moveSymlinkFile(@NonNull final Context context, final String label, final String srcFilePath, final String destFilePath, final boolean ignoreNonExistentSrcFile) {
+        return copyOrMoveFile(context, label, srcFilePath, destFilePath,
+            true, ignoreNonExistentSrcFile, FileType.SYMLINK.getValue(),
+            true, true);
+    }
+
+    /**
+     * Copy a file from {@code sourceFilePath} to {@code destFilePath}.
+     *
+     * This function is a wrapper for
+     * {@link #copyOrMoveFile(Context, String, String, String, boolean, boolean, int, boolean, boolean)}.
+     *
+     * If destination file already exists, then it will be overwritten, but only if its the same file
+     * type as the source, otherwise an error will be returned.
+     *
+     * @param context The {@link Context} to get error string.
+     * @param label The optional label for file to copy. This can optionally be {@code null}.
+     * @param srcFilePath The {@code source path} for file to copy.
+     * @param destFilePath The {@code destination path} for file to copy.
+     * @param ignoreNonExistentSrcFile The {@code boolean} that decides if it should be considered an
+     *                              error if source file to copied doesn't exist.
+     * @return Returns the {@code errmsg} if copy was not successful, otherwise {@code null}.
+     */
+    public static String copyFile(@NonNull final Context context, final String label, final String srcFilePath, final String destFilePath, final boolean ignoreNonExistentSrcFile) {
+        return copyOrMoveFile(context, label, srcFilePath, destFilePath,
+            false, ignoreNonExistentSrcFile, FileTypes.FILE_TYPE_NORMAL_FLAGS,
+            true, true);
+    }
+
+    /**
+     * Move a file from {@code sourceFilePath} to {@code destFilePath}.
+     *
+     * This function is a wrapper for
+     * {@link #copyOrMoveFile(Context, String, String, String, boolean, boolean, int, boolean, boolean)}.
+     *
+     * If destination file already exists, then it will be overwritten, but only if its the same file
+     * type as the source, otherwise an error will be returned.
+     *
+     * @param context The {@link Context} to get error string.
+     * @param label The optional label for file to move. This can optionally be {@code null}.
+     * @param srcFilePath The {@code source path} for file to move.
+     * @param destFilePath The {@code destination path} for file to move.
+     * @param ignoreNonExistentSrcFile The {@code boolean} that decides if it should be considered an
+     *                              error if source file to moved doesn't exist.
+     * @return Returns the {@code errmsg} if move was not successful, otherwise {@code null}.
+     */
+    public static String moveFile(@NonNull final Context context, final String label, final String srcFilePath, final String destFilePath, final boolean ignoreNonExistentSrcFile) {
+        return copyOrMoveFile(context, label, srcFilePath, destFilePath,
+            true, ignoreNonExistentSrcFile, FileTypes.FILE_TYPE_NORMAL_FLAGS,
+            true, true);
+    }
+    
+    /**
+     * Copy or move a file from {@code sourceFilePath} to {@code destFilePath}.
+     *
+     * The {@code sourceFilePath} and {@code destFilePath} must be the canonical path to the source
+     * and destination since symlinks will not be followed.
+     *
+     * If the {@code sourceFilePath} or {@code destFilePath} is a canonical path to a directory,
+     * then any symlink files found under the directory will be deleted, but not their targets when
+     * deleting source after move and deleting destination before copy/move.
+     *
+     * @param context The {@link Context} to get error string.
+     * @param label The optional label for file to copy or move. This can optionally be {@code null}.
+     * @param srcFilePath The {@code source path} for file to copy or move.
+     * @param destFilePath The {@code destination path} for file to copy or move.
+     * @param moveFile The {@code boolean} that decides if source file needs to be copied or moved.
+     *                 If set to {@code true}, then source file will be moved, otherwise it will be
+     *                 copied.
+     * @param ignoreNonExistentSrcFile The {@code boolean} that decides if it should be considered an
+     *                              error if source file to copied or moved doesn't exist.
+     * @param allowedFileTypeFlags The flags that are matched against the source file's {@link FileType}
+     *                             to see if it should be copied/moved or not. This is a safety measure
+     *                             to prevent accidental copy/move/delete of the wrong type of file,
+     *                             like a directory instead of a regular file. You can pass
+     *                             {@link FileTypes#FILE_TYPE_ANY_FLAGS} to allow copy/move of any file type.
+     * @param overwrite The {@code boolean} that decides if destination file should be overwritten if
+     *                  it already exists. If set to {@code true}, then destination file will be
+     *                  deleted before source is copied or moved.
+     * @param overwriteOnlyIfDestSameFileTypeAsSrc The {@code boolean} that decides if overwrite should
+     *                                         only be done if destination file is also the same file
+     *                                          type as the source file.
+     * @return Returns the {@code errmsg} if copy or move was not successful, otherwise {@code null}.
+     */
+    public static String copyOrMoveFile(@NonNull final Context context, String label, final String srcFilePath, final String destFilePath,
+                                        final boolean moveFile, final boolean ignoreNonExistentSrcFile, int allowedFileTypeFlags,
+                                        final boolean overwrite, final boolean overwriteOnlyIfDestSameFileTypeAsSrc) {
+        label = (label == null ? "" : label + " ");
+        if (srcFilePath == null || srcFilePath.isEmpty()) return context.getString(R.string.error_null_or_empty_parameter, label + "source file path", "copyOrMoveFile");
+        if (destFilePath == null || destFilePath.isEmpty()) return context.getString(R.string.error_null_or_empty_parameter, label + "destination file path", "copyOrMoveFile");
+
+        String mode = (moveFile ? "Moving" : "Copying");
+        String modePast = (moveFile ? "moved" : "copied");
+
+        String errmsg;
+
+        InputStream inputStream = null;
+        OutputStream outputStream = null;
+        
+        try {
+            Logger.logVerbose(LOG_TAG, mode + " " + label + "source file from \"" + srcFilePath + "\" to destination \"" + destFilePath + "\"");
+
+            File srcFile = new File(srcFilePath);
+            File destFile = new File(destFilePath);
+
+            FileType srcFileType = getFileType(srcFilePath, false);
+            FileType destFileType = getFileType(destFilePath, false);
+
+            String srcFileCanonicalPath = srcFile.getCanonicalPath();
+            String destFileCanonicalPath = destFile.getCanonicalPath();
+
+            // If source file does not exist
+            if (srcFileType == FileType.NO_EXIST) {
+                // If copy or move is to be ignored if source file is not found
+                if(ignoreNonExistentSrcFile)
+                    return null;
+                // Else return with error
+                else
+                    return context.getString(R.string.error_file_not_found_at_path, label + "source file", srcFilePath);
+            }
+
+            // If the file type of the source file does not exist in the allowedFileTypeFlags, then return with error
+            if((allowedFileTypeFlags & srcFileType.getValue()) <= 0)
+                return context.getString(R.string.error_file_not_an_allowed_file_type, label + "source file meant to be " + modePast, srcFilePath, FileTypes.convertFileTypeFlagsToNamesString(allowedFileTypeFlags));
+
+            // If source and destination file path are the same
+            if (srcFileCanonicalPath.equals(destFileCanonicalPath))
+                return context.getString(R.string.error_copying_or_moving_file_to_same_path, mode + " " + label + "source file", srcFilePath, destFilePath);
+
+            // If destination exists
+            if(destFileType != FileType.NO_EXIST) {
+                // If destination must not be overwritten
+                if(!overwrite) {
+                    return null;
+                }
+
+                // If overwriteOnlyIfDestSameFileTypeAsSrc is enabled but destination file does not match source file type
+                if(overwriteOnlyIfDestSameFileTypeAsSrc && destFileType != srcFileType)
+                    return context.getString(R.string.error_cannot_overwrite_a_different_file_type, label + "source file", mode.toLowerCase(), srcFilePath, destFilePath, destFileType.getName(), srcFileType.getName());
+
+                // Delete the destination file
+                errmsg = deleteFile(context, label + "destination file", destFilePath, true);
+                if(errmsg != null)
+                    return errmsg;
+            }
+
+
+            // Copy or move source file to dest
+            boolean copyFile = !moveFile;
+
+            // If moveFile is true
+            if(moveFile) {
+                // We first try to rename source file to destination file to save a copy operation in case both source and destination are on the same filesystem
+                Logger.logVerbose(LOG_TAG, "Attempting to rename source to destination.");
+
+                // https://cs.android.com/android/platform/superproject/+/android-11.0.0_r3:libcore/ojluni/src/main/java/java/io/UnixFileSystem.java;l=358
+                // https://cs.android.com/android/platform/superproject/+/android-11.0.0_r3:libcore/luni/src/main/java/android/system/Os.java;l=512
+                // Uses File.getPath() to get the path of source and destination and not the canonical path
+                if(!srcFile.renameTo(destFile)) {
+                    // If destination directory is a subdirectory of the source directory
+                    // Copying is still allowed by copyDirectory() by excluding destination directory files
+                    if (srcFileType == FileType.DIRECTORY && destFileCanonicalPath.startsWith(srcFileCanonicalPath + File.separator))
+                        return context.getString(R.string.error_cannot_move_directory_to_sub_directory_of_itself, label + "source directory", srcFilePath, destFilePath);
+
+                    // If rename failed, then we copy
+                    Logger.logVerbose(LOG_TAG, "Renaming " + label + "source file to destination failed, attempting to copy.");
+                    copyFile = true;
+                }
+            }
+
+            // If moveFile is false or renameTo failed while moving
+            if(copyFile) {
+                Logger.logVerbose(LOG_TAG, "Attempting to copy source to destination.");
+
+                // Create the dest file parent directory
+                errmsg = createParentDirectoryFile(context, label + "dest file parent", destFilePath);
+                if(errmsg != null)
+                    return errmsg;
+
+                if (srcFileType == FileType.DIRECTORY) {
+                    // Will give runtime exceptions on android < 8 due to missing classes like java.nio.file.Path if org.apache.commons.io version > 2.5
+                    org.apache.commons.io.FileUtils.copyDirectory(srcFile, destFile, true);
+                } else if (srcFileType == FileType.SYMLINK) {
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                        java.nio.file.Files.copy(srcFile.toPath(), destFile.toPath(), LinkOption.NOFOLLOW_LINKS, StandardCopyOption.REPLACE_EXISTING);
+                    } else {
+                        // read the target for the source file and create a symlink at dest
+                        // source file metadata will be lost
+                        errmsg = createSymlinkFile(context, label + "dest file", Os.readlink(srcFilePath), destFilePath);
+                        if (errmsg != null)
+                            return errmsg;
+                    }
+                } else {
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                        java.nio.file.Files.copy(srcFile.toPath(), destFile.toPath(), LinkOption.NOFOLLOW_LINKS, StandardCopyOption.REPLACE_EXISTING);
+                    } else {
+                        // Will give runtime exceptions on android < 8 due to missing classes like java.nio.file.Path if org.apache.commons.io version > 2.5
+                        org.apache.commons.io.FileUtils.copyFile(srcFile, destFile, true);
+                    }
+                }
+            }
+
+            // If source file had to be moved
+            if(moveFile) {
+                // Delete the source file since copying would have succeeded
+                errmsg = deleteFile(context, label + "source file", srcFilePath, true);
+                if(errmsg != null)
+                    return errmsg;
+            }
+
+            Logger.logVerbose(LOG_TAG, mode + " successful.");
+        }
+        catch (Exception e) {
+            return context.getString(R.string.error_copying_or_moving_file_failed_with_exception, mode + " " + label + "file", srcFilePath, destFilePath, e.getMessage());
+        } finally {
+            closeCloseable(inputStream);
+            closeCloseable(outputStream);
+        }
+
+        return null;
+    }
+
+
+
+    /**
+     * Delete regular file at path.
+     *
+     * This function is a wrapper for {@link #deleteFile(Context, String, String, boolean, int)}.
+     *
+     * @param context The {@link Context} to get error string.
+     * @param label The optional label for file to delete. This can optionally be {@code null}.
+     * @param filePath The {@code path} for file to delete.
+     * @param ignoreNonExistentFile The {@code boolean} that decides if it should be considered an
+     *                              error if file to deleted doesn't exist.
+     * @return Returns the {@code errmsg} if deletion was not successful, otherwise {@code null}.
+     */
+    public static String deleteRegularFile(@NonNull final Context context, String label, final String filePath, final boolean ignoreNonExistentFile) {
+        return deleteFile(context, label, filePath, ignoreNonExistentFile, FileType.REGULAR.getValue());
+    }
+
+    /**
+     * Delete directory file at path.
+     *
+     * This function is a wrapper for {@link #deleteFile(Context, String, String, boolean, int)}.
+     *
+     * @param context The {@link Context} to get error string.
+     * @param label The optional label for file to delete. This can optionally be {@code null}.
+     * @param filePath The {@code path} for file to delete.
+     * @param ignoreNonExistentFile The {@code boolean} that decides if it should be considered an
+     *                              error if file to deleted doesn't exist.
+     * @return Returns the {@code errmsg} if deletion was not successful, otherwise {@code null}.
+     */
+    public static String deleteDirectoryFile(@NonNull final Context context, String label, final String filePath, final boolean ignoreNonExistentFile) {
+        return deleteFile(context, label, filePath, ignoreNonExistentFile, FileType.DIRECTORY.getValue());
+    }
+
+    /**
+     * Delete symlink file at path.
+     *
+     * This function is a wrapper for {@link #deleteFile(Context, String, String, boolean, int)}.
+     *
+     * @param context The {@link Context} to get error string.
+     * @param label The optional label for file to delete. This can optionally be {@code null}.
+     * @param filePath The {@code path} for file to delete.
+     * @param ignoreNonExistentFile The {@code boolean} that decides if it should be considered an
+     *                              error if file to deleted doesn't exist.
+     * @return Returns the {@code errmsg} if deletion was not successful, otherwise {@code null}.
+     */
+    public static String deleteSymlinkFile(@NonNull final Context context, String label, final String filePath, final boolean ignoreNonExistentFile) {
+        return deleteFile(context, label, filePath, ignoreNonExistentFile, FileType.SYMLINK.getValue());
+    }
+
+    /**
+     * Delete regular, directory or symlink file at path.
+     *
+     * This function is a wrapper for {@link #deleteFile(Context, String, String, boolean, int)}.
+     *
+     * @param context The {@link Context} to get error string.
+     * @param label The optional label for file to delete. This can optionally be {@code null}.
+     * @param filePath The {@code path} for file to delete.
+     * @param ignoreNonExistentFile The {@code boolean} that decides if it should be considered an
+     *                              error if file to deleted doesn't exist.
+     * @return Returns the {@code errmsg} if deletion was not successful, otherwise {@code null}.
+     */
+    public static String deleteFile(@NonNull final Context context, String label, final String filePath, final boolean ignoreNonExistentFile) {
+        return deleteFile(context, label, filePath, ignoreNonExistentFile, FileTypes.FILE_TYPE_NORMAL_FLAGS);
+    }
+
+    /**
+     * Delete file at path.
+     *
+     * The {@code filePath} must be the canonical path to the file to be deleted since symlinks will
+     * not be followed.
+     * If the {@code filePath} is a canonical path to a directory, then any symlink files found under
+     * the directory will be deleted, but not their targets.
+     *
+     * @param context The {@link Context} to get error string.
+     * @param label The optional label for file to delete. This can optionally be {@code null}.
+     * @param filePath The {@code path} for file to delete.
+     * @param ignoreNonExistentFile The {@code boolean} that decides if it should be considered an
+     *                              error if file to deleted doesn't exist.
+     * @param allowedFileTypeFlags The flags that are matched against the file's {@link FileType} to
+     *                             see if it should be deleted or not. This is a safety measure to
+     *                             prevent accidental deletion of the wrong type of file, like a
+     *                             directory instead of a regular file. You can pass
+     *                             {@link FileTypes#FILE_TYPE_ANY_FLAGS} to allow deletion of any file type.
+     * @return Returns the {@code errmsg} if deletion was not successful, otherwise {@code null}.
+     */
+    public static String deleteFile(@NonNull final Context context, String label, final String filePath, final boolean ignoreNonExistentFile, int allowedFileTypeFlags) {
+        label = (label == null ? "" : label + " ");
+        if (filePath == null || filePath.isEmpty()) return context.getString(R.string.error_null_or_empty_parameter, label + "file path", "deleteFile");
+        
+        try {
+            Logger.logVerbose(LOG_TAG, "Deleting " + label + "file at path \"" + filePath + "\"");
+
+            File file = new File(filePath);
+            FileType fileType = getFileType(filePath, false);
+
+            // If file does not exist
+            if (fileType == FileType.NO_EXIST) {
+                // If delete is to be ignored if file does not exist
+                if(ignoreNonExistentFile)
+                    return null;
+                // Else return with error
+                else
+                    return context.getString(R.string.error_file_not_found_at_path, label + "file meant to be deleted", filePath);
+            }
+
+            // If the file type of the file does not exist in the allowedFileTypeFlags, then return with error
+            if((allowedFileTypeFlags & fileType.getValue()) <= 0)
+                return context.getString(R.string.error_file_not_an_allowed_file_type, label + "file meant to be deleted", filePath, FileTypes.convertFileTypeFlagsToNamesString(allowedFileTypeFlags));
+
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                    /* Try to use {@link SecureDirectoryStream} if available for safer directory
+                    deletion, it should be available for android >= 8.0
+                    * https://guava.dev/releases/24.1-jre/api/docs/com/google/common/io/MoreFiles.html#deleteRecursively-java.nio.file.Path-com.google.common.io.RecursiveDeleteOption...-
+                    * https://github.com/google/guava/issues/365
+                    * https://cs.android.com/android/platform/superproject/+/android-11.0.0_r3:libcore/ojluni/src/main/java/sun/nio/fs/UnixSecureDirectoryStream.java
+                    *
+                    * MoreUtils is marked with the @Beta annotation so the API may be removed in
+                    * future but has been there for a few years now
+                    */
+                //noinspection UnstableApiUsage
+                com.google.common.io.MoreFiles.deleteRecursively(file.toPath(), RecursiveDeleteOption.ALLOW_INSECURE);
+            } else {
+                if (fileType == FileType.DIRECTORY) {
+                    // deleteDirectory() instead of forceDelete() gets the files list first instead of walking directory tree, so seems safer
+                    // Will give runtime exceptions on android < 8 due to missing classes like java.nio.file.Path if org.apache.commons.io version > 2.5
+                    org.apache.commons.io.FileUtils.deleteDirectory(file);
+                } else {
+                    // Will give runtime exceptions on android < 8 due to missing classes like java.nio.file.Path if org.apache.commons.io version > 2.5
+                    org.apache.commons.io.FileUtils.forceDelete(file);
+                }
+            }
+
+            // If file still exists after deleting it
+            fileType = getFileType(filePath, false);
+            if(fileType != FileType.NO_EXIST)
+                return context.getString(R.string.error_file_still_exists_after_deleting, label + "file meant to be deleted", filePath);
+        }
+        catch (Exception e) {
+            return context.getString(R.string.error_deleting_file_failed_with_exception, label + "file", filePath, e.getMessage());
+        }
+
+        return null;
+    }
+
+
+
+    /**
+     * Clear contents of directory at path without deleting the directory. If directory does not exist
+     * it will be created automatically.
+     *
+     * This function is a wrapper for
+     * {@link #clearDirectory(Context, String, String)}.
+     *
+     * @param context The {@link Context} to get error string.
+     * @param filePath The {@code path} for directory to clear.
+     * @return Returns the {@code errmsg} if clearing was not successful, otherwise {@code null}.
+     */
+    public static String clearDirectory(Context context, String filePath) {
+        return clearDirectory(context, null, filePath);
+    }
+
+    /**
+     * Clear contents of directory at path without deleting the directory. If directory does not exist
+     * it will be created automatically.
+     *
+     * The {@code filePath} must be the canonical path to a directory since symlinks will not be followed.
+     * Any symlink files found under the directory will be deleted, but not their targets.
+     *
+     * @param context The {@link Context} to get error string.
+     * @param label The optional label for directory to clear. This can optionally be {@code null}.
+     * @param filePath The {@code path} for directory to clear.
+     * @return Returns the {@code errmsg} if clearing was not successful, otherwise {@code null}.
+     */
+    public static String clearDirectory(@NonNull final Context context, String label, final String filePath) {
+        label = (label == null ? "" : label + " ");
+        if (filePath == null || filePath.isEmpty()) return context.getString(R.string.error_null_or_empty_parameter, label + "file path", "clearDirectory");
+
+        String errmsg;
+
+        try {
+            Logger.logVerbose(LOG_TAG, "Clearing " + label + "directory at path \"" + filePath + "\"");
+
+            File file = new File(filePath);
+            FileType fileType = getFileType(filePath, false);
+
+            // If file exists but not a directory file
+            if (fileType != FileType.NO_EXIST && fileType != FileType.DIRECTORY) {
+                return context.getString(R.string.error_non_directory_file_found, label + "directory");
+            }
+
+            // If directory exists, clear its contents
+            if (fileType == FileType.DIRECTORY) {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                    //noinspection UnstableApiUsage
+                    com.google.common.io.MoreFiles.deleteDirectoryContents(file.toPath(), RecursiveDeleteOption.ALLOW_INSECURE);
+                } else {
+                    // Will give runtime exceptions on android < 8 due to missing classes like java.nio.file.Path if org.apache.commons.io version > 2.5
+                    org.apache.commons.io.FileUtils.cleanDirectory(new File(filePath));
+                }
+            }
+            // Else create it
+            else {
+                errmsg = createDirectoryFile(context, label, filePath);
+                if(errmsg != null)
+                    return errmsg;
+            }
+        } catch (Exception e) {
+            return context.getString(R.string.error_clearing_directory_failed_with_exception, label + "directory", filePath, e.getMessage());
+        }
+
+        return null;
+    }
+
+
+
+    /**
+     * Read a {@link String} from file at path with a specific {@link Charset} into {@code dataString}.
+     *
+     * @param context The {@link Context} to get error string.
+     * @param label The optional label for file to read. This can optionally be {@code null}.
+     * @param filePath The {@code path} for file to read.
+     * @param charset The {@link Charset} of the file. If this is {@code null},
+     *      *                then default {@link Charset} will be used.
+     * @param dataStringBuilder The {@code StringBuilder} to read data into.
+     * @param ignoreNonExistentFile The {@code boolean} that decides if it should be considered an
+     *                              error if file to read doesn't exist.
+     * @return Returns the {@code errmsg} if reading was not successful, otherwise {@code null}.
+     */
+    public static String readStringFromFile(@NonNull final Context context, String label, final String filePath, Charset charset, @NonNull final StringBuilder dataStringBuilder, final boolean ignoreNonExistentFile) {
+        label = (label == null ? "" : label + " ");
+        if (filePath == null || filePath.isEmpty()) return context.getString(R.string.error_null_or_empty_parameter, label + "file path", "readStringFromFile");
+
+        Logger.logVerbose(LOG_TAG, "Reading string from " + label + "file at path \"" + filePath + "\"");
+
+        String errmsg;
+
+        FileType fileType = getFileType(filePath, false);
+
+        // If file exists but not a regular file
+        if (fileType != FileType.NO_EXIST && fileType != FileType.REGULAR) {
+            return context.getString(R.string.error_non_regular_file_found, label + "file");
+        }
+
+        // If file does not exist
+        if (fileType == FileType.NO_EXIST) {
+            // If reading is to be ignored if file does not exist
+            if(ignoreNonExistentFile)
+                return null;
+            // Else return with error
+            else
+                return context.getString(R.string.error_file_not_found_at_path, label + "file meant to be read", filePath);
+        }
+
+        if(charset == null) charset = Charset.defaultCharset();
+
+        // Check if charset is supported
+        errmsg = isCharsetSupported(context, charset);
+        if(errmsg != null)
+            return errmsg;
+
+        FileInputStream fileInputStream = null;
+        BufferedReader bufferedReader = null;
+        try {
+            // Read string from file
+            fileInputStream = new FileInputStream(filePath);
+            bufferedReader = new BufferedReader(new InputStreamReader(fileInputStream, charset));
+
+            String receiveString;
+
+            boolean firstLine = true;
+            while ((receiveString = bufferedReader.readLine()) != null ) {
+                if(!firstLine) dataStringBuilder.append("\n"); else firstLine = false;
+                dataStringBuilder.append(receiveString);
+            }
+
+            Logger.logVerbose(LOG_TAG, Logger.getMultiLineLogStringEntry("String", DataUtils.getTruncatedCommandOutput(dataStringBuilder.toString(), Logger.LOGGER_ENTRY_SIZE_LIMIT_IN_BYTES, true, false, true), "-"));
+        } catch (Exception e) {
+            return context.getString(R.string.error_reading_string_to_file_failed_with_exception, label + "file", filePath, e.getMessage());
+        } finally {
+            closeCloseable(fileInputStream);
+            closeCloseable(bufferedReader);
+        }
+
+        return null;
+    }
+
+    /**
+     * Write the {@link String} {@code dataString} with a specific {@link Charset} to file at path.
+     *
+     * @param context The {@link Context} to get error string.
+     * @param label The optional label for file to write. This can optionally be {@code null}.
+     * @param filePath The {@code path} for file to write.
+     * @param charset The {@link Charset} of the {@code dataString}. If this is {@code null},
+     *                then default {@link Charset} will be used.
+     * @param append The {@code boolean} that decides if file should be appended to or not.
+     * @return Returns the {@code errmsg} if writing was not successful, otherwise {@code null}.
+     */
+    public static String writeStringToFile(@NonNull final Context context, String label, final String filePath, Charset charset, final String dataString, final boolean append) {
+        label = (label == null ? "" : label + " ");
+        if (filePath == null || filePath.isEmpty()) return context.getString(R.string.error_null_or_empty_parameter, label + "file path", "writeStringToFile");
+
+        Logger.logVerbose(LOG_TAG, Logger.getMultiLineLogStringEntry("Writing string to " + label + "file at path \"" + filePath + "\"", DataUtils.getTruncatedCommandOutput(dataString, Logger.LOGGER_ENTRY_SIZE_LIMIT_IN_BYTES, true, false, true), "-"));
+
+        String errmsg;
+
+        FileType fileType = getFileType(filePath, false);
+
+        // If file exists but not a regular file
+        if (fileType != FileType.NO_EXIST && fileType != FileType.REGULAR) {
+            return context.getString(R.string.error_non_regular_file_found, label + "file");
+        }
+
+        // Create the file parent directory
+        errmsg = createParentDirectoryFile(context, label + "file parent", filePath);
+        if(errmsg != null)
+            return errmsg;
+
+        if(charset == null) charset = Charset.defaultCharset();
+
+        // Check if charset is supported
+        errmsg = isCharsetSupported(context, charset);
+        if(errmsg != null)
+            return errmsg;
+
+        FileOutputStream fileOutputStream = null;
+        BufferedWriter bufferedWriter = null;
+        try {
+            // Write string to file
+            fileOutputStream = new FileOutputStream(filePath, append);
+            bufferedWriter = new BufferedWriter(new OutputStreamWriter(fileOutputStream, charset));
+
+            bufferedWriter.write(dataString);
+            bufferedWriter.flush();
+        } catch (Exception e) {
+            return context.getString(R.string.error_writing_string_to_file_failed_with_exception, label + "file", filePath, e.getMessage());
+        } finally {
+            closeCloseable(fileOutputStream);
+            closeCloseable(bufferedWriter);
+        }
+
+        return null;
+    }
+
+
+
+    /**
+     * Check if a specific {@link Charset} is supported.
+     *
+     * @param context The {@link Context} to get error string.
+     * @param charset The {@link Charset} to check.
+     * @return Returns the {@code errmsg} if charset is not supported or failed to check it, otherwise {@code null}.
+     */
+    public static String isCharsetSupported(@NonNull final Context context, final Charset charset) {
+        if (charset == null) return context.getString(R.string.error_null_or_empty_parameter, "charset", "isCharsetSupported");
+
+        try {
+            if(!Charset.isSupported(charset.name())) {
+                return context.getString(R.string.error_unsupported_charset, charset.name());
+            }
+        } catch (Exception e) {
+            return context.getString(R.string.error_checking_if_charset_supported_failed, charset.name(), e.getMessage());
+        }
+
+        return null;
+    }
+
+
+
+    /**
+     * Close a {@link Closeable} object if not {@code null} and ignore any exceptions raised.
+     *
+     * @param closeable The {@link Closeable} object to close.
+     */
+    public static void closeCloseable(final Closeable closeable) {
+        if (closeable != null) {
+            try {
+                closeable.close();
+            }
+            catch (IOException e) {
+                // ignore
+            }
+        }
+    }
+
+
+
+    /**
+     * Set permissions for file at path. Existing permission outside the {@code permissionsToSet}
+     * will be removed.
+     *
+     * @param filePath The {@code path} for file to set permissions to.
+     * @param permissionsToSet The 3 character string that contains the "r", "w", "x" or "-" in-order.
+     */
+    public static void setFilePermissions(final String filePath, final String permissionsToSet) {
+        setFilePermissions(null, filePath, permissionsToSet);
+    }
+
+    /**
+     * Set permissions for file at path. Existing permission outside the {@code permissionsToSet}
+     * will be removed.
+     *
+     * @param label The optional label for the file. This can optionally be {@code null}.
+     * @param filePath The {@code path} for file to set permissions to.
+     * @param permissionsToSet The 3 character string that contains the "r", "w", "x" or "-" in-order.
+     */
+    public static void setFilePermissions(String label, final String filePath, final String permissionsToSet) {
+        label = (label == null ? "" : label + " ");
+        if (filePath == null || filePath.isEmpty()) return;
+
+        if (!isValidPermissingString(permissionsToSet)) {
+            Logger.logError(LOG_TAG, "Invalid permissionsToSet passed to setFilePermissions: \"" + permissionsToSet + "\"");
+            return;
+        }
+
+        File file = new File(filePath);
+
+        if (permissionsToSet.contains("r")) {
+            if (!file.canRead()) {
+                Logger.logVerbose(LOG_TAG, "Setting read permissions for " + label + "file at path \"" + filePath + "\"");
+                file.setReadable(true);
+            }
+        } else {
+            if (file.canRead()) {
+                Logger.logVerbose(LOG_TAG, "Removing read permissions for " + label + "file at path \"" + filePath + "\"");
+                file.setReadable(false);
+            }
+        }
+
+
+        if (permissionsToSet.contains("w")) {
+            if (!file.canWrite()) {
+                Logger.logVerbose(LOG_TAG, "Setting write permissions for " + label + "file at path \"" + filePath + "\"");
+                file.setWritable(true);
+            }
+        } else {
+            if (file.canWrite()) {
+                Logger.logVerbose(LOG_TAG, "Removing write permissions for " + label + "file at path \"" + filePath + "\"");
+                file.setWritable(false);
+            }
+        }
+
+
+        if (permissionsToSet.contains("x")) {
+            if (!file.canExecute()) {
+                Logger.logVerbose(LOG_TAG, "Setting execute permissions for " + label + "file at path \"" + filePath + "\"");
+                file.setExecutable(true);
+            }
+        } else {
+            if (file.canExecute()) {
+                Logger.logVerbose(LOG_TAG, "Removing execute permissions for " + label + "file at path \"" + filePath + "\"");
+                file.setExecutable(false);
+            }
+        }
+    }
+
+
+
+    /**
+     * Set missing permissions for file at path. Existing permission outside the {@code permissionsToSet}
+     * will not be removed.
+     *
+     * @param filePath The {@code path} for file to set permissions to.
+     * @param permissionsToSet The 3 character string that contains the "r", "w", "x" or "-" in-order.
+     */
+    public static void setMissingFilePermissions(final String filePath, final String permissionsToSet) {
+        setMissingFilePermissions(null, filePath, permissionsToSet);
+    }
+
+    /**
+     * Set missing permissions for file at path. Existing permission outside the {@code permissionsToSet}
+     * will not be removed.
+     *
+     * @param label The optional label for the file. This can optionally be {@code null}.
+     * @param filePath The {@code path} for file to set permissions to.
+     * @param permissionsToSet The 3 character string that contains the "r", "w", "x" or "-" in-order.
+     */
+    public static void setMissingFilePermissions(String label, final String filePath, final String permissionsToSet) {
+        label = (label == null ? "" : label + " ");
+        if (filePath == null || filePath.isEmpty()) return;
+
+        if (!isValidPermissingString(permissionsToSet)) {
+            Logger.logError(LOG_TAG, "Invalid permissionsToSet passed to setMissingFilePermissions: \"" + permissionsToSet + "\"");
+            return;
+        }
+
+        File file = new File(filePath);
+
+        if (permissionsToSet.contains("r") && !file.canRead()) {
+            Logger.logVerbose(LOG_TAG, "Setting missing read permissions for " + label + "file at path \"" + filePath + "\"");
+            file.setReadable(true);
+        }
+
+        if (permissionsToSet.contains("w") && !file.canWrite()) {
+            Logger.logVerbose(LOG_TAG, "Setting missing write permissions for " + label + "file at path \"" + filePath + "\"");
+            file.setWritable(true);
+        }
+
+        if (permissionsToSet.contains("x") && !file.canExecute()) {
+            Logger.logVerbose(LOG_TAG, "Setting missing execute permissions for " + label + "file at path \"" + filePath + "\"");
+            file.setExecutable(true);
+        }
+    }
+
+
+
+    /**
+     * Checking missing permissions for file at path.
+     *
+     * @param context The {@link Context} to get error string.
+     * @param filePath The {@code path} for file to check permissions for.
+     * @param permissionsToCheck The 3 character string that contains the "r", "w", "x" or "-" in-order.
+     * @param ignoreIfNotExecutable The {@code boolean} that decides if missing executable permission
+     *                              error is to be ignored.
+     * @return Returns the {@code errmsg} if validating permissions failed, otherwise {@code null}.
+     */
+    public static String checkMissingFilePermissions(@NonNull final Context context, final String filePath, final String permissionsToCheck, final boolean ignoreIfNotExecutable) {
+        return checkMissingFilePermissions(context, null, filePath, permissionsToCheck, ignoreIfNotExecutable);
+    }
+
+    /**
+     * Checking missing permissions for file at path.
+     *
+     * @param context The {@link Context} to get error string.
+     * @param label The optional label for the file. This can optionally be {@code null}.
+     * @param filePath The {@code path} for file to check permissions for.
+     * @param permissionsToCheck The 3 character string that contains the "r", "w", "x" or "-" in-order.
+     * @param ignoreIfNotExecutable The {@code boolean} that decides if missing executable permission
+     *                              error is to be ignored.
+     * @return Returns the {@code errmsg} if validating permissions failed, otherwise {@code null}.
+     */
+    public static String checkMissingFilePermissions(@NonNull final Context context, String label, final String filePath, final String permissionsToCheck, final boolean ignoreIfNotExecutable) {
+        label = (label == null ? "" : label + " ");
+        if (filePath == null || filePath.isEmpty()) return context.getString(R.string.error_null_or_empty_parameter, label + "file path", "checkMissingFilePermissions");
+
+        if (!isValidPermissingString(permissionsToCheck)) {
+            Logger.logError(LOG_TAG, "Invalid permissionsToCheck passed to checkMissingFilePermissions: \"" + permissionsToCheck + "\"");
+            return context.getString(R.string.error_invalid_file_permissions_string_to_check);
+        }
+
+        File file = new File(filePath);
+
+        // If file is not readable
+        if (permissionsToCheck.contains("r") && !file.canRead()) {
+            return context.getString(R.string.error_file_not_readable, label + "file");
+        }
+
+        // If file is not writable
+        if (permissionsToCheck.contains("w") && !file.canWrite()) {
+            return context.getString(R.string.error_file_not_writable, label + "file");
+        }
+        // If file is not executable
+        // This canExecute() will give "avc: granted { execute }" warnings for target sdk 29
+        else if (permissionsToCheck.contains("x") && !file.canExecute() && !ignoreIfNotExecutable) {
+            return context.getString(R.string.error_file_not_executable, label + "file");
+        }
+
+        return null;
+    }
+
+
+
+    /**
+     * Checks whether string exactly matches the 3 character permission string that
+     * contains the "r", "w", "x" or "-" in-order.
+     *
+     * @param string The {@link String} to check.
+     * @return Returns {@code true} if string exactly matches a permission string, otherwise {@code false}.
+     */
+    public static boolean isValidPermissingString(final String string) {
+        if (string == null || string.isEmpty()) return false;
+        return Pattern.compile("^([r-])[w-][x-]$", 0).matcher(string).matches();
+    }
+    
+}
diff --git a/app/src/main/java/com/termux/app/file/filesystem/FileAttributes.java b/app/src/main/java/com/termux/app/file/filesystem/FileAttributes.java
new file mode 100644
index 0000000000..03482136cd
--- /dev/null
+++ b/app/src/main/java/com/termux/app/file/filesystem/FileAttributes.java
@@ -0,0 +1,416 @@
+/*
+ * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.termux.app.file.filesystem;
+
+import android.os.Build;
+import android.system.StructStat;
+
+import androidx.annotation.NonNull;
+
+import com.termux.app.utils.Logger;
+
+import java.io.File;
+import java.io.FileDescriptor;
+import java.io.IOException;
+import java.util.concurrent.TimeUnit;
+import java.util.Set;
+import java.util.HashSet;
+
+/**
+ * Unix implementation of PosixFileAttributes.
+ * https://cs.android.com/android/platform/superproject/+/android-11.0.0_r3:libcore/ojluni/src/main/java/sun/nio/fs/UnixFileAttributes.java
+ */
+
+public class FileAttributes {
+    private String filePath;
+    private FileDescriptor fileDescriptor;
+
+    private int st_mode;
+    private long st_ino;
+    private long st_dev;
+    private long st_rdev;
+    private long st_nlink;
+    private int st_uid;
+    private int st_gid;
+    private long st_size;
+    private long st_blksize;
+    private long st_blocks;
+    private long st_atime_sec;
+    private long st_atime_nsec;
+    private long st_mtime_sec;
+    private long st_mtime_nsec;
+    private long st_ctime_sec;
+    private long st_ctime_nsec;
+
+    // created lazily
+    private volatile String owner;
+    private volatile String group;
+    private volatile FileKey key;
+
+    private FileAttributes(String filePath) {
+        this.filePath = filePath;
+    }
+
+    private FileAttributes(FileDescriptor fileDescriptor) {
+        this.fileDescriptor = fileDescriptor;
+    }
+
+    // get the FileAttributes for a given file
+    public static FileAttributes get(String filePath, boolean followLinks) throws IOException {
+        FileAttributes fileAttributes;
+
+        if (filePath == null || filePath.isEmpty())
+            fileAttributes = new FileAttributes((String) null);
+        else
+            fileAttributes = new FileAttributes(new File(filePath).getAbsolutePath());
+
+        if (followLinks) {
+            NativeDispatcher.stat(filePath, fileAttributes);
+        } else {
+            NativeDispatcher.lstat(filePath, fileAttributes);
+        }
+
+        // Logger.logDebug(fileAttributes.toString());
+
+        return fileAttributes;
+    }
+
+    // get the FileAttributes for an open file
+    public static FileAttributes get(FileDescriptor fileDescriptor) throws IOException {
+        FileAttributes fileAttributes = new FileAttributes(fileDescriptor);
+        NativeDispatcher.fstat(fileDescriptor, fileAttributes);
+        return fileAttributes;
+    }
+
+    public String file() {
+        if(filePath != null)
+            return filePath;
+        else if(fileDescriptor != null)
+            return fileDescriptor.toString();
+        else
+            return null;
+    }
+
+    // package-private
+    public boolean isSameFile(FileAttributes attrs) {
+        return ((st_ino == attrs.st_ino) && (st_dev == attrs.st_dev));
+    }
+
+    // package-private
+    public int mode() {
+        return st_mode;
+    }
+
+    public long blksize() {
+        return st_blksize;
+    }
+
+    public long blocks() {
+        return st_blocks;
+    }
+
+    public long ino() {
+        return st_ino;
+    }
+
+    public long dev() {
+        return st_dev;
+    }
+
+    public long rdev() {
+        return st_rdev;
+    }
+
+    public long nlink() {
+        return st_nlink;
+    }
+
+    public int uid() {
+        return st_uid;
+    }
+
+    public int gid() {
+        return st_gid;
+    }
+
+    private static FileTime toFileTime(long sec, long nsec) {
+        if (nsec == 0) {
+            return FileTime.from(sec, TimeUnit.SECONDS);
+        } else {
+            // truncate to microseconds to avoid overflow with timestamps
+            // way out into the future. We can re-visit this if FileTime
+            // is updated to define a from(secs,nsecs) method.
+            long micro = sec * 1000000L + nsec / 1000L;
+            return FileTime.from(micro, TimeUnit.MICROSECONDS);
+        }
+    }
+
+    public FileTime lastAccessTime() {
+        return toFileTime(st_atime_sec, st_atime_nsec);
+    }
+
+    public FileTime lastModifiedTime() {
+        return toFileTime(st_mtime_sec, st_mtime_nsec);
+    }
+
+    public FileTime lastChangeTime() {
+        return toFileTime(st_ctime_sec, st_ctime_nsec);
+    }
+
+    public FileTime creationTime() {
+        return lastModifiedTime();
+    }
+
+    public boolean isRegularFile() {
+        return ((st_mode & UnixConstants.S_IFMT) == UnixConstants.S_IFREG);
+    }
+
+    public boolean isDirectory() {
+        return ((st_mode & UnixConstants.S_IFMT) == UnixConstants.S_IFDIR);
+    }
+
+    public boolean isSymbolicLink() {
+        return ((st_mode & UnixConstants.S_IFMT) == UnixConstants.S_IFLNK);
+    }
+
+    public boolean isCharacter() {
+        return ((st_mode & UnixConstants.S_IFMT) == UnixConstants.S_IFCHR);
+    }
+
+    public boolean isFifo() {
+        return ((st_mode & UnixConstants.S_IFMT) == UnixConstants.S_IFIFO);
+    }
+
+    public boolean isBlock() {
+        return ((st_mode & UnixConstants.S_IFMT) == UnixConstants.S_IFBLK);
+    }
+
+    public boolean isOther() {
+        int type = st_mode & UnixConstants.S_IFMT;
+        return (type != UnixConstants.S_IFREG &&
+            type != UnixConstants.S_IFDIR &&
+            type != UnixConstants.S_IFLNK);
+    }
+
+    public boolean isDevice() {
+        int type = st_mode & UnixConstants.S_IFMT;
+        return (type == UnixConstants.S_IFCHR ||
+            type == UnixConstants.S_IFBLK ||
+            type == UnixConstants.S_IFIFO);
+    }
+
+    public long size() {
+        return st_size;
+    }
+
+    public FileKey fileKey() {
+        if (key == null) {
+            synchronized (this) {
+                if (key == null) {
+                    key = new FileKey(st_dev, st_ino);
+                }
+            }
+        }
+        return key;
+    }
+
+    public String owner() {
+        if (owner == null) {
+            synchronized (this) {
+                if (owner == null) {
+                    owner = Integer.toString(st_uid);
+                }
+            }
+        }
+        return owner;
+    }
+
+    public String group() {
+        if (group == null) {
+            synchronized (this) {
+                if (group == null) {
+                    group = Integer.toString(st_gid);
+                }
+            }
+        }
+        return group;
+    }
+
+    public Set<FilePermission> permissions() {
+        int bits = (st_mode & UnixConstants.S_IAMB);
+        HashSet<FilePermission> perms = new HashSet<>();
+
+        if ((bits & UnixConstants.S_IRUSR) > 0)
+            perms.add(FilePermission.OWNER_READ);
+        if ((bits & UnixConstants.S_IWUSR) > 0)
+            perms.add(FilePermission.OWNER_WRITE);
+        if ((bits & UnixConstants.S_IXUSR) > 0)
+            perms.add(FilePermission.OWNER_EXECUTE);
+
+        if ((bits & UnixConstants.S_IRGRP) > 0)
+            perms.add(FilePermission.GROUP_READ);
+        if ((bits & UnixConstants.S_IWGRP) > 0)
+            perms.add(FilePermission.GROUP_WRITE);
+        if ((bits & UnixConstants.S_IXGRP) > 0)
+            perms.add(FilePermission.GROUP_EXECUTE);
+
+        if ((bits & UnixConstants.S_IROTH) > 0)
+            perms.add(FilePermission.OTHERS_READ);
+        if ((bits & UnixConstants.S_IWOTH) > 0)
+            perms.add(FilePermission.OTHERS_WRITE);
+        if ((bits & UnixConstants.S_IXOTH) > 0)
+            perms.add(FilePermission.OTHERS_EXECUTE);
+
+        return perms;
+    }
+
+    public void loadFromStructStat(StructStat structStat) {
+        this.st_mode = structStat.st_mode;
+        this.st_ino = structStat.st_ino;
+        this.st_dev = structStat.st_dev;
+        this.st_rdev = structStat.st_rdev;
+        this.st_nlink = structStat.st_nlink;
+        this.st_uid = structStat.st_uid;
+        this.st_gid = structStat.st_gid;
+        this.st_size = structStat.st_size;
+        this.st_blksize = structStat.st_blksize;
+        this.st_blocks = structStat.st_blocks;
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
+            this.st_atime_sec = structStat.st_atim.tv_sec;
+            this.st_atime_nsec = structStat.st_atim.tv_nsec;
+            this.st_mtime_sec = structStat.st_mtim.tv_sec;
+            this.st_mtime_nsec = structStat.st_mtim.tv_nsec;
+            this.st_ctime_sec = structStat.st_ctim.tv_sec;
+            this.st_ctime_nsec = structStat.st_ctim.tv_nsec;
+        } else {
+            this.st_atime_sec = structStat.st_atime;
+            this.st_atime_nsec = 0;
+            this.st_mtime_sec = structStat.st_mtime;
+            this.st_mtime_nsec = 0;
+            this.st_ctime_sec = structStat.st_ctime;
+            this.st_ctime_nsec = 0;
+        }
+    }
+
+    public String getFileString() {
+        return "File: `" + file() + "`";
+    }
+
+    public String getTypeString() {
+        return "Type: `" + FileTypes.getFileType(this).getName() + "`";
+    }
+
+    public String getSizeString() {
+        return "Size: `" + size() + "`";
+    }
+
+    public String getBlocksString() {
+        return "Blocks: `" + blocks() + "`";
+    }
+
+    public String getIOBlockString() {
+        return "IO Block: `" + blksize() + "`";
+    }
+
+    public String getDeviceString() {
+        return "Device: `" + Long.toHexString(st_dev) + "`";
+    }
+
+    public String getInodeString() {
+        return "Inode: `" + st_ino + "`";
+    }
+
+    public String getLinksString() {
+        return "Links: `" + nlink() + "`";
+    }
+
+    public String getDeviceTypeString() {
+        return "Device Type: `" + rdev() + "`";
+    }
+
+    public String getOwnerString() {
+        return "Owner: `" + owner() + "`";
+    }
+
+    public String getGroupString() {
+        return "Group: `" + group() + "`";
+    }
+
+    public String getPermissionString() {
+        return "Permissions: `" + FilePermissions.toString(permissions()) + "`";
+    }
+
+    public String getAccessTimeString() {
+        return "Access Time: `" + lastAccessTime() + "`";
+    }
+
+    public String getModifiedTimeString() {
+        return "Modified Time: `" + lastModifiedTime() + "`";
+    }
+
+    public String getChangeTimeString() {
+        return "Change Time: `" + lastChangeTime() + "`";
+    }
+
+    @NonNull
+    @Override
+    public String toString() {
+        return getFileAttributesLogString(this);
+    }
+
+    public static String getFileAttributesLogString(final FileAttributes fileAttributes) {
+        if (fileAttributes == null) return "null";
+
+        StringBuilder logString = new StringBuilder();
+
+        logString.append(fileAttributes.getFileString());
+
+        logString.append("\n").append(fileAttributes.getTypeString());
+
+        logString.append("\n").append(fileAttributes.getSizeString());
+        logString.append("\n").append(fileAttributes.getBlocksString());
+        logString.append("\n").append(fileAttributes.getIOBlockString());
+
+        logString.append("\n").append(fileAttributes.getDeviceString());
+        logString.append("\n").append(fileAttributes.getInodeString());
+        logString.append("\n").append(fileAttributes.getLinksString());
+
+        if(fileAttributes.isBlock() || fileAttributes.isCharacter())
+            logString.append("\n").append(fileAttributes.getDeviceTypeString());
+
+        logString.append("\n").append(fileAttributes.getOwnerString());
+        logString.append("\n").append(fileAttributes.getGroupString());
+        logString.append("\n").append(fileAttributes.getPermissionString());
+
+        logString.append("\n").append(fileAttributes.getAccessTimeString());
+        logString.append("\n").append(fileAttributes.getModifiedTimeString());
+        logString.append("\n").append(fileAttributes.getChangeTimeString());
+
+        return logString.toString();
+    }
+
+}
diff --git a/app/src/main/java/com/termux/app/file/filesystem/FileKey.java b/app/src/main/java/com/termux/app/file/filesystem/FileKey.java
new file mode 100644
index 0000000000..87908a2634
--- /dev/null
+++ b/app/src/main/java/com/termux/app/file/filesystem/FileKey.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.termux.app.file.filesystem;
+
+/**
+ * Container for device/inode to uniquely identify file.
+ * https://cs.android.com/android/platform/superproject/+/android-11.0.0_r3:libcore/ojluni/src/main/java/sun/nio/fs/UnixFileKey.java
+ */
+
+public class FileKey {
+    private final long st_dev;
+    private final long st_ino;
+
+    FileKey(long st_dev, long st_ino) {
+        this.st_dev = st_dev;
+        this.st_ino = st_ino;
+    }
+
+    @Override
+    public int hashCode() {
+        return (int)(st_dev ^ (st_dev >>> 32)) +
+            (int)(st_ino ^ (st_ino >>> 32));
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == this)
+            return true;
+        if (!(obj instanceof FileKey))
+            return false;
+        FileKey other = (FileKey)obj;
+        return (this.st_dev == other.st_dev) && (this.st_ino == other.st_ino);
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("(dev=")
+            .append(Long.toHexString(st_dev))
+            .append(",ino=")
+            .append(st_ino)
+            .append(')');
+        return sb.toString();
+    }
+}
diff --git a/app/src/main/java/com/termux/app/file/filesystem/FilePermission.java b/app/src/main/java/com/termux/app/file/filesystem/FilePermission.java
new file mode 100644
index 0000000000..6cb4dd1949
--- /dev/null
+++ b/app/src/main/java/com/termux/app/file/filesystem/FilePermission.java
@@ -0,0 +1,87 @@
+
+/*
+ * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.termux.app.file.filesystem;
+
+/**
+ * Defines the bits for use with the {@link FileAttributes#permissions()
+ * permissions} attribute.
+ *
+ * <p> The {@link FileAttributes} class defines methods for manipulating
+ * set of permissions.
+ *
+ * https://cs.android.com/android/platform/superproject/+/android-11.0.0_r3:libcore/ojluni/src/main/java/java/nio/file/attribute/PosixFilePermission.java
+ *
+ * @since 1.7
+ */
+
+public enum FilePermission {
+
+    /**
+     * Read permission, owner.
+     */
+    OWNER_READ,
+
+    /**
+     * Write permission, owner.
+     */
+    OWNER_WRITE,
+
+    /**
+     * Execute/search permission, owner.
+     */
+    OWNER_EXECUTE,
+
+    /**
+     * Read permission, group.
+     */
+    GROUP_READ,
+
+    /**
+     * Write permission, group.
+     */
+    GROUP_WRITE,
+
+    /**
+     * Execute/search permission, group.
+     */
+    GROUP_EXECUTE,
+
+    /**
+     * Read permission, others.
+     */
+    OTHERS_READ,
+
+    /**
+     * Write permission, others.
+     */
+    OTHERS_WRITE,
+
+    /**
+     * Execute/search permission, others.
+     */
+    OTHERS_EXECUTE;
+}
diff --git a/app/src/main/java/com/termux/app/file/filesystem/FilePermissions.java b/app/src/main/java/com/termux/app/file/filesystem/FilePermissions.java
new file mode 100644
index 0000000000..eb48579c70
--- /dev/null
+++ b/app/src/main/java/com/termux/app/file/filesystem/FilePermissions.java
@@ -0,0 +1,145 @@
+/*
+ * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.termux.app.file.filesystem;
+
+import static com.termux.app.file.filesystem.FilePermission.*;
+
+import java.util.*;
+
+/**
+ * This class consists exclusively of static methods that operate on sets of
+ * {@link FilePermission} objects.
+ *
+ * https://cs.android.com/android/platform/superproject/+/android-11.0.0_r3:libcore/ojluni/src/main/java/java/nio/file/attribute/PosixFilePermissions.java
+ *
+ * @since 1.7
+ */
+
+public final class FilePermissions {
+    private FilePermissions() { }
+
+    // Write string representation of permission bits to {@code sb}.
+    private static void writeBits(StringBuilder sb, boolean r, boolean w, boolean x) {
+        if (r) {
+            sb.append('r');
+        } else {
+            sb.append('-');
+        }
+        if (w) {
+            sb.append('w');
+        } else {
+            sb.append('-');
+        }
+        if (x) {
+            sb.append('x');
+        } else {
+            sb.append('-');
+        }
+    }
+
+    /**
+     * Returns the {@code String} representation of a set of permissions. It
+     * is guaranteed that the returned {@code String} can be parsed by the
+     * {@link #fromString} method.
+     *
+     * <p> If the set contains {@code null} or elements that are not of type
+     * {@code FilePermission} then these elements are ignored.
+     *
+     * @param   perms
+     *          the set of permissions
+     *
+     * @return  the string representation of the permission set
+     */
+    public static String toString(Set<FilePermission> perms) {
+        StringBuilder sb = new StringBuilder(9);
+        writeBits(sb, perms.contains(OWNER_READ), perms.contains(OWNER_WRITE),
+            perms.contains(OWNER_EXECUTE));
+        writeBits(sb, perms.contains(GROUP_READ), perms.contains(GROUP_WRITE),
+            perms.contains(GROUP_EXECUTE));
+        writeBits(sb, perms.contains(OTHERS_READ), perms.contains(OTHERS_WRITE),
+            perms.contains(OTHERS_EXECUTE));
+        return sb.toString();
+    }
+
+    private static boolean isSet(char c, char setValue) {
+        if (c == setValue)
+            return true;
+        if (c == '-')
+            return false;
+        throw new IllegalArgumentException("Invalid mode");
+    }
+    private static boolean isR(char c) { return isSet(c, 'r'); }
+    private static boolean isW(char c) { return isSet(c, 'w'); }
+    private static boolean isX(char c) { return isSet(c, 'x'); }
+
+    /**
+     * Returns the set of permissions corresponding to a given {@code String}
+     * representation.
+     *
+     * <p> The {@code perms} parameter is a {@code String} representing the
+     * permissions. It has 9 characters that are interpreted as three sets of
+     * three. The first set refers to the owner's permissions; the next to the
+     * group permissions and the last to others. Within each set, the first
+     * character is {@code 'r'} to indicate permission to read, the second
+     * character is {@code 'w'} to indicate permission to write, and the third
+     * character is {@code 'x'} for execute permission. Where a permission is
+     * not set then the corresponding character is set to {@code '-'}.
+     *
+     * <p> <b>Usage Example:</b>
+     * Suppose we require the set of permissions that indicate the owner has read,
+     * write, and execute permissions, the group has read and execute permissions
+     * and others have none.
+     * <pre>
+     *   Set&lt;FilePermission&gt; perms = FilePermissions.fromString("rwxr-x---");
+     * </pre>
+     *
+     * @param   perms
+     *          string representing a set of permissions
+     *
+     * @return  the resulting set of permissions
+     *
+     * @throws  IllegalArgumentException
+     *          if the string cannot be converted to a set of permissions
+     *
+     * @see #toString(Set)
+     */
+    public static Set<FilePermission> fromString(String perms) {
+        if (perms.length() != 9)
+            throw new IllegalArgumentException("Invalid mode");
+        Set<FilePermission> result = EnumSet.noneOf(FilePermission.class);
+        if (isR(perms.charAt(0))) result.add(OWNER_READ);
+        if (isW(perms.charAt(1))) result.add(OWNER_WRITE);
+        if (isX(perms.charAt(2))) result.add(OWNER_EXECUTE);
+        if (isR(perms.charAt(3))) result.add(GROUP_READ);
+        if (isW(perms.charAt(4))) result.add(GROUP_WRITE);
+        if (isX(perms.charAt(5))) result.add(GROUP_EXECUTE);
+        if (isR(perms.charAt(6))) result.add(OTHERS_READ);
+        if (isW(perms.charAt(7))) result.add(OTHERS_WRITE);
+        if (isX(perms.charAt(8))) result.add(OTHERS_EXECUTE);
+        return result;
+    }
+
+}
diff --git a/app/src/main/java/com/termux/app/file/filesystem/FileTime.java b/app/src/main/java/com/termux/app/file/filesystem/FileTime.java
new file mode 100644
index 0000000000..cf0f30fde9
--- /dev/null
+++ b/app/src/main/java/com/termux/app/file/filesystem/FileTime.java
@@ -0,0 +1,156 @@
+/*
+ * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.termux.app.file.filesystem;
+
+import androidx.annotation.NonNull;
+
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Objects;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Represents the value of a file's time stamp attribute. For example, it may
+ * represent the time that the file was last
+ * {@link FileAttributes#lastModifiedTime() modified},
+ * {@link FileAttributes#lastAccessTime() accessed},
+ * or {@link FileAttributes#creationTime() created}.
+ *
+ * <p> Instances of this class are immutable.
+ *
+ * https://cs.android.com/android/platform/superproject/+/android-11.0.0_r3:libcore/ojluni/src/main/java/java/nio/file/attribute/FileTime.java
+ *
+ * @since 1.7
+ * @see java.nio.file.Files#setLastModifiedTime
+ * @see java.nio.file.Files#getLastModifiedTime
+ */
+
+public final class FileTime {
+    /**
+     * The unit of granularity to interpret the value. Null if
+     * this {@code FileTime} is converted from an {@code Instant},
+     * the {@code value} and {@code unit} pair will not be used
+     * in this scenario.
+     */
+    private final TimeUnit unit;
+
+    /**
+     * The value since the epoch; can be negative.
+     */
+    private final long value;
+    
+
+    /**
+     * The value return by toString (created lazily)
+     */
+    private String valueAsString;
+
+    /**
+     * Initializes a new instance of this class.
+     */
+    private FileTime(long value, TimeUnit unit) {
+        this.value = value;
+        this.unit = unit;
+    }
+
+    /**
+     * Returns a {@code FileTime} representing a value at the given unit of
+     * granularity.
+     *
+     * @param   value
+     *          the value since the epoch (1970-01-01T00:00:00Z); can be
+     *          negative
+     * @param   unit
+     *          the unit of granularity to interpret the value
+     *
+     * @return  a {@code FileTime} representing the given value
+     */
+    public static FileTime from(long value, @NonNull TimeUnit unit) {
+        Objects.requireNonNull(unit, "unit");
+        return new FileTime(value, unit);
+    }
+
+    /**
+     * Returns a {@code FileTime} representing the given value in milliseconds.
+     *
+     * @param   value
+     *          the value, in milliseconds, since the epoch
+     *          (1970-01-01T00:00:00Z); can be negative
+     *
+     * @return  a {@code FileTime} representing the given value
+     */
+    public static FileTime fromMillis(long value) {
+        return new FileTime(value, TimeUnit.MILLISECONDS);
+    }
+
+    /**
+     * Returns the value at the given unit of granularity.
+     *
+     * <p> Conversion from a coarser granularity that would numerically overflow
+     * saturate to {@code Long.MIN_VALUE} if negative or {@code Long.MAX_VALUE}
+     * if positive.
+     *
+     * @param   unit
+     *          the unit of granularity for the return value
+     *
+     * @return  value in the given unit of granularity, since the epoch
+     *          since the epoch (1970-01-01T00:00:00Z); can be negative
+     */
+    public long to(TimeUnit unit) {
+        Objects.requireNonNull(unit, "unit");
+        return unit.convert(this.value, this.unit);
+    }
+
+    /**
+     * Returns the value in milliseconds.
+     *
+     * <p> Conversion from a coarser granularity that would numerically overflow
+     * saturate to {@code Long.MIN_VALUE} if negative or {@code Long.MAX_VALUE}
+     * if positive.
+     *
+     * @return  the value in milliseconds, since the epoch (1970-01-01T00:00:00Z)
+     */
+    public long toMillis() {
+        return unit.toMillis(value);
+    }
+
+    @NonNull
+    @Override
+    public String toString() {
+        return getDate(toMillis(), "yyyy.MM.dd HH:mm:ss.SSS z");
+    }
+
+    public static String getDate(long milliSeconds, String format) {
+        try {
+            Calendar calendar = Calendar.getInstance();
+            calendar.setTimeInMillis(milliSeconds);
+            return new SimpleDateFormat(format).format(calendar.getTime());
+        } catch(Exception e) {
+            return Long.toString(milliSeconds);
+        }
+    }
+
+}
diff --git a/app/src/main/java/com/termux/app/file/filesystem/FileType.java b/app/src/main/java/com/termux/app/file/filesystem/FileType.java
new file mode 100644
index 0000000000..2378456b38
--- /dev/null
+++ b/app/src/main/java/com/termux/app/file/filesystem/FileType.java
@@ -0,0 +1,31 @@
+package com.termux.app.file.filesystem;
+
+/** The {@link Enum} that defines file types. */
+public enum FileType {
+
+    NO_EXIST("no exist", 0),    // 0000000
+    REGULAR("regular", 1),      // 0000001
+    DIRECTORY("directory", 2),  // 0000010
+    SYMLINK("symlink", 4),      // 0000100
+    CHARACTER("character", 8),  // 0001000
+    FIFO("fifo", 16),           // 0010000
+    BLOCK("block", 32),         // 0100000
+    UNKNOWN("unknown", 64);     // 1000000
+
+    private final String name;
+    private final int value;
+
+    FileType(final String name, final int value) {
+        this.name = name;
+        this.value = value;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public int getValue() {
+        return value;
+    }
+
+}
diff --git a/app/src/main/java/com/termux/app/file/filesystem/FileTypes.java b/app/src/main/java/com/termux/app/file/filesystem/FileTypes.java
new file mode 100644
index 0000000000..6f7507157e
--- /dev/null
+++ b/app/src/main/java/com/termux/app/file/filesystem/FileTypes.java
@@ -0,0 +1,116 @@
+package com.termux.app.file.filesystem;
+
+import android.system.Os;
+
+import androidx.annotation.NonNull;
+
+import com.termux.app.utils.Logger;
+
+import java.io.File;
+
+public class FileTypes {
+
+    /** Flags to represent regular, directory and symlink file types defined by {@link FileType} */
+    public static final int FILE_TYPE_NORMAL_FLAGS = FileType.REGULAR.getValue() | FileType.DIRECTORY.getValue() | FileType.SYMLINK.getValue();
+
+    /** Flags to represent any file type defined by {@link FileType} */
+    public static final int FILE_TYPE_ANY_FLAGS = Integer.MAX_VALUE; // 1111111111111111111111111111111 (31 1's)
+
+    public static String convertFileTypeFlagsToNamesString(int fileTypeFlags) {
+        StringBuilder fileTypeFlagsStringBuilder = new StringBuilder();
+
+        FileType[] fileTypes = {FileType.REGULAR, FileType.DIRECTORY, FileType.SYMLINK, FileType.CHARACTER, FileType.FIFO, FileType.BLOCK, FileType.UNKNOWN};
+        for (FileType fileType : fileTypes) {
+            if ((fileTypeFlags & fileType.getValue()) > 0)
+                fileTypeFlagsStringBuilder.append(fileType.getName()).append(",");
+        }
+
+        String fileTypeFlagsString = fileTypeFlagsStringBuilder.toString();
+
+        if (fileTypeFlagsString.endsWith(","))
+            fileTypeFlagsString = fileTypeFlagsString.substring(0, fileTypeFlagsString.lastIndexOf(","));
+
+        return fileTypeFlagsString;
+    }
+
+    /**
+     * Checks the type of file that exists at {@code filePath}.
+     *
+     * Returns:
+     * - {@link FileType#NO_EXIST} if {@code filePath} is {@code null}, empty, an exception is raised
+     *      or no file exists at {@code filePath}.
+     * - {@link FileType#REGULAR} if file at {@code filePath} is a regular file.
+     * - {@link FileType#DIRECTORY} if file at {@code filePath} is a directory file.
+     * - {@link FileType#SYMLINK} if file at {@code filePath} is a symlink file and {@code followLinks} is {@code false}.
+     * - {@link FileType#CHARACTER} if file at {@code filePath} is a character special file.
+     * - {@link FileType#FIFO} if file at {@code filePath} is a fifo special file.
+     * - {@link FileType#BLOCK} if file at {@code filePath} is a block special file.
+     * - {@link FileType#UNKNOWN} if file at {@code filePath} is of unknown type.
+     *
+     * The {@link File#isFile()} and {@link File#isDirectory()} uses {@link Os#stat(String)} system
+     * call (not {@link Os#lstat(String)}) to check file type and does follow symlinks.
+     *
+     * The {@link File#exists()} uses {@link Os#access(String, int)} system call to check if file is
+     * accessible and does not follow symlinks. However, it returns {@code false} for dangling symlinks,
+     * on android at least. Check https://stackoverflow.com/a/57747064/14686958
+     *
+     * Basically {@link File} API is not reliable to check for symlinks.
+     *
+     * So we get the file type directly with {@link Os#lstat(String)} if {@code followLinks} is
+     * {@code false} and {@link Os#stat(String)} if {@code followLinks} is {@code true}. All exceptions
+     * are assumed as non-existence.
+     *
+     * The {@link org.apache.commons.io.FileUtils#isSymlink(File)} can also be used for checking
+     * symlinks but {@link FileAttributes} will provide access to more attributes if necessary,
+     * including getting other special file types considering that {@link File#exists()} can't be
+     * used to reliably check for non-existence and exclude the other 3 file types. commons.io is
+     * also not compatible with android < 8 for many things.
+     *
+     * https://cs.android.com/android/platform/superproject/+/android-11.0.0_r3:libcore/ojluni/src/main/java/java/io/File.java;l=793
+     * https://cs.android.com/android/platform/superproject/+/android-11.0.0_r3:libcore/ojluni/src/main/java/java/io/UnixFileSystem.java;l=248
+     * https://cs.android.com/android/platform/superproject/+/android-11.0.0_r3:libcore/ojluni/src/main/native/UnixFileSystem_md.c;l=121
+     * https://cs.android.com/android/_/android/platform/libcore/+/001ac51d61ad7443ba518bf2cf7e086efe698c6d
+     * https://cs.android.com/android/platform/superproject/+/android-11.0.0_r3:libcore/luni/src/main/java/libcore/io/Os.java;l=51
+     * https://cs.android.com/android/platform/superproject/+/android-11.0.0_r3:libcore/luni/src/main/java/libcore/io/Libcore.java;l=45
+     * https://cs.android.com/android/platform/superproject/+/master:frameworks/base/core/java/android/app/ActivityThread.java;l=7530
+     *
+     * @param filePath The {@code path} for file to check.
+     * @param followLinks The {@code boolean} that decides if symlinks will be followed while
+     *                       finding type. If set to {@code true}, then type of symlink target will
+     *                       be returned if file at {@code filePath} is a symlink. If set to
+     *                       {@code false}, then type of file at {@code filePath} itself will be
+     *                       returned.
+     * @return Returns the {@link FileType} of file.
+     */
+    public static FileType getFileType(final String filePath, final boolean followLinks) {
+        if (filePath == null || filePath.isEmpty()) return FileType.NO_EXIST;
+
+        try {
+            FileAttributes fileAttributes = FileAttributes.get(filePath, followLinks);
+            return getFileType(fileAttributes);
+        } catch (Exception e) {
+            // If not a ENOENT (No such file or directory) exception
+            if(!e.getMessage().contains("ENOENT"))
+                Logger.logError("Failed to get file type for file at path \"" + filePath + "\": " + e.getMessage());
+            return FileType.NO_EXIST;
+        }
+    }
+
+    public static FileType getFileType(@NonNull final FileAttributes fileAttributes) {
+        if (fileAttributes.isRegularFile())
+            return FileType.REGULAR;
+        else if (fileAttributes.isDirectory())
+            return FileType.DIRECTORY;
+        else if (fileAttributes.isSymbolicLink())
+            return FileType.SYMLINK;
+        else if (fileAttributes.isCharacter())
+            return FileType.CHARACTER;
+        else if (fileAttributes.isFifo())
+            return FileType.FIFO;
+        else if (fileAttributes.isBlock())
+            return FileType.BLOCK;
+        else
+            return FileType.UNKNOWN;
+    }
+
+}
diff --git a/app/src/main/java/com/termux/app/file/filesystem/NativeDispatcher.java b/app/src/main/java/com/termux/app/file/filesystem/NativeDispatcher.java
new file mode 100644
index 0000000000..d4495373fd
--- /dev/null
+++ b/app/src/main/java/com/termux/app/file/filesystem/NativeDispatcher.java
@@ -0,0 +1,58 @@
+package com.termux.app.file.filesystem;
+
+import android.system.ErrnoException;
+import android.system.Os;
+
+import java.io.File;
+import java.io.FileDescriptor;
+import java.io.IOException;
+
+public class NativeDispatcher {
+
+    public static void stat(String filePath, FileAttributes fileAttributes) throws IOException {
+        validateFileExistence(filePath);
+
+        try {
+            fileAttributes.loadFromStructStat(Os.stat(filePath));
+        } catch (ErrnoException e) {
+            throw new IOException("Failed to run Os.stat() on file at path \"" + filePath + "\": " + e.getMessage());
+        }
+    }
+
+    public static void lstat(String filePath, FileAttributes fileAttributes) throws IOException {
+        validateFileExistence(filePath);
+
+        try {
+            fileAttributes.loadFromStructStat(Os.lstat(filePath));
+        } catch (ErrnoException e) {
+            throw new IOException("Failed to run Os.lstat() on file at path \"" + filePath + "\": " + e.getMessage());
+        }
+    }
+
+    public static void fstat(FileDescriptor fileDescriptor, FileAttributes fileAttributes) throws IOException {
+        validateFileDescriptor(fileDescriptor);
+
+        try {
+            fileAttributes.loadFromStructStat(Os.fstat(fileDescriptor));
+        } catch (ErrnoException e) {
+            throw new IOException("Failed to run Os.fstat() on file descriptor \"" + fileDescriptor.toString() + "\": " + e.getMessage());
+        }
+    }
+
+    public static void validateFileExistence(String filePath) throws IOException {
+        if (filePath == null || filePath.isEmpty()) throw new IOException("The path is null or empty");
+
+        File file = new File(filePath);
+
+        //if(!file.exists())
+        //    throw new IOException("No such file or directory: \"" + filePath + "\"");
+    }
+
+    public static void validateFileDescriptor(FileDescriptor fileDescriptor) throws IOException {
+        if (fileDescriptor == null) throw new IOException("The file descriptor is null");
+
+        if(!fileDescriptor.valid())
+            throw new IOException("No such file descriptor: \"" + fileDescriptor.toString() + "\"");
+    }
+
+}
diff --git a/app/src/main/java/com/termux/app/file/filesystem/UnixConstants.java b/app/src/main/java/com/termux/app/file/filesystem/UnixConstants.java
new file mode 100644
index 0000000000..0cc7a79dae
--- /dev/null
+++ b/app/src/main/java/com/termux/app/file/filesystem/UnixConstants.java
@@ -0,0 +1,149 @@
+
+/*
+ * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+// AUTOMATICALLY GENERATED FILE - DO NOT EDIT
+package com.termux.app.file.filesystem;
+
+// BEGIN Android-changed: Use constants from android.system.OsConstants. http://b/32203242
+// Those constants are initialized by native code to ensure correctness on different architectures.
+// AT_SYMLINK_NOFOLLOW (used by fstatat) and AT_REMOVEDIR (used by unlinkat) as of July 2018 do not
+// have equivalents in android.system.OsConstants so left unchanged.
+import android.system.OsConstants;
+
+/**
+ * https://cs.android.com/android/platform/superproject/+/android-11.0.0_r3:libcore/ojluni/src/main/java/sun/nio/fs/UnixConstants.java
+ */
+public class UnixConstants {
+    private UnixConstants() { }
+
+    static final int O_RDONLY = OsConstants.O_RDONLY;
+
+    static final int O_WRONLY = OsConstants.O_WRONLY;
+
+    static final int O_RDWR = OsConstants.O_RDWR;
+
+    static final int O_APPEND = OsConstants.O_APPEND;
+
+    static final int O_CREAT = OsConstants.O_CREAT;
+
+    static final int O_EXCL = OsConstants.O_EXCL;
+
+    static final int O_TRUNC = OsConstants.O_TRUNC;
+
+    static final int O_SYNC = OsConstants.O_SYNC;
+
+    static final int O_DSYNC = OsConstants.O_DSYNC;
+
+    static final int O_NOFOLLOW = OsConstants.O_NOFOLLOW;
+
+    static final int S_IAMB = get_S_IAMB();
+
+    static final int S_IRUSR = OsConstants.S_IRUSR;
+
+    static final int S_IWUSR = OsConstants.S_IWUSR;
+
+    static final int S_IXUSR = OsConstants.S_IXUSR;
+
+    static final int S_IRGRP = OsConstants.S_IRGRP;
+
+    static final int S_IWGRP = OsConstants.S_IWGRP;
+
+    static final int S_IXGRP = OsConstants.S_IXGRP;
+
+    static final int S_IROTH = OsConstants.S_IROTH;
+
+    static final int S_IWOTH = OsConstants.S_IWOTH;
+
+    static final int S_IXOTH = OsConstants.S_IXOTH;
+
+    static final int S_IFMT = OsConstants.S_IFMT;
+
+    static final int S_IFREG = OsConstants.S_IFREG;
+
+    static final int S_IFDIR = OsConstants.S_IFDIR;
+
+    static final int S_IFLNK = OsConstants.S_IFLNK;
+
+    static final int S_IFCHR = OsConstants.S_IFCHR;
+
+    static final int S_IFBLK = OsConstants.S_IFBLK;
+
+    static final int S_IFIFO = OsConstants.S_IFIFO;
+
+    static final int R_OK = OsConstants.R_OK;
+
+    static final int W_OK = OsConstants.W_OK;
+
+    static final int X_OK = OsConstants.X_OK;
+
+    static final int F_OK = OsConstants.F_OK;
+
+    static final int ENOENT = OsConstants.ENOENT;
+
+    static final int EACCES = OsConstants.EACCES;
+
+    static final int EEXIST = OsConstants.EEXIST;
+
+    static final int ENOTDIR = OsConstants.ENOTDIR;
+
+    static final int EINVAL = OsConstants.EINVAL;
+
+    static final int EXDEV = OsConstants.EXDEV;
+
+    static final int EISDIR = OsConstants.EISDIR;
+
+    static final int ENOTEMPTY = OsConstants.ENOTEMPTY;
+
+    static final int ENOSPC = OsConstants.ENOSPC;
+
+    static final int EAGAIN = OsConstants.EAGAIN;
+
+    static final int ENOSYS = OsConstants.ENOSYS;
+
+    static final int ELOOP = OsConstants.ELOOP;
+
+    static final int EROFS = OsConstants.EROFS;
+
+    static final int ENODATA = OsConstants.ENODATA;
+
+    static final int ERANGE = OsConstants.ERANGE;
+
+    static final int EMFILE = OsConstants.EMFILE;
+
+    // S_IAMB are access mode bits, therefore, calculated by taking OR of all the read, write and
+    // execute permissions bits for owner, group and other.
+    private static int get_S_IAMB() {
+        return (OsConstants.S_IRUSR | OsConstants.S_IWUSR | OsConstants.S_IXUSR |
+            OsConstants.S_IRGRP | OsConstants.S_IWGRP | OsConstants.S_IXGRP |
+            OsConstants.S_IROTH | OsConstants.S_IWOTH | OsConstants.S_IXOTH);
+    }
+    // END Android-changed: Use constants from android.system.OsConstants. http://b/32203242
+
+
+    static final int AT_SYMLINK_NOFOLLOW = 0x100;
+    static final int AT_REMOVEDIR = 0x200;
+}
diff --git a/app/src/main/java/com/termux/app/file/tests/FileUtilsTests.java b/app/src/main/java/com/termux/app/file/tests/FileUtilsTests.java
new file mode 100644
index 0000000000..21db1d57db
--- /dev/null
+++ b/app/src/main/java/com/termux/app/file/tests/FileUtilsTests.java
@@ -0,0 +1,301 @@
+package com.termux.app.file.tests;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+
+import com.termux.app.TermuxConstants;
+import com.termux.app.file.FileUtils;
+import com.termux.app.utils.Logger;
+
+import java.io.File;
+import java.nio.charset.Charset;
+
+public class FileUtilsTests {
+
+    private static final String LOG_TAG = "FileUtilsTests";
+
+    /**
+     * Run basic tests for {@link FileUtils} class.
+     *
+     * Move tests need to be written, specially for failures.
+     *
+     * The log level must be set to verbose.
+     *
+     * Run at app startup like in an activity
+     * FileUtilsTests.runTests(this, TermuxConstants.TERMUX_HOME_DIR_PATH + "/FileUtilsTests");
+     *
+     * @param context The {@link Context} for operations.
+     */
+    public static void runTests(@NonNull final Context context, @NonNull final String testRootDirectoryPath) {
+        try {
+            Logger.logInfo(LOG_TAG, "Running tests");
+            Logger.logInfo(LOG_TAG, "testRootDirectoryPath: \"" + testRootDirectoryPath + "\"");
+
+            String fileUtilsTestsDirectoryCanonicalPath = FileUtils.getCanonicalPath(testRootDirectoryPath, null, false);
+            assertEqual("FileUtilsTests directory path is not a canonical path", testRootDirectoryPath, fileUtilsTestsDirectoryCanonicalPath);
+
+            runTestsInner(context, testRootDirectoryPath);
+            Logger.logInfo(LOG_TAG, "All tests successful");
+        } catch (Exception e) {
+            Logger.logErrorAndShowToast(context, LOG_TAG, e.getMessage());
+        }
+    }
+
+    private static void runTestsInner(@NonNull final Context context, @NonNull final String testRootDirectoryPath) throws Exception {
+        String errmsg;
+        String label;
+        String path;
+
+        /*
+         * - dir1
+         *  - sub_dir1
+         *  - sub_reg1
+         *  - sub_sym1 (absolute symlink to dir2)
+         *  - sub_sym2 (copy of sub_sym1 for symlink to dir2)
+         *  - sub_sym3 (relative symlink to dir4)
+         * - dir2
+         *  - sub_reg1
+         *  - sub_reg2 (copy of dir2/sub_reg1)
+         * - dir3 (copy of dir1)
+         * - dir4 (moved from dir3)
+         */
+
+        String dir1_label = "dir1";
+        String dir1_path = testRootDirectoryPath + "/dir1";
+
+        String dir1__sub_dir1_label = "dir1/sub_dir1";
+        String dir1__sub_dir1_path = dir1_path + "/sub_dir1";
+
+        String dir1__sub_reg1_label = "dir1/sub_reg1";
+        String dir1__sub_reg1_path = dir1_path + "/sub_reg1";
+
+        String dir1__sub_sym1_label = "dir1/sub_sym1";
+        String dir1__sub_sym1_path = dir1_path + "/sub_sym1";
+
+        String dir1__sub_sym2_label = "dir1/sub_sym2";
+        String dir1__sub_sym2_path = dir1_path + "/sub_sym2";
+
+        String dir1__sub_sym3_label = "dir1/sub_sym3";
+        String dir1__sub_sym3_path = dir1_path + "/sub_sym3";
+
+
+        String dir2_label = "dir2";
+        String dir2_path = testRootDirectoryPath + "/dir2";
+
+        String dir2__sub_reg1_label = "dir2/sub_reg1";
+        String dir2__sub_reg1_path = dir2_path + "/sub_reg1";
+
+        String dir2__sub_reg2_label = "dir2/sub_reg2";
+        String dir2__sub_reg2_path = dir2_path + "/sub_reg2";
+
+
+        String dir3_label = "dir3";
+        String dir3_path = testRootDirectoryPath + "/dir3";
+
+        String dir4_label = "dir4";
+        String dir4_path = testRootDirectoryPath + "/dir4";
+
+
+
+
+
+        // Create or clear test root directory file
+        label = "testRootDirectoryPath";
+        errmsg = FileUtils.clearDirectory(context, label, testRootDirectoryPath);
+        assertEqual("Failed to create " + label + " directory file", null, errmsg);
+
+        if(!FileUtils.directoryFileExists(testRootDirectoryPath, false))
+            throwException("The " + label + " directory file does not exist as expected after creation");
+
+
+        // Create dir1 directory file
+        errmsg = FileUtils.createDirectoryFile(context, dir1_label, dir1_path);
+        assertEqual("Failed to create " + dir1_label + " directory file", null, errmsg);
+
+        // Create dir2 directory file
+        errmsg = FileUtils.createDirectoryFile(context, dir2_label, dir2_path);
+        assertEqual("Failed to create " + dir2_label + " directory file", null, errmsg);
+
+
+
+
+
+        // Create dir1/sub_dir1 directory file
+        label = dir1__sub_dir1_label; path = dir1__sub_dir1_path;
+        errmsg = FileUtils.createDirectoryFile(context, label, path);
+        assertEqual("Failed to create " + label + " directory file", null, errmsg);
+        if(!FileUtils.directoryFileExists(path, false))
+            throwException("The " + label + " directory file does not exist as expected after creation");
+
+        // Create dir1/sub_reg1 regular file
+        label = dir1__sub_reg1_label; path = dir1__sub_reg1_path;
+        errmsg = FileUtils.createRegularFile(context, label, path);
+        assertEqual("Failed to create " + label + " regular file", null, errmsg);
+        if(!FileUtils.regularFileExists(path, false))
+            throwException("The " + label + " regular file does not exist as expected after creation");
+
+        // Create dir1/sub_sym1 -> dir2 absolute symlink file
+        label = dir1__sub_sym1_label; path = dir1__sub_sym1_path;
+        errmsg = FileUtils.createSymlinkFile(context, label, dir2_path, path);
+        assertEqual("Failed to create " + label + " symlink file", null, errmsg);
+        if(!FileUtils.symlinkFileExists(path))
+            throwException("The " + label + " symlink file does not exist as expected after creation");
+
+        // Copy dir1/sub_sym1 symlink file to dir1/sub_sym2
+        label = dir1__sub_sym2_label; path = dir1__sub_sym2_path;
+        errmsg = FileUtils.copySymlinkFile(context, label, dir1__sub_sym1_path, path, false);
+        assertEqual("Failed to copy " + dir1__sub_sym1_label + " symlink file to " + label, null, errmsg);
+        if(!FileUtils.symlinkFileExists(path))
+            throwException("The " + label + " symlink file does not exist as expected after copying it from " + dir1__sub_sym1_label);
+        if(!new File(path).getCanonicalPath().equals(dir2_path))
+            throwException("The " + label + " symlink file does not point to " + dir2_label);
+
+
+
+
+
+        // Write "line1" to dir2/sub_reg1 regular file
+        label = dir2__sub_reg1_label; path = dir2__sub_reg1_path;
+        errmsg = FileUtils.writeStringToFile(context, label, path, Charset.defaultCharset(), "line1", false);
+        assertEqual("Failed to write string to " + label + " file with append mode false", null, errmsg);
+        if(!FileUtils.regularFileExists(path, false))
+            throwException("The " + label + " file does not exist as expected after writing to it with append mode false");
+
+        // Write "line2" to dir2/sub_reg1 regular file
+        errmsg = FileUtils.writeStringToFile(context, label, path, Charset.defaultCharset(), "\nline2", true);
+        assertEqual("Failed to write string to " + label + " file with append mode true", null, errmsg);
+
+        // Read dir2/sub_reg1 regular file
+        StringBuilder dataStringBuilder = new StringBuilder();
+        errmsg = FileUtils.readStringFromFile(context, label, path, Charset.defaultCharset(), dataStringBuilder, false);
+        assertEqual("Failed to read from " + label + " file", null, errmsg);
+        assertEqual("The data read from " + label + " file in not as expected", "line1\nline2", dataStringBuilder.toString());
+
+        // Copy dir2/sub_reg1 regular file to dir2/sub_reg2 file
+        label = dir2__sub_reg2_label; path = dir2__sub_reg2_path;
+        errmsg = FileUtils.copyRegularFile(context, label, dir2__sub_reg1_path, path, false);
+        assertEqual("Failed to copy " + dir2__sub_reg1_label + " regular file to " + label, null, errmsg);
+        if(!FileUtils.regularFileExists(path, false))
+            throwException("The " + label + " regular file does not exist as expected after copying it from " + dir2__sub_reg1_label);
+
+
+
+
+
+        // Copy dir1 directory file to dir3
+        label = dir3_label; path = dir3_path;
+        errmsg = FileUtils.copyDirectoryFile(context, label, dir2_path, path, false);
+        assertEqual("Failed to copy " + dir2_label + " directory file to " + label, null, errmsg);
+        if(!FileUtils.directoryFileExists(path, false))
+            throwException("The " + label + " directory file does not exist as expected after copying it from " + dir2_label);
+
+        // Copy dir1 directory file to dir3 again to test overwrite
+        label = dir3_label; path = dir3_path;
+        errmsg = FileUtils.copyDirectoryFile(context, label, dir2_path, path, false);
+        assertEqual("Failed to copy " + dir2_label + " directory file to " + label, null, errmsg);
+        if(!FileUtils.directoryFileExists(path, false))
+            throwException("The " + label + " directory file does not exist as expected after copying it from " + dir2_label);
+
+        // Move dir3 directory file to dir4
+        label = dir4_label; path = dir4_path;
+        errmsg = FileUtils.moveDirectoryFile(context, label, dir3_path, path, false);
+        assertEqual("Failed to move " + dir3_label + " directory file to " + label, null, errmsg);
+        if(!FileUtils.directoryFileExists(path, false))
+            throwException("The " + label + " directory file does not exist as expected after copying it from " + dir3_label);
+
+
+
+
+
+        // Create dir1/sub_sym3 -> dir4 relative symlink file
+        label = dir1__sub_sym3_label; path = dir1__sub_sym3_path;
+        errmsg = FileUtils.createSymlinkFile(context, label, "../dir4", path);
+        assertEqual("Failed to create " + label + " symlink file", null, errmsg);
+        if(!FileUtils.symlinkFileExists(path))
+            throwException("The " + label + " symlink file does not exist as expected after creation");
+
+        // Create dir1/sub_sym3 -> dirX relative dangling symlink file
+        // This is to ensure that symlinkFileExists returns true if a symlink file exists but is dangling
+        label = dir1__sub_sym3_label; path = dir1__sub_sym3_path;
+        errmsg = FileUtils.createSymlinkFile(context, label, "../dirX", path);
+        assertEqual("Failed to create " + label + " symlink file", null, errmsg);
+        if(!FileUtils.symlinkFileExists(path))
+            throwException("The " + label + " dangling symlink file does not exist as expected after creation");
+
+
+
+
+
+        // Delete dir1/sub_sym2 symlink file
+        label = dir1__sub_sym2_label; path = dir1__sub_sym2_path;
+        errmsg = FileUtils.deleteSymlinkFile(context, label, path, false);
+        assertEqual("Failed to delete " + label + " symlink file", null, errmsg);
+        if(FileUtils.fileExists(path, false))
+            throwException("The " + label + " symlink file still exist after deletion");
+
+        // Check if dir2 directory file still exists after deletion of dir1/sub_sym2 since it was a symlink to dir2
+        // When deleting a symlink file, its target must not be deleted
+        label = dir2_label; path = dir2_path;
+        if(!FileUtils.directoryFileExists(path, false))
+            throwException("The " + label + " directory file has unexpectedly been deleted after deletion of " + dir1__sub_sym2_label);
+
+
+
+
+
+        // Delete dir1 directory file
+        label = dir1_label; path = dir1_path;
+        errmsg = FileUtils.deleteDirectoryFile(context, label, path, false);
+        assertEqual("Failed to delete " + label + " directory file", null, errmsg);
+        if(FileUtils.fileExists(path, false))
+            throwException("The " + label + " directory file still exist after deletion");
+
+
+        // Check if dir2 directory file and dir2/sub_reg1 regular file still exist after deletion of
+        // dir1 since there was a dir1/sub_sym1 symlink to dir2 in it
+        // When deleting a directory, any targets of symlinks must not be deleted when deleting symlink files
+        label = dir2_label; path = dir2_path;
+        if(!FileUtils.directoryFileExists(path, false))
+            throwException("The " + label + " directory file has unexpectedly been deleted after deletion of " + dir1_label);
+        label = dir2__sub_reg1_label; path = dir2__sub_reg1_path;
+        if(!FileUtils.fileExists(path, false))
+            throwException("The " + label + " regular file has unexpectedly been deleted after deletion of " + dir1_label);
+
+
+
+
+
+        // Delete dir2/sub_reg1 regular file
+        label = dir2__sub_reg1_label; path = dir2__sub_reg1_path;
+        errmsg = FileUtils.deleteRegularFile(context, label, path, false);
+        assertEqual("Failed to delete " + label + " regular file", null, errmsg);
+        if(FileUtils.fileExists(path, false))
+            throwException("The " + label + " regular file still exist after deletion");
+
+        FileUtils.getFileType("/dev/ptmx", false);
+        FileUtils.getFileType("/dev/null", false);
+    }
+
+    public static void assertEqual(@NonNull final String message, final String expected, final String actual) throws Exception {
+        if (!equalsRegardingNull(expected, actual))
+            throwException(message + "\nexpected: \"" + expected + "\"\nactual: \"" + actual + "\"");
+    }
+
+    private static boolean equalsRegardingNull(final String expected, final String actual) {
+        if (expected == null) {
+            return actual == null;
+        }
+
+        return isEquals(expected, actual);
+    }
+
+    private static boolean isEquals(String expected, String actual) {
+        return expected.equals(actual);
+    }
+
+    public static void throwException(@NonNull final String message) throws Exception {
+            throw new Exception(message);
+    }
+
+}
diff --git a/app/src/main/java/com/termux/app/utils/FileUtils.java b/app/src/main/java/com/termux/app/utils/FileUtils.java
deleted file mode 100644
index 194e37f920..0000000000
--- a/app/src/main/java/com/termux/app/utils/FileUtils.java
+++ /dev/null
@@ -1,376 +0,0 @@
-package com.termux.app.utils;
-
-import android.content.Context;
-
-import com.termux.R;
-import com.termux.app.TermuxConstants;
-
-import java.io.File;
-import java.util.regex.Pattern;
-
-public class FileUtils {
-
-    private static final String LOG_TAG = "FileUtils";
-
-    /**
-     * Replace "$PREFIX/" or "~/" prefix with termux absolute paths.
-     *
-     * @param path The {@code path} to expand.
-     * @return Returns the {@code expand path}.
-     */
-    public static String getExpandedTermuxPath(String path) {
-        if(path != null && !path.isEmpty()) {
-            path = path.replaceAll("^\\$PREFIX$", TermuxConstants.TERMUX_PREFIX_DIR_PATH);
-            path = path.replaceAll("^\\$PREFIX/", TermuxConstants.TERMUX_PREFIX_DIR_PATH + "/");
-            path = path.replaceAll("^~/$", TermuxConstants.TERMUX_HOME_DIR_PATH);
-            path = path.replaceAll("^~/", TermuxConstants.TERMUX_HOME_DIR_PATH + "/");
-        }
-
-        return path;
-    }
-
-    /**
-     * Replace termux absolute paths with "$PREFIX/" or "~/" prefix.
-     *
-     * @param path The {@code path} to unexpand.
-     * @return Returns the {@code unexpand path}.
-     */
-    public static String getUnExpandedTermuxPath(String path) {
-        if(path != null && !path.isEmpty()) {
-            path = path.replaceAll("^" + Pattern.quote(TermuxConstants.TERMUX_PREFIX_DIR_PATH) + "/", "\\$PREFIX/");
-            path = path.replaceAll("^" + Pattern.quote(TermuxConstants.TERMUX_HOME_DIR_PATH) + "/", "~/");
-        }
-
-        return path;
-    }
-
-    /**
-     * If {@code expandPath} is enabled, then input path is first attempted to be expanded by calling
-     * {@link #getExpandedTermuxPath(String)}.
-     *
-     * Then if path is already an absolute path, then it is used as is to get canonical path.
-     * If path is not an absolute path and {code prefixForNonAbsolutePath} is not {@code null}, then
-     * {code prefixForNonAbsolutePath} + "/" is prefixed before path before getting canonical path.
-     * If path is not an absolute path and {code prefixForNonAbsolutePath} is {@code null}, then
-     * "/" is prefixed before path before getting canonical path.
-     *
-     * If an exception is raised to get the canonical path, then absolute path is returned.
-     *
-     * @param path The {@code path} to convert.
-     * @param prefixForNonAbsolutePath Optional prefix path to prefix before non-absolute paths. This
-     *                                 can be set to {@code null} if non-absolute paths should
-     *                                 be prefixed with "/". The call to {@link File#getCanonicalPath()}
-     *                                 will automatically do this anyways.
-     * @return Returns the {@code canonical path}.
-     */
-    public static String getCanonicalPath(String path, String prefixForNonAbsolutePath, boolean expandPath) {
-        if (path == null) path = "";
-
-        if(expandPath)
-            path = getExpandedTermuxPath(path);
-
-        String absolutePath;
-
-        // If path is already an absolute path
-        if (path.startsWith("/") ) {
-            absolutePath = path;
-        } else {
-            if (prefixForNonAbsolutePath != null)
-                absolutePath = prefixForNonAbsolutePath + "/" + path;
-            else
-                absolutePath = "/" + path;
-        }
-
-        try {
-            return new File(absolutePath).getCanonicalPath();
-        } catch(Exception e) {
-        }
-
-        return absolutePath;
-    }
-
-    /**
-     * Removes one or more forward slashes "//" with single slash "/"
-     * Removes "./"
-     * Removes trailing forward slash "/"
-     *
-     * @param path The {@code path} to convert.
-     * @return Returns the {@code normalized path}.
-     */
-    public static String normalizePath(String path) {
-        if (path == null) return null;
-
-        path = path.replaceAll("/+", "/");
-        path = path.replaceAll("\\./", "");
-
-        if (path.endsWith("/")) {
-            path = path.substring(0, path.length() - 1);
-        }
-
-        return path;
-    }
-
-    /**
-     * Determines whether path is in {@code dirPath}.
-     *
-     * @param path The {@code path} to check.
-     * @param dirPath The {@code directory path} to check in.
-     * @param ensureUnder If set to {@code true}, then it will be ensured that {@code path} is
-     *                    under the directory and does not equal it.
-     * @return Returns {@code true} if path in {@code dirPath}, otherwise returns {@code false}.
-     */
-    public static boolean isPathInDirPath(String path, String dirPath, boolean ensureUnder) {
-        if (path == null || dirPath == null) return false;
-
-        try {
-            path = new File(path).getCanonicalPath();
-        } catch(Exception e) {
-            return false;
-        }
-
-        String normalizedDirPath = normalizePath(dirPath);
-
-        if(ensureUnder)
-            return !path.equals(normalizedDirPath) && path.startsWith(normalizedDirPath + "/");
-        else
-            return path.startsWith(normalizedDirPath + "/");
-    }
-
-    /**
-     * Validate the existence and permissions of regular file at path.
-     *
-     * If the {@code parentDirPath} is not {@code null}, then setting of missing permissions will
-     * only be done if {@code path} is under {@code parentDirPath}.
-     *
-     * @param context The {@link Context} to get error string.
-     * @param path The {@code path} for file to validate.
-     * @param parentDirPath The optional {@code parent directory path} to restrict operations to.
-     *                      This can optionally be {@code null}.
-     * @param permissionsToCheck The 3 character string that contains the "r", "w", "x" or "-" in-order.
-     * @param setMissingPermissions The {@code boolean} that decides if missing permissions are to be
-     *                              automatically set.
-     * @param ignoreErrorsIfPathIsUnderParentDirPath The {@code boolean} that decides if permission
-     *                                               errors are to be ignored if path is under
-     *                                               {@code parentDirPath}.
-     * @return Returns the {@code errmsg} if path is not a regular file, or validating permissions
-     * failed, otherwise {@code null}.
-     */
-    public static String validateRegularFileExistenceAndPermissions(final Context context, final String path, final String parentDirPath, String permissionsToCheck, final boolean setMissingPermissions, final boolean ignoreErrorsIfPathIsUnderParentDirPath) {
-        if (path == null || path.isEmpty()) return context.getString(R.string.error_null_or_empty_file);
-
-        try {
-            File file = new File(path);
-
-            // If file exits but not a regular file
-            if (file.exists() && !file.isFile()) {
-                return context.getString(R.string.error_non_regular_file_found);
-            }
-
-            boolean isPathUnderParentDirPath = false;
-            if (parentDirPath != null) {
-                // The path can only be under parent directory path
-                isPathUnderParentDirPath = isPathInDirPath(path, parentDirPath, true);
-            }
-
-            // If setMissingPermissions is enabled and path is a regular file
-            if (setMissingPermissions && permissionsToCheck != null && file.isFile()) {
-                // If there is not parentDirPath restriction or path is under parentDirPath
-                if (parentDirPath == null || (isPathUnderParentDirPath && new File(parentDirPath).isDirectory())) {
-                    setMissingFilePermissions(path, permissionsToCheck);
-                }
-            }
-
-            // If path is not a regular file
-            // Regular files cannot be automatically created so we do not ignore if missing
-            if (!file.isFile()) {
-                return context.getString(R.string.error_no_regular_file_found);
-            }
-
-            // If there is not parentDirPath restriction or path is not under parentDirPath or
-            // if permission errors must not be ignored for paths under parentDirPath
-            if (parentDirPath == null || !isPathUnderParentDirPath || !ignoreErrorsIfPathIsUnderParentDirPath) {
-                if (permissionsToCheck != null) {
-                    // Check if permissions are missing
-                    return checkMissingFilePermissions(context, path, permissionsToCheck, "File", false);
-                }
-            }
-        }
-        // Some function calls may throw SecurityException, etc
-        catch (Exception e) {
-            return context.getString(R.string.error_validate_file_existence_and_permissions_failed_with_exception, path, e.getMessage());
-        }
-
-        return null;
-
-    }
-
-    /**
-     * Validate the existence and permissions of directory at path.
-     *
-     * If the {@code parentDirPath} is not {@code null}, then creation of missing directory and
-     * setting of missing permissions will only be done if {@code path} is under
-     * {@code parentDirPath} or equals {@code parentDirPath}.
-     *
-     * @param context The {@link Context} to get error string.
-     * @param path The {@code path} for file to validate.
-     * @param parentDirPath The optional {@code parent directory path} to restrict operations to.
-     *                      This can optionally be {@code null}.
-     * @param permissionsToCheck The 3 character string that contains the "r", "w", "x" or "-" in-order.
-     * @param createDirectoryIfMissing The {@code boolean} that decides if directory
-     *                                 should be created if its missing.
-     * @param setMissingPermissions The {@code boolean} that decides if missing permissions are to be
-     *                              automatically set.
-     * @param ignoreErrorsIfPathIsInParentDirPath The {@code boolean} that decides if existence
-     *                                  and permission errors are to be ignored if path is
-     *                                  in {@code parentDirPath}.
-     * @param ignoreIfNotExecutable The {@code boolean} that decides if missing executable permission
-     *                              error is to be ignored. This allows making an attempt to set
-     *                              executable permissions, but ignoring if it fails.
-     * @return Returns the {@code errmsg} if path is not a directory, or validating permissions
-     * failed, otherwise {@code null}.
-     */
-    public static String validateDirectoryExistenceAndPermissions(final Context context, final String path, final String parentDirPath, String permissionsToCheck, final boolean createDirectoryIfMissing, final boolean setMissingPermissions, final boolean ignoreErrorsIfPathIsInParentDirPath, final boolean ignoreIfNotExecutable) {
-        if (path == null || path.isEmpty()) return context.getString(R.string.error_null_or_empty_directory);
-
-        try {
-            File file = new File(path);
-
-            // If file exits but not a directory file
-            if (file.exists() && !file.isDirectory()) {
-                return context.getString(R.string.error_non_directory_file_found);
-            }
-
-            boolean isPathInParentDirPath = false;
-            if (parentDirPath != null) {
-                // The path can be equal to parent directory path or under it
-                isPathInParentDirPath = isPathInDirPath(path, parentDirPath, false);
-            }
-
-            if (createDirectoryIfMissing || setMissingPermissions) {
-                // If there is not parentDirPath restriction or path is in parentDirPath
-                if (parentDirPath == null || (isPathInParentDirPath && new File(parentDirPath).isDirectory())) {
-                    // If createDirectoryIfMissing is enabled and no file exists at path, then create directory
-                    if (createDirectoryIfMissing && !file.exists()) {
-                        Logger.logVerbose(LOG_TAG, "Creating missing directory at path: \"" + path + "\"");
-                        // If failed to create directory
-                        if (!file.mkdirs()) {
-                            return context.getString(R.string.error_creating_missing_directory_failed, path);
-                        }
-                    }
-
-                    // If setMissingPermissions is enabled and path is a directory
-                    if (setMissingPermissions && permissionsToCheck != null && file.isDirectory()) {
-                        setMissingFilePermissions(path, permissionsToCheck);
-                    }
-                }
-            }
-
-            // If there is not parentDirPath restriction or path is not in parentDirPath or
-            // if existence or permission errors must not be ignored for paths in parentDirPath
-            if (parentDirPath == null || !isPathInParentDirPath || !ignoreErrorsIfPathIsInParentDirPath) {
-                // If path is not a directory
-                // Directories can be automatically created so we can ignore if missing with above check
-                if (!file.isDirectory()) {
-                    return context.getString(R.string.error_no_directory_found);
-                }
-
-                if (permissionsToCheck != null) {
-                    // Check if permissions are missing
-                    return checkMissingFilePermissions(context, path, permissionsToCheck, "Directory", ignoreIfNotExecutable);
-                }
-            }
-        }
-        // Some function calls may throw SecurityException, etc
-        catch (Exception e) {
-            return context.getString(R.string.error_validate_directory_existence_and_permissions_failed_with_exception, path, e.getMessage());
-        }
-
-        return null;
-    }
-
-    /**
-     * Set missing permissions for file at path.
-     *
-     * @param path The {@code path} for file to set permissions to.
-     * @param permissionsToSet The 3 character string that contains the "r", "w", "x" or "-" in-order.
-     */
-    public static void setMissingFilePermissions(String path, String permissionsToSet) {
-        if (path == null || path.isEmpty()) return;
-
-        if (!isValidPermissingString(permissionsToSet)) {
-            Logger.logError(LOG_TAG, "Invalid permissionsToSet passed to setMissingFilePermissions: \"" + permissionsToSet + "\"");
-            return;
-        }
-
-        File file = new File(path);
-
-        if (permissionsToSet.contains("r") && !file.canRead()) {
-            Logger.logVerbose(LOG_TAG, "Setting missing read permissions for file at path: \"" + path + "\"");
-            file.setReadable(true);
-        }
-
-        if (permissionsToSet.contains("w") && !file.canWrite()) {
-            Logger.logVerbose(LOG_TAG, "Setting missing write permissions for file at path: \"" + path + "\"");
-            file.setWritable(true);
-        }
-
-        if (permissionsToSet.contains("x") && !file.canExecute()) {
-            Logger.logVerbose(LOG_TAG, "Setting missing execute permissions for file at path: \"" + path + "\"");
-            file.setExecutable(true);
-        }
-    }
-
-    /**
-     * Checking missing permissions for file at path.
-     *
-     * @param context The {@link Context} to get error string.
-     * @param path The {@code path} for file to check permissions for.
-     * @param permissionsToCheck The 3 character string that contains the "r", "w", "x" or "-" in-order.
-     * @param fileType The label for the type of file to use for error string.
-     * @param ignoreIfNotExecutable The {@code boolean} that decides if missing executable permission
-     *                              error is to be ignored.
-     * @return Returns the {@code errmsg} if validating permissions failed, otherwise {@code null}.
-     */
-    public static String checkMissingFilePermissions(Context context, String path, String permissionsToCheck, String fileType, boolean ignoreIfNotExecutable) {
-        if (path == null || path.isEmpty()) return context.getString(R.string.error_null_or_empty_path);
-
-        if (!isValidPermissingString(permissionsToCheck)) {
-            Logger.logError(LOG_TAG, "Invalid permissionsToCheck passed to checkMissingFilePermissions: \"" + permissionsToCheck + "\"");
-            return context.getString(R.string.error_invalid_file_permissions_string_to_check);
-        }
-
-        if (fileType == null || fileType.isEmpty()) fileType = "File";
-
-        File file = new File(path);
-
-        // If file is not readable
-        if (permissionsToCheck.contains("r") && !file.canRead()) {
-            return context.getString(R.string.error_file_not_readable, fileType);
-        }
-
-        // If file is not writable
-        if (permissionsToCheck.contains("w") && !file.canWrite()) {
-            return context.getString(R.string.error_file_not_writable, fileType);
-        }
-        // If file is not executable
-        // This canExecute() will give "avc: granted { execute }" warnings for target sdk 29
-        else if (permissionsToCheck.contains("x") && !file.canExecute() && !ignoreIfNotExecutable) {
-            return context.getString(R.string.error_file_not_executable, fileType);
-        }
-
-        return null;
-    }
-
-    /**
-     * Determines whether string exactly matches the 3 character permission string that
-     * contains the "r", "w", "x" or "-" in-order.
-     *
-     * @param string The {@link String} to check.
-     * @return Returns {@code true} if string exactly matches a permission string, otherwise {@code false}.
-     */
-    public static boolean isValidPermissingString(String string) {
-        if (string == null || string.isEmpty()) return false;
-        return Pattern.compile("^([r-])[w-][x-]$", 0).matcher(string).matches();
-    }
-
-}
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 211fa379c8..89c4e1b148 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -104,21 +104,50 @@
 
     <!-- Termux FileUtils -->
     <string name="error_executable_required">Executable required.</string>
-    <string name="error_null_or_empty_path">The path is null or empty.</string>
-    <string name="error_null_or_empty_file">The file is null or empty.</string>
-    <string name="error_null_or_empty_executable">The executable is null or empty.</string>
-    <string name="error_null_or_empty_directory">The directory is null or empty.</string>
+    <string name="error_null_or_empty_parameter">The %1$s is to \"%2$s\" null or empty.</string>
+    <string name="error_null_or_empty_regular_file_path">The regular file path is null or empty.</string>
+    <string name="error_null_or_empty_regular_file">The regular file is null or empty.</string>
+    <string name="error_null_or_empty_executable_file_path">The executable file path is null or empty.</string>
+    <string name="error_null_or_empty_executable_file">The executable file is null or empty.</string>
+    <string name="error_null_or_empty_directory_file_path">The directory file path is null or empty.</string>
+    <string name="error_null_or_empty_directory_file">The directory file is null or empty.</string>
+
+    <string name="error_file_not_found_at_path">The %1$s is not found at path \"%2$s\".</string>
+    <string name="error_no_regular_file_found">Regular file not found at %1$s path.</string>
+    <string name="error_not_a_regular_file">The %1$s at path \"%2$s\" is not a regular file.</string>
+    <string name="error_non_regular_file_found">Non-regular file found at %1$s path.</string>
+    <string name="error_non_directory_file_found">Non-directory file found at %1$s path.</string>
+    <string name="error_non_symlink_file_found">Non-symlink file found at %1$s path.</string>
+    <string name="error_file_not_an_allowed_file_type">The %1$s found at path \"%2$s\" is not one of allowed file types \"%3$s\".</string>
+
+    <string name="error_validate_file_existence_and_permissions_failed_with_exception">Validating file existence and permissions of %1$s at path \"%2$s\" failed.\nException: %3$s</string>
+    <string name="error_validate_directory_existence_and_permissions_failed_with_exception">Validating directory existence and permissions of %1$s at path \"%2$s\" failed.\nException: %3$s</string>
+
+    <string name="error_creating_file_failed">Creating %1$s at path \"%2$s\" failed.</string>
+    <string name="error_creating_file_failed_with_exception">Creating %1$s at path \"%2$s\" failed.\nException: %3$s</string>
+
+    <string name="error_cannot_overwrite_a_non_symlink_file_type">Cannot overwrite %1$s while creating symlink at \"%2$s\" to \"%3$s\" since destination file type \"%4$s\" is not a symlink.</string>
+    <string name="error_creating_symlink_file_failed_with_exception">Creating %1$s at path \"%2$s\" to \"%3$s\" failed.\nException: %4$s</string>
+
+    <string name="error_copying_or_moving_file_failed_with_exception">%1$s from \"%2$s\" to \"%3$s\" failed.\nException: %4$s</string>
+    <string name="error_copying_or_moving_file_to_same_path">%1$s from \"%2$s\" to \"%3$s\" cannot be done since they point to the same path.</string>
+    <string name="error_cannot_overwrite_a_different_file_type">Cannot overwrite %1$s while %2$s it from \"%3$s\" to \"%4$s\" since destination file type \"%5$s\" is different from source file type \"%6$s\".</string>
+    <string name="error_cannot_move_directory_to_sub_directory_of_itself">Cannot move %1$s from \"%2$s\" to \"%3$s\" since destination is a subdirectory of the source.</string>
+
+    <string name="error_file_still_exists_after_deleting">The %1$s still exists after deleting it from \"%2$s\".</string>
+    <string name="error_deleting_file_failed">Deleting %1$s at path \"%2$s\" failed.</string>
+    <string name="error_deleting_file_failed_with_exception">Deleting %1$s at path \"%2$s\" failed.\nException: %3$s</string>
+    <string name="error_clearing_directory_failed_with_exception">Clearing %1$s at path \"%2$s\" failed.\nException: %3$s</string>
+
+    <string name="error_reading_string_to_file_failed_with_exception">Reading string from %1$s at path \"%2$s\" failed.\nException: %3$s</string>
+    <string name="error_writing_string_to_file_failed_with_exception">Writing string to %1$s at path \"%2$s\" failed.\nException: %3$s</string>
+    <string name="error_unsupported_charset">Unsupported charset \"%1$s\"</string>
+    <string name="error_checking_if_charset_supported_failed">Checking if charset \"%1$s\" is suppoted failed.\nException: %2$s</string>
+
     <string name="error_invalid_file_permissions_string_to_check">The file permission string to check is invalid.</string>
-    <string name="error_no_regular_file_found">Regular file not found at path.</string>
-    <string name="error_no_directory_found">Directory not found at path.</string>
-    <string name="error_file_not_readable">%1$s at path is not readable. Permission Denied.</string>
-    <string name="error_file_not_writable">%1$s at path is not writable. Permission Denied.</string>
-    <string name="error_file_not_executable">%1$s at path is not executable. Permission Denied.</string>
-    <string name="error_non_regular_file_found">Non-regular file found at path.</string>
-    <string name="error_non_directory_file_found">Non-directory file found at path.</string>
-    <string name="error_creating_missing_directory_failed">Failed to create missing directory at path: \"%1$s\"</string>
-    <string name="error_validate_file_existence_and_permissions_failed_with_exception">Validating file existence and permissions fafiled: \"%1$s\"\nException: %2$s</string>
-    <string name="error_validate_directory_existence_and_permissions_failed_with_exception">Validating directory existence and permissions fafiled: \"%1$s\"\nException: %2$s</string>
+    <string name="error_file_not_readable">The %1$s at path is not readable. Permission Denied.</string>
+    <string name="error_file_not_writable">The %1$s at path is not writable. Permission Denied.</string>
+    <string name="error_file_not_executable">The %1$s at path is not executable. Permission Denied.</string>
 
 
 

From b2cd20c03554eed10cbeff5d6b888608b0dc87ca Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Tue, 6 Apr 2021 06:00:21 +0500
Subject: [PATCH 309/912] Use FileUtils for bootstrap and shared storage
 symlinks setup

---
 .../java/com/termux/app/TermuxActivity.java   |  2 +-
 .../java/com/termux/app/TermuxInstaller.java  | 90 ++++++++-----------
 2 files changed, 36 insertions(+), 56 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index 7d5c352d50..e586540289 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -251,7 +251,7 @@ public void onServiceConnected(ComponentName componentName, IBinder service) {
 
         if (mTermuxService.isTermuxSessionsEmpty()) {
             if (mIsVisible) {
-                TermuxInstaller.setupIfNeeded(TermuxActivity.this, () -> {
+                TermuxInstaller.setupBootstrapIfNeeded(TermuxActivity.this, () -> {
                     if (mTermuxService == null) return; // Activity might have been destroyed.
                     try {
                         Bundle bundle = getIntent().getExtras();
diff --git a/app/src/main/java/com/termux/app/TermuxInstaller.java b/app/src/main/java/com/termux/app/TermuxInstaller.java
index 389aaa60e5..6c355bbf2f 100644
--- a/app/src/main/java/com/termux/app/TermuxInstaller.java
+++ b/app/src/main/java/com/termux/app/TermuxInstaller.java
@@ -11,13 +11,13 @@
 import android.view.WindowManager;
 
 import com.termux.R;
+import com.termux.app.file.FileUtils;
 import com.termux.app.utils.Logger;
 
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileOutputStream;
-import java.io.IOException;
 import java.io.InputStreamReader;
 import java.util.ArrayList;
 import java.util.List;
@@ -32,7 +32,7 @@
  * <p/>
  * (2) A progress dialog is shown with "Installing..." message and a spinner.
  * <p/>
- * (3) A staging directory, $STAGING_PREFIX, is {@link #deleteDirectory(File)} if left over from broken installation below.
+ * (3) A staging directory, $STAGING_PREFIX, is cleared if left over from broken installation below.
  * <p/>
  * (4) The zip file is loaded from a shared library.
  * <p/>
@@ -47,10 +47,8 @@ final class TermuxInstaller {
 
     private static final String LOG_TAG = "TermuxInstaller";
 
-    /** Performs setup if necessary. */
-    static void setupIfNeeded(final Activity activity, final Runnable whenDone) {
-        Logger.logInfo(LOG_TAG, "Installing " + TermuxConstants.TERMUX_APP_NAME + " bootstrap packages.");
-
+    /** Performs bootstrap setup if necessary. */
+    static void setupBootstrapIfNeeded(final Activity activity, final Runnable whenDone) {
         // Termux can only be run as the primary user (device owner) since only that
         // account has the expected file system paths. Verify that:
         UserManager um = (UserManager) activity.getSystemService(Context.USER_SERVICE);
@@ -63,7 +61,6 @@ static void setupIfNeeded(final Activity activity, final Runnable whenDone) {
             return;
         }
 
-        Logger.logInfo(LOG_TAG, "Creating prefix directory \"" + TermuxConstants.TERMUX_PREFIX_DIR_PATH + "\".");
         final File PREFIX_FILE = TermuxConstants.TERMUX_PREFIX_DIR;
         if (PREFIX_FILE.isDirectory()) {
             whenDone.run();
@@ -75,12 +72,16 @@ static void setupIfNeeded(final Activity activity, final Runnable whenDone) {
             @Override
             public void run() {
                 try {
+                    Logger.logInfo(LOG_TAG, "Installing " + TermuxConstants.TERMUX_APP_NAME + " bootstrap packages.");
+
+                    String errmsg;
+
                     final String STAGING_PREFIX_PATH = TermuxConstants.TERMUX_STAGING_PREFIX_DIR_PATH;
                     final File STAGING_PREFIX_FILE = new File(STAGING_PREFIX_PATH);
 
-                    if (STAGING_PREFIX_FILE.exists()) {
-                        Logger.logInfo(LOG_TAG, "Deleting prefix staging directory \"" + TermuxConstants.TERMUX_STAGING_PREFIX_DIR_PATH + "\".");
-                        deleteDirectory(STAGING_PREFIX_FILE);
+                    errmsg = FileUtils.clearDirectory(activity, "prefix staging directory", STAGING_PREFIX_PATH);
+                    if (errmsg != null) {
+                        throw new RuntimeException(errmsg);
                     }
 
                     Logger.logInfo(LOG_TAG, "Extracting bootstrap zip to prefix staging directory \"" + TermuxConstants.TERMUX_STAGING_PREFIX_DIR_PATH + "\".");
@@ -103,14 +104,14 @@ public void run() {
                                     String newPath = STAGING_PREFIX_PATH + "/" + parts[1];
                                     symlinks.add(Pair.create(oldPath, newPath));
 
-                                    ensureDirectoryExists(new File(newPath).getParentFile());
+                                    ensureDirectoryExists(activity, new File(newPath).getParentFile());
                                 }
                             } else {
                                 String zipEntryName = zipEntry.getName();
                                 File targetFile = new File(STAGING_PREFIX_PATH, zipEntryName);
                                 boolean isDirectory = zipEntry.isDirectory();
 
-                                ensureDirectoryExists(isDirectory ? targetFile : targetFile.getParentFile());
+                                ensureDirectoryExists(activity, isDirectory ? targetFile : targetFile.getParentFile());
 
                                 if (!isDirectory) {
                                     try (FileOutputStream outStream = new FileOutputStream(targetFile)) {
@@ -151,7 +152,7 @@ public void run() {
                                     activity.finish();
                                 }).setPositiveButton(R.string.bootstrap_error_try_again, (dialog, which) -> {
                                 dialog.dismiss();
-                                TermuxInstaller.setupIfNeeded(activity, whenDone);
+                                TermuxInstaller.setupBootstrapIfNeeded(activity, whenDone);
                             }).show();
                         } catch (WindowManager.BadTokenException e1) {
                             // Activity already dismissed - ignore.
@@ -170,37 +171,6 @@ public void run() {
         }.start();
     }
 
-    private static void ensureDirectoryExists(File directory) {
-        if (!directory.isDirectory() && !directory.mkdirs()) {
-            throw new RuntimeException("Unable to create directory: " + directory.getAbsolutePath());
-        }
-    }
-
-    public static byte[] loadZipBytes() {
-        // Only load the shared library when necessary to save memory usage.
-        System.loadLibrary("termux-bootstrap");
-        return getZip();
-    }
-
-    public static native byte[] getZip();
-
-    /** Delete a directory and all its content or throw. Don't follow symlinks. */
-    static void deleteDirectory(File fileOrDirectory) throws IOException {
-        if (fileOrDirectory.getCanonicalPath().equals(fileOrDirectory.getAbsolutePath()) && fileOrDirectory.isDirectory()) {
-            File[] children = fileOrDirectory.listFiles();
-
-            if (children != null) {
-                for (File child : children) {
-                    deleteDirectory(child);
-                }
-            }
-        }
-
-        if (!fileOrDirectory.delete()) {
-            throw new RuntimeException("Unable to delete " + (fileOrDirectory.isDirectory() ? "directory " : "file ") + fileOrDirectory.getAbsolutePath());
-        }
-    }
-
     static void setupStorageSymlinks(final Context context) {
         final String LOG_TAG = "termux-storage";
 
@@ -209,19 +179,12 @@ static void setupStorageSymlinks(final Context context) {
         new Thread() {
             public void run() {
                 try {
+                    String errmsg;
                     File storageDir = TermuxConstants.TERMUX_STORAGE_HOME_DIR;
 
-                    if (storageDir.exists()) {
-                        try {
-                            deleteDirectory(storageDir);
-                        } catch (IOException e) {
-                            Logger.logStackTraceWithMessage(LOG_TAG, "Failed to delete old ~/storage directory", e);
-                            return;
-                        }
-                    }
-
-                    if (!storageDir.mkdirs()) {
-                        Logger.logError(LOG_TAG, "Unable to create ~/storage directory.");
+                    errmsg = FileUtils.clearDirectory(context, "~/storage", storageDir.getAbsolutePath());
+                    if (errmsg != null) {
+                        Logger.logErrorAndShowToast(context, LOG_TAG, errmsg);
                         return;
                     }
 
@@ -264,4 +227,21 @@ public void run() {
         }.start();
     }
 
+    private 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() {
+        // Only load the shared library when necessary to save memory usage.
+        System.loadLibrary("termux-bootstrap");
+        return getZip();
+    }
+
+    public static native byte[] getZip();
+
 }

From 8598b92dea1665381fd4beddca0cf9e9d62188aa Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Tue, 6 Apr 2021 06:00:41 +0500
Subject: [PATCH 310/912] Use FileUtils for clearing TMPDIR and move clearing
 function to ShellUtils from TermuxService

---
 app/src/main/java/com/termux/app/TermuxService.java   | 11 +----------
 .../main/java/com/termux/app/shell/ShellUtils.java    | 10 ++++++++++
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxService.java b/app/src/main/java/com/termux/app/TermuxService.java
index 3bdd979d1f..77779b6c1a 100644
--- a/app/src/main/java/com/termux/app/TermuxService.java
+++ b/app/src/main/java/com/termux/app/TermuxService.java
@@ -154,17 +154,8 @@ public int onStartCommand(Intent intent, int flags, int startId) {
     @Override
     public void onDestroy() {
         Logger.logVerbose(LOG_TAG, "onDestroy");
-        File termuxTmpDir = TermuxConstants.TERMUX_TMP_DIR;
 
-        if (termuxTmpDir.exists()) {
-            try {
-                TermuxInstaller.deleteDirectory(termuxTmpDir.getCanonicalFile());
-            } catch (Exception e) {
-                Logger.logStackTraceWithMessage(LOG_TAG, "Error while removing file at " + termuxTmpDir.getAbsolutePath(), e);
-            }
-
-            termuxTmpDir.mkdirs();
-        }
+        ShellUtils.clearTermuxTMPDIR(this);
 
         actionReleaseWakeLock(false);
         finishAllTermuxSessions();
diff --git a/app/src/main/java/com/termux/app/shell/ShellUtils.java b/app/src/main/java/com/termux/app/shell/ShellUtils.java
index 838e7c8483..a6fbefe3f5 100644
--- a/app/src/main/java/com/termux/app/shell/ShellUtils.java
+++ b/app/src/main/java/com/termux/app/shell/ShellUtils.java
@@ -3,6 +3,8 @@
 import android.content.Context;
 
 import com.termux.app.TermuxConstants;
+import com.termux.app.file.FileUtils;
+import com.termux.app.utils.Logger;
 import com.termux.app.utils.PackageUtils;
 import com.termux.app.utils.TermuxUtils;
 
@@ -143,4 +145,12 @@ public static String getExecutableBasename(String executable) {
         return (lastSlash == -1) ? executable : executable.substring(lastSlash + 1);
     }
 
+    public static void clearTermuxTMPDIR(Context context) {
+        String errmsg;
+        errmsg = FileUtils.clearDirectory(context, "$TMPDIR", FileUtils.getCanonicalPath(TermuxConstants.TERMUX_TMP_PREFIX_DIR_PATH, null, false));
+        if (errmsg != null) {
+            Logger.logErrorAndShowToast(context, errmsg);
+        }
+    }
+
 }

From 8a5442f80dd15f3fd8169d6666a28fb8d10971f8 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Tue, 6 Apr 2021 12:19:37 +0500
Subject: [PATCH 311/912] Update TermuxConstants

The `TermuxConstants` classes has been updated to `v0.15.0`. Check its Changelog sections for info on changes.
---
 .../java/com/termux/app/TermuxConstants.java  | 122 ++++++++++++++++--
 1 file changed, 111 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxConstants.java b/app/src/main/java/com/termux/app/TermuxConstants.java
index 1038b08274..dc47d0f833 100644
--- a/app/src/main/java/com/termux/app/TermuxConstants.java
+++ b/app/src/main/java/com/termux/app/TermuxConstants.java
@@ -5,7 +5,7 @@
 import java.io.File;
 
 /*
- * Version: v0.14.0
+ * Version: v0.15.0
  *
  * Changelog
  *
@@ -96,6 +96,23 @@
  *          `TERMUX_STYLING_GITHUB_REPO_NAME`, `TERMUX_STYLING_GITHUB_REPO_URL`, `TERMUX_STYLING_FDROID_PACKAGE_URL`,
  *          `TERMUX_TASKER_GITHUB_REPO_NAME`, `TERMUX_TASKER_GITHUB_REPO_URL`, `TERMUX_TASKER_FDROID_PACKAGE_URL`,
  *          `TERMUX_WIDGET_GITHUB_REPO_NAME`, `TERMUX_WIDGET_GITHUB_REPO_URL` `TERMUX_WIDGET_FDROID_PACKAGE_URL`.
+ *
+ * - 0.15.0 (2021-04-06)
+ *      - Fixed some variables that had `PREFIX_` substring missing in their name.
+ *      - Added `TERMUX_CRASH_LOG_FILE_PATH`, `TERMUX_CRASH_LOG_BACKUP_FILE_PATH`,
+ *          `TERMUX_GITHUB_ISSUES_REPO_URL`, `TERMUX_API_GITHUB_ISSUES_REPO_URL`,
+ *          `TERMUX_BOOT_GITHUB_ISSUES_REPO_URL`, `TERMUX_FLOAT_GITHUB_ISSUES_REPO_URL`,
+ *          `TERMUX_STYLING_GITHUB_ISSUES_REPO_URL`, `TERMUX_TASKER_GITHUB_ISSUES_REPO_URL`,
+ *          `TERMUX_WIDGET_GITHUB_ISSUES_REPO_URL`,
+ *          `TERMUX_GITHUB_WIKI_REPO_URL`, `TERMUX_PACKAGES_GITHUB_WIKI_REPO_URL`,
+ *          `TERMUX_PACKAGES_GITHUB_REPO_NAME`, `TERMUX_PACKAGES_GITHUB_REPO_URL`, `TERMUX_PACKAGES_GITHUB_ISSUES_REPO_URL`,
+ *          `TERMUX_GAME_PACKAGES_GITHUB_REPO_NAME`, `TERMUX_GAME_PACKAGES_GITHUB_REPO_URL`, `TERMUX_GAME_PACKAGES_GITHUB_ISSUES_REPO_URL`,
+ *          `TERMUX_SCIENCE_PACKAGES_GITHUB_REPO_NAME`, `TERMUX_SCIENCE_PACKAGES_GITHUB_REPO_URL`, `TERMUX_SCIENCE_PACKAGES_GITHUB_ISSUES_REPO_URL`,
+ *          `TERMUX_ROOT_PACKAGES_GITHUB_REPO_NAME`, `TERMUX_ROOT_PACKAGES_GITHUB_REPO_URL`, `TERMUX_ROOT_PACKAGES_GITHUB_ISSUES_REPO_URL`,
+ *          `TERMUX_UNSTABLE_PACKAGES_GITHUB_REPO_NAME`, `TERMUX_UNSTABLE_PACKAGES_GITHUB_REPO_URL`, `TERMUX_UNSTABLE_PACKAGES_GITHUB_ISSUES_REPO_URL`,
+ *          `TERMUX_X11_PACKAGES_GITHUB_REPO_NAME`, `TERMUX_X11_PACKAGES_GITHUB_REPO_URL`, `TERMUX_X11_PACKAGES_GITHUB_ISSUES_REPO_URL`.
+ *      - Added following to `RUN_COMMAND_SERVICE`:
+ *          `RUN_COMMAND_API_HELP_URL`.
  */
 
 /**
@@ -152,7 +169,7 @@ public final class TermuxConstants {
 
 
     /*
-     * Termux and its plugin app and package names.
+     * Termux and its plugin app and package names and urls.
      */
 
     /** Termux app name */
@@ -163,6 +180,10 @@ public final class TermuxConstants {
     public static final String TERMUX_GITHUB_REPO_NAME = "termux-app"; // Default: "termux-app"
     /** Termux Github repo url */
     public static final String TERMUX_GITHUB_REPO_URL = TERMUX_GITHUB_ORGANIZATION_URL + "/" + TERMUX_GITHUB_REPO_NAME; // Default: "https://github.com/termux/termux-app"
+    /** Termux Github issues repo url */
+    public static final String TERMUX_GITHUB_ISSUES_REPO_URL = TERMUX_GITHUB_REPO_URL + "/issues"; // Default: "https://github.com/termux/termux-app/issues"
+    /** Termux Github wiki repo url */
+    public static final String TERMUX_GITHUB_WIKI_REPO_URL = TERMUX_GITHUB_REPO_URL + "/wiki"; // Default: "https://github.com/termux/termux-app/wiki"
     /** Termux F-Droid package url */
     public static final String TERMUX_FDROID_PACKAGE_URL = FDROID_PACKAGES_BASE_URL + "/" + TERMUX_PACKAGE_NAME; // Default: "https://f-droid.org/en/packages/com.termux"
 
@@ -175,6 +196,8 @@ public final class TermuxConstants {
     public static final String TERMUX_API_GITHUB_REPO_NAME = "termux-api"; // Default: "termux-api"
     /** Termux API Github repo url */
     public static final String TERMUX_API_GITHUB_REPO_URL = TERMUX_GITHUB_ORGANIZATION_URL + "/" + TERMUX_API_GITHUB_REPO_NAME; // Default: "https://github.com/termux/termux-api"
+    /** Termux API Github issues repo url */
+    public static final String TERMUX_API_GITHUB_ISSUES_REPO_URL = TERMUX_API_GITHUB_REPO_URL + "/issues"; // Default: "https://github.com/termux/termux-api/issues"
     /** Termux API F-Droid package url */
     public static final String TERMUX_API_FDROID_PACKAGE_URL = FDROID_PACKAGES_BASE_URL + "/" + TERMUX_API_PACKAGE_NAME; // Default: "https://f-droid.org/en/packages/com.termux.api"
 
@@ -187,6 +210,8 @@ public final class TermuxConstants {
     public static final String TERMUX_BOOT_GITHUB_REPO_NAME = "termux-boot"; // Default: "termux-boot"
     /** Termux Boot Github repo url */
     public static final String TERMUX_BOOT_GITHUB_REPO_URL = TERMUX_GITHUB_ORGANIZATION_URL + "/" + TERMUX_BOOT_GITHUB_REPO_NAME; // Default: "https://github.com/termux/termux-boot"
+    /** Termux Boot Github issues repo url */
+    public static final String TERMUX_BOOT_GITHUB_ISSUES_REPO_URL = TERMUX_BOOT_GITHUB_REPO_URL + "/issues"; // Default: "https://github.com/termux/termux-boot/issues"
     /** Termux Boot F-Droid package url */
     public static final String TERMUX_BOOT_FDROID_PACKAGE_URL = FDROID_PACKAGES_BASE_URL + "/" + TERMUX_BOOT_PACKAGE_NAME; // Default: "https://f-droid.org/en/packages/com.termux.boot"
 
@@ -199,6 +224,8 @@ public final class TermuxConstants {
     public static final String TERMUX_FLOAT_GITHUB_REPO_NAME = "termux-float"; // Default: "termux-float"
     /** Termux Float Github repo url */
     public static final String TERMUX_FLOAT_GITHUB_REPO_URL = TERMUX_GITHUB_ORGANIZATION_URL + "/" + TERMUX_FLOAT_GITHUB_REPO_NAME; // Default: "https://github.com/termux/termux-float"
+    /** Termux Float Github issues repo url */
+    public static final String TERMUX_FLOAT_GITHUB_ISSUES_REPO_URL = TERMUX_FLOAT_GITHUB_REPO_URL + "/issues"; // Default: "https://github.com/termux/termux-float/issues"
     /** Termux Float F-Droid package url */
     public static final String TERMUX_FLOAT_FDROID_PACKAGE_URL = FDROID_PACKAGES_BASE_URL + "/" + TERMUX_FLOAT_PACKAGE_NAME; // Default: "https://f-droid.org/en/packages/com.termux.window"
 
@@ -211,6 +238,8 @@ public final class TermuxConstants {
     public static final String TERMUX_STYLING_GITHUB_REPO_NAME = "termux-styling"; // Default: "termux-styling"
     /** Termux Styling Github repo url */
     public static final String TERMUX_STYLING_GITHUB_REPO_URL = TERMUX_GITHUB_ORGANIZATION_URL + "/" + TERMUX_STYLING_GITHUB_REPO_NAME; // Default: "https://github.com/termux/termux-styling"
+    /** Termux Styling Github issues repo url */
+    public static final String TERMUX_STYLING_GITHUB_ISSUES_REPO_URL = TERMUX_STYLING_GITHUB_REPO_URL + "/issues"; // Default: "https://github.com/termux/termux-styling/issues"
     /** Termux Styling F-Droid package url */
     public static final String TERMUX_STYLING_FDROID_PACKAGE_URL = FDROID_PACKAGES_BASE_URL + "/" + TERMUX_STYLING_PACKAGE_NAME; // Default: "https://f-droid.org/en/packages/com.termux.styling"
 
@@ -223,6 +252,8 @@ public final class TermuxConstants {
     public static final String TERMUX_TASKER_GITHUB_REPO_NAME = "termux-tasker"; // Default: "termux-tasker"
     /** Termux Tasker Github repo url */
     public static final String TERMUX_TASKER_GITHUB_REPO_URL = TERMUX_GITHUB_ORGANIZATION_URL + "/" + TERMUX_TASKER_GITHUB_REPO_NAME; // Default: "https://github.com/termux/termux-tasker"
+    /** Termux Tasker Github issues repo url */
+    public static final String TERMUX_TASKER_GITHUB_ISSUES_REPO_URL = TERMUX_TASKER_GITHUB_REPO_URL + "/issues"; // Default: "https://github.com/termux/termux-tasker/issues"
     /** Termux Tasker F-Droid package url */
     public static final String TERMUX_TASKER_FDROID_PACKAGE_URL = FDROID_PACKAGES_BASE_URL + "/" + TERMUX_TASKER_PACKAGE_NAME; // Default: "https://f-droid.org/en/packages/com.termux.tasker"
 
@@ -235,6 +266,8 @@ public final class TermuxConstants {
     public static final String TERMUX_WIDGET_GITHUB_REPO_NAME = "termux-widget"; // Default: "termux-widget"
     /** Termux Widget Github repo url */
     public static final String TERMUX_WIDGET_GITHUB_REPO_URL = TERMUX_GITHUB_ORGANIZATION_URL + "/" + TERMUX_WIDGET_GITHUB_REPO_NAME; // Default: "https://github.com/termux/termux-widget"
+    /** Termux Widget Github issues repo url */
+    public static final String TERMUX_WIDGET_GITHUB_ISSUES_REPO_URL = TERMUX_WIDGET_GITHUB_REPO_URL + "/issues"; // Default: "https://github.com/termux/termux-widget/issues"
     /** Termux Widget F-Droid package url */
     public static final String TERMUX_WIDGET_FDROID_PACKAGE_URL = FDROID_PACKAGES_BASE_URL + "/" + TERMUX_WIDGET_PACKAGE_NAME; // Default: "https://f-droid.org/en/packages/com.termux.widget"
 
@@ -242,6 +275,63 @@ public final class TermuxConstants {
 
 
 
+    /*
+     * Termux packages urls.
+     */
+
+    /** Termux Packages Github repo name */
+    public static final String TERMUX_PACKAGES_GITHUB_REPO_NAME = "termux-packages"; // Default: "termux-packages"
+    /** Termux Packages Github repo url */
+    public static final String TERMUX_PACKAGES_GITHUB_REPO_URL = TERMUX_GITHUB_ORGANIZATION_URL + "/" + TERMUX_PACKAGES_GITHUB_REPO_NAME; // Default: "https://github.com/termux/termux-packages"
+    /** Termux Packages Github issues repo url */
+    public static final String TERMUX_PACKAGES_GITHUB_ISSUES_REPO_URL = TERMUX_PACKAGES_GITHUB_REPO_URL + "/issues"; // Default: "https://github.com/termux/termux-packages/issues"
+    /** Termux Packages wiki repo url */
+    public static final String TERMUX_PACKAGES_GITHUB_WIKI_REPO_URL = TERMUX_PACKAGES_GITHUB_REPO_URL + "/wiki"; // Default: "https://github.com/termux/termux-packages/wiki"
+
+
+    /** Termux Game Packages Github repo name */
+    public static final String TERMUX_GAME_PACKAGES_GITHUB_REPO_NAME = "game-packages"; // Default: "game-packages"
+    /** Termux Game Packages Github repo url */
+    public static final String TERMUX_GAME_PACKAGES_GITHUB_REPO_URL = TERMUX_GITHUB_ORGANIZATION_URL + "/" + TERMUX_GAME_PACKAGES_GITHUB_REPO_NAME; // Default: "https://github.com/termux/game-packages"
+    /** Termux Game Packages Github issues repo url */
+    public static final String TERMUX_GAME_PACKAGES_GITHUB_ISSUES_REPO_URL = TERMUX_GAME_PACKAGES_GITHUB_REPO_URL + "/issues"; // Default: "https://github.com/termux/game-packages/issues"
+
+
+    /** Termux Science Packages Github repo name */
+    public static final String TERMUX_SCIENCE_PACKAGES_GITHUB_REPO_NAME = "science-packages"; // Default: "science-packages"
+    /** Termux Science Packages Github repo url */
+    public static final String TERMUX_SCIENCE_PACKAGES_GITHUB_REPO_URL = TERMUX_GITHUB_ORGANIZATION_URL + "/" + TERMUX_SCIENCE_PACKAGES_GITHUB_REPO_NAME; // Default: "https://github.com/termux/science-packages"
+    /** Termux Science Packages Github issues repo url */
+    public static final String TERMUX_SCIENCE_PACKAGES_GITHUB_ISSUES_REPO_URL = TERMUX_SCIENCE_PACKAGES_GITHUB_REPO_URL + "/issues"; // Default: "https://github.com/termux/science-packages/issues"
+
+
+    /** Termux Root Packages Github repo name */
+    public static final String TERMUX_ROOT_PACKAGES_GITHUB_REPO_NAME = "termux-root-packages"; // Default: "termux-root-packages"
+    /** Termux Root Packages Github repo url */
+    public static final String TERMUX_ROOT_PACKAGES_GITHUB_REPO_URL = TERMUX_GITHUB_ORGANIZATION_URL + "/" + TERMUX_ROOT_PACKAGES_GITHUB_REPO_NAME; // Default: "https://github.com/termux/termux-root-packages"
+    /** Termux Root Packages Github issues repo url */
+    public static final String TERMUX_ROOT_PACKAGES_GITHUB_ISSUES_REPO_URL = TERMUX_ROOT_PACKAGES_GITHUB_REPO_URL + "/issues"; // Default: "https://github.com/termux/termux-root-packages/issues"
+
+
+    /** Termux Unstable Packages Github repo name */
+    public static final String TERMUX_UNSTABLE_PACKAGES_GITHUB_REPO_NAME = "unstable-packages"; // Default: "unstable-packages"
+    /** Termux Unstable Packages Github repo url */
+    public static final String TERMUX_UNSTABLE_PACKAGES_GITHUB_REPO_URL = TERMUX_GITHUB_ORGANIZATION_URL + "/" + TERMUX_UNSTABLE_PACKAGES_GITHUB_REPO_NAME; // Default: "https://github.com/termux/unstable-packages"
+    /** Termux Unstable Packages Github issues repo url */
+    public static final String TERMUX_UNSTABLE_PACKAGES_GITHUB_ISSUES_REPO_URL = TERMUX_UNSTABLE_PACKAGES_GITHUB_REPO_URL + "/issues"; // Default: "https://github.com/termux/unstable-packages/issues"
+
+
+    /** Termux X11 Packages Github repo name */
+    public static final String TERMUX_X11_PACKAGES_GITHUB_REPO_NAME = "x11-packages"; // Default: "x11-packages"
+    /** Termux X11 Packages Github repo url */
+    public static final String TERMUX_X11_PACKAGES_GITHUB_REPO_URL = TERMUX_GITHUB_ORGANIZATION_URL + "/" + TERMUX_X11_PACKAGES_GITHUB_REPO_NAME; // Default: "https://github.com/termux/x11-packages"
+    /** Termux X11 Packages Github issues repo url */
+    public static final String TERMUX_X11_PACKAGES_GITHUB_ISSUES_REPO_URL = TERMUX_X11_PACKAGES_GITHUB_REPO_URL + "/issues"; // Default: "https://github.com/termux/x11-packages/issues"
+
+
+
+
+
     /*
      * Termux app core directory paths.
      */
@@ -276,43 +366,43 @@ public final class TermuxConstants {
     /** Termux app $PREFIX/etc directory path */
     public static final String TERMUX_ETC_PREFIX_DIR_PATH = TERMUX_PREFIX_DIR_PATH + "/etc"; // Default: "/data/data/com.termux/files/usr/etc"
     /** Termux app $PREFIX/etc directory */
-    public static final File TERMUX_ETC_DIR = new File(TERMUX_ETC_PREFIX_DIR_PATH);
+    public static final File TERMUX_ETC_PREFIX_DIR = new File(TERMUX_ETC_PREFIX_DIR_PATH);
 
 
     /** Termux app $PREFIX/include directory path */
     public static final String TERMUX_INCLUDE_PREFIX_DIR_PATH = TERMUX_PREFIX_DIR_PATH + "/include"; // Default: "/data/data/com.termux/files/usr/include"
     /** Termux app $PREFIX/include directory */
-    public static final File TERMUX_INCLUDE_DIR = new File(TERMUX_INCLUDE_PREFIX_DIR_PATH);
+    public static final File TERMUX_INCLUDE_PREFIX_DIR = new File(TERMUX_INCLUDE_PREFIX_DIR_PATH);
 
 
     /** Termux app $PREFIX/lib directory path */
     public static final String TERMUX_LIB_PREFIX_DIR_PATH = TERMUX_PREFIX_DIR_PATH + "/lib"; // Default: "/data/data/com.termux/files/usr/lib"
     /** Termux app $PREFIX/lib directory */
-    public static final File TERMUX_LIB_DIR = new File(TERMUX_LIB_PREFIX_DIR_PATH);
+    public static final File TERMUX_LIB_PREFIX_DIR = new File(TERMUX_LIB_PREFIX_DIR_PATH);
 
 
     /** Termux app $PREFIX/libexec directory path */
     public static final String TERMUX_LIBEXEC_PREFIX_DIR_PATH = TERMUX_PREFIX_DIR_PATH + "/libexec"; // Default: "/data/data/com.termux/files/usr/libexec"
     /** Termux app $PREFIX/libexec directory */
-    public static final File TERMUX_LIBEXEC_DIR = new File(TERMUX_LIBEXEC_PREFIX_DIR_PATH);
+    public static final File TERMUX_LIBEXEC_PREFIX_DIR = new File(TERMUX_LIBEXEC_PREFIX_DIR_PATH);
 
 
     /** Termux app $PREFIX/share directory path */
     public static final String TERMUX_SHARE_PREFIX_DIR_PATH = TERMUX_PREFIX_DIR_PATH + "/share"; // Default: "/data/data/com.termux/files/usr/share"
     /** Termux app $PREFIX/share directory */
-    public static final File TERMUX_SHARE_DIR = new File(TERMUX_SHARE_PREFIX_DIR_PATH);
+    public static final File TERMUX_SHARE_PREFIX_DIR = new File(TERMUX_SHARE_PREFIX_DIR_PATH);
 
 
-    /** Termux app $PREFIX/tmp and $TMP directory path */
+    /** Termux app $PREFIX/tmp and $TMPDIR directory path */
     public static final String TERMUX_TMP_PREFIX_DIR_PATH = TERMUX_PREFIX_DIR_PATH + "/tmp"; // Default: "/data/data/com.termux/files/usr/tmp"
-    /** Termux app $PREFIX/tmp and $TMP directory */
-    public static final File TERMUX_TMP_DIR = new File(TERMUX_TMP_PREFIX_DIR_PATH);
+    /** Termux app $PREFIX/tmp and $TMPDIR directory */
+    public static final File TERMUX_TMP_PREFIX_DIR = new File(TERMUX_TMP_PREFIX_DIR_PATH);
 
 
     /** Termux app $PREFIX/var directory path */
     public static final String TERMUX_VAR_PREFIX_DIR_PATH = TERMUX_PREFIX_DIR_PATH + "/var"; // Default: "/data/data/com.termux/files/usr/var"
     /** Termux app $PREFIX/var directory */
-    public static final File TERMUX_VAR_DIR = new File(TERMUX_VAR_PREFIX_DIR_PATH);
+    public static final File TERMUX_VAR_PREFIX_DIR = new File(TERMUX_VAR_PREFIX_DIR_PATH);
 
 
 
@@ -398,6 +488,13 @@ public final class TermuxConstants {
     public static final File TERMUX_FONT_FILE = new File(TERMUX_FONT_FILE_PATH);
 
 
+    /** Termux app and plugins crash log file path */
+    public static final String TERMUX_CRASH_LOG_FILE_PATH = TERMUX_HOME_DIR_PATH + "/crash_log.md"; // Default: "/data/data/com.termux/files/home/crash_log.md"
+
+    /** Termux app and plugins crash log backup file path */
+    public static final String TERMUX_CRASH_LOG_BACKUP_FILE_PATH = TERMUX_HOME_DIR_PATH + "/crash_log_backup.md"; // Default: "/data/data/com.termux/files/home/crash_log_backup.md"
+
+
 
 
 
@@ -591,6 +688,9 @@ public static final class TERMUX_SERVICE {
          */
         public static final class RUN_COMMAND_SERVICE {
 
+            /** Termux RUN_COMMAND Intent help url */
+            public static final String RUN_COMMAND_API_HELP_URL = TERMUX_GITHUB_WIKI_REPO_URL + "/RUN_COMMAND-Intent"; // Default: "https://github.com/termux/termux-app/wiki/RUN_COMMAND-Intent"
+
             /** Intent action to execute command with RUN_COMMAND_SERVICE */
             public static final String ACTION_RUN_COMMAND = TERMUX_PACKAGE_NAME + ".RUN_COMMAND"; // Default: "com.termux.RUN_COMMAND"
             /** Intent {@code String} extra for absolute path of command for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent */

From 38323b1c2a364556556d5363415975f3861a7e4e Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Tue, 6 Apr 2021 12:21:22 +0500
Subject: [PATCH 312/912] Fix RUN_COMMAND Intent plugin api url

---
 app/src/main/java/com/termux/app/RunCommandService.java | 2 +-
 app/src/main/res/values/strings.xml                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/termux/app/RunCommandService.java b/app/src/main/java/com/termux/app/RunCommandService.java
index 67339f6f1d..800889bb90 100644
--- a/app/src/main/java/com/termux/app/RunCommandService.java
+++ b/app/src/main/java/com/termux/app/RunCommandService.java
@@ -302,7 +302,7 @@ public int onStartCommand(Intent intent, int flags, int startId) {
         runStartForeground();
 
         ExecutionCommand executionCommand = new ExecutionCommand();
-        executionCommand.pluginAPIHelp = this.getString(R.string.error_run_command_service_api_help, TermuxConstants.TERMUX_GITHUB_REPO_URL);
+        executionCommand.pluginAPIHelp = this.getString(R.string.error_run_command_service_api_help, RUN_COMMAND_SERVICE.RUN_COMMAND_API_HELP_URL);
 
         String errmsg;
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 89c4e1b148..2afc8a7dfc 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -89,7 +89,7 @@
     <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/blob/master/app/src/main/java/com/termux/app/RunCommandService.java for more info on RUN_COMMAND Intent usage.</string>
+    <string name="error_run_command_service_api_help">Visit %1$s for more info on RUN_COMMAND Intent usage.</string>
 
 
 

From 18b004a2ba6f35f2224343eed75621511fb27a22 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Tue, 6 Apr 2021 12:23:00 +0500
Subject: [PATCH 313/912] Fix Logger function modifier order

---
 .../java/com/termux/app/utils/Logger.java     | 65 ++++++++++---------
 1 file changed, 36 insertions(+), 29 deletions(-)

diff --git a/app/src/main/java/com/termux/app/utils/Logger.java b/app/src/main/java/com/termux/app/utils/Logger.java
index cd46288736..e296fc7ad6 100644
--- a/app/src/main/java/com/termux/app/utils/Logger.java
+++ b/app/src/main/java/com/termux/app/utils/Logger.java
@@ -31,7 +31,7 @@ public class Logger {
 
 
 
-    static public void logMesssage(int logLevel, String tag, String message) {
+    public static void logMesssage(int logLevel, String tag, String message) {
         if(logLevel == Log.ERROR && CURRENT_LOG_LEVEL >= LOG_LEVEL_NORMAL)
             Log.e(getFullTag(tag), message);
         else if(logLevel == Log.WARN && CURRENT_LOG_LEVEL >= LOG_LEVEL_NORMAL)
@@ -46,57 +46,57 @@ else if(logLevel == Log.VERBOSE && CURRENT_LOG_LEVEL >= LOG_LEVEL_VERBOSE)
 
 
 
-    static public void logError(String tag, String message) {
+    public static void logError(String tag, String message) {
         logMesssage(Log.ERROR, tag, message);
     }
 
-    static public void logError(String message) {
+    public static void logError(String message) {
         logMesssage(Log.ERROR, DEFAULT_LOG_TAG, message);
     }
 
 
 
-    static public void logWarn(String tag, String message) {
+    public static void logWarn(String tag, String message) {
         logMesssage(Log.WARN, tag, message);
     }
 
-    static public void logWarn(String message) {
+    public static void logWarn(String message) {
         logMesssage(Log.WARN, DEFAULT_LOG_TAG, message);
     }
 
 
 
-    static public void logInfo(String tag, String message) {
+    public static void logInfo(String tag, String message) {
         logMesssage(Log.INFO, tag, message);
     }
 
-    static public void logInfo(String message) {
+    public static void logInfo(String message) {
         logMesssage(Log.INFO, DEFAULT_LOG_TAG, message);
     }
 
 
 
-    static public void logDebug(String tag, String message) {
+    public static void logDebug(String tag, String message) {
         logMesssage(Log.DEBUG, tag, message);
     }
 
-    static public void logDebug(String message) {
+    public static void logDebug(String message) {
         logMesssage(Log.DEBUG, DEFAULT_LOG_TAG, message);
     }
 
 
 
-    static public void logVerbose(String tag, String message) {
+    public static void logVerbose(String tag, String message) {
         logMesssage(Log.VERBOSE, tag, message);
     }
 
-    static public void logVerbose(String message) {
+    public static void logVerbose(String message) {
         logMesssage(Log.VERBOSE, DEFAULT_LOG_TAG, message);
     }
 
 
 
-    static public void logErrorAndShowToast(Context context, String tag, String message) {
+    public static void logErrorAndShowToast(Context context, String tag, String message) {
         if (context == null) return;
 
         if(CURRENT_LOG_LEVEL >= LOG_LEVEL_NORMAL) {
@@ -105,13 +105,13 @@ static public void logErrorAndShowToast(Context context, String tag, String mess
         }
     }
 
-    static public void logErrorAndShowToast(Context context, String message) {
+    public static void logErrorAndShowToast(Context context, String message) {
         logErrorAndShowToast(context, DEFAULT_LOG_TAG, message);
     }
 
 
 
-    static public void logDebugAndShowToast(Context context, String tag, String message) {
+    public static void logDebugAndShowToast(Context context, String tag, String message) {
         if (context == null) return;
 
         if(CURRENT_LOG_LEVEL >= LOG_LEVEL_DEBUG) {
@@ -120,35 +120,35 @@ static public void logDebugAndShowToast(Context context, String tag, String mess
         }
     }
 
-    static public void logDebugAndShowToast(Context context, String message) {
+    public static void logDebugAndShowToast(Context context, String message) {
         logDebugAndShowToast(context, DEFAULT_LOG_TAG, message);
     }
 
 
 
-    static public void logStackTraceWithMessage(String tag, String message, Throwable throwable) {
+    public static void logStackTraceWithMessage(String tag, String message, Throwable throwable) {
         if(CURRENT_LOG_LEVEL >= LOG_LEVEL_NORMAL)
             Log.e(getFullTag(tag), getMessageAndStackTraceString(message, throwable));
     }
 
-    static public void logStackTraceWithMessage(String message, Throwable throwable) {
+    public static void logStackTraceWithMessage(String message, Throwable throwable) {
         logStackTraceWithMessage(DEFAULT_LOG_TAG, message, throwable);
     }
 
-    static public void logStackTrace(String tag, Throwable throwable) {
+    public static void logStackTrace(String tag, Throwable throwable) {
         logStackTraceWithMessage(tag, null, throwable);
     }
 
-    static public void logStackTrace(Throwable throwable) {
+    public static void logStackTrace(Throwable throwable) {
         logStackTraceWithMessage(DEFAULT_LOG_TAG, null, throwable);
     }
 
-    static public void logStackTracesWithMessage(String tag, String message, List<Throwable> throwableList) {
+    public static void logStackTracesWithMessage(String tag, String message, List<Throwable> throwableList) {
         if(CURRENT_LOG_LEVEL >= LOG_LEVEL_NORMAL)
             Log.e(getFullTag(tag), getMessageAndStackTracesString(message, throwableList));
     }
 
-    static public String getMessageAndStackTraceString(String message, Throwable throwable) {
+    public static String getMessageAndStackTraceString(String message, Throwable throwable) {
         if(message == null && throwable == null)
             return null;
         else if(message != null && throwable != null)
@@ -159,7 +159,7 @@ else if(throwable == null)
             return getStackTraceString(throwable);
     }
 
-    static public String getMessageAndStackTracesString(String message, List<Throwable> throwableList) {
+    public static String getMessageAndStackTracesString(String message, List<Throwable> throwableList) {
         if(message == null && (throwableList == null || throwableList.size() == 0))
             return null;
         else if(message != null && (throwableList != null && throwableList.size() != 0))
@@ -170,7 +170,7 @@ else if(throwableList == null || throwableList.size() == 0)
             return getStackTracesString(null, getStackTraceStringArray(throwableList));
     }
 
-    static public String getStackTraceString(Throwable throwable) {
+    public static String getStackTraceString(Throwable throwable) {
         if(throwable == null) return null;
 
         String stackTraceString = null;
@@ -188,7 +188,8 @@ static public String getStackTraceString(Throwable throwable) {
 
         return stackTraceString;
     }
-    private static String[] getStackTraceStringArray(Throwable throwable) {
+
+    public static String[] getStackTraceStringArray(Throwable throwable) {
         return getStackTraceStringArray(Collections.singletonList(throwable));
     }
 
@@ -210,7 +211,10 @@ public static String getStackTracesString(String label, String[] stackTraceStrin
             stackTracesString.append(" -");
         } else {
             for (int i = 0; i != stackTraceStringArray.length; i++) {
-                stackTracesString.append("\n\nStacktrace ").append(i + 1).append("\n```\n").append(stackTraceStringArray[i]).append("\n```\n");
+                if(stackTraceStringArray.length > 1)
+                    stackTracesString.append("\n\nStacktrace ").append(i + 1);
+
+                stackTracesString.append("\n```\n").append(stackTraceStringArray[i]).append("\n```\n");
             }
         }
 
@@ -218,14 +222,17 @@ public static String getStackTracesString(String label, String[] stackTraceStrin
     }
 
     public static String getStackTracesMarkdownString(String label, String[] stackTraceStringArray) {
-        if(label == null) label = "StackTraces:";
+        if(label == null) label = "StackTraces";
         StringBuilder stackTracesString = new StringBuilder("### " + label);
 
         if (stackTraceStringArray == null || stackTraceStringArray.length == 0) {
             stackTracesString.append("\n\n`-`");
         } else {
             for (int i = 0; i != stackTraceStringArray.length; i++) {
-                stackTracesString.append("\n\n\n#### Stacktrace ").append(i + 1).append("\n\n```\n").append(stackTraceStringArray[i]).append("\n```");
+                if(stackTraceStringArray.length > 1)
+                    stackTracesString.append("\n\n\n#### Stacktrace ").append(i + 1);
+
+                stackTracesString.append("\n\n```\n").append(stackTraceStringArray[i]).append("\n```");
             }
         }
 
@@ -250,7 +257,7 @@ public static String getMultiLineLogStringEntry(String label, Object object, Str
     
 
 
-    static public void showToast(final Context context, final String toastText, boolean longDuration) {
+    public static void showToast(final Context context, final String toastText, boolean longDuration) {
         if (context == null) return;
 
         new Handler(Looper.getMainLooper()).post(() -> Toast.makeText(context, toastText, longDuration ? Toast.LENGTH_LONG : Toast.LENGTH_SHORT).show());
@@ -313,7 +320,7 @@ public static int setLogLevel(Context context, int logLevel) {
         return CURRENT_LOG_LEVEL;
     }
 
-    static public String getFullTag(String tag) {
+    public static String getFullTag(String tag) {
         if(DEFAULT_LOG_TAG.equals(tag))
             return tag;
         else

From cf5bb69fc88b9e0c254a1b9ac0eabe7a40782ac1 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Tue, 6 Apr 2021 12:48:56 +0500
Subject: [PATCH 314/912] Add crash_report_notifications_enabled shared
 preferences

This will allow users to control if a notification should be shown with the crash info when app is restarted after a crash

The `TermuxPreferenceConstants` classes has been updated to `v0.8.0`. Check its Changelog section for info on changes.
---
 .../settings/DebuggingPreferencesFragment.java       |  5 +++++
 .../preferences/TermuxAppSharedPreferences.java      | 10 ++++++++++
 .../preferences/TermuxPreferenceConstants.java       | 12 +++++++++++-
 app/src/main/res/values/strings.xml                  |  5 +++++
 app/src/main/res/xml/debugging_preferences.xml       |  6 ++++++
 5 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/termux/app/fragments/settings/DebuggingPreferencesFragment.java b/app/src/main/java/com/termux/app/fragments/settings/DebuggingPreferencesFragment.java
index d8841eb477..61f99156b4 100644
--- a/app/src/main/java/com/termux/app/fragments/settings/DebuggingPreferencesFragment.java
+++ b/app/src/main/java/com/termux/app/fragments/settings/DebuggingPreferencesFragment.java
@@ -111,6 +111,9 @@ public void putBoolean(String key, boolean value) {
             case "plugin_error_notifications_enabled":
                 mPreferences.setPluginErrorNotificationsEnabled(value);
                 break;
+            case "crash_report_notifications_enabled":
+                mPreferences.setCrashReportNotificationsEnabled(value);
+                break;
             default:
                 break;
         }
@@ -123,6 +126,8 @@ public boolean getBoolean(String key, boolean defValue) {
                 return mPreferences.getTerminalViewKeyLoggingEnabled();
             case "plugin_error_notifications_enabled":
                 return mPreferences.getPluginErrorNotificationsEnabled();
+            case "crash_report_notifications_enabled":
+                return mPreferences.getCrashReportNotificationsEnabled();
             default:
                 return false;
         }
diff --git a/app/src/main/java/com/termux/app/settings/preferences/TermuxAppSharedPreferences.java b/app/src/main/java/com/termux/app/settings/preferences/TermuxAppSharedPreferences.java
index 2d7db91596..ba2b37a2f4 100644
--- a/app/src/main/java/com/termux/app/settings/preferences/TermuxAppSharedPreferences.java
+++ b/app/src/main/java/com/termux/app/settings/preferences/TermuxAppSharedPreferences.java
@@ -161,4 +161,14 @@ public void setPluginErrorNotificationsEnabled(boolean value) {
         SharedPreferenceUtils.setBoolean(mSharedPreferences, TERMUX_APP.KEY_PLUGIN_ERROR_NOTIFICATIONS_ENABLED, value, false);
     }
 
+
+
+    public boolean getCrashReportNotificationsEnabled() {
+        return SharedPreferenceUtils.getBoolean(mSharedPreferences, TERMUX_APP.KEY_CRASH_REPORT_NOTIFICATIONS_ENABLED, TERMUX_APP.DEFAULT_VALUE_CRASH_REPORT_NOTIFICATIONS_ENABLED);
+    }
+
+    public void setCrashReportNotificationsEnabled(boolean value) {
+        SharedPreferenceUtils.setBoolean(mSharedPreferences, TERMUX_APP.KEY_CRASH_REPORT_NOTIFICATIONS_ENABLED, value, false);
+    }
+
 }
diff --git a/app/src/main/java/com/termux/app/settings/preferences/TermuxPreferenceConstants.java b/app/src/main/java/com/termux/app/settings/preferences/TermuxPreferenceConstants.java
index fd4aef0722..2d3afd6e73 100644
--- a/app/src/main/java/com/termux/app/settings/preferences/TermuxPreferenceConstants.java
+++ b/app/src/main/java/com/termux/app/settings/preferences/TermuxPreferenceConstants.java
@@ -1,7 +1,7 @@
 package com.termux.app.settings.preferences;
 
 /*
- * Version: v0.7.0
+ * Version: v0.8.0
  *
  * Changelog
  *
@@ -33,6 +33,10 @@
  * - 0.7.0 (2021-03-27)
  *      - Added following to `TERMUX_APP`:
  *          `KEY_SOFT_KEYBOARD_ENABLED` and `DEFAULT_VALUE_KEY_SOFT_KEYBOARD_ENABLED`.
+ *
+ * - 0.8.0 (2021-04-06)
+ *      - Added following to `TERMUX_APP`:
+ *          `KEY_CRASH_REPORT_NOTIFICATIONS_ENABLED` and `DEFAULT_VALUE_CRASH_REPORT_NOTIFICATIONS_ENABLED`.
  */
 
 /**
@@ -108,6 +112,12 @@ public static final class TERMUX_APP {
         public static final String KEY_PLUGIN_ERROR_NOTIFICATIONS_ENABLED = "plugin_error_notifications_enabled";
         public static final boolean DEFAULT_VALUE_PLUGIN_ERROR_NOTIFICATIONS_ENABLED = true;
 
+        /**
+         * Defines the key for whether notifications for crash reports are enabled or not.
+         */
+        public static final String KEY_CRASH_REPORT_NOTIFICATIONS_ENABLED = "crash_report_notifications_enabled";
+        public static final boolean DEFAULT_VALUE_CRASH_REPORT_NOTIFICATIONS_ENABLED = true;
+
     }
 
     /**
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2afc8a7dfc..c3a127581c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -201,6 +201,11 @@
             <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>
 
+            <!-- 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="terminal_io_preferences">Terminal I/O</string>
diff --git a/app/src/main/res/xml/debugging_preferences.xml b/app/src/main/res/xml/debugging_preferences.xml
index af126ff38f..48e44f98d1 100644
--- a/app/src/main/res/xml/debugging_preferences.xml
+++ b/app/src/main/res/xml/debugging_preferences.xml
@@ -22,6 +22,12 @@
             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>

From 325a6f7d660d66cdafa2238cd227ae698aab0cca Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Tue, 6 Apr 2021 13:27:43 +0500
Subject: [PATCH 315/912] Fix SettingsActivity shortcut not showing on android
 7 and fixed shortcut actions and categories

---
 app/src/main/AndroidManifest.xml   |  1 +
 app/src/main/res/xml/shortcuts.xml | 14 +++++++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 888d269458..cef9943d05 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -98,6 +98,7 @@
 
         <activity
             android:name=".app.activities.SettingsActivity"
+            android:exported="true"
             android:label="@string/title_activity_termux_settings"
             android:theme="@style/Theme.AppCompat.Light.DarkActionBar" />
 
diff --git a/app/src/main/res/xml/shortcuts.xml b/app/src/main/res/xml/shortcuts.xml
index 61683ca554..dcd8d341cc 100644
--- a/app/src/main/res/xml/shortcuts.xml
+++ b/app/src/main/res/xml/shortcuts.xml
@@ -9,6 +9,7 @@
         need to be manually patched since dot (.) prefix does not work to automatically prefix the
         package name.
     -->
+
     <shortcut
         android:shortcutId="new_session"
         android:enabled="true"
@@ -18,7 +19,8 @@
         <intent
             android:action="android.intent.action.RUN"
             android:targetPackage="com.termux"
-            android:targetClass="com.termux.app.TermuxActivity"/>
+            android:targetClass="com.termux.app.TermuxActivity"
+            android:name="android.shortcut.conversation"/>
     </shortcut>
 
     <shortcut
@@ -30,8 +32,9 @@
         <intent
             android:action="android.intent.action.RUN"
             android:targetPackage="com.termux"
-            android:targetClass="com.termux.app.TermuxActivity">
-            <extra android:name="com.termux.app.failsafe_session" android:value="true" />
+            android:targetClass="com.termux.app.TermuxActivity"
+            android:name="android.shortcut.conversation">
+            <extra android:name="com.termux.app.failsafe_session" android:value="true"/>
         </intent>
     </shortcut>
 
@@ -42,9 +45,10 @@
         android:shortcutShortLabel="@string/action_open_settings"
         tools:targetApi="n_mr1">
         <intent
-            android:action="android.intent.action.RUN"
+            android:action="android.intent.action.VIEW"
             android:targetPackage="com.termux"
-            android:targetClass="com.termux.app.activities.SettingsActivity"/>
+            android:targetClass="com.termux.app.activities.SettingsActivity"
+            android:name="android.shortcut.conversation"/>
     </shortcut>
 
 </shortcuts>

From 07e6ecd3c35628d27e10aa85841e642152687e0d Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Tue, 6 Apr 2021 16:13:28 +0500
Subject: [PATCH 316/912] Update TermuxConstants

The `TermuxConstants` classes has been updated to `v0.16.0`. Check its Changelog section for info on changes.
---
 .../java/com/termux/app/TermuxConstants.java  | 24 ++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/termux/app/TermuxConstants.java b/app/src/main/java/com/termux/app/TermuxConstants.java
index dc47d0f833..798e48a88e 100644
--- a/app/src/main/java/com/termux/app/TermuxConstants.java
+++ b/app/src/main/java/com/termux/app/TermuxConstants.java
@@ -5,7 +5,7 @@
 import java.io.File;
 
 /*
- * Version: v0.15.0
+ * Version: v0.16.0
  *
  * Changelog
  *
@@ -113,6 +113,11 @@
  *          `TERMUX_X11_PACKAGES_GITHUB_REPO_NAME`, `TERMUX_X11_PACKAGES_GITHUB_REPO_URL`, `TERMUX_X11_PACKAGES_GITHUB_ISSUES_REPO_URL`.
  *      - Added following to `RUN_COMMAND_SERVICE`:
  *          `RUN_COMMAND_API_HELP_URL`.
+ *
+ * - 0.16.0 (2021-04-06)
+ *      - Added `TERMUX_SUPPORT_EMAIL`, `TERMUX_SUPPORT_EMAIL_URL`, `TERMUX_SUPPORT_EMAIL_MAILTO_URL`,
+ *          `TERMUX_REDDIT_SUBREDDIT`, `TERMUX_REDDIT_SUBREDDIT_URL`.
+ *      - The `TERMUX_SUPPORT_EMAIL_URL` value must be fixed later when email has been set up.
  */
 
 /**
@@ -163,11 +168,28 @@ public final class TermuxConstants {
     /** Termux Github organization url */
     public static final String TERMUX_GITHUB_ORGANIZATION_URL = "https://github.com" + "/" + TERMUX_GITHUB_ORGANIZATION_NAME; // Default: "https://github.com/termux"
 
+    /** Termux support email */
+    public static final String TERMUX_SUPPORT_EMAIL = "support"; // Default: "support"
+
+    /** Termux support email url */
+    public static final String TERMUX_SUPPORT_EMAIL_URL = "email@example.com"; // Default: "email@example.com"
+
+    /** Termux support email mailto url */
+    public static final String TERMUX_SUPPORT_EMAIL_MAILTO_URL = "mailto:" + TERMUX_SUPPORT_EMAIL_URL; // Default: "mailto:email@example.com"
+
+    /** Termux Reddit subreddit */
+    public static final String TERMUX_REDDIT_SUBREDDIT = "r/termux"; // Default: "r/termux"
+
+    /** Termux Reddit subreddit url */
+    public static final String TERMUX_REDDIT_SUBREDDIT_URL = "https://www.reddit.com/r/termux"; // Default: "https://www.reddit.com/r/termux"
+
     /** F-Droid packages base url */
     public static final String FDROID_PACKAGES_BASE_URL = "https://f-droid.org/en/packages"; // Default: "https://f-droid.org/en/packages"
 
 
 
+
+
     /*
      * Termux and its plugin app and package names and urls.
      */

From 69e4b575a87a21e5895ad48bb38e4f200e982f9a Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Tue, 6 Apr 2021 16:15:00 +0500
Subject: [PATCH 317/912] Implement crash handler and reporting

Now whenever the Termux app crashes, the crash report (stacktrace, app and device info) will be logged to ~/crash_log.md file. When the user will reopen the app, a notification will be shown which when clicked will show the crash report content in the ReportActivity. The activity will have important links like email, reddit, github issues of termux app and packages at which the user can optionally report an issue if necessary after copying the crash report text. The ~/crash_log.md file will be moved to ~/crash_log-backup.md so that a notification is not shown again on next startup and can be viewed again via SAF, etc.

This will allow reports for bugs that are submitted to have complete and useful info, specially in markdown format, making lives of devs a tad bit easier. Also more bugs that are rare might be submitted since users will have the info to report with and know where to report at.

ToDo:
- The TermuxConstants.TERMUX_SUPPORT_EMAIL_URL needs to be updated with a valid support email once its set up. The TermuxUtils.getReportIssueMarkdownString() function currently also has "email" lines commented out which will need to be uncommented.
- Currently, crashes will only be handled for the main app thread, other threads will have to manually hooked into where necessary.
---
 .../java/com/termux/app/TermuxActivity.java   |   5 +
 .../com/termux/app/TermuxApplication.java     |   9 +-
 .../termux/app/activities/ReportActivity.java |  21 +-
 .../com/termux/app/crash/CrashHandler.java    |  34 ++++
 .../java/com/termux/app/crash/CrashUtils.java | 189 ++++++++++++++++++
 .../termux/app/models/ExecutionCommand.java   |   2 +-
 .../com/termux/app/models/ReportInfo.java     |  30 +--
 .../com/termux/app/models/UserAction.java     |   3 +-
 .../com/termux/app/utils/MarkdownUtils.java   |   7 +
 .../com/termux/app/utils/PluginUtils.java     |   8 +-
 .../com/termux/app/utils/TermuxUtils.java     |  46 ++++-
 app/src/main/res/values/strings.xml           |   2 +
 12 files changed, 329 insertions(+), 27 deletions(-)
 create mode 100644 app/src/main/java/com/termux/app/crash/CrashHandler.java
 create mode 100644 app/src/main/java/com/termux/app/crash/CrashUtils.java

diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index e586540289..5d872ee5b0 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -34,6 +34,7 @@
 import com.termux.app.TermuxConstants.TERMUX_APP.TERMUX_ACTIVITY;
 import com.termux.app.activities.HelpActivity;
 import com.termux.app.activities.SettingsActivity;
+import com.termux.app.crash.CrashUtils;
 import com.termux.app.settings.preferences.TermuxAppSharedPreferences;
 import com.termux.app.terminal.TermuxSessionsListViewController;
 import com.termux.app.terminal.io.TerminalToolbarViewPager;
@@ -155,6 +156,10 @@ public void onCreate(Bundle savedInstanceState) {
 
         Logger.logDebug(LOG_TAG, "onCreate");
 
+        // Check if a crash happened on last run of the app and show a
+        // notification with the crash details if it did
+        CrashUtils.notifyCrash(this, LOG_TAG);
+
         // Load termux shared preferences and properties
         mPreferences = new TermuxAppSharedPreferences(this);
         mProperties = new TermuxSharedProperties(this);
diff --git a/app/src/main/java/com/termux/app/TermuxApplication.java b/app/src/main/java/com/termux/app/TermuxApplication.java
index 53d129eb2f..62713ac20f 100644
--- a/app/src/main/java/com/termux/app/TermuxApplication.java
+++ b/app/src/main/java/com/termux/app/TermuxApplication.java
@@ -2,6 +2,7 @@
 
 import android.app.Application;
 
+import com.termux.app.crash.CrashHandler;
 import com.termux.app.settings.preferences.TermuxAppSharedPreferences;
 import com.termux.app.utils.Logger;
 
@@ -10,10 +11,14 @@ public class TermuxApplication extends Application {
     public void onCreate() {
         super.onCreate();
 
-        updateLogLevel();
+        // Set crash handler for the app
+        CrashHandler.setCrashHandler(this);
+
+        // Set log level for the app
+        setLogLevel();
     }
 
-    private void updateLogLevel() {
+    private void setLogLevel() {
         // Load the log level from shared preferences and set it to the {@link Loggger.CURRENT_LOG_LEVEL}
         TermuxAppSharedPreferences preferences = new TermuxAppSharedPreferences(getApplicationContext());
         preferences.setLogLevel(null, preferences.getLogLevel());
diff --git a/app/src/main/java/com/termux/app/activities/ReportActivity.java b/app/src/main/java/com/termux/app/activities/ReportActivity.java
index ae3b5db03a..57a4ae3c03 100644
--- a/app/src/main/java/com/termux/app/activities/ReportActivity.java
+++ b/app/src/main/java/com/termux/app/activities/ReportActivity.java
@@ -18,7 +18,6 @@
 import com.termux.app.TermuxConstants;
 import com.termux.app.utils.MarkdownUtils;
 import com.termux.app.utils.ShareUtils;
-import com.termux.app.utils.TermuxUtils;
 import com.termux.app.models.ReportInfo;
 
 import org.commonmark.node.FencedCodeBlock;
@@ -32,6 +31,7 @@ public class ReportActivity extends AppCompatActivity {
     private static final String EXTRA_REPORT_INFO = "report_info";
 
     ReportInfo mReportInfo;
+    String mReportMarkdownString;
     String mReportActivityMarkdownString;
 
     @Override
@@ -131,11 +131,11 @@ public void onBackPressed() {
     public boolean onOptionsItemSelected(final MenuItem item) {
         int id = item.getItemId();
         if (id == R.id.menu_item_share_report) {
-            if (mReportInfo != null)
-                ShareUtils.shareText(this, getString(R.string.title_report_text), mReportActivityMarkdownString);
+            if (mReportMarkdownString != null)
+                ShareUtils.shareText(this, getString(R.string.title_report_text), mReportMarkdownString);
         } else if (id == R.id.menu_item_copy_report) {
-            if (mReportInfo != null)
-                ShareUtils.copyTextToClipboard(this, mReportActivityMarkdownString, null);
+            if (mReportMarkdownString != null)
+                ShareUtils.copyTextToClipboard(this, mReportMarkdownString, null);
         }
 
         return false;
@@ -145,7 +145,16 @@ public boolean onOptionsItemSelected(final MenuItem item) {
      * Generate the markdown {@link String} to be shown in {@link ReportActivity}.
      */
     private void generateReportActivityMarkdownString() {
-        mReportActivityMarkdownString = ReportInfo.getReportInfoMarkdownString(this, mReportInfo);
+        mReportMarkdownString = ReportInfo.getReportInfoMarkdownString(mReportInfo);
+
+        mReportActivityMarkdownString = "";
+        if(mReportInfo.reportStringPrefix != null)
+            mReportActivityMarkdownString += mReportInfo.reportStringPrefix;
+
+        mReportActivityMarkdownString += mReportMarkdownString;
+
+        if(mReportInfo.reportStringSuffix != null)
+            mReportActivityMarkdownString += mReportInfo.reportStringSuffix;
     }
 
 
diff --git a/app/src/main/java/com/termux/app/crash/CrashHandler.java b/app/src/main/java/com/termux/app/crash/CrashHandler.java
new file mode 100644
index 0000000000..7de2f1aa35
--- /dev/null
+++ b/app/src/main/java/com/termux/app/crash/CrashHandler.java
@@ -0,0 +1,34 @@
+package com.termux.app.crash;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+
+/**
+ * Catches uncaught exceptions and logs them.
+ */
+public class CrashHandler implements Thread.UncaughtExceptionHandler {
+
+    private final Context context;
+    private final Thread.UncaughtExceptionHandler defaultUEH;
+
+    private CrashHandler(final Context context) {
+        this.context = context;
+        this.defaultUEH = Thread.getDefaultUncaughtExceptionHandler();
+    }
+
+    public void uncaughtException(@NonNull Thread thread, @NonNull Throwable throwable) {
+        CrashUtils.logCrash(context,thread, throwable);
+        defaultUEH.uncaughtException(thread, throwable);
+    }
+
+    /**
+     * Set default uncaught crash handler of current thread to {@link CrashHandler}.
+     */
+    public static void setCrashHandler(final Context context) {
+        if(!(Thread.getDefaultUncaughtExceptionHandler() instanceof CrashHandler)) {
+            Thread.setDefaultUncaughtExceptionHandler(new CrashHandler(context));
+        }
+    }
+
+}
diff --git a/app/src/main/java/com/termux/app/crash/CrashUtils.java b/app/src/main/java/com/termux/app/crash/CrashUtils.java
new file mode 100644
index 0000000000..c4d900d857
--- /dev/null
+++ b/app/src/main/java/com/termux/app/crash/CrashUtils.java
@@ -0,0 +1,189 @@
+package com.termux.app.crash;
+
+import android.app.Notification;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.content.Context;
+import android.content.Intent;
+
+import androidx.annotation.Nullable;
+
+import com.termux.R;
+import com.termux.app.activities.ReportActivity;
+import com.termux.app.file.FileUtils;
+import com.termux.app.models.ReportInfo;
+import com.termux.app.models.UserAction;
+import com.termux.app.settings.preferences.TermuxAppSharedPreferences;
+import com.termux.app.settings.preferences.TermuxPreferenceConstants;
+import com.termux.app.utils.DataUtils;
+import com.termux.app.utils.Logger;
+import com.termux.app.utils.MarkdownUtils;
+import com.termux.app.utils.NotificationUtils;
+import com.termux.app.utils.TermuxUtils;
+
+import com.termux.app.TermuxConstants;
+
+import java.nio.charset.Charset;
+
+public class CrashUtils {
+
+    private static final String NOTIFICATION_CHANNEL_ID_CRASH_REPORT_ERRORS = "termux_crash_reports_notification_channel";
+    private static final String NOTIFICATION_CHANNEL_NAME_CRASH_REPORT_ERRORS = TermuxConstants.TERMUX_APP_NAME + " Crash Reports";
+
+    private static final String LOG_TAG = "CrashUtils";
+
+    /**
+     * Log a crash in the crash log file at
+     * {@link TermuxConstants#TERMUX_CRASH_LOG_FILE_PATH}.
+     *
+     * @param context The {@link Context} for operations.
+     * @param thread The {@link Thread} in which the crash happened.
+     * @param thread The {@link Throwable} thrown for the crash.
+     */
+    public static void logCrash(final Context context, final Thread thread, final Throwable throwable) {
+
+        StringBuilder reportString = new StringBuilder();
+
+        reportString.append("## Crash Details\n");
+        reportString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Crash Thread", thread.toString(), "-"));
+        reportString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Crash Timestamp", TermuxUtils.getCurrentTimeStamp(), "-"));
+
+        reportString.append("\n\n").append(Logger.getStackTracesMarkdownString("Stacktrace", Logger.getStackTraceStringArray(throwable)));
+        reportString.append("\n\n").append(TermuxUtils.getAppInfoMarkdownString(context, true));
+        reportString.append("\n\n").append(TermuxUtils.getDeviceInfoMarkdownString(context));
+
+        // Log report string to logcat
+        Logger.logError(reportString.toString());
+
+        // Write report string to crash log file
+        String errmsg = FileUtils.writeStringToFile(context, "crash log", TermuxConstants.TERMUX_CRASH_LOG_FILE_PATH, Charset.defaultCharset(), reportString.toString(), false);
+        if(errmsg != null) {
+            Logger.logError(LOG_TAG, errmsg);
+        }
+    }
+
+    /**
+     * 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}.
+     *
+     * If the crash log file exists and is not empty and
+     * {@link TermuxPreferenceConstants.TERMUX_APP#KEY_CRASH_REPORT_NOTIFICATIONS_ENABLED} is
+     * enabled, then a notification will be shown for the crash on the
+     * {@link #NOTIFICATION_CHANNEL_NAME_CRASH_REPORT_ERRORS} channel, otherwise nothing will be done.
+     *
+     * After reading from the crash log file, it will be moved to {@link TermuxConstants#TERMUX_CRASH_LOG_BACKUP_FILE_PATH}.
+     *
+     * @param context The {@link Context} for operations.
+     * @param logTagParam The log tag to use for logging.
+     */
+    public static void notifyCrash(final Context context, final String logTagParam) {
+        if(context == null) return;
+
+
+        TermuxAppSharedPreferences preferences = new TermuxAppSharedPreferences(context);
+        // If user has disabled notifications for crashes
+        if (!preferences.getCrashReportNotificationsEnabled())
+            return;
+
+        new Thread() {
+            @Override
+            public void run() {
+                String logTag = DataUtils.getDefaultIfNull(logTagParam, LOG_TAG);
+
+                if(!FileUtils.regularFileExists(TermuxConstants.TERMUX_CRASH_LOG_FILE_PATH, false))
+                    return;
+
+                String errmsg;
+                StringBuilder reportStringBuilder = new StringBuilder();
+
+                // Read report string from crash log file
+                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
+                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 == null || reportString.isEmpty())
+                    return;
+
+                // 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, "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();
+    }
+
+    /**
+     * Get {@link Notification.Builder} for {@link #NOTIFICATION_CHANNEL_ID_CRASH_REPORT_ERRORS}
+     * and {@link #NOTIFICATION_CHANNEL_NAME_CRASH_REPORT_ERRORS}.
+     *
+     * @param context The {@link Context} for operations.
+     * @param title The title for the notification.
+     * @param notifiationText The second line text of the notification.
+     * @param notificationBigText The full text of the notification that may optionally be styled.
+     * @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 notifiationText, final CharSequence notificationBigText, final PendingIntent pendingIntent, final int notificationMode) {
+
+        Notification.Builder builder =  NotificationUtils.geNotificationBuilder(context,
+            NOTIFICATION_CHANNEL_ID_CRASH_REPORT_ERRORS, Notification.PRIORITY_HIGH,
+            title, notifiationText, notificationBigText, pendingIntent, notificationMode);
+
+        if(builder == null)  return null;
+
+        // Enable timestamp
+        builder.setShowWhen(true);
+
+        // Set notification icon
+        builder.setSmallIcon(R.drawable.ic_error_notification);
+
+        // Set background color for small notification icon
+        builder.setColor(0xFF607D8B);
+
+        // Dismiss on click
+        builder.setAutoCancel(true);
+
+        return builder;
+    }
+
+    /**
+     * Setup the notification channel for {@link #NOTIFICATION_CHANNEL_ID_CRASH_REPORT_ERRORS} and
+     * {@link #NOTIFICATION_CHANNEL_NAME_CRASH_REPORT_ERRORS}.
+     *
+     * @param context The {@link Context} for operations.
+     */
+    public static void setupCrashReportsNotificationChannel(final Context context) {
+        NotificationUtils.setupNotificationChannel(context, NOTIFICATION_CHANNEL_ID_CRASH_REPORT_ERRORS,
+            NOTIFICATION_CHANNEL_NAME_CRASH_REPORT_ERRORS, NotificationManager.IMPORTANCE_HIGH);
+    }
+
+}
diff --git a/app/src/main/java/com/termux/app/models/ExecutionCommand.java b/app/src/main/java/com/termux/app/models/ExecutionCommand.java
index 2de23ffc9b..aa83d74722 100644
--- a/app/src/main/java/com/termux/app/models/ExecutionCommand.java
+++ b/app/src/main/java/com/termux/app/models/ExecutionCommand.java
@@ -415,7 +415,7 @@ public String geStackTracesLogString() {
     }
 
     public String geStackTracesMarkdownString() {
-        return Logger.getStackTracesMarkdownString("StackTraces:", Logger.getStackTraceStringArray(throwableList));
+        return Logger.getStackTracesMarkdownString("StackTraces", Logger.getStackTraceStringArray(throwableList));
     }
 
 
diff --git a/app/src/main/java/com/termux/app/models/ReportInfo.java b/app/src/main/java/com/termux/app/models/ReportInfo.java
index 7832d64602..cd12e5ed55 100644
--- a/app/src/main/java/com/termux/app/models/ReportInfo.java
+++ b/app/src/main/java/com/termux/app/models/ReportInfo.java
@@ -1,7 +1,5 @@
 package com.termux.app.models;
 
-import android.content.Context;
-
 import com.termux.app.utils.MarkdownUtils;
 import com.termux.app.utils.TermuxUtils;
 
@@ -15,49 +13,51 @@ public class ReportInfo implements Serializable {
     public String sender;
     /** The report title. */
     public String reportTitle;
-    /** The markdown text for the report. */
+    /** The markdown report text prefix. Will not be part of copy and share operations, etc. */
+    public String reportStringPrefix;
+    /** The markdown report text. */
     public String reportString;
+    /** The markdown report text suffix. Will not be part of copy and share operations, etc. */
+    public String reportStringSuffix;
     /** If set to {@code true}, then report, app and device info will be added to the report when
      * markdown is generated.
      */
     public boolean addReportInfoToMarkdown;
     /** The timestamp for the report. */
-    public String creationTimestammp;
+    public String reportTimestammp;
 
-    public ReportInfo(UserAction userAction, String sender, String reportTitle, String reportString, boolean addReportInfoToMarkdown) {
+    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.addReportInfoToMarkdown = addReportInfoToMarkdown;
-        this.creationTimestammp = TermuxUtils.getCurrentTimeStamp();
+        this.reportTimestammp = TermuxUtils.getCurrentTimeStamp();
     }
 
     /**
      * Get a markdown {@link String} for {@link ReportInfo}.
      *
-     * @param currentPackageContext The context of current package.
      * @param reportInfo The {@link ReportInfo} to convert.
      * @return Returns the markdown {@link String}.
      */
-    public static String getReportInfoMarkdownString(final Context currentPackageContext, final ReportInfo reportInfo) {
+    public static String getReportInfoMarkdownString(final ReportInfo reportInfo) {
         if (reportInfo == null) return "null";
 
         StringBuilder markdownString = new StringBuilder();
 
-        markdownString.append(reportInfo.reportString);
-
         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, "-"));
-            markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Creation Timestamp", reportInfo.creationTimestammp, "-"));
-            markdownString.append("\n##\n");
-
-            markdownString.append("\n\n").append(TermuxUtils.getAppInfoMarkdownString(currentPackageContext, true));
-            markdownString.append("\n\n").append(TermuxUtils.getDeviceInfoMarkdownString(currentPackageContext));
+            markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Report Timestamp", reportInfo.reportTimestammp, "-"));
+            markdownString.append("\n##\n\n");
         }
 
+        markdownString.append(reportInfo.reportString);
+
         return markdownString.toString();
     }
 
diff --git a/app/src/main/java/com/termux/app/models/UserAction.java b/app/src/main/java/com/termux/app/models/UserAction.java
index 611304ea2f..9a27992fc4 100644
--- a/app/src/main/java/com/termux/app/models/UserAction.java
+++ b/app/src/main/java/com/termux/app/models/UserAction.java
@@ -2,7 +2,8 @@
 
 public enum UserAction {
 
-    PLUGIN_EXECUTION_COMMAND("plugin execution command");
+    PLUGIN_EXECUTION_COMMAND("plugin execution command"),
+    CRASH_REPORT("crash report");
 
     private final String name;
 
diff --git a/app/src/main/java/com/termux/app/utils/MarkdownUtils.java b/app/src/main/java/com/termux/app/utils/MarkdownUtils.java
index 712b01b232..5d40a20393 100644
--- a/app/src/main/java/com/termux/app/utils/MarkdownUtils.java
+++ b/app/src/main/java/com/termux/app/utils/MarkdownUtils.java
@@ -117,6 +117,13 @@ public static String getMultiLineMarkdownStringEntry(String label, Object object
             return "**" + label + "**: " + def + "\n";
     }
 
+    public static String getLinkMarkdownString(String label, Object object) {
+        if (object != null)
+            return "[" + label + "](" + object +  ")";
+        else
+            return label;
+    }
+
 
     /** Check following for more info:
      * https://github.com/noties/Markwon/tree/v4.6.2/app-sample
diff --git a/app/src/main/java/com/termux/app/utils/PluginUtils.java b/app/src/main/java/com/termux/app/utils/PluginUtils.java
index 4c9bc136a4..f95dd35a30 100644
--- a/app/src/main/java/com/termux/app/utils/PluginUtils.java
+++ b/app/src/main/java/com/termux/app/utils/PluginUtils.java
@@ -149,7 +149,13 @@ public static void processPluginExecutionCommandError(final Context context, Str
         // to show the details of the error
         String title = TermuxConstants.TERMUX_APP_NAME + " Plugin Execution Command Error";
 
-        Intent notificationIntent = ReportActivity.newInstance(context, new ReportInfo(UserAction.PLUGIN_EXECUTION_COMMAND, logTag, title, ExecutionCommand.getExecutionCommandMarkdownString(executionCommand), true));
+        StringBuilder reportString = new StringBuilder();
+
+        reportString.append(ExecutionCommand.getExecutionCommandMarkdownString(executionCommand));
+        reportString.append("\n\n").append(TermuxUtils.getAppInfoMarkdownString(context, true));
+        reportString.append("\n\n").append(TermuxUtils.getDeviceInfoMarkdownString(context));
+
+        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
diff --git a/app/src/main/java/com/termux/app/utils/TermuxUtils.java b/app/src/main/java/com/termux/app/utils/TermuxUtils.java
index 9640b63fed..79ead17aea 100644
--- a/app/src/main/java/com/termux/app/utils/TermuxUtils.java
+++ b/app/src/main/java/com/termux/app/utils/TermuxUtils.java
@@ -11,6 +11,7 @@
 
 import com.google.common.base.Joiner;
 
+import com.termux.R;
 import com.termux.app.TermuxConstants;
 
 import java.io.BufferedReader;
@@ -238,6 +239,49 @@ public static String getDeviceInfoMarkdownString(@NonNull final Context context)
         return markdownString.toString();
     }
 
+    /**
+     * Get a markdown {@link String} for reporting an issue.
+     *
+     * @param context The context for operations.
+     * @return Returns the markdown {@link String}.
+     */
+    public static String getReportIssueMarkdownString(@NonNull final Context context) {
+        if (context == null) return "null";
+
+        StringBuilder markdownString = new StringBuilder();
+
+        markdownString.append("## Report Issue");
+
+        markdownString.append("\n\n").append(context.getString(R.string.msg_report_issue)).append("\n");
+
+        //markdownString.append("\n\n### Email\n");
+        //markdownString.append("\n").append(MarkdownUtils.getLinkMarkdownString(TermuxConstants.TERMUX_SUPPORT_EMAIL, TermuxConstants.TERMUX_SUPPORT_EMAIL_MAILTO_URL)).append("  ");
+
+        markdownString.append("\n\n### Reddit\n");
+        markdownString.append("\n").append(MarkdownUtils.getLinkMarkdownString(TermuxConstants.TERMUX_REDDIT_SUBREDDIT, TermuxConstants.TERMUX_REDDIT_SUBREDDIT_URL)).append("  ");
+
+        markdownString.append("\n\n### Github Issues for Termux apps\n");
+        markdownString.append("\n").append(MarkdownUtils.getLinkMarkdownString(TermuxConstants.TERMUX_APP_NAME, TermuxConstants.TERMUX_GITHUB_ISSUES_REPO_URL)).append("  ");
+        markdownString.append("\n").append(MarkdownUtils.getLinkMarkdownString(TermuxConstants.TERMUX_API_APP_NAME, TermuxConstants.TERMUX_API_GITHUB_ISSUES_REPO_URL)).append("  ");
+        markdownString.append("\n").append(MarkdownUtils.getLinkMarkdownString(TermuxConstants.TERMUX_BOOT_APP_NAME, TermuxConstants.TERMUX_BOOT_GITHUB_ISSUES_REPO_URL)).append("  ");
+        markdownString.append("\n").append(MarkdownUtils.getLinkMarkdownString(TermuxConstants.TERMUX_FLOAT_APP_NAME, TermuxConstants.TERMUX_FLOAT_GITHUB_ISSUES_REPO_URL)).append("  ");
+        markdownString.append("\n").append(MarkdownUtils.getLinkMarkdownString(TermuxConstants.TERMUX_STYLING_APP_NAME, TermuxConstants.TERMUX_STYLING_GITHUB_ISSUES_REPO_URL)).append("  ");
+        markdownString.append("\n").append(MarkdownUtils.getLinkMarkdownString(TermuxConstants.TERMUX_TASKER_APP_NAME, TermuxConstants.TERMUX_TASKER_GITHUB_ISSUES_REPO_URL)).append("  ");
+        markdownString.append("\n").append(MarkdownUtils.getLinkMarkdownString(TermuxConstants.TERMUX_WIDGET_APP_NAME, TermuxConstants.TERMUX_WIDGET_GITHUB_ISSUES_REPO_URL)).append("  ");
+
+        markdownString.append("\n\n### Github Issues for Termux packages\n");
+        markdownString.append("\n").append(MarkdownUtils.getLinkMarkdownString(TermuxConstants.TERMUX_PACKAGES_GITHUB_REPO_NAME, TermuxConstants.TERMUX_PACKAGES_GITHUB_ISSUES_REPO_URL)).append("  ");
+        markdownString.append("\n").append(MarkdownUtils.getLinkMarkdownString(TermuxConstants.TERMUX_GAME_PACKAGES_GITHUB_REPO_NAME, TermuxConstants.TERMUX_GAME_PACKAGES_GITHUB_ISSUES_REPO_URL)).append("  ");
+        markdownString.append("\n").append(MarkdownUtils.getLinkMarkdownString(TermuxConstants.TERMUX_SCIENCE_PACKAGES_GITHUB_REPO_NAME, TermuxConstants.TERMUX_SCIENCE_PACKAGES_GITHUB_ISSUES_REPO_URL)).append("  ");
+        markdownString.append("\n").append(MarkdownUtils.getLinkMarkdownString(TermuxConstants.TERMUX_ROOT_PACKAGES_GITHUB_REPO_NAME, TermuxConstants.TERMUX_ROOT_PACKAGES_GITHUB_ISSUES_REPO_URL)).append("  ");
+        markdownString.append("\n").append(MarkdownUtils.getLinkMarkdownString(TermuxConstants.TERMUX_UNSTABLE_PACKAGES_GITHUB_REPO_NAME, TermuxConstants.TERMUX_UNSTABLE_PACKAGES_GITHUB_ISSUES_REPO_URL)).append("  ");
+        markdownString.append("\n").append(MarkdownUtils.getLinkMarkdownString(TermuxConstants.TERMUX_X11_PACKAGES_GITHUB_REPO_NAME, TermuxConstants.TERMUX_X11_PACKAGES_GITHUB_ISSUES_REPO_URL)).append("  ");
+
+        markdownString.append("\n##\n");
+
+        return markdownString.toString();
+    }
+
     public static Properties getSystemProperties() {
         Properties systemProperties = new Properties();
 
@@ -311,7 +355,7 @@ private static String getPropertyMarkdown(String label, Object value) {
 
     public static String getCurrentTimeStamp() {
         @SuppressLint("SimpleDateFormat")
-        final SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+        final SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss z");
         df.setTimeZone(TimeZone.getTimeZone("UTC"));
         return df.format(new Date());
     }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c3a127581c..ca6a00ae73 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -158,6 +158,8 @@
     <string name="title_share_with">Share With</string>
     <string name="title_report_text">Report Text</string>
 
+    <string name="msg_report_issue">If you think this report should be reported, then copy its text from the options menu (3-dots on top right) and post an issue on one of the following links at which the report belongs at.</string>
+
 
 
     <!-- Termux PermissionUtils -->

From 067709bf4bd4d75e904824f1760ef5c8ffc3b278 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Tue, 6 Apr 2021 16:15:50 +0500
Subject: [PATCH 318/912] Disable obfuscation of termux-app in release builds
 without disabling optimizations and shrinking

This will allow stacktraces to have full class and method names when a crash report is generated.
---
 app/proguard-rules.pro | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 4306bcc419..7365abb1dc 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -7,5 +7,6 @@
 # For more details, see
 #   http://developer.android.com/guide/developing/tools/proguard.html
 
--renamesourcefileattribute SourceFile
--keepattributes SourceFile,LineNumberTable
+-dontobfuscate
+#-renamesourcefileattribute SourceFile
+#-keepattributes SourceFile,LineNumberTable

From 939338aaaca61802d0d09b18e3d914e7947bca9b Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Tue, 6 Apr 2021 17:09:54 +0500
Subject: [PATCH 319/912] Allow users to report an issue from terminal
 transcript by selection "Report Issue" from context menu

---
 .../java/com/termux/app/TermuxActivity.java   | 36 +++++++++----------
 .../com/termux/app/models/UserAction.java     |  3 +-
 .../termux/app/terminal/TermuxViewClient.java | 28 +++++++++++++++
 .../com/termux/app/utils/TermuxUtils.java     |  2 +-
 app/src/main/res/values/strings.xml           |  1 +
 5 files changed, 50 insertions(+), 20 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index 5d872ee5b0..750bee55bb 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -135,15 +135,14 @@ public final class TermuxActivity extends Activity implements ServiceConnection
 
     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_PASTE_ID = 3;
+    private static final int CONTEXT_MENU_AUTOFILL_ID = 2;
+    private static final int CONTEXT_MENU_RESET_TERMINAL_ID = 3;
     private static final int CONTEXT_MENU_KILL_PROCESS_ID = 4;
-    private static final int CONTEXT_MENU_RESET_TERMINAL_ID = 5;
-    private static final int CONTEXT_MENU_STYLING_ID = 6;
-    private static final int CONTEXT_MENU_HELP_ID = 8;
-    private static final int CONTEXT_MENU_TOGGLE_KEEP_SCREEN_ON = 9;
-    private static final int CONTEXT_MENU_AUTOFILL_ID = 10;
-    private static final int CONTEXT_MENU_SETTINGS_ID = 11;
-
+    private static final int CONTEXT_MENU_STYLING_ID = 5;
+    private static final int CONTEXT_MENU_TOGGLE_KEEP_SCREEN_ON = 6;
+    private static final int CONTEXT_MENU_HELP_ID = 7;
+    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;
 
@@ -526,6 +525,7 @@ public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuIn
         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);
     }
 
     /** Hook system menu to show context menu instead. */
@@ -546,29 +546,29 @@ public boolean onContextItemSelected(MenuItem item) {
             case CONTEXT_MENU_SHARE_TRANSCRIPT_ID:
                 mTermuxViewClient.shareSessionTranscript();
                 return true;
-            case CONTEXT_MENU_PASTE_ID:
-                mTermuxViewClient.doPaste();
-                return true;
-            case CONTEXT_MENU_KILL_PROCESS_ID:
-                showKillSessionDialog(session);
+            case CONTEXT_MENU_AUTOFILL_ID:
+                requestAutoFill();
                 return true;
             case CONTEXT_MENU_RESET_TERMINAL_ID:
                 resetSession(session);
                 return true;
+            case CONTEXT_MENU_KILL_PROCESS_ID:
+                showKillSessionDialog(session);
+                return true;
             case CONTEXT_MENU_STYLING_ID:
                 showStylingDialog();
                 return true;
+            case CONTEXT_MENU_TOGGLE_KEEP_SCREEN_ON:
+                toggleKeepScreenOn();
+                return true;
             case CONTEXT_MENU_HELP_ID:
                 startActivity(new Intent(this, HelpActivity.class));
                 return true;
             case CONTEXT_MENU_SETTINGS_ID:
                 startActivity(new Intent(this, SettingsActivity.class));
                 return true;
-            case CONTEXT_MENU_TOGGLE_KEEP_SCREEN_ON:
-                toggleKeepScreenOn();
-                return true;
-            case CONTEXT_MENU_AUTOFILL_ID:
-                requestAutoFill();
+            case CONTEXT_MENU_REPORT_ID:
+                mTermuxViewClient.reportIssueFromTranscript();
                 return true;
             default:
                 return super.onContextItemSelected(item);
diff --git a/app/src/main/java/com/termux/app/models/UserAction.java b/app/src/main/java/com/termux/app/models/UserAction.java
index 9a27992fc4..ad56fbefaf 100644
--- a/app/src/main/java/com/termux/app/models/UserAction.java
+++ b/app/src/main/java/com/termux/app/models/UserAction.java
@@ -3,7 +3,8 @@
 public enum UserAction {
 
     PLUGIN_EXECUTION_COMMAND("plugin execution command"),
-    CRASH_REPORT("crash report");
+    CRASH_REPORT("crash report"),
+    REPORT_ISSUE_FROM_TRANSCRIPT("report issue from transcript");
 
     private final String name;
 
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxViewClient.java b/app/src/main/java/com/termux/app/terminal/TermuxViewClient.java
index 08f8ae7da8..329e8f4170 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxViewClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxViewClient.java
@@ -20,11 +20,17 @@
 
 import com.termux.R;
 import com.termux.app.TermuxActivity;
+import com.termux.app.TermuxConstants;
+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.app.settings.properties.TermuxPropertyConstants;
 import com.termux.app.utils.DataUtils;
 import com.termux.app.utils.Logger;
+import com.termux.app.utils.MarkdownUtils;
+import com.termux.app.utils.TermuxUtils;
 import com.termux.terminal.KeyHandler;
 import com.termux.terminal.TerminalEmulator;
 import com.termux.terminal.TerminalSession;
@@ -394,6 +400,28 @@ public void showUrlSelection() {
         dialog.show();
     }
 
+    public void reportIssueFromTranscript() {
+        TerminalSession session = mActivity.getCurrentSession();
+        if (session == null) return;
+
+        String transcriptText = session.getEmulator().getScreen().getTranscriptTextWithoutJoinedLines().trim();
+        if (transcriptText == null) return;
+
+        transcriptText = DataUtils.getTruncatedCommandOutput(transcriptText, DataUtils.TRANSACTION_SIZE_LIMIT_IN_BYTES, false, true, false).trim();
+
+        StringBuilder reportString = new StringBuilder();
+
+        String title = TermuxConstants.TERMUX_APP_NAME + " Report Issue";
+
+        reportString.append("## Transcript\n");
+        reportString.append("\n").append(MarkdownUtils.getMarkdownCodeForString(transcriptText, true));
+
+        reportString.append("\n\n").append(TermuxUtils.getAppInfoMarkdownString(mActivity, true));
+        reportString.append("\n\n").append(TermuxUtils.getDeviceInfoMarkdownString(mActivity));
+
+        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() {
         TerminalSession session = mActivity.getCurrentSession();
         if (session == null) return;
diff --git a/app/src/main/java/com/termux/app/utils/TermuxUtils.java b/app/src/main/java/com/termux/app/utils/TermuxUtils.java
index 79ead17aea..acff15cb0f 100644
--- a/app/src/main/java/com/termux/app/utils/TermuxUtils.java
+++ b/app/src/main/java/com/termux/app/utils/TermuxUtils.java
@@ -250,7 +250,7 @@ public static String getReportIssueMarkdownString(@NonNull final Context context
 
         StringBuilder markdownString = new StringBuilder();
 
-        markdownString.append("## Report Issue");
+        markdownString.append("## Where To Report An Issue");
 
         markdownString.append("\n\n").append(context.getString(R.string.msg_report_issue)).append("\n");
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ca6a00ae73..11b39d2ce2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -72,6 +72,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="error_styling_not_installed">The &TERMUX_STYLING_APP_NAME; Plugin App is not installed.</string>
     <string name="action_styling_install">Install</string>

From 81d97c35840e9292cfcfdbf4df7d93f84b44e167 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Tue, 6 Apr 2021 17:13:28 +0500
Subject: [PATCH 320/912] Fix potential TransactionTooLargeException when
 sharing text

---
 app/src/main/java/com/termux/app/utils/ShareUtils.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/termux/app/utils/ShareUtils.java b/app/src/main/java/com/termux/app/utils/ShareUtils.java
index 07b961cd0f..3530ad0033 100644
--- a/app/src/main/java/com/termux/app/utils/ShareUtils.java
+++ b/app/src/main/java/com/termux/app/utils/ShareUtils.java
@@ -41,7 +41,7 @@ public static void shareText(final Context context, final String subject, final
         final Intent shareTextIntent = new Intent(Intent.ACTION_SEND);
         shareTextIntent.setType("text/plain");
         shareTextIntent.putExtra(Intent.EXTRA_SUBJECT, subject);
-        shareTextIntent.putExtra(Intent.EXTRA_TEXT, text);
+        shareTextIntent.putExtra(Intent.EXTRA_TEXT, DataUtils.getTruncatedCommandOutput(text, DataUtils.TRANSACTION_SIZE_LIMIT_IN_BYTES, false, false, false));
 
         openSystemAppChooser(context, shareTextIntent, context.getString(R.string.title_share_with));
     }

From 9cee71004fd8d3eb298ef2bd860f5d45d0adf8b4 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Tue, 6 Apr 2021 17:17:12 +0500
Subject: [PATCH 321/912] Replace "if(" with "if ("

---
 .../termux/app/activities/ReportActivity.java | 10 +--
 .../com/termux/app/crash/CrashHandler.java    |  2 +-
 .../java/com/termux/app/crash/CrashUtils.java | 18 ++---
 .../java/com/termux/app/file/FileUtils.java   | 80 +++++++++----------
 .../termux/app/file/filesystem/FileTypes.java |  2 +-
 .../app/file/filesystem/NativeDispatcher.java |  4 +-
 .../termux/app/models/ExecutionCommand.java   | 30 +++----
 .../com/termux/app/models/ReportInfo.java     |  2 +-
 .../settings/properties/SharedProperties.java | 10 +--
 .../properties/TermuxSharedProperties.java    |  6 +-
 .../app/terminal/TermuxSessionClient.java     | 14 ++--
 .../TermuxSessionsListViewController.java     |  1 -
 .../terminal/io/TerminalToolbarViewPager.java |  2 +-
 .../java/com/termux/app/utils/DataUtils.java  | 16 ++--
 .../TextSelectionHandleView.java              |  6 +-
 15 files changed, 101 insertions(+), 102 deletions(-)

diff --git a/app/src/main/java/com/termux/app/activities/ReportActivity.java b/app/src/main/java/com/termux/app/activities/ReportActivity.java
index 57a4ae3c03..3bf5bdce51 100644
--- a/app/src/main/java/com/termux/app/activities/ReportActivity.java
+++ b/app/src/main/java/com/termux/app/activities/ReportActivity.java
@@ -46,9 +46,9 @@ protected void onCreate(Bundle savedInstanceState) {
 
         Bundle bundle = null;
         Intent intent = getIntent();
-        if(intent != null)
+        if (intent != null)
             bundle = intent.getExtras();
-        else if(savedInstanceState != null)
+        else if (savedInstanceState != null)
             bundle = savedInstanceState;
 
         updateUI(bundle);
@@ -60,7 +60,7 @@ protected void onNewIntent(Intent intent) {
         super.onNewIntent(intent);
         setIntent(intent);
 
-        if(intent != null)
+        if (intent != null)
             updateUI(intent.getExtras());
     }
 
@@ -148,12 +148,12 @@ private void generateReportActivityMarkdownString() {
         mReportMarkdownString = ReportInfo.getReportInfoMarkdownString(mReportInfo);
 
         mReportActivityMarkdownString = "";
-        if(mReportInfo.reportStringPrefix != null)
+        if (mReportInfo.reportStringPrefix != null)
             mReportActivityMarkdownString += mReportInfo.reportStringPrefix;
 
         mReportActivityMarkdownString += mReportMarkdownString;
 
-        if(mReportInfo.reportStringSuffix != null)
+        if (mReportInfo.reportStringSuffix != null)
             mReportActivityMarkdownString += mReportInfo.reportStringSuffix;
     }
 
diff --git a/app/src/main/java/com/termux/app/crash/CrashHandler.java b/app/src/main/java/com/termux/app/crash/CrashHandler.java
index 7de2f1aa35..a1f18f0743 100644
--- a/app/src/main/java/com/termux/app/crash/CrashHandler.java
+++ b/app/src/main/java/com/termux/app/crash/CrashHandler.java
@@ -26,7 +26,7 @@ public void uncaughtException(@NonNull Thread thread, @NonNull Throwable throwab
      * Set default uncaught crash handler of current thread to {@link CrashHandler}.
      */
     public static void setCrashHandler(final Context context) {
-        if(!(Thread.getDefaultUncaughtExceptionHandler() instanceof CrashHandler)) {
+        if (!(Thread.getDefaultUncaughtExceptionHandler() instanceof CrashHandler)) {
             Thread.setDefaultUncaughtExceptionHandler(new CrashHandler(context));
         }
     }
diff --git a/app/src/main/java/com/termux/app/crash/CrashUtils.java b/app/src/main/java/com/termux/app/crash/CrashUtils.java
index c4d900d857..e1af3dd0c5 100644
--- a/app/src/main/java/com/termux/app/crash/CrashUtils.java
+++ b/app/src/main/java/com/termux/app/crash/CrashUtils.java
@@ -57,7 +57,7 @@ public static void logCrash(final Context context, final Thread thread, final Th
 
         // Write report string to crash log file
         String errmsg = FileUtils.writeStringToFile(context, "crash log", TermuxConstants.TERMUX_CRASH_LOG_FILE_PATH, Charset.defaultCharset(), reportString.toString(), false);
-        if(errmsg != null) {
+        if (errmsg != null) {
             Logger.logError(LOG_TAG, errmsg);
         }
     }
@@ -77,7 +77,7 @@ public static void logCrash(final Context context, final Thread thread, final Th
      * @param logTagParam The log tag to use for logging.
      */
     public static void notifyCrash(final Context context, final String logTagParam) {
-        if(context == null) return;
+        if (context == null) return;
 
 
         TermuxAppSharedPreferences preferences = new TermuxAppSharedPreferences(context);
@@ -90,7 +90,7 @@ public static void notifyCrash(final Context context, final String logTagParam)
             public void run() {
                 String logTag = DataUtils.getDefaultIfNull(logTagParam, LOG_TAG);
 
-                if(!FileUtils.regularFileExists(TermuxConstants.TERMUX_CRASH_LOG_FILE_PATH, false))
+                if (!FileUtils.regularFileExists(TermuxConstants.TERMUX_CRASH_LOG_FILE_PATH, false))
                     return;
 
                 String errmsg;
@@ -98,20 +98,20 @@ public void run() {
 
                 // Read report string from crash log file
                 errmsg = FileUtils.readStringFromFile(context, "crash log", TermuxConstants.TERMUX_CRASH_LOG_FILE_PATH, Charset.defaultCharset(), reportStringBuilder, false);
-                if(errmsg != null) {
+                if (errmsg != null) {
                     Logger.logError(logTag, errmsg);
                     return;
                 }
 
                 // Move crash log file to backup location if it exists
                 FileUtils.moveRegularFile(context, "crash log", TermuxConstants.TERMUX_CRASH_LOG_FILE_PATH, TermuxConstants.TERMUX_CRASH_LOG_BACKUP_FILE_PATH, true);
-                if(errmsg != null) {
+                if (errmsg != null) {
                     Logger.logError(logTag, errmsg);
                 }
 
                 String reportString = reportStringBuilder.toString();
 
-                if(reportString == null || reportString.isEmpty())
+                if (reportString == null || reportString.isEmpty())
                     return;
 
                 // Send a notification to show the crash log which when clicked will open the {@link ReportActivity}
@@ -128,12 +128,12 @@ public void run() {
 
                 // Build the notification
                 Notification.Builder builder = getCrashReportsNotificationBuilder(context, title, null, null, pendingIntent, NotificationUtils.NOTIFICATION_MODE_VIBRATE);
-                if(builder == null)  return;
+                if (builder == null)  return;
 
                 // Send the notification
                 int nextNotificationId = NotificationUtils.getNextNotificationId(context);
                 NotificationManager notificationManager = NotificationUtils.getNotificationManager(context);
-                if(notificationManager != null)
+                if (notificationManager != null)
                     notificationManager.notify(nextNotificationId, builder.build());
             }
         }.start();
@@ -158,7 +158,7 @@ public static Notification.Builder getCrashReportsNotificationBuilder(final Cont
             NOTIFICATION_CHANNEL_ID_CRASH_REPORT_ERRORS, Notification.PRIORITY_HIGH,
             title, notifiationText, notificationBigText, pendingIntent, notificationMode);
 
-        if(builder == null)  return null;
+        if (builder == null)  return null;
 
         // Enable timestamp
         builder.setShowWhen(true);
diff --git a/app/src/main/java/com/termux/app/file/FileUtils.java b/app/src/main/java/com/termux/app/file/FileUtils.java
index 4e5abaddca..b91cd2e42d 100644
--- a/app/src/main/java/com/termux/app/file/FileUtils.java
+++ b/app/src/main/java/com/termux/app/file/FileUtils.java
@@ -41,7 +41,7 @@ public class FileUtils {
      * @return Returns the {@code expand path}.
      */
     public static String getExpandedTermuxPath(String path) {
-        if(path != null && !path.isEmpty()) {
+        if (path != null && !path.isEmpty()) {
             path = path.replaceAll("^\\$PREFIX$", TermuxConstants.TERMUX_PREFIX_DIR_PATH);
             path = path.replaceAll("^\\$PREFIX/", TermuxConstants.TERMUX_PREFIX_DIR_PATH + "/");
             path = path.replaceAll("^~/$", TermuxConstants.TERMUX_HOME_DIR_PATH);
@@ -58,7 +58,7 @@ public static String getExpandedTermuxPath(String path) {
      * @return Returns the {@code unexpand path}.
      */
     public static String getUnExpandedTermuxPath(String path) {
-        if(path != null && !path.isEmpty()) {
+        if (path != null && !path.isEmpty()) {
             path = path.replaceAll("^" + Pattern.quote(TermuxConstants.TERMUX_PREFIX_DIR_PATH) + "/", "\\$PREFIX/");
             path = path.replaceAll("^" + Pattern.quote(TermuxConstants.TERMUX_HOME_DIR_PATH) + "/", "~/");
         }
@@ -88,7 +88,7 @@ public static String getUnExpandedTermuxPath(String path) {
     public static String getCanonicalPath(String path, final String prefixForNonAbsolutePath, final boolean expandPath) {
         if (path == null) path = "";
 
-        if(expandPath)
+        if (expandPath)
             path = getExpandedTermuxPath(path);
 
         String absolutePath;
@@ -153,7 +153,7 @@ public static boolean isPathInDirPath(String path, final String dirPath, final b
 
         String normalizedDirPath = normalizePath(dirPath);
 
-        if(ensureUnder)
+        if (ensureUnder)
             return !path.equals(normalizedDirPath) && path.startsWith(normalizedDirPath + "/");
         else
             return path.startsWith(normalizedDirPath + "/");
@@ -276,7 +276,7 @@ public static String validateRegularFileExistenceAndPermissions(@NonNull final C
             if (setPermissions && permissionsToCheck != null && fileType == FileType.REGULAR) {
                 // If there is not parentDirPath restriction or path is under parentDirPath
                 if (parentDirPath == null || (isPathUnderParentDirPath && getFileType(parentDirPath, false) == FileType.DIRECTORY)) {
-                    if(setMissingPermissionsOnly)
+                    if (setMissingPermissionsOnly)
                         setMissingFilePermissions(label + "file", filePath, permissionsToCheck);
                     else
                         setFilePermissions(label + "file", filePath, permissionsToCheck);
@@ -369,7 +369,7 @@ public static String validateDirectoryFileExistenceAndPermissions(@NonNull final
 
                     // If setPermissions is enabled and path is a directory
                     if (setPermissions && permissionsToCheck != null && fileType == FileType.DIRECTORY) {
-                        if(setMissingPermissionsOnly)
+                        if (setMissingPermissionsOnly)
                             setMissingFilePermissions(label + "directory", filePath, permissionsToCheck);
                         else
                             setFilePermissions(label + "directory", filePath, permissionsToCheck);
@@ -471,13 +471,13 @@ public static String createRegularFile(@NonNull final Context context, String la
 
         // Create the file parent directory
         errmsg = createParentDirectoryFile(context, label + "regular file parent", filePath);
-        if(errmsg != null)
+        if (errmsg != null)
             return errmsg;
 
         try {
             Logger.logVerbose(LOG_TAG, "Creating " + label + "regular file at path \"" + filePath + "\"");
 
-            if(!file.createNewFile())
+            if (!file.createNewFile())
                 return context.getString(R.string.error_creating_file_failed, label + "regular file", filePath);
         } catch (Exception e) {
             return context.getString(R.string.error_creating_file_failed_with_exception, label + "regular file", filePath, e.getMessage());
@@ -509,7 +509,7 @@ public static String createParentDirectoryFile(@NonNull final Context context, f
         File file = new File(filePath);
         String fileParentPath = file.getParent();
 
-        if(fileParentPath != null)
+        if (fileParentPath != null)
             return createDirectoryFile(context, label, fileParentPath,
             null, false, false);
         else
@@ -648,7 +648,7 @@ public static String createSymlinkFile(@NonNull final Context context, String la
             // If target path is relative instead of absolute
             if (!targetFilePath.startsWith("/")) {
                 String destFileParentPath = destFile.getParent();
-                if(destFileParentPath != null)
+                if (destFileParentPath != null)
                     targetFileAbsolutePath = destFileParentPath + "/" +  targetFilePath;
             }
 
@@ -658,29 +658,29 @@ public static String createSymlinkFile(@NonNull final Context context, String la
             // If target file does not exist
             if (targetFileType == FileType.NO_EXIST) {
                 // If dangling symlink should not be allowed, then return with error
-                if(!allowDangling)
+                if (!allowDangling)
                     return context.getString(R.string.error_file_not_found_at_path, label + "symlink target file", targetFileAbsolutePath);
             }
 
             // If destination exists
-            if(destFileType != FileType.NO_EXIST) {
+            if (destFileType != FileType.NO_EXIST) {
                 // If destination must not be overwritten
-                if(!overwrite) {
+                if (!overwrite) {
                     return null;
                 }
 
                 // If overwriteOnlyIfDestIsASymlink is enabled but destination file is not a symlink
-                if(overwriteOnlyIfDestIsASymlink && destFileType != FileType.SYMLINK)
+                if (overwriteOnlyIfDestIsASymlink && destFileType != FileType.SYMLINK)
                     return context.getString(R.string.error_cannot_overwrite_a_non_symlink_file_type, label + " file", destFilePath, targetFilePath, destFileType.getName());
 
                 // Delete the destination file
                 errmsg = deleteFile(context, label + "symlink destination", destFilePath, true);
-                if(errmsg != null)
+                if (errmsg != null)
                     return errmsg;
             } else {
                 // Create the destination file parent directory
                 errmsg = createParentDirectoryFile(context, label + "symlink destination file parent", destFilePath);
-                if(errmsg != null)
+                if (errmsg != null)
                     return errmsg;
             }
 
@@ -942,7 +942,7 @@ public static String copyOrMoveFile(@NonNull final Context context, String label
             // If source file does not exist
             if (srcFileType == FileType.NO_EXIST) {
                 // If copy or move is to be ignored if source file is not found
-                if(ignoreNonExistentSrcFile)
+                if (ignoreNonExistentSrcFile)
                     return null;
                 // Else return with error
                 else
@@ -950,7 +950,7 @@ public static String copyOrMoveFile(@NonNull final Context context, String label
             }
 
             // If the file type of the source file does not exist in the allowedFileTypeFlags, then return with error
-            if((allowedFileTypeFlags & srcFileType.getValue()) <= 0)
+            if ((allowedFileTypeFlags & srcFileType.getValue()) <= 0)
                 return context.getString(R.string.error_file_not_an_allowed_file_type, label + "source file meant to be " + modePast, srcFilePath, FileTypes.convertFileTypeFlagsToNamesString(allowedFileTypeFlags));
 
             // If source and destination file path are the same
@@ -958,19 +958,19 @@ public static String copyOrMoveFile(@NonNull final Context context, String label
                 return context.getString(R.string.error_copying_or_moving_file_to_same_path, mode + " " + label + "source file", srcFilePath, destFilePath);
 
             // If destination exists
-            if(destFileType != FileType.NO_EXIST) {
+            if (destFileType != FileType.NO_EXIST) {
                 // If destination must not be overwritten
-                if(!overwrite) {
+                if (!overwrite) {
                     return null;
                 }
 
                 // If overwriteOnlyIfDestSameFileTypeAsSrc is enabled but destination file does not match source file type
-                if(overwriteOnlyIfDestSameFileTypeAsSrc && destFileType != srcFileType)
+                if (overwriteOnlyIfDestSameFileTypeAsSrc && destFileType != srcFileType)
                     return context.getString(R.string.error_cannot_overwrite_a_different_file_type, label + "source file", mode.toLowerCase(), srcFilePath, destFilePath, destFileType.getName(), srcFileType.getName());
 
                 // Delete the destination file
                 errmsg = deleteFile(context, label + "destination file", destFilePath, true);
-                if(errmsg != null)
+                if (errmsg != null)
                     return errmsg;
             }
 
@@ -979,14 +979,14 @@ public static String copyOrMoveFile(@NonNull final Context context, String label
             boolean copyFile = !moveFile;
 
             // If moveFile is true
-            if(moveFile) {
+            if (moveFile) {
                 // We first try to rename source file to destination file to save a copy operation in case both source and destination are on the same filesystem
                 Logger.logVerbose(LOG_TAG, "Attempting to rename source to destination.");
 
                 // https://cs.android.com/android/platform/superproject/+/android-11.0.0_r3:libcore/ojluni/src/main/java/java/io/UnixFileSystem.java;l=358
                 // https://cs.android.com/android/platform/superproject/+/android-11.0.0_r3:libcore/luni/src/main/java/android/system/Os.java;l=512
                 // Uses File.getPath() to get the path of source and destination and not the canonical path
-                if(!srcFile.renameTo(destFile)) {
+                if (!srcFile.renameTo(destFile)) {
                     // If destination directory is a subdirectory of the source directory
                     // Copying is still allowed by copyDirectory() by excluding destination directory files
                     if (srcFileType == FileType.DIRECTORY && destFileCanonicalPath.startsWith(srcFileCanonicalPath + File.separator))
@@ -999,12 +999,12 @@ public static String copyOrMoveFile(@NonNull final Context context, String label
             }
 
             // If moveFile is false or renameTo failed while moving
-            if(copyFile) {
+            if (copyFile) {
                 Logger.logVerbose(LOG_TAG, "Attempting to copy source to destination.");
 
                 // Create the dest file parent directory
                 errmsg = createParentDirectoryFile(context, label + "dest file parent", destFilePath);
-                if(errmsg != null)
+                if (errmsg != null)
                     return errmsg;
 
                 if (srcFileType == FileType.DIRECTORY) {
@@ -1031,10 +1031,10 @@ public static String copyOrMoveFile(@NonNull final Context context, String label
             }
 
             // If source file had to be moved
-            if(moveFile) {
+            if (moveFile) {
                 // Delete the source file since copying would have succeeded
                 errmsg = deleteFile(context, label + "source file", srcFilePath, true);
-                if(errmsg != null)
+                if (errmsg != null)
                     return errmsg;
             }
 
@@ -1149,7 +1149,7 @@ public static String deleteFile(@NonNull final Context context, String label, fi
             // If file does not exist
             if (fileType == FileType.NO_EXIST) {
                 // If delete is to be ignored if file does not exist
-                if(ignoreNonExistentFile)
+                if (ignoreNonExistentFile)
                     return null;
                 // Else return with error
                 else
@@ -1157,7 +1157,7 @@ public static String deleteFile(@NonNull final Context context, String label, fi
             }
 
             // If the file type of the file does not exist in the allowedFileTypeFlags, then return with error
-            if((allowedFileTypeFlags & fileType.getValue()) <= 0)
+            if ((allowedFileTypeFlags & fileType.getValue()) <= 0)
                 return context.getString(R.string.error_file_not_an_allowed_file_type, label + "file meant to be deleted", filePath, FileTypes.convertFileTypeFlagsToNamesString(allowedFileTypeFlags));
 
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
@@ -1185,7 +1185,7 @@ public static String deleteFile(@NonNull final Context context, String label, fi
 
             // If file still exists after deleting it
             fileType = getFileType(filePath, false);
-            if(fileType != FileType.NO_EXIST)
+            if (fileType != FileType.NO_EXIST)
                 return context.getString(R.string.error_file_still_exists_after_deleting, label + "file meant to be deleted", filePath);
         }
         catch (Exception e) {
@@ -1254,7 +1254,7 @@ public static String clearDirectory(@NonNull final Context context, String label
             // Else create it
             else {
                 errmsg = createDirectoryFile(context, label, filePath);
-                if(errmsg != null)
+                if (errmsg != null)
                     return errmsg;
             }
         } catch (Exception e) {
@@ -1297,18 +1297,18 @@ public static String readStringFromFile(@NonNull final Context context, String l
         // If file does not exist
         if (fileType == FileType.NO_EXIST) {
             // If reading is to be ignored if file does not exist
-            if(ignoreNonExistentFile)
+            if (ignoreNonExistentFile)
                 return null;
             // Else return with error
             else
                 return context.getString(R.string.error_file_not_found_at_path, label + "file meant to be read", filePath);
         }
 
-        if(charset == null) charset = Charset.defaultCharset();
+        if (charset == null) charset = Charset.defaultCharset();
 
         // Check if charset is supported
         errmsg = isCharsetSupported(context, charset);
-        if(errmsg != null)
+        if (errmsg != null)
             return errmsg;
 
         FileInputStream fileInputStream = null;
@@ -1322,7 +1322,7 @@ public static String readStringFromFile(@NonNull final Context context, String l
 
             boolean firstLine = true;
             while ((receiveString = bufferedReader.readLine()) != null ) {
-                if(!firstLine) dataStringBuilder.append("\n"); else firstLine = false;
+                if (!firstLine) dataStringBuilder.append("\n"); else firstLine = false;
                 dataStringBuilder.append(receiveString);
             }
 
@@ -1365,14 +1365,14 @@ public static String writeStringToFile(@NonNull final Context context, String la
 
         // Create the file parent directory
         errmsg = createParentDirectoryFile(context, label + "file parent", filePath);
-        if(errmsg != null)
+        if (errmsg != null)
             return errmsg;
 
-        if(charset == null) charset = Charset.defaultCharset();
+        if (charset == null) charset = Charset.defaultCharset();
 
         // Check if charset is supported
         errmsg = isCharsetSupported(context, charset);
-        if(errmsg != null)
+        if (errmsg != null)
             return errmsg;
 
         FileOutputStream fileOutputStream = null;
@@ -1407,7 +1407,7 @@ public static String isCharsetSupported(@NonNull final Context context, final Ch
         if (charset == null) return context.getString(R.string.error_null_or_empty_parameter, "charset", "isCharsetSupported");
 
         try {
-            if(!Charset.isSupported(charset.name())) {
+            if (!Charset.isSupported(charset.name())) {
                 return context.getString(R.string.error_unsupported_charset, charset.name());
             }
         } catch (Exception e) {
diff --git a/app/src/main/java/com/termux/app/file/filesystem/FileTypes.java b/app/src/main/java/com/termux/app/file/filesystem/FileTypes.java
index 6f7507157e..447f11f53f 100644
--- a/app/src/main/java/com/termux/app/file/filesystem/FileTypes.java
+++ b/app/src/main/java/com/termux/app/file/filesystem/FileTypes.java
@@ -90,7 +90,7 @@ public static FileType getFileType(final String filePath, final boolean followLi
             return getFileType(fileAttributes);
         } catch (Exception e) {
             // If not a ENOENT (No such file or directory) exception
-            if(!e.getMessage().contains("ENOENT"))
+            if (!e.getMessage().contains("ENOENT"))
                 Logger.logError("Failed to get file type for file at path \"" + filePath + "\": " + e.getMessage());
             return FileType.NO_EXIST;
         }
diff --git a/app/src/main/java/com/termux/app/file/filesystem/NativeDispatcher.java b/app/src/main/java/com/termux/app/file/filesystem/NativeDispatcher.java
index d4495373fd..2eb6bfad5a 100644
--- a/app/src/main/java/com/termux/app/file/filesystem/NativeDispatcher.java
+++ b/app/src/main/java/com/termux/app/file/filesystem/NativeDispatcher.java
@@ -44,14 +44,14 @@ public static void validateFileExistence(String filePath) throws IOException {
 
         File file = new File(filePath);
 
-        //if(!file.exists())
+        //if (!file.exists())
         //    throw new IOException("No such file or directory: \"" + filePath + "\"");
     }
 
     public static void validateFileDescriptor(FileDescriptor fileDescriptor) throws IOException {
         if (fileDescriptor == null) throw new IOException("The file descriptor is null");
 
-        if(!fileDescriptor.valid())
+        if (!fileDescriptor.valid())
             throw new IOException("No such file descriptor: \"" + fileDescriptor.toString() + "\"");
     }
 
diff --git a/app/src/main/java/com/termux/app/models/ExecutionCommand.java b/app/src/main/java/com/termux/app/models/ExecutionCommand.java
index aa83d74722..ec43b7e6a5 100644
--- a/app/src/main/java/com/termux/app/models/ExecutionCommand.java
+++ b/app/src/main/java/com/termux/app/models/ExecutionCommand.java
@@ -146,7 +146,7 @@ public ExecutionCommand(Integer id, String executable, String[] arguments, Strin
     @NonNull
     @Override
     public String toString() {
-        if(!hasExecuted())
+        if (!hasExecuted())
             return getExecutionInputLogString(this, true);
         else {
             return getExecutionOutputLogString(this, true);
@@ -167,7 +167,7 @@ public static String getExecutionInputLogString(final ExecutionCommand execution
 
         logString.append(executionCommand.getCommandIdAndLabelLogString()).append(":");
 
-        if(executionCommand.previousState != ExecutionState.PRE_EXECUTION)
+        if (executionCommand.previousState != ExecutionState.PRE_EXECUTION)
             logString.append("\n").append(executionCommand.getPreviousStateLogString());
         logString.append("\n").append(executionCommand.getCurrentStateLogString());
 
@@ -178,11 +178,11 @@ public static String getExecutionInputLogString(final ExecutionCommand execution
         logString.append("\n").append(executionCommand.getIsFailsafeLogString());
 
 
-        if(!ignoreNull || executionCommand.sessionAction != null)
+        if (!ignoreNull || executionCommand.sessionAction != null)
             logString.append("\n").append(executionCommand.getSessionActionLogString());
 
         logString.append("\n").append(executionCommand.getIsPluginExecutionCommandLogString());
-        if(!ignoreNull || executionCommand.isPluginExecutionCommand) {
+        if (!ignoreNull || executionCommand.isPluginExecutionCommand) {
             if (!ignoreNull || executionCommand.pluginPendingIntent != null)
                 logString.append("\n").append(executionCommand.getPendingIntentCreatorLogString());
         }
@@ -226,7 +226,7 @@ public static String getExecutionOutputLogString(final ExecutionCommand executio
     public static String getExecutionErrLogString(final ExecutionCommand executionCommand, boolean ignoreNull) {
         StringBuilder logString = new StringBuilder();
 
-        if(!ignoreNull || (executionCommand.isStateFailed())) {
+        if (!ignoreNull || (executionCommand.isStateFailed())) {
             logString.append("\n").append(executionCommand.getErrCodeLogString());
             logString.append("\n").append(executionCommand.getErrmsgLogString());
             logString.append("\n").append(executionCommand.geStackTracesLogString());
@@ -299,7 +299,7 @@ public static String getExecutionCommandMarkdownString(final ExecutionCommand ex
         markdownString.append("\n").append("**Errmsg:**\n").append(DataUtils.getDefaultIfNull(executionCommand.errmsg, "-"));
         markdownString.append("\n\n").append(executionCommand.geStackTracesMarkdownString());
 
-        if(executionCommand.commandDescription != null || executionCommand.commandHelp != null) {
+        if (executionCommand.commandDescription != null || executionCommand.commandHelp != null) {
             if (executionCommand.commandDescription != null)
                 markdownString.append("\n\n### Command Description\n\n").append(executionCommand.commandDescription).append("\n");
             if (executionCommand.commandHelp != null)
@@ -307,7 +307,7 @@ public static String getExecutionCommandMarkdownString(final ExecutionCommand ex
             markdownString.append("\n##\n");
         }
 
-        if(executionCommand.pluginAPIHelp != null) {
+        if (executionCommand.pluginAPIHelp != null) {
             markdownString.append("\n\n### Plugin API Help\n\n").append(executionCommand.pluginAPIHelp);
             markdownString.append("\n##\n");
         }
@@ -318,7 +318,7 @@ public static String getExecutionCommandMarkdownString(final ExecutionCommand ex
 
 
     public String getIdLogString() {
-        if(id != null)
+        if (id != null)
             return "(" + id + ") ";
         else
             return "";
@@ -490,7 +490,7 @@ public static String getArgumentsLogString(final String[] argumentsArray) {
 
     public synchronized boolean setState(ExecutionState newState) {
         // The state transition cannot go back or change if already at {@link ExecutionState#SUCCESS}
-        if(newState.getValue() < currentState.getValue() || currentState == ExecutionState.SUCCESS) {
+        if (newState.getValue() < currentState.getValue() || currentState == ExecutionState.SUCCESS) {
             Logger.logError("Invalid "+ getCommandIdAndLabelLogString() + " state transition from \"" + currentState.getName() + "\" to " +  "\"" + newState.getName() + "\"");
             return false;
         }
@@ -498,7 +498,7 @@ public synchronized boolean setState(ExecutionState newState) {
         // The {@link ExecutionState#FAILED} can be set again, like to add more errors, but we don't update
         // {@link #previousState} with the {@link #currentState} value if its at {@link ExecutionState#FAILED} to
         // preserve the last valid state
-        if(currentState != ExecutionState.FAILED)
+        if (currentState != ExecutionState.FAILED)
             previousState = currentState;
 
         currentState = newState;
@@ -515,23 +515,23 @@ public synchronized boolean setStateFailed(int errCode, String errmsg,  Throwabl
 
         this.errmsg = errmsg;
 
-        if(!setState(ExecutionState.FAILED))
+        if (!setState(ExecutionState.FAILED))
             return false;
 
-        if(this.throwableList == null)
+        if (this.throwableList == null)
             this.throwableList =  new ArrayList<>();
 
-        if(throwable != null)
+        if (throwable != null)
             this.throwableList.add(throwable);
 
         return true;
     }
 
     public synchronized boolean isStateFailed() {
-        if(currentState != ExecutionState.FAILED)
+        if (currentState != ExecutionState.FAILED)
             return false;
 
-        if(errCode <= RESULT_CODE_OK) {
+        if (errCode <= RESULT_CODE_OK) {
             Logger.logWarn("The "  + getCommandIdAndLabelLogString() + " has an invalid errCode value \"" + errCode + "\" while having ExecutionState.FAILED state.");
             return false;
         } else {
diff --git a/app/src/main/java/com/termux/app/models/ReportInfo.java b/app/src/main/java/com/termux/app/models/ReportInfo.java
index cd12e5ed55..a4d62f1531 100644
--- a/app/src/main/java/com/termux/app/models/ReportInfo.java
+++ b/app/src/main/java/com/termux/app/models/ReportInfo.java
@@ -48,7 +48,7 @@ public static String getReportInfoMarkdownString(final ReportInfo reportInfo) {
 
         StringBuilder markdownString = new StringBuilder();
 
-        if(reportInfo.addReportInfoToMarkdown) {
+        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, "-"));
diff --git a/app/src/main/java/com/termux/app/settings/properties/SharedProperties.java b/app/src/main/java/com/termux/app/settings/properties/SharedProperties.java
index d2dfc417ff..c1797d6e9f 100644
--- a/app/src/main/java/com/termux/app/settings/properties/SharedProperties.java
+++ b/app/src/main/java/com/termux/app/settings/properties/SharedProperties.java
@@ -31,7 +31,7 @@
  *
  * The {@link SharedProperties} also provides static functions that can be used to read properties
  * from files or individual key values or even their internal values. An automatic mapping to a
- * boolean as internal value can also be done. An in-memory cache is not maintained, nor a locks used.
+ * boolean as internal value can also be done. An in-memory cache is not maintained, nor are locks used.
  *
  * This currently only has read support, write support can/will be added later if needed. Check android's
  * SharedPreferencesImpl class for reference implementation.
@@ -119,7 +119,7 @@ public void loadPropertiesFromDisk() {
             Properties newProperties = new Properties();
 
             Set<String> propertiesList = mPropertiesList;
-            if(propertiesList == null)
+            if (propertiesList == null)
                 propertiesList = properties.stringPropertyNames();
 
             String value;
@@ -240,7 +240,7 @@ public static Properties getPropertiesFromFile(Context context, File propertiesF
                 properties.load(new InputStreamReader(in, StandardCharsets.UTF_8));
             }
         } catch (Exception e) {
-            if(context != null)
+            if (context != null)
                 Toast.makeText(context, "Could not open properties file \"" + propertiesFile.getAbsolutePath() + "\": " + e.getMessage(), Toast.LENGTH_LONG).show();
             Logger.logStackTraceWithMessage(LOG_TAG, "Error loading properties file \"" + propertiesFile.getAbsolutePath() + "\"", e);
             return null;
@@ -394,7 +394,7 @@ public static boolean putToProperties(Properties properties, String key, String
     }
 
     public static Properties getPropertiesCopy(Properties inputProperties) {
-        if(inputProperties == null) return null;
+        if (inputProperties == null) return null;
 
         Properties outputProperties = new Properties();
         for (String key : inputProperties.stringPropertyNames()) {
@@ -405,7 +405,7 @@ public static Properties getPropertiesCopy(Properties inputProperties) {
     }
 
     public static Map<String, Object> getMapCopy(Map<String, Object> map) {
-        if(map == null) return null;
+        if (map == null) return null;
         return new HashMap<String, Object>(map);
     }
 
diff --git a/app/src/main/java/com/termux/app/settings/properties/TermuxSharedProperties.java b/app/src/main/java/com/termux/app/settings/properties/TermuxSharedProperties.java
index f3d2d549e5..79c6ffae93 100644
--- a/app/src/main/java/com/termux/app/settings/properties/TermuxSharedProperties.java
+++ b/app/src/main/java/com/termux/app/settings/properties/TermuxSharedProperties.java
@@ -228,7 +228,7 @@ public Object getInternalPropertyValueFromValue(Context context, String key, Str
      * @return Returns the internal termux {@link Object} object.
      */
     public static Object getInternalTermuxPropertyValueFromValue(Context context, String key, String value) {
-        if(key == null) return null;
+        if (key == null) return null;
         /*
           For keys where a MAP_* is checked by respective functions. Note that value to this function
           would actually be the key for the MAP_*:
@@ -269,10 +269,10 @@ public static Object getInternalTermuxPropertyValueFromValue(Context context, St
                 return (String) getExtraKeysStyleInternalPropertyValueFromValue(value);
             default:
                 // default boolean behaviour
-                if(TermuxPropertyConstants.TERMUX_DEFAULT_BOOLEAN_BEHAVIOUR_PROPERTIES_LIST.contains(key))
+                if (TermuxPropertyConstants.TERMUX_DEFAULT_BOOLEAN_BEHAVIOUR_PROPERTIES_LIST.contains(key))
                     return (boolean) SharedProperties.getBooleanValueForStringValue(value, false);
                 // default inverted boolean behaviour
-                else if(TermuxPropertyConstants.TERMUX_DEFAULT_INVERETED_BOOLEAN_BEHAVIOUR_PROPERTIES_LIST.contains(key))
+                else if (TermuxPropertyConstants.TERMUX_DEFAULT_INVERETED_BOOLEAN_BEHAVIOUR_PROPERTIES_LIST.contains(key))
                     return (boolean) SharedProperties.getInvertedBooleanValueForStringValue(value, true);
                 // just use String object as is (may be null)
                 else
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxSessionClient.java b/app/src/main/java/com/termux/app/terminal/TermuxSessionClient.java
index 110b556402..96fc38490c 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxSessionClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxSessionClient.java
@@ -137,7 +137,7 @@ public void onColorsChanged(TerminalSession changedSession) {
 
     /** Try switching to session. */
     public void setCurrentSession(TerminalSession session) {
-        if(session == null) return;
+        if (session == null) return;
 
         if (mActivity.getTerminalView().attachSession(session)) {
             // notify about switched session if not already displaying the session
@@ -170,13 +170,13 @@ public void switchToSession(boolean forward) {
         }
 
         TermuxSession termuxSession = service.getTermuxSession(index);
-        if(termuxSession != null)
+        if (termuxSession != null)
             setCurrentSession(termuxSession.getTerminalSession());
     }
 
     public void switchToSession(int index) {
         TermuxSession termuxSession = mActivity.getTermuxService().getTermuxSession(index);
-        if(termuxSession != null)
+        if (termuxSession != null)
             setCurrentSession(termuxSession.getTerminalSession());
     }
 
@@ -232,7 +232,7 @@ public TerminalSession getCurrentStoredSessionOrLast() {
         } else {
             // Else return the last session currently running
             TermuxSession termuxSession = mActivity.getTermuxService().getLastTermuxSession();
-            if(termuxSession != null)
+            if (termuxSession != null)
                 return termuxSession.getTerminalSession();
             else
                 return null;
@@ -243,7 +243,7 @@ private TerminalSession getCurrentStoredSession(TermuxActivity context) {
         String sessionHandle = mActivity.getPreferences().getCurrentSession();
 
         // If no session is stored in shared preferences
-        if(sessionHandle == null)
+        if (sessionHandle == null)
             return null;
 
         // Check if the session handle found matches one of the currently running sessions
@@ -264,7 +264,7 @@ public void removeFinishedSession(TerminalSession finishedSession) {
                 index = size - 1;
             }
             TermuxSession termuxSession = service.getTermuxSession(index);
-            if(termuxSession != null)
+            if (termuxSession != null)
                 setCurrentSession(termuxSession.getTerminalSession());
         }
     }
@@ -278,7 +278,7 @@ public void checkAndScrollToSession(TerminalSession session) {
         final int indexOfSession = mActivity.getTermuxService().getIndexOfSession(session);
         if (indexOfSession < 0) return;
         final ListView termuxSessionsListView = mActivity.findViewById(R.id.terminal_sessions_list);
-        if(termuxSessionsListView == null) return;
+        if (termuxSessionsListView == null) return;
 
         termuxSessionsListView.setItemChecked(indexOfSession, true);
         // Delay is necessary otherwise sometimes scroll to newly added session does not happen
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxSessionsListViewController.java b/app/src/main/java/com/termux/app/terminal/TermuxSessionsListViewController.java
index 94ea9de541..5dcec5e072 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxSessionsListViewController.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxSessionsListViewController.java
@@ -94,7 +94,6 @@ public void onItemClick(AdapterView<?> parent, View view, int position, long id)
         TermuxSession clickedSession = getItem(position);
         mActivity.getTermuxSessionClient().setCurrentSession(clickedSession.getTerminalSession());
         mActivity.getDrawer().closeDrawers();
-
     }
 
     @Override
diff --git a/app/src/main/java/com/termux/app/terminal/io/TerminalToolbarViewPager.java b/app/src/main/java/com/termux/app/terminal/io/TerminalToolbarViewPager.java
index 1e23220d5f..dd194d8c71 100644
--- a/app/src/main/java/com/termux/app/terminal/io/TerminalToolbarViewPager.java
+++ b/app/src/main/java/com/termux/app/terminal/io/TerminalToolbarViewPager.java
@@ -56,7 +56,7 @@ public Object instantiateItem(@NonNull ViewGroup collection, int position) {
                 layout = inflater.inflate(R.layout.view_terminal_toolbar_text_input, collection, false);
                 final EditText editText = layout.findViewById(R.id.terminal_toolbar_text_input);
 
-                if(mSavedTextInput != null) {
+                if (mSavedTextInput != null) {
                     editText.setText(mSavedTextInput);
                     mSavedTextInput = null;
                 }
diff --git a/app/src/main/java/com/termux/app/utils/DataUtils.java b/app/src/main/java/com/termux/app/utils/DataUtils.java
index 87954ffec0..c179971397 100644
--- a/app/src/main/java/com/termux/app/utils/DataUtils.java
+++ b/app/src/main/java/com/termux/app/utils/DataUtils.java
@@ -11,21 +11,21 @@ public class DataUtils {
     public static final int TRANSACTION_SIZE_LIMIT_IN_BYTES = 100 * 1024; // 100KB
 
     public static String getTruncatedCommandOutput(String text, int maxLength, boolean fromEnd, boolean onNewline, boolean addPrefix) {
-        if(text == null) return null;
+        if (text == null) return null;
 
         String prefix = "(truncated) ";
 
-        if(addPrefix)
+        if (addPrefix)
             maxLength = maxLength - prefix.length();
 
-        if(maxLength < 0 || text.length() < maxLength) return text;
+        if (maxLength < 0 || text.length() < maxLength) return text;
 
         if (fromEnd) {
             text = text.substring(0, Math.min(text.length(), maxLength));
         } else {
             int cutOffIndex = text.length() - maxLength;
 
-            if(onNewline) {
+            if (onNewline) {
                 int nextNewlineIndex = text.indexOf('\n', cutOffIndex);
                 if (nextNewlineIndex != -1 && nextNewlineIndex != text.length() - 1) {
                     cutOffIndex = nextNewlineIndex + 1;
@@ -34,7 +34,7 @@ public static String getTruncatedCommandOutput(String text, int maxLength, boole
             text = text.substring(cutOffIndex);
         }
 
-        if(addPrefix)
+        if (addPrefix)
             text = prefix + text;
 
         return text;
@@ -49,7 +49,7 @@ public static String getTruncatedCommandOutput(String text, int maxLength, boole
      * returns default if failed to read a valid value, like in case of an exception.
      */
     public static float getFloatFromString(String value, float def) {
-        if(value == null) return def;
+        if (value == null) return def;
 
         try {
             return Float.parseFloat(value);
@@ -68,7 +68,7 @@ public static float getFloatFromString(String value, float def) {
      * returns default if failed to read a valid value, like in case of an exception.
      */
     public static int getIntFromString(String value, int def) {
-        if(value == null) return def;
+        if (value == null) return def;
 
         try {
             return Integer.parseInt(value);
@@ -89,7 +89,7 @@ public static int getIntFromString(String value, int def) {
      * like in case of an exception.
      */
     public static int getIntStoredAsStringFromBundle(Bundle bundle, String key, int def) {
-        if(bundle == null) return def;
+        if (bundle == null) return def;
         return getIntFromString(bundle.getString(key, Integer.toString(def)), def);
     }
 
diff --git a/terminal-view/src/main/java/com/termux/view/textselection/TextSelectionHandleView.java b/terminal-view/src/main/java/com/termux/view/textselection/TextSelectionHandleView.java
index 74634be244..4f39e723ba 100644
--- a/terminal-view/src/main/java/com/termux/view/textselection/TextSelectionHandleView.java
+++ b/terminal-view/src/main/java/com/termux/view/textselection/TextSelectionHandleView.java
@@ -123,14 +123,14 @@ public void show() {
         coords[0] += mPointX;
         coords[1] += mPointY;
 
-        if(mHandle != null)
+        if (mHandle != null)
             mHandle.showAtLocation(terminalView, 0, coords[0], coords[1]);
     }
 
     public void hide() {
         mIsDragging = false;
 
-        if(mHandle != null) {
+        if (mHandle != null) {
             mHandle.dismiss();
 
             // We remove handle from its parent, otherwise it may still be shown in some cases even after the dismiss call
@@ -141,7 +141,7 @@ public void hide() {
     }
 
     public void removeFromParent() {
-        if(!isParentNull()) {
+        if (!isParentNull()) {
             ((ViewGroup)this.getParent()).removeView(this);
         }
     }

From c9a476caf7d9b5acf4955a0ebc67b07bee1347bc Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Tue, 6 Apr 2021 17:23:12 +0500
Subject: [PATCH 322/912] Add TermuxTaskerAppSharedPreferences to handle
 termux-tasker shared preferences

---
 .../TermuxTaskerAppSharedPreferences.java     | 52 +++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 app/src/main/java/com/termux/app/settings/preferences/TermuxTaskerAppSharedPreferences.java

diff --git a/app/src/main/java/com/termux/app/settings/preferences/TermuxTaskerAppSharedPreferences.java b/app/src/main/java/com/termux/app/settings/preferences/TermuxTaskerAppSharedPreferences.java
new file mode 100644
index 0000000000..a0e1aed1ba
--- /dev/null
+++ b/app/src/main/java/com/termux/app/settings/preferences/TermuxTaskerAppSharedPreferences.java
@@ -0,0 +1,52 @@
+package com.termux.app.settings.preferences;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+
+import com.termux.app.TermuxConstants;
+import com.termux.app.settings.preferences.TermuxPreferenceConstants.TERMUX_TASKER_APP;
+import com.termux.app.utils.DataUtils;
+import com.termux.app.utils.Logger;
+import com.termux.app.utils.TermuxUtils;
+
+import javax.annotation.Nonnull;
+
+public class TermuxTaskerAppSharedPreferences {
+
+    private final Context mContext;
+    private final SharedPreferences mSharedPreferences;
+    private final SharedPreferences mMultiProcessSharedPreferences;
+
+
+    private static final String LOG_TAG = "TermuxTaskerAppSharedPreferences";
+
+    public TermuxTaskerAppSharedPreferences(@Nonnull Context context) {
+        // We use the default context if failed to get termux-tasker package context
+        mContext = DataUtils.getDefaultIfNull(TermuxUtils.getTermuxTaskerPackageContext(context), context);
+        mSharedPreferences = getPrivateSharedPreferences(mContext);
+        mMultiProcessSharedPreferences = getPrivateAndMultiProcessSharedPreferences(mContext);
+    }
+
+    private static SharedPreferences getPrivateSharedPreferences(Context context) {
+        return SharedPreferenceUtils.getPrivateSharedPreferences(context, TermuxConstants.TERMUX_TASKER_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION);
+    }
+
+    private static SharedPreferences getPrivateAndMultiProcessSharedPreferences(Context context) {
+        return SharedPreferenceUtils.getPrivateAndMultiProcessSharedPreferences(context, TermuxConstants.TERMUX_TASKER_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION);
+    }
+
+
+
+    public int getLogLevel(boolean readFromFfile) {
+        if(readFromFfile)
+            return SharedPreferenceUtils.getInt(mMultiProcessSharedPreferences, TERMUX_TASKER_APP.KEY_LOG_LEVEL, Logger.DEFAULT_LOG_LEVEL);
+        else
+            return SharedPreferenceUtils.getInt(mSharedPreferences, TERMUX_TASKER_APP.KEY_LOG_LEVEL, Logger.DEFAULT_LOG_LEVEL);
+    }
+
+    public void setLogLevel(Context context, int logLevel, boolean commitToFile) {
+        logLevel = Logger.setLogLevel(context, logLevel);
+        SharedPreferenceUtils.setInt(mSharedPreferences, TERMUX_TASKER_APP.KEY_LOG_LEVEL, logLevel, commitToFile);
+    }
+
+}

From 682ce083149be145512b11fe4037aa74ccbe0251 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 7 Apr 2021 11:31:30 +0500
Subject: [PATCH 323/912] Create termux-shared library package for all termux
 constants and shared utils

The termux plugins should use this library instead of hardcoding "com.termux" values in their source code.

The library can be included as a dependency by plugins and third party apps by including the following line in the build.gradle where x.xxx is the version number, once its published.

`implementation 'com.termux:termux-shared:x.xxx'`

The `TermuxConstants` class has been updated to `v0.17.0`, `TermuxPreferenceConstants` to `v0.9.0` and `TermuxPropertyConstants` to `v0.6.0`. Check their Changelog sections for info on changes.

Some typos and redundant code has also been fixed.
---
 app/build.gradle                              | 19 ++--
 .../com/termux/app/RunCommandService.java     | 29 +++---
 .../java/com/termux/app/TermuxActivity.java   | 30 +++---
 .../com/termux/app/TermuxApplication.java     |  8 +-
 .../java/com/termux/app/TermuxInstaller.java  |  5 +-
 .../com/termux/app/TermuxOpenReceiver.java    |  3 +-
 .../java/com/termux/app/TermuxService.java    | 46 ++++-----
 .../termux/app/activities/ReportActivity.java |  6 +-
 .../com/termux/app/crash/CrashHandler.java    | 34 -------
 .../DebuggingPreferencesFragment.java         |  4 +-
 .../TerminalIOPreferencesFragment.java        |  4 +-
 .../termux/app/models/ExecutionCommand.java   | 10 +-
 .../com/termux/app/models/ReportInfo.java     | 24 ++---
 .../properties/TermuxAppSharedProperties.java | 99 +++++++++++++++++++
 .../termux/app/terminal/TermuxSession.java    |  6 +-
 .../app/terminal/TermuxSessionClient.java     | 14 +--
 .../app/terminal/TermuxSessionClientBase.java |  2 +-
 .../com/termux/app/terminal/TermuxTask.java   |  8 +-
 .../termux/app/terminal/TermuxViewClient.java | 16 +--
 .../termux/app/terminal/io/BellHandler.java   |  2 +-
 .../terminal/io/extrakeys/ExtraKeyButton.java |  2 +-
 .../terminal/io/extrakeys/ExtraKeysInfo.java  |  2 +-
 .../app/{crash => utils}/CrashUtils.java      | 77 +++++----------
 .../com/termux/app/utils/PluginUtils.java     | 51 +++++-----
 .../filepicker/TermuxDocumentsProvider.java   |  6 +-
 .../TermuxFileReceiverActivity.java           |  8 +-
 app/src/main/res/values/colors.xml            |  2 -
 app/src/main/res/values/strings.xml           | 70 +------------
 .../com/termux/app/TermuxActivityTest.java    |  2 +-
 gradle.properties                             |  3 +
 settings.gradle                               |  2 +-
 terminal-emulator/build.gradle                |  2 +-
 .../java/com/termux/view/TerminalView.java    |  2 +-
 .../com/termux/view/TerminalViewClient.java   |  2 +-
 termux-shared/.gitignore                      |  1 +
 termux-shared/build.gradle                    | 67 +++++++++++++
 termux-shared/proguard-rules.pro              | 10 ++
 .../shared/ExampleInstrumentedTest.java       | 26 +++++
 termux-shared/src/main/AndroidManifest.xml    |  3 +
 .../com/termux/shared/crash/CrashHandler.java | 74 ++++++++++++++
 .../com/termux/shared/data}/DataUtils.java    |  2 +-
 .../com/termux/shared}/file/FileUtils.java    | 22 ++---
 .../file/filesystem/FileAttributes.java       |  4 +-
 .../shared}/file/filesystem/FileKey.java      |  2 +-
 .../file/filesystem/FilePermission.java       |  5 +-
 .../file/filesystem/FilePermissions.java      |  4 +-
 .../shared}/file/filesystem/FileTime.java     |  2 +-
 .../shared}/file/filesystem/FileType.java     |  2 +-
 .../shared}/file/filesystem/FileTypes.java    |  4 +-
 .../file/filesystem/NativeDispatcher.java     |  2 +-
 .../file/filesystem/UnixConstants.java        |  2 +-
 .../shared}/file/tests/FileUtilsTests.java    |  7 +-
 .../termux/shared/interact}/DialogUtils.java  |  2 +-
 .../termux/shared/interact}/ShareUtils.java   |  6 +-
 .../com/termux/shared/logger}/Logger.java     | 28 +++---
 .../shared/markdown}/MarkdownUtils.java       |  8 +-
 .../notification}/NotificationUtils.java      | 15 +--
 .../termux/shared/packages}/PackageUtils.java |  4 +-
 .../shared/packages}/PermissionUtils.java     |  9 +-
 .../preferences/SharedPreferenceUtils.java    |  4 +-
 .../TermuxAppSharedPreferences.java           | 12 +--
 .../TermuxPreferenceConstants.java            | 15 +--
 .../TermuxTaskerAppSharedPreferences.java     | 12 +--
 .../settings/properties/SharedProperties.java | 12 +--
 .../properties/SharedPropertiesParser.java    |  4 +-
 .../properties/TermuxPropertyConstants.java   | 19 ++--
 .../properties/TermuxSharedProperties.java    | 76 ++------------
 .../com/termux/shared}/shell/ShellUtils.java  | 12 +--
 .../termux/shared}/shell/StreamGobbler.java   |  4 +-
 .../shared/termux}/TermuxConstants.java       | 84 ++++++++++++----
 .../termux/shared/termux}/TermuxUtils.java    |  8 +-
 termux-shared/src/main/res/values/colors.xml  |  5 +
 termux-shared/src/main/res/values/strings.xml | 88 +++++++++++++++++
 73 files changed, 746 insertions(+), 520 deletions(-)
 delete mode 100644 app/src/main/java/com/termux/app/crash/CrashHandler.java
 create mode 100644 app/src/main/java/com/termux/app/settings/properties/TermuxAppSharedProperties.java
 rename app/src/main/java/com/termux/app/{crash => utils}/CrashUtils.java (62%)
 create mode 100644 termux-shared/.gitignore
 create mode 100644 termux-shared/build.gradle
 create mode 100644 termux-shared/proguard-rules.pro
 create mode 100644 termux-shared/src/androidTest/java/com/termux/shared/ExampleInstrumentedTest.java
 create mode 100644 termux-shared/src/main/AndroidManifest.xml
 create mode 100644 termux-shared/src/main/java/com/termux/shared/crash/CrashHandler.java
 rename {app/src/main/java/com/termux/app/utils => termux-shared/src/main/java/com/termux/shared/data}/DataUtils.java (99%)
 rename {app/src/main/java/com/termux/app => termux-shared/src/main/java/com/termux/shared}/file/FileUtils.java (99%)
 rename {app/src/main/java/com/termux/app => termux-shared/src/main/java/com/termux/shared}/file/filesystem/FileAttributes.java (99%)
 rename {app/src/main/java/com/termux/app => termux-shared/src/main/java/com/termux/shared}/file/filesystem/FileKey.java (98%)
 rename {app/src/main/java/com/termux/app => termux-shared/src/main/java/com/termux/shared}/file/filesystem/FilePermission.java (97%)
 rename {app/src/main/java/com/termux/app => termux-shared/src/main/java/com/termux/shared}/file/filesystem/FilePermissions.java (98%)
 rename {app/src/main/java/com/termux/app => termux-shared/src/main/java/com/termux/shared}/file/filesystem/FileTime.java (99%)
 rename {app/src/main/java/com/termux/app => termux-shared/src/main/java/com/termux/shared}/file/filesystem/FileType.java (94%)
 rename {app/src/main/java/com/termux/app => termux-shared/src/main/java/com/termux/shared}/file/filesystem/FileTypes.java (98%)
 rename {app/src/main/java/com/termux/app => termux-shared/src/main/java/com/termux/shared}/file/filesystem/NativeDispatcher.java (97%)
 rename {app/src/main/java/com/termux/app => termux-shared/src/main/java/com/termux/shared}/file/filesystem/UnixConstants.java (99%)
 rename {app/src/main/java/com/termux/app => termux-shared/src/main/java/com/termux/shared}/file/tests/FileUtilsTests.java (98%)
 rename {app/src/main/java/com/termux/app/utils => termux-shared/src/main/java/com/termux/shared/interact}/DialogUtils.java (98%)
 rename {app/src/main/java/com/termux/app/utils => termux-shared/src/main/java/com/termux/shared/interact}/ShareUtils.java (94%)
 rename {app/src/main/java/com/termux/app/utils => termux-shared/src/main/java/com/termux/shared/logger}/Logger.java (93%)
 rename {app/src/main/java/com/termux/app/utils => termux-shared/src/main/java/com/termux/shared/markdown}/MarkdownUtils.java (97%)
 rename {app/src/main/java/com/termux/app/utils => termux-shared/src/main/java/com/termux/shared/notification}/NotificationUtils.java (91%)
 rename {app/src/main/java/com/termux/app/utils => termux-shared/src/main/java/com/termux/shared/packages}/PackageUtils.java (98%)
 rename {app/src/main/java/com/termux/app/utils => termux-shared/src/main/java/com/termux/shared/packages}/PermissionUtils.java (93%)
 rename {app/src/main/java/com/termux/app => termux-shared/src/main/java/com/termux/shared}/settings/preferences/SharedPreferenceUtils.java (99%)
 rename {app/src/main/java/com/termux/app => termux-shared/src/main/java/com/termux/shared}/settings/preferences/TermuxAppSharedPreferences.java (95%)
 rename {app/src/main/java/com/termux/app => termux-shared/src/main/java/com/termux/shared}/settings/preferences/TermuxPreferenceConstants.java (89%)
 rename {app/src/main/java/com/termux/app => termux-shared/src/main/java/com/termux/shared}/settings/preferences/TermuxTaskerAppSharedPreferences.java (86%)
 rename {app/src/main/java/com/termux/app => termux-shared/src/main/java/com/termux/shared}/settings/properties/SharedProperties.java (98%)
 rename {app/src/main/java/com/termux/app => termux-shared/src/main/java/com/termux/shared}/settings/properties/SharedPropertiesParser.java (83%)
 rename {app/src/main/java/com/termux/app => termux-shared/src/main/java/com/termux/shared}/settings/properties/TermuxPropertyConstants.java (94%)
 rename {app/src/main/java/com/termux/app => termux-shared/src/main/java/com/termux/shared}/settings/properties/TermuxSharedProperties.java (86%)
 rename {app/src/main/java/com/termux/app => termux-shared/src/main/java/com/termux/shared}/shell/ShellUtils.java (96%)
 rename {app/src/main/java/com/termux/app => termux-shared/src/main/java/com/termux/shared}/shell/StreamGobbler.java (99%)
 rename {app/src/main/java/com/termux/app => termux-shared/src/main/java/com/termux/shared/termux}/TermuxConstants.java (91%)
 rename {app/src/main/java/com/termux/app/utils => termux-shared/src/main/java/com/termux/shared/termux}/TermuxUtils.java (98%)
 create mode 100644 termux-shared/src/main/res/values/colors.xml
 create mode 100644 termux-shared/src/main/res/values/strings.xml

diff --git a/app/build.gradle b/app/build.gradle
index 17691e8abd..47a4d6ec09 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,8 +2,6 @@ plugins {
   id "com.android.application"
 }
 
-ext.markwon_version='4.6.2'
-
 android {
     compileSdkVersion project.properties.compileSdkVersion.toInteger()
     ndkVersion project.properties.ndkVersion
@@ -15,16 +13,13 @@ android {
         implementation "androidx.preference:preference:1.1.1"
         implementation "androidx.viewpager:viewpager:1.0.0"
         implementation "com.google.guava:guava:24.1-jre"
-        implementation "io.noties.markwon:core:$markwon_version"
-        implementation "io.noties.markwon:ext-strikethrough:$markwon_version"
-        implementation "io.noties.markwon:linkify:$markwon_version"
-        implementation "io.noties.markwon:recycler:$markwon_version"
-        implementation project(":terminal-view")
+        implementation "io.noties.markwon:core:$markwonVersion"
+        implementation "io.noties.markwon:ext-strikethrough:$markwonVersion"
+        implementation "io.noties.markwon:linkify:$markwonVersion"
+        implementation "io.noties.markwon:recycler:$markwonVersion"
 
-        // Do not increment version higher than 2.5 or there
-        // will be runtime exceptions on android < 8
-        // due to missing classes like java.nio.file.Path.
-        implementation "commons-io:commons-io:2.5"
+        implementation project(":terminal-view")
+        implementation project(":termux-shared")
     }
 
     defaultConfig {
@@ -99,7 +94,7 @@ android {
 }
 
 dependencies {
-    testImplementation "junit:junit:4.13.1"
+    testImplementation "junit:junit:4.13.2"
     testImplementation "org.robolectric:robolectric:4.4"
 }
 
diff --git a/app/src/main/java/com/termux/app/RunCommandService.java b/app/src/main/java/com/termux/app/RunCommandService.java
index 800889bb90..338b037ca0 100644
--- a/app/src/main/java/com/termux/app/RunCommandService.java
+++ b/app/src/main/java/com/termux/app/RunCommandService.java
@@ -12,13 +12,14 @@
 import android.os.IBinder;
 
 import com.termux.R;
-import com.termux.app.TermuxConstants.TERMUX_APP.RUN_COMMAND_SERVICE;
-import com.termux.app.TermuxConstants.TERMUX_APP.TERMUX_SERVICE;
-import com.termux.app.file.FileUtils;
-import com.termux.app.utils.Logger;
-import com.termux.app.utils.NotificationUtils;
+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;
+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.app.utils.DataUtils;
+import com.termux.shared.data.DataUtils;
 import com.termux.app.models.ExecutionCommand;
 
 /**
@@ -269,10 +270,6 @@
  */
 public class RunCommandService extends Service {
 
-    private static final String NOTIFICATION_CHANNEL_ID = "termux_run_command_notification_channel";
-    private static final String NOTIFICATION_CHANNEL_NAME = TermuxConstants.TERMUX_APP_NAME + " RunCommandService";
-    public static final int NOTIFICATION_ID = 1338;
-
     private static final String LOG_TAG = "RunCommandService";
 
     class LocalBinder extends Binder {
@@ -296,7 +293,7 @@ public void onCreate() {
     public int onStartCommand(Intent intent, int flags, int startId) {
         Logger.logDebug(LOG_TAG, "onStartCommand");
 
-        if(intent == null) return Service.START_NOT_STICKY;;
+        if(intent == null) return Service.START_NOT_STICKY;
 
         // Run again in case service is already started and onCreate() is not called
         runStartForeground();
@@ -421,7 +418,7 @@ public int onStartCommand(Intent intent, int flags, int startId) {
     private void runStartForeground() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             setupNotificationChannel();
-            startForeground(NOTIFICATION_ID, buildNotification());
+            startForeground(TermuxConstants.TERMUX_RUN_COMMAND_NOTIFICATION_ID, buildNotification());
         }
     }
 
@@ -434,8 +431,8 @@ private void runStopForeground() {
     private Notification buildNotification() {
         // Build the notification
         Notification.Builder builder =  NotificationUtils.geNotificationBuilder(this,
-            NOTIFICATION_CHANNEL_ID, Notification.PRIORITY_LOW,
-            NOTIFICATION_CHANNEL_NAME, null, null,
+            TermuxConstants.TERMUX_RUN_COMMAND_NOTIFICATION_CHANNEL_ID, Notification.PRIORITY_LOW,
+            TermuxConstants.TERMUX_RUN_COMMAND_NOTIFICATION_CHANNEL_NAME, null, null,
             null, NotificationUtils.NOTIFICATION_MODE_SILENT);
         if(builder == null)  return null;
 
@@ -454,8 +451,8 @@ private Notification buildNotification() {
     private void setupNotificationChannel() {
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) return;
 
-        NotificationUtils.setupNotificationChannel(this, NOTIFICATION_CHANNEL_ID,
-            NOTIFICATION_CHANNEL_NAME, NotificationManager.IMPORTANCE_LOW);
+        NotificationUtils.setupNotificationChannel(this, TermuxConstants.TERMUX_RUN_COMMAND_NOTIFICATION_CHANNEL_ID,
+            TermuxConstants.TERMUX_RUN_COMMAND_NOTIFICATION_CHANNEL_NAME, NotificationManager.IMPORTANCE_LOW);
     }
 
 }
diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index 750bee55bb..6ec5e9b304 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -31,22 +31,23 @@
 import android.widget.Toast;
 
 import com.termux.R;
-import com.termux.app.TermuxConstants.TERMUX_APP.TERMUX_ACTIVITY;
+import com.termux.shared.termux.TermuxConstants;
+import com.termux.shared.termux.TermuxConstants.TERMUX_APP.TERMUX_ACTIVITY;
 import com.termux.app.activities.HelpActivity;
 import com.termux.app.activities.SettingsActivity;
-import com.termux.app.crash.CrashUtils;
-import com.termux.app.settings.preferences.TermuxAppSharedPreferences;
+import com.termux.shared.settings.preferences.TermuxAppSharedPreferences;
 import com.termux.app.terminal.TermuxSessionsListViewController;
 import com.termux.app.terminal.io.TerminalToolbarViewPager;
 import com.termux.app.terminal.TermuxSessionClient;
 import com.termux.app.terminal.TermuxViewClient;
 import com.termux.app.terminal.io.extrakeys.ExtraKeysView;
-import com.termux.app.settings.properties.TermuxSharedProperties;
-import com.termux.app.utils.DialogUtils;
-import com.termux.app.utils.Logger;
-import com.termux.app.utils.TermuxUtils;
+import com.termux.app.settings.properties.TermuxAppSharedProperties;
+import com.termux.shared.interact.DialogUtils;
+import com.termux.shared.logger.Logger;
+import com.termux.shared.termux.TermuxUtils;
 import com.termux.terminal.TerminalSession;
 import com.termux.terminal.TerminalSessionClient;
+import com.termux.app.utils.CrashUtils;
 import com.termux.view.TerminalView;
 import com.termux.view.TerminalViewClient;
 
@@ -101,7 +102,7 @@ public final class TermuxActivity extends Activity implements ServiceConnection
     /**
      * Termux app shared properties manager, loaded from termux.properties
      */
-    private TermuxSharedProperties mProperties;
+    private TermuxAppSharedProperties mProperties;
 
     /**
      * The terminal extra keys view.
@@ -116,7 +117,7 @@ public final class TermuxActivity extends Activity implements ServiceConnection
     /**
      * The {@link TermuxActivity} broadcast receiver for various things like terminal style configuration changes.
      */
-    private final BroadcastReceiver mTermuxActivityBroadcastReceiever = new TermuxActivityBroadcastReceiever();
+    private final BroadcastReceiver mTermuxActivityBroadcastReceiever = new TermuxActivityBroadcastReceiver();
 
     /**
      * The last toast shown, used cancel current toast before showing new in {@link #showToast(String, boolean)}.
@@ -161,7 +162,7 @@ public void onCreate(Bundle savedInstanceState) {
 
         // Load termux shared preferences and properties
         mPreferences = new TermuxAppSharedPreferences(this);
-        mProperties = new TermuxSharedProperties(this);
+        mProperties = new TermuxAppSharedProperties(this);
 
         setActivityTheme();
 
@@ -327,7 +328,7 @@ public void onDestroy() {
     }
 
     @Override
-    public void onSaveInstanceState(Bundle savedInstanceState) {
+    public void onSaveInstanceState(@NonNull Bundle savedInstanceState) {
         super.onSaveInstanceState(savedInstanceState);
         saveTerminalToolbarTextInput(savedInstanceState);
     }
@@ -383,6 +384,7 @@ public void toggleTerminalToolbar() {
         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 && terminalToolbarViewPager.getCurrentItem() == 1) {
             // Focus the text input view if just revealed.
@@ -704,7 +706,7 @@ public TermuxAppSharedPreferences getPreferences() {
         return mPreferences;
     }
 
-    public TermuxSharedProperties getProperties() {
+    public TermuxAppSharedProperties getProperties() {
         return mProperties;
     }
 
@@ -718,7 +720,7 @@ public static void updateTermuxActivityStyling(Context context) {
         context.sendBroadcast(stylingIntent);
     }
 
-    class TermuxActivityBroadcastReceiever extends BroadcastReceiver {
+    class TermuxActivityBroadcastReceiver extends BroadcastReceiver {
         @Override
         public void onReceive(Context context, Intent intent) {
             if (mIsVisible) {
@@ -755,7 +757,7 @@ public void onReceive(Context context, Intent intent) {
                 // TermuxActivity.this.recreate();
             }
         }
-    };
+    }
 
 
 
diff --git a/app/src/main/java/com/termux/app/TermuxApplication.java b/app/src/main/java/com/termux/app/TermuxApplication.java
index 62713ac20f..3bc6689ca4 100644
--- a/app/src/main/java/com/termux/app/TermuxApplication.java
+++ b/app/src/main/java/com/termux/app/TermuxApplication.java
@@ -2,9 +2,9 @@
 
 import android.app.Application;
 
-import com.termux.app.crash.CrashHandler;
-import com.termux.app.settings.preferences.TermuxAppSharedPreferences;
-import com.termux.app.utils.Logger;
+import com.termux.shared.crash.CrashHandler;
+import com.termux.shared.settings.preferences.TermuxAppSharedPreferences;
+import com.termux.shared.logger.Logger;
 
 
 public class TermuxApplication extends Application {
@@ -19,7 +19,7 @@ public void onCreate() {
     }
 
     private void setLogLevel() {
-        // Load the log level from shared preferences and set it to the {@link Loggger.CURRENT_LOG_LEVEL}
+        // Load the log level from shared preferences and set it to the {@link Logger.CURRENT_LOG_LEVEL}
         TermuxAppSharedPreferences preferences = new TermuxAppSharedPreferences(getApplicationContext());
         preferences.setLogLevel(null, preferences.getLogLevel());
         Logger.logDebug("Starting Application");
diff --git a/app/src/main/java/com/termux/app/TermuxInstaller.java b/app/src/main/java/com/termux/app/TermuxInstaller.java
index 6c355bbf2f..bc25838043 100644
--- a/app/src/main/java/com/termux/app/TermuxInstaller.java
+++ b/app/src/main/java/com/termux/app/TermuxInstaller.java
@@ -11,8 +11,9 @@
 import android.view.WindowManager;
 
 import com.termux.R;
-import com.termux.app.file.FileUtils;
-import com.termux.app.utils.Logger;
+import com.termux.shared.file.FileUtils;
+import com.termux.shared.logger.Logger;
+import com.termux.shared.termux.TermuxConstants;
 
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
diff --git a/app/src/main/java/com/termux/app/TermuxOpenReceiver.java b/app/src/main/java/com/termux/app/TermuxOpenReceiver.java
index 455c2211bf..c3609dbc2f 100644
--- a/app/src/main/java/com/termux/app/TermuxOpenReceiver.java
+++ b/app/src/main/java/com/termux/app/TermuxOpenReceiver.java
@@ -13,7 +13,8 @@
 import android.provider.MediaStore;
 import android.webkit.MimeTypeMap;
 
-import com.termux.app.utils.Logger;
+import com.termux.shared.logger.Logger;
+import com.termux.shared.termux.TermuxConstants;
 
 import java.io.File;
 import java.io.FileNotFoundException;
diff --git a/app/src/main/java/com/termux/app/TermuxService.java b/app/src/main/java/com/termux/app/TermuxService.java
index 77779b6c1a..e9d47799d5 100644
--- a/app/src/main/java/com/termux/app/TermuxService.java
+++ b/app/src/main/java/com/termux/app/TermuxService.java
@@ -20,17 +20,18 @@
 import android.widget.ArrayAdapter;
 
 import com.termux.R;
-import com.termux.app.TermuxConstants.TERMUX_APP.TERMUX_ACTIVITY;
-import com.termux.app.TermuxConstants.TERMUX_APP.TERMUX_SERVICE;
-import com.termux.app.settings.preferences.TermuxAppSharedPreferences;
+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;
+import com.termux.shared.settings.preferences.TermuxAppSharedPreferences;
 import com.termux.app.terminal.TermuxSession;
 import com.termux.app.terminal.TermuxSessionClient;
 import com.termux.app.terminal.TermuxSessionClientBase;
-import com.termux.app.utils.Logger;
-import com.termux.app.utils.NotificationUtils;
-import com.termux.app.utils.PermissionUtils;
-import com.termux.app.shell.ShellUtils;
-import com.termux.app.utils.DataUtils;
+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.app.models.ExecutionCommand;
 import com.termux.app.models.ExecutionCommand.ExecutionState;
 import com.termux.app.terminal.TermuxTask;
@@ -38,7 +39,6 @@
 import com.termux.terminal.TerminalSession;
 import com.termux.terminal.TerminalSessionClient;
 
-import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -58,10 +58,6 @@
  */
 public final class TermuxService extends Service {
 
-    private static final String NOTIFICATION_CHANNEL_ID = "termux_notification_channel";
-    private static final String NOTIFICATION_CHANNEL_NAME = TermuxConstants.TERMUX_APP_NAME + " App";
-    public static final int NOTIFICATION_ID = 1337;
-
     private static int EXECUTION_ID = 1000;
 
     /** This service is only bound from inside the same process and never uses IPC. */
@@ -95,7 +91,7 @@ class LocalBinder extends Binder {
     /** The basic implementation of the {@link TerminalSessionClient} interface to be used by {@link TerminalSession}
      * that does not hold activity references.
      */
-    final TermuxSessionClientBase mTermuxSessionClientBase = new TermuxSessionClientBase();;
+    final TermuxSessionClientBase mTermuxSessionClientBase = new TermuxSessionClientBase();
 
     /** The wake lock and wifi lock are always acquired and released together. */
     private PowerManager.WakeLock mWakeLock;
@@ -183,7 +179,7 @@ public boolean onUnbind(Intent intent) {
     /** Make service run in foreground mode. */
     private void runStartForeground() {
         setupNotificationChannel();
-        startForeground(NOTIFICATION_ID, buildNotification());
+        startForeground(TermuxConstants.TERMUX_APP_NOTIFICATION_ID, buildNotification());
     }
 
     /** Make service leave foreground mode. */
@@ -366,7 +362,7 @@ public synchronized TermuxTask createTermuxTask(ExecutionCommand executionComman
         if (newTermuxTask == null) {
             Logger.logError(LOG_TAG, "Failed to execute new termux task command for:\n" + executionCommand.getCommandIdAndLabelLogString());
             return null;
-        };
+        }
 
         mTermuxTasks.add(newTermuxTask);
 
@@ -436,7 +432,7 @@ public synchronized TermuxSession createTermuxSession(ExecutionCommand execution
         if (newTermuxSession == null) {
             Logger.logError(LOG_TAG, "Failed to execute new termux session command for:\n" + executionCommand.getCommandIdAndLabelLogString());
             return null;
-        };
+        }
 
         mTermuxSessions.add(newTermuxSession);
 
@@ -593,13 +589,13 @@ private Notification buildNotification() {
         // Set notification text
         int sessionCount = getTermuxSessionsSize();
         int taskCount = mTermuxTasks.size();
-        String notifiationText = sessionCount + " session" + (sessionCount == 1 ? "" : "s");
+        String notificationText = sessionCount + " session" + (sessionCount == 1 ? "" : "s");
         if (taskCount > 0) {
-            notifiationText += ", " + taskCount + " task" + (taskCount == 1 ? "" : "s");
+            notificationText += ", " + taskCount + " task" + (taskCount == 1 ? "" : "s");
         }
 
         final boolean wakeLockHeld = mWakeLock != null;
-        if (wakeLockHeld) notifiationText += " (wake lock held)";
+        if (wakeLockHeld) notificationText += " (wake lock held)";
 
 
         // Set notification priority
@@ -610,8 +606,8 @@ private Notification buildNotification() {
 
         // Build the notification
         Notification.Builder builder =  NotificationUtils.geNotificationBuilder(this,
-            NOTIFICATION_CHANNEL_ID, priority,
-            getText(R.string.application_name), notifiationText, null,
+            TermuxConstants.TERMUX_APP_NOTIFICATION_CHANNEL_ID, priority,
+            getText(R.string.application_name), notificationText, null,
             pendingIntent, NotificationUtils.NOTIFICATION_MODE_SILENT);
         if(builder == null)  return null;
 
@@ -647,8 +643,8 @@ private Notification buildNotification() {
     private void setupNotificationChannel() {
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) return;
 
-        NotificationUtils.setupNotificationChannel(this, NOTIFICATION_CHANNEL_ID,
-            NOTIFICATION_CHANNEL_NAME, NotificationManager.IMPORTANCE_LOW);
+        NotificationUtils.setupNotificationChannel(this, TermuxConstants.TERMUX_APP_NOTIFICATION_CHANNEL_ID,
+            TermuxConstants.TERMUX_APP_NOTIFICATION_CHANNEL_NAME, NotificationManager.IMPORTANCE_LOW);
     }
 
     /** Update the shown foreground service notification after making any changes that affect it. */
@@ -657,7 +653,7 @@ void updateNotification() {
             // Exit if we are updating after the user disabled all locks with no sessions or tasks running.
             requestStopService();
         } else {
-            ((NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE)).notify(NOTIFICATION_ID, buildNotification());
+            ((NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE)).notify(TermuxConstants.TERMUX_APP_NOTIFICATION_ID, buildNotification());
         }
     }
 
diff --git a/app/src/main/java/com/termux/app/activities/ReportActivity.java b/app/src/main/java/com/termux/app/activities/ReportActivity.java
index 3bf5bdce51..2491005a02 100644
--- a/app/src/main/java/com/termux/app/activities/ReportActivity.java
+++ b/app/src/main/java/com/termux/app/activities/ReportActivity.java
@@ -15,9 +15,9 @@
 import android.view.MenuItem;
 
 import com.termux.R;
-import com.termux.app.TermuxConstants;
-import com.termux.app.utils.MarkdownUtils;
-import com.termux.app.utils.ShareUtils;
+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;
diff --git a/app/src/main/java/com/termux/app/crash/CrashHandler.java b/app/src/main/java/com/termux/app/crash/CrashHandler.java
deleted file mode 100644
index a1f18f0743..0000000000
--- a/app/src/main/java/com/termux/app/crash/CrashHandler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.termux.app.crash;
-
-import android.content.Context;
-
-import androidx.annotation.NonNull;
-
-/**
- * Catches uncaught exceptions and logs them.
- */
-public class CrashHandler implements Thread.UncaughtExceptionHandler {
-
-    private final Context context;
-    private final Thread.UncaughtExceptionHandler defaultUEH;
-
-    private CrashHandler(final Context context) {
-        this.context = context;
-        this.defaultUEH = Thread.getDefaultUncaughtExceptionHandler();
-    }
-
-    public void uncaughtException(@NonNull Thread thread, @NonNull Throwable throwable) {
-        CrashUtils.logCrash(context,thread, throwable);
-        defaultUEH.uncaughtException(thread, throwable);
-    }
-
-    /**
-     * Set default uncaught crash handler of current thread to {@link CrashHandler}.
-     */
-    public static void setCrashHandler(final Context context) {
-        if (!(Thread.getDefaultUncaughtExceptionHandler() instanceof CrashHandler)) {
-            Thread.setDefaultUncaughtExceptionHandler(new CrashHandler(context));
-        }
-    }
-
-}
diff --git a/app/src/main/java/com/termux/app/fragments/settings/DebuggingPreferencesFragment.java b/app/src/main/java/com/termux/app/fragments/settings/DebuggingPreferencesFragment.java
index 61f99156b4..c34d70e2eb 100644
--- a/app/src/main/java/com/termux/app/fragments/settings/DebuggingPreferencesFragment.java
+++ b/app/src/main/java/com/termux/app/fragments/settings/DebuggingPreferencesFragment.java
@@ -11,8 +11,8 @@
 import androidx.preference.PreferenceManager;
 
 import com.termux.R;
-import com.termux.app.settings.preferences.TermuxAppSharedPreferences;
-import com.termux.app.utils.Logger;
+import com.termux.shared.settings.preferences.TermuxAppSharedPreferences;
+import com.termux.shared.logger.Logger;
 
 public class DebuggingPreferencesFragment extends PreferenceFragmentCompat {
 
diff --git a/app/src/main/java/com/termux/app/fragments/settings/TerminalIOPreferencesFragment.java b/app/src/main/java/com/termux/app/fragments/settings/TerminalIOPreferencesFragment.java
index 874a87b4b0..0280b89701 100644
--- a/app/src/main/java/com/termux/app/fragments/settings/TerminalIOPreferencesFragment.java
+++ b/app/src/main/java/com/termux/app/fragments/settings/TerminalIOPreferencesFragment.java
@@ -3,14 +3,12 @@
 import android.content.Context;
 import android.os.Bundle;
 
-import androidx.annotation.Nullable;
-
 import androidx.preference.PreferenceDataStore;
 import androidx.preference.PreferenceFragmentCompat;
 import androidx.preference.PreferenceManager;
 
 import com.termux.R;
-import com.termux.app.settings.preferences.TermuxAppSharedPreferences;
+import com.termux.shared.settings.preferences.TermuxAppSharedPreferences;
 
 public class TerminalIOPreferencesFragment extends PreferenceFragmentCompat {
 
diff --git a/app/src/main/java/com/termux/app/models/ExecutionCommand.java b/app/src/main/java/com/termux/app/models/ExecutionCommand.java
index ec43b7e6a5..240af229e7 100644
--- a/app/src/main/java/com/termux/app/models/ExecutionCommand.java
+++ b/app/src/main/java/com/termux/app/models/ExecutionCommand.java
@@ -6,10 +6,10 @@
 
 import androidx.annotation.NonNull;
 
-import com.termux.app.TermuxConstants.TERMUX_APP.TERMUX_SERVICE;
-import com.termux.app.utils.Logger;
-import com.termux.app.utils.MarkdownUtils;
-import com.termux.app.utils.DataUtils;
+import com.termux.shared.termux.TermuxConstants.TERMUX_APP.TERMUX_SERVICE;
+import com.termux.shared.logger.Logger;
+import com.termux.shared.markdown.MarkdownUtils;
+import com.termux.shared.data.DataUtils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -112,7 +112,7 @@ public int getValue() {
 
     /** The stdout of shell command. */
     public String stdout;
-    /** The sterr of shell command. */
+    /** The stderr of shell command. */
     public String stderr;
     /** The exit code of shell command. */
     public Integer exitCode;
diff --git a/app/src/main/java/com/termux/app/models/ReportInfo.java b/app/src/main/java/com/termux/app/models/ReportInfo.java
index a4d62f1531..05c8853d20 100644
--- a/app/src/main/java/com/termux/app/models/ReportInfo.java
+++ b/app/src/main/java/com/termux/app/models/ReportInfo.java
@@ -1,30 +1,30 @@
 package com.termux.app.models;
 
-import com.termux.app.utils.MarkdownUtils;
-import com.termux.app.utils.TermuxUtils;
+import com.termux.shared.markdown.MarkdownUtils;
+import com.termux.shared.termux.TermuxUtils;
 
 import java.io.Serializable;
 
 public class ReportInfo implements Serializable {
 
     /** The user action that was being processed for which the report was generated. */
-    public UserAction userAction;
+    public final UserAction userAction;
     /** The internal app component that sent the report. */
-    public String sender;
+    public final String sender;
     /** The report title. */
-    public String reportTitle;
+    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 boolean addReportInfoToMarkdown;
+    public final boolean addReportInfoToMarkdown;
     /** The timestamp for the report. */
-    public String reportTimestammp;
+    public final String reportTimestamp;
 
     public ReportInfo(UserAction userAction, String sender, String reportTitle, String reportStringPrefix, String reportString, String reportStringSuffix, boolean addReportInfoToMarkdown) {
         this.userAction = userAction;
@@ -34,7 +34,7 @@ public ReportInfo(UserAction userAction, String sender, String reportTitle, Stri
         this.reportString = reportString;
         this.reportStringSuffix = reportStringSuffix;
         this.addReportInfoToMarkdown = addReportInfoToMarkdown;
-        this.reportTimestammp = TermuxUtils.getCurrentTimeStamp();
+        this.reportTimestamp = TermuxUtils.getCurrentTimeStamp();
     }
 
     /**
@@ -52,7 +52,7 @@ public static String getReportInfoMarkdownString(final ReportInfo reportInfo) {
             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, "-"));
-            markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Report Timestamp", reportInfo.reportTimestammp, "-"));
+            markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Report Timestamp", reportInfo.reportTimestamp, "-"));
             markdownString.append("\n##\n\n");
         }
 
diff --git a/app/src/main/java/com/termux/app/settings/properties/TermuxAppSharedProperties.java b/app/src/main/java/com/termux/app/settings/properties/TermuxAppSharedProperties.java
new file mode 100644
index 0000000000..4153a42686
--- /dev/null
+++ b/app/src/main/java/com/termux/app/settings/properties/TermuxAppSharedProperties.java
@@ -0,0 +1,99 @@
+package com.termux.app.settings.properties;
+
+import android.content.Context;
+
+import com.termux.app.terminal.io.KeyboardShortcut;
+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 org.json.JSONException;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+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);
+    }
+
+    /**
+     * Reload the termux properties from disk into an in-memory cache.
+     */
+    @Override
+    public void loadTermuxPropertiesFromDisk() {
+        super.loadTermuxPropertiesFromDisk();
+
+        setExtraKeys();
+        setSessionShortcuts();
+    }
+
+    /**
+     * Set the terminal extra keys and style.
+     */
+    private void setExtraKeys() {
+        mExtraKeysInfo = null;
+
+        try {
+            // The mMap stores the extra key and style string values while loading properties
+            // Check {@link #getExtraKeysInternalPropertyValueFromValue(String)} and
+            // {@link #getExtraKeysStyleInternalPropertyValueFromValue(String)}
+            String extrakeys = (String) getInternalPropertyValue(TermuxPropertyConstants.KEY_EXTRA_KEYS, true);
+            String extraKeysStyle = (String) getInternalPropertyValue(TermuxPropertyConstants.KEY_EXTRA_KEYS_STYLE, true);
+            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);
+            } catch (JSONException e2) {
+                Logger.showToast(mContext, "Can't create default extra keys",true);
+                Logger.logStackTraceWithMessage(LOG_TAG, "Could create default extra keys: ", e);
+                mExtraKeysInfo = null;
+            }
+        }
+    }
+
+    /**
+     * Set the terminal sessions shortcuts.
+     */
+    private void setSessionShortcuts() {
+        if(mSessionShortcuts == null)
+            mSessionShortcuts = new ArrayList<>();
+        else
+            mSessionShortcuts.clear();
+
+        // The {@link TermuxPropertyConstants#MAP_SESSION_SHORTCUTS} stores the session shortcut key and action pair
+        for (Map.Entry<String, Integer> entry : TermuxPropertyConstants.MAP_SESSION_SHORTCUTS.entrySet()) {
+            // The mMap stores the code points for the session shortcuts while loading properties
+            Integer codePoint = (Integer) getInternalPropertyValue(entry.getKey(), true);
+            // If codePoint is null, then session shortcut did not exist in properties or was invalid
+            // as parsed by {@link #getCodePointForSessionShortcuts(String,String)}
+            // If codePoint is not null, then get the action for the MAP_SESSION_SHORTCUTS key and
+            // add the code point to sessionShortcuts
+            if (codePoint != null)
+                mSessionShortcuts.add(new KeyboardShortcut(codePoint, entry.getValue()));
+        }
+    }
+
+    public List<KeyboardShortcut> getSessionShortcuts() {
+        return mSessionShortcuts;
+    }
+
+    public ExtraKeysInfo getExtraKeysInfo() {
+        return mExtraKeysInfo;
+    }
+
+}
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxSession.java b/app/src/main/java/com/termux/app/terminal/TermuxSession.java
index b282b1f026..7b8381e351 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxSession.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxSession.java
@@ -3,11 +3,11 @@
 import androidx.annotation.NonNull;
 
 import com.termux.R;
-import com.termux.app.TermuxConstants;
+import com.termux.shared.termux.TermuxConstants;
 import com.termux.app.TermuxService;
-import com.termux.app.utils.Logger;
+import com.termux.shared.logger.Logger;
 import com.termux.app.utils.PluginUtils;
-import com.termux.app.shell.ShellUtils;
+import com.termux.shared.shell.ShellUtils;
 import com.termux.app.models.ExecutionCommand;
 import com.termux.terminal.TerminalSession;
 
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxSessionClient.java b/app/src/main/java/com/termux/app/terminal/TermuxSessionClient.java
index 96fc38490c..2dbc55524b 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxSessionClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxSessionClient.java
@@ -13,13 +13,13 @@
 import android.widget.ListView;
 
 import com.termux.R;
-import com.termux.app.utils.DialogUtils;
+import com.termux.shared.interact.DialogUtils;
 import com.termux.app.TermuxActivity;
-import com.termux.app.TermuxConstants;
+import com.termux.shared.termux.TermuxConstants;
 import com.termux.app.TermuxService;
-import com.termux.app.settings.properties.TermuxPropertyConstants;
+import com.termux.shared.settings.properties.TermuxPropertyConstants;
 import com.termux.app.terminal.io.BellHandler;
-import com.termux.app.utils.Logger;
+import com.termux.shared.logger.Logger;
 import com.termux.terminal.TerminalColors;
 import com.termux.terminal.TerminalSession;
 import com.termux.terminal.TextStyle;
@@ -31,15 +31,15 @@
 
 public class TermuxSessionClient extends TermuxSessionClientBase {
 
-    final TermuxActivity mActivity;
+    private final TermuxActivity mActivity;
 
     private static final int MAX_SESSIONS = 8;
 
-    final SoundPool mBellSoundPool = new SoundPool.Builder().setMaxStreams(1).setAudioAttributes(
+    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();
 
-    int mBellSoundId;
+    private final int mBellSoundId;
 
     private static final String LOG_TAG = "TermuxSessionClient";
 
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxSessionClientBase.java b/app/src/main/java/com/termux/app/terminal/TermuxSessionClientBase.java
index 7404ed00b9..cb0dec8fbb 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxSessionClientBase.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxSessionClientBase.java
@@ -1,6 +1,6 @@
 package com.termux.app.terminal;
 
-import com.termux.app.utils.Logger;
+import com.termux.shared.logger.Logger;
 import com.termux.terminal.TerminalSession;
 import com.termux.terminal.TerminalSessionClient;
 
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTask.java b/app/src/main/java/com/termux/app/terminal/TermuxTask.java
index 0c0143ee63..f70ee9e5b1 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTask.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTask.java
@@ -3,12 +3,12 @@
 import androidx.annotation.NonNull;
 
 import com.termux.R;
-import com.termux.app.TermuxConstants;
+import com.termux.shared.termux.TermuxConstants;
 import com.termux.app.TermuxService;
-import com.termux.app.shell.StreamGobbler;
-import com.termux.app.utils.Logger;
+import com.termux.shared.shell.StreamGobbler;
+import com.termux.shared.logger.Logger;
 import com.termux.app.utils.PluginUtils;
-import com.termux.app.shell.ShellUtils;
+import com.termux.shared.shell.ShellUtils;
 import com.termux.app.models.ExecutionCommand;
 import com.termux.app.models.ExecutionCommand.ExecutionState;
 
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxViewClient.java b/app/src/main/java/com/termux/app/terminal/TermuxViewClient.java
index 329e8f4170..08586fe54c 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxViewClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxViewClient.java
@@ -20,17 +20,17 @@
 
 import com.termux.R;
 import com.termux.app.TermuxActivity;
-import com.termux.app.TermuxConstants;
+import com.termux.shared.termux.TermuxConstants;
 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.app.settings.properties.TermuxPropertyConstants;
-import com.termux.app.utils.DataUtils;
-import com.termux.app.utils.Logger;
-import com.termux.app.utils.MarkdownUtils;
-import com.termux.app.utils.TermuxUtils;
+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.terminal.KeyHandler;
 import com.termux.terminal.TerminalEmulator;
 import com.termux.terminal.TerminalSession;
@@ -81,7 +81,7 @@ public boolean shouldBackButtonBeMappedToEscape() {
     }
 
     @Override
-    public boolean shouldEnforeCharBasedInput() {
+    public boolean shouldEnforceCharBasedInput() {
         return mActivity.getProperties().isEnforcingCharBasedInput();
     }
 
@@ -301,7 +301,7 @@ public boolean onCodePoint(final int codePoint, boolean ctrlDown, TerminalSessio
             }
 
             List<KeyboardShortcut> shortcuts = mActivity.getProperties().getSessionShortcuts();
-            if (!shortcuts.isEmpty()) {
+            if (shortcuts != null && !shortcuts.isEmpty()) {
                 int codePointLowerCase = Character.toLowerCase(codePoint);
                 for (int i = shortcuts.size() - 1; i >= 0; i--) {
                     KeyboardShortcut shortcut = shortcuts.get(i);
diff --git a/app/src/main/java/com/termux/app/terminal/io/BellHandler.java b/app/src/main/java/com/termux/app/terminal/io/BellHandler.java
index 490bd2fd40..728e12e60d 100644
--- a/app/src/main/java/com/termux/app/terminal/io/BellHandler.java
+++ b/app/src/main/java/com/termux/app/terminal/io/BellHandler.java
@@ -47,7 +47,7 @@ public synchronized void doBell() {
         if (timeSinceLastBell < 0) {
             // there is a next bell pending; don't schedule another one
         } else if (timeSinceLastBell < MIN_PAUSE) {
-            // there was a bell recently, scheudle the next one
+            // there was a bell recently, schedule the next one
             handler.postDelayed(bellRunnable, MIN_PAUSE - timeSinceLastBell);
             lastBell = lastBell + MIN_PAUSE;
         } else {
diff --git a/app/src/main/java/com/termux/app/terminal/io/extrakeys/ExtraKeyButton.java b/app/src/main/java/com/termux/app/terminal/io/extrakeys/ExtraKeyButton.java
index 2701a9ecc4..9454081970 100644
--- a/app/src/main/java/com/termux/app/terminal/io/extrakeys/ExtraKeyButton.java
+++ b/app/src/main/java/com/termux/app/terminal/io/extrakeys/ExtraKeyButton.java
@@ -33,7 +33,7 @@ public class ExtraKeyButton {
      * The information of the popup (triggered by swipe up).
      */
     @Nullable
-    private ExtraKeyButton popup = null;
+    private ExtraKeyButton popup;
 
     public ExtraKeyButton(ExtraKeysInfo.CharDisplayMap charDisplayMap, JSONObject config) throws JSONException {
         this(charDisplayMap, config, null);
diff --git a/app/src/main/java/com/termux/app/terminal/io/extrakeys/ExtraKeysInfo.java b/app/src/main/java/com/termux/app/terminal/io/extrakeys/ExtraKeysInfo.java
index 12fe30a966..d71f392684 100644
--- a/app/src/main/java/com/termux/app/terminal/io/extrakeys/ExtraKeysInfo.java
+++ b/app/src/main/java/com/termux/app/terminal/io/extrakeys/ExtraKeysInfo.java
@@ -16,7 +16,7 @@ public class ExtraKeysInfo {
     /**
      * This corresponds to one of the CharMapDisplay below
      */
-    private String style = "default";
+    private String style;
 
     public ExtraKeysInfo(String propertiesInfo, String style) throws JSONException {
         this.style = style;
diff --git a/app/src/main/java/com/termux/app/crash/CrashUtils.java b/app/src/main/java/com/termux/app/utils/CrashUtils.java
similarity index 62%
rename from app/src/main/java/com/termux/app/crash/CrashUtils.java
rename to app/src/main/java/com/termux/app/utils/CrashUtils.java
index e1af3dd0c5..a192e5ab2e 100644
--- a/app/src/main/java/com/termux/app/crash/CrashUtils.java
+++ b/app/src/main/java/com/termux/app/utils/CrashUtils.java
@@ -1,4 +1,4 @@
-package com.termux.app.crash;
+package com.termux.app.utils;
 
 import android.app.Notification;
 import android.app.NotificationManager;
@@ -10,66 +10,33 @@
 
 import com.termux.R;
 import com.termux.app.activities.ReportActivity;
-import com.termux.app.file.FileUtils;
+import com.termux.shared.notification.NotificationUtils;
+import com.termux.shared.file.FileUtils;
 import com.termux.app.models.ReportInfo;
 import com.termux.app.models.UserAction;
-import com.termux.app.settings.preferences.TermuxAppSharedPreferences;
-import com.termux.app.settings.preferences.TermuxPreferenceConstants;
-import com.termux.app.utils.DataUtils;
-import com.termux.app.utils.Logger;
-import com.termux.app.utils.MarkdownUtils;
-import com.termux.app.utils.NotificationUtils;
-import com.termux.app.utils.TermuxUtils;
+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.TermuxUtils;
 
-import com.termux.app.TermuxConstants;
+import com.termux.shared.termux.TermuxConstants;
 
 import java.nio.charset.Charset;
 
 public class CrashUtils {
 
-    private static final String NOTIFICATION_CHANNEL_ID_CRASH_REPORT_ERRORS = "termux_crash_reports_notification_channel";
-    private static final String NOTIFICATION_CHANNEL_NAME_CRASH_REPORT_ERRORS = TermuxConstants.TERMUX_APP_NAME + " Crash Reports";
-
     private static final String LOG_TAG = "CrashUtils";
 
-    /**
-     * Log a crash in the crash log file at
-     * {@link TermuxConstants#TERMUX_CRASH_LOG_FILE_PATH}.
-     *
-     * @param context The {@link Context} for operations.
-     * @param thread The {@link Thread} in which the crash happened.
-     * @param thread The {@link Throwable} thrown for the crash.
-     */
-    public static void logCrash(final Context context, final Thread thread, final Throwable throwable) {
-
-        StringBuilder reportString = new StringBuilder();
-
-        reportString.append("## Crash Details\n");
-        reportString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Crash Thread", thread.toString(), "-"));
-        reportString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Crash Timestamp", TermuxUtils.getCurrentTimeStamp(), "-"));
-
-        reportString.append("\n\n").append(Logger.getStackTracesMarkdownString("Stacktrace", Logger.getStackTraceStringArray(throwable)));
-        reportString.append("\n\n").append(TermuxUtils.getAppInfoMarkdownString(context, true));
-        reportString.append("\n\n").append(TermuxUtils.getDeviceInfoMarkdownString(context));
-
-        // Log report string to logcat
-        Logger.logError(reportString.toString());
-
-        // Write report string to crash log file
-        String errmsg = FileUtils.writeStringToFile(context, "crash log", TermuxConstants.TERMUX_CRASH_LOG_FILE_PATH, Charset.defaultCharset(), reportString.toString(), false);
-        if (errmsg != null) {
-            Logger.logError(LOG_TAG, errmsg);
-        }
-    }
-
     /**
      * 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}.
+     * {@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
      * {@link TermuxPreferenceConstants.TERMUX_APP#KEY_CRASH_REPORT_NOTIFICATIONS_ENABLED} is
      * enabled, then a notification will be shown for the crash on the
-     * {@link #NOTIFICATION_CHANNEL_NAME_CRASH_REPORT_ERRORS} channel, otherwise nothing will be done.
+     * {@link TermuxConstants#TERMUX_CRASH_REPORTS_NOTIFICATION_CHANNEL_NAME} channel, otherwise nothing will be done.
      *
      * After reading from the crash log file, it will be moved to {@link TermuxConstants#TERMUX_CRASH_LOG_BACKUP_FILE_PATH}.
      *
@@ -140,23 +107,23 @@ public void run() {
     }
 
     /**
-     * Get {@link Notification.Builder} for {@link #NOTIFICATION_CHANNEL_ID_CRASH_REPORT_ERRORS}
-     * and {@link #NOTIFICATION_CHANNEL_NAME_CRASH_REPORT_ERRORS}.
+     * Get {@link Notification.Builder} 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 title The title for the notification.
-     * @param notifiationText The second line text of 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 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 notifiationText, final CharSequence notificationBigText, final PendingIntent pendingIntent, 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,
-            NOTIFICATION_CHANNEL_ID_CRASH_REPORT_ERRORS, Notification.PRIORITY_HIGH,
-            title, notifiationText, notificationBigText, pendingIntent, notificationMode);
+            TermuxConstants.TERMUX_CRASH_REPORTS_NOTIFICATION_CHANNEL_ID, Notification.PRIORITY_HIGH,
+            title, notificationText, notificationBigText, pendingIntent, notificationMode);
 
         if (builder == null)  return null;
 
@@ -176,14 +143,14 @@ public static Notification.Builder getCrashReportsNotificationBuilder(final Cont
     }
 
     /**
-     * Setup the notification channel for {@link #NOTIFICATION_CHANNEL_ID_CRASH_REPORT_ERRORS} and
-     * {@link #NOTIFICATION_CHANNEL_NAME_CRASH_REPORT_ERRORS}.
+     * Setup the notification channel 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.
      */
     public static void setupCrashReportsNotificationChannel(final Context context) {
-        NotificationUtils.setupNotificationChannel(context, NOTIFICATION_CHANNEL_ID_CRASH_REPORT_ERRORS,
-            NOTIFICATION_CHANNEL_NAME_CRASH_REPORT_ERRORS, NotificationManager.IMPORTANCE_HIGH);
+        NotificationUtils.setupNotificationChannel(context, TermuxConstants.TERMUX_CRASH_REPORTS_NOTIFICATION_CHANNEL_ID,
+            TermuxConstants.TERMUX_CRASH_REPORTS_NOTIFICATION_CHANNEL_NAME, NotificationManager.IMPORTANCE_HIGH);
     }
 
 }
diff --git a/app/src/main/java/com/termux/app/utils/PluginUtils.java b/app/src/main/java/com/termux/app/utils/PluginUtils.java
index f95dd35a30..a174c0d5b5 100644
--- a/app/src/main/java/com/termux/app/utils/PluginUtils.java
+++ b/app/src/main/java/com/termux/app/utils/PluginUtils.java
@@ -11,22 +11,24 @@
 import androidx.annotation.Nullable;
 
 import com.termux.R;
-import com.termux.app.TermuxConstants;
-import com.termux.app.TermuxConstants.TERMUX_APP.TERMUX_SERVICE;
+import com.termux.shared.notification.NotificationUtils;
+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.app.settings.preferences.TermuxAppSharedPreferences;
-import com.termux.app.settings.preferences.TermuxPreferenceConstants.TERMUX_APP;
-import com.termux.app.settings.properties.SharedProperties;
-import com.termux.app.settings.properties.TermuxPropertyConstants;
+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.app.models.ReportInfo;
 import com.termux.app.models.ExecutionCommand;
 import com.termux.app.models.UserAction;
+import com.termux.shared.data.DataUtils;
+import com.termux.shared.markdown.MarkdownUtils;
+import com.termux.shared.termux.TermuxUtils;
 
 public class PluginUtils {
 
-    private static final String NOTIFICATION_CHANNEL_ID_PLUGIN_COMMAND_ERRORS = "termux_plugin_command_errors_notification_channel";
-    private static final String NOTIFICATION_CHANNEL_NAME_PLUGIN_COMMAND_ERRORS = TermuxConstants.TERMUX_APP_NAME + " Plugin Commands Errors";
-
     /** 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.
@@ -95,7 +97,7 @@ public static void processPluginExecutionCommandResult(final Context context, St
      *
      * 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
-     * on the {@link #NOTIFICATION_CHANNEL_NAME_PLUGIN_COMMAND_ERRORS} channel instead of just logging
+     * on the {@link TermuxConstants#TERMUX_PLUGIN_COMMAND_ERRORS_NOTIFICATION_CHANNEL_NAME} channel instead of just logging
      * the error.
      *
      * @param context The {@link Context} for operations.
@@ -162,11 +164,11 @@ public static void processPluginExecutionCommandError(final Context context, Str
         setupPluginCommandErrorsNotificationChannel(context);
 
         // Use markdown in notification
-        CharSequence notifiationText = MarkdownUtils.getSpannedMarkdownText(context, executionCommand.errmsg);
-        //CharSequence notifiationText = executionCommand.errmsg;
+        CharSequence notificationText = MarkdownUtils.getSpannedMarkdownText(context, executionCommand.errmsg);
+        //CharSequence notificationText = executionCommand.errmsg;
 
         // Build the notification
-        Notification.Builder builder = getPluginCommandErrorsNotificationBuilder(context, title, notifiationText, notifiationText, pendingIntent, NotificationUtils.NOTIFICATION_MODE_VIBRATE);
+        Notification.Builder builder = getPluginCommandErrorsNotificationBuilder(context, title, notificationText, notificationText, pendingIntent, NotificationUtils.NOTIFICATION_MODE_VIBRATE);
         if(builder == null)  return;
 
         // Send the notification
@@ -202,7 +204,6 @@ public static boolean sendPluginExecutionCommandResultPendingIntent(Context cont
 
         String truncatedStdout = null;
         String truncatedStderr = null;
-        String truncatedErrmsg = null;
 
         String stdoutOriginalLength = (stdout == null) ? null: String.valueOf(stdout.length());
         String stderrOriginalLength = (stderr == null) ? null: String.valueOf(stderr.length());
@@ -231,7 +232,7 @@ public static boolean sendPluginExecutionCommandResultPendingIntent(Context cont
 
         // Truncate errmsg to max TRANSACTION_SIZE_LIMIT_IN_BYTES / 4
         // trim from end to preserve start of stacktraces
-        truncatedErrmsg = DataUtils.getTruncatedCommandOutput(errmsg, DataUtils.TRANSACTION_SIZE_LIMIT_IN_BYTES / 4, true, false, false);
+        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;
@@ -262,23 +263,23 @@ public static boolean sendPluginExecutionCommandResultPendingIntent(Context cont
 
 
     /**
-     * Get {@link Notification.Builder} for {@link #NOTIFICATION_CHANNEL_ID_PLUGIN_COMMAND_ERRORS}
-     * and {@link #NOTIFICATION_CHANNEL_NAME_PLUGIN_COMMAND_ERRORS}.
+     * Get {@link Notification.Builder} 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 title The title for the notification.
-     * @param notifiationText The second line text of 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 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 notifiationText, final CharSequence notificationBigText, final PendingIntent pendingIntent, 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,
-            NOTIFICATION_CHANNEL_ID_PLUGIN_COMMAND_ERRORS, Notification.PRIORITY_HIGH,
-            title, notifiationText, notificationBigText, pendingIntent, notificationMode);
+            TermuxConstants.TERMUX_PLUGIN_COMMAND_ERRORS_NOTIFICATION_CHANNEL_ID, Notification.PRIORITY_HIGH,
+            title, notificationText, notificationBigText, pendingIntent, notificationMode);
 
         if(builder == null)  return null;
 
@@ -298,14 +299,14 @@ public static Notification.Builder getPluginCommandErrorsNotificationBuilder(fin
     }
 
     /**
-     * Setup the notification channel for {@link #NOTIFICATION_CHANNEL_ID_PLUGIN_COMMAND_ERRORS} and
-     * {@link #NOTIFICATION_CHANNEL_NAME_PLUGIN_COMMAND_ERRORS}.
+     * Setup the notification channel 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.
      */
     public static void setupPluginCommandErrorsNotificationChannel(final Context context) {
-        NotificationUtils.setupNotificationChannel(context, NOTIFICATION_CHANNEL_ID_PLUGIN_COMMAND_ERRORS,
-            NOTIFICATION_CHANNEL_NAME_PLUGIN_COMMAND_ERRORS, NotificationManager.IMPORTANCE_HIGH);
+        NotificationUtils.setupNotificationChannel(context, TermuxConstants.TERMUX_PLUGIN_COMMAND_ERRORS_NOTIFICATION_CHANNEL_ID,
+            TermuxConstants.TERMUX_PLUGIN_COMMAND_ERRORS_NOTIFICATION_CHANNEL_NAME, NotificationManager.IMPORTANCE_HIGH);
     }
 
 
diff --git a/app/src/main/java/com/termux/filepicker/TermuxDocumentsProvider.java b/app/src/main/java/com/termux/filepicker/TermuxDocumentsProvider.java
index 0a4de74f69..7974d6dbc1 100644
--- a/app/src/main/java/com/termux/filepicker/TermuxDocumentsProvider.java
+++ b/app/src/main/java/com/termux/filepicker/TermuxDocumentsProvider.java
@@ -12,7 +12,7 @@
 import android.webkit.MimeTypeMap;
 
 import com.termux.R;
-import com.termux.app.TermuxConstants;
+import com.termux.shared.termux.TermuxConstants;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -63,9 +63,9 @@ public class TermuxDocumentsProvider extends DocumentsProvider {
     };
 
     @Override
-    public Cursor queryRoots(String[] projection) throws FileNotFoundException {
+    public Cursor queryRoots(String[] projection) {
         final MatrixCursor result = new MatrixCursor(projection != null ? projection : DEFAULT_ROOT_PROJECTION);
-        @SuppressWarnings("ConstantConditions") final String applicationName = getContext().getString(R.string.application_name);
+        final String applicationName = getContext().getString(R.string.application_name);
 
         final MatrixCursor.RowBuilder row = result.newRow();
         row.add(Root.COLUMN_ROOT_ID, getDocIdForFile(BASE_DIR));
diff --git a/app/src/main/java/com/termux/filepicker/TermuxFileReceiverActivity.java b/app/src/main/java/com/termux/filepicker/TermuxFileReceiverActivity.java
index 8a279fcae1..ccee576588 100644
--- a/app/src/main/java/com/termux/filepicker/TermuxFileReceiverActivity.java
+++ b/app/src/main/java/com/termux/filepicker/TermuxFileReceiverActivity.java
@@ -9,11 +9,11 @@
 import android.util.Patterns;
 
 import com.termux.R;
-import com.termux.app.utils.DialogUtils;
-import com.termux.app.TermuxConstants;
-import com.termux.app.TermuxConstants.TERMUX_APP.TERMUX_SERVICE;
+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;
-import com.termux.app.utils.Logger;
+import com.termux.shared.logger.Logger;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index cc83b56d07..045e125f3d 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,5 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="background_markdown_code_inline">#1F000000</color>
-    <color name="background_markdown_code_block">#0F000000</color>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 11b39d2ce2..741e849863 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -48,6 +48,9 @@
 
     <string name="action_toggle_soft_keyboard">Keyboard</string>
 
+    <string name="msg_enabling_terminal_toolbar">Enabling Terminal Toolbar</string>
+    <string name="msg_disabling_terminal_toolbar">Disabling Terminal Toolbar</string>
+
 
 
     <!-- Terminal Popup -->
@@ -103,55 +106,6 @@
 
 
 
-    <!-- Termux FileUtils -->
-    <string name="error_executable_required">Executable required.</string>
-    <string name="error_null_or_empty_parameter">The %1$s is to \"%2$s\" null or empty.</string>
-    <string name="error_null_or_empty_regular_file_path">The regular file path is null or empty.</string>
-    <string name="error_null_or_empty_regular_file">The regular file is null or empty.</string>
-    <string name="error_null_or_empty_executable_file_path">The executable file path is null or empty.</string>
-    <string name="error_null_or_empty_executable_file">The executable file is null or empty.</string>
-    <string name="error_null_or_empty_directory_file_path">The directory file path is null or empty.</string>
-    <string name="error_null_or_empty_directory_file">The directory file is null or empty.</string>
-
-    <string name="error_file_not_found_at_path">The %1$s is not found at path \"%2$s\".</string>
-    <string name="error_no_regular_file_found">Regular file not found at %1$s path.</string>
-    <string name="error_not_a_regular_file">The %1$s at path \"%2$s\" is not a regular file.</string>
-    <string name="error_non_regular_file_found">Non-regular file found at %1$s path.</string>
-    <string name="error_non_directory_file_found">Non-directory file found at %1$s path.</string>
-    <string name="error_non_symlink_file_found">Non-symlink file found at %1$s path.</string>
-    <string name="error_file_not_an_allowed_file_type">The %1$s found at path \"%2$s\" is not one of allowed file types \"%3$s\".</string>
-
-    <string name="error_validate_file_existence_and_permissions_failed_with_exception">Validating file existence and permissions of %1$s at path \"%2$s\" failed.\nException: %3$s</string>
-    <string name="error_validate_directory_existence_and_permissions_failed_with_exception">Validating directory existence and permissions of %1$s at path \"%2$s\" failed.\nException: %3$s</string>
-
-    <string name="error_creating_file_failed">Creating %1$s at path \"%2$s\" failed.</string>
-    <string name="error_creating_file_failed_with_exception">Creating %1$s at path \"%2$s\" failed.\nException: %3$s</string>
-
-    <string name="error_cannot_overwrite_a_non_symlink_file_type">Cannot overwrite %1$s while creating symlink at \"%2$s\" to \"%3$s\" since destination file type \"%4$s\" is not a symlink.</string>
-    <string name="error_creating_symlink_file_failed_with_exception">Creating %1$s at path \"%2$s\" to \"%3$s\" failed.\nException: %4$s</string>
-
-    <string name="error_copying_or_moving_file_failed_with_exception">%1$s from \"%2$s\" to \"%3$s\" failed.\nException: %4$s</string>
-    <string name="error_copying_or_moving_file_to_same_path">%1$s from \"%2$s\" to \"%3$s\" cannot be done since they point to the same path.</string>
-    <string name="error_cannot_overwrite_a_different_file_type">Cannot overwrite %1$s while %2$s it from \"%3$s\" to \"%4$s\" since destination file type \"%5$s\" is different from source file type \"%6$s\".</string>
-    <string name="error_cannot_move_directory_to_sub_directory_of_itself">Cannot move %1$s from \"%2$s\" to \"%3$s\" since destination is a subdirectory of the source.</string>
-
-    <string name="error_file_still_exists_after_deleting">The %1$s still exists after deleting it from \"%2$s\".</string>
-    <string name="error_deleting_file_failed">Deleting %1$s at path \"%2$s\" failed.</string>
-    <string name="error_deleting_file_failed_with_exception">Deleting %1$s at path \"%2$s\" failed.\nException: %3$s</string>
-    <string name="error_clearing_directory_failed_with_exception">Clearing %1$s at path \"%2$s\" failed.\nException: %3$s</string>
-
-    <string name="error_reading_string_to_file_failed_with_exception">Reading string from %1$s at path \"%2$s\" failed.\nException: %3$s</string>
-    <string name="error_writing_string_to_file_failed_with_exception">Writing string to %1$s at path \"%2$s\" failed.\nException: %3$s</string>
-    <string name="error_unsupported_charset">Unsupported charset \"%1$s\"</string>
-    <string name="error_checking_if_charset_supported_failed">Checking if charset \"%1$s\" is suppoted failed.\nException: %2$s</string>
-
-    <string name="error_invalid_file_permissions_string_to_check">The file permission string to check is invalid.</string>
-    <string name="error_file_not_readable">The %1$s at path is not readable. Permission Denied.</string>
-    <string name="error_file_not_writable">The %1$s at path is not writable. Permission Denied.</string>
-    <string name="error_file_not_executable">The %1$s at path is not executable. Permission Denied.</string>
-
-
-
     <!-- Termux Report And ShareUtils -->
     <string name="action_copy">Copy</string>
     <string name="action_share">Share</string>
@@ -159,14 +113,6 @@
     <string name="title_share_with">Share With</string>
     <string name="title_report_text">Report Text</string>
 
-    <string name="msg_report_issue">If you think this report should be reported, then copy its text from the options menu (3-dots on top right) and post an issue on one of the following links at which the report belongs at.</string>
-
-
-
-    <!-- Termux PermissionUtils -->
-    <string name="message_sudo_please_grant_permissions">Please grant permissions on next screen</string>
-    <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 File Receiver -->
@@ -185,15 +131,6 @@
         <!-- Logging Category -->
         <string name="logging_header">Logging</string>
 
-            <!-- Log Level -->
-            <string name="log_level_title">Log Level</string>
-            <string name="log_level_off">"Off"</string>
-            <string name="log_level_normal">"Normal"</string>
-            <string name="log_level_debug">"Debug"</string>
-            <string name="log_level_verbose">"Verbose"</string>
-            <string name="log_level_unknown">"*Unknown*"</string>
-            <string name="log_level_value">Logcat log level set to \"%1$s\"</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>
@@ -221,5 +158,4 @@
             <string name="soft_keyboard_off">Soft keyboard will be disabled.</string>
             <string name="soft_keyboard_on">Soft keyboard will be enabled. (Default)</string>
 
-
 </resources>
diff --git a/app/src/test/java/com/termux/app/TermuxActivityTest.java b/app/src/test/java/com/termux/app/TermuxActivityTest.java
index 66be65fe37..090d5cce79 100644
--- a/app/src/test/java/com/termux/app/TermuxActivityTest.java
+++ b/app/src/test/java/com/termux/app/TermuxActivityTest.java
@@ -1,6 +1,6 @@
 package com.termux.app;
 
-import com.termux.app.utils.DataUtils;
+import com.termux.shared.data.DataUtils;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/gradle.properties b/gradle.properties
index 663d831306..b0b9199f6a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -19,3 +19,6 @@ minSdkVersion=24
 targetSdkVersion=28
 ndkVersion=22.0.7026061
 compileSdkVersion=29
+
+markwonVersion=4.6.2
+
diff --git a/settings.gradle b/settings.gradle
index 2cfc62326b..b8045c242a 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-include ':app', ':terminal-emulator', ':terminal-view'
+include ':app', ':termux-shared', ':terminal-emulator', ':terminal-view'
diff --git a/terminal-emulator/build.gradle b/terminal-emulator/build.gradle
index e92d24aeec..d899a96ff3 100644
--- a/terminal-emulator/build.gradle
+++ b/terminal-emulator/build.gradle
@@ -50,7 +50,7 @@ tasks.withType(Test) {
 }
 
 dependencies {
-    testImplementation 'junit:junit:4.13.1'
+    testImplementation 'junit:junit:4.13.2'
 }
 
 
diff --git a/terminal-view/src/main/java/com/termux/view/TerminalView.java b/terminal-view/src/main/java/com/termux/view/TerminalView.java
index 0eea85d479..3a0f005261 100644
--- a/terminal-view/src/main/java/com/termux/view/TerminalView.java
+++ b/terminal-view/src/main/java/com/termux/view/TerminalView.java
@@ -249,7 +249,7 @@ public boolean attachSession(TerminalSession session) {
 
     @Override
     public InputConnection onCreateInputConnection(EditorInfo outAttrs) {
-        if (mClient.shouldEnforeCharBasedInput()) {
+        if (mClient.shouldEnforceCharBasedInput()) {
             // Some keyboards seems do not reset the internal state on TYPE_NULL.
             // Affects mostly Samsung stock keyboards.
             // https://github.com/termux/termux-app/issues/686
diff --git a/terminal-view/src/main/java/com/termux/view/TerminalViewClient.java b/terminal-view/src/main/java/com/termux/view/TerminalViewClient.java
index a1ed550b21..3e454f9a23 100644
--- a/terminal-view/src/main/java/com/termux/view/TerminalViewClient.java
+++ b/terminal-view/src/main/java/com/termux/view/TerminalViewClient.java
@@ -30,7 +30,7 @@ public interface TerminalViewClient {
 
     boolean shouldBackButtonBeMappedToEscape();
 
-    boolean shouldEnforeCharBasedInput();
+    boolean shouldEnforceCharBasedInput();
 
     boolean shouldUseCtrlSpaceWorkaround();
 
diff --git a/termux-shared/.gitignore b/termux-shared/.gitignore
new file mode 100644
index 0000000000..796b96d1c4
--- /dev/null
+++ b/termux-shared/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/termux-shared/build.gradle b/termux-shared/build.gradle
new file mode 100644
index 0000000000..f41993651d
--- /dev/null
+++ b/termux-shared/build.gradle
@@ -0,0 +1,67 @@
+apply plugin: 'com.android.library'
+apply plugin: 'maven-publish'
+
+android {
+    compileSdkVersion project.properties.compileSdkVersion.toInteger()
+
+    dependencies {
+        implementation "androidx.annotation:annotation:1.2.0"
+        implementation "com.google.guava:guava:24.1-jre"
+        implementation "io.noties.markwon:core:$markwonVersion"
+        implementation "io.noties.markwon:ext-strikethrough:$markwonVersion"
+        implementation "io.noties.markwon:linkify:$markwonVersion"
+        implementation "io.noties.markwon:recycler:$markwonVersion"
+
+        // Do not increment version higher than 2.5 or there
+        // will be runtime exceptions on android < 8
+        // due to missing classes like java.nio.file.Path.
+        implementation "commons-io:commons-io:2.5"
+    }
+
+    defaultConfig {
+        minSdkVersion project.properties.minSdkVersion.toInteger()
+        targetSdkVersion project.properties.targetSdkVersion.toInteger()
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+}
+
+dependencies {
+    testImplementation "junit:junit:4.13.2"
+    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+}
+
+publishing {
+    publications {
+        bar(MavenPublication) {
+            groupId 'com.termux'
+            artifactId 'termux-shared'
+            version '0.108'
+            artifact("$buildDir/outputs/aar/termux-shared-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")
+            }
+        }
+    }
+}
diff --git a/termux-shared/proguard-rules.pro b/termux-shared/proguard-rules.pro
new file mode 100644
index 0000000000..ab2e21a773
--- /dev/null
+++ b/termux-shared/proguard-rules.pro
@@ -0,0 +1,10 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+-dontobfuscate
+#-renamesourcefileattribute SourceFile
+#-keepattributes SourceFile,LineNumberTable
diff --git a/termux-shared/src/androidTest/java/com/termux/shared/ExampleInstrumentedTest.java b/termux-shared/src/androidTest/java/com/termux/shared/ExampleInstrumentedTest.java
new file mode 100644
index 0000000000..ff184472c7
--- /dev/null
+++ b/termux-shared/src/androidTest/java/com/termux/shared/ExampleInstrumentedTest.java
@@ -0,0 +1,26 @@
+package com.termux.shared;
+
+import android.content.Context;
+
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+    @Test
+    public void useAppContext() {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
+        assertEquals("com.termux.shared.test", appContext.getPackageName());
+    }
+}
diff --git a/termux-shared/src/main/AndroidManifest.xml b/termux-shared/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..5759b36774
--- /dev/null
+++ b/termux-shared/src/main/AndroidManifest.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="com.termux.shared">
+</manifest>
diff --git a/termux-shared/src/main/java/com/termux/shared/crash/CrashHandler.java b/termux-shared/src/main/java/com/termux/shared/crash/CrashHandler.java
new file mode 100644
index 0000000000..8cdbdf246b
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/crash/CrashHandler.java
@@ -0,0 +1,74 @@
+package com.termux.shared.crash;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+
+import com.termux.shared.file.FileUtils;
+import com.termux.shared.logger.Logger;
+import com.termux.shared.markdown.MarkdownUtils;
+import com.termux.shared.termux.TermuxConstants;
+import com.termux.shared.termux.TermuxUtils;
+
+import java.nio.charset.Charset;
+
+/**
+ * Catches uncaught exceptions and logs them.
+ */
+public class CrashHandler implements Thread.UncaughtExceptionHandler {
+
+    private final Context context;
+    private final Thread.UncaughtExceptionHandler defaultUEH;
+
+    private static final String LOG_TAG = "CrashUtils";
+
+    private CrashHandler(final Context context) {
+        this.context = context;
+        this.defaultUEH = Thread.getDefaultUncaughtExceptionHandler();
+    }
+
+    public void uncaughtException(@NonNull Thread thread, @NonNull Throwable throwable) {
+        logCrash(context,thread, throwable);
+        defaultUEH.uncaughtException(thread, throwable);
+    }
+
+    /**
+     * Set default uncaught crash handler of current thread to {@link CrashHandler}.
+     */
+    public static void setCrashHandler(final Context context) {
+        if (!(Thread.getDefaultUncaughtExceptionHandler() instanceof CrashHandler)) {
+            Thread.setDefaultUncaughtExceptionHandler(new CrashHandler(context));
+        }
+    }
+
+    /**
+     * Log a crash in the crash log file at
+     * {@link TermuxConstants#TERMUX_CRASH_LOG_FILE_PATH}.
+     *
+     * @param context The {@link Context} for operations.
+     * @param thread The {@link Thread} in which the crash happened.
+     * @param throwable The {@link Throwable} thrown for the crash.
+     */
+    public static void logCrash(final Context context, final Thread thread, final Throwable throwable) {
+
+        StringBuilder reportString = new StringBuilder();
+
+        reportString.append("## Crash Details\n");
+        reportString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Crash Thread", thread.toString(), "-"));
+        reportString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Crash Timestamp", TermuxUtils.getCurrentTimeStamp(), "-"));
+
+        reportString.append("\n\n").append(Logger.getStackTracesMarkdownString("Stacktrace", Logger.getStackTraceStringArray(throwable)));
+        reportString.append("\n\n").append(TermuxUtils.getAppInfoMarkdownString(context, true));
+        reportString.append("\n\n").append(TermuxUtils.getDeviceInfoMarkdownString(context));
+
+        // Log report string to logcat
+        Logger.logError(reportString.toString());
+
+        // Write report string to crash log file
+        String errmsg = FileUtils.writeStringToFile(context, "crash log", TermuxConstants.TERMUX_CRASH_LOG_FILE_PATH, Charset.defaultCharset(), reportString.toString(), false);
+        if (errmsg != null) {
+            Logger.logError(LOG_TAG, errmsg);
+        }
+    }
+
+}
diff --git a/app/src/main/java/com/termux/app/utils/DataUtils.java b/termux-shared/src/main/java/com/termux/shared/data/DataUtils.java
similarity index 99%
rename from app/src/main/java/com/termux/app/utils/DataUtils.java
rename to termux-shared/src/main/java/com/termux/shared/data/DataUtils.java
index c179971397..61b7fff2a9 100644
--- a/app/src/main/java/com/termux/app/utils/DataUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/data/DataUtils.java
@@ -1,4 +1,4 @@
-package com.termux.app.utils;
+package com.termux.shared.data;
 
 import android.os.Bundle;
 
diff --git a/app/src/main/java/com/termux/app/file/FileUtils.java b/termux-shared/src/main/java/com/termux/shared/file/FileUtils.java
similarity index 99%
rename from app/src/main/java/com/termux/app/file/FileUtils.java
rename to termux-shared/src/main/java/com/termux/shared/file/FileUtils.java
index b91cd2e42d..71b1ae15dd 100644
--- a/app/src/main/java/com/termux/app/file/FileUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/file/FileUtils.java
@@ -1,4 +1,4 @@
-package com.termux.app.file;
+package com.termux.shared.file;
 
 import android.content.Context;
 import android.os.Build;
@@ -7,12 +7,12 @@
 import androidx.annotation.NonNull;
 
 import com.google.common.io.RecursiveDeleteOption;
-import com.termux.R;
-import com.termux.app.TermuxConstants;
-import com.termux.app.file.filesystem.FileType;
-import com.termux.app.file.filesystem.FileTypes;
-import com.termux.app.utils.DataUtils;
-import com.termux.app.utils.Logger;
+import com.termux.shared.R;
+import com.termux.shared.termux.TermuxConstants;
+import com.termux.shared.file.filesystem.FileType;
+import com.termux.shared.file.filesystem.FileTypes;
+import com.termux.shared.data.DataUtils;
+import com.termux.shared.logger.Logger;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
@@ -1460,7 +1460,7 @@ public static void setFilePermissions(String label, final String filePath, final
         label = (label == null ? "" : label + " ");
         if (filePath == null || filePath.isEmpty()) return;
 
-        if (!isValidPermissingString(permissionsToSet)) {
+        if (!isValidPermissionString(permissionsToSet)) {
             Logger.logError(LOG_TAG, "Invalid permissionsToSet passed to setFilePermissions: \"" + permissionsToSet + "\"");
             return;
         }
@@ -1531,7 +1531,7 @@ public static void setMissingFilePermissions(String label, final String filePath
         label = (label == null ? "" : label + " ");
         if (filePath == null || filePath.isEmpty()) return;
 
-        if (!isValidPermissingString(permissionsToSet)) {
+        if (!isValidPermissionString(permissionsToSet)) {
             Logger.logError(LOG_TAG, "Invalid permissionsToSet passed to setMissingFilePermissions: \"" + permissionsToSet + "\"");
             return;
         }
@@ -1585,7 +1585,7 @@ public static String checkMissingFilePermissions(@NonNull final Context context,
         label = (label == null ? "" : label + " ");
         if (filePath == null || filePath.isEmpty()) return context.getString(R.string.error_null_or_empty_parameter, label + "file path", "checkMissingFilePermissions");
 
-        if (!isValidPermissingString(permissionsToCheck)) {
+        if (!isValidPermissionString(permissionsToCheck)) {
             Logger.logError(LOG_TAG, "Invalid permissionsToCheck passed to checkMissingFilePermissions: \"" + permissionsToCheck + "\"");
             return context.getString(R.string.error_invalid_file_permissions_string_to_check);
         }
@@ -1619,7 +1619,7 @@ else if (permissionsToCheck.contains("x") && !file.canExecute() && !ignoreIfNotE
      * @param string The {@link String} to check.
      * @return Returns {@code true} if string exactly matches a permission string, otherwise {@code false}.
      */
-    public static boolean isValidPermissingString(final String string) {
+    public static boolean isValidPermissionString(final String string) {
         if (string == null || string.isEmpty()) return false;
         return Pattern.compile("^([r-])[w-][x-]$", 0).matcher(string).matches();
     }
diff --git a/app/src/main/java/com/termux/app/file/filesystem/FileAttributes.java b/termux-shared/src/main/java/com/termux/shared/file/filesystem/FileAttributes.java
similarity index 99%
rename from app/src/main/java/com/termux/app/file/filesystem/FileAttributes.java
rename to termux-shared/src/main/java/com/termux/shared/file/filesystem/FileAttributes.java
index 03482136cd..a9986c1a8e 100644
--- a/app/src/main/java/com/termux/app/file/filesystem/FileAttributes.java
+++ b/termux-shared/src/main/java/com/termux/shared/file/filesystem/FileAttributes.java
@@ -23,15 +23,13 @@
  * questions.
  */
 
-package com.termux.app.file.filesystem;
+package com.termux.shared.file.filesystem;
 
 import android.os.Build;
 import android.system.StructStat;
 
 import androidx.annotation.NonNull;
 
-import com.termux.app.utils.Logger;
-
 import java.io.File;
 import java.io.FileDescriptor;
 import java.io.IOException;
diff --git a/app/src/main/java/com/termux/app/file/filesystem/FileKey.java b/termux-shared/src/main/java/com/termux/shared/file/filesystem/FileKey.java
similarity index 98%
rename from app/src/main/java/com/termux/app/file/filesystem/FileKey.java
rename to termux-shared/src/main/java/com/termux/shared/file/filesystem/FileKey.java
index 87908a2634..bc65cf1670 100644
--- a/app/src/main/java/com/termux/app/file/filesystem/FileKey.java
+++ b/termux-shared/src/main/java/com/termux/shared/file/filesystem/FileKey.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package com.termux.app.file.filesystem;
+package com.termux.shared.file.filesystem;
 
 /**
  * Container for device/inode to uniquely identify file.
diff --git a/app/src/main/java/com/termux/app/file/filesystem/FilePermission.java b/termux-shared/src/main/java/com/termux/shared/file/filesystem/FilePermission.java
similarity index 97%
rename from app/src/main/java/com/termux/app/file/filesystem/FilePermission.java
rename to termux-shared/src/main/java/com/termux/shared/file/filesystem/FilePermission.java
index 6cb4dd1949..b9b1ed0ea6 100644
--- a/app/src/main/java/com/termux/app/file/filesystem/FilePermission.java
+++ b/termux-shared/src/main/java/com/termux/shared/file/filesystem/FilePermission.java
@@ -24,7 +24,7 @@
  * questions.
  */
 
-package com.termux.app.file.filesystem;
+package com.termux.shared.file.filesystem;
 
 /**
  * Defines the bits for use with the {@link FileAttributes#permissions()
@@ -83,5 +83,6 @@ public enum FilePermission {
     /**
      * Execute/search permission, others.
      */
-    OTHERS_EXECUTE;
+    OTHERS_EXECUTE
+
 }
diff --git a/app/src/main/java/com/termux/app/file/filesystem/FilePermissions.java b/termux-shared/src/main/java/com/termux/shared/file/filesystem/FilePermissions.java
similarity index 98%
rename from app/src/main/java/com/termux/app/file/filesystem/FilePermissions.java
rename to termux-shared/src/main/java/com/termux/shared/file/filesystem/FilePermissions.java
index eb48579c70..e069160993 100644
--- a/app/src/main/java/com/termux/app/file/filesystem/FilePermissions.java
+++ b/termux-shared/src/main/java/com/termux/shared/file/filesystem/FilePermissions.java
@@ -23,9 +23,9 @@
  * questions.
  */
 
-package com.termux.app.file.filesystem;
+package com.termux.shared.file.filesystem;
 
-import static com.termux.app.file.filesystem.FilePermission.*;
+import static com.termux.shared.file.filesystem.FilePermission.*;
 
 import java.util.*;
 
diff --git a/app/src/main/java/com/termux/app/file/filesystem/FileTime.java b/termux-shared/src/main/java/com/termux/shared/file/filesystem/FileTime.java
similarity index 99%
rename from app/src/main/java/com/termux/app/file/filesystem/FileTime.java
rename to termux-shared/src/main/java/com/termux/shared/file/filesystem/FileTime.java
index cf0f30fde9..14c1d8b5ab 100644
--- a/app/src/main/java/com/termux/app/file/filesystem/FileTime.java
+++ b/termux-shared/src/main/java/com/termux/shared/file/filesystem/FileTime.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package com.termux.app.file.filesystem;
+package com.termux.shared.file.filesystem;
 
 import androidx.annotation.NonNull;
 
diff --git a/app/src/main/java/com/termux/app/file/filesystem/FileType.java b/termux-shared/src/main/java/com/termux/shared/file/filesystem/FileType.java
similarity index 94%
rename from app/src/main/java/com/termux/app/file/filesystem/FileType.java
rename to termux-shared/src/main/java/com/termux/shared/file/filesystem/FileType.java
index 2378456b38..00ed06d62b 100644
--- a/app/src/main/java/com/termux/app/file/filesystem/FileType.java
+++ b/termux-shared/src/main/java/com/termux/shared/file/filesystem/FileType.java
@@ -1,4 +1,4 @@
-package com.termux.app.file.filesystem;
+package com.termux.shared.file.filesystem;
 
 /** The {@link Enum} that defines file types. */
 public enum FileType {
diff --git a/app/src/main/java/com/termux/app/file/filesystem/FileTypes.java b/termux-shared/src/main/java/com/termux/shared/file/filesystem/FileTypes.java
similarity index 98%
rename from app/src/main/java/com/termux/app/file/filesystem/FileTypes.java
rename to termux-shared/src/main/java/com/termux/shared/file/filesystem/FileTypes.java
index 447f11f53f..c6a78d7afe 100644
--- a/app/src/main/java/com/termux/app/file/filesystem/FileTypes.java
+++ b/termux-shared/src/main/java/com/termux/shared/file/filesystem/FileTypes.java
@@ -1,10 +1,10 @@
-package com.termux.app.file.filesystem;
+package com.termux.shared.file.filesystem;
 
 import android.system.Os;
 
 import androidx.annotation.NonNull;
 
-import com.termux.app.utils.Logger;
+import com.termux.shared.logger.Logger;
 
 import java.io.File;
 
diff --git a/app/src/main/java/com/termux/app/file/filesystem/NativeDispatcher.java b/termux-shared/src/main/java/com/termux/shared/file/filesystem/NativeDispatcher.java
similarity index 97%
rename from app/src/main/java/com/termux/app/file/filesystem/NativeDispatcher.java
rename to termux-shared/src/main/java/com/termux/shared/file/filesystem/NativeDispatcher.java
index 2eb6bfad5a..08ba808850 100644
--- a/app/src/main/java/com/termux/app/file/filesystem/NativeDispatcher.java
+++ b/termux-shared/src/main/java/com/termux/shared/file/filesystem/NativeDispatcher.java
@@ -1,4 +1,4 @@
-package com.termux.app.file.filesystem;
+package com.termux.shared.file.filesystem;
 
 import android.system.ErrnoException;
 import android.system.Os;
diff --git a/app/src/main/java/com/termux/app/file/filesystem/UnixConstants.java b/termux-shared/src/main/java/com/termux/shared/file/filesystem/UnixConstants.java
similarity index 99%
rename from app/src/main/java/com/termux/app/file/filesystem/UnixConstants.java
rename to termux-shared/src/main/java/com/termux/shared/file/filesystem/UnixConstants.java
index 0cc7a79dae..39e84eb674 100644
--- a/app/src/main/java/com/termux/app/file/filesystem/UnixConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/file/filesystem/UnixConstants.java
@@ -26,7 +26,7 @@
  *
  */
 // AUTOMATICALLY GENERATED FILE - DO NOT EDIT
-package com.termux.app.file.filesystem;
+package com.termux.shared.file.filesystem;
 
 // BEGIN Android-changed: Use constants from android.system.OsConstants. http://b/32203242
 // Those constants are initialized by native code to ensure correctness on different architectures.
diff --git a/app/src/main/java/com/termux/app/file/tests/FileUtilsTests.java b/termux-shared/src/main/java/com/termux/shared/file/tests/FileUtilsTests.java
similarity index 98%
rename from app/src/main/java/com/termux/app/file/tests/FileUtilsTests.java
rename to termux-shared/src/main/java/com/termux/shared/file/tests/FileUtilsTests.java
index 21db1d57db..52f876f5da 100644
--- a/app/src/main/java/com/termux/app/file/tests/FileUtilsTests.java
+++ b/termux-shared/src/main/java/com/termux/shared/file/tests/FileUtilsTests.java
@@ -1,12 +1,11 @@
-package com.termux.app.file.tests;
+package com.termux.shared.file.tests;
 
 import android.content.Context;
 
 import androidx.annotation.NonNull;
 
-import com.termux.app.TermuxConstants;
-import com.termux.app.file.FileUtils;
-import com.termux.app.utils.Logger;
+import com.termux.shared.file.FileUtils;
+import com.termux.shared.logger.Logger;
 
 import java.io.File;
 import java.nio.charset.Charset;
diff --git a/app/src/main/java/com/termux/app/utils/DialogUtils.java b/termux-shared/src/main/java/com/termux/shared/interact/DialogUtils.java
similarity index 98%
rename from app/src/main/java/com/termux/app/utils/DialogUtils.java
rename to termux-shared/src/main/java/com/termux/shared/interact/DialogUtils.java
index 5970850fe0..1a5fa8344d 100644
--- a/app/src/main/java/com/termux/app/utils/DialogUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/interact/DialogUtils.java
@@ -1,4 +1,4 @@
-package com.termux.app.utils;
+package com.termux.shared.interact;
 
 import android.app.Activity;
 import android.app.AlertDialog;
diff --git a/app/src/main/java/com/termux/app/utils/ShareUtils.java b/termux-shared/src/main/java/com/termux/shared/interact/ShareUtils.java
similarity index 94%
rename from app/src/main/java/com/termux/app/utils/ShareUtils.java
rename to termux-shared/src/main/java/com/termux/shared/interact/ShareUtils.java
index 3530ad0033..eb23970352 100644
--- a/app/src/main/java/com/termux/app/utils/ShareUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/interact/ShareUtils.java
@@ -1,4 +1,4 @@
-package com.termux.app.utils;
+package com.termux.shared.interact;
 
 import android.content.ClipData;
 import android.content.ClipboardManager;
@@ -7,7 +7,9 @@
 
 import androidx.core.content.ContextCompat;
 
-import com.termux.R;
+import com.termux.shared.R;
+import com.termux.shared.data.DataUtils;
+import com.termux.shared.logger.Logger;
 
 public class ShareUtils {
 
diff --git a/app/src/main/java/com/termux/app/utils/Logger.java b/termux-shared/src/main/java/com/termux/shared/logger/Logger.java
similarity index 93%
rename from app/src/main/java/com/termux/app/utils/Logger.java
rename to termux-shared/src/main/java/com/termux/shared/logger/Logger.java
index e296fc7ad6..b8fc151a7b 100644
--- a/app/src/main/java/com/termux/app/utils/Logger.java
+++ b/termux-shared/src/main/java/com/termux/shared/logger/Logger.java
@@ -1,4 +1,4 @@
-package com.termux.app.utils;
+package com.termux.shared.logger;
 
 import android.content.Context;
 import android.os.Handler;
@@ -6,8 +6,8 @@
 import android.util.Log;
 import android.widget.Toast;
 
-import com.termux.R;
-import com.termux.app.TermuxConstants;
+import com.termux.shared.R;
+import com.termux.shared.termux.TermuxConstants;
 
 import java.io.IOException;
 import java.io.PrintWriter;
@@ -31,7 +31,7 @@ public class Logger {
 
 
 
-    public static void logMesssage(int logLevel, String tag, String message) {
+    public static void logMessage(int logLevel, String tag, String message) {
         if(logLevel == Log.ERROR && CURRENT_LOG_LEVEL >= LOG_LEVEL_NORMAL)
             Log.e(getFullTag(tag), message);
         else if(logLevel == Log.WARN && CURRENT_LOG_LEVEL >= LOG_LEVEL_NORMAL)
@@ -47,51 +47,51 @@ else if(logLevel == Log.VERBOSE && CURRENT_LOG_LEVEL >= LOG_LEVEL_VERBOSE)
 
 
     public static void logError(String tag, String message) {
-        logMesssage(Log.ERROR, tag, message);
+        logMessage(Log.ERROR, tag, message);
     }
 
     public static void logError(String message) {
-        logMesssage(Log.ERROR, DEFAULT_LOG_TAG, message);
+        logMessage(Log.ERROR, DEFAULT_LOG_TAG, message);
     }
 
 
 
     public static void logWarn(String tag, String message) {
-        logMesssage(Log.WARN, tag, message);
+        logMessage(Log.WARN, tag, message);
     }
 
     public static void logWarn(String message) {
-        logMesssage(Log.WARN, DEFAULT_LOG_TAG, message);
+        logMessage(Log.WARN, DEFAULT_LOG_TAG, message);
     }
 
 
 
     public static void logInfo(String tag, String message) {
-        logMesssage(Log.INFO, tag, message);
+        logMessage(Log.INFO, tag, message);
     }
 
     public static void logInfo(String message) {
-        logMesssage(Log.INFO, DEFAULT_LOG_TAG, message);
+        logMessage(Log.INFO, DEFAULT_LOG_TAG, message);
     }
 
 
 
     public static void logDebug(String tag, String message) {
-        logMesssage(Log.DEBUG, tag, message);
+        logMessage(Log.DEBUG, tag, message);
     }
 
     public static void logDebug(String message) {
-        logMesssage(Log.DEBUG, DEFAULT_LOG_TAG, message);
+        logMessage(Log.DEBUG, DEFAULT_LOG_TAG, message);
     }
 
 
 
     public static void logVerbose(String tag, String message) {
-        logMesssage(Log.VERBOSE, tag, message);
+        logMessage(Log.VERBOSE, tag, message);
     }
 
     public static void logVerbose(String message) {
-        logMesssage(Log.VERBOSE, DEFAULT_LOG_TAG, message);
+        logMessage(Log.VERBOSE, DEFAULT_LOG_TAG, message);
     }
 
 
diff --git a/app/src/main/java/com/termux/app/utils/MarkdownUtils.java b/termux-shared/src/main/java/com/termux/shared/markdown/MarkdownUtils.java
similarity index 97%
rename from app/src/main/java/com/termux/app/utils/MarkdownUtils.java
rename to termux-shared/src/main/java/com/termux/shared/markdown/MarkdownUtils.java
index 5d40a20393..9c3bdaeb21 100644
--- a/app/src/main/java/com/termux/app/utils/MarkdownUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/markdown/MarkdownUtils.java
@@ -1,4 +1,4 @@
-package com.termux.app.utils;
+package com.termux.shared.markdown;
 
 import android.content.Context;
 import android.graphics.Typeface;
@@ -16,7 +16,7 @@
 import androidx.core.content.ContextCompat;
 
 import com.google.common.base.Strings;
-import com.termux.R;
+import com.termux.shared.R;
 
 import org.commonmark.ext.gfm.strikethrough.Strikethrough;
 import org.commonmark.node.BlockQuote;
@@ -38,8 +38,8 @@
 
 public class MarkdownUtils {
 
-    public static String backtick = "`";
-    public static Pattern backticksPattern = Pattern.compile("(" + backtick + "+)");
+    public static final String backtick = "`";
+    public static final Pattern backticksPattern = Pattern.compile("(" + backtick + "+)");
 
     /**
      * Get the markdown code {@link String} for a {@link String}. This ensures all backticks "`" are
diff --git a/app/src/main/java/com/termux/app/utils/NotificationUtils.java b/termux-shared/src/main/java/com/termux/shared/notification/NotificationUtils.java
similarity index 91%
rename from app/src/main/java/com/termux/app/utils/NotificationUtils.java
rename to termux-shared/src/main/java/com/termux/shared/notification/NotificationUtils.java
index 9c83132ed1..64933cfef4 100644
--- a/app/src/main/java/com/termux/app/utils/NotificationUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/notification/NotificationUtils.java
@@ -1,4 +1,4 @@
-package com.termux.app.utils;
+package com.termux.shared.notification;
 
 import android.app.Notification;
 import android.app.NotificationChannel;
@@ -9,10 +9,10 @@
 
 import androidx.annotation.Nullable;
 
-import com.termux.app.RunCommandService;
-import com.termux.app.TermuxService;
-import com.termux.app.settings.preferences.TermuxAppSharedPreferences;
-import com.termux.app.settings.preferences.TermuxPreferenceConstants;
+import com.termux.shared.logger.Logger;
+import com.termux.shared.settings.preferences.TermuxAppSharedPreferences;
+import com.termux.shared.settings.preferences.TermuxPreferenceConstants;
+import com.termux.shared.termux.TermuxConstants;
 
 public class NotificationUtils {
 
@@ -52,6 +52,9 @@ public static NotificationManager getNotificationManager(final Context context)
     /**
      * Try to get the next unique notification id that isn't already being used by the app.
      *
+     * Termux app and its plugin must use unique notification ids from the same pool due to usage of android:sharedUserId.
+     * https://commonsware.com/blog/2017/06/07/jobscheduler-job-ids-libraries.html
+     *
      * @param context The {@link Context} for operations.
      * @return Returns the notification id that should be safe to use.
      */
@@ -62,7 +65,7 @@ public synchronized static int getNextNotificationId(final Context context) {
         int lastNotificationId = preferences.getLastNotificationId();
 
         int nextNotificationId = lastNotificationId + 1;
-        while(nextNotificationId == TermuxService.NOTIFICATION_ID || nextNotificationId == RunCommandService.NOTIFICATION_ID) {
+        while(nextNotificationId == TermuxConstants.TERMUX_APP_NOTIFICATION_ID || nextNotificationId == TermuxConstants.TERMUX_RUN_COMMAND_NOTIFICATION_ID) {
             nextNotificationId++;
         }
 
diff --git a/app/src/main/java/com/termux/app/utils/PackageUtils.java b/termux-shared/src/main/java/com/termux/shared/packages/PackageUtils.java
similarity index 98%
rename from app/src/main/java/com/termux/app/utils/PackageUtils.java
rename to termux-shared/src/main/java/com/termux/shared/packages/PackageUtils.java
index 96e9609904..75b8b8c4a6 100644
--- a/app/src/main/java/com/termux/app/utils/PackageUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/packages/PackageUtils.java
@@ -1,4 +1,4 @@
-package com.termux.app.utils;
+package com.termux.shared.packages;
 
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
@@ -6,6 +6,8 @@
 
 import androidx.annotation.NonNull;
 
+import com.termux.shared.logger.Logger;
+
 public class PackageUtils {
 
     /**
diff --git a/app/src/main/java/com/termux/app/utils/PermissionUtils.java b/termux-shared/src/main/java/com/termux/shared/packages/PermissionUtils.java
similarity index 93%
rename from app/src/main/java/com/termux/app/utils/PermissionUtils.java
rename to termux-shared/src/main/java/com/termux/shared/packages/PermissionUtils.java
index 2b8614c9a4..d97895a051 100644
--- a/app/src/main/java/com/termux/app/utils/PermissionUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/packages/PermissionUtils.java
@@ -1,4 +1,4 @@
-package com.termux.app.utils;
+package com.termux.shared.packages;
 
 import android.app.Activity;
 import android.content.Context;
@@ -10,9 +10,10 @@
 
 import androidx.core.content.ContextCompat;
 
-import com.termux.R;
-import com.termux.app.TermuxConstants;
-import com.termux.app.settings.preferences.TermuxAppSharedPreferences;
+import com.termux.shared.R;
+import com.termux.shared.termux.TermuxConstants;
+import com.termux.shared.logger.Logger;
+import com.termux.shared.settings.preferences.TermuxAppSharedPreferences;
 
 import java.util.Arrays;
 
diff --git a/app/src/main/java/com/termux/app/settings/preferences/SharedPreferenceUtils.java b/termux-shared/src/main/java/com/termux/shared/settings/preferences/SharedPreferenceUtils.java
similarity index 99%
rename from app/src/main/java/com/termux/app/settings/preferences/SharedPreferenceUtils.java
rename to termux-shared/src/main/java/com/termux/shared/settings/preferences/SharedPreferenceUtils.java
index 389ba9ba29..21ccd1bfa3 100644
--- a/app/src/main/java/com/termux/app/settings/preferences/SharedPreferenceUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/preferences/SharedPreferenceUtils.java
@@ -1,10 +1,10 @@
-package com.termux.app.settings.preferences;
+package com.termux.shared.settings.preferences;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.SharedPreferences;
 
-import com.termux.app.utils.Logger;
+import com.termux.shared.logger.Logger;
 
 import java.util.Set;
 
diff --git a/app/src/main/java/com/termux/app/settings/preferences/TermuxAppSharedPreferences.java b/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxAppSharedPreferences.java
similarity index 95%
rename from app/src/main/java/com/termux/app/settings/preferences/TermuxAppSharedPreferences.java
rename to termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxAppSharedPreferences.java
index ba2b37a2f4..086e50d75e 100644
--- a/app/src/main/java/com/termux/app/settings/preferences/TermuxAppSharedPreferences.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxAppSharedPreferences.java
@@ -1,14 +1,14 @@
-package com.termux.app.settings.preferences;
+package com.termux.shared.settings.preferences;
 
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.util.TypedValue;
 
-import com.termux.app.TermuxConstants;
-import com.termux.app.utils.Logger;
-import com.termux.app.utils.TermuxUtils;
-import com.termux.app.utils.DataUtils;
-import com.termux.app.settings.preferences.TermuxPreferenceConstants.TERMUX_APP;
+import com.termux.shared.termux.TermuxConstants;
+import com.termux.shared.logger.Logger;
+import com.termux.shared.termux.TermuxUtils;
+import com.termux.shared.data.DataUtils;
+import com.termux.shared.settings.preferences.TermuxPreferenceConstants.TERMUX_APP;
 
 import javax.annotation.Nonnull;
 
diff --git a/app/src/main/java/com/termux/app/settings/preferences/TermuxPreferenceConstants.java b/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxPreferenceConstants.java
similarity index 89%
rename from app/src/main/java/com/termux/app/settings/preferences/TermuxPreferenceConstants.java
rename to termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxPreferenceConstants.java
index 2d3afd6e73..633b7c3441 100644
--- a/app/src/main/java/com/termux/app/settings/preferences/TermuxPreferenceConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxPreferenceConstants.java
@@ -1,7 +1,7 @@
-package com.termux.app.settings.preferences;
+package com.termux.shared.settings.preferences;
 
 /*
- * Version: v0.8.0
+ * Version: v0.9.0
  *
  * Changelog
  *
@@ -37,13 +37,16 @@
  * - 0.8.0 (2021-04-06)
  *      - Added following to `TERMUX_APP`:
  *          `KEY_CRASH_REPORT_NOTIFICATIONS_ENABLED` and `DEFAULT_VALUE_CRASH_REPORT_NOTIFICATIONS_ENABLED`.
+ *
+ * - 0.9.0 (2021-04-07)
+ *      - Updated javadocs.
  */
 
 /**
- * A class that defines shared constants of the Shared preferences used by Termux app and its plugins.
- * This class will be hosted by termux-app and should be imported by other termux plugin apps as is
- * instead of copying constants to random classes. The 3rd party apps can also import it for
- * interacting with termux apps. If changes are made to this file, increment the version number
+ * A class that defines shared constants of the SharedPreferences used by Termux app and its plugins.
+ * This class will be hosted by termux-shared lib and should be imported by other termux plugin
+ * apps as is instead of copying constants to random classes. The 3rd party apps can also import
+ * it for interacting with termux apps. If changes are made to this file, increment the version number
  * and add an entry in the Changelog section above.
  */
 public final class TermuxPreferenceConstants {
diff --git a/app/src/main/java/com/termux/app/settings/preferences/TermuxTaskerAppSharedPreferences.java b/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxTaskerAppSharedPreferences.java
similarity index 86%
rename from app/src/main/java/com/termux/app/settings/preferences/TermuxTaskerAppSharedPreferences.java
rename to termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxTaskerAppSharedPreferences.java
index a0e1aed1ba..52730cdf69 100644
--- a/app/src/main/java/com/termux/app/settings/preferences/TermuxTaskerAppSharedPreferences.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxTaskerAppSharedPreferences.java
@@ -1,13 +1,13 @@
-package com.termux.app.settings.preferences;
+package com.termux.shared.settings.preferences;
 
 import android.content.Context;
 import android.content.SharedPreferences;
 
-import com.termux.app.TermuxConstants;
-import com.termux.app.settings.preferences.TermuxPreferenceConstants.TERMUX_TASKER_APP;
-import com.termux.app.utils.DataUtils;
-import com.termux.app.utils.Logger;
-import com.termux.app.utils.TermuxUtils;
+import com.termux.shared.termux.TermuxConstants;
+import com.termux.shared.settings.preferences.TermuxPreferenceConstants.TERMUX_TASKER_APP;
+import com.termux.shared.data.DataUtils;
+import com.termux.shared.logger.Logger;
+import com.termux.shared.termux.TermuxUtils;
 
 import javax.annotation.Nonnull;
 
diff --git a/app/src/main/java/com/termux/app/settings/properties/SharedProperties.java b/termux-shared/src/main/java/com/termux/shared/settings/properties/SharedProperties.java
similarity index 98%
rename from app/src/main/java/com/termux/app/settings/properties/SharedProperties.java
rename to termux-shared/src/main/java/com/termux/shared/settings/properties/SharedProperties.java
index c1797d6e9f..72cf0daddf 100644
--- a/app/src/main/java/com/termux/app/settings/properties/SharedProperties.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/properties/SharedProperties.java
@@ -1,11 +1,11 @@
-package com.termux.app.settings.properties;
+package com.termux.shared.settings.properties;
 
 import android.content.Context;
 import android.widget.Toast;
 
 import com.google.common.collect.ImmutableBiMap;
 import com.google.common.primitives.Primitives;
-import com.termux.app.utils.Logger;
+import com.termux.shared.logger.Logger;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -96,7 +96,7 @@ public SharedProperties(@Nonnull Context context, @Nullable File propertiesFile,
         mSharedPropertiesParser = sharedPropertiesParser;
 
         mProperties = new Properties();
-        mMap = new HashMap<String, Object>();
+        mMap = new HashMap<>();
     }
 
     /**
@@ -115,7 +115,7 @@ public void loadPropertiesFromDisk() {
             if (properties == null)
                 properties = new Properties();
 
-            HashMap<String, Object> map = new HashMap<String, Object>();
+            HashMap<String, Object> map = new HashMap<>();
             Properties newProperties = new Properties();
 
             Set<String> propertiesList = mPropertiesList;
@@ -187,7 +187,7 @@ public String getProperty(String key, boolean cached) {
      */
     public Map<String, Object> getInternalProperties() {
         synchronized (mLock) {
-            if (mMap == null) mMap = new HashMap<String, Object>();
+            if (mMap == null) mMap = new HashMap<>();
             return getMapCopy(mMap);
         }
     }
@@ -406,7 +406,7 @@ public static Properties getPropertiesCopy(Properties inputProperties) {
 
     public static Map<String, Object> getMapCopy(Map<String, Object> map) {
         if (map == null) return null;
-        return new HashMap<String, Object>(map);
+        return new HashMap<>(map);
     }
 
 
diff --git a/app/src/main/java/com/termux/app/settings/properties/SharedPropertiesParser.java b/termux-shared/src/main/java/com/termux/shared/settings/properties/SharedPropertiesParser.java
similarity index 83%
rename from app/src/main/java/com/termux/app/settings/properties/SharedPropertiesParser.java
rename to termux-shared/src/main/java/com/termux/shared/settings/properties/SharedPropertiesParser.java
index a82141bf90..8fd09eea6a 100644
--- a/app/src/main/java/com/termux/app/settings/properties/SharedPropertiesParser.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/properties/SharedPropertiesParser.java
@@ -1,4 +1,4 @@
-package com.termux.app.settings.properties;
+package com.termux.shared.settings.properties;
 
 import android.content.Context;
 
@@ -18,6 +18,6 @@ public interface SharedPropertiesParser {
      * @param value The literal value for the property found is the properties file.
      * @return Returns the {@link Object} object to store in the {@link HashMap <>} in-memory cache.
      */
-    public Object getInternalPropertyValueFromValue(Context context, String key, String value);
+    Object getInternalPropertyValueFromValue(Context context, String key, String value);
 
 }
diff --git a/app/src/main/java/com/termux/app/settings/properties/TermuxPropertyConstants.java b/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java
similarity index 94%
rename from app/src/main/java/com/termux/app/settings/properties/TermuxPropertyConstants.java
rename to termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java
index fefe4246cf..588db5d24e 100644
--- a/app/src/main/java/com/termux/app/settings/properties/TermuxPropertyConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java
@@ -1,8 +1,8 @@
-package com.termux.app.settings.properties;
+package com.termux.shared.settings.properties;
 
 import com.google.common.collect.ImmutableBiMap;
-import com.termux.app.TermuxConstants;
-import com.termux.app.utils.Logger;
+import com.termux.shared.termux.TermuxConstants;
+import com.termux.shared.logger.Logger;
 
 import java.io.File;
 import java.util.Arrays;
@@ -10,7 +10,7 @@
 import java.util.Set;
 
 /*
- * Version: v0.5.0
+ * Version: v0.6.0
  *
  * Changelog
  *
@@ -30,13 +30,16 @@
  *
  * - 0.5.0 (2021-03-25)
  *      - Add `KEY_HIDE_SOFT_KEYBOARD_ON_STARTUP`.
+ *
+ * - 0.6.0 (2021-04-07)
+ *      - Updated javadocs.
  */
 
 /**
- * A class that defines shared constants of the properties used by Termux app and its plugins.
- * This class will be hosted by termux-app and should be imported by other termux plugin apps as is
- * instead of copying constants to random classes. The 3rd party apps can also import it for
- * interacting with termux apps. If changes are made to this file, increment the version number
+ * A class that defines shared constants of the SharedProperties used by Termux app and its plugins.
+ * This class will be hosted by termux-shared lib and should be imported by other termux plugin
+ * apps as is instead of copying constants to random classes. The 3rd party apps can also import
+ * it for interacting with termux apps. If changes are made to this file, increment the version number
  * and add an entry in the Changelog section above.
  *
  * The properties are loaded from the first file found at
diff --git a/app/src/main/java/com/termux/app/settings/properties/TermuxSharedProperties.java b/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxSharedProperties.java
similarity index 86%
rename from app/src/main/java/com/termux/app/settings/properties/TermuxSharedProperties.java
rename to termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxSharedProperties.java
index 79c6ffae93..124fe6ae09 100644
--- a/app/src/main/java/com/termux/app/settings/properties/TermuxSharedProperties.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxSharedProperties.java
@@ -1,19 +1,13 @@
-package com.termux.app.settings.properties;
+package com.termux.shared.settings.properties;
 
 import android.content.Context;
 import android.content.res.Configuration;
 
-import com.termux.app.terminal.io.extrakeys.ExtraKeysInfo;
-import com.termux.app.terminal.io.KeyboardShortcut;
-import com.termux.app.utils.Logger;
-import com.termux.app.utils.DataUtils;
-
-import org.json.JSONException;
+import com.termux.shared.logger.Logger;
+import com.termux.shared.data.DataUtils;
 
 import java.io.File;
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 
@@ -21,12 +15,9 @@
 
 public class TermuxSharedProperties implements SharedPropertiesParser {
 
-    private final Context mContext;
-    private final SharedProperties mSharedProperties;
-    private final File mPropertiesFile;
-
-    private ExtraKeysInfo mExtraKeysInfo;
-    private final List<KeyboardShortcut> mSessionShortcuts = new ArrayList<>();
+    protected final Context mContext;
+    protected final SharedProperties mSharedProperties;
+    protected final File mPropertiesFile;
 
     private static final String LOG_TAG = "TermuxSharedProperties";
 
@@ -44,53 +35,6 @@ public void loadTermuxPropertiesFromDisk() {
         mSharedProperties.loadPropertiesFromDisk();
         dumpPropertiesToLog();
         dumpInternalPropertiesToLog();
-        setExtraKeys();
-        setSessionShortcuts();
-    }
-
-    /**
-     * Set the terminal extra keys and style.
-     */
-    private void setExtraKeys() {
-        mExtraKeysInfo = null;
-
-        try {
-            // The mMap stores the extra key and style string values while loading properties
-            // Check {@link #getExtraKeysInternalPropertyValueFromValue(String)} and
-            // {@link #getExtraKeysStyleInternalPropertyValueFromValue(String)}
-            String extrakeys = (String) getInternalPropertyValue(TermuxPropertyConstants.KEY_EXTRA_KEYS, true);
-            String extraKeysStyle = (String) getInternalPropertyValue(TermuxPropertyConstants.KEY_EXTRA_KEYS_STYLE, true);
-            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);
-            } catch (JSONException e2) {
-                Logger.showToast(mContext, "Can't create default extra keys",true);
-                Logger.logStackTraceWithMessage(LOG_TAG, "Could create default extra keys: ", e);
-                mExtraKeysInfo = null;
-            }
-        }
-    }
-
-    /**
-     * Set the terminal sessions shortcuts.
-     */
-    private void setSessionShortcuts() {
-        mSessionShortcuts.clear();
-        // The {@link TermuxPropertyConstants#MAP_SESSION_SHORTCUTS} stores the session shortcut key and action pair
-        for (Map.Entry<String, Integer> entry : TermuxPropertyConstants.MAP_SESSION_SHORTCUTS.entrySet()) {
-            // The mMap stores the code points for the session shortcuts while loading properties
-            Integer codePoint = (Integer) getInternalPropertyValue(entry.getKey(), true);
-            // If codePoint is null, then session shortcut did not exist in properties or was invalid
-            // as parsed by {@link #getCodePointForSessionShortcuts(String,String)}
-            // If codePoint is not null, then get the action for the MAP_SESSION_SHORTCUTS key and
-            // add the code point to sessionShortcuts
-            if (codePoint != null)
-                mSessionShortcuts.add(new KeyboardShortcut(codePoint, entry.getValue()));
-        }
     }
 
 
@@ -473,18 +417,10 @@ public float getTerminalToolbarHeightScaleFactor() {
         return rangeTerminalToolbarHeightScaleFactorValue((float) getInternalPropertyValue(TermuxPropertyConstants.KEY_TERMINAL_TOOLBAR_HEIGHT_SCALE_FACTOR, true));
     }
 
-    public List<KeyboardShortcut> getSessionShortcuts() {
-        return mSessionShortcuts;
-    }
-
     public String getDefaultWorkingDirectory() {
         return (String) getInternalPropertyValue(TermuxPropertyConstants.KEY_DEFAULT_WORKING_DIRECTORY, true);
     }
 
-    public ExtraKeysInfo getExtraKeysInfo() {
-        return mExtraKeysInfo;
-    }
-
 
 
 
diff --git a/app/src/main/java/com/termux/app/shell/ShellUtils.java b/termux-shared/src/main/java/com/termux/shared/shell/ShellUtils.java
similarity index 96%
rename from app/src/main/java/com/termux/app/shell/ShellUtils.java
rename to termux-shared/src/main/java/com/termux/shared/shell/ShellUtils.java
index a6fbefe3f5..d30a01faa3 100644
--- a/app/src/main/java/com/termux/app/shell/ShellUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/shell/ShellUtils.java
@@ -1,12 +1,12 @@
-package com.termux.app.shell;
+package com.termux.shared.shell;
 
 import android.content.Context;
 
-import com.termux.app.TermuxConstants;
-import com.termux.app.file.FileUtils;
-import com.termux.app.utils.Logger;
-import com.termux.app.utils.PackageUtils;
-import com.termux.app.utils.TermuxUtils;
+import com.termux.shared.termux.TermuxConstants;
+import com.termux.shared.file.FileUtils;
+import com.termux.shared.logger.Logger;
+import com.termux.shared.packages.PackageUtils;
+import com.termux.shared.termux.TermuxUtils;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/app/src/main/java/com/termux/app/shell/StreamGobbler.java b/termux-shared/src/main/java/com/termux/shared/shell/StreamGobbler.java
similarity index 99%
rename from app/src/main/java/com/termux/app/shell/StreamGobbler.java
rename to termux-shared/src/main/java/com/termux/shared/shell/StreamGobbler.java
index daad11768c..bfb247a75c 100644
--- a/app/src/main/java/com/termux/app/shell/StreamGobbler.java
+++ b/termux-shared/src/main/java/com/termux/shared/shell/StreamGobbler.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.termux.app.shell;
+package com.termux.shared.shell;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -28,7 +28,7 @@
 import androidx.annotation.Nullable;
 import androidx.annotation.WorkerThread;
 
-import com.termux.app.utils.Logger;
+import com.termux.shared.logger.Logger;
 
 /**
  * Thread utility class continuously reading from an InputStream
diff --git a/app/src/main/java/com/termux/app/TermuxConstants.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
similarity index 91%
rename from app/src/main/java/com/termux/app/TermuxConstants.java
rename to termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
index 798e48a88e..4f772cb642 100644
--- a/app/src/main/java/com/termux/app/TermuxConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
@@ -1,11 +1,11 @@
-package com.termux.app;
+package com.termux.shared.termux;
 
 import android.annotation.SuppressLint;
 
 import java.io.File;
 
 /*
- * Version: v0.16.0
+ * Version: v0.17.0
  *
  * Changelog
  *
@@ -118,13 +118,20 @@
  *      - Added `TERMUX_SUPPORT_EMAIL`, `TERMUX_SUPPORT_EMAIL_URL`, `TERMUX_SUPPORT_EMAIL_MAILTO_URL`,
  *          `TERMUX_REDDIT_SUBREDDIT`, `TERMUX_REDDIT_SUBREDDIT_URL`.
  *      - The `TERMUX_SUPPORT_EMAIL_URL` value must be fixed later when email has been set up.
+ *
+ * - 0.17.0 (2021-04-07)
+ *      - Added `TERMUX_APP_NOTIFICATION_CHANNEL_ID`, `TERMUX_APP_NOTIFICATION_CHANNEL_NAME`, `TERMUX_APP_NOTIFICATION_ID`,
+ *          `TERMUX_RUN_COMMAND_NOTIFICATION_CHANNEL_ID`, `TERMUX_RUN_COMMAND_NOTIFICATION_CHANNEL_NAME`, `TERMUX_RUN_COMMAND_NOTIFICATION_ID`,
+ *          `TERMUX_PLUGIN_COMMAND_ERRORS_NOTIFICATION_CHANNEL_ID`, `TERMUX_PLUGIN_COMMAND_ERRORS_NOTIFICATION_CHANNEL_NAME`,
+ *          `TERMUX_CRASH_REPORTS_NOTIFICATION_CHANNEL_ID`, `TERMUX_CRASH_REPORTS_NOTIFICATION_CHANNEL_NAME`.
+ *      - Updated javadocs.
  */
 
 /**
  * A class that defines shared constants of the Termux app and its plugins.
- * This class will be hosted by termux-app and should be imported by other termux plugin apps as is
- * instead of copying constants to random classes. The 3rd party apps can also import it for
- * interacting with termux apps. If changes are made to this file, increment the version number
+ * This class will be hosted by termux-shared lib and should be imported by other termux plugin
+ * apps as is instead of copying constants to random classes. The 3rd party apps can also import
+ * it for interacting with termux apps. If changes are made to this file, increment the version number
  * and add an entry in the Changelog section above.
  *
  * Termux app default package name is "com.termux" and is used in {@link #TERMUX_PREFIX_DIR_PATH}.
@@ -139,22 +146,25 @@
  *
  * Ideally the only places where changes should be required if changing package name are the following:
  * - The {@link #TERMUX_PACKAGE_NAME} in {@link TermuxConstants}.
- * - The "applicationId" in "build.gradle". This is package name that android and app stores will
- *       use and is also the final package name stored in "AndroidManifest.xml".
- * - The "manifestPlaceholders" values for {@link #TERMUX_PACKAGE_NAME} and *_APP_NAME in "build.gradle".
- * - The "ENTITY" values for {@link #TERMUX_PACKAGE_NAME} and *_APP_NAME in "strings.xml".
- * - The "shortcut.xml" and "*_preferences.xml" files like in termux-app since dynamic variables don't
+ * - The "applicationId" in "build.gradle" of termux-app. This is package name that android and app
+ *      stores will use and is also the final package name stored in "AndroidManifest.xml".
+ * - The "manifestPlaceholders" values for {@link #TERMUX_PACKAGE_NAME} and *_APP_NAME in
+ *      "build.gradle" of termux-app.
+ * - The "ENTITY" values for {@link #TERMUX_PACKAGE_NAME} and *_APP_NAME in "strings.xml" of
+ *      termux-app and of termux-shared.
+ * - The "shortcut.xml" and "*_preferences.xml" files of termux-app since dynamic variables don't
  *      work in it.
- * - Optionally the "package" in "AndroidManifest.xml" if modifying project structure. This is
- *      package name for java classes project structure and is prefixed if activity and service
- *      names use dot (.) notation.
+ * - Optionally the "package" in "AndroidManifest.xml" if modifying project structure of termux-app.
+ *      This is package name for java classes project structure and is prefixed if activity and service
+ *      names use dot (.) notation. This is currently not advisable since this will break lot of
+ *      stuff, including termux-* packages.
  * - Optionally the *_PATH variables in {@link TermuxConstants} containing the string "termux".
  *
  * Check https://developer.android.com/studio/build/application-id for info on "package" in
  * "AndroidManifest.xml" and "applicationId" in "build.gradle".
  *
- * {@link #TERMUX_PACKAGE_NAME} must be used in source code of Termux app and its plugins instead of
- * hardcoded "com.termux" paths.
+ * The {@link #TERMUX_PACKAGE_NAME} must be used in source code of Termux app and its plugins instead
+ * of hardcoded "com.termux" paths.
  */
 public final class TermuxConstants {
 
@@ -551,6 +561,38 @@ public final class TermuxConstants {
 
 
 
+    /*
+     * Termux app and plugins notification variables.
+     */
+
+    /** Termux app notification channel id used by {@link TERMUX_APP.TERMUX_SERVICE} */
+    public static final String TERMUX_APP_NOTIFICATION_CHANNEL_ID = "termux_notification_channel";
+    /** Termux app notification channel name used by {@link TERMUX_APP.TERMUX_SERVICE} */
+    public static final String TERMUX_APP_NOTIFICATION_CHANNEL_NAME = TermuxConstants.TERMUX_APP_NAME + " App";
+    /** Termux app unique notification id used by {@link TERMUX_APP.TERMUX_SERVICE} */
+    public static final int TERMUX_APP_NOTIFICATION_ID = 1337;
+
+    /** Termux app notification channel id used by {@link TERMUX_APP.RUN_COMMAND_SERVICE} */
+    public static final String TERMUX_RUN_COMMAND_NOTIFICATION_CHANNEL_ID = "termux_run_command_notification_channel";
+    /** Termux app notification channel name used by {@link TERMUX_APP.RUN_COMMAND_SERVICE} */
+    public static final String TERMUX_RUN_COMMAND_NOTIFICATION_CHANNEL_NAME = TermuxConstants.TERMUX_APP_NAME + " RunCommandService";
+    /** Termux app unique notification id used by {@link TERMUX_APP.RUN_COMMAND_SERVICE} */
+    public static final int TERMUX_RUN_COMMAND_NOTIFICATION_ID = 1338;
+
+    /** Termux app notification channel id used for plugin command errors */
+    public static final String TERMUX_PLUGIN_COMMAND_ERRORS_NOTIFICATION_CHANNEL_ID = "termux_plugin_command_errors_notification_channel";
+    /** Termux app notification channel name used for plugin command errors */
+    public static final String TERMUX_PLUGIN_COMMAND_ERRORS_NOTIFICATION_CHANNEL_NAME = TermuxConstants.TERMUX_APP_NAME + " Plugin Commands Errors";
+
+    /** Termux app notification channel id used for crash reports */
+    public static final String TERMUX_CRASH_REPORTS_NOTIFICATION_CHANNEL_ID = "termux_crash_reports_notification_channel";
+    /** Termux app notification channel name used for crash reports */
+    public static final String TERMUX_CRASH_REPORTS_NOTIFICATION_CHANNEL_NAME = TermuxConstants.TERMUX_APP_NAME + " Crash Reports";
+
+
+
+
+
     /*
      * Termux app and plugins miscellaneous variables.
      */
@@ -647,30 +689,30 @@ public static final class TERMUX_SERVICE {
 
 
             /** The value for {@link #EXTRA_SESSION_ACTION} extra that will set the new session as
-             * the current session and will start {@link TermuxActivity} if its not running to bring
+             * the current session and will start {@link TERMUX_ACTIVITY} if its not running to bring
              * the new session to foreground.
              */
             public static final int VALUE_EXTRA_SESSION_ACTION_SWITCH_TO_NEW_SESSION_AND_OPEN_ACTIVITY = 0;
 
             /** The value for {@link #EXTRA_SESSION_ACTION} extra that will keep any existing session
-             * as the current session and will start {@link TermuxActivity} if its not running to
+             * as the current session and will start {@link TERMUX_ACTIVITY} if its not running to
              * bring the existing session to foreground. The new session will be added to the left
              * sidebar in the sessions list.
              */
             public static final int VALUE_EXTRA_SESSION_ACTION_KEEP_CURRENT_SESSION_AND_OPEN_ACTIVITY = 1;
 
             /** The value for {@link #EXTRA_SESSION_ACTION} extra that will set the new session as
-             * the current session but will not start {@link TermuxActivity} if its not running
+             * the current session but will not start {@link TERMUX_ACTIVITY} if its not running
              * and session(s) will be seen in Termux notification and can be clicked to bring new
-             * session to foreground. If the {@link TermuxActivity} is already running, then this
+             * session to foreground. If the {@link TERMUX_ACTIVITY} is already running, then this
              * will behave like {@link #VALUE_EXTRA_SESSION_ACTION_KEEP_CURRENT_SESSION_AND_OPEN_ACTIVITY}.
              */
             public static final int VALUE_EXTRA_SESSION_ACTION_SWITCH_TO_NEW_SESSION_AND_DONT_OPEN_ACTIVITY = 2;
 
             /** The value for {@link #EXTRA_SESSION_ACTION} extra that will keep any existing session
-             * as the current session but will not start {@link TermuxActivity} if its not running
+             * as the current session but will not start {@link TERMUX_ACTIVITY} if its not running
              * and session(s) will be seen in Termux notification and can be clicked to bring
-             * existing session to foreground. If the {@link TermuxActivity} is already running,
+             * existing session to foreground. If the {@link TERMUX_ACTIVITY} is already running,
              * then this will behave like {@link #VALUE_EXTRA_SESSION_ACTION_KEEP_CURRENT_SESSION_AND_OPEN_ACTIVITY}.
              */
             public static final int VALUE_EXTRA_SESSION_ACTION_KEEP_CURRENT_SESSION_AND_DONT_OPEN_ACTIVITY = 3;
diff --git a/app/src/main/java/com/termux/app/utils/TermuxUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
similarity index 98%
rename from app/src/main/java/com/termux/app/utils/TermuxUtils.java
rename to termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
index acff15cb0f..07a80cd726 100644
--- a/app/src/main/java/com/termux/app/utils/TermuxUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
@@ -1,4 +1,4 @@
-package com.termux.app.utils;
+package com.termux.shared.termux;
 
 import android.annotation.SuppressLint;
 import android.content.ComponentName;
@@ -11,8 +11,10 @@
 
 import com.google.common.base.Joiner;
 
-import com.termux.R;
-import com.termux.app.TermuxConstants;
+import com.termux.shared.R;
+import com.termux.shared.logger.Logger;
+import com.termux.shared.markdown.MarkdownUtils;
+import com.termux.shared.packages.PackageUtils;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/termux-shared/src/main/res/values/colors.xml b/termux-shared/src/main/res/values/colors.xml
new file mode 100644
index 0000000000..cc83b56d07
--- /dev/null
+++ b/termux-shared/src/main/res/values/colors.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="background_markdown_code_inline">#1F000000</color>
+    <color name="background_markdown_code_block">#0F000000</color>
+</resources>
diff --git a/termux-shared/src/main/res/values/strings.xml b/termux-shared/src/main/res/values/strings.xml
new file mode 100644
index 0000000000..888eece9e7
--- /dev/null
+++ b/termux-shared/src/main/res/values/strings.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE resources [
+    <!ENTITY TERMUX_PACKAGE_NAME "com.termux">
+    <!ENTITY TERMUX_APP_NAME "Termux">
+    <!ENTITY TERMUX_API_APP_NAME "Termux:API">
+    <!ENTITY TERMUX_BOOT_APP_NAME "Termux:Boot">
+    <!ENTITY TERMUX_FLOAT_APP_NAME "Termux:Float">
+    <!ENTITY TERMUX_STYLING_APP_NAME "Termux:Styling">
+    <!ENTITY TERMUX_TASKER_APP_NAME "Termux:Tasker">
+    <!ENTITY TERMUX_WIDGET_APP_NAME "Termux:Widget">
+    ]>
+
+<resources>
+
+    <!-- FileUtils -->
+    <string name="error_executable_required">Executable required.</string>
+    <string name="error_null_or_empty_parameter">The %1$s is to \"%2$s\" null or empty.</string>
+    <string name="error_null_or_empty_regular_file_path">The regular file path is null or empty.</string>
+    <string name="error_null_or_empty_regular_file">The regular file is null or empty.</string>
+    <string name="error_null_or_empty_executable_file_path">The executable file path is null or empty.</string>
+    <string name="error_null_or_empty_executable_file">The executable file is null or empty.</string>
+    <string name="error_null_or_empty_directory_file_path">The directory file path is null or empty.</string>
+    <string name="error_null_or_empty_directory_file">The directory file is null or empty.</string>
+
+    <string name="error_file_not_found_at_path">The %1$s is not found at path \"%2$s\".</string>
+    <string name="error_no_regular_file_found">Regular file not found at %1$s path.</string>
+    <string name="error_not_a_regular_file">The %1$s at path \"%2$s\" is not a regular file.</string>
+    <string name="error_non_regular_file_found">Non-regular file found at %1$s path.</string>
+    <string name="error_non_directory_file_found">Non-directory file found at %1$s path.</string>
+    <string name="error_non_symlink_file_found">Non-symlink file found at %1$s path.</string>
+    <string name="error_file_not_an_allowed_file_type">The %1$s found at path \"%2$s\" is not one of allowed file types \"%3$s\".</string>
+
+    <string name="error_validate_file_existence_and_permissions_failed_with_exception">Validating file existence and permissions of %1$s at path \"%2$s\" failed.\nException: %3$s</string>
+    <string name="error_validate_directory_existence_and_permissions_failed_with_exception">Validating directory existence and permissions of %1$s at path \"%2$s\" failed.\nException: %3$s</string>
+
+    <string name="error_creating_file_failed">Creating %1$s at path \"%2$s\" failed.</string>
+    <string name="error_creating_file_failed_with_exception">Creating %1$s at path \"%2$s\" failed.\nException: %3$s</string>
+
+    <string name="error_cannot_overwrite_a_non_symlink_file_type">Cannot overwrite %1$s while creating symlink at \"%2$s\" to \"%3$s\" since destination file type \"%4$s\" is not a symlink.</string>
+    <string name="error_creating_symlink_file_failed_with_exception">Creating %1$s at path \"%2$s\" to \"%3$s\" failed.\nException: %4$s</string>
+
+    <string name="error_copying_or_moving_file_failed_with_exception">%1$s from \"%2$s\" to \"%3$s\" failed.\nException: %4$s</string>
+    <string name="error_copying_or_moving_file_to_same_path">%1$s from \"%2$s\" to \"%3$s\" cannot be done since they point to the same path.</string>
+    <string name="error_cannot_overwrite_a_different_file_type">Cannot overwrite %1$s while %2$s it from \"%3$s\" to \"%4$s\" since destination file type \"%5$s\" is different from source file type \"%6$s\".</string>
+    <string name="error_cannot_move_directory_to_sub_directory_of_itself">Cannot move %1$s from \"%2$s\" to \"%3$s\" since destination is a subdirectory of the source.</string>
+
+    <string name="error_file_still_exists_after_deleting">The %1$s still exists after deleting it from \"%2$s\".</string>
+    <string name="error_deleting_file_failed">Deleting %1$s at path \"%2$s\" failed.</string>
+    <string name="error_deleting_file_failed_with_exception">Deleting %1$s at path \"%2$s\" failed.\nException: %3$s</string>
+    <string name="error_clearing_directory_failed_with_exception">Clearing %1$s at path \"%2$s\" failed.\nException: %3$s</string>
+
+    <string name="error_reading_string_to_file_failed_with_exception">Reading string from %1$s at path \"%2$s\" failed.\nException: %3$s</string>
+    <string name="error_writing_string_to_file_failed_with_exception">Writing string to %1$s at path \"%2$s\" failed.\nException: %3$s</string>
+    <string name="error_unsupported_charset">Unsupported charset \"%1$s\"</string>
+    <string name="error_checking_if_charset_supported_failed">Checking if charset \"%1$s\" is suppoted failed.\nException: %2$s</string>
+
+    <string name="error_invalid_file_permissions_string_to_check">The file permission string to check is invalid.</string>
+    <string name="error_file_not_readable">The %1$s at path is not readable. Permission Denied.</string>
+    <string name="error_file_not_writable">The %1$s at path is not writable. Permission Denied.</string>
+    <string name="error_file_not_executable">The %1$s at path is not executable. Permission Denied.</string>
+
+
+    <!-- PermissionUtils -->
+    <string name="message_sudo_please_grant_permissions">Please grant permissions on next screen</string>
+    <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>
+
+
+
+    <!-- ShareUtils -->
+    <string name="title_share_with">Share With</string>
+
+
+
+    <!-- TermuxUtils -->
+    <string name="msg_report_issue">If you think this report should be reported, then copy its text from the options menu (3-dots on top right) and post an issue on one of the following links at which the report belongs at.</string>
+
+
+    <!-- Log Level -->
+    <string name="log_level_title">Log Level</string>
+    <string name="log_level_off">"Off"</string>
+    <string name="log_level_normal">"Normal"</string>
+    <string name="log_level_debug">"Debug"</string>
+    <string name="log_level_verbose">"Verbose"</string>
+    <string name="log_level_unknown">"*Unknown*"</string>
+    <string name="log_level_value">Logcat log level set to \"%1$s\"</string>
+
+</resources>

From 71dfefd4b77fc56132c34c4d2df8a7b3ea2fd839 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 7 Apr 2021 11:32:22 +0500
Subject: [PATCH 324/912] Add termux-shared library to github workflow so that
 its published

---
 .github/workflows/publish_libraries.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/publish_libraries.yml b/.github/workflows/publish_libraries.yml
index 41d76af4e0..077539deba 100644
--- a/.github/workflows/publish_libraries.yml
+++ b/.github/workflows/publish_libraries.yml
@@ -7,6 +7,7 @@ on:
     paths:
     - 'terminal-emulator/build.gradle'
     - 'terminal-view/build.gradle'
+    - 'termux-shared/build.gradle'
 
 jobs:
   build:

From 62a2104adccd98e63ac111c0728922dfae288d5d Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 8 Apr 2021 03:26:43 +0500
Subject: [PATCH 325/912] Updated RunCommandService javadocs.

Documentation has been moved to https://github.com/termux/termux-app/wiki/RUN_COMMAND-Intent
---
 .../com/termux/app/RunCommandService.java     | 245 +-----------------
 1 file changed, 2 insertions(+), 243 deletions(-)

diff --git a/app/src/main/java/com/termux/app/RunCommandService.java b/app/src/main/java/com/termux/app/RunCommandService.java
index 338b037ca0..ff3afb0824 100644
--- a/app/src/main/java/com/termux/app/RunCommandService.java
+++ b/app/src/main/java/com/termux/app/RunCommandService.java
@@ -1,7 +1,5 @@
 package com.termux.app;
 
-import android.app.Activity;
-import android.app.IntentService;
 import android.app.Notification;
 import android.app.NotificationManager;
 import android.app.Service;
@@ -23,250 +21,11 @@
 import com.termux.app.models.ExecutionCommand;
 
 /**
- * Third-party apps that are not part of termux world can run commands in termux context by either
- * sending an intent to RunCommandService or becoming a plugin host for the termux-tasker plugin
- * client.
- *
- * For the {@link RUN_COMMAND_SERVICE#ACTION_RUN_COMMAND} intent to work, here are the requirements:
- *
- * 1. `com.termux.permission.RUN_COMMAND` permission (Mandatory)
- *      The Intent sender/third-party app must request the `com.termux.permission.RUN_COMMAND`
- *      permission in its `AndroidManifest.xml` and it should be granted by user to the app through the
- *      app's `App Info` `Permissions` page in Android Settings, likely under `Additional Permissions`.
- *      This is a security measure to prevent any other apps from running commands in `Termux` context
- *      which do not have the required permission granted to them.
- *
- *      For `Tasker` you can grant it with:
- *      `Android Settings` -> `Apps` -> `Tasker` -> `Permissions` -> `Additional permissions` ->
- *      `Run commands in Termux environment`.
- *
- * 2. `allow-external-apps` property (Mandatory)
- *      The `allow-external-apps` property must be set to "true" in `~/.termux/termux.properties` in
- *      Termux app, regardless of if the executable path is inside or outside the `~/.termux/tasker/`
- *      directory. Check https://github.com/termux/termux-tasker#allow-external-apps-property-optional
- *      for more info.
- *
- * 3. `Draw Over Apps` permission (Optional)
- *      For android `>= 10` there are new
- *      [restrictions](https://developer.android.com/guide/components/activities/background-starts)
- *      that prevent activities from starting from the background. This prevents the background
- *      {@link TermuxService} from starting a terminal session in the foreground and running the
- *      commands until the user manually clicks `Termux` notification in the status bar dropdown
- *      notifications list. This only affects commands that are to be executed in a terminal
- *      session and not the background ones. `Termux` version `>= 0.100`
- *      requests the `Draw Over Apps` permission so that users can bypass this restriction so
- *      that commands can automatically start running without user intervention.
- *      You can grant `Termux` the `Draw Over Apps` permission from its `App Info` activity:
- *      `Android Settings` -> `Apps` -> `Termux` -> `Advanced` -> `Draw over other apps`.
- *
- * 4. `Storage` permission (Optional)
- *      Termux app must be granted `Storage` permission if the executable is accessing or working
- *      directory is set to path in external shared storage. The common paths which usually refer to
- *      it are `~/storage`, `/sdcard`, `/storage/emulated/0` etc.
- *       You can grant `Termux` the `Storage` permission from its `App Info` activity:
- *       For Android version < 11:
- *          `Android Settings` -> `Apps` -> `Termux` -> `Permissions` -> `Storage`.
- *       For Android version >= 11
- *          `Android Settings` -> `Apps` -> `Termux` -> `Permissions` -> `Files and media` ->
- *          `Allowed management of all files`.
- *       NOTE: For Android version >= 11, sometimes you will get `Permission Denied` errors for
- *       external shared storage even when you have granted `Files and media` permission. To solve
- *       this, Deny the permission and then Allow it again and restart Termux.
- *       Also check https://wiki.termux.com/wiki/Termux-setup-storage
- *
- * 5. Battery Optimizations (May be mandatory depending on device)
- *      Some devices kill apps aggressively or prevent apps from starting from background.
- *      If Termux is running into such problems, then exempt it from such restrictions.
- *      The user may also disable battery optimizations for Termux to reduce the chances of Termux
- *      being killed by Android even further due to violation of not being able to call
- *      `startForeground()` within ~5s of service start in android >= 8.
- *      Check https://dontkillmyapp.com/ for device specfic info to opt-out of battery optimiations.
- *
- *  You may also want to check https://github.com/termux/termux-tasker
- *
- *
- *
- * The {@link RUN_COMMAND_SERVICE#ACTION_RUN_COMMAND} intent expects the following extras:
- *
- * 1. The **mandatory** {@code String} {@link RUN_COMMAND_SERVICE#EXTRA_COMMAND_PATH} extra for
- *      absolute path of command.
- * 2. The {@code String[]} {@link RUN_COMMAND_SERVICE#EXTRA_ARGUMENTS} extra for any arguments to
- *      pass to command.
- * 3. The {@code String} {@link RUN_COMMAND_SERVICE#EXTRA_WORKDIR} extra for current working directory
- *      of command. This defaults to {@link TermuxConstants#TERMUX_HOME_DIR_PATH}.
- * 4. The {@code boolean} {@link RUN_COMMAND_SERVICE#EXTRA_BACKGROUND} extra whether to run command
- *      in background or foreground terminal session. This defaults to {@code false}.
- * 5. The {@code String} {@link RUN_COMMAND_SERVICE#EXTRA_SESSION_ACTION} extra for for session action
- *      of foreground commands. This defaults to
- *      {@link TERMUX_SERVICE#VALUE_EXTRA_SESSION_ACTION_SWITCH_TO_NEW_SESSION_AND_OPEN_ACTIVITY}.
- * 6. The {@code String} {@link RUN_COMMAND_SERVICE#EXTRA_COMMAND_LABEL} extra for label of the command.
- * 7. The markdown {@code String} {@link RUN_COMMAND_SERVICE#EXTRA_COMMAND_DESCRIPTION} extra for
- *      description of the command. This should ideally be get short.
- * 8. The markdown {@code String} {@link RUN_COMMAND_SERVICE#EXTRA_COMMAND_HELP} extra for help of
- *      the command. This can add details about the command. 3rd party apps can provide more info
- *      to users for setting up commands. Ideally a url link should be provided that goes into full
- *      details.
- * 9. The {@code Parcelable} {@link RUN_COMMAND_SERVICE#EXTRA_PENDING_INTENT} extra containing the
- *      pending intent with which result of commands should be returned to the caller. The results
- *      will be sent in the {@link TERMUX_SERVICE#EXTRA_PLUGIN_RESULT_BUNDLE} bundle. This is optional
- *      and only needed if caller wants the results back.
- *
- *
- * The {@link RUN_COMMAND_SERVICE#EXTRA_COMMAND_PATH} and {@link RUN_COMMAND_SERVICE#EXTRA_WORKDIR}
- * can optionally be prefixed with "$PREFIX/" or "~/" if an absolute path is not to be given.
- * The "$PREFIX/" will expand to {@link TermuxConstants#TERMUX_PREFIX_DIR_PATH} and
- * "~/" will expand to {@link TermuxConstants#TERMUX_HOME_DIR_PATH}, followed by a forward slash "/".
- *
- *
- * The `EXTRA_COMMAND_*` extras are used for logging and are their values are provided to users in case
- * of failure in a popup. The popup shown is in commonmark-spec markdown using markwon library so
- * make sure to follow its formatting rules. Also make sure to end lines with 2 blank spaces to prevent
- * word-wrap wherever needed.
- * It's the users and 3rd party apps responsibility to use them wisely. There are also android
- * internal intent size limits (roughly 500KB) that must not exceed when sending intents so make sure
- * the combined size of ALL extras is less than that.
- * There are also limits on the arguments size you can pass to commands or the full command string
- * length that can be run, which is likely equal to 131072 bytes or 128KB on an android device.
- * Check https://github.com/termux/termux-tasker#arguments-and-result-data-limits for more details.
- *
- *
- *
- * If your third-party app is targeting sdk 30 (android 11), then it needs to add `com.termux`
- * package to the `queries` element or request `QUERY_ALL_PACKAGES` permission in its
- * `AndroidManifest.xml`. Otherwise it will get `PackageSetting{...... com.termux/......} BLOCKED`
- * errors in logcat and `RUN_COMMAND` won't work.
- * https://developer.android.com/training/basics/intents/package-visibility#package-name
- *
- *
- * Its probably wiser for apps to import the {@link TermuxConstants} class and use the variables
- * provided for actions and extras instead of using hardcoded string values.
- *
- * Sample code to run command "top" with java:
- * ```
- * intent.setClassName("com.termux", "com.termux.app.RunCommandService");
- * intent.setAction("com.termux.RUN_COMMAND");
- * intent.putExtra("com.termux.RUN_COMMAND_PATH", "/data/data/com.termux/files/usr/bin/top");
- * intent.putExtra("com.termux.RUN_COMMAND_ARGUMENTS", new String[]{"-n", "5"});
- * intent.putExtra("com.termux.RUN_COMMAND_WORKDIR", "/data/data/com.termux/files/home");
- * intent.putExtra("com.termux.RUN_COMMAND_BACKGROUND", false);
- * intent.putExtra("com.termux.RUN_COMMAND_SESSION_ACTION", "0");
- * startService(intent);
- * ```
- *
- * Sample code to run command "top" with "am startservice" command:
- * ```
- * am startservice --user 0 -n com.termux/com.termux.app.RunCommandService \
- * -a com.termux.RUN_COMMAND \
- * --es com.termux.RUN_COMMAND_PATH '/data/data/com.termux/files/usr/bin/top' \
- * --esa com.termux.RUN_COMMAND_ARGUMENTS '-n,5' \
- * --es com.termux.RUN_COMMAND_WORKDIR '/data/data/com.termux/files/home' \
- * --ez com.termux.RUN_COMMAND_BACKGROUND 'false' \
- * --es com.termux.RUN_COMMAND_SESSION_ACTION '0'
- *
- *
- *
- *
- * The {@link RUN_COMMAND_SERVICE#ACTION_RUN_COMMAND} intent returns the following extras
- * in the {@link TERMUX_SERVICE#EXTRA_PLUGIN_RESULT_BUNDLE} bundle if a pending intent is sent by the
- * called in {@code Parcelable} {@link RUN_COMMAND_SERVICE#EXTRA_PENDING_INTENT} extra:
- *
- * For foreground commands ({@link RUN_COMMAND_SERVICE#EXTRA_BACKGROUND} is `false`):
- * - {@link TERMUX_SERVICE#EXTRA_PLUGIN_RESULT_BUNDLE_STDOUT} will contain session transcript.
- * - {@link TERMUX_SERVICE#EXTRA_PLUGIN_RESULT_BUNDLE_STDERR} will be null since its not used.
- * - {@link TERMUX_SERVICE#EXTRA_PLUGIN_RESULT_BUNDLE_EXIT_CODE} will contain exit code of session.
-
- * For background commands ({@link RUN_COMMAND_SERVICE#EXTRA_BACKGROUND} is `true`):
- * - {@link TERMUX_SERVICE#EXTRA_PLUGIN_RESULT_BUNDLE_STDOUT} will contain stdout of commands.
- * - {@link TERMUX_SERVICE#EXTRA_PLUGIN_RESULT_BUNDLE_STDERR} will contain stderr of commands.
- * - {@link TERMUX_SERVICE#EXTRA_PLUGIN_RESULT_BUNDLE_EXIT_CODE} will contain exit code of command.
- *
- * The {@link TERMUX_SERVICE#EXTRA_PLUGIN_RESULT_BUNDLE_STDOUT_ORIGINAL_LENGTH} and
- * {@link TERMUX_SERVICE#EXTRA_PLUGIN_RESULT_BUNDLE_STDERR_ORIGINAL_LENGTH} will contain
- * the original length of stdout and stderr respectively. This is useful to detect cases where
- * stdout and stderr was too large to be sent back via an intent, otherwise
- *
- * The internal errors raised by termux outside the shell will be sent in the the
- * {@link TERMUX_SERVICE#EXTRA_PLUGIN_RESULT_BUNDLE_ERR} and {@link TERMUX_SERVICE#EXTRA_PLUGIN_RESULT_BUNDLE_ERRMSG}
- * extras. These will contain errors like if starting a termux command failed or if the user manually
- * exited the termux sessions or android killed the termux service before the commands had finished executing.
- * The err value will be {@link Activity#RESULT_OK}(-1) if no internal errors are raised.
- *
- * Note that if stdout or stderr are too large in length, then a {@link android.os.TransactionTooLargeException}
- * exception will be raised when the pending intent is sent back containing the results, But it cannot
- * be caught by the intent sender and intent will silently fail with logcat entries for the exception
- * raised internally by android os components. To prevent this, the stdout and stderr sent
- * back will be truncated from the start to max 100KB combined. The original length of stdout and
- * stderr will be provided in
- * {@link TERMUX_SERVICE#EXTRA_PLUGIN_RESULT_BUNDLE_STDOUT_ORIGINAL_LENGTH} and
- * {@link TERMUX_SERVICE#EXTRA_PLUGIN_RESULT_BUNDLE_STDERR_ORIGINAL_LENGTH} extras respectively, so
- * that the caller can check if either of them were truncated. The errmsg will also be truncated
- * from end to max 25KB to preserve start of stacktraces.
- *
- *
- *
- * If your app (not shell) wants to receive termux session command results, then put the
- * pending intent for your app like for an {@link IntentService} in the "com.termux.RUN_COMMAND_PENDING_INTENT"
- * extra.
- * ```
- * // Create intent for your IntentService class
- * Intent pluginResultsServiceIntent = new Intent(MainActivity.this, PluginResultsService.class);
- * // Create PendingIntent that will be used by termux service to send result of commands back to PluginResultsService
- * PendingIntent pendingIntent = PendingIntent.getService(context, 1, pluginResultsServiceIntent, PendingIntent.FLAG_ONE_SHOT);
- * intent.putExtra("com.termux.RUN_COMMAND_PENDING_INTENT", pendingIntent);
- * ```
- *
- *
- * Declare `PluginResultsService` entry in AndroidManifest.xml
- * ```
- * <service android:name=".PluginResultsService" />
- * ```
- *
- *
- * Define the `PluginResultsService` class
- * ```
- * public class PluginResultsService extends IntentService {
- *
- *     public static final String PLUGIN_SERVICE_LABEL = "PluginResultsService";
- *
- *     private static final String LOG_TAG = "PluginResultsService";
- *
- *     public PluginResultsService(){
- *         super(PLUGIN_SERVICE_LABEL);
- *     }
- *
- *     @Override
- *     protected void onHandleIntent(@Nullable Intent intent) {
- *         if (intent == null) return;
- *
- *         if(intent.getComponent() != null)
- *             Log.d(LOG_TAG, PLUGIN_SERVICE_LABEL + " received execution result from " + intent.getComponent().toString());
- *
- *
- *         final Bundle resultBundle = intent.getBundleExtra("result");
- *         if (resultBundle == null) {
- *             Log.e(LOG_TAG, "The intent does not contain the result bundle at the \"result\" key.");
- *             return;
- *         }
- *
- *         Log.d(LOG_TAG, "stdout:\n```\n" + resultBundle.getString("stdout", "") + "\n```\n" +
- *                 "stdout_original_length: `" + resultBundle.getString("stdout_original_length") + "`\n" +
- *                 "stderr:\n```\n" + resultBundle.getString("stderr", "") + "\n```\n" +
- *                 "stderr_original_length: `" + resultBundle.getString("stderr_original_length") + "`\n" +
- *                 "exitCode: `" + resultBundle.getInt("exitCode") + "`\n" +
- *                 "errCode: `" + resultBundle.getInt("err") + "`\n" +
- *                 "errmsg: `" + resultBundle.getString("errmsg", "") + "`");
- *     }
- *
- * }
- *```
- *
- *
- *
- *
- *
  * A service that receives {@link RUN_COMMAND_SERVICE#ACTION_RUN_COMMAND} intent from third party apps and
  * plugins that contains info on command execution and forwards the extras to {@link TermuxService}
  * for the actual execution.
+ *
+ * Check https://github.com/termux/termux-app/wiki/RUN_COMMAND-Intent for more info.
  */
 public class RunCommandService extends Service {
 

From 0c9b85a4f97c3e06c29792c4ae4faa2cfac44074 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 10 Apr 2021 02:32:21 +0500
Subject: [PATCH 326/912] Micro optimization for StreamGobbler

---
 .../src/main/java/com/termux/shared/shell/StreamGobbler.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/shell/StreamGobbler.java b/termux-shared/src/main/java/com/termux/shared/shell/StreamGobbler.java
index bfb247a75c..ede6145c49 100644
--- a/termux-shared/src/main/java/com/termux/shared/shell/StreamGobbler.java
+++ b/termux-shared/src/main/java/com/termux/shared/shell/StreamGobbler.java
@@ -168,12 +168,13 @@ public StreamGobbler(@NonNull String shell, @NonNull InputStream inputStream, @N
     public void run() {
         // keep reading the InputStream until it ends (or an error occurs)
         // optionally pausing when a command is executed that consumes the InputStream itself
-        int logLevel = Logger.getLogLevel();
+        int currentLogLevel = Logger.getLogLevel();
+        int logLevelVerbose = Logger.LOG_LEVEL_VERBOSE;
         try {
             String line;
             while ((line = reader.readLine()) != null) {
 
-                if(logLevel >= Logger.LOG_LEVEL_VERBOSE)
+                if(currentLogLevel >= logLevelVerbose)
                     Logger.logVerbose(LOG_TAG, String.format(Locale.ENGLISH, "[%s] %s", shell, line)); // This will get truncated by LOGGER_ENTRY_MAX_LEN, likely 4KB
 
                 if (stringWriter != null) stringWriter.append(line).append("\n");

From 64fb2ce49bea8221a2c22dbc262cfbd389829a56 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sun, 11 Apr 2021 02:28:00 +0500
Subject: [PATCH 327/912] Update TermuxConstants

The `TermuxConstants` class has been updated to `v0.18.0`. Check its Changelog section for info on changes.
---
 .../com/termux/shared/termux/TermuxConstants.java   | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
index 4f772cb642..9b864fb188 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
@@ -5,7 +5,7 @@
 import java.io.File;
 
 /*
- * Version: v0.17.0
+ * Version: v0.18.0
  *
  * Changelog
  *
@@ -125,6 +125,10 @@
  *          `TERMUX_PLUGIN_COMMAND_ERRORS_NOTIFICATION_CHANNEL_ID`, `TERMUX_PLUGIN_COMMAND_ERRORS_NOTIFICATION_CHANNEL_NAME`,
  *          `TERMUX_CRASH_REPORTS_NOTIFICATION_CHANNEL_ID`, `TERMUX_CRASH_REPORTS_NOTIFICATION_CHANNEL_NAME`.
  *      - Updated javadocs.
+ *
+ * - 0.18.0 (2021-04-11)
+ *      - Updated `TERMUX_SUPPORT_EMAIL_URL` to a valid email.
+ *      - Removed `TERMUX_SUPPORT_EMAIL`.
  */
 
 /**
@@ -178,14 +182,11 @@ public final class TermuxConstants {
     /** Termux Github organization url */
     public static final String TERMUX_GITHUB_ORGANIZATION_URL = "https://github.com" + "/" + TERMUX_GITHUB_ORGANIZATION_NAME; // Default: "https://github.com/termux"
 
-    /** Termux support email */
-    public static final String TERMUX_SUPPORT_EMAIL = "support"; // Default: "support"
-
     /** Termux support email url */
-    public static final String TERMUX_SUPPORT_EMAIL_URL = "email@example.com"; // Default: "email@example.com"
+    public static final String TERMUX_SUPPORT_EMAIL_URL = "termuxreports@groups.io"; // Default: "termuxreports@groups.io"
 
     /** Termux support email mailto url */
-    public static final String TERMUX_SUPPORT_EMAIL_MAILTO_URL = "mailto:" + TERMUX_SUPPORT_EMAIL_URL; // Default: "mailto:email@example.com"
+    public static final String TERMUX_SUPPORT_EMAIL_MAILTO_URL = "mailto:" + TERMUX_SUPPORT_EMAIL_URL; // Default: "mailto:termuxreports@groups.io"
 
     /** Termux Reddit subreddit */
     public static final String TERMUX_REDDIT_SUBREDDIT = "r/termux"; // Default: "r/termux"

From df4d8ac7e5da79cfc582e0776b21772e8beecde4 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sun, 11 Apr 2021 02:29:00 +0500
Subject: [PATCH 328/912] Add support for reporting issues to the
 termuxreports@groups.io email

---
 .../src/main/java/com/termux/shared/termux/TermuxUtils.java   | 4 ++--
 termux-shared/src/main/res/values/strings.xml                 | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
index 07a80cd726..5218626c4c 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
@@ -256,8 +256,8 @@ public static String getReportIssueMarkdownString(@NonNull final Context context
 
         markdownString.append("\n\n").append(context.getString(R.string.msg_report_issue)).append("\n");
 
-        //markdownString.append("\n\n### Email\n");
-        //markdownString.append("\n").append(MarkdownUtils.getLinkMarkdownString(TermuxConstants.TERMUX_SUPPORT_EMAIL, TermuxConstants.TERMUX_SUPPORT_EMAIL_MAILTO_URL)).append("  ");
+        markdownString.append("\n\n### Email\n");
+        markdownString.append("\n").append(MarkdownUtils.getLinkMarkdownString(TermuxConstants.TERMUX_SUPPORT_EMAIL_URL, TermuxConstants.TERMUX_SUPPORT_EMAIL_MAILTO_URL)).append("  ");
 
         markdownString.append("\n\n### Reddit\n");
         markdownString.append("\n").append(MarkdownUtils.getLinkMarkdownString(TermuxConstants.TERMUX_REDDIT_SUBREDDIT, TermuxConstants.TERMUX_REDDIT_SUBREDDIT_URL)).append("  ");
diff --git a/termux-shared/src/main/res/values/strings.xml b/termux-shared/src/main/res/values/strings.xml
index 888eece9e7..16746d2d7b 100644
--- a/termux-shared/src/main/res/values/strings.xml
+++ b/termux-shared/src/main/res/values/strings.xml
@@ -73,7 +73,7 @@
 
 
     <!-- TermuxUtils -->
-    <string name="msg_report_issue">If you think this report should be reported, then copy its text from the options menu (3-dots on top right) and post an issue on one of the following links at which the report belongs at.</string>
+    <string name="msg_report_issue">If you want to report this issue, then copy its text from the options menu (3-dots on top right) and post an issue on one of the following links. If you are posting on Github, then post it in the repository at which the report belongs at. You may optionally remove any device specific info that you consider private or don\'t want to share or that is not relevant to the issue.</string>
 
 
     <!-- Log Level -->

From 0cd7cb81622d2abadd8744d028b48523df12c6f3 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Mon, 12 Apr 2021 14:26:53 +0500
Subject: [PATCH 329/912] Improve TermuxSession and TermuxTask

TermuxSession, TermuxTask and TermuxSessionClientBase have been moved to termux-shared. They are now not dependent on TermuxService anymore and have become abstract so that they can be called from anywhere. TermuxSession.TermuxSessionClient and TermuxTask.TermuxTaskClient interfaces have been created for callbacks, which the TermuxService now implements.

The TermuxTask now also supports synchronous command execution as well to run shell commands from anywhere for internal use by termux app and its plugins.

TermuxTask now also supports killing the process being run by sending it a SIGKILL. This is used by TermuxService to kill all the TermuxTasks (in addition to TermuxSessions) it manages when it is destroyed, either by user exiting it or by android killing it. Only the tasks that were started by a plugin which **expects** the result back via a pending intent will be killed, but the remaining background tasks will keep on running until the termux app process is killed by android, like by OOM. Check TermuxService.killAllTermuxExecutionCommands() for more details on how TermuxService kills TermuxTasks and TermuxSessions.

Fixed null pointer exception when getting terminal transcript if TerminalEmulator not initialized.
---
 .../com/termux/app/RunCommandService.java     |   2 +-
 .../java/com/termux/app/TermuxService.java    | 202 +++++++++----
 .../termux/app/terminal/TermuxSession.java    | 116 --------
 .../app/terminal/TermuxSessionClient.java     |   3 +
 .../TermuxSessionsListViewController.java     |   1 +
 .../com/termux/app/terminal/TermuxTask.java   | 142 ---------
 .../termux/app/terminal/TermuxViewClient.java |   7 +-
 .../com/termux/app/utils/PluginUtils.java     |   7 +-
 app/src/main/res/values/strings.xml           |   3 -
 termux-shared/build.gradle                    |   2 +
 .../shared}/models/ExecutionCommand.java      |  15 +-
 .../com/termux/shared/shell/ShellUtils.java   |  31 +-
 .../termux/shared/shell/StreamGobbler.java    |   4 +
 .../termux/shared/shell/TermuxSession.java    | 258 +++++++++++++++++
 .../shell}/TermuxSessionClientBase.java       |   2 +-
 .../com/termux/shared/shell/TermuxTask.java   | 273 ++++++++++++++++++
 termux-shared/src/main/res/values/strings.xml |   9 +
 17 files changed, 747 insertions(+), 330 deletions(-)
 delete mode 100644 app/src/main/java/com/termux/app/terminal/TermuxSession.java
 delete mode 100644 app/src/main/java/com/termux/app/terminal/TermuxTask.java
 rename {app/src/main/java/com/termux/app => termux-shared/src/main/java/com/termux/shared}/models/ExecutionCommand.java (97%)
 create mode 100644 termux-shared/src/main/java/com/termux/shared/shell/TermuxSession.java
 rename {app/src/main/java/com/termux/app/terminal => termux-shared/src/main/java/com/termux/shared/shell}/TermuxSessionClientBase.java (98%)
 create mode 100644 termux-shared/src/main/java/com/termux/shared/shell/TermuxTask.java

diff --git a/app/src/main/java/com/termux/app/RunCommandService.java b/app/src/main/java/com/termux/app/RunCommandService.java
index ff3afb0824..aac26428b9 100644
--- a/app/src/main/java/com/termux/app/RunCommandService.java
+++ b/app/src/main/java/com/termux/app/RunCommandService.java
@@ -18,7 +18,7 @@
 import com.termux.shared.notification.NotificationUtils;
 import com.termux.app.utils.PluginUtils;
 import com.termux.shared.data.DataUtils;
-import com.termux.app.models.ExecutionCommand;
+import com.termux.shared.models.ExecutionCommand;
 
 /**
  * A service that receives {@link RUN_COMMAND_SERVICE#ACTION_RUN_COMMAND} intent from third party apps and
diff --git a/app/src/main/java/com/termux/app/TermuxService.java b/app/src/main/java/com/termux/app/TermuxService.java
index e9d47799d5..e158c39df5 100644
--- a/app/src/main/java/com/termux/app/TermuxService.java
+++ b/app/src/main/java/com/termux/app/TermuxService.java
@@ -20,21 +20,21 @@
 import android.widget.ArrayAdapter;
 
 import com.termux.R;
+import com.termux.app.terminal.TermuxSessionClient;
+import com.termux.app.utils.PluginUtils;
 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;
 import com.termux.shared.settings.preferences.TermuxAppSharedPreferences;
-import com.termux.app.terminal.TermuxSession;
-import com.termux.app.terminal.TermuxSessionClient;
-import com.termux.app.terminal.TermuxSessionClientBase;
+import com.termux.shared.shell.TermuxSession;
+import com.termux.shared.shell.TermuxSessionClientBase;
 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.app.models.ExecutionCommand;
-import com.termux.app.models.ExecutionCommand.ExecutionState;
-import com.termux.app.terminal.TermuxTask;
+import com.termux.shared.models.ExecutionCommand;
+import com.termux.shared.shell.TermuxTask;
 import com.termux.terminal.TerminalEmulator;
 import com.termux.terminal.TerminalSession;
 import com.termux.terminal.TerminalSessionClient;
@@ -45,9 +45,10 @@
 import javax.annotation.Nullable;
 
 /**
- * A service holding a list of termux sessions, {@link #mTermuxSessions}, showing a foreground notification while
- * running so that it is not terminated. The user interacts with the session through {@link TermuxActivity}, but this
- * service may outlive the activity when the user or the system disposes of the activity. In that case the user may
+ * 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.
+ * The user interacts with the session through {@link TermuxActivity}, but this service may outlive
+ * the activity when the user or the system disposes of the activity. In that case the user may
  * restart {@link TermuxActivity} later to yet again access the sessions.
  * <p/>
  * In order to keep both terminal sessions and spawned processes (who may outlive the terminal sessions) alive as long
@@ -56,7 +57,7 @@
  * Optionally may hold a wake and a wifi lock, in which case that is shown in the notification - see
  * {@link #buildNotification()}.
  */
-public final class TermuxService extends Service {
+public final class TermuxService extends Service implements TermuxTask.TermuxTaskClient, TermuxSession.TermuxSessionClient {
 
     private static int EXECUTION_ID = 1000;
 
@@ -70,7 +71,7 @@ class LocalBinder extends Binder {
     private final Handler mHandler = new Handler();
 
     /**
-     * The foreground termux sessions which this service manages.
+     * The foreground TermuxSessions which this service manages.
      * Note that this list is observed by {@link TermuxActivity#mTermuxSessionListViewController},
      * so any changes must be made on the UI thread and followed by a call to
      * {@link ArrayAdapter#notifyDataSetChanged()} }.
@@ -78,15 +79,20 @@ class LocalBinder extends Binder {
     final List<TermuxSession> mTermuxSessions = new ArrayList<>();
 
     /**
-     * The background termux tasks which this service manages.
+     * The background TermuxTasks which this service manages.
      */
     final List<TermuxTask> mTermuxTasks = new ArrayList<>();
 
+    /**
+     * The pending plugin ExecutionCommands that have yet to be processed by this service.
+     */
+    final List<ExecutionCommand> mPendingPluginExecutionCommands = new ArrayList<>();
+
     /** The full implementation of the {@link TerminalSessionClient} interface to be used by {@link TerminalSession}
      * that holds activity references for activity related functions.
      * Note that the service may often outlive the activity, so need to clear this reference.
      */
-    TermuxSessionClient mTermuxSessionClient;
+    com.termux.app.terminal.TermuxSessionClient mTermuxSessionClient;
 
     /** The basic implementation of the {@link TerminalSessionClient} interface to be used by {@link TerminalSession}
      * that does not hold activity references.
@@ -154,7 +160,8 @@ public void onDestroy() {
         ShellUtils.clearTermuxTMPDIR(this);
 
         actionReleaseWakeLock(false);
-        finishAllTermuxSessions();
+        if (!mWantsToStop)
+            killAllTermuxExecutionCommands();
         runStopForeground();
     }
 
@@ -197,34 +204,77 @@ private void requestStopService() {
     /** Process action to stop service. */
     private void actionStopService() {
         mWantsToStop = true;
-        finishAllTermuxSessions();
+        killAllTermuxExecutionCommands();
         requestStopService();
     }
 
-    /** Finish all termux sessions by sending SIGKILL to their shells. */
-    private synchronized void finishAllTermuxSessions() {
-        ExecutionCommand executionCommand;
+    /** Kill all TermuxSessions and TermuxTasks by sending SIGKILL to their processes.
+     *
+     * For TermuxSessions, all sessions will be killed, whether user manually exited Termux or if
+     * onDestroy() was directly called because of unintended shutdown. The processing of results
+     * will only be done if user manually exited termux or if the session was started by a plugin
+     * which **expects** the result back via a pending intent.
+     *
+     * For TermuxTasks, only tasks that were started by a plugin which **expects** the result
+     * back via a pending intent will be killed, whether user manually exited Termux or if
+     * onDestroy() was directly called because of unintended shutdown. The processing of results
+     * will always be done for the tasks that are killed. The remaining processes will keep on
+     * running until the termux app process is killed by android, like by OOM, so we let them run
+     * as long as they can.
+     *
+     * Some plugin execution commands may not have been processed and added to mTermuxSessions and
+     * mTermuxTasks lists before the service is killed, so we maintain a separate
+     * mPendingPluginExecutionCommands list for those, so that we can notify the pending intent
+     * creators that execution was cancelled.
+     *
+     * Note that if user didn't manually exit Termux and if onDestroy() was directly called because
+     * of unintended shutdown, like android deciding to kill the service, then there will be no
+     * guarantee that onDestroy() will be allowed to finish and termux app process may be killed before
+     * it has finished. This means that in those cases some results may not be sent back to their
+     * creators for plugin commands but we still try to process whatever results can be processed
+     * despite the unreliable behaviour of onDestroy().
+     *
+     * Note that if don't kill the processes started by plugins which **expect** the result back
+     * and notify their creators that they have been killed, then they may get stuck waiting for
+     * the results forever like in case of commands started by Termux:Tasker or RUN_COMMAND intent,
+     * since once TermuxService has been killed, no result will be sent back. They may still get
+     * stuck if termux app process gets killed, so for this case reasonable timeout values should
+     * be used, like in Tasker for the Termux:Tasker actions.
+     *
+     * We make copies of each list since items are removed inside the loop.
+     */
+    private synchronized void killAllTermuxExecutionCommands() {
+        boolean processResult;
+
+        Logger.logDebug(LOG_TAG, "Killing TermuxSessions=" + mTermuxSessions.size() + ", TermuxTasks=" + mTermuxTasks.size() + ", PendingPluginExecutionCommands=" + mPendingPluginExecutionCommands.size());
 
-        // TODO: Should SIGKILL also be send to background processes maintained by mTermuxTasks?
-        for (int i = 0; i < mTermuxSessions.size(); i++) {
-            TermuxSession termuxSession = mTermuxSessions.get(i);
-            executionCommand = termuxSession.getExecutionCommand();
+        List<TermuxSession> termuxSessions = new ArrayList<>(mTermuxSessions);
+        for (int i = 0; i < termuxSessions.size(); i++) {
+            ExecutionCommand executionCommand = termuxSessions.get(i).getExecutionCommand();
+            processResult = mWantsToStop || (executionCommand.isPluginExecutionCommand && executionCommand.pluginPendingIntent != null);
+            termuxSessions.get(i).killIfExecuting(this, processResult);
+        }
 
-            // If the execution command was started for a plugin and is currently executing, then notify the callers
-            if(executionCommand.isPluginExecutionCommand && executionCommand.isExecuting()) {
-                if (executionCommand.setStateFailed(ExecutionCommand.RESULT_CODE_FAILED, this.getString(R.string.error_sending_sigkill_to_process), null)) {
-                    TermuxSession.processTermuxSessionResult(this, termuxSession, null);
+        List<TermuxTask> termuxTasks = new ArrayList<>(mTermuxTasks);
+        for (int i = 0; i < termuxTasks.size(); i++) {
+            ExecutionCommand executionCommand = termuxTasks.get(i).getExecutionCommand();
+            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.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);
                 }
             }
-
-            termuxSession.getTerminalSession().finishIfRunning();
         }
     }
 
 
 
-
-
     /** Process action to acquire Power and Wi-Fi WakeLocks. */
     @SuppressLint({"WakelockTimeout", "BatteryLife"})
     private void actionAcquireWakeLock() {
@@ -290,7 +340,7 @@ private void actionReleaseWakeLock(boolean updateNotification) {
     }
 
     /** Process {@link TERMUX_SERVICE#ACTION_SERVICE_EXECUTE} intent to execute a shell command in
-     * a foreground termux session or in background. */
+     * a foreground TermuxSession or in a background TermuxTask. */
     private void actionServiceExecute(Intent intent) {
         if (intent == null){
             Logger.logError(LOG_TAG, "Ignoring null intent to actionServiceExecute");
@@ -317,6 +367,9 @@ private void actionServiceExecute(Intent intent) {
         executionCommand.isPluginExecutionCommand = true;
         executionCommand.pluginPendingIntent = intent.getParcelableExtra(TERMUX_SERVICE.EXTRA_PENDING_INTENT);
 
+        // Add the execution command to pending plugin execution commands list
+        mPendingPluginExecutionCommands.add(executionCommand);
+
         if (executionCommand.inBackground) {
             executeTermuxTaskCommand(executionCommand);
         } else {
@@ -332,7 +385,7 @@ private void actionServiceExecute(Intent intent) {
     private void executeTermuxTaskCommand(ExecutionCommand executionCommand) {
         if (executionCommand == null) return;
 
-        Logger.logDebug(LOG_TAG, "Starting background termux task command");
+        Logger.logDebug(LOG_TAG, "Executing background \"" + executionCommand.getCommandIdAndLabelLogString() + "\" TermuxTask command");
 
         TermuxTask newTermuxTask = createTermuxTask(executionCommand);
     }
@@ -348,7 +401,7 @@ public TermuxTask createTermuxTask(String executablePath, String[] arguments, St
     public synchronized TermuxTask createTermuxTask(ExecutionCommand executionCommand) {
         if (executionCommand == null) return null;
 
-        Logger.logDebug(LOG_TAG, "Creating termux task");
+        Logger.logDebug(LOG_TAG, "Creating \"" + executionCommand.getCommandIdAndLabelLogString() + "\" TermuxTask");
 
         if (!executionCommand.inBackground) {
             Logger.logDebug(LOG_TAG, "Ignoring a foreground execution command passed to createTermuxTask()");
@@ -358,23 +411,40 @@ public synchronized TermuxTask createTermuxTask(ExecutionCommand executionComman
         if(Logger.getLogLevel() >= Logger.LOG_LEVEL_VERBOSE)
             Logger.logVerbose(LOG_TAG, executionCommand.toString());
 
-        TermuxTask newTermuxTask = TermuxTask.create(this, executionCommand);
+        TermuxTask newTermuxTask = TermuxTask.execute(this, executionCommand, this, false);
         if (newTermuxTask == null) {
-            Logger.logError(LOG_TAG, "Failed to execute new termux task command for:\n" + executionCommand.getCommandIdAndLabelLogString());
+            Logger.logError(LOG_TAG, "Failed to execute new TermuxTask command for:\n" + executionCommand.getCommandIdAndLabelLogString());
             return null;
         }
 
         mTermuxTasks.add(newTermuxTask);
 
+        // Remove the execution command from the pending plugin execution commands list since it has
+        // now been processed
+        if(executionCommand.isPluginExecutionCommand)
+            mPendingPluginExecutionCommands.remove(executionCommand);
+
         updateNotification();
 
         return newTermuxTask;
     }
 
     /** Callback received when a {@link TermuxTask} finishes. */
-    public synchronized void onTermuxTaskExited(final TermuxTask task) {
+    @Override
+    public void onTermuxTaskExited(final TermuxTask termuxTask) {
         mHandler.post(() -> {
-            mTermuxTasks.remove(task);
+            if(termuxTask != null) {
+                ExecutionCommand executionCommand = termuxTask.getExecutionCommand();
+
+                Logger.logVerbose(LOG_TAG, "The onTermuxTaskExited() callback called for \"" + executionCommand.getCommandIdAndLabelLogString() + "\" TermuxTask command");
+
+                // If the execution command was started for a plugin, then process the results
+                if(executionCommand != null && executionCommand.isPluginExecutionCommand)
+                    PluginUtils.processPluginExecutionCommandResult(this, LOG_TAG, executionCommand);
+
+                mTermuxTasks.remove(termuxTask);
+            }
+
             updateNotification();
         });
     }
@@ -386,8 +456,8 @@ public synchronized void onTermuxTaskExited(final TermuxTask task) {
     /** Execute a shell command in a foreground {@link TermuxSession}. */
     private void executeTermuxSessionCommand(ExecutionCommand executionCommand) {
         if (executionCommand == null) return;
-        
-        Logger.logDebug(LOG_TAG, "Starting foreground termux session command");
+
+        Logger.logDebug(LOG_TAG, "Executing foreground \"" + executionCommand.getCommandIdAndLabelLogString() + "\" TermuxSession command");
 
         String sessionName = null;
 
@@ -406,7 +476,7 @@ private void executeTermuxSessionCommand(ExecutionCommand executionCommand) {
 
     /**
      * Create a {@link TermuxSession}.
-     * Currently called by {@link TermuxSessionClient#addNewSession(boolean, String)} to add a new termux session.
+     * Currently called by {@link TermuxSessionClient#addNewSession(boolean, String)} to add a new {@link TermuxSession}.
      */
     @Nullable
     public TermuxSession createTermuxSession(String executablePath, String[] arguments, String workingDirectory, boolean isFailSafe, String sessionName) {
@@ -418,7 +488,7 @@ public TermuxSession createTermuxSession(String executablePath, String[] argumen
     public synchronized TermuxSession createTermuxSession(ExecutionCommand executionCommand, String sessionName) {
         if (executionCommand == null) return null;
 
-        Logger.logDebug(LOG_TAG, "Creating termux session");
+        Logger.logDebug(LOG_TAG, "Creating \"" + executionCommand.getCommandIdAndLabelLogString() + "\" TermuxSession");
 
         if (executionCommand.inBackground) {
             Logger.logDebug(LOG_TAG, "Ignoring a background execution command passed to createTermuxSession()");
@@ -427,15 +497,23 @@ public synchronized TermuxSession createTermuxSession(ExecutionCommand execution
 
         if(Logger.getLogLevel() >= Logger.LOG_LEVEL_VERBOSE)
             Logger.logVerbose(LOG_TAG, executionCommand.toString());
-        
-        TermuxSession newTermuxSession = TermuxSession.create(this, executionCommand, getTermuxSessionClient(), sessionName);
+
+        // 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
+        TermuxSession newTermuxSession = TermuxSession.execute(this, executionCommand, getTermuxSessionClient(), this, sessionName, executionCommand.isPluginExecutionCommand);
         if (newTermuxSession == null) {
-            Logger.logError(LOG_TAG, "Failed to execute new termux session command for:\n" + executionCommand.getCommandIdAndLabelLogString());
+            Logger.logError(LOG_TAG, "Failed to execute new TermuxSession command for:\n" + executionCommand.getCommandIdAndLabelLogString());
             return null;
         }
 
         mTermuxSessions.add(newTermuxSession);
 
+        // Remove the execution command from the pending plugin execution commands list since it has
+        // now been processed
+        if(executionCommand.isPluginExecutionCommand)
+            mPendingPluginExecutionCommands.remove(executionCommand);
+
         // Notify {@link TermuxSessionsListViewController} that sessions list has been updated if
         // activity in is foreground
         if(mTermuxSessionClient != null)
@@ -447,20 +525,27 @@ public synchronized TermuxSession createTermuxSession(ExecutionCommand execution
         return newTermuxSession;
     }
 
-    /** Remove a termux session. */
+    /** Remove a TermuxSession. */
     public synchronized int removeTermuxSession(TerminalSession sessionToRemove) {
         int index = getIndexOfSession(sessionToRemove);
 
-        if(index >= 0) {
-            TermuxSession termuxSession = mTermuxSessions.get(index);
+        if(index >= 0)
+            mTermuxSessions.get(index).finish();
 
-            if (termuxSession.getExecutionCommand().setState(ExecutionState.EXECUTED)) {
-                // If the execution command was started for a plugin and is currently executing, then process the result
-                if(termuxSession.getExecutionCommand().isPluginExecutionCommand)
-                    TermuxSession.processTermuxSessionResult(this, termuxSession, null);
-                else
-                    termuxSession.getExecutionCommand().setState(ExecutionState.SUCCESS);
-            }
+        return index;
+    }
+
+    /** Callback received when a {@link TermuxSession} finishes. */
+    @Override
+    public void onTermuxSessionExited(final TermuxSession termuxSession) {
+        if(termuxSession != null) {
+            ExecutionCommand executionCommand = termuxSession.getExecutionCommand();
+
+            Logger.logVerbose(LOG_TAG, "The onTermuxSessionExited() callback called for \"" + executionCommand.getCommandIdAndLabelLogString() + "\" TermuxSession command");
+
+            // If the execution command was started for a plugin, then process the results
+            if(executionCommand != null && executionCommand.isPluginExecutionCommand)
+                PluginUtils.processPluginExecutionCommandResult(this, LOG_TAG, executionCommand);
 
             mTermuxSessions.remove(termuxSession);
 
@@ -471,13 +556,12 @@ public synchronized int removeTermuxSession(TerminalSession sessionToRemove) {
         }
 
         if (mTermuxSessions.isEmpty() && mWakeLock == null) {
-            // Finish if there are no sessions left and the wake lock is not held, otherwise keep the service alive if
+            // Finish if there are no TermuxSessions left and the wake lock is not held, otherwise keep the service alive if
             // holding wake lock since there may be daemon processes (e.g. sshd) running.
             requestStopService();
         } else {
             updateNotification();
         }
-        return index;
     }
 
 
@@ -519,7 +603,7 @@ private void handleSessionAction(int sessionAction, TerminalSession newTerminalS
     /** Launch the {@link }TermuxActivity} to bring it to foreground. */
     private void startTermuxActivity() {
         // For android >= 10, apps require Display over other apps permission to start foreground activities
-        // from background (services). If it is not granted, then termux sessions that are started will
+        // 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)) {
             TermuxActivity.startTermuxActivity(this);
@@ -620,7 +704,7 @@ private Notification buildNotification() {
         // Set background color for small notification icon
         builder.setColor(0xFF607D8B);
 
-        // Termux sessions are always ongoing
+        // TermuxSessions are always ongoing
         builder.setOngoing(true);
 
 
@@ -648,7 +732,7 @@ private void setupNotificationChannel() {
     }
 
     /** Update the shown foreground service notification after making any changes that affect it. */
-    void updateNotification() {
+    private synchronized void updateNotification() {
         if (mWakeLock == null && mTermuxSessions.isEmpty() && mTermuxTasks.isEmpty()) {
             // Exit if we are updating after the user disabled all locks with no sessions or tasks running.
             requestStopService();
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxSession.java b/app/src/main/java/com/termux/app/terminal/TermuxSession.java
deleted file mode 100644
index 7b8381e351..0000000000
--- a/app/src/main/java/com/termux/app/terminal/TermuxSession.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package com.termux.app.terminal;
-
-import androidx.annotation.NonNull;
-
-import com.termux.R;
-import com.termux.shared.termux.TermuxConstants;
-import com.termux.app.TermuxService;
-import com.termux.shared.logger.Logger;
-import com.termux.app.utils.PluginUtils;
-import com.termux.shared.shell.ShellUtils;
-import com.termux.app.models.ExecutionCommand;
-import com.termux.terminal.TerminalSession;
-
-import java.io.File;
-
-/**
- * A class that maintains info for foreground Termux sessions.
- * It also provides a way to link each {@link TerminalSession} with the {@link ExecutionCommand}
- * that started it.
- */
-public class TermuxSession {
-
-    private final TerminalSession mTerminalSession;
-    private final ExecutionCommand mExecutionCommand;
-
-    private static final String LOG_TAG = "TermuxSession";
-
-    private TermuxSession(TerminalSession terminalSession, ExecutionCommand executionCommand) {
-        this.mTerminalSession = terminalSession;
-        this.mExecutionCommand = executionCommand;
-    }
-
-    public static TermuxSession create(@NonNull final TermuxService service, @NonNull ExecutionCommand executionCommand, @NonNull TermuxSessionClientBase termuxSessionClient, String sessionName) {
-        if (executionCommand.workingDirectory == null || executionCommand.workingDirectory.isEmpty()) executionCommand.workingDirectory = TermuxConstants.TERMUX_HOME_DIR_PATH;
-
-        String[] environment = ShellUtils.buildEnvironment(service, executionCommand.isFailsafe, executionCommand.workingDirectory);
-
-        boolean isLoginShell = false;
-        if (executionCommand.executable == null) {
-            if (!executionCommand.isFailsafe) {
-                for (String shellBinary : new String[]{"login", "bash", "zsh"}) {
-                    File shellFile = new File(TermuxConstants.TERMUX_BIN_PREFIX_DIR_PATH, shellBinary);
-                    if (shellFile.canExecute()) {
-                        executionCommand.executable = shellFile.getAbsolutePath();
-                        break;
-                    }
-                }
-            }
-
-            if (executionCommand.executable == null) {
-                // Fall back to system shell as last resort:
-                executionCommand.executable = "/system/bin/sh";
-            }
-            isLoginShell = true;
-        }
-
-        String[] processArgs = ShellUtils.setupProcessArgs(executionCommand.executable, executionCommand.arguments);
-
-        executionCommand.executable = processArgs[0];
-        String processName = (isLoginShell ? "-" : "") + ShellUtils.getExecutableBasename(executionCommand.executable);
-
-        String[] arguments = new String[processArgs.length];
-        arguments[0] = processName;
-        if (processArgs.length > 1) System.arraycopy(processArgs, 1, arguments, 1, processArgs.length - 1);
-
-        executionCommand.arguments = arguments;
-
-        if(!executionCommand.setState(ExecutionCommand.ExecutionState.EXECUTING)) {
-            executionCommand.setStateFailed(ExecutionCommand.RESULT_CODE_FAILED, service.getString(R.string.error_failed_to_execute_termux_session_command, executionCommand.getCommandIdAndLabelLogString()), null);
-            if(executionCommand.isPluginExecutionCommand) {
-                TermuxSession.processTermuxSessionResult(service, null, executionCommand);
-            }
-            return null;
-        }
-
-        Logger.logDebug(LOG_TAG, executionCommand.toString());
-
-        TerminalSession terminalSession = new TerminalSession(executionCommand.executable, executionCommand.workingDirectory, executionCommand.arguments, environment, termuxSessionClient);
-
-        if (sessionName != null) {
-            terminalSession.mSessionName = sessionName;
-        }
-
-        return new TermuxSession(terminalSession, executionCommand);
-    }
-
-    public static void processTermuxSessionResult(@NonNull final TermuxService service, final TermuxSession termuxSession, ExecutionCommand executionCommand) {
-        TerminalSession terminalSession = null;
-        if(termuxSession != null) {
-            executionCommand = termuxSession.mExecutionCommand;
-            terminalSession = termuxSession.mTerminalSession;
-        }
-
-        if(executionCommand == null) return;
-
-        // Must be a normal command like foreground terminal session started by user, so just return
-        if(!executionCommand.isPluginExecutionCommand) return;
-
-        if(terminalSession != null && !terminalSession.isRunning() && executionCommand.hasExecuted() && !executionCommand.isStateFailed()) {
-            executionCommand.stdout = terminalSession.getEmulator().getScreen().getTranscriptTextWithFullLinesJoined();
-            executionCommand.stderr = null;
-            executionCommand.exitCode = terminalSession.getExitStatus();
-        }
-
-        PluginUtils.processPluginExecutionCommandResult(service.getApplicationContext(), LOG_TAG, executionCommand);
-    }
-
-    public TerminalSession getTerminalSession() {
-        return mTerminalSession;
-    }
-
-    public ExecutionCommand getExecutionCommand() {
-        return mExecutionCommand;
-    }
-
-}
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxSessionClient.java b/app/src/main/java/com/termux/app/terminal/TermuxSessionClient.java
index 2dbc55524b..ec4020b206 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxSessionClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxSessionClient.java
@@ -13,8 +13,10 @@
 import android.widget.ListView;
 
 import com.termux.R;
+import com.termux.shared.shell.TermuxSession;
 import com.termux.shared.interact.DialogUtils;
 import com.termux.app.TermuxActivity;
+import com.termux.shared.shell.TermuxSessionClientBase;
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.app.TermuxService;
 import com.termux.shared.settings.properties.TermuxPropertyConstants;
@@ -255,6 +257,7 @@ public void removeFinishedSession(TerminalSession finishedSession) {
         TermuxService service = mActivity.getTermuxService();
 
         int index = service.removeTermuxSession(finishedSession);
+
         int size = mActivity.getTermuxService().getTermuxSessionsSize();
         if (size == 0) {
             // There are no sessions to show, so finish the activity.
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxSessionsListViewController.java b/app/src/main/java/com/termux/app/terminal/TermuxSessionsListViewController.java
index 5dcec5e072..a87780ecde 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxSessionsListViewController.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxSessionsListViewController.java
@@ -20,6 +20,7 @@
 
 import com.termux.R;
 import com.termux.app.TermuxActivity;
+import com.termux.shared.shell.TermuxSession;
 import com.termux.terminal.TerminalSession;
 
 import java.util.List;
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTask.java b/app/src/main/java/com/termux/app/terminal/TermuxTask.java
deleted file mode 100644
index f70ee9e5b1..0000000000
--- a/app/src/main/java/com/termux/app/terminal/TermuxTask.java
+++ /dev/null
@@ -1,142 +0,0 @@
-package com.termux.app.terminal;
-
-import androidx.annotation.NonNull;
-
-import com.termux.R;
-import com.termux.shared.termux.TermuxConstants;
-import com.termux.app.TermuxService;
-import com.termux.shared.shell.StreamGobbler;
-import com.termux.shared.logger.Logger;
-import com.termux.app.utils.PluginUtils;
-import com.termux.shared.shell.ShellUtils;
-import com.termux.app.models.ExecutionCommand;
-import com.termux.app.models.ExecutionCommand.ExecutionState;
-
-import java.io.File;
-import java.io.IOException;
-
-/**
- * A class that maintains info for background Termux tasks.
- * It also provides a way to link each {@link Process} with the {@link ExecutionCommand}
- * that started it.
- */
-public final class TermuxTask {
-
-    private final Process mProcess;
-    private final ExecutionCommand mExecutionCommand;
-
-    private static final String LOG_TAG = "TermuxTask";
-
-    private TermuxTask(Process process, ExecutionCommand executionCommand) {
-        this.mProcess = process;
-        this.mExecutionCommand = executionCommand;
-    }
-
-    public static TermuxTask create(@NonNull final TermuxService service, @NonNull ExecutionCommand executionCommand) {
-        if (executionCommand.workingDirectory == null || executionCommand.workingDirectory.isEmpty()) executionCommand.workingDirectory = TermuxConstants.TERMUX_HOME_DIR_PATH;
-
-        String[] env = ShellUtils.buildEnvironment(service, false, executionCommand.workingDirectory);
-
-        final String[] commandArray = ShellUtils.setupProcessArgs(executionCommand.executable, executionCommand.arguments);
-        // final String commandDescription = Arrays.toString(commandArray);
-
-        if(!executionCommand.setState(ExecutionState.EXECUTING))
-            return null;
-
-        Logger.logDebug(LOG_TAG, executionCommand.toString());
-
-        String taskName = ShellUtils.getExecutableBasename(executionCommand.executable);
-
-        if(executionCommand.commandLabel == null)
-            executionCommand.commandLabel = taskName;
-
-        // Exec the process
-        final Process process;
-        try {
-            process = Runtime.getRuntime().exec(commandArray, env, new File(executionCommand.workingDirectory));
-        } catch (IOException e) {
-            executionCommand.setStateFailed(ExecutionCommand.RESULT_CODE_FAILED, service.getString(R.string.error_failed_to_execute_termux_task_command, executionCommand.getCommandIdAndLabelLogString()), e);
-            TermuxSession.processTermuxSessionResult(service, null, executionCommand);
-            return null;
-        }
-
-        final int pid = ShellUtils.getPid(process);
-
-        Logger.logDebug(LOG_TAG, "Running \"" + executionCommand.commandLabel + "\" background task with pid " + pid);
-
-        final TermuxTask termuxTask = new TermuxTask(process, executionCommand);
-
-        StringBuilder stdout = new StringBuilder();
-        StringBuilder stderr = new StringBuilder();
-
-        new Thread() {
-            @Override
-            public void run() {
-                try {
-                    // setup stdout and stderr gobblers
-                    StreamGobbler STDOUT = new StreamGobbler(pid + "-stdout", process.getInputStream(), stdout);
-                    StreamGobbler STDERR = new StreamGobbler(pid + "-stderr", process.getErrorStream(), stderr);
-
-                    // start gobbling
-                    STDOUT.start();
-                    STDERR.start();
-
-                    // wait for our process to finish, while we gobble away in the
-                    // background
-                    int exitCode = process.waitFor();
-
-                    // make sure our threads are done gobbling
-                    // and the process is destroyed - while the latter shouldn't be
-                    // needed in theory, and may even produce warnings, in "normal" Java
-                    // they are required for guaranteed cleanup of resources, so lets be
-                    // safe and do this on Android as well
-                    STDOUT.join();
-                    STDERR.join();
-                    process.destroy();
-
-
-                    // Process result
-                    if (exitCode == 0)
-                        Logger.logDebug(LOG_TAG, "The \"" + executionCommand.commandLabel + "\" background task with pid " + pid + " exited normally");
-                    else
-                        Logger.logDebug(LOG_TAG, "The \"" + executionCommand.commandLabel + "\" background task with pid " + pid + " exited with code: " + exitCode);
-
-                    executionCommand.stdout = stdout.toString();
-                    executionCommand.stderr = stderr.toString();
-                    executionCommand.exitCode = exitCode;
-
-                    if(!executionCommand.setState(ExecutionState.EXECUTED))
-                        return;
-
-                    TermuxTask.processTermuxTaskResult(service, termuxTask, null);
-
-                } catch (IllegalThreadStateException | InterruptedException e) {
-                    // TODO: Should either of these be handled or returned?
-                }
-            }
-        }.start();
-
-        return termuxTask;
-    }
-
-    public static void processTermuxTaskResult(@NonNull final TermuxService service, final TermuxTask termuxTask, ExecutionCommand executionCommand) {
-        if(termuxTask != null)
-            executionCommand = termuxTask.mExecutionCommand;
-
-        if(executionCommand == null) return;
-
-        PluginUtils.processPluginExecutionCommandResult(service.getApplicationContext(), LOG_TAG, executionCommand);
-
-        if(termuxTask != null)
-            service.onTermuxTaskExited(termuxTask);
-    }
-
-    public Process getTerminalSession() {
-        return mProcess;
-    }
-
-    public ExecutionCommand getExecutionCommand() {
-        return mExecutionCommand;
-    }
-
-}
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxViewClient.java b/app/src/main/java/com/termux/app/terminal/TermuxViewClient.java
index 08586fe54c..7c19aa78aa 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxViewClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxViewClient.java
@@ -20,6 +20,7 @@
 
 import com.termux.R;
 import com.termux.app.TermuxActivity;
+import com.termux.shared.shell.ShellUtils;
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.app.activities.ReportActivity;
 import com.termux.app.models.ReportInfo;
@@ -341,7 +342,7 @@ public void shareSessionTranscript() {
         TerminalSession session = mActivity.getCurrentSession();
         if (session == null) return;
 
-        String transcriptText = session.getEmulator().getScreen().getTranscriptTextWithoutJoinedLines().trim();
+        String transcriptText = ShellUtils.getTerminalSessionTranscriptText(session, false, true);
         if (transcriptText == null) return;
 
         try {
@@ -361,7 +362,7 @@ public void showUrlSelection() {
         TerminalSession session = mActivity.getCurrentSession();
         if (session == null) return;
 
-        String text = session.getEmulator().getScreen().getTranscriptTextWithFullLinesJoined();
+        String text = ShellUtils.getTerminalSessionTranscriptText(session, true, true);
 
         LinkedHashSet<CharSequence> urlSet = DataUtils.extractUrls(text);
         if (urlSet.isEmpty()) {
@@ -404,7 +405,7 @@ public void reportIssueFromTranscript() {
         TerminalSession session = mActivity.getCurrentSession();
         if (session == null) return;
 
-        String transcriptText = session.getEmulator().getScreen().getTranscriptTextWithoutJoinedLines().trim();
+        String transcriptText = ShellUtils.getTerminalSessionTranscriptText(session, false, true);
         if (transcriptText == null) return;
 
         transcriptText = DataUtils.getTruncatedCommandOutput(transcriptText, DataUtils.TRANSACTION_SIZE_LIMIT_IN_BYTES, false, true, false).trim();
diff --git a/app/src/main/java/com/termux/app/utils/PluginUtils.java b/app/src/main/java/com/termux/app/utils/PluginUtils.java
index a174c0d5b5..552c3b9992 100644
--- a/app/src/main/java/com/termux/app/utils/PluginUtils.java
+++ b/app/src/main/java/com/termux/app/utils/PluginUtils.java
@@ -21,7 +21,7 @@
 import com.termux.shared.settings.properties.SharedProperties;
 import com.termux.shared.settings.properties.TermuxPropertyConstants;
 import com.termux.app.models.ReportInfo;
-import com.termux.app.models.ExecutionCommand;
+import com.termux.shared.models.ExecutionCommand;
 import com.termux.app.models.UserAction;
 import com.termux.shared.data.DataUtils;
 import com.termux.shared.markdown.MarkdownUtils;
@@ -56,7 +56,7 @@ public static void processPluginExecutionCommandResult(final Context context, St
         logTag = DataUtils.getDefaultIfNull(logTag, LOG_TAG);
 
         if(!executionCommand.hasExecuted()) {
-            Logger.logWarn(logTag, "Ignoring call to processPluginExecutionCommandResult() since the execution command has not been ExecutionState.EXECUTED");
+            Logger.logWarn(logTag, "Ignoring call to processPluginExecutionCommandResult() since the execution command state is not higher than the ExecutionState.EXECUTED");
             return;
         }
 
@@ -114,7 +114,7 @@ public static void processPluginExecutionCommandError(final Context context, Str
         logTag = DataUtils.getDefaultIfNull(logTag, LOG_TAG);
 
         if(!executionCommand.isStateFailed()) {
-            Logger.logWarn(logTag, "Ignoring call to processPluginExecutionCommandError() since the execution command does not have ExecutionState.FAILED state");
+            Logger.logWarn(logTag, "Ignoring call to processPluginExecutionCommandError() since the execution command is not in ExecutionState.FAILED");
             return;
         }
 
@@ -255,6 +255,7 @@ public static boolean sendPluginExecutionCommandResultPendingIntent(Context cont
             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;
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 741e849863..0cebd0b560 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -100,9 +100,6 @@
     <!-- 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>
-    <string name="error_sending_sigkill_to_process">Sending SIGKILL to process on user request or because android is killing the service</string>
-    <string name="error_failed_to_execute_termux_session_command">"Failed to execute \"%1$s\" termux session command"</string>
-    <string name="error_failed_to_execute_termux_task_command">"Failed to execute \"%1$s\" termux task command"</string>
 
 
 
diff --git a/termux-shared/build.gradle b/termux-shared/build.gradle
index f41993651d..a152325322 100644
--- a/termux-shared/build.gradle
+++ b/termux-shared/build.gradle
@@ -16,6 +16,8 @@ android {
         // will be runtime exceptions on android < 8
         // due to missing classes like java.nio.file.Path.
         implementation "commons-io:commons-io:2.5"
+
+        implementation project(":terminal-view")
     }
 
     defaultConfig {
diff --git a/app/src/main/java/com/termux/app/models/ExecutionCommand.java b/termux-shared/src/main/java/com/termux/shared/models/ExecutionCommand.java
similarity index 97%
rename from app/src/main/java/com/termux/app/models/ExecutionCommand.java
rename to termux-shared/src/main/java/com/termux/shared/models/ExecutionCommand.java
index 240af229e7..7069e53193 100644
--- a/app/src/main/java/com/termux/app/models/ExecutionCommand.java
+++ b/termux-shared/src/main/java/com/termux/shared/models/ExecutionCommand.java
@@ -1,4 +1,4 @@
-package com.termux.app.models;
+package com.termux.shared.models;
 
 import android.app.Activity;
 import android.app.PendingIntent;
@@ -56,6 +56,7 @@ public int getValue() {
     public final static int	RESULT_CODE_OK = Activity.RESULT_OK;
     public final static int	RESULT_CODE_OK_MINOR_FAILURES = Activity.RESULT_FIRST_USER;
     public final static int	RESULT_CODE_FAILED = Activity.RESULT_FIRST_USER + 1;
+    public final static int	RESULT_CODE_CANCELED = Activity.RESULT_FIRST_USER + 2;
 
     /** The optional unique id for the {@link ExecutionCommand}. */
     public Integer id;
@@ -125,6 +126,9 @@ public int getValue() {
     /** The internal exceptions of {@link ExecutionCommand}. */
     public List<Throwable> throwableList  = new ArrayList<>();
 
+    /** Defines if processing results already called for this {@link ExecutionCommand}. */
+    public boolean processingResultsAlreadyCalled;
+
 
 
     public ExecutionCommand(){
@@ -527,6 +531,15 @@ public synchronized boolean setStateFailed(int errCode, String errmsg,  Throwabl
         return true;
     }
 
+    public synchronized boolean shouldNotProcessResults() {
+        if (processingResultsAlreadyCalled) {
+            return true;
+        } else {
+            processingResultsAlreadyCalled = true;
+            return false;
+        }
+    }
+
     public synchronized boolean isStateFailed() {
         if (currentState != ExecutionState.FAILED)
             return false;
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/ShellUtils.java b/termux-shared/src/main/java/com/termux/shared/shell/ShellUtils.java
index d30a01faa3..9d5455cb92 100644
--- a/termux-shared/src/main/java/com/termux/shared/shell/ShellUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/shell/ShellUtils.java
@@ -2,11 +2,16 @@
 
 import android.content.Context;
 
+import androidx.annotation.NonNull;
+
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.file.FileUtils;
 import com.termux.shared.logger.Logger;
 import com.termux.shared.packages.PackageUtils;
 import com.termux.shared.termux.TermuxUtils;
+import com.termux.terminal.TerminalBuffer;
+import com.termux.terminal.TerminalEmulator;
+import com.termux.terminal.TerminalSession;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -85,7 +90,7 @@ public static int getPid(Process p) {
         }
     }
 
-    public static String[] setupProcessArgs(String fileToExecute, String[] arguments) {
+    public static String[] setupProcessArgs(@NonNull String fileToExecute, String[] arguments) {
         // The file to execute may either be:
         // - An elf file, in which we execute it directly.
         // - A script file without shebang, which we execute with our standard shell $PREFIX/bin/sh instead of the
@@ -153,4 +158,28 @@ public static void clearTermuxTMPDIR(Context context) {
         }
     }
 
+    public static String getTerminalSessionTranscriptText(TerminalSession terminalSession, boolean linesJoined, boolean trim) {
+        if (terminalSession == null) return null;
+
+        TerminalEmulator terminalEmulator = terminalSession.getEmulator();
+        if (terminalEmulator == null) return null;
+
+        TerminalBuffer terminalBuffer = terminalEmulator.getScreen();
+        if (terminalBuffer == null) return null;
+
+        String transcriptText;
+
+        if(linesJoined)
+            transcriptText = terminalBuffer.getTranscriptTextWithFullLinesJoined();
+        else
+            transcriptText = terminalBuffer.getTranscriptTextWithoutJoinedLines();
+
+        if (transcriptText == null) return null;
+
+        if(trim)
+            transcriptText = transcriptText.trim();
+
+        return transcriptText;
+    }
+
 }
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/StreamGobbler.java b/termux-shared/src/main/java/com/termux/shared/shell/StreamGobbler.java
index ede6145c49..8d785c5dd6 100644
--- a/termux-shared/src/main/java/com/termux/shared/shell/StreamGobbler.java
+++ b/termux-shared/src/main/java/com/termux/shared/shell/StreamGobbler.java
@@ -32,6 +32,9 @@
 
 /**
  * Thread utility class continuously reading from an InputStream
+ *
+ * https://github.com/Chainfire/libsuperuser/blob/1.1.0.201907261845/libsuperuser/src/eu/chainfire/libsuperuser/Shell.java#L141
+ * https://github.com/Chainfire/libsuperuser/blob/1.1.0.201907261845/libsuperuser/src/eu/chainfire/libsuperuser/StreamGobbler.java
  */
 @SuppressWarnings({"WeakerAccess"})
 public class StreamGobbler extends Thread {
@@ -170,6 +173,7 @@ public void run() {
         // optionally pausing when a command is executed that consumes the InputStream itself
         int currentLogLevel = Logger.getLogLevel();
         int logLevelVerbose = Logger.LOG_LEVEL_VERBOSE;
+
         try {
             String line;
             while ((line = reader.readLine()) != null) {
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/TermuxSession.java b/termux-shared/src/main/java/com/termux/shared/shell/TermuxSession.java
new file mode 100644
index 0000000000..837edbc2e6
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/shell/TermuxSession.java
@@ -0,0 +1,258 @@
+package com.termux.shared.shell;
+
+import android.content.Context;
+import android.system.OsConstants;
+
+import androidx.annotation.NonNull;
+
+import com.termux.shared.R;
+import com.termux.shared.models.ExecutionCommand;
+import com.termux.shared.termux.TermuxConstants;
+import com.termux.shared.logger.Logger;
+import com.termux.terminal.TerminalSession;
+import com.termux.terminal.TerminalSessionClient;
+
+import java.io.File;
+
+/**
+ * A class that maintains info for foreground Termux sessions.
+ * It also provides a way to link each {@link TerminalSession} with the {@link ExecutionCommand}
+ * that started it.
+ */
+public class TermuxSession {
+
+    private final TerminalSession mTerminalSession;
+    private final ExecutionCommand mExecutionCommand;
+    private final TermuxSessionClient mTermuxSessionClient;
+    private final boolean mSetStdoutOnExit;
+
+    private static final String LOG_TAG = "TermuxSession";
+
+    private TermuxSession(@NonNull final TerminalSession terminalSession, @NonNull final ExecutionCommand executionCommand,
+                          final TermuxSessionClient termuxSessionClient, final boolean setStdoutOnExit) {
+        this.mTerminalSession = terminalSession;
+        this.mExecutionCommand = executionCommand;
+        this.mTermuxSessionClient = termuxSessionClient;
+        this.mSetStdoutOnExit = setStdoutOnExit;
+    }
+
+    /**
+     * Start execution of an {@link ExecutionCommand} with {@link Runtime#exec(String[], String[], File)}.
+     *
+     * The {@link ExecutionCommand#executable}, must be set, {@link ExecutionCommand#commandLabel},
+     * {@link ExecutionCommand#arguments} and {@link ExecutionCommand#workingDirectory} may optionally
+     * be set.
+     *
+     * If {@link ExecutionCommand#executable} is {@code null}, then a default shell is automatically
+     * chosen.
+     *
+     * @param context The {@link Context} for operations.
+     * @param executionCommand The {@link ExecutionCommand} containing the information for execution command.
+     * @param terminalSessionClient The {@link TerminalSessionClient} interface implementation.
+     * @param termuxSessionClient The {@link TermuxSessionClient} interface implementation.
+     * @param sessionName The optional {@link TerminalSession} name.
+     * @param setStdoutOnExit If set to {@code true}, then the {@link ExecutionCommand#stdout}
+     *                        available in the {@link TermuxSessionClient#onTermuxSessionExited(TermuxSession)}
+     *                        callback will be set to the {@link TerminalSession} transcript. The session
+     *                        transcript will contain both stdout and stderr combined, basically
+     *                        anything sent to the the pseudo terminal /dev/pts, including PS1 prefixes.
+     *                        Set this to {@code true} only if the session transcript is required,
+     *                        since this requires extra processing to get it.
+     * @return Returns the {@link TermuxSession}. This will be {@code null} if failed to start the execution command.
+     */
+    public static TermuxSession execute(@NonNull final Context context, @NonNull ExecutionCommand executionCommand,
+                                        @NonNull final TerminalSessionClient terminalSessionClient, final TermuxSessionClient termuxSessionClient,
+                                        final String sessionName, final boolean setStdoutOnExit) {
+        if (executionCommand.workingDirectory == null || executionCommand.workingDirectory.isEmpty()) executionCommand.workingDirectory = TermuxConstants.TERMUX_HOME_DIR_PATH;
+
+        String[] environment = ShellUtils.buildEnvironment(context, executionCommand.isFailsafe, executionCommand.workingDirectory);
+
+        boolean isLoginShell = false;
+        if (executionCommand.executable == null) {
+            if (!executionCommand.isFailsafe) {
+                for (String shellBinary : new String[]{"login", "bash", "zsh"}) {
+                    File shellFile = new File(TermuxConstants.TERMUX_BIN_PREFIX_DIR_PATH, shellBinary);
+                    if (shellFile.canExecute()) {
+                        executionCommand.executable = shellFile.getAbsolutePath();
+                        break;
+                    }
+                }
+            }
+
+            if (executionCommand.executable == null) {
+                // Fall back to system shell as last resort:
+                executionCommand.executable = "/system/bin/sh";
+            }
+            isLoginShell = true;
+        }
+
+        String[] processArgs = ShellUtils.setupProcessArgs(executionCommand.executable, executionCommand.arguments);
+
+        executionCommand.executable = processArgs[0];
+        String processName = (isLoginShell ? "-" : "") + ShellUtils.getExecutableBasename(executionCommand.executable);
+
+        String[] arguments = new String[processArgs.length];
+        arguments[0] = processName;
+        if (processArgs.length > 1) System.arraycopy(processArgs, 1, arguments, 1, processArgs.length - 1);
+
+        executionCommand.arguments = arguments;
+
+        if (executionCommand.commandLabel == null)
+            executionCommand.commandLabel = processName;
+
+        if (!executionCommand.setState(ExecutionCommand.ExecutionState.EXECUTING)) {
+            executionCommand.setStateFailed(ExecutionCommand.RESULT_CODE_FAILED, context.getString(R.string.error_failed_to_execute_termux_session_command, executionCommand.getCommandIdAndLabelLogString()), null);
+            TermuxSession.processTermuxSessionResult(null, executionCommand);
+            return null;
+        }
+
+        Logger.logDebug(LOG_TAG, executionCommand.toString());
+
+        Logger.logDebug(LOG_TAG, "Running \"" + executionCommand.getCommandIdAndLabelLogString() + "\" TermuxSession");
+        TerminalSession terminalSession = new TerminalSession(executionCommand.executable, executionCommand.workingDirectory, executionCommand.arguments, environment, terminalSessionClient);
+
+        if (sessionName != null) {
+            terminalSession.mSessionName = sessionName;
+        }
+
+        return new TermuxSession(terminalSession, executionCommand, termuxSessionClient, setStdoutOnExit);
+    }
+
+    /**
+     * Signal that this {@link TermuxSession} has finished.  This should be called when
+     * {@link TerminalSessionClient#onSessionFinished(TerminalSession)} callback is received by the caller.
+     *
+     * If the processes has finished, then sets {@link ExecutionCommand#stdout}, {@link ExecutionCommand#stderr}
+     * and {@link ExecutionCommand#exitCode} for the {@link #mExecutionCommand} of the {@code termuxTask}
+     * and then calls {@link #processTermuxSessionResult(TermuxSession, ExecutionCommand)} to process the result}.
+     *
+     */
+    public void finish() {
+        // If process is still running, then ignore the call
+        if (mTerminalSession.isRunning()) return;
+
+        int exitCode = mTerminalSession.getExitStatus();
+
+        if (exitCode == 0)
+            Logger.logDebug(LOG_TAG, "The \"" + mExecutionCommand.getCommandIdAndLabelLogString() + "\" TermuxSession with exited normally");
+        else
+            Logger.logDebug(LOG_TAG, "The \"" + mExecutionCommand.getCommandIdAndLabelLogString() + "\" TermuxSession with exited with code: " + exitCode);
+
+        // If the execution command has already failed, like SIGKILL was sent, then don't continue
+        if (mExecutionCommand.isStateFailed()) {
+            Logger.logDebug(LOG_TAG, "Ignoring setting \"" + mExecutionCommand.getCommandIdAndLabelLogString() + "\" TermuxSession state to ExecutionState.EXECUTED and processing results since it has already failed");
+            return;
+        }
+
+        if (this.mSetStdoutOnExit)
+            mExecutionCommand.stdout = ShellUtils.getTerminalSessionTranscriptText(mTerminalSession, true, false);
+        else
+            mExecutionCommand.stdout = null;
+
+        mExecutionCommand.stderr = null;
+        mExecutionCommand.exitCode = exitCode;
+
+        if (!mExecutionCommand.setState(ExecutionCommand.ExecutionState.EXECUTED))
+            return;
+
+        TermuxSession.processTermuxSessionResult(this, null);
+    }
+
+    /**
+     * Kill this {@link TermuxSession} by sending a {@link OsConstants#SIGILL} to its {@link #mTerminalSession}
+     * if its still executing.
+     *
+     * We process the results even if
+     *
+     * @param context The {@link Context} for operations.
+     * @param processResult If set to {@code true}, then the {@link #processTermuxSessionResult(TermuxSession, ExecutionCommand)}
+     *                      will be called to process the failure.
+     */
+    public void killIfExecuting(@NonNull final Context context, boolean processResult) {
+        // If execution command has already finished executing, then no need to process results or send SIGKILL
+        if(mExecutionCommand.hasExecuted()) {
+            Logger.logDebug(LOG_TAG, "Ignoring sending SIGKILL to \"" + mExecutionCommand.getCommandIdAndLabelLogString() + "\" TermuxSession since it has already finished executing");
+            return;
+        }
+
+        Logger.logDebug(LOG_TAG, "Send SIGKILL to \"" + mExecutionCommand.getCommandIdAndLabelLogString() + "\" TermuxSession");
+        if (mExecutionCommand.setStateFailed(ExecutionCommand.RESULT_CODE_FAILED, context.getString(R.string.error_sending_sigkill_to_process), null)) {
+            if (processResult) {
+                // Get whatever output has been set till now in case its needed
+                if (this.mSetStdoutOnExit)
+                    mExecutionCommand.stdout = ShellUtils.getTerminalSessionTranscriptText(mTerminalSession, true, false);
+                else
+                    mExecutionCommand.stdout = null;
+
+                mExecutionCommand.stderr = null;
+                mExecutionCommand.exitCode = 137; // SIGKILL
+
+                TermuxSession.processTermuxSessionResult(this, null);
+            }
+        }
+
+        // Send SIGKILL to process
+        mTerminalSession.finishIfRunning();
+    }
+
+    /**
+     * Process the results of {@link TermuxSession} or {@link ExecutionCommand}.
+     *
+     * Only one of {@code termuxSession} and {@code executionCommand} must be set.
+     *
+     * If the {@code termuxSession} and its {@link #mTermuxSessionClient} are not {@code null},
+     * then the {@link TermuxSession.TermuxSessionClient#onTermuxSessionExited(TermuxSession)}
+     * callback will be called.
+     *
+     * @param termuxSession The {@link TermuxSession}, which should be set if
+     *                  {@link #execute(Context, ExecutionCommand, TerminalSessionClient, TermuxSessionClient, String, boolean)} 
+     *                   successfully started the process.
+     * @param executionCommand The {@link ExecutionCommand}, which should be set if
+     *                          {@link #execute(Context, ExecutionCommand, TerminalSessionClient, TermuxSessionClient, String, boolean)}
+     *                          failed to start the process.
+     */
+    private static void processTermuxSessionResult(final TermuxSession termuxSession, ExecutionCommand executionCommand) {
+        if (termuxSession != null)
+            executionCommand = termuxSession.mExecutionCommand;
+
+        if (executionCommand == null) return;
+
+        if (executionCommand.shouldNotProcessResults()) {
+            Logger.logDebug(LOG_TAG, "Ignoring duplicate call to process \"" + executionCommand.getCommandIdAndLabelLogString() + "\" TermuxSession result");
+            return;
+        }
+
+        Logger.logDebug(LOG_TAG, "Processing \"" + executionCommand.getCommandIdAndLabelLogString() + "\" TermuxSession result");
+
+        if (termuxSession != null && termuxSession.mTermuxSessionClient != null) {
+            termuxSession.mTermuxSessionClient.onTermuxSessionExited(termuxSession);
+        } else {
+            // If a callback is not set and execution command didn't fail, then we set success state now
+            // Otherwise, the callback host can set it himself when its done with the termuxSession
+            if (!executionCommand.isStateFailed())
+                executionCommand.setState(ExecutionCommand.ExecutionState.SUCCESS);
+        }
+    }
+
+    public TerminalSession getTerminalSession() {
+        return mTerminalSession;
+    }
+
+    public ExecutionCommand getExecutionCommand() {
+        return mExecutionCommand;
+    }
+
+
+
+    public interface TermuxSessionClient {
+
+        /**
+         * Callback function for when {@link TermuxSession} exits.
+         *
+         * @param termuxSession The {@link TermuxSession} that exited.
+         */
+        void onTermuxSessionExited(TermuxSession termuxSession);
+
+    }
+
+}
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxSessionClientBase.java b/termux-shared/src/main/java/com/termux/shared/shell/TermuxSessionClientBase.java
similarity index 98%
rename from app/src/main/java/com/termux/app/terminal/TermuxSessionClientBase.java
rename to termux-shared/src/main/java/com/termux/shared/shell/TermuxSessionClientBase.java
index cb0dec8fbb..194c8aab59 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxSessionClientBase.java
+++ b/termux-shared/src/main/java/com/termux/shared/shell/TermuxSessionClientBase.java
@@ -1,4 +1,4 @@
-package com.termux.app.terminal;
+package com.termux.shared.shell;
 
 import com.termux.shared.logger.Logger;
 import com.termux.terminal.TerminalSession;
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/TermuxTask.java b/termux-shared/src/main/java/com/termux/shared/shell/TermuxTask.java
new file mode 100644
index 0000000000..17d6795f44
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/shell/TermuxTask.java
@@ -0,0 +1,273 @@
+package com.termux.shared.shell;
+
+import android.content.Context;
+import android.system.ErrnoException;
+import android.system.Os;
+import android.system.OsConstants;
+
+import androidx.annotation.NonNull;
+
+import com.termux.shared.R;
+import com.termux.shared.models.ExecutionCommand;
+import com.termux.shared.termux.TermuxConstants;
+import com.termux.shared.logger.Logger;
+import com.termux.shared.models.ExecutionCommand.ExecutionState;
+
+import java.io.File;
+import java.io.IOException;
+
+/**
+ * A class that maintains info for background Termux tasks run with {@link Runtime#exec(String[], String[], File)}.
+ * It also provides a way to link each {@link Process} with the {@link ExecutionCommand}
+ * that started it.
+ */
+public final class TermuxTask {
+
+    private final Process mProcess;
+    private final ExecutionCommand mExecutionCommand;
+    private final TermuxTaskClient mTermuxTaskClient;
+
+    private final StringBuilder mStdout = new StringBuilder();
+    private final StringBuilder mStderr = new StringBuilder();
+
+    private static final String LOG_TAG = "TermuxTask";
+
+    private TermuxTask(@NonNull final Process process, @NonNull final ExecutionCommand executionCommand,
+                       final TermuxTaskClient termuxTaskClient) {
+        this.mProcess = process;
+        this.mExecutionCommand = executionCommand;
+        this.mTermuxTaskClient = termuxTaskClient;
+    }
+
+    /**
+     * Start execution of an {@link ExecutionCommand} with {@link Runtime#exec(String[], String[], File)}.
+     *
+     * The {@link ExecutionCommand#executable}, must be set.
+     * The  {@link ExecutionCommand#commandLabel}, {@link ExecutionCommand#arguments} and
+     * {@link ExecutionCommand#workingDirectory} may optionally be set.
+     *
+     * @param context The {@link Context} for operations.
+     * @param executionCommand The {@link ExecutionCommand} containing the information for execution command.
+     * @param termuxTaskClient The {@link TermuxTaskClient} interface implementation.
+     *                           The {@link TermuxTaskClient#onTermuxTaskExited(TermuxTask)} will
+     *                           be called regardless of {@code isSynchronous} value but not if
+     *                           {@code null} is returned by this method. This can
+     *                           optionally be {@code null}.
+     * @param isSynchronous If set to {@code true}, then the command will be executed in the
+     *                      caller thread and results returned synchronously in the {@link ExecutionCommand}
+     *                      sub object of the {@link TermuxTask} returned.
+     *                      If set to {@code false}, then a new thread is started run the commands
+     *                      asynchronously in the background and control is returned to the caller thread.
+     * @return Returns the {@link TermuxTask}. This will be {@code null} if failed to start the execution command.
+     */
+    public static TermuxTask execute(@NonNull final Context context, @NonNull ExecutionCommand executionCommand,
+                                     final TermuxTaskClient termuxTaskClient, final boolean isSynchronous) {
+        if (executionCommand.workingDirectory == null || executionCommand.workingDirectory.isEmpty()) executionCommand.workingDirectory = TermuxConstants.TERMUX_HOME_DIR_PATH;
+
+        String[] env = ShellUtils.buildEnvironment(context, false, executionCommand.workingDirectory);
+
+        final String[] commandArray = ShellUtils.setupProcessArgs(executionCommand.executable, executionCommand.arguments);
+
+        if (!executionCommand.setState(ExecutionState.EXECUTING))
+            return null;
+
+        Logger.logDebug(LOG_TAG, executionCommand.toString());
+
+        String taskName = ShellUtils.getExecutableBasename(executionCommand.executable);
+
+        if (executionCommand.commandLabel == null)
+            executionCommand.commandLabel = taskName;
+
+        // Exec the process
+        final Process process;
+        try {
+            process = Runtime.getRuntime().exec(commandArray, env, new File(executionCommand.workingDirectory));
+        } catch (IOException e) {
+            executionCommand.setStateFailed(ExecutionCommand.RESULT_CODE_FAILED, context.getString(R.string.error_failed_to_execute_termux_task_command, executionCommand.getCommandIdAndLabelLogString()), e);
+            TermuxTask.processTermuxTaskResult(null, executionCommand);
+            return null;
+        }
+
+        final TermuxTask termuxTask = new TermuxTask(process, executionCommand, termuxTaskClient);
+
+        if (isSynchronous) {
+            try {
+                termuxTask.executeInner();
+            } catch (IllegalThreadStateException | InterruptedException e) {
+                // TODO: Should either of these be handled or returned?
+            }
+        } else {
+            new Thread() {
+                @Override
+                public void run() {
+                    try {
+                        termuxTask.executeInner();
+                    } catch (IllegalThreadStateException | InterruptedException e) {
+                        // TODO: Should either of these be handled or returned?
+                    }
+                }
+            }.start();
+        }
+
+        return termuxTask;
+    }
+
+    /**
+     * Sets up stdout and stderr readers for the {@link #mProcess} and waits for the process to end.
+     *
+     * If the processes finishes, then sets {@link ExecutionCommand#stdout}, {@link ExecutionCommand#stderr}
+     * and {@link ExecutionCommand#exitCode} for the {@link #mExecutionCommand} of the {@code termuxTask}
+     * and then calls {@link #processTermuxTaskResult(TermuxTask, ExecutionCommand) to process the result}.
+     */
+    private void executeInner() throws IllegalThreadStateException, InterruptedException {
+        final int pid = ShellUtils.getPid(mProcess);
+
+        Logger.logDebug(LOG_TAG, "Running \"" + mExecutionCommand.getCommandIdAndLabelLogString() + "\" TermuxTask with pid " + pid);
+
+        mExecutionCommand.stdout = null;
+        mExecutionCommand.stderr = null;
+        mExecutionCommand.exitCode = null;
+
+
+
+        // setup stdout and stderr gobblers
+        StreamGobbler STDOUT = new StreamGobbler(pid + "-stdout", mProcess.getInputStream(), mStdout);
+        StreamGobbler STDERR = new StreamGobbler(pid + "-stderr", mProcess.getErrorStream(), mStderr);
+
+        // start gobbling
+        STDOUT.start();
+        STDERR.start();
+
+        // wait for our process to finish, while we gobble away in the background
+        int exitCode = mProcess.waitFor();
+
+        // make sure our threads are done gobbling
+        // and the process is destroyed - while the latter shouldn't be
+        // needed in theory, and may even produce warnings, in "normal" Java
+        // they are required for guaranteed cleanup of resources, so lets be
+        // safe and do this on Android as well
+        STDOUT.join();
+        STDERR.join();
+        mProcess.destroy();
+
+        // Process result
+        if (exitCode == 0)
+            Logger.logDebug(LOG_TAG, "The \"" + mExecutionCommand.getCommandIdAndLabelLogString() + "\" TermuxTask with pid " + pid + " exited normally");
+        else
+            Logger.logDebug(LOG_TAG, "The \"" + mExecutionCommand.getCommandIdAndLabelLogString() + "\" TermuxTask with pid " + pid + " exited with code: " + exitCode);
+
+        // If the execution command has already failed, like SIGKILL was sent, then don't continue
+        if (mExecutionCommand.isStateFailed()) {
+            Logger.logDebug(LOG_TAG, "Ignoring setting \"" + mExecutionCommand.getCommandIdAndLabelLogString() + "\" TermuxTask state to ExecutionState.EXECUTED and processing results since it has already failed");
+            return;
+        }
+
+        mExecutionCommand.stdout = mStdout.toString();
+        mExecutionCommand.stderr = mStderr.toString();
+        mExecutionCommand.exitCode = exitCode;
+
+        if (!mExecutionCommand.setState(ExecutionState.EXECUTED))
+            return;
+
+        TermuxTask.processTermuxTaskResult(this, null);
+    }
+
+    /**
+     * Kill this {@link TermuxTask} by sending a {@link OsConstants#SIGILL} to its {@link #mProcess}
+     * if its still executing.
+     *
+     * @param context The {@link Context} for operations.
+     * @param processResult If set to {@code true}, then the {@link #processTermuxTaskResult(TermuxTask, ExecutionCommand)}
+     *                      will be called to process the failure.
+     */
+    public void killIfExecuting(@NonNull final Context context, boolean processResult) {
+        // If execution command has already finished executing, then no need to process results or send SIGKILL
+        if(mExecutionCommand.hasExecuted()) {
+            Logger.logDebug(LOG_TAG, "Ignoring sending SIGKILL to \"" + mExecutionCommand.getCommandIdAndLabelLogString() + "\" TermuxTask since it has already finished executing");
+            return;
+        }
+
+        Logger.logDebug(LOG_TAG, "Send SIGKILL to \"" + mExecutionCommand.getCommandIdAndLabelLogString() + "\" TermuxTask");
+
+        if (mExecutionCommand.setStateFailed(ExecutionCommand.RESULT_CODE_FAILED, context.getString(R.string.error_sending_sigkill_to_process), null)) {
+            if (processResult) {
+                // Get whatever output has been set till now in case its needed
+                mExecutionCommand.stdout = mStdout.toString();
+                mExecutionCommand.stderr = mStderr.toString();
+                mExecutionCommand.exitCode = 137; // SIGKILL
+
+                TermuxTask.processTermuxTaskResult(this, null);
+            }
+        }
+
+        if (mExecutionCommand.isExecuting()) {
+            int pid = ShellUtils.getPid(mProcess);
+            try {
+                // Send SIGKILL to process
+                Os.kill(pid, OsConstants.SIGKILL);
+            } catch (ErrnoException e) {
+                Logger.logWarn(LOG_TAG, "Failed to send SIGKILL to \"" + mExecutionCommand.getCommandIdAndLabelLogString() + "\" TermuxTask with pid " + pid + ": " + e.getMessage());
+            }
+        }
+    }
+
+    /**
+     * Process the results of {@link TermuxTask} or {@link ExecutionCommand}.
+     *
+     * Only one of {@code termuxTask} and {@code executionCommand} must be set.
+     *
+     * If the {@code termuxTask} and its {@link #mTermuxTaskClient} are not {@code null},
+     * then the {@link TermuxTaskClient#onTermuxTaskExited(TermuxTask)} callback will be called.
+     *
+     * @param termuxTask The {@link TermuxTask}, which should be set if
+     *                  {@link #execute(Context, ExecutionCommand, TermuxTaskClient, boolean)}
+     *                   successfully started the process.
+     * @param executionCommand The {@link ExecutionCommand}, which should be set if
+     *                          {@link #execute(Context, ExecutionCommand, TermuxTaskClient, boolean)}
+     *                          failed to start the process.
+     */
+    private static void processTermuxTaskResult(final TermuxTask termuxTask, ExecutionCommand executionCommand) {
+        if (termuxTask != null)
+            executionCommand = termuxTask.mExecutionCommand;
+
+        if (executionCommand == null) return;
+
+        if (executionCommand.shouldNotProcessResults()) {
+            Logger.logDebug(LOG_TAG, "Ignoring duplicate call to process \"" + executionCommand.getCommandIdAndLabelLogString() + "\" TermuxTask result");
+            return;
+        }
+
+        Logger.logDebug(LOG_TAG, "Processing \"" + executionCommand.getCommandIdAndLabelLogString() + "\" TermuxTask result");
+
+        if (termuxTask != null && termuxTask.mTermuxTaskClient != null) {
+            termuxTask.mTermuxTaskClient.onTermuxTaskExited(termuxTask);
+        } else {
+            // If a callback is not set and execution command didn't fail, then we set success state now
+            // Otherwise, the callback host can set it himself when its done with the termuxTask
+            if (!executionCommand.isStateFailed())
+                executionCommand.setState(ExecutionCommand.ExecutionState.SUCCESS);
+        }
+    }
+
+    public Process getProcess() {
+        return mProcess;
+    }
+
+    public ExecutionCommand getExecutionCommand() {
+        return mExecutionCommand;
+    }
+
+
+
+    public interface TermuxTaskClient {
+
+        /**
+         * Callback function for when {@link TermuxTask} exits.
+         *
+         * @param termuxTask The {@link TermuxTask} that exited.
+         */
+        void onTermuxTaskExited(TermuxTask termuxTask);
+
+    }
+
+}
diff --git a/termux-shared/src/main/res/values/strings.xml b/termux-shared/src/main/res/values/strings.xml
index 16746d2d7b..a4b77fc58b 100644
--- a/termux-shared/src/main/res/values/strings.xml
+++ b/termux-shared/src/main/res/values/strings.xml
@@ -76,6 +76,15 @@
     <string name="msg_report_issue">If you want to report this issue, then copy its text from the options menu (3-dots on top right) and post an issue on one of the following links. If you are posting on Github, then post it in the repository at which the report belongs at. You may optionally remove any device specific info that you consider private or don\'t want to share or that is not relevant to the issue.</string>
 
 
+
+    <!-- ShellUtils -->
+    <string name="error_sending_sigkill_to_process">Sending SIGKILL to process on user request or because android is killing the execution service</string>
+    <string name="error_execution_cancelled">Execution has been cancelled since execution service is being killed</string>
+    <string name="error_failed_to_execute_termux_session_command">"Failed to execute \"%1$s\" termux session command"</string>
+    <string name="error_failed_to_execute_termux_task_command">"Failed to execute \"%1$s\" termux task command"</string>
+
+
+
     <!-- Log Level -->
     <string name="log_level_title">Log Level</string>
     <string name="log_level_off">"Off"</string>

From 24a5493ea5ee090ec6bf5787f7bb4561729f7734 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Mon, 12 Apr 2021 14:32:02 +0500
Subject: [PATCH 330/912] Replace "if(" with "if ("

---
 app/build.gradle                              |  2 +-
 .../java/com/termux/app/TermuxService.java    | 46 +++++++++----------
 .../terminal/io/extrakeys/ExtraKeysInfo.java  |  8 ++--
 .../com/termux/app/utils/PluginUtils.java     | 28 +++++------
 .../file/filesystem/FileAttributes.java       |  6 +--
 .../shared/file/tests/FileUtilsTests.java     | 38 +++++++--------
 .../java/com/termux/shared/logger/Logger.java | 20 ++++----
 .../shared/models/ExecutionCommand.java       |  4 +-
 .../preferences/SharedPreferenceUtils.java    | 44 +++++++++---------
 .../TermuxTaskerAppSharedPreferences.java     |  2 +-
 .../com/termux/shared/termux/TermuxUtils.java | 14 +++---
 11 files changed, 107 insertions(+), 105 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 47a4d6ec09..fc866cd572 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -153,7 +153,7 @@ clean {
     }
 }
 
-task downloadBootstraps(){
+task downloadBootstraps() {
     doLast {
         def version = "2021.02.19-r1"
         downloadBootstrap("aarch64", "1e3d80bd8cc8771715845ab4a1e67fc125d84c4deda3a1a435116fe4d1f86160", version)
diff --git a/app/src/main/java/com/termux/app/TermuxService.java b/app/src/main/java/com/termux/app/TermuxService.java
index e158c39df5..7f03938cc3 100644
--- a/app/src/main/java/com/termux/app/TermuxService.java
+++ b/app/src/main/java/com/termux/app/TermuxService.java
@@ -178,7 +178,7 @@ public boolean onUnbind(Intent intent) {
         // Since we cannot rely on {@link TermuxActivity.onDestroy()} to always complete,
         // we unset clients here as well if it failed, so that we do not leave service and session
         // clients with references to the activity.
-        if(mTermuxSessionClient != null)
+        if (mTermuxSessionClient != null)
             unsetTermuxSessionClient();
         return false;
     }
@@ -258,14 +258,14 @@ private synchronized void killAllTermuxExecutionCommands() {
         List<TermuxTask> termuxTasks = new ArrayList<>(mTermuxTasks);
         for (int i = 0; i < termuxTasks.size(); i++) {
             ExecutionCommand executionCommand = termuxTasks.get(i).getExecutionCommand();
-            if(executionCommand.isPluginExecutionCommand && executionCommand.pluginPendingIntent != null)
+            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.pluginPendingIntent != null) {
+            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);
                 }
@@ -316,7 +316,7 @@ private void actionAcquireWakeLock() {
 
     /** Process action to release Power and Wi-Fi WakeLocks. */
     private void actionReleaseWakeLock(boolean updateNotification) {
-        if (mWakeLock == null && mWifiLock == null){
+        if (mWakeLock == null && mWifiLock == null) {
             Logger.logDebug(LOG_TAG, "Ignoring releasing WakeLocks since none are already held");
             return;
         }
@@ -333,7 +333,7 @@ private void actionReleaseWakeLock(boolean updateNotification) {
             mWifiLock = null;
         }
 
-        if(updateNotification)
+        if (updateNotification)
             updateNotification();
 
         Logger.logDebug(LOG_TAG, "WakeLocks released successfully");
@@ -342,7 +342,7 @@ private void actionReleaseWakeLock(boolean updateNotification) {
     /** Process {@link TERMUX_SERVICE#ACTION_SERVICE_EXECUTE} intent to execute a shell command in
      * a foreground TermuxSession or in a background TermuxTask. */
     private void actionServiceExecute(Intent intent) {
-        if (intent == null){
+        if (intent == null) {
             Logger.logError(LOG_TAG, "Ignoring null intent to actionServiceExecute");
             return;
         }
@@ -351,7 +351,7 @@ private void actionServiceExecute(Intent intent) {
 
         executionCommand.executableUri = intent.getData();
 
-        if(executionCommand.executableUri != null) {
+        if (executionCommand.executableUri != null) {
             executionCommand.executable = executionCommand.executableUri.getPath();
             executionCommand.arguments = intent.getStringArrayExtra(TERMUX_SERVICE.EXTRA_ARGUMENTS);
         }
@@ -408,7 +408,7 @@ public synchronized TermuxTask createTermuxTask(ExecutionCommand executionComman
             return null;
         }
 
-        if(Logger.getLogLevel() >= Logger.LOG_LEVEL_VERBOSE)
+        if (Logger.getLogLevel() >= Logger.LOG_LEVEL_VERBOSE)
             Logger.logVerbose(LOG_TAG, executionCommand.toString());
 
         TermuxTask newTermuxTask = TermuxTask.execute(this, executionCommand, this, false);
@@ -421,7 +421,7 @@ public synchronized TermuxTask createTermuxTask(ExecutionCommand executionComman
 
         // Remove the execution command from the pending plugin execution commands list since it has
         // now been processed
-        if(executionCommand.isPluginExecutionCommand)
+        if (executionCommand.isPluginExecutionCommand)
             mPendingPluginExecutionCommands.remove(executionCommand);
 
         updateNotification();
@@ -433,13 +433,13 @@ public synchronized TermuxTask createTermuxTask(ExecutionCommand executionComman
     @Override
     public void onTermuxTaskExited(final TermuxTask termuxTask) {
         mHandler.post(() -> {
-            if(termuxTask != null) {
+            if (termuxTask != null) {
                 ExecutionCommand executionCommand = termuxTask.getExecutionCommand();
 
                 Logger.logVerbose(LOG_TAG, "The onTermuxTaskExited() callback called for \"" + executionCommand.getCommandIdAndLabelLogString() + "\" TermuxTask command");
 
                 // If the execution command was started for a plugin, then process the results
-                if(executionCommand != null && executionCommand.isPluginExecutionCommand)
+                if (executionCommand != null && executionCommand.isPluginExecutionCommand)
                     PluginUtils.processPluginExecutionCommandResult(this, LOG_TAG, executionCommand);
 
                 mTermuxTasks.remove(termuxTask);
@@ -495,7 +495,7 @@ public synchronized TermuxSession createTermuxSession(ExecutionCommand execution
             return null;
         }
 
-        if(Logger.getLogLevel() >= Logger.LOG_LEVEL_VERBOSE)
+        if (Logger.getLogLevel() >= Logger.LOG_LEVEL_VERBOSE)
             Logger.logVerbose(LOG_TAG, executionCommand.toString());
 
         // If the execution command was started for a plugin, only then will the stdout be set
@@ -511,12 +511,12 @@ public synchronized TermuxSession createTermuxSession(ExecutionCommand execution
 
         // Remove the execution command from the pending plugin execution commands list since it has
         // now been processed
-        if(executionCommand.isPluginExecutionCommand)
+        if (executionCommand.isPluginExecutionCommand)
             mPendingPluginExecutionCommands.remove(executionCommand);
 
         // Notify {@link TermuxSessionsListViewController} that sessions list has been updated if
         // activity in is foreground
-        if(mTermuxSessionClient != null)
+        if (mTermuxSessionClient != null)
             mTermuxSessionClient.termuxSessionListNotifyUpdated();
 
         updateNotification();
@@ -529,7 +529,7 @@ public synchronized TermuxSession createTermuxSession(ExecutionCommand execution
     public synchronized int removeTermuxSession(TerminalSession sessionToRemove) {
         int index = getIndexOfSession(sessionToRemove);
 
-        if(index >= 0)
+        if (index >= 0)
             mTermuxSessions.get(index).finish();
 
         return index;
@@ -538,20 +538,20 @@ public synchronized int removeTermuxSession(TerminalSession sessionToRemove) {
     /** Callback received when a {@link TermuxSession} finishes. */
     @Override
     public void onTermuxSessionExited(final TermuxSession termuxSession) {
-        if(termuxSession != null) {
+        if (termuxSession != null) {
             ExecutionCommand executionCommand = termuxSession.getExecutionCommand();
 
             Logger.logVerbose(LOG_TAG, "The onTermuxSessionExited() callback called for \"" + executionCommand.getCommandIdAndLabelLogString() + "\" TermuxSession command");
 
             // If the execution command was started for a plugin, then process the results
-            if(executionCommand != null && executionCommand.isPluginExecutionCommand)
+            if (executionCommand != null && executionCommand.isPluginExecutionCommand)
                 PluginUtils.processPluginExecutionCommandResult(this, LOG_TAG, executionCommand);
 
             mTermuxSessions.remove(termuxSession);
 
             // Notify {@link TermuxSessionsListViewController} that sessions list has been updated if
             // activity in is foreground
-            if(mTermuxSessionClient != null)
+            if (mTermuxSessionClient != null)
                 mTermuxSessionClient.termuxSessionListNotifyUpdated();
         }
 
@@ -575,22 +575,22 @@ private void handleSessionAction(int sessionAction, TerminalSession newTerminalS
         switch (sessionAction) {
             case TERMUX_SERVICE.VALUE_EXTRA_SESSION_ACTION_SWITCH_TO_NEW_SESSION_AND_OPEN_ACTIVITY:
                 setCurrentStoredTerminalSession(newTerminalSession);
-                if(mTermuxSessionClient != null)
+                if (mTermuxSessionClient != null)
                     mTermuxSessionClient.setCurrentSession(newTerminalSession);
                 startTermuxActivity();
                 break;
             case TERMUX_SERVICE.VALUE_EXTRA_SESSION_ACTION_KEEP_CURRENT_SESSION_AND_OPEN_ACTIVITY:
-                if(getTermuxSessionsSize() == 1)
+                if (getTermuxSessionsSize() == 1)
                     setCurrentStoredTerminalSession(newTerminalSession);
                 startTermuxActivity();
                 break;
             case TERMUX_SERVICE.VALUE_EXTRA_SESSION_ACTION_SWITCH_TO_NEW_SESSION_AND_DONT_OPEN_ACTIVITY:
                 setCurrentStoredTerminalSession(newTerminalSession);
-                if(mTermuxSessionClient != null)
+                if (mTermuxSessionClient != null)
                     mTermuxSessionClient.setCurrentSession(newTerminalSession);
                 break;
             case TERMUX_SERVICE.VALUE_EXTRA_SESSION_ACTION_KEEP_CURRENT_SESSION_AND_DONT_OPEN_ACTIVITY:
-                if(getTermuxSessionsSize() == 1)
+                if (getTermuxSessionsSize() == 1)
                     setCurrentStoredTerminalSession(newTerminalSession);
                 break;
             default:
@@ -605,7 +605,7 @@ private void startTermuxActivity() {
         // 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)) {
+        if (PermissionUtils.validateDisplayOverOtherAppsPermissionForPostAndroid10(this)) {
             TermuxActivity.startTermuxActivity(this);
         }
     }
diff --git a/app/src/main/java/com/termux/app/terminal/io/extrakeys/ExtraKeysInfo.java b/app/src/main/java/com/termux/app/terminal/io/extrakeys/ExtraKeysInfo.java
index d71f392684..26fec3d6a3 100644
--- a/app/src/main/java/com/termux/app/terminal/io/extrakeys/ExtraKeysInfo.java
+++ b/app/src/main/java/com/termux/app/terminal/io/extrakeys/ExtraKeysInfo.java
@@ -43,7 +43,7 @@ public ExtraKeysInfo(String propertiesInfo, String style) throws JSONException {
 
                 ExtraKeyButton button;
 
-                if(! jobject.has("popup")) {
+                if (! jobject.has("popup")) {
                     // no popup
                     button = new ExtraKeyButton(getSelectedCharMap(), jobject);
                 } else {
@@ -63,10 +63,10 @@ public ExtraKeysInfo(String propertiesInfo, String style) throws JSONException {
      */
     private static JSONObject normalizeKeyConfig(Object key) throws JSONException {
         JSONObject jobject;
-        if(key instanceof String) {
+        if (key instanceof String) {
             jobject = new JSONObject();
             jobject.put("key", key);
-        } else if(key instanceof JSONObject) {
+        } 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");
@@ -84,7 +84,7 @@ public ExtraKeyButton[][] getMatrix() {
      */
     static class CleverMap<K,V> extends HashMap<K,V> {
         V get(K key, V defaultValue) {
-            if(containsKey(key))
+            if (containsKey(key))
                 return get(key);
             else
                 return defaultValue;
diff --git a/app/src/main/java/com/termux/app/utils/PluginUtils.java b/app/src/main/java/com/termux/app/utils/PluginUtils.java
index 552c3b9992..98d469194a 100644
--- a/app/src/main/java/com/termux/app/utils/PluginUtils.java
+++ b/app/src/main/java/com/termux/app/utils/PluginUtils.java
@@ -55,7 +55,7 @@ public static void processPluginExecutionCommandResult(final Context context, St
 
         logTag = DataUtils.getDefaultIfNull(logTag, LOG_TAG);
 
-        if(!executionCommand.hasExecuted()) {
+        if (!executionCommand.hasExecuted()) {
             Logger.logWarn(logTag, "Ignoring call to processPluginExecutionCommandResult() since the execution command state is not higher than the ExecutionState.EXECUTED");
             return;
         }
@@ -66,7 +66,7 @@ public static void processPluginExecutionCommandResult(final Context context, St
 
         // If isPluginExecutionCommand is true and pluginPendingIntent is not null, then
         // send pluginPendingIntent to its creator with the result
-        if(executionCommand.isPluginExecutionCommand && executionCommand.pluginPendingIntent != null) {
+        if (executionCommand.isPluginExecutionCommand && executionCommand.pluginPendingIntent != null) {
             String errmsg = executionCommand.errmsg;
 
             //Combine errmsg and stacktraces
@@ -78,7 +78,7 @@ public static void processPluginExecutionCommandResult(final Context context, St
             result = sendPluginExecutionCommandResultPendingIntent(context, logTag, executionCommand.getCommandIdAndLabelLogString(), executionCommand.stdout, executionCommand.stderr, executionCommand.exitCode, executionCommand.errCode, errmsg, executionCommand.pluginPendingIntent);
         }
 
-        if(!executionCommand.isStateFailed() && result)
+        if (!executionCommand.isStateFailed() && result)
             executionCommand.setState(ExecutionCommand.ExecutionState.SUCCESS);
     }
 
@@ -109,11 +109,11 @@ public static void processPluginExecutionCommandResult(final Context context, St
      *                          is {@code false}.
      */
     public static void processPluginExecutionCommandError(final Context context, String logTag, final ExecutionCommand executionCommand, boolean forceNotification) {
-        if(context == null || executionCommand == null) return;
+        if (context == null || executionCommand == null) return;
 
         logTag = DataUtils.getDefaultIfNull(logTag, LOG_TAG);
 
-        if(!executionCommand.isStateFailed()) {
+        if (!executionCommand.isStateFailed()) {
             Logger.logWarn(logTag, "Ignoring call to processPluginExecutionCommandError() since the execution command is not in ExecutionState.FAILED");
             return;
         }
@@ -124,7 +124,7 @@ public static void processPluginExecutionCommandError(final Context context, Str
 
         // If isPluginExecutionCommand is true and pluginPendingIntent is not null, then
         // send pluginPendingIntent to its creator with the errors
-        if(executionCommand.isPluginExecutionCommand && executionCommand.pluginPendingIntent != null) {
+        if (executionCommand.isPluginExecutionCommand && executionCommand.pluginPendingIntent != null) {
             String errmsg = executionCommand.errmsg;
 
             //Combine errmsg and stacktraces
@@ -169,12 +169,12 @@ public static void processPluginExecutionCommandError(final Context context, Str
 
         // Build the notification
         Notification.Builder builder = getPluginCommandErrorsNotificationBuilder(context, title, notificationText, notificationText, pendingIntent, NotificationUtils.NOTIFICATION_MODE_VIBRATE);
-        if(builder == null)  return;
+        if (builder == null)  return;
 
         // Send the notification
         int nextNotificationId = NotificationUtils.getNextNotificationId(context);
         NotificationManager notificationManager = NotificationUtils.getNotificationManager(context);
-        if(notificationManager != null)
+        if (notificationManager != null)
             notificationManager.notify(nextNotificationId, builder.build());
 
     }
@@ -196,7 +196,7 @@ public static void processPluginExecutionCommandError(final Context context, Str
      * @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;
+        if (context == null || pluginPendingIntent == null) return false;
 
         logTag = DataUtils.getDefaultIfNull(logTag, LOG_TAG);
 
@@ -209,7 +209,7 @@ public static boolean sendPluginExecutionCommandResultPendingIntent(Context cont
         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()) {
+        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);
@@ -218,12 +218,12 @@ public static boolean sendPluginExecutionCommandResultPendingIntent(Context cont
             truncatedStderr = DataUtils.getTruncatedCommandOutput(stderr, DataUtils.TRANSACTION_SIZE_LIMIT_IN_BYTES / 2, false, false, false);
         }
 
-        if(truncatedStdout != null && truncatedStdout.length() < stdout.length()){
+        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()){
+        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;
         }
@@ -233,7 +233,7 @@ public static boolean sendPluginExecutionCommandResultPendingIntent(Context cont
         // 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()){
+        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;
         }
@@ -282,7 +282,7 @@ public static Notification.Builder getPluginCommandErrorsNotificationBuilder(fin
             TermuxConstants.TERMUX_PLUGIN_COMMAND_ERRORS_NOTIFICATION_CHANNEL_ID, Notification.PRIORITY_HIGH,
             title, notificationText, notificationBigText, pendingIntent, notificationMode);
 
-        if(builder == null)  return null;
+        if (builder == null)  return null;
 
         // Enable timestamp
         builder.setShowWhen(true);
diff --git a/termux-shared/src/main/java/com/termux/shared/file/filesystem/FileAttributes.java b/termux-shared/src/main/java/com/termux/shared/file/filesystem/FileAttributes.java
index a9986c1a8e..5e847a1e9e 100644
--- a/termux-shared/src/main/java/com/termux/shared/file/filesystem/FileAttributes.java
+++ b/termux-shared/src/main/java/com/termux/shared/file/filesystem/FileAttributes.java
@@ -104,9 +104,9 @@ public static FileAttributes get(FileDescriptor fileDescriptor) throws IOExcepti
     }
 
     public String file() {
-        if(filePath != null)
+        if (filePath != null)
             return filePath;
-        else if(fileDescriptor != null)
+        else if (fileDescriptor != null)
             return fileDescriptor.toString();
         else
             return null;
@@ -397,7 +397,7 @@ public static String getFileAttributesLogString(final FileAttributes fileAttribu
         logString.append("\n").append(fileAttributes.getInodeString());
         logString.append("\n").append(fileAttributes.getLinksString());
 
-        if(fileAttributes.isBlock() || fileAttributes.isCharacter())
+        if (fileAttributes.isBlock() || fileAttributes.isCharacter())
             logString.append("\n").append(fileAttributes.getDeviceTypeString());
 
         logString.append("\n").append(fileAttributes.getOwnerString());
diff --git a/termux-shared/src/main/java/com/termux/shared/file/tests/FileUtilsTests.java b/termux-shared/src/main/java/com/termux/shared/file/tests/FileUtilsTests.java
index 52f876f5da..47f4e86b3c 100644
--- a/termux-shared/src/main/java/com/termux/shared/file/tests/FileUtilsTests.java
+++ b/termux-shared/src/main/java/com/termux/shared/file/tests/FileUtilsTests.java
@@ -104,7 +104,7 @@ private static void runTestsInner(@NonNull final Context context, @NonNull final
         errmsg = FileUtils.clearDirectory(context, label, testRootDirectoryPath);
         assertEqual("Failed to create " + label + " directory file", null, errmsg);
 
-        if(!FileUtils.directoryFileExists(testRootDirectoryPath, false))
+        if (!FileUtils.directoryFileExists(testRootDirectoryPath, false))
             throwException("The " + label + " directory file does not exist as expected after creation");
 
 
@@ -124,30 +124,30 @@ private static void runTestsInner(@NonNull final Context context, @NonNull final
         label = dir1__sub_dir1_label; path = dir1__sub_dir1_path;
         errmsg = FileUtils.createDirectoryFile(context, label, path);
         assertEqual("Failed to create " + label + " directory file", null, errmsg);
-        if(!FileUtils.directoryFileExists(path, false))
+        if (!FileUtils.directoryFileExists(path, false))
             throwException("The " + label + " directory file does not exist as expected after creation");
 
         // Create dir1/sub_reg1 regular file
         label = dir1__sub_reg1_label; path = dir1__sub_reg1_path;
         errmsg = FileUtils.createRegularFile(context, label, path);
         assertEqual("Failed to create " + label + " regular file", null, errmsg);
-        if(!FileUtils.regularFileExists(path, false))
+        if (!FileUtils.regularFileExists(path, false))
             throwException("The " + label + " regular file does not exist as expected after creation");
 
         // Create dir1/sub_sym1 -> dir2 absolute symlink file
         label = dir1__sub_sym1_label; path = dir1__sub_sym1_path;
         errmsg = FileUtils.createSymlinkFile(context, label, dir2_path, path);
         assertEqual("Failed to create " + label + " symlink file", null, errmsg);
-        if(!FileUtils.symlinkFileExists(path))
+        if (!FileUtils.symlinkFileExists(path))
             throwException("The " + label + " symlink file does not exist as expected after creation");
 
         // Copy dir1/sub_sym1 symlink file to dir1/sub_sym2
         label = dir1__sub_sym2_label; path = dir1__sub_sym2_path;
         errmsg = FileUtils.copySymlinkFile(context, label, dir1__sub_sym1_path, path, false);
         assertEqual("Failed to copy " + dir1__sub_sym1_label + " symlink file to " + label, null, errmsg);
-        if(!FileUtils.symlinkFileExists(path))
+        if (!FileUtils.symlinkFileExists(path))
             throwException("The " + label + " symlink file does not exist as expected after copying it from " + dir1__sub_sym1_label);
-        if(!new File(path).getCanonicalPath().equals(dir2_path))
+        if (!new File(path).getCanonicalPath().equals(dir2_path))
             throwException("The " + label + " symlink file does not point to " + dir2_label);
 
 
@@ -158,7 +158,7 @@ private static void runTestsInner(@NonNull final Context context, @NonNull final
         label = dir2__sub_reg1_label; path = dir2__sub_reg1_path;
         errmsg = FileUtils.writeStringToFile(context, label, path, Charset.defaultCharset(), "line1", false);
         assertEqual("Failed to write string to " + label + " file with append mode false", null, errmsg);
-        if(!FileUtils.regularFileExists(path, false))
+        if (!FileUtils.regularFileExists(path, false))
             throwException("The " + label + " file does not exist as expected after writing to it with append mode false");
 
         // Write "line2" to dir2/sub_reg1 regular file
@@ -175,7 +175,7 @@ private static void runTestsInner(@NonNull final Context context, @NonNull final
         label = dir2__sub_reg2_label; path = dir2__sub_reg2_path;
         errmsg = FileUtils.copyRegularFile(context, label, dir2__sub_reg1_path, path, false);
         assertEqual("Failed to copy " + dir2__sub_reg1_label + " regular file to " + label, null, errmsg);
-        if(!FileUtils.regularFileExists(path, false))
+        if (!FileUtils.regularFileExists(path, false))
             throwException("The " + label + " regular file does not exist as expected after copying it from " + dir2__sub_reg1_label);
 
 
@@ -186,21 +186,21 @@ private static void runTestsInner(@NonNull final Context context, @NonNull final
         label = dir3_label; path = dir3_path;
         errmsg = FileUtils.copyDirectoryFile(context, label, dir2_path, path, false);
         assertEqual("Failed to copy " + dir2_label + " directory file to " + label, null, errmsg);
-        if(!FileUtils.directoryFileExists(path, false))
+        if (!FileUtils.directoryFileExists(path, false))
             throwException("The " + label + " directory file does not exist as expected after copying it from " + dir2_label);
 
         // Copy dir1 directory file to dir3 again to test overwrite
         label = dir3_label; path = dir3_path;
         errmsg = FileUtils.copyDirectoryFile(context, label, dir2_path, path, false);
         assertEqual("Failed to copy " + dir2_label + " directory file to " + label, null, errmsg);
-        if(!FileUtils.directoryFileExists(path, false))
+        if (!FileUtils.directoryFileExists(path, false))
             throwException("The " + label + " directory file does not exist as expected after copying it from " + dir2_label);
 
         // Move dir3 directory file to dir4
         label = dir4_label; path = dir4_path;
         errmsg = FileUtils.moveDirectoryFile(context, label, dir3_path, path, false);
         assertEqual("Failed to move " + dir3_label + " directory file to " + label, null, errmsg);
-        if(!FileUtils.directoryFileExists(path, false))
+        if (!FileUtils.directoryFileExists(path, false))
             throwException("The " + label + " directory file does not exist as expected after copying it from " + dir3_label);
 
 
@@ -211,7 +211,7 @@ private static void runTestsInner(@NonNull final Context context, @NonNull final
         label = dir1__sub_sym3_label; path = dir1__sub_sym3_path;
         errmsg = FileUtils.createSymlinkFile(context, label, "../dir4", path);
         assertEqual("Failed to create " + label + " symlink file", null, errmsg);
-        if(!FileUtils.symlinkFileExists(path))
+        if (!FileUtils.symlinkFileExists(path))
             throwException("The " + label + " symlink file does not exist as expected after creation");
 
         // Create dir1/sub_sym3 -> dirX relative dangling symlink file
@@ -219,7 +219,7 @@ private static void runTestsInner(@NonNull final Context context, @NonNull final
         label = dir1__sub_sym3_label; path = dir1__sub_sym3_path;
         errmsg = FileUtils.createSymlinkFile(context, label, "../dirX", path);
         assertEqual("Failed to create " + label + " symlink file", null, errmsg);
-        if(!FileUtils.symlinkFileExists(path))
+        if (!FileUtils.symlinkFileExists(path))
             throwException("The " + label + " dangling symlink file does not exist as expected after creation");
 
 
@@ -230,13 +230,13 @@ private static void runTestsInner(@NonNull final Context context, @NonNull final
         label = dir1__sub_sym2_label; path = dir1__sub_sym2_path;
         errmsg = FileUtils.deleteSymlinkFile(context, label, path, false);
         assertEqual("Failed to delete " + label + " symlink file", null, errmsg);
-        if(FileUtils.fileExists(path, false))
+        if (FileUtils.fileExists(path, false))
             throwException("The " + label + " symlink file still exist after deletion");
 
         // Check if dir2 directory file still exists after deletion of dir1/sub_sym2 since it was a symlink to dir2
         // When deleting a symlink file, its target must not be deleted
         label = dir2_label; path = dir2_path;
-        if(!FileUtils.directoryFileExists(path, false))
+        if (!FileUtils.directoryFileExists(path, false))
             throwException("The " + label + " directory file has unexpectedly been deleted after deletion of " + dir1__sub_sym2_label);
 
 
@@ -247,7 +247,7 @@ private static void runTestsInner(@NonNull final Context context, @NonNull final
         label = dir1_label; path = dir1_path;
         errmsg = FileUtils.deleteDirectoryFile(context, label, path, false);
         assertEqual("Failed to delete " + label + " directory file", null, errmsg);
-        if(FileUtils.fileExists(path, false))
+        if (FileUtils.fileExists(path, false))
             throwException("The " + label + " directory file still exist after deletion");
 
 
@@ -255,10 +255,10 @@ private static void runTestsInner(@NonNull final Context context, @NonNull final
         // dir1 since there was a dir1/sub_sym1 symlink to dir2 in it
         // When deleting a directory, any targets of symlinks must not be deleted when deleting symlink files
         label = dir2_label; path = dir2_path;
-        if(!FileUtils.directoryFileExists(path, false))
+        if (!FileUtils.directoryFileExists(path, false))
             throwException("The " + label + " directory file has unexpectedly been deleted after deletion of " + dir1_label);
         label = dir2__sub_reg1_label; path = dir2__sub_reg1_path;
-        if(!FileUtils.fileExists(path, false))
+        if (!FileUtils.fileExists(path, false))
             throwException("The " + label + " regular file has unexpectedly been deleted after deletion of " + dir1_label);
 
 
@@ -269,7 +269,7 @@ private static void runTestsInner(@NonNull final Context context, @NonNull final
         label = dir2__sub_reg1_label; path = dir2__sub_reg1_path;
         errmsg = FileUtils.deleteRegularFile(context, label, path, false);
         assertEqual("Failed to delete " + label + " regular file", null, errmsg);
-        if(FileUtils.fileExists(path, false))
+        if (FileUtils.fileExists(path, false))
             throwException("The " + label + " regular file still exist after deletion");
 
         FileUtils.getFileType("/dev/ptmx", false);
diff --git a/termux-shared/src/main/java/com/termux/shared/logger/Logger.java b/termux-shared/src/main/java/com/termux/shared/logger/Logger.java
index b8fc151a7b..2610b80748 100644
--- a/termux-shared/src/main/java/com/termux/shared/logger/Logger.java
+++ b/termux-shared/src/main/java/com/termux/shared/logger/Logger.java
@@ -32,15 +32,15 @@ public class Logger {
 
 
     public static void logMessage(int logLevel, String tag, String message) {
-        if(logLevel == Log.ERROR && CURRENT_LOG_LEVEL >= LOG_LEVEL_NORMAL)
+        if (logLevel == Log.ERROR && CURRENT_LOG_LEVEL >= LOG_LEVEL_NORMAL)
             Log.e(getFullTag(tag), message);
-        else if(logLevel == Log.WARN && CURRENT_LOG_LEVEL >= LOG_LEVEL_NORMAL)
+        else if (logLevel == Log.WARN && CURRENT_LOG_LEVEL >= LOG_LEVEL_NORMAL)
             Log.w(getFullTag(tag), message);
-        else if(logLevel == Log.INFO && CURRENT_LOG_LEVEL >= LOG_LEVEL_NORMAL)
+        else if (logLevel == Log.INFO && CURRENT_LOG_LEVEL >= LOG_LEVEL_NORMAL)
             Log.i(getFullTag(tag), message);
-        else if(logLevel == Log.DEBUG && CURRENT_LOG_LEVEL >= LOG_LEVEL_DEBUG)
+        else if (logLevel == Log.DEBUG && CURRENT_LOG_LEVEL >= LOG_LEVEL_DEBUG)
             Log.d(getFullTag(tag), message);
-        else if(logLevel == Log.VERBOSE && CURRENT_LOG_LEVEL >= LOG_LEVEL_VERBOSE)
+        else if (logLevel == Log.VERBOSE && CURRENT_LOG_LEVEL >= LOG_LEVEL_VERBOSE)
             Log.v(getFullTag(tag), message);
     }
 
@@ -99,7 +99,7 @@ public static void logVerbose(String message) {
     public static void logErrorAndShowToast(Context context, String tag, String message) {
         if (context == null) return;
 
-        if(CURRENT_LOG_LEVEL >= LOG_LEVEL_NORMAL) {
+        if (CURRENT_LOG_LEVEL >= LOG_LEVEL_NORMAL) {
             logError(tag, message);
             showToast(context, message, true);
         }
@@ -114,7 +114,7 @@ public static void logErrorAndShowToast(Context context, String message) {
     public static void logDebugAndShowToast(Context context, String tag, String message) {
         if (context == null) return;
 
-        if(CURRENT_LOG_LEVEL >= LOG_LEVEL_DEBUG) {
+        if (CURRENT_LOG_LEVEL >= LOG_LEVEL_DEBUG) {
             logDebug(tag, message);
             showToast(context, message, true);
         }
@@ -127,7 +127,7 @@ public static void logDebugAndShowToast(Context context, String message) {
 
 
     public static void logStackTraceWithMessage(String tag, String message, Throwable throwable) {
-        if(CURRENT_LOG_LEVEL >= LOG_LEVEL_NORMAL)
+        if (CURRENT_LOG_LEVEL >= LOG_LEVEL_NORMAL)
             Log.e(getFullTag(tag), getMessageAndStackTraceString(message, throwable));
     }
 
@@ -144,12 +144,12 @@ public static void logStackTrace(Throwable throwable) {
     }
 
     public static void logStackTracesWithMessage(String tag, String message, List<Throwable> throwableList) {
-        if(CURRENT_LOG_LEVEL >= LOG_LEVEL_NORMAL)
+        if (CURRENT_LOG_LEVEL >= LOG_LEVEL_NORMAL)
             Log.e(getFullTag(tag), getMessageAndStackTracesString(message, throwableList));
     }
 
     public static String getMessageAndStackTraceString(String message, Throwable throwable) {
-        if(message == null && throwable == null)
+        if (message == null && throwable == null)
             return null;
         else if(message != null && throwable != null)
             return message + ":\n" + getStackTraceString(throwable);
diff --git a/termux-shared/src/main/java/com/termux/shared/models/ExecutionCommand.java b/termux-shared/src/main/java/com/termux/shared/models/ExecutionCommand.java
index 7069e53193..5aaf585b74 100644
--- a/termux-shared/src/main/java/com/termux/shared/models/ExecutionCommand.java
+++ b/termux-shared/src/main/java/com/termux/shared/models/ExecutionCommand.java
@@ -131,10 +131,10 @@ public int getValue() {
 
 
 
-    public ExecutionCommand(){
+    public ExecutionCommand() {
     }
 
-    public ExecutionCommand(Integer id){
+    public ExecutionCommand(Integer id) {
         this.id = id;
     }
 
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/preferences/SharedPreferenceUtils.java b/termux-shared/src/main/java/com/termux/shared/settings/preferences/SharedPreferenceUtils.java
index 21ccd1bfa3..ca16624b41 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/preferences/SharedPreferenceUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/preferences/SharedPreferenceUtils.java
@@ -52,7 +52,7 @@ public static SharedPreferences getPrivateAndMultiProcessSharedPreferences(Conte
      * default if failed to read a valid value, like in case of an exception.
      */
     public static boolean getBoolean(SharedPreferences sharedPreferences, String key, boolean def) {
-        if(sharedPreferences == null) {
+        if (sharedPreferences == null) {
             Logger.logError(LOG_TAG, "Error getting boolean value for the \"" + key + "\" key from null shared preferences. Returning default value \"" + def + "\".");
             return def;
         }
@@ -78,12 +78,12 @@ public static boolean getBoolean(SharedPreferences sharedPreferences, String key
      */
     @SuppressLint("ApplySharedPref")
     public static void setBoolean(SharedPreferences sharedPreferences, String key, boolean value, boolean commitToFile) {
-        if(sharedPreferences == null) {
+        if (sharedPreferences == null) {
             Logger.logError(LOG_TAG, "Ignoring setting boolean value \"" + value + "\" for the \"" + key + "\" key into null shared preferences.");
             return;
         }
 
-        if(commitToFile)
+        if (commitToFile)
             sharedPreferences.edit().putBoolean(key, value).commit();
         else
             sharedPreferences.edit().putBoolean(key, value).apply();
@@ -102,7 +102,7 @@ public static void setBoolean(SharedPreferences sharedPreferences, String key, b
      * default if failed to read a valid value, like in case of an exception.
      */
     public static float getFloat(SharedPreferences sharedPreferences, String key, float def) {
-        if(sharedPreferences == null) {
+        if (sharedPreferences == null) {
             Logger.logError(LOG_TAG, "Error getting float value for the \"" + key + "\" key from null shared preferences. Returning default value \"" + def + "\".");
             return def;
         }
@@ -128,12 +128,12 @@ public static float getFloat(SharedPreferences sharedPreferences, String key, fl
      */
     @SuppressLint("ApplySharedPref")
     public static void setFloat(SharedPreferences sharedPreferences, String key, float value, boolean commitToFile) {
-        if(sharedPreferences == null) {
+        if (sharedPreferences == null) {
             Logger.logError(LOG_TAG, "Ignoring setting float value \"" + value + "\" for the \"" + key + "\" key into null shared preferences.");
             return;
         }
 
-        if(commitToFile)
+        if (commitToFile)
             sharedPreferences.edit().putFloat(key, value).commit();
         else
             sharedPreferences.edit().putFloat(key, value).apply();
@@ -151,7 +151,7 @@ public static void setFloat(SharedPreferences sharedPreferences, String key, flo
      * default if failed to read a valid value, like in case of an exception.
      */
     public static int getInt(SharedPreferences sharedPreferences, String key, int def) {
-        if(sharedPreferences == null) {
+        if (sharedPreferences == null) {
             Logger.logError(LOG_TAG, "Error getting int value for the \"" + key + "\" key from null shared preferences. Returning default value \"" + def + "\".");
             return def;
         }
@@ -177,12 +177,12 @@ public static int getInt(SharedPreferences sharedPreferences, String key, int de
      */
     @SuppressLint("ApplySharedPref")
     public static void setInt(SharedPreferences sharedPreferences, String key, int value, boolean commitToFile) {
-        if(sharedPreferences == null) {
+        if (sharedPreferences == null) {
             Logger.logError(LOG_TAG, "Ignoring setting int value \"" + value + "\" for the \"" + key + "\" key into null shared preferences.");
             return;
         }
 
-        if(commitToFile)
+        if (commitToFile)
             sharedPreferences.edit().putInt(key, value).commit();
         else
             sharedPreferences.edit().putInt(key, value).apply();
@@ -200,7 +200,7 @@ public static void setInt(SharedPreferences sharedPreferences, String key, int v
      * default if failed to read a valid value, like in case of an exception.
      */
     public static long getLong(SharedPreferences sharedPreferences, String key, long def) {
-        if(sharedPreferences == null) {
+        if (sharedPreferences == null) {
             Logger.logError(LOG_TAG, "Error getting long value for the \"" + key + "\" key from null shared preferences. Returning default value \"" + def + "\".");
             return def;
         }
@@ -226,12 +226,12 @@ public static long getLong(SharedPreferences sharedPreferences, String key, long
      */
     @SuppressLint("ApplySharedPref")
     public static void setLong(SharedPreferences sharedPreferences, String key, long value, boolean commitToFile) {
-        if(sharedPreferences == null) {
+        if (sharedPreferences == null) {
             Logger.logError(LOG_TAG, "Ignoring setting long value \"" + value + "\" for the \"" + key + "\" key into null shared preferences.");
             return;
         }
 
-        if(commitToFile)
+        if (commitToFile)
             sharedPreferences.edit().putLong(key, value).commit();
         else
             sharedPreferences.edit().putLong(key, value).apply();
@@ -249,7 +249,7 @@ public static void setLong(SharedPreferences sharedPreferences, String key, long
      * default if failed to read a valid value, like in case of an exception.
      */
     public static String getString(SharedPreferences sharedPreferences, String key, String def) {
-        if(sharedPreferences == null) {
+        if (sharedPreferences == null) {
             Logger.logError(LOG_TAG, "Error getting String value for the \"" + key + "\" key from null shared preferences. Returning default value \"" + def + "\".");
             return def;
         }
@@ -275,12 +275,12 @@ public static String getString(SharedPreferences sharedPreferences, String key,
      */
     @SuppressLint("ApplySharedPref")
     public static void setString(SharedPreferences sharedPreferences, String key, String value, boolean commitToFile) {
-        if(sharedPreferences == null) {
+        if (sharedPreferences == null) {
             Logger.logError(LOG_TAG, "Ignoring setting String value \"" + value + "\" for the \"" + key + "\" key into null shared preferences.");
             return;
         }
 
-        if(commitToFile)
+        if (commitToFile)
             sharedPreferences.edit().putString(key, value).commit();
         else
             sharedPreferences.edit().putString(key, value).apply();
@@ -298,7 +298,7 @@ public static void setString(SharedPreferences sharedPreferences, String key, St
      * default if failed to read a valid value, like in case of an exception.
      */
     public static Set<String> getStringSet(SharedPreferences sharedPreferences, String key, Set<String> def) {
-        if(sharedPreferences == null) {
+        if (sharedPreferences == null) {
             Logger.logError(LOG_TAG, "Error getting Set<String> value for the \"" + key + "\" key from null shared preferences. Returning default value \"" + def + "\".");
             return def;
         }
@@ -324,12 +324,12 @@ public static Set<String> getStringSet(SharedPreferences sharedPreferences, Stri
      */
     @SuppressLint("ApplySharedPref")
     public static void setStringSet(SharedPreferences sharedPreferences, String key, Set<String> value, boolean commitToFile) {
-        if(sharedPreferences == null) {
+        if (sharedPreferences == null) {
             Logger.logError(LOG_TAG, "Ignoring setting Set<String> value \"" + value + "\" for the \"" + key + "\" key into null shared preferences.");
             return;
         }
 
-        if(commitToFile)
+        if (commitToFile)
             sharedPreferences.edit().putStringSet(key, value).commit();
         else
             sharedPreferences.edit().putStringSet(key, value).apply();
@@ -348,7 +348,7 @@ public static void setStringSet(SharedPreferences sharedPreferences, String key,
      * like in case of an exception.
      */
     public static int getIntStoredAsString(SharedPreferences sharedPreferences, String key, int def) {
-        if(sharedPreferences == null) {
+        if (sharedPreferences == null) {
             Logger.logError(LOG_TAG, "Error getting int value for the \"" + key + "\" key from null shared preferences. Returning default value \"" + def + "\".");
             return def;
         }
@@ -358,7 +358,7 @@ public static int getIntStoredAsString(SharedPreferences sharedPreferences, Stri
 
         try {
             stringValue = sharedPreferences.getString(key, Integer.toString(def));
-            if(stringValue != null)
+            if (stringValue != null)
                 intValue =  Integer.parseInt(stringValue);
             else
                 intValue = def;
@@ -381,12 +381,12 @@ public static int getIntStoredAsString(SharedPreferences sharedPreferences, Stri
      */
     @SuppressLint("ApplySharedPref")
     public static void setIntStoredAsString(SharedPreferences sharedPreferences, String key, int value, boolean commitToFile) {
-        if(sharedPreferences == null) {
+        if (sharedPreferences == null) {
             Logger.logError(LOG_TAG, "Ignoring setting int value \"" + value + "\" for the \"" + key + "\" key into null shared preferences.");
             return;
         }
 
-        if(commitToFile)
+        if (commitToFile)
             sharedPreferences.edit().putString(key, Integer.toString(value)).commit();
         else
             sharedPreferences.edit().putString(key, Integer.toString(value)).apply();
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxTaskerAppSharedPreferences.java b/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxTaskerAppSharedPreferences.java
index 52730cdf69..b2f0ba7846 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxTaskerAppSharedPreferences.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxTaskerAppSharedPreferences.java
@@ -38,7 +38,7 @@ private static SharedPreferences getPrivateAndMultiProcessSharedPreferences(Cont
 
 
     public int getLogLevel(boolean readFromFfile) {
-        if(readFromFfile)
+        if (readFromFfile)
             return SharedPreferenceUtils.getInt(mMultiProcessSharedPreferences, TERMUX_TASKER_APP.KEY_LOG_LEVEL, Logger.DEFAULT_LOG_LEVEL);
         else
             return SharedPreferenceUtils.getInt(mSharedPreferences, TERMUX_TASKER_APP.KEY_LOG_LEVEL, Logger.DEFAULT_LOG_LEVEL);
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
index 5218626c4c..aabce776c7 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
@@ -145,7 +145,7 @@ public static String getAppInfoMarkdownString(@NonNull final Context currentPack
 
         String termuxPackageName = null;
         String termuxAppName = null;
-        if(termuxPackageContext != null) {
+        if (termuxPackageContext != null) {
             termuxPackageName = PackageUtils.getPackageNameForPackage(termuxPackageContext);
             termuxAppName = PackageUtils.getAppNameForPackage(termuxPackageContext);
         }
@@ -156,13 +156,13 @@ public static String getAppInfoMarkdownString(@NonNull final Context currentPack
         boolean isTermuxPackage = (termuxPackageName != null && termuxPackageName.equals(currentPackageName));
 
 
-        if(returnTermuxPackageInfoToo && !isTermuxPackage)
+        if (returnTermuxPackageInfoToo && !isTermuxPackage)
             markdownString.append("## ").append(currentAppName).append(" App Info (Current)\n");
         else
             markdownString.append("## ").append(currentAppName).append(" App Info\n");
         markdownString.append(getAppInfoMarkdownStringInner(currentPackageContext));
 
-        if(returnTermuxPackageInfoToo && !isTermuxPackage) {
+        if (returnTermuxPackageInfoToo && !isTermuxPackage) {
             markdownString.append("\n\n## ").append(termuxAppName).append(" App Info\n");
             markdownString.append(getAppInfoMarkdownStringInner(termuxPackageContext));
         }
@@ -284,6 +284,8 @@ public static String getReportIssueMarkdownString(@NonNull final Context context
         return markdownString.toString();
     }
 
+
+
     public static Properties getSystemProperties() {
         Properties systemProperties = new Properties();
 
@@ -311,7 +313,7 @@ public static Properties getSystemProperties() {
                 if (matcher.matches()) {
                     key = matcher.group(1);
                     value = matcher.group(2);
-                    if(key != null && value != null && !key.isEmpty() && !value.isEmpty())
+                    if (key != null && value != null && !key.isEmpty() && !value.isEmpty())
                         systemProperties.put(key, value);
                 }
             }
@@ -340,8 +342,8 @@ private static String getSystemPropertyWithAndroidAPI(@NonNull String property)
     }
 
     private static void appendPropertyToMarkdownIfSet(StringBuilder markdownString, String label, Object value) {
-        if(value == null) return;
-        if(value instanceof String && (((String) value).isEmpty()) || "REL".equals(value)) return;
+        if (value == null) return;
+        if (value instanceof String && (((String) value).isEmpty()) || "REL".equals(value)) return;
         markdownString.append("\n").append(getPropertyMarkdown(label, value));
     }
 

From f888f35e357c0b01bf5c971b2fb30501ede18afd Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Mon, 12 Apr 2021 14:43:39 +0500
Subject: [PATCH 331/912] Fix issue where TermuxService was stopped and Termux
 notification canceled, if background tasks were still running but all
 sessions had been closed.

---
 app/src/main/java/com/termux/app/TermuxService.java | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxService.java b/app/src/main/java/com/termux/app/TermuxService.java
index 7f03938cc3..ab02156ced 100644
--- a/app/src/main/java/com/termux/app/TermuxService.java
+++ b/app/src/main/java/com/termux/app/TermuxService.java
@@ -555,13 +555,7 @@ public void onTermuxSessionExited(final TermuxSession termuxSession) {
                 mTermuxSessionClient.termuxSessionListNotifyUpdated();
         }
 
-        if (mTermuxSessions.isEmpty() && mWakeLock == null) {
-            // Finish if there are no TermuxSessions left and the wake lock is not held, otherwise keep the service alive if
-            // holding wake lock since there may be daemon processes (e.g. sshd) running.
-            requestStopService();
-        } else {
-            updateNotification();
-        }
+        updateNotification();
     }
 
 

From a95e187b25ba7e8b4887e5bc107ff2bd27ef542a Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Mon, 12 Apr 2021 14:49:49 +0500
Subject: [PATCH 332/912] Assure "Process completed" string is written to
 terminal before session is finished

---
 .../src/main/java/com/termux/terminal/TerminalSession.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/terminal-emulator/src/main/java/com/termux/terminal/TerminalSession.java b/terminal-emulator/src/main/java/com/termux/terminal/TerminalSession.java
index 3ebb793ff1..688c8e58e7 100644
--- a/terminal-emulator/src/main/java/com/termux/terminal/TerminalSession.java
+++ b/terminal-emulator/src/main/java/com/termux/terminal/TerminalSession.java
@@ -340,7 +340,6 @@ public void handleMessage(Message msg) {
             if (msg.what == MSG_PROCESS_EXITED) {
                 int exitCode = (Integer) msg.obj;
                 cleanupResources(exitCode);
-                mClient.onSessionFinished(TerminalSession.this);
 
                 String exitDescription = "\r\n[Process completed";
                 if (exitCode > 0) {
@@ -355,6 +354,8 @@ public void handleMessage(Message msg) {
                 byte[] bytesToWrite = exitDescription.getBytes(StandardCharsets.UTF_8);
                 mEmulator.append(bytesToWrite, bytesToWrite.length);
                 notifyScreenUpdate();
+
+                mClient.onSessionFinished(TerminalSession.this);
             }
         }
 

From 824b3e657ff20c5db2e47162240e9812716272b1 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Mon, 12 Apr 2021 15:19:25 +0500
Subject: [PATCH 333/912] Rename termux terminal view and session client
 classes

- com.termux.app.terminal.TermuxViewClient has been renamed to TermuxTerminalViewClient
- com.termux.app.terminal.TermuxSessionClient has been renamed to TermuxTerminalSessionClient
- com.termux.shared.shell.TermuxSessionClientBase has been renamed to TermuxTerminalSessionClientBase

This was required because com.termux.app.terminal.TermuxSessionClient was in conflict with com.termux.shared.shell.TermuxSessionClient interface of com.termux.shared.shell.TermuxSession.
---
 .../java/com/termux/app/TermuxActivity.java   | 50 ++++++-------
 .../java/com/termux/app/TermuxService.java    | 70 +++++++++----------
 .../TermuxSessionsListViewController.java     |  4 +-
 ....java => TermuxTerminalSessionClient.java} |  8 +--
 ...ent.java => TermuxTerminalViewClient.java} | 30 ++++----
 .../terminal/io/TerminalToolbarViewPager.java |  2 +-
 ...a => TermuxTerminalSessionClientBase.java} |  4 +-
 7 files changed, 84 insertions(+), 84 deletions(-)
 rename app/src/main/java/com/termux/app/terminal/{TermuxSessionClient.java => TermuxTerminalSessionClient.java} (97%)
 rename app/src/main/java/com/termux/app/terminal/{TermuxViewClient.java => TermuxTerminalViewClient.java} (93%)
 rename termux-shared/src/main/java/com/termux/shared/shell/{TermuxSessionClientBase.java => TermuxTerminalSessionClientBase.java} (92%)

diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index 6ec5e9b304..b7ad1e40ac 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -38,8 +38,8 @@
 import com.termux.shared.settings.preferences.TermuxAppSharedPreferences;
 import com.termux.app.terminal.TermuxSessionsListViewController;
 import com.termux.app.terminal.io.TerminalToolbarViewPager;
-import com.termux.app.terminal.TermuxSessionClient;
-import com.termux.app.terminal.TermuxViewClient;
+import com.termux.app.terminal.TermuxTerminalSessionClient;
+import com.termux.app.terminal.TermuxTerminalViewClient;
 import com.termux.app.terminal.io.extrakeys.ExtraKeysView;
 import com.termux.app.settings.properties.TermuxAppSharedProperties;
 import com.termux.shared.interact.DialogUtils;
@@ -86,13 +86,13 @@ public final class TermuxActivity extends Activity implements ServiceConnection
      *  The {@link TerminalViewClient} interface implementation to allow for communication between
      *  {@link TerminalView} and {@link TermuxActivity}.
      */
-    TermuxViewClient mTermuxViewClient;
+    TermuxTerminalViewClient mTermuxTerminalViewClient;
 
     /**
      *  The {@link TerminalSessionClient} interface implementation to allow for communication between
      *  {@link TerminalSession} and {@link TermuxActivity}.
      */
-    TermuxSessionClient mTermuxSessionClient;
+    TermuxTerminalSessionClient mTermuxTerminalSessionClient;
 
     /**
      * Termux app shared preferences manager.
@@ -218,7 +218,7 @@ 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.
-            mTermuxSessionClient.setCurrentSession(mTermuxSessionClient.getCurrentStoredSessionOrLast());
+            mTermuxTerminalSessionClient.setCurrentSession(mTermuxTerminalSessionClient.getCurrentStoredSessionOrLast());
             termuxSessionListNotifyUpdated();
         }
 
@@ -264,7 +264,7 @@ public void onServiceConnected(ComponentName componentName, IBinder service) {
                         if (bundle != null) {
                             launchFailsafe = bundle.getBoolean(TERMUX_ACTIVITY.ACTION_FAILSAFE_SESSION, false);
                         }
-                        mTermuxSessionClient.addNewSession(launchFailsafe, null);
+                        mTermuxTerminalSessionClient.addNewSession(launchFailsafe, null);
                     } catch (WindowManager.BadTokenException e) {
                         // Activity finished - ignore.
                     }
@@ -278,14 +278,14 @@ public void onServiceConnected(ComponentName componentName, IBinder service) {
             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.ACTION_FAILSAFE_SESSION, false);
-                mTermuxSessionClient.addNewSession(isFailSafe, null);
+                mTermuxTerminalSessionClient.addNewSession(isFailSafe, null);
             } else {
-                mTermuxSessionClient.setCurrentSession(mTermuxSessionClient.getCurrentStoredSessionOrLast());
+                mTermuxTerminalSessionClient.setCurrentSession(mTermuxTerminalSessionClient.getCurrentStoredSessionOrLast());
             }
         }
 
         // Update the {@link TerminalSession} and {@link TerminalEmulator} clients.
-        mTermuxService.setTermuxSessionClient(mTermuxSessionClient);
+        mTermuxService.setTermuxTerminalSessionClient(mTermuxTerminalSessionClient);
     }
 
     @Override
@@ -307,7 +307,7 @@ protected void onStop() {
 
         // Store current session in shared preferences so that it can be restored later in
         // {@link #onStart} if needed.
-        mTermuxSessionClient.setCurrentStoredSession();
+        mTermuxTerminalSessionClient.setCurrentStoredSession();
 
         unregisterReceiver(mTermuxActivityBroadcastReceiever);
         getDrawer().closeDrawers();
@@ -321,7 +321,7 @@ public void onDestroy() {
 
         if (mTermuxService != null) {
             // Do not leave service and session clients with references to activity.
-            mTermuxService.unsetTermuxSessionClient();
+            mTermuxService.unsetTermuxTerminalSessionClient();
             mTermuxService = null;
         }
         unbindService(this);
@@ -406,11 +406,11 @@ private void saveTerminalToolbarTextInput(Bundle savedInstanceState) {
 
     private void setNewSessionButtonView() {
         View newSessionButton = findViewById(R.id.new_session_button);
-        newSessionButton.setOnClickListener(v -> mTermuxSessionClient.addNewSession(false, null));
+        newSessionButton.setOnClickListener(v -> mTermuxTerminalSessionClient.addNewSession(false, null));
         newSessionButton.setOnLongClickListener(v -> {
             DialogUtils.textInput(TermuxActivity.this, R.string.title_create_named_session, null,
-                R.string.action_create_named_session_confirm, text -> mTermuxSessionClient.addNewSession(false, text),
-                R.string.action_new_session_failsafe, text -> mTermuxSessionClient.addNewSession(true, text),
+                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);
             return true;
         });
@@ -447,12 +447,12 @@ private void setSoftKeyboardState() {
 
     private void setTermuxTerminalViewAndClients() {
         // Set termux terminal view and session clients
-        mTermuxSessionClient = new TermuxSessionClient(this);
-        mTermuxViewClient = new TermuxViewClient(this, mTermuxSessionClient);
+        mTermuxTerminalSessionClient = new TermuxTerminalSessionClient(this);
+        mTermuxTerminalViewClient = new TermuxTerminalViewClient(this, mTermuxTerminalSessionClient);
 
         // Set termux terminal view
         mTerminalView = findViewById(R.id.terminal_view);
-        mTerminalView.setTerminalViewClient(mTermuxViewClient);
+        mTerminalView.setTerminalViewClient(mTermuxTerminalViewClient);
 
         mTerminalView.setTextSize(mPreferences.getFontSize());
         mTerminalView.setKeepScreenOn(mPreferences.getKeepScreenOn());
@@ -462,7 +462,7 @@ private void setTermuxTerminalViewAndClients() {
 
         mTerminalView.requestFocus();
 
-        mTermuxSessionClient.checkForFontAndColors();
+        mTermuxTerminalSessionClient.checkForFontAndColors();
     }
 
     private void setTermuxSessionsListView() {
@@ -543,10 +543,10 @@ public boolean onContextItemSelected(MenuItem item) {
 
         switch (item.getItemId()) {
             case CONTEXT_MENU_SELECT_URL_ID:
-                mTermuxViewClient.showUrlSelection();
+                mTermuxTerminalViewClient.showUrlSelection();
                 return true;
             case CONTEXT_MENU_SHARE_TRANSCRIPT_ID:
-                mTermuxViewClient.shareSessionTranscript();
+                mTermuxTerminalViewClient.shareSessionTranscript();
                 return true;
             case CONTEXT_MENU_AUTOFILL_ID:
                 requestAutoFill();
@@ -570,7 +570,7 @@ public boolean onContextItemSelected(MenuItem item) {
                 startActivity(new Intent(this, SettingsActivity.class));
                 return true;
             case CONTEXT_MENU_REPORT_ID:
-                mTermuxViewClient.reportIssueFromTranscript();
+                mTermuxTerminalViewClient.reportIssueFromTranscript();
                 return true;
             default:
                 return super.onContextItemSelected(item);
@@ -690,8 +690,8 @@ public TerminalView getTerminalView() {
         return mTerminalView;
     }
 
-    public TermuxSessionClient getTermuxSessionClient() {
-        return mTermuxSessionClient;
+    public TermuxTerminalSessionClient getTermuxTerminalSessionClient() {
+        return mTermuxTerminalSessionClient;
     }
 
     @Nullable
@@ -732,8 +732,8 @@ public void onReceive(Context context, Intent intent) {
                     return;
                 }
 
-                if(mTermuxSessionClient!= null) {
-                    mTermuxSessionClient.checkForFontAndColors();
+                if(mTermuxTerminalSessionClient != null) {
+                    mTermuxTerminalSessionClient.checkForFontAndColors();
                 }
 
                 if(mProperties!= null) {
diff --git a/app/src/main/java/com/termux/app/TermuxService.java b/app/src/main/java/com/termux/app/TermuxService.java
index ab02156ced..26e89309d1 100644
--- a/app/src/main/java/com/termux/app/TermuxService.java
+++ b/app/src/main/java/com/termux/app/TermuxService.java
@@ -20,14 +20,14 @@
 import android.widget.ArrayAdapter;
 
 import com.termux.R;
-import com.termux.app.terminal.TermuxSessionClient;
+import com.termux.app.terminal.TermuxTerminalSessionClient;
 import com.termux.app.utils.PluginUtils;
 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;
 import com.termux.shared.settings.preferences.TermuxAppSharedPreferences;
 import com.termux.shared.shell.TermuxSession;
-import com.termux.shared.shell.TermuxSessionClientBase;
+import com.termux.shared.shell.TermuxTerminalSessionClientBase;
 import com.termux.shared.logger.Logger;
 import com.termux.shared.notification.NotificationUtils;
 import com.termux.shared.packages.PermissionUtils;
@@ -92,12 +92,12 @@ class LocalBinder extends Binder {
      * that holds activity references for activity related functions.
      * Note that the service may often outlive the activity, so need to clear this reference.
      */
-    com.termux.app.terminal.TermuxSessionClient mTermuxSessionClient;
+    TermuxTerminalSessionClient mTermuxTerminalSessionClient;
 
     /** The basic implementation of the {@link TerminalSessionClient} interface to be used by {@link TerminalSession}
      * that does not hold activity references.
      */
-    final TermuxSessionClientBase mTermuxSessionClientBase = new TermuxSessionClientBase();
+    final TermuxTerminalSessionClientBase mTermuxTerminalSessionClientBase = new TermuxTerminalSessionClientBase();
 
     /** The wake lock and wifi lock are always acquired and released together. */
     private PowerManager.WakeLock mWakeLock;
@@ -178,8 +178,8 @@ public boolean onUnbind(Intent intent) {
         // Since we cannot rely on {@link TermuxActivity.onDestroy()} to always complete,
         // we unset clients here as well if it failed, so that we do not leave service and session
         // clients with references to the activity.
-        if (mTermuxSessionClient != null)
-            unsetTermuxSessionClient();
+        if (mTermuxTerminalSessionClient != null)
+            unsetTermuxTerminalSessionClient();
         return false;
     }
 
@@ -476,7 +476,7 @@ private void executeTermuxSessionCommand(ExecutionCommand executionCommand) {
 
     /**
      * Create a {@link TermuxSession}.
-     * Currently called by {@link TermuxSessionClient#addNewSession(boolean, String)} to add a new {@link TermuxSession}.
+     * Currently called by {@link TermuxTerminalSessionClient#addNewSession(boolean, String)} to add a new {@link TermuxSession}.
      */
     @Nullable
     public TermuxSession createTermuxSession(String executablePath, String[] arguments, String workingDirectory, boolean isFailSafe, String sessionName) {
@@ -501,7 +501,7 @@ public synchronized TermuxSession createTermuxSession(ExecutionCommand execution
         // 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
-        TermuxSession newTermuxSession = TermuxSession.execute(this, executionCommand, getTermuxSessionClient(), this, 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());
             return null;
@@ -516,8 +516,8 @@ public synchronized TermuxSession createTermuxSession(ExecutionCommand execution
 
         // Notify {@link TermuxSessionsListViewController} that sessions list has been updated if
         // activity in is foreground
-        if (mTermuxSessionClient != null)
-            mTermuxSessionClient.termuxSessionListNotifyUpdated();
+        if (mTermuxTerminalSessionClient != null)
+            mTermuxTerminalSessionClient.termuxSessionListNotifyUpdated();
 
         updateNotification();
         TermuxActivity.updateTermuxActivityStyling(this);
@@ -551,8 +551,8 @@ public void onTermuxSessionExited(final TermuxSession termuxSession) {
 
             // Notify {@link TermuxSessionsListViewController} that sessions list has been updated if
             // activity in is foreground
-            if (mTermuxSessionClient != null)
-                mTermuxSessionClient.termuxSessionListNotifyUpdated();
+            if (mTermuxTerminalSessionClient != null)
+                mTermuxTerminalSessionClient.termuxSessionListNotifyUpdated();
         }
 
         updateNotification();
@@ -569,8 +569,8 @@ private void handleSessionAction(int sessionAction, TerminalSession newTerminalS
         switch (sessionAction) {
             case TERMUX_SERVICE.VALUE_EXTRA_SESSION_ACTION_SWITCH_TO_NEW_SESSION_AND_OPEN_ACTIVITY:
                 setCurrentStoredTerminalSession(newTerminalSession);
-                if (mTermuxSessionClient != null)
-                    mTermuxSessionClient.setCurrentSession(newTerminalSession);
+                if (mTermuxTerminalSessionClient != null)
+                    mTermuxTerminalSessionClient.setCurrentSession(newTerminalSession);
                 startTermuxActivity();
                 break;
             case TERMUX_SERVICE.VALUE_EXTRA_SESSION_ACTION_KEEP_CURRENT_SESSION_AND_OPEN_ACTIVITY:
@@ -580,8 +580,8 @@ private void handleSessionAction(int sessionAction, TerminalSession newTerminalS
                 break;
             case TERMUX_SERVICE.VALUE_EXTRA_SESSION_ACTION_SWITCH_TO_NEW_SESSION_AND_DONT_OPEN_ACTIVITY:
                 setCurrentStoredTerminalSession(newTerminalSession);
-                if (mTermuxSessionClient != null)
-                    mTermuxSessionClient.setCurrentSession(newTerminalSession);
+                if (mTermuxTerminalSessionClient != null)
+                    mTermuxTerminalSessionClient.setCurrentSession(newTerminalSession);
                 break;
             case TERMUX_SERVICE.VALUE_EXTRA_SESSION_ACTION_KEEP_CURRENT_SESSION_AND_DONT_OPEN_ACTIVITY:
                 if (getTermuxSessionsSize() == 1)
@@ -610,46 +610,46 @@ private void startTermuxActivity() {
 
     /** If {@link TermuxActivity} has not bound to the {@link TermuxService} yet or is destroyed, then
      * interface functions requiring the activity should not be available to the terminal sessions,
-     * so we just return the {@link #mTermuxSessionClientBase}. Once {@link TermuxActivity} bind
-     * callback is received, it should call {@link #setTermuxSessionClient} to set the
-     * {@link TermuxService#mTermuxSessionClient} so that further terminal sessions are directly
-     * passed the {@link TermuxSessionClient} object which fully implements the
+     * so we just return the {@link #mTermuxTerminalSessionClientBase}. Once {@link TermuxActivity} bind
+     * callback is received, it should call {@link #setTermuxTerminalSessionClient} to set the
+     * {@link TermuxService#mTermuxTerminalSessionClient} so that further terminal sessions are directly
+     * passed the {@link TermuxTerminalSessionClient} object which fully implements the
      * {@link TerminalSessionClient} interface.
      *
-     * @return Returns the {@link TermuxSessionClient} if {@link TermuxActivity} has bound with
-     * {@link TermuxService}, otherwise {@link TermuxSessionClientBase}.
+     * @return Returns the {@link TermuxTerminalSessionClient} if {@link TermuxActivity} has bound with
+     * {@link TermuxService}, otherwise {@link TermuxTerminalSessionClientBase}.
      */
-    public synchronized TermuxSessionClientBase getTermuxSessionClient() {
-        if (mTermuxSessionClient != null)
-            return mTermuxSessionClient;
+    public synchronized TermuxTerminalSessionClientBase getTermuxTerminalSessionClient() {
+        if (mTermuxTerminalSessionClient != null)
+            return mTermuxTerminalSessionClient;
         else
-            return mTermuxSessionClientBase;
+            return mTermuxTerminalSessionClientBase;
     }
 
     /** This should be called when {@link TermuxActivity#onServiceConnected} is called to set the
-     * {@link TermuxService#mTermuxSessionClient} variable and update the {@link TerminalSession}
-     * and {@link TerminalEmulator} clients in case they were passed {@link TermuxSessionClientBase}
+     * {@link TermuxService#mTermuxTerminalSessionClient} variable and update the {@link TerminalSession}
+     * and {@link TerminalEmulator} clients in case they were passed {@link TermuxTerminalSessionClientBase}
      * earlier.
      *
-     * @param termuxSessionClient The {@link TermuxSessionClient} object that fully
+     * @param termuxTerminalSessionClient The {@link TermuxTerminalSessionClient} object that fully
      * implements the {@link TerminalSessionClient} interface.
      */
-    public synchronized void setTermuxSessionClient(TermuxSessionClient termuxSessionClient) {
-        mTermuxSessionClient = termuxSessionClient;
+    public synchronized void setTermuxTerminalSessionClient(TermuxTerminalSessionClient termuxTerminalSessionClient) {
+        mTermuxTerminalSessionClient = termuxTerminalSessionClient;
 
         for (int i = 0; i < mTermuxSessions.size(); i++)
-            mTermuxSessions.get(i).getTerminalSession().updateTerminalSessionClient(mTermuxSessionClient);
+            mTermuxSessions.get(i).getTerminalSession().updateTerminalSessionClient(mTermuxTerminalSessionClient);
     }
 
     /** This should be called when {@link TermuxActivity} has been destroyed and in {@link #onUnbind(Intent)}
      * so that the {@link TermuxService} and {@link TerminalSession} and {@link TerminalEmulator}
      * clients do not hold an activity references.
      */
-    public synchronized void unsetTermuxSessionClient() {
+    public synchronized void unsetTermuxTerminalSessionClient() {
         for (int i = 0; i < mTermuxSessions.size(); i++)
-            mTermuxSessions.get(i).getTerminalSession().updateTerminalSessionClient(mTermuxSessionClientBase);
+            mTermuxSessions.get(i).getTerminalSession().updateTerminalSessionClient(mTermuxTerminalSessionClientBase);
 
-        mTermuxSessionClient = null;
+        mTermuxTerminalSessionClient = null;
     }
 
 
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxSessionsListViewController.java b/app/src/main/java/com/termux/app/terminal/TermuxSessionsListViewController.java
index a87780ecde..76c7930912 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxSessionsListViewController.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxSessionsListViewController.java
@@ -93,14 +93,14 @@ public View getView(int position, View convertView, @NonNull ViewGroup parent) {
     @Override
     public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
         TermuxSession clickedSession = getItem(position);
-        mActivity.getTermuxSessionClient().setCurrentSession(clickedSession.getTerminalSession());
+        mActivity.getTermuxTerminalSessionClient().setCurrentSession(clickedSession.getTerminalSession());
         mActivity.getDrawer().closeDrawers();
     }
 
     @Override
     public boolean onItemLongClick(AdapterView<?> parent, View view, int position, long id) {
         final TermuxSession selectedSession = getItem(position);
-        mActivity.getTermuxSessionClient().renameSession(selectedSession.getTerminalSession());
+        mActivity.getTermuxTerminalSessionClient().renameSession(selectedSession.getTerminalSession());
         return true;
     }
 
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxSessionClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java
similarity index 97%
rename from app/src/main/java/com/termux/app/terminal/TermuxSessionClient.java
rename to app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java
index ec4020b206..13d5934e54 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxSessionClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java
@@ -16,7 +16,7 @@
 import com.termux.shared.shell.TermuxSession;
 import com.termux.shared.interact.DialogUtils;
 import com.termux.app.TermuxActivity;
-import com.termux.shared.shell.TermuxSessionClientBase;
+import com.termux.shared.shell.TermuxTerminalSessionClientBase;
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.app.TermuxService;
 import com.termux.shared.settings.properties.TermuxPropertyConstants;
@@ -31,7 +31,7 @@
 import java.io.InputStream;
 import java.util.Properties;
 
-public class TermuxSessionClient extends TermuxSessionClientBase {
+public class TermuxTerminalSessionClient extends TermuxTerminalSessionClientBase {
 
     private final TermuxActivity mActivity;
 
@@ -43,9 +43,9 @@ public class TermuxSessionClient extends TermuxSessionClientBase {
 
     private final int mBellSoundId;
 
-    private static final String LOG_TAG = "TermuxSessionClient";
+    private static final String LOG_TAG = "TermuxTerminalSessionClient";
 
-    public TermuxSessionClient(TermuxActivity activity) {
+    public TermuxTerminalSessionClient(TermuxActivity activity) {
         this.mActivity = activity;
 
         mBellSoundId = mBellSoundPool.load(activity, R.raw.bell, 1);
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxViewClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
similarity index 93%
rename from app/src/main/java/com/termux/app/terminal/TermuxViewClient.java
rename to app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
index 7c19aa78aa..b0e5bf6a04 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxViewClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
@@ -44,18 +44,18 @@
 
 import androidx.drawerlayout.widget.DrawerLayout;
 
-public class TermuxViewClient implements TerminalViewClient {
+public class TermuxTerminalViewClient implements TerminalViewClient {
 
     final TermuxActivity mActivity;
 
-    final TermuxSessionClient mTermuxSessionClient;
+    final TermuxTerminalSessionClient mTermuxTerminalSessionClient;
 
     /** Keeping track of the special keys acting as Ctrl and Fn for the soft keyboard and other hardware keys. */
     boolean mVirtualControlKeyDown, mVirtualFnKeyDown;
 
-    public TermuxViewClient(TermuxActivity activity, TermuxSessionClient termuxSessionClient) {
+    public TermuxTerminalViewClient(TermuxActivity activity, TermuxTerminalSessionClient termuxTerminalSessionClient) {
         this.mActivity = activity;
-        this.mTermuxSessionClient = termuxSessionClient;
+        this.mTermuxTerminalSessionClient = termuxTerminalSessionClient;
     }
 
     @Override
@@ -107,16 +107,16 @@ public boolean onKeyDown(int keyCode, KeyEvent e, TerminalSession currentSession
         if (handleVirtualKeys(keyCode, e, true)) return true;
 
         if (keyCode == KeyEvent.KEYCODE_ENTER && !currentSession.isRunning()) {
-            mTermuxSessionClient.removeFinishedSession(currentSession);
+            mTermuxTerminalSessionClient.removeFinishedSession(currentSession);
             return true;
         } else if (e.isCtrlPressed() && e.isAltPressed()) {
             // Get the unmodified code point:
             int unicodeChar = e.getUnicodeChar(0);
 
             if (keyCode == KeyEvent.KEYCODE_DPAD_DOWN || unicodeChar == 'n'/* next */) {
-                mTermuxSessionClient.switchToSession(true);
+                mTermuxTerminalSessionClient.switchToSession(true);
             } else if (keyCode == KeyEvent.KEYCODE_DPAD_UP || unicodeChar == 'p' /* previous */) {
-                mTermuxSessionClient.switchToSession(false);
+                mTermuxTerminalSessionClient.switchToSession(false);
             } else if (keyCode == KeyEvent.KEYCODE_DPAD_RIGHT) {
                 mActivity.getDrawer().openDrawer(Gravity.LEFT);
             } else if (keyCode == KeyEvent.KEYCODE_DPAD_LEFT) {
@@ -127,9 +127,9 @@ public boolean onKeyDown(int keyCode, KeyEvent e, TerminalSession currentSession
             } else if (unicodeChar == 'm'/* menu */) {
                 mActivity.getTerminalView().showContextMenu();
             } else if (unicodeChar == 'r'/* rename */) {
-                mTermuxSessionClient.renameSession(currentSession);
+                mTermuxTerminalSessionClient.renameSession(currentSession);
             } else if (unicodeChar == 'c'/* create */) {
-                mTermuxSessionClient.addNewSession(false, null);
+                mTermuxTerminalSessionClient.addNewSession(false, null);
             } else if (unicodeChar == 'u' /* urls */) {
                 showUrlSelection();
             } else if (unicodeChar == 'v') {
@@ -142,7 +142,7 @@ public boolean onKeyDown(int keyCode, KeyEvent e, TerminalSession currentSession
                 changeFontSize(false);
             } else if (unicodeChar >= '1' && unicodeChar <= '9') {
                 int index = unicodeChar - '1';
-                mTermuxSessionClient.switchToSession(index);
+                mTermuxTerminalSessionClient.switchToSession(index);
             }
             return true;
         }
@@ -297,7 +297,7 @@ public boolean onCodePoint(final int codePoint, boolean ctrlDown, TerminalSessio
             return true;
         } else if (ctrlDown) {
             if (codePoint == 106 /* Ctrl+j or \n */ && !session.isRunning()) {
-                mTermuxSessionClient.removeFinishedSession(session);
+                mTermuxTerminalSessionClient.removeFinishedSession(session);
                 return true;
             }
 
@@ -309,16 +309,16 @@ public boolean onCodePoint(final int codePoint, boolean ctrlDown, TerminalSessio
                     if (codePointLowerCase == shortcut.codePoint) {
                         switch (shortcut.shortcutAction) {
                             case TermuxPropertyConstants.ACTION_SHORTCUT_CREATE_SESSION:
-                                mTermuxSessionClient.addNewSession(false, null);
+                                mTermuxTerminalSessionClient.addNewSession(false, null);
                                 return true;
                             case TermuxPropertyConstants.ACTION_SHORTCUT_NEXT_SESSION:
-                                mTermuxSessionClient.switchToSession(true);
+                                mTermuxTerminalSessionClient.switchToSession(true);
                                 return true;
                             case TermuxPropertyConstants.ACTION_SHORTCUT_PREVIOUS_SESSION:
-                                mTermuxSessionClient.switchToSession(false);
+                                mTermuxTerminalSessionClient.switchToSession(false);
                                 return true;
                             case TermuxPropertyConstants.ACTION_SHORTCUT_RENAME_SESSION:
-                                mTermuxSessionClient.renameSession(mActivity.getCurrentSession());
+                                mTermuxTerminalSessionClient.renameSession(mActivity.getCurrentSession());
                                 return true;
                         }
                     }
diff --git a/app/src/main/java/com/termux/app/terminal/io/TerminalToolbarViewPager.java b/app/src/main/java/com/termux/app/terminal/io/TerminalToolbarViewPager.java
index dd194d8c71..06bdfe19a9 100644
--- a/app/src/main/java/com/termux/app/terminal/io/TerminalToolbarViewPager.java
+++ b/app/src/main/java/com/termux/app/terminal/io/TerminalToolbarViewPager.java
@@ -69,7 +69,7 @@ public Object instantiateItem(@NonNull ViewGroup collection, int position) {
                             if (textToSend.length() == 0) textToSend = "\r";
                             session.write(textToSend);
                         } else {
-                            mActivity.getTermuxSessionClient().removeFinishedSession(session);
+                            mActivity.getTermuxTerminalSessionClient().removeFinishedSession(session);
                         }
                         editText.setText("");
                     }
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/TermuxSessionClientBase.java b/termux-shared/src/main/java/com/termux/shared/shell/TermuxTerminalSessionClientBase.java
similarity index 92%
rename from termux-shared/src/main/java/com/termux/shared/shell/TermuxSessionClientBase.java
rename to termux-shared/src/main/java/com/termux/shared/shell/TermuxTerminalSessionClientBase.java
index 194c8aab59..ac5014c9e2 100644
--- a/termux-shared/src/main/java/com/termux/shared/shell/TermuxSessionClientBase.java
+++ b/termux-shared/src/main/java/com/termux/shared/shell/TermuxTerminalSessionClientBase.java
@@ -4,9 +4,9 @@
 import com.termux.terminal.TerminalSession;
 import com.termux.terminal.TerminalSessionClient;
 
-public class TermuxSessionClientBase implements TerminalSessionClient {
+public class TermuxTerminalSessionClientBase implements TerminalSessionClient {
 
-    public TermuxSessionClientBase() {
+    public TermuxTerminalSessionClientBase() {
     }
 
     @Override

From 192b2088835d43201351edcec15aeb93a86a8733 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Mon, 12 Apr 2021 18:25:43 +0500
Subject: [PATCH 334/912] Add support for stdin for background TermuxTasks

This will allow passing scripts (to bash or python) or other data to an executable via stdin. Arguments are passed to the executable and not the script.
---
 .../java/com/termux/app/TermuxService.java    |  8 +--
 .../terminal/TermuxTerminalSessionClient.java |  2 +-
 .../shared/models/ExecutionCommand.java       |  9 ++-
 .../com/termux/shared/shell/TermuxTask.java   | 67 +++++++++++++++----
 termux-shared/src/main/res/values/strings.xml |  2 +
 5 files changed, 70 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxService.java b/app/src/main/java/com/termux/app/TermuxService.java
index 26e89309d1..135dcc85eb 100644
--- a/app/src/main/java/com/termux/app/TermuxService.java
+++ b/app/src/main/java/com/termux/app/TermuxService.java
@@ -392,8 +392,8 @@ private void executeTermuxTaskCommand(ExecutionCommand executionCommand) {
 
     /** Create a {@link TermuxTask}. */
     @Nullable
-    public TermuxTask createTermuxTask(String executablePath, String[] arguments, String workingDirectory) {
-        return createTermuxTask(new ExecutionCommand(getNextExecutionId(), executablePath, arguments, workingDirectory, true, false));
+    public TermuxTask createTermuxTask(String executablePath, String[] arguments, String stdin, String workingDirectory) {
+        return createTermuxTask(new ExecutionCommand(getNextExecutionId(), executablePath, arguments, stdin, workingDirectory, true, false));
     }
 
     /** Create a {@link TermuxTask}. */
@@ -479,8 +479,8 @@ private void executeTermuxSessionCommand(ExecutionCommand executionCommand) {
      * Currently called by {@link TermuxTerminalSessionClient#addNewSession(boolean, String)} to add a new {@link TermuxSession}.
      */
     @Nullable
-    public TermuxSession createTermuxSession(String executablePath, String[] arguments, String workingDirectory, boolean isFailSafe, String sessionName) {
-        return createTermuxSession(new ExecutionCommand(getNextExecutionId(), executablePath, arguments, workingDirectory, false, isFailSafe), sessionName);
+    public TermuxSession createTermuxSession(String executablePath, String[] arguments, String stdin, String workingDirectory, boolean isFailSafe, String sessionName) {
+        return createTermuxSession(new ExecutionCommand(getNextExecutionId(), executablePath, arguments, stdin, workingDirectory, false, isFailSafe), sessionName);
     }
 
     /** Create a {@link TermuxSession}. */
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java
index 13d5934e54..8beb797146 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java
@@ -206,7 +206,7 @@ public void addNewSession(boolean isFailSafe, String sessionName) {
                 workingDirectory = currentSession.getCwd();
             }
 
-            TermuxSession newTermuxSession = mActivity.getTermuxService().createTermuxSession(null, null, workingDirectory, isFailSafe, sessionName);
+            TermuxSession newTermuxSession = mActivity.getTermuxService().createTermuxSession(null, null, null, workingDirectory, isFailSafe, sessionName);
             if (newTermuxSession == null) return;
 
             TerminalSession newTerminalSession = newTermuxSession.getTerminalSession();
diff --git a/termux-shared/src/main/java/com/termux/shared/models/ExecutionCommand.java b/termux-shared/src/main/java/com/termux/shared/models/ExecutionCommand.java
index 5aaf585b74..76e5853219 100644
--- a/termux-shared/src/main/java/com/termux/shared/models/ExecutionCommand.java
+++ b/termux-shared/src/main/java/com/termux/shared/models/ExecutionCommand.java
@@ -74,6 +74,8 @@ public int getValue() {
     public Uri executableUri;
     /** The executable arguments array for the {@link ExecutionCommand}. */
     public String[] arguments;
+    /** The stdin string for the {@link ExecutionCommand}. */
+    public String stdin;
     /** The current working directory for the {@link ExecutionCommand}. */
     public String workingDirectory;
 
@@ -138,10 +140,11 @@ public ExecutionCommand(Integer id) {
         this.id = id;
     }
 
-    public ExecutionCommand(Integer id, String executable, String[] arguments, String workingDirectory, boolean inBackground, boolean isFailsafe) {
+    public ExecutionCommand(Integer id, String executable, String[] arguments, String stdin, String workingDirectory, boolean inBackground, boolean isFailsafe) {
         this.id = id;
         this.executable = executable;
         this.arguments = arguments;
+        this.stdin = stdin;
         this.workingDirectory = workingDirectory;
         this.inBackground = inBackground;
         this.isFailsafe = isFailsafe;
@@ -560,4 +563,8 @@ public synchronized boolean isExecuting() {
         return currentState == ExecutionState.EXECUTING;
     }
 
+    public synchronized boolean isSuccessful() {
+        return currentState == ExecutionState.SUCCESS;
+    }
+
 }
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/TermuxTask.java b/termux-shared/src/main/java/com/termux/shared/shell/TermuxTask.java
index 17d6795f44..d8525430be 100644
--- a/termux-shared/src/main/java/com/termux/shared/shell/TermuxTask.java
+++ b/termux-shared/src/main/java/com/termux/shared/shell/TermuxTask.java
@@ -13,8 +13,10 @@
 import com.termux.shared.logger.Logger;
 import com.termux.shared.models.ExecutionCommand.ExecutionState;
 
+import java.io.DataOutputStream;
 import java.io.File;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 
 /**
  * A class that maintains info for background Termux tasks run with {@link Runtime#exec(String[], String[], File)}.
@@ -92,7 +94,7 @@ public static TermuxTask execute(@NonNull final Context context, @NonNull Execut
 
         if (isSynchronous) {
             try {
-                termuxTask.executeInner();
+                termuxTask.executeInner(context);
             } catch (IllegalThreadStateException | InterruptedException e) {
                 // TODO: Should either of these be handled or returned?
             }
@@ -101,7 +103,7 @@ public static TermuxTask execute(@NonNull final Context context, @NonNull Execut
                 @Override
                 public void run() {
                     try {
-                        termuxTask.executeInner();
+                        termuxTask.executeInner(context);
                     } catch (IllegalThreadStateException | InterruptedException e) {
                         // TODO: Should either of these be handled or returned?
                     }
@@ -118,8 +120,10 @@ public void run() {
      * If the processes finishes, then sets {@link ExecutionCommand#stdout}, {@link ExecutionCommand#stderr}
      * and {@link ExecutionCommand#exitCode} for the {@link #mExecutionCommand} of the {@code termuxTask}
      * and then calls {@link #processTermuxTaskResult(TermuxTask, ExecutionCommand) to process the result}.
+     *
+     * @param context The {@link Context} for operations.
      */
-    private void executeInner() throws IllegalThreadStateException, InterruptedException {
+    private void executeInner(@NonNull final Context context) throws IllegalThreadStateException, InterruptedException {
         final int pid = ShellUtils.getPid(mProcess);
 
         Logger.logDebug(LOG_TAG, "Running \"" + mExecutionCommand.getCommandIdAndLabelLogString() + "\" TermuxTask with pid " + pid);
@@ -129,8 +133,8 @@ private void executeInner() throws IllegalThreadStateException, InterruptedExcep
         mExecutionCommand.exitCode = null;
 
 
-
-        // setup stdout and stderr gobblers
+        // setup stdin, and stdout and stderr gobblers
+        DataOutputStream STDIN = new DataOutputStream(mProcess.getOutputStream());
         StreamGobbler STDOUT = new StreamGobbler(pid + "-stdout", mProcess.getInputStream(), mStdout);
         StreamGobbler STDERR = new StreamGobbler(pid + "-stderr", mProcess.getErrorStream(), mStderr);
 
@@ -138,6 +142,33 @@ private void executeInner() throws IllegalThreadStateException, InterruptedExcep
         STDOUT.start();
         STDERR.start();
 
+        if (mExecutionCommand.stdin != null && !mExecutionCommand.stdin.isEmpty()) {
+            try {
+                STDIN.write((mExecutionCommand.stdin + "\n").getBytes(StandardCharsets.UTF_8));
+                STDIN.flush();
+                STDIN.close();
+                //STDIN.write("exit\n".getBytes(StandardCharsets.UTF_8));
+                //STDIN.flush();
+            } catch(IOException e){
+                if (e.getMessage().contains("EPIPE") || e.getMessage().contains("Stream closed")) {
+                    // Method most horrid to catch broken pipe, in which case we
+                    // do nothing. The command is not a shell, the shell closed
+                    // STDIN, the script already contained the exit command, etc.
+                    // these cases we want the output instead of returning null.
+                } else {
+                    // other issues we don't know how to handle, leads to
+                    // returning null
+                    mExecutionCommand.setStateFailed(ExecutionCommand.RESULT_CODE_FAILED, context.getString(R.string.error_exception_received_while_executing_termux_task_command, mExecutionCommand.getCommandIdAndLabelLogString(), e.getMessage()), e);
+                    mExecutionCommand.stdout = mStdout.toString();
+                    mExecutionCommand.stderr = mStderr.toString();
+                    mExecutionCommand.exitCode = -1;
+                    TermuxTask.processTermuxTaskResult(this, null);
+                    kill();
+                    return;
+                }
+            }
+        }
+
         // wait for our process to finish, while we gobble away in the background
         int exitCode = mProcess.waitFor();
 
@@ -146,6 +177,11 @@ private void executeInner() throws IllegalThreadStateException, InterruptedExcep
         // needed in theory, and may even produce warnings, in "normal" Java
         // they are required for guaranteed cleanup of resources, so lets be
         // safe and do this on Android as well
+        try {
+            STDIN.close();
+        } catch (IOException e) {
+            // might be closed already
+        }
         STDOUT.join();
         STDERR.join();
         mProcess.destroy();
@@ -201,13 +237,20 @@ public void killIfExecuting(@NonNull final Context context, boolean processResul
         }
 
         if (mExecutionCommand.isExecuting()) {
-            int pid = ShellUtils.getPid(mProcess);
-            try {
-                // Send SIGKILL to process
-                Os.kill(pid, OsConstants.SIGKILL);
-            } catch (ErrnoException e) {
-                Logger.logWarn(LOG_TAG, "Failed to send SIGKILL to \"" + mExecutionCommand.getCommandIdAndLabelLogString() + "\" TermuxTask with pid " + pid + ": " + e.getMessage());
-            }
+            kill();
+        }
+    }
+
+    /**
+     * Kill this {@link TermuxTask} by sending a {@link OsConstants#SIGILL} to its {@link #mProcess}.
+     */
+    public void kill() {
+        int pid = ShellUtils.getPid(mProcess);
+        try {
+            // Send SIGKILL to process
+            Os.kill(pid, OsConstants.SIGKILL);
+        } catch (ErrnoException e) {
+            Logger.logWarn(LOG_TAG, "Failed to send SIGKILL to \"" + mExecutionCommand.getCommandIdAndLabelLogString() + "\" TermuxTask with pid " + pid + ": " + e.getMessage());
         }
     }
 
diff --git a/termux-shared/src/main/res/values/strings.xml b/termux-shared/src/main/res/values/strings.xml
index a4b77fc58b..d1b4e49456 100644
--- a/termux-shared/src/main/res/values/strings.xml
+++ b/termux-shared/src/main/res/values/strings.xml
@@ -82,6 +82,8 @@
     <string name="error_execution_cancelled">Execution has been cancelled since execution service is being killed</string>
     <string name="error_failed_to_execute_termux_session_command">"Failed to execute \"%1$s\" termux session command"</string>
     <string name="error_failed_to_execute_termux_task_command">"Failed to execute \"%1$s\" termux task command"</string>
+    <string name="error_exception_received_while_executing_termux_session_command">Exception received while to executing \"%1$s\" termux session command.\nException: %2$s</string>
+    <string name="error_exception_received_while_executing_termux_task_command">Exception received while to executing \"%1$s\" termux task command.\nException: %2$s"</string>
 
 
 

From 153818f7fb581dd7dc47e72aecab4986720c593d Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Mon, 12 Apr 2021 18:26:18 +0500
Subject: [PATCH 335/912] Fix typos

---
 .../main/java/com/termux/shared/packages/PermissionUtils.java   | 2 +-
 .../com/termux/shared/settings/properties/SharedProperties.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/packages/PermissionUtils.java b/termux-shared/src/main/java/com/termux/shared/packages/PermissionUtils.java
index d97895a051..ff57a13546 100644
--- a/termux-shared/src/main/java/com/termux/shared/packages/PermissionUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/packages/PermissionUtils.java
@@ -21,7 +21,7 @@ public class PermissionUtils {
 
     public static final int ACTION_MANAGE_OVERLAY_PERMISSION_REQUEST_CODE = 0;
 
-    private static final String LOG_TAG = "PluginUtils";
+    private static final String LOG_TAG = "PermissionUtils";
 
     public static boolean checkPermissions(Context context, String[] permissions) {
         int result;
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/properties/SharedProperties.java b/termux-shared/src/main/java/com/termux/shared/settings/properties/SharedProperties.java
index 72cf0daddf..9c808e93b2 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/properties/SharedProperties.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/properties/SharedProperties.java
@@ -126,7 +126,7 @@ public void loadPropertiesFromDisk() {
             Object internalValue;
             for (String key : propertiesList) {
                 value = properties.getProperty(key); // value will be null if key does not exist in propertiesFile
-                Logger.logDebug(LOG_TAG, key + " : " + value);
+                // Logger.logVerbose(LOG_TAG, key + " : " + value);
 
                 // Call the {@link SharedPropertiesParser#getInternalPropertyValueFromValue(Context,String,String)}
                 // interface method to get the internal value to store in the {@link #mMap}.

From bbf03a05076ce20afb5f6df0a3d4b097821344e7 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Mon, 12 Apr 2021 19:16:21 +0500
Subject: [PATCH 336/912] The `TermuxConstants` class has been updated to
 `v0.19.0`. Check its Changelog section for info on changes.

---
 .../termux/shared/termux/TermuxConstants.java | 22 +++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
index 9b864fb188..d0bcab1ddb 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
@@ -5,7 +5,7 @@
 import java.io.File;
 
 /*
- * Version: v0.18.0
+ * Version: v0.19.0
  *
  * Changelog
  *
@@ -129,6 +129,12 @@
  * - 0.18.0 (2021-04-11)
  *      - Updated `TERMUX_SUPPORT_EMAIL_URL` to a valid email.
  *      - Removed `TERMUX_SUPPORT_EMAIL`.
+ *
+ * - 0.19.0 (2021-04-12)
+ *      - Added `TERMUX_ACTIVITY.ACTION_REQUEST_PERMISSIONS`.
+ *      - Added `TERMUX_SERVICE.EXTRA_STDIN`.
+ *      - Added `RUN_COMMAND_SERVICE.EXTRA_STDIN`.
+ *      - Deprecated `TERMUX_ACTIVITY.EXTRA_RELOAD_STYLE`.
  */
 
 /**
@@ -633,9 +639,13 @@ public static final class TERMUX_ACTIVITY {
             public static final String ACTION_FAILSAFE_SESSION = TermuxConstants.TERMUX_PACKAGE_NAME + ".app.failsafe_session"; // Default: "com.termux.app.failsafe_session"
 
 
+            /** Intent action to make termux request storage permissions */
+            public static final String ACTION_REQUEST_PERMISSIONS = TermuxConstants.TERMUX_PACKAGE_NAME + ".app.request_storage_permissions"; // Default: "com.termux.app.request_storage_permissions"
+
             /** Intent action to make termux reload its termux session styling */
             public static final String ACTION_RELOAD_STYLE = TermuxConstants.TERMUX_PACKAGE_NAME + ".app.reload_style"; // Default: "com.termux.app.reload_style"
-            /** Intent {@code String} extra for what to reload for the TERMUX_ACTIVITY.ACTION_RELOAD_STYLE intent */
+            /** Intent {@code String} extra for what to reload for the TERMUX_ACTIVITY.ACTION_RELOAD_STYLE intent. This has been deperecated. */
+            @Deprecated
             public static final String EXTRA_RELOAD_STYLE = TermuxConstants.TERMUX_PACKAGE_NAME + ".app.reload_style"; // Default: "com.termux.app.reload_style"
 
         }
@@ -668,8 +678,10 @@ public static final class TERMUX_SERVICE {
             public static final String ACTION_SERVICE_EXECUTE = TERMUX_PACKAGE_NAME + ".service_execute"; // Default: "com.termux.service_execute"
             /** Uri scheme for paths sent via intent to TERMUX_SERVICE */
             public static final String URI_SCHEME_SERVICE_EXECUTE = TERMUX_PACKAGE_NAME + ".file"; // Default: "com.termux.file"
-            /** Intent {@code String[]} extra for command arguments for the TERMUX_SERVICE.ACTION_SERVICE_EXECUTE intent */
+            /** Intent {@code String[]} extra for arguments to the executable of the command for the TERMUX_SERVICE.ACTION_SERVICE_EXECUTE intent */
             public static final String EXTRA_ARGUMENTS = TERMUX_PACKAGE_NAME + ".execute.arguments"; // Default: "com.termux.execute.arguments"
+            /** Intent {@code String} extra for stdin of the command for the TERMUX_SERVICE.ACTION_SERVICE_EXECUTE intent */
+            public static final String EXTRA_STDIN = TERMUX_PACKAGE_NAME + ".execute.stdin"; // Default: "com.termux.execute.stdin"
             /** Intent {@code String} extra for command current working directory for the TERMUX_SERVICE.ACTION_SERVICE_EXECUTE intent */
             public static final String EXTRA_WORKDIR = TERMUX_PACKAGE_NAME + ".execute.cwd"; // Default: "com.termux.execute.cwd"
             /** Intent {@code boolean} extra for command background mode for the TERMUX_SERVICE.ACTION_SERVICE_EXECUTE intent */
@@ -760,8 +772,10 @@ public static final class RUN_COMMAND_SERVICE {
             public static final String ACTION_RUN_COMMAND = TERMUX_PACKAGE_NAME + ".RUN_COMMAND"; // Default: "com.termux.RUN_COMMAND"
             /** Intent {@code String} extra for absolute path of command for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent */
             public static final String EXTRA_COMMAND_PATH = TERMUX_PACKAGE_NAME + ".RUN_COMMAND_PATH"; // Default: "com.termux.RUN_COMMAND_PATH"
-            /** Intent {@code String[]} extra for any arguments to pass to command for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent */
+            /** Intent {@code String[]} extra for arguments to the executable of the command for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent */
             public static final String EXTRA_ARGUMENTS = TERMUX_PACKAGE_NAME + ".RUN_COMMAND_ARGUMENTS"; // Default: "com.termux.RUN_COMMAND_ARGUMENTS"
+            /** Intent {@code String} extra for stdin of the command for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent */
+            public static final String EXTRA_STDIN = TERMUX_PACKAGE_NAME + ".RUN_COMMAND_STDIN"; // Default: "com.termux.RUN_COMMAND_STDIN"
             /** Intent {@code String} extra for current working directory of command for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent */
             public static final String EXTRA_WORKDIR = TERMUX_PACKAGE_NAME + ".RUN_COMMAND_WORKDIR"; // Default: "com.termux.RUN_COMMAND_WORKDIR"
             /** Intent {@code boolean} extra for whether to run command in background or foreground terminal session for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent */

From f1034c2e79398ede1a366131f3620def15b1ba24 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Mon, 12 Apr 2021 19:16:45 +0500
Subject: [PATCH 337/912] Add support for stdin for background RUN_COMMAND
 intent and TERMUX_SERVICE.ACTION_SERVICE_EXECUTE commands

---
 app/src/main/java/com/termux/app/RunCommandService.java | 2 ++
 app/src/main/java/com/termux/app/TermuxService.java     | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/termux/app/RunCommandService.java b/app/src/main/java/com/termux/app/RunCommandService.java
index aac26428b9..d056f6bb5d 100644
--- a/app/src/main/java/com/termux/app/RunCommandService.java
+++ b/app/src/main/java/com/termux/app/RunCommandService.java
@@ -72,6 +72,7 @@ public int onStartCommand(Intent intent, int flags, int startId) {
 
         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.sessionAction = intent.getStringExtra(RUN_COMMAND_SERVICE.EXTRA_SESSION_ACTION);
@@ -153,6 +154,7 @@ public int onStartCommand(Intent intent, int flags, int startId) {
         Intent execIntent = new Intent(TERMUX_SERVICE.ACTION_SERVICE_EXECUTE, executionCommand.executableUri);
         execIntent.setClass(this, TermuxService.class);
         execIntent.putExtra(TERMUX_SERVICE.EXTRA_ARGUMENTS, executionCommand.arguments);
+        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_SESSION_ACTION, executionCommand.sessionAction);
diff --git a/app/src/main/java/com/termux/app/TermuxService.java b/app/src/main/java/com/termux/app/TermuxService.java
index 135dcc85eb..1bab00654e 100644
--- a/app/src/main/java/com/termux/app/TermuxService.java
+++ b/app/src/main/java/com/termux/app/TermuxService.java
@@ -350,14 +350,16 @@ private void actionServiceExecute(Intent intent) {
         ExecutionCommand executionCommand = new ExecutionCommand(getNextExecutionId());
 
         executionCommand.executableUri = intent.getData();
+        executionCommand.inBackground = intent.getBooleanExtra(TERMUX_SERVICE.EXTRA_BACKGROUND, false);
 
         if (executionCommand.executableUri != null) {
             executionCommand.executable = executionCommand.executableUri.getPath();
             executionCommand.arguments = intent.getStringArrayExtra(TERMUX_SERVICE.EXTRA_ARGUMENTS);
+            if (executionCommand.inBackground)
+                executionCommand.stdin = intent.getStringExtra(TERMUX_SERVICE.EXTRA_STDIN);
         }
 
         executionCommand.workingDirectory = intent.getStringExtra(TERMUX_SERVICE.EXTRA_WORKDIR);
-        executionCommand.inBackground = intent.getBooleanExtra(TERMUX_SERVICE.EXTRA_BACKGROUND, false);
         executionCommand.isFailsafe = intent.getBooleanExtra(TERMUX_ACTIVITY.ACTION_FAILSAFE_SESSION, false);
         executionCommand.sessionAction = intent.getStringExtra(TERMUX_SERVICE.EXTRA_SESSION_ACTION);
         executionCommand.commandLabel = DataUtils.getDefaultIfNull(intent.getStringExtra(TERMUX_SERVICE.EXTRA_COMMAND_LABEL), "Execution Intent Command");

From e5c5174f6f6a429eb8514f73e437a0945254e08e Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Mon, 12 Apr 2021 19:22:07 +0500
Subject: [PATCH 338/912] Fix TermuxActivityBroadcastReceiver wrongly designed
 intent actions and extras

From now on
- TERMUX_ACTIVITY.ACTION_REQUEST_PERMISSIONS should be used for requesting storage permissions.
- TERMUX_ACTIVITY.ACTION_RELOAD_STYLE should be used for reloading styling.
- TERMUX_ACTIVITY.EXTRA_RELOAD_STYLE which was previously used for requesting storage permissions if its value equaled "storage" has been deprecated.

If more actions need to be supported in future, add them to TermuxActivity.registerTermuxActivityBroadcastReceiver() IntentFilter.
---
 .../java/com/termux/app/TermuxActivity.java   | 92 +++++++++++++------
 1 file changed, 62 insertions(+), 30 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index b7ad1e40ac..78bb760851 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -117,7 +117,7 @@ public final class TermuxActivity extends Activity implements ServiceConnection
     /**
      * The {@link TermuxActivity} broadcast receiver for various things like terminal style configuration changes.
      */
-    private final BroadcastReceiver mTermuxActivityBroadcastReceiever = new TermuxActivityBroadcastReceiver();
+    private final BroadcastReceiver mTermuxActivityBroadcastReceiver = new TermuxActivityBroadcastReceiver();
 
     /**
      * The last toast shown, used cancel current toast before showing new in {@link #showToast(String, boolean)}.
@@ -222,7 +222,7 @@ public void onStart() {
             termuxSessionListNotifyUpdated();
         }
 
-        registerReceiver(mTermuxActivityBroadcastReceiever, new IntentFilter(TERMUX_ACTIVITY.ACTION_RELOAD_STYLE));
+        registerTermuxActivityBroadcastReceiver();
 
         // If user changed the preference from {@link TermuxSettings} activity and returns, then
         // update the {@link TerminalView#TERMINAL_VIEW_KEY_LOGGING_ENABLED} value.
@@ -309,7 +309,7 @@ protected void onStop() {
         // {@link #onStart} if needed.
         mTermuxTerminalSessionClient.setCurrentStoredSession();
 
-        unregisterReceiver(mTermuxActivityBroadcastReceiever);
+        unregisterTermuxActivityBroadcastReceiever();
         getDrawer().closeDrawers();
     }
 
@@ -716,47 +716,79 @@ public TermuxAppSharedProperties getProperties() {
     public static void updateTermuxActivityStyling(Context context) {
         // Make sure that terminal styling is always applied.
         Intent stylingIntent = new Intent(TERMUX_ACTIVITY.ACTION_RELOAD_STYLE);
-        stylingIntent.putExtra(TERMUX_ACTIVITY.EXTRA_RELOAD_STYLE, "styling");
         context.sendBroadcast(stylingIntent);
     }
 
+    private void registerTermuxActivityBroadcastReceiver() {
+        IntentFilter intentFilter = new IntentFilter();
+        intentFilter.addAction(TERMUX_ACTIVITY.ACTION_REQUEST_PERMISSIONS);
+        intentFilter.addAction(TERMUX_ACTIVITY.ACTION_RELOAD_STYLE);
+
+        registerReceiver(mTermuxActivityBroadcastReceiver, intentFilter);
+    }
+
+    private void unregisterTermuxActivityBroadcastReceiever() {
+        unregisterReceiver(mTermuxActivityBroadcastReceiver);
+    }
+
+    private void fixTermuxActivityBroadcastReceieverIntent(Intent intent) {
+        if (intent == null) return;
+
+        String extraReloadStyle = intent.getStringExtra(TERMUX_ACTIVITY.EXTRA_RELOAD_STYLE);
+        if ("storage".equals(extraReloadStyle)) {
+            intent.removeExtra(TERMUX_ACTIVITY.EXTRA_RELOAD_STYLE);
+            intent.setAction(TERMUX_ACTIVITY.ACTION_REQUEST_PERMISSIONS);
+        }
+    }
+
     class TermuxActivityBroadcastReceiver extends BroadcastReceiver {
         @Override
         public void onReceive(Context context, Intent intent) {
+            if (intent == null) return;
+
             if (mIsVisible) {
-                String whatToReload = intent.getStringExtra(TERMUX_ACTIVITY.EXTRA_RELOAD_STYLE);
-                Logger.logDebug(LOG_TAG, "Reloading termux style for: " + whatToReload);
-                if ("storage".equals(whatToReload)) {
-                    if (ensureStoragePermissionGranted())
-                        TermuxInstaller.setupStorageSymlinks(TermuxActivity.this);
-                    return;
+                fixTermuxActivityBroadcastReceieverIntent(intent);
+
+                switch (intent.getAction()) {
+                    case TERMUX_ACTIVITY.ACTION_REQUEST_PERMISSIONS:
+                        Logger.logDebug(LOG_TAG, "Received intent to request storage permissions");
+                        if (ensureStoragePermissionGranted())
+                            TermuxInstaller.setupStorageSymlinks(TermuxActivity.this);
+                        return;
+                    case TERMUX_ACTIVITY.ACTION_RELOAD_STYLE:
+                        Logger.logDebug(LOG_TAG, "Received intent to reload styling");
+                        reloadTermuxActivityStyling();
+                        return;
+                    default:
                 }
+            }
+        }
+    }
 
-                if(mTermuxTerminalSessionClient != null) {
-                    mTermuxTerminalSessionClient.checkForFontAndColors();
-                }
+    private void reloadTermuxActivityStyling() {
+        if(mTermuxTerminalSessionClient != null) {
+            mTermuxTerminalSessionClient.checkForFontAndColors();
+        }
 
-                if(mProperties!= null) {
-                    mProperties.loadTermuxPropertiesFromDisk();
+        if(mProperties!= null) {
+            mProperties.loadTermuxPropertiesFromDisk();
 
-                    if (mExtraKeysView != null) {
-                        mExtraKeysView.reload(mProperties.getExtraKeysInfo());
-                    }
-                }
+            if (mExtraKeysView != null) {
+                mExtraKeysView.reload(mProperties.getExtraKeysInfo());
+            }
+        }
 
-                setTerminalToolbarHeight();
+        setTerminalToolbarHeight();
 
-                setSoftKeyboardState();
+        setSoftKeyboardState();
 
-                // To change the activity and drawer theme, activity needs to be recreated.
-                // But this will destroy the activity, and will call the onCreate() again.
-                // We need to investigate if enabling this is wise, since all stored variables and
-                // views will be destroyed and bindService() will be called again. Extra keys input
-                // text will we restored since that has already been implemented. Terminal sessions
-                // and transcripts are also already preserved. Theme does change properly too.
-                // TermuxActivity.this.recreate();
-            }
-        }
+        // To change the activity and drawer theme, activity needs to be recreated.
+        // But this will destroy the activity, and will call the onCreate() again.
+        // We need to investigate if enabling this is wise, since all stored variables and
+        // views will be destroyed and bindService() will be called again. Extra keys input
+        // text will we restored since that has already been implemented. Terminal sessions
+        // and transcripts are also already preserved. Theme does change properly too.
+        // TermuxActivity.this.recreate();
     }
 
 

From 6293f5f170d89b3c2368dacf43a2601c76ab8d7f Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Mon, 12 Apr 2021 19:22:29 +0500
Subject: [PATCH 339/912] Added APT package info when generating "Report Issue"
 text

This will now take a few more seconds due to "apt update" command being run.
---
 .../terminal/TermuxTerminalViewClient.java    |  4 ++
 .../com/termux/shared/termux/TermuxUtils.java | 55 ++++++++++++++++++
 .../src/main/res/raw/apt_info_script.         | 58 +++++++++++++++++++
 3 files changed, 117 insertions(+)
 create mode 100644 termux-shared/src/main/res/raw/apt_info_script.

diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
index b0e5bf6a04..39ca33d94b 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
@@ -420,6 +420,10 @@ public void reportIssueFromTranscript() {
         reportString.append("\n\n").append(TermuxUtils.getAppInfoMarkdownString(mActivity, true));
         reportString.append("\n\n").append(TermuxUtils.getDeviceInfoMarkdownString(mActivity));
 
+        String termuxAptInfo = TermuxUtils.geAPTInfoMarkdownString(mActivity);
+        if (termuxAptInfo != null)
+            reportString.append("\n\n").append(termuxAptInfo);
+
         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));
     }
 
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
index aabce776c7..374355c74a 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
@@ -14,12 +14,17 @@
 import com.termux.shared.R;
 import com.termux.shared.logger.Logger;
 import com.termux.shared.markdown.MarkdownUtils;
+import com.termux.shared.models.ExecutionCommand;
 import com.termux.shared.packages.PackageUtils;
+import com.termux.shared.shell.TermuxTask;
+
+import org.apache.commons.io.IOUtils;
 
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.nio.charset.Charset;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
@@ -30,6 +35,8 @@
 
 public class TermuxUtils {
 
+    private static final String LOG_TAG = "TermuxUtils";
+
     /**
      * Get the {@link Context} for {@link TermuxConstants#TERMUX_PACKAGE_NAME} package.
      *
@@ -286,6 +293,54 @@ public static String getReportIssueMarkdownString(@NonNull final Context context
 
 
 
+    /**
+     * Get a markdown {@link String} for APT info of the app.
+     *
+     * This will take a few seconds to run due to running {@code apt update} command.
+     *
+     * @param context The context for operations.
+     * @return Returns the markdown {@link String}.
+     */
+    public static String geAPTInfoMarkdownString(@NonNull final Context context) {
+
+        String aptInfoScript = null;
+        InputStream inputStream = context.getResources().openRawResource(com.termux.shared.R.raw.apt_info_script);
+        try {
+            aptInfoScript = IOUtils.toString(inputStream, Charset.defaultCharset());
+        } catch (IOException e) {
+            Logger.logError(LOG_TAG, "Failed to get APT info script: " + e.getMessage());
+            return null;
+        }
+
+        IOUtils.closeQuietly(inputStream);
+
+        if (aptInfoScript == null || aptInfoScript.isEmpty()) {
+            Logger.logError(LOG_TAG, "The APT info script is null or empty");
+            return null;
+        }
+
+        aptInfoScript = aptInfoScript.replaceAll(Pattern.quote("@TERMUX_PREFIX@"), TermuxConstants.TERMUX_PREFIX_DIR_PATH);
+
+        ExecutionCommand executionCommand = new ExecutionCommand(1, TermuxConstants.TERMUX_BIN_PREFIX_DIR_PATH + "/bash", null, aptInfoScript, null, true, false);
+        TermuxTask termuxTask = TermuxTask.execute(context, executionCommand, null, true);
+        if (termuxTask == null || !executionCommand.isSuccessful() || executionCommand.exitCode != 0) {
+            Logger.logError(LOG_TAG, executionCommand.toString());
+            return null;
+        }
+
+        if (executionCommand.stderr != null && !executionCommand.stderr.isEmpty())
+            Logger.logError(LOG_TAG, executionCommand.toString());
+
+        StringBuilder markdownString = new StringBuilder();
+
+        markdownString.append("## ").append(TermuxConstants.TERMUX_APP_NAME).append(" APT Info\n\n");
+        markdownString.append(executionCommand.stdout);
+
+        return markdownString.toString();
+    }
+
+
+
     public static Properties getSystemProperties() {
         Properties systemProperties = new Properties();
 
diff --git a/termux-shared/src/main/res/raw/apt_info_script. b/termux-shared/src/main/res/raw/apt_info_script.
new file mode 100644
index 0000000000..3319e9ba18
--- /dev/null
+++ b/termux-shared/src/main/res/raw/apt_info_script.
@@ -0,0 +1,58 @@
+#!/bin/bash
+
+subscribed_repositories() {
+	local main_sources
+	main_sources=$(grep -P '^\s*deb\s' "@TERMUX_PREFIX@/etc/apt/sources.list")
+
+	if [ -n "$main_sources" ]; then
+		echo "#### sources.list"
+		echo "\`$main_sources\`"
+	fi
+
+	local filename repo_package supl_sources
+	while read -r filename; do
+		repo_package=$(dpkg -S "$filename" 2>/dev/null | cut -d : -f 1)
+		supl_sources=$(grep -P '^\s*deb\s' "$filename")
+
+		if [ -n "$supl_sources" ]; then
+			if [ -n "$repo_package" ]; then
+				echo "#### $repo_package (sources.list.d/$(basename "$filename"))"
+			else
+				echo "#### sources.list.d/$(basename "$filename")"
+			fi
+			echo "\`$supl_sources\`"
+		fi
+	done < <(find "@TERMUX_PREFIX@/etc/apt/sources.list.d" -maxdepth 1 ! -type d)
+}
+
+updatable_packages() {
+	local updatable
+
+	if [ "$(id -u)" = "0" ]; then
+		echo "Running as root. Cannot check updatable packages."
+	else
+		apt update >/dev/null 2>&1
+		updatable=$(apt list --upgradable 2>/dev/null | tail -n +2)
+
+		if [ -z "$updatable" ];then
+			echo "All packages up to date"
+		else
+			echo "\`$updatable\`"
+		fi
+	fi
+}
+
+output="
+### Subscribed Repositories
+
+$(subscribed_repositories)
+##
+
+
+### Updatable Packages
+$(updatable_packages)
+##
+
+"
+
+echo "$output"

From 3d468496735b294a6531ac32bbb077779a7e1114 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Mon, 12 Apr 2021 20:19:04 +0500
Subject: [PATCH 340/912] Replace "if(" with "if ("

---
 .../com/termux/app/RunCommandService.java     |  4 +--
 .../java/com/termux/app/TermuxActivity.java   | 26 +++++++++----------
 .../java/com/termux/app/TermuxService.java    |  6 ++---
 .../DebuggingPreferencesFragment.java         |  8 +++---
 .../TerminalIOPreferencesFragment.java        |  2 +-
 .../properties/TermuxAppSharedProperties.java |  2 +-
 .../terminal/io/extrakeys/ExtraKeysView.java  |  6 ++---
 terminal-emulator/src/main/jni/termux.c       |  2 +-
 .../termux/shared/interact/ShareUtils.java    |  6 ++---
 .../java/com/termux/shared/logger/Logger.java | 26 +++++++++----------
 .../termux/shared/markdown/MarkdownUtils.java | 16 ++++++------
 .../notification/NotificationUtils.java       | 10 +++----
 .../shared/packages/PermissionUtils.java      |  6 ++---
 .../com/termux/shared/shell/ShellUtils.java   | 10 +++----
 .../termux/shared/shell/StreamGobbler.java    |  2 +-
 .../termux/shared/shell/TermuxSession.java    |  2 +-
 .../com/termux/shared/shell/TermuxTask.java   |  4 +--
 17 files changed, 69 insertions(+), 69 deletions(-)

diff --git a/app/src/main/java/com/termux/app/RunCommandService.java b/app/src/main/java/com/termux/app/RunCommandService.java
index d056f6bb5d..d81b3ec53e 100644
--- a/app/src/main/java/com/termux/app/RunCommandService.java
+++ b/app/src/main/java/com/termux/app/RunCommandService.java
@@ -52,7 +52,7 @@ public void onCreate() {
     public int onStartCommand(Intent intent, int flags, int startId) {
         Logger.logDebug(LOG_TAG, "onStartCommand");
 
-        if(intent == null) return Service.START_NOT_STICKY;
+        if (intent == null) return Service.START_NOT_STICKY;
 
         // Run again in case service is already started and onCreate() is not called
         runStartForeground();
@@ -195,7 +195,7 @@ private Notification buildNotification() {
             TermuxConstants.TERMUX_RUN_COMMAND_NOTIFICATION_CHANNEL_ID, Notification.PRIORITY_LOW,
             TermuxConstants.TERMUX_RUN_COMMAND_NOTIFICATION_CHANNEL_NAME, null, null,
             null, NotificationUtils.NOTIFICATION_MODE_SILENT);
-        if(builder == null)  return null;
+        if (builder == null)  return null;
 
         // No need to show a timestamp:
         builder.setShowWhen(false);
diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index 78bb760851..f323d0fe22 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -362,7 +362,7 @@ private void setTerminalToolbarView(Bundle savedInstanceState) {
         setTerminalToolbarHeight();
 
         String savedTextInput = null;
-        if(savedInstanceState != null)
+        if (savedInstanceState != null)
             savedTextInput = savedInstanceState.getString(ARG_TERMINAL_TOOLBAR_TEXT_INPUT);
 
         terminalToolbarViewPager.setAdapter(new TerminalToolbarViewPager.PageAdapter(this, savedTextInput));
@@ -371,7 +371,7 @@ private void setTerminalToolbarView(Bundle savedInstanceState) {
 
     private void setTerminalToolbarHeight() {
         final ViewPager terminalToolbarViewPager = findViewById(R.id.terminal_toolbar_view_pager);
-        if(terminalToolbarViewPager == null) return;
+        if (terminalToolbarViewPager == null) return;
         ViewGroup.LayoutParams layoutParams = terminalToolbarViewPager.getLayoutParams();
         layoutParams.height = (int) Math.round(mTerminalToolbarDefaultHeight *
                                                 (mProperties.getExtraKeysInfo() == null ? 0 : mProperties.getExtraKeysInfo().getMatrix().length) *
@@ -381,7 +381,7 @@ private void setTerminalToolbarHeight() {
 
     public void toggleTerminalToolbar() {
         final ViewPager terminalToolbarViewPager = findViewById(R.id.terminal_toolbar_view_pager);
-        if(terminalToolbarViewPager == null) return;
+        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);
@@ -393,12 +393,12 @@ public void toggleTerminalToolbar() {
     }
 
     private void saveTerminalToolbarTextInput(Bundle savedInstanceState) {
-        if(savedInstanceState == null) return;
+        if (savedInstanceState == null) return;
 
         final EditText textInputView =  findViewById(R.id.terminal_toolbar_text_input);
-        if(textInputView != null) {
+        if (textInputView != null) {
             String textInput = textInputView.getText().toString();
-            if(!textInput.isEmpty()) savedInstanceState.putString(ARG_TERMINAL_TOOLBAR_TEXT_INPUT, textInput);
+            if (!textInput.isEmpty()) savedInstanceState.putString(ARG_TERMINAL_TOOLBAR_TEXT_INPUT, textInput);
         }
     }
 
@@ -431,14 +431,14 @@ private void setToggleKeyboardView() {
 
     private void setSoftKeyboardState() {
         // If soft keyboard is to disabled
-        if(!mPreferences.getSoftKeyboardEnabled()) {
+        if (!mPreferences.getSoftKeyboardEnabled()) {
             getWindow().setFlags(WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM, WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM);
         } else {
             getWindow().clearFlags(WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM);
         }
 
         // If soft keyboard is to be hidden on startup
-        if(mProperties.shouldSoftKeyboardBeHiddenOnStartup()) {
+        if (mProperties.shouldSoftKeyboardBeHiddenOnStartup()) {
             getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN);
         }
     }
@@ -496,7 +496,7 @@ public void finishActivityIfNotFinishing() {
 
     /** Show a toast and dismiss the last one if still visible. */
     public void showToast(String text, boolean longDuration) {
-        if(text == null || text.isEmpty()) return;
+        if (text == null || text.isEmpty()) return;
         if (mLastToast != null) mLastToast.cancel();
         mLastToast = Toast.makeText(TermuxActivity.this, text, longDuration ? Toast.LENGTH_LONG : Toast.LENGTH_SHORT);
         mLastToast.setGravity(Gravity.TOP, 0, 0);
@@ -611,7 +611,7 @@ private void showStylingDialog() {
         }
     }
     private void toggleKeepScreenOn() {
-        if(mTerminalView.getKeepScreenOn()) {
+        if (mTerminalView.getKeepScreenOn()) {
             mTerminalView.setKeepScreenOn(false);
             mPreferences.setKeepScreenOn(false);
         } else {
@@ -696,7 +696,7 @@ public TermuxTerminalSessionClient getTermuxTerminalSessionClient() {
 
     @Nullable
     public TerminalSession getCurrentSession() {
-        if(mTerminalView != null)
+        if (mTerminalView != null)
             return mTerminalView.getCurrentSession();
         else
             return null;
@@ -766,11 +766,11 @@ public void onReceive(Context context, Intent intent) {
     }
 
     private void reloadTermuxActivityStyling() {
-        if(mTermuxTerminalSessionClient != null) {
+        if (mTermuxTerminalSessionClient != null) {
             mTermuxTerminalSessionClient.checkForFontAndColors();
         }
 
-        if(mProperties!= null) {
+        if (mProperties!= null) {
             mProperties.loadTermuxPropertiesFromDisk();
 
             if (mExtraKeysView != null) {
diff --git a/app/src/main/java/com/termux/app/TermuxService.java b/app/src/main/java/com/termux/app/TermuxService.java
index 1bab00654e..c505645795 100644
--- a/app/src/main/java/com/termux/app/TermuxService.java
+++ b/app/src/main/java/com/termux/app/TermuxService.java
@@ -689,7 +689,7 @@ private Notification buildNotification() {
             TermuxConstants.TERMUX_APP_NOTIFICATION_CHANNEL_ID, priority,
             getText(R.string.application_name), notificationText, null,
             pendingIntent, NotificationUtils.NOTIFICATION_MODE_SILENT);
-        if(builder == null)  return null;
+        if (builder == null)  return null;
 
         // No need to show a timestamp:
         builder.setShowWhen(false);
@@ -742,7 +742,7 @@ private synchronized void updateNotification() {
 
 
     private void setCurrentStoredTerminalSession(TerminalSession session) {
-        if(session == null) return;
+        if (session == null) return;
         // Make the newly created session the current one to be displayed:
         TermuxAppSharedPreferences preferences = new TermuxAppSharedPreferences(this);
         preferences.setCurrentSession(session.mHandle);
@@ -762,7 +762,7 @@ public synchronized List<TermuxSession> getTermuxSessions() {
 
     @Nullable
     public synchronized TermuxSession getTermuxSession(int index) {
-        if(index >= 0 && index < mTermuxSessions.size())
+        if (index >= 0 && index < mTermuxSessions.size())
             return mTermuxSessions.get(index);
         else
             return null;
diff --git a/app/src/main/java/com/termux/app/fragments/settings/DebuggingPreferencesFragment.java b/app/src/main/java/com/termux/app/fragments/settings/DebuggingPreferencesFragment.java
index c34d70e2eb..09da15c3ed 100644
--- a/app/src/main/java/com/termux/app/fragments/settings/DebuggingPreferencesFragment.java
+++ b/app/src/main/java/com/termux/app/fragments/settings/DebuggingPreferencesFragment.java
@@ -32,7 +32,7 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
     }
 
     protected ListPreference setLogLevelListPreferenceData(ListPreference logLevelListPreference, Context context) {
-        if(logLevelListPreference == null)
+        if (logLevelListPreference == null)
             logLevelListPreference = new ListPreference(context);
 
         CharSequence[] logLevels = Logger.getLogLevelsArray();
@@ -73,7 +73,7 @@ public static synchronized DebuggingPreferencesDataStore getInstance(Context con
     @Override
     @Nullable
     public String getString(String key, @Nullable String defValue) {
-        if(key == null) return null;
+        if (key == null) return null;
 
         switch (key) {
             case "log_level":
@@ -85,7 +85,7 @@ public String getString(String key, @Nullable String defValue) {
 
     @Override
     public void putString(String key, @Nullable String value) {
-        if(key == null) return;
+        if (key == null) return;
 
         switch (key) {
             case "log_level":
@@ -102,7 +102,7 @@ public void putString(String key, @Nullable String value) {
 
     @Override
     public void putBoolean(String key, boolean value) {
-        if(key == null) return;
+        if (key == null) return;
 
         switch (key) {
             case "terminal_view_key_logging_enabled":
diff --git a/app/src/main/java/com/termux/app/fragments/settings/TerminalIOPreferencesFragment.java b/app/src/main/java/com/termux/app/fragments/settings/TerminalIOPreferencesFragment.java
index 0280b89701..987f9dadbe 100644
--- a/app/src/main/java/com/termux/app/fragments/settings/TerminalIOPreferencesFragment.java
+++ b/app/src/main/java/com/termux/app/fragments/settings/TerminalIOPreferencesFragment.java
@@ -45,7 +45,7 @@ public static synchronized TerminalIOPreferencesDataStore getInstance(Context co
 
     @Override
     public void putBoolean(String key, boolean value) {
-        if(key == null) return;
+        if (key == null) return;
 
         switch (key) {
             case "soft_keyboard_enabled":
diff --git a/app/src/main/java/com/termux/app/settings/properties/TermuxAppSharedProperties.java b/app/src/main/java/com/termux/app/settings/properties/TermuxAppSharedProperties.java
index 4153a42686..2ad4209532 100644
--- a/app/src/main/java/com/termux/app/settings/properties/TermuxAppSharedProperties.java
+++ b/app/src/main/java/com/termux/app/settings/properties/TermuxAppSharedProperties.java
@@ -70,7 +70,7 @@ private void setExtraKeys() {
      * Set the terminal sessions shortcuts.
      */
     private void setSessionShortcuts() {
-        if(mSessionShortcuts == null)
+        if (mSessionShortcuts == null)
             mSessionShortcuts = new ArrayList<>();
         else
             mSessionShortcuts.clear();
diff --git a/app/src/main/java/com/termux/app/terminal/io/extrakeys/ExtraKeysView.java b/app/src/main/java/com/termux/app/terminal/io/extrakeys/ExtraKeysView.java
index be896ab443..da4cbeaf6d 100644
--- a/app/src/main/java/com/termux/app/terminal/io/extrakeys/ExtraKeysView.java
+++ b/app/src/main/java/com/termux/app/terminal/io/extrakeys/ExtraKeysView.java
@@ -188,7 +188,7 @@ void popup(View view, ExtraKeyButton extraButton) {
         int width = view.getMeasuredWidth();
         int height = view.getMeasuredHeight();
         Button button;
-        if(isSpecialButton(extraButton)) {
+        if (isSpecialButton(extraButton)) {
             button = createSpecialButton(extraButton.getKey(), false);
             if (button == null) return;
         } else {
@@ -240,7 +240,7 @@ static int maximumLength(Object[][] matrix) {
      */
     @SuppressLint("ClickableViewAccessibility")
     public void reload(ExtraKeysInfo infos) {
-        if(infos == null)
+        if (infos == null)
             return;
 
         for(SpecialButtonState state : specialButtons.values())
@@ -258,7 +258,7 @@ public void reload(ExtraKeysInfo infos) {
                 final ExtraKeyButton buttonInfo = buttons[row][col];
 
                 Button button;
-                if(isSpecialButton(buttonInfo)) {
+                if (isSpecialButton(buttonInfo)) {
                     button = createSpecialButton(buttonInfo.getKey(), true);
                     if (button == null) return;
                 } else {
diff --git a/terminal-emulator/src/main/jni/termux.c b/terminal-emulator/src/main/jni/termux.c
index 38399872c1..22f1d507d1 100644
--- a/terminal-emulator/src/main/jni/termux.c
+++ b/terminal-emulator/src/main/jni/termux.c
@@ -88,7 +88,7 @@ static int create_subprocess(JNIEnv* env,
             struct dirent* entry;
             while ((entry = readdir(self_dir)) != NULL) {
                 int fd = atoi(entry->d_name);
-                if(fd > 2 && fd != self_dir_fd) close(fd);
+                if (fd > 2 && fd != self_dir_fd) close(fd);
             }
             closedir(self_dir);
         }
diff --git a/termux-shared/src/main/java/com/termux/shared/interact/ShareUtils.java b/termux-shared/src/main/java/com/termux/shared/interact/ShareUtils.java
index eb23970352..c4efab2352 100644
--- a/termux-shared/src/main/java/com/termux/shared/interact/ShareUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/interact/ShareUtils.java
@@ -21,7 +21,7 @@ public class ShareUtils {
      * @param title The title for choose menu.
      */
     private static void openSystemAppChooser(final Context context, final Intent intent, final String title) {
-        if(context == null) return;
+        if (context == null) return;
 
         final Intent chooserIntent = new Intent(Intent.ACTION_CHOOSER);
         chooserIntent.putExtra(Intent.EXTRA_INTENT, intent);
@@ -38,7 +38,7 @@ private static void openSystemAppChooser(final Context context, final Intent int
      * @param text The text to share.
      */
     public static void shareText(final Context context, final String subject, final String text) {
-        if(context == null) return;
+        if (context == null) return;
 
         final Intent shareTextIntent = new Intent(Intent.ACTION_SEND);
         shareTextIntent.setType("text/plain");
@@ -57,7 +57,7 @@ public static void shareText(final Context context, final String subject, final
      *                    clipboard is successful.
      */
     public static void copyTextToClipboard(final Context context, final String text, final String toastString) {
-        if(context == null) return;
+        if (context == null) return;
 
         final ClipboardManager clipboardManager = ContextCompat.getSystemService(context, ClipboardManager.class);
 
diff --git a/termux-shared/src/main/java/com/termux/shared/logger/Logger.java b/termux-shared/src/main/java/com/termux/shared/logger/Logger.java
index 2610b80748..0560625b73 100644
--- a/termux-shared/src/main/java/com/termux/shared/logger/Logger.java
+++ b/termux-shared/src/main/java/com/termux/shared/logger/Logger.java
@@ -151,27 +151,27 @@ public static void logStackTracesWithMessage(String tag, String message, List<Th
     public static String getMessageAndStackTraceString(String message, Throwable throwable) {
         if (message == null && throwable == null)
             return null;
-        else if(message != null && throwable != null)
+        else if (message != null && throwable != null)
             return message + ":\n" + getStackTraceString(throwable);
-        else if(throwable == null)
+        else if (throwable == null)
             return message;
         else
             return getStackTraceString(throwable);
     }
 
     public static String getMessageAndStackTracesString(String message, List<Throwable> throwableList) {
-        if(message == null && (throwableList == null || throwableList.size() == 0))
+        if (message == null && (throwableList == null || throwableList.size() == 0))
             return null;
-        else if(message != null && (throwableList != null && throwableList.size() != 0))
+        else if (message != null && (throwableList != null && throwableList.size() != 0))
             return message + ":\n" + getStackTracesString(null, getStackTraceStringArray(throwableList));
-        else if(throwableList == null || throwableList.size() == 0)
+        else if (throwableList == null || throwableList.size() == 0)
             return message;
         else
             return getStackTracesString(null, getStackTraceStringArray(throwableList));
     }
 
     public static String getStackTraceString(Throwable throwable) {
-        if(throwable == null) return null;
+        if (throwable == null) return null;
 
         String stackTraceString = null;
 
@@ -204,14 +204,14 @@ public static String[] getStackTraceStringArray(List<Throwable> throwableList) {
     }
 
     public static String getStackTracesString(String label, String[] stackTraceStringArray) {
-        if(label == null) label = "StackTraces:";
+        if (label == null) label = "StackTraces:";
         StringBuilder stackTracesString = new StringBuilder(label);
 
         if (stackTraceStringArray == null || stackTraceStringArray.length == 0) {
             stackTracesString.append(" -");
         } else {
             for (int i = 0; i != stackTraceStringArray.length; i++) {
-                if(stackTraceStringArray.length > 1)
+                if (stackTraceStringArray.length > 1)
                     stackTracesString.append("\n\nStacktrace ").append(i + 1);
 
                 stackTracesString.append("\n```\n").append(stackTraceStringArray[i]).append("\n```\n");
@@ -222,14 +222,14 @@ public static String getStackTracesString(String label, String[] stackTraceStrin
     }
 
     public static String getStackTracesMarkdownString(String label, String[] stackTraceStringArray) {
-        if(label == null) label = "StackTraces";
+        if (label == null) label = "StackTraces";
         StringBuilder stackTracesString = new StringBuilder("### " + label);
 
         if (stackTraceStringArray == null || stackTraceStringArray.length == 0) {
             stackTracesString.append("\n\n`-`");
         } else {
             for (int i = 0; i != stackTraceStringArray.length; i++) {
-                if(stackTraceStringArray.length > 1)
+                if (stackTraceStringArray.length > 1)
                     stackTracesString.append("\n\n\n#### Stacktrace ").append(i + 1);
 
                 stackTracesString.append("\n\n```\n").append(stackTraceStringArray[i]).append("\n```");
@@ -309,19 +309,19 @@ public static int getLogLevel() {
     }
 
     public static int setLogLevel(Context context, int logLevel) {
-        if(logLevel >= LOG_LEVEL_OFF && logLevel <= LOG_LEVEL_VERBOSE)
+        if (logLevel >= LOG_LEVEL_OFF && logLevel <= LOG_LEVEL_VERBOSE)
             CURRENT_LOG_LEVEL = logLevel;
         else
             CURRENT_LOG_LEVEL = DEFAULT_LOG_LEVEL;
 
-        if(context != null)
+        if (context != null)
             showToast(context, context.getString(R.string.log_level_value, getLogLevelLabel(context, CURRENT_LOG_LEVEL, false)),true);
 
         return CURRENT_LOG_LEVEL;
     }
 
     public static String getFullTag(String tag) {
-        if(DEFAULT_LOG_TAG.equals(tag))
+        if (DEFAULT_LOG_TAG.equals(tag))
             return tag;
         else
             return DEFAULT_LOG_TAG + ":" + tag;
diff --git a/termux-shared/src/main/java/com/termux/shared/markdown/MarkdownUtils.java b/termux-shared/src/main/java/com/termux/shared/markdown/MarkdownUtils.java
index 9c3bdaeb21..86ddd03fff 100644
--- a/termux-shared/src/main/java/com/termux/shared/markdown/MarkdownUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/markdown/MarkdownUtils.java
@@ -50,15 +50,15 @@ public class MarkdownUtils {
      * @return Returns the markdown code {@link String}.
      */
     public static String getMarkdownCodeForString(String string, boolean codeBlock) {
-        if(string == null) return null;
-        if(string.isEmpty()) return "";
+        if (string == null) return null;
+        if (string.isEmpty()) return "";
 
         int maxConsecutiveBackTicksCount = getMaxConsecutiveBackTicksCount(string);
 
         // markdown requires surrounding backticks count to be at least one more than the count
         // of consecutive ticks in the string itself
         int backticksCountToUse;
-        if(codeBlock)
+        if (codeBlock)
             backticksCountToUse = maxConsecutiveBackTicksCount + 3;
         else
             backticksCountToUse = maxConsecutiveBackTicksCount + 1;
@@ -66,13 +66,13 @@ public static String getMarkdownCodeForString(String string, boolean codeBlock)
         // create a string with n backticks where n==backticksCountToUse
         String backticksToUse = Strings.repeat(backtick, backticksCountToUse);
 
-        if(codeBlock)
+        if (codeBlock)
             return backticksToUse + "\n" + string + "\n" + backticksToUse;
         else {
             // add a space to any prefixed or suffixed backtick characters
-            if(string.startsWith(backtick))
+            if (string.startsWith(backtick))
                 string = " " + string;
-            if(string.endsWith(backtick))
+            if (string.endsWith(backtick))
                 string = string + " ";
 
             return backticksToUse + string + backticksToUse;
@@ -86,7 +86,7 @@ public static String getMarkdownCodeForString(String string, boolean codeBlock)
      * @return Returns the max consecutive backticks count.
      */
     public static int getMaxConsecutiveBackTicksCount(String string) {
-        if(string == null || string.isEmpty()) return 0;
+        if (string == null || string.isEmpty()) return 0;
 
         int maxCount = 0;
         int matchCount;
@@ -94,7 +94,7 @@ public static int getMaxConsecutiveBackTicksCount(String string) {
         Matcher matcher = backticksPattern.matcher(string);
         while(matcher.find()) {
             matchCount = matcher.group(1).length();
-            if(matchCount > maxCount)
+            if (matchCount > maxCount)
                 maxCount = matchCount;
         }
 
diff --git a/termux-shared/src/main/java/com/termux/shared/notification/NotificationUtils.java b/termux-shared/src/main/java/com/termux/shared/notification/NotificationUtils.java
index 64933cfef4..fe9d87e6d1 100644
--- a/termux-shared/src/main/java/com/termux/shared/notification/NotificationUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/notification/NotificationUtils.java
@@ -45,7 +45,7 @@ public class NotificationUtils {
      */
     @Nullable
     public static NotificationManager getNotificationManager(final Context context) {
-        if(context == null) return null;
+        if (context == null) return null;
         return (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
     }
 
@@ -59,7 +59,7 @@ public static NotificationManager getNotificationManager(final Context context)
      * @return Returns the notification id that should be safe to use.
      */
     public synchronized static int getNextNotificationId(final Context context) {
-        if(context == null) return TermuxPreferenceConstants.TERMUX_APP.DEFAULT_VALUE_KEY_LAST_NOTIFICATION_ID;
+        if (context == null) return TermuxPreferenceConstants.TERMUX_APP.DEFAULT_VALUE_KEY_LAST_NOTIFICATION_ID;
 
         TermuxAppSharedPreferences preferences = new TermuxAppSharedPreferences(context);
         int lastNotificationId = preferences.getLastNotificationId();
@@ -69,7 +69,7 @@ public synchronized static int getNextNotificationId(final Context context) {
             nextNotificationId++;
         }
 
-        if(nextNotificationId == Integer.MAX_VALUE || nextNotificationId < 0)
+        if (nextNotificationId == Integer.MAX_VALUE || nextNotificationId < 0)
             nextNotificationId = TermuxPreferenceConstants.TERMUX_APP.DEFAULT_VALUE_KEY_LAST_NOTIFICATION_ID;
 
         preferences.setLastNotificationId(nextNotificationId);
@@ -91,7 +91,7 @@ public synchronized static int getNextNotificationId(final Context context) {
      */
     @Nullable
     public static Notification.Builder geNotificationBuilder(final Context context, final String channelId, final int priority, final CharSequence title, final CharSequence notifiationText, final CharSequence notificationBigText, final PendingIntent pendingIntent, final int notificationMode) {
-        if(context == null) return null;
+        if (context == null) return null;
         Notification.Builder builder = new Notification.Builder(context);
         builder.setContentTitle(title);
         builder.setContentText(notifiationText);
@@ -124,7 +124,7 @@ public static void setupNotificationChannel(final Context context, final String
         NotificationChannel channel = new NotificationChannel(channelId, channelName, importance);
 
         NotificationManager notificationManager = getNotificationManager(context);
-        if(notificationManager != null)
+        if (notificationManager != null)
             notificationManager.createNotificationChannel(channel);
     }
 
diff --git a/termux-shared/src/main/java/com/termux/shared/packages/PermissionUtils.java b/termux-shared/src/main/java/com/termux/shared/packages/PermissionUtils.java
index ff57a13546..da522b066e 100644
--- a/termux-shared/src/main/java/com/termux/shared/packages/PermissionUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/packages/PermissionUtils.java
@@ -36,7 +36,7 @@ public static boolean checkPermissions(Context context, String[] permissions) {
     }
 
     public static void askPermissions(Activity context, String[] permissions) {
-        if(context == null || permissions == null) return;
+        if (context == null || permissions == null) return;
 
         int result;
         Logger.showToast(context, context.getString(R.string.message_sudo_please_grant_permissions), true);
@@ -74,9 +74,9 @@ public static void askDisplayOverOtherAppsPermission(Activity context) {
     public static boolean validateDisplayOverOtherAppsPermissionForPostAndroid10(Context context) {
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) return true;
         
-        if(!PermissionUtils.checkDisplayOverOtherAppsPermission(context)) {
+        if (!PermissionUtils.checkDisplayOverOtherAppsPermission(context)) {
             TermuxAppSharedPreferences preferences = new TermuxAppSharedPreferences(context);
-            if(preferences.getPluginErrorNotificationsEnabled())
+            if (preferences.getPluginErrorNotificationsEnabled())
                 Logger.showToast(context, context.getString(R.string.error_display_over_other_apps_permission_not_granted), true);
             return false;
         } else {
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/ShellUtils.java b/termux-shared/src/main/java/com/termux/shared/shell/ShellUtils.java
index 9d5455cb92..af32758e28 100644
--- a/termux-shared/src/main/java/com/termux/shared/shell/ShellUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/shell/ShellUtils.java
@@ -32,9 +32,9 @@ public static String[] buildEnvironment(Context currentPackageContext, boolean i
 
         // This function may be called by a different package like a plugin, so we get version for Termux package via its context
         Context termuxPackageContext = TermuxUtils.getTermuxPackageContext(currentPackageContext);
-        if(termuxPackageContext != null) {
+        if (termuxPackageContext != null) {
             String termuxVersionName = PackageUtils.getVersionNameForPackage(termuxPackageContext);
-            if(termuxVersionName != null)
+            if (termuxVersionName != null)
                 environment.add("TERMUX_VERSION=" + termuxVersionName);
         }
 
@@ -145,7 +145,7 @@ public static String[] setupProcessArgs(@NonNull String fileToExecute, String[]
     }
 
     public static String getExecutableBasename(String executable) {
-        if(executable == null) return null;
+        if (executable == null) return null;
         int lastSlash = executable.lastIndexOf('/');
         return (lastSlash == -1) ? executable : executable.substring(lastSlash + 1);
     }
@@ -169,14 +169,14 @@ public static String getTerminalSessionTranscriptText(TerminalSession terminalSe
 
         String transcriptText;
 
-        if(linesJoined)
+        if (linesJoined)
             transcriptText = terminalBuffer.getTranscriptTextWithFullLinesJoined();
         else
             transcriptText = terminalBuffer.getTranscriptTextWithoutJoinedLines();
 
         if (transcriptText == null) return null;
 
-        if(trim)
+        if (trim)
             transcriptText = transcriptText.trim();
 
         return transcriptText;
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/StreamGobbler.java b/termux-shared/src/main/java/com/termux/shared/shell/StreamGobbler.java
index 8d785c5dd6..d14ce7ab27 100644
--- a/termux-shared/src/main/java/com/termux/shared/shell/StreamGobbler.java
+++ b/termux-shared/src/main/java/com/termux/shared/shell/StreamGobbler.java
@@ -178,7 +178,7 @@ public void run() {
             String line;
             while ((line = reader.readLine()) != null) {
 
-                if(currentLogLevel >= logLevelVerbose)
+                if (currentLogLevel >= logLevelVerbose)
                     Logger.logVerbose(LOG_TAG, String.format(Locale.ENGLISH, "[%s] %s", shell, line)); // This will get truncated by LOGGER_ENTRY_MAX_LEN, likely 4KB
 
                 if (stringWriter != null) stringWriter.append(line).append("\n");
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/TermuxSession.java b/termux-shared/src/main/java/com/termux/shared/shell/TermuxSession.java
index 837edbc2e6..825910b1cb 100644
--- a/termux-shared/src/main/java/com/termux/shared/shell/TermuxSession.java
+++ b/termux-shared/src/main/java/com/termux/shared/shell/TermuxSession.java
@@ -170,7 +170,7 @@ public void finish() {
      */
     public void killIfExecuting(@NonNull final Context context, boolean processResult) {
         // If execution command has already finished executing, then no need to process results or send SIGKILL
-        if(mExecutionCommand.hasExecuted()) {
+        if (mExecutionCommand.hasExecuted()) {
             Logger.logDebug(LOG_TAG, "Ignoring sending SIGKILL to \"" + mExecutionCommand.getCommandIdAndLabelLogString() + "\" TermuxSession since it has already finished executing");
             return;
         }
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/TermuxTask.java b/termux-shared/src/main/java/com/termux/shared/shell/TermuxTask.java
index d8525430be..1234284d12 100644
--- a/termux-shared/src/main/java/com/termux/shared/shell/TermuxTask.java
+++ b/termux-shared/src/main/java/com/termux/shared/shell/TermuxTask.java
@@ -149,7 +149,7 @@ private void executeInner(@NonNull final Context context) throws IllegalThreadSt
                 STDIN.close();
                 //STDIN.write("exit\n".getBytes(StandardCharsets.UTF_8));
                 //STDIN.flush();
-            } catch(IOException e){
+            } catch(IOException e) {
                 if (e.getMessage().contains("EPIPE") || e.getMessage().contains("Stream closed")) {
                     // Method most horrid to catch broken pipe, in which case we
                     // do nothing. The command is not a shell, the shell closed
@@ -218,7 +218,7 @@ private void executeInner(@NonNull final Context context) throws IllegalThreadSt
      */
     public void killIfExecuting(@NonNull final Context context, boolean processResult) {
         // If execution command has already finished executing, then no need to process results or send SIGKILL
-        if(mExecutionCommand.hasExecuted()) {
+        if (mExecutionCommand.hasExecuted()) {
             Logger.logDebug(LOG_TAG, "Ignoring sending SIGKILL to \"" + mExecutionCommand.getCommandIdAndLabelLogString() + "\" TermuxTask since it has already finished executing");
             return;
         }

From 567eeca782fec8971b2682b5ef01c787674ea0b3 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Mon, 12 Apr 2021 20:20:26 +0500
Subject: [PATCH 341/912] Bump to v0.109

---
 app/build.gradle               | 4 ++--
 terminal-emulator/build.gradle | 2 +-
 terminal-view/build.gradle     | 2 +-
 termux-shared/build.gradle     | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index fc866cd572..7bcd6bed29 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -26,8 +26,8 @@ android {
         applicationId "com.termux"
         minSdkVersion project.properties.minSdkVersion.toInteger()
         targetSdkVersion project.properties.targetSdkVersion.toInteger()
-        versionCode 108
-        versionName "0.108"
+        versionCode 109
+        versionName "0.109"
 
         manifestPlaceholders.TERMUX_PACKAGE_NAME = "com.termux"
         manifestPlaceholders.TERMUX_APP_NAME = "Termux"
diff --git a/terminal-emulator/build.gradle b/terminal-emulator/build.gradle
index d899a96ff3..20232c6523 100644
--- a/terminal-emulator/build.gradle
+++ b/terminal-emulator/build.gradle
@@ -59,7 +59,7 @@ publishing {
         bar(MavenPublication) {
             groupId 'com.termux'
             artifactId 'terminal-emulator'
-            version '0.106.1'
+            version '0.109'
             artifact("$buildDir/outputs/aar/terminal-emulator-release.aar")
         }
     }
diff --git a/terminal-view/build.gradle b/terminal-view/build.gradle
index b196e223f4..d83e8b8390 100644
--- a/terminal-view/build.gradle
+++ b/terminal-view/build.gradle
@@ -37,7 +37,7 @@ publishing {
         bar(MavenPublication) {
             groupId 'com.termux'
             artifactId 'terminal-view'
-            version '0.106.1'
+            version '0.109'
             artifact("$buildDir/outputs/aar/terminal-view-release.aar")
         }
     }
diff --git a/termux-shared/build.gradle b/termux-shared/build.gradle
index a152325322..c01d8d6e4f 100644
--- a/termux-shared/build.gradle
+++ b/termux-shared/build.gradle
@@ -50,7 +50,7 @@ publishing {
         bar(MavenPublication) {
             groupId 'com.termux'
             artifactId 'termux-shared'
-            version '0.108'
+            version '0.109'
             artifact("$buildDir/outputs/aar/termux-shared-release.aar")
         }
     }

From bbb6f4471f6459d01660483c82f682c5ebc5a59b Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Tue, 13 Apr 2021 13:34:11 +0300
Subject: [PATCH 342/912] update bootstrap archives

---
 app/build.gradle | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 7bcd6bed29..4fb53eefff 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -155,11 +155,11 @@ clean {
 
 task downloadBootstraps() {
     doLast {
-        def version = "2021.02.19-r1"
-        downloadBootstrap("aarch64", "1e3d80bd8cc8771715845ab4a1e67fc125d84c4deda3a1a435116fe4d1f86160", version)
-        downloadBootstrap("arm",     "317a987cab3d4da6f9d42f024a5f25e3aaf8557b8ec68eaf80411fde6b8ea78d", version)
-        downloadBootstrap("i686",    "dd4632350474058fe5dec14b7bd882798bb3e9fe738b2de8c84a51a0b6395f4b", version)
-        downloadBootstrap("x86_64",  "5458119186c3ea631420833e59730461dc2a5faf17b8fad239823c88aa4569ae", version)
+        def version = "2021.04.13-r1"
+        downloadBootstrap("aarch64", "ff82e5755d947cd1f3e0b30916d125c6ddd8ba3254801ca7499d73653417e158", version)
+        downloadBootstrap("arm",     "53a7df2d6d0a36a8c9ab5259c8b5457c93b8bae8aec2321a470236b6da54e59a", version)
+        downloadBootstrap("i686",    "f0e1399a13ebed6c5229fde161f9848d9f5eeae7b8cd82f31250a813b52e371", version)
+        downloadBootstrap("x86_64",  "e36c4d8c933dc12b3f48937b7747c7a4dcfaa70f0dd89ad5e8b4465930075ae9", version)
     }
 }
 

From ffd8687b4cbc9ae9dab8f56384bfecab83a4049b Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Tue, 13 Apr 2021 16:09:31 +0500
Subject: [PATCH 343/912] Revert "Bump to v0.109"

---
 app/build.gradle               | 4 ++--
 terminal-emulator/build.gradle | 2 +-
 terminal-view/build.gradle     | 2 +-
 termux-shared/build.gradle     | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 7bcd6bed29..fc866cd572 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -26,8 +26,8 @@ android {
         applicationId "com.termux"
         minSdkVersion project.properties.minSdkVersion.toInteger()
         targetSdkVersion project.properties.targetSdkVersion.toInteger()
-        versionCode 109
-        versionName "0.109"
+        versionCode 108
+        versionName "0.108"
 
         manifestPlaceholders.TERMUX_PACKAGE_NAME = "com.termux"
         manifestPlaceholders.TERMUX_APP_NAME = "Termux"
diff --git a/terminal-emulator/build.gradle b/terminal-emulator/build.gradle
index 20232c6523..d899a96ff3 100644
--- a/terminal-emulator/build.gradle
+++ b/terminal-emulator/build.gradle
@@ -59,7 +59,7 @@ publishing {
         bar(MavenPublication) {
             groupId 'com.termux'
             artifactId 'terminal-emulator'
-            version '0.109'
+            version '0.106.1'
             artifact("$buildDir/outputs/aar/terminal-emulator-release.aar")
         }
     }
diff --git a/terminal-view/build.gradle b/terminal-view/build.gradle
index d83e8b8390..b196e223f4 100644
--- a/terminal-view/build.gradle
+++ b/terminal-view/build.gradle
@@ -37,7 +37,7 @@ publishing {
         bar(MavenPublication) {
             groupId 'com.termux'
             artifactId 'terminal-view'
-            version '0.109'
+            version '0.106.1'
             artifact("$buildDir/outputs/aar/terminal-view-release.aar")
         }
     }
diff --git a/termux-shared/build.gradle b/termux-shared/build.gradle
index c01d8d6e4f..a152325322 100644
--- a/termux-shared/build.gradle
+++ b/termux-shared/build.gradle
@@ -50,7 +50,7 @@ publishing {
         bar(MavenPublication) {
             groupId 'com.termux'
             artifactId 'termux-shared'
-            version '0.109'
+            version '0.108'
             artifact("$buildDir/outputs/aar/termux-shared-release.aar")
         }
     }

From b7b4a0a8a20147d78cbc541d4a88a421a25d2807 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Tue, 13 Apr 2021 16:20:47 +0500
Subject: [PATCH 344/912] Move TermuxTerminalSessionClientBase to
 com.termux.shared.terminal package

---
 app/src/main/java/com/termux/app/TermuxService.java             | 2 +-
 .../com/termux/app/terminal/TermuxTerminalSessionClient.java    | 2 +-
 .../{shell => terminal}/TermuxTerminalSessionClientBase.java    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename termux-shared/src/main/java/com/termux/shared/{shell => terminal}/TermuxTerminalSessionClientBase.java (97%)

diff --git a/app/src/main/java/com/termux/app/TermuxService.java b/app/src/main/java/com/termux/app/TermuxService.java
index c505645795..64ca368524 100644
--- a/app/src/main/java/com/termux/app/TermuxService.java
+++ b/app/src/main/java/com/termux/app/TermuxService.java
@@ -27,7 +27,7 @@
 import com.termux.shared.termux.TermuxConstants.TERMUX_APP.TERMUX_SERVICE;
 import com.termux.shared.settings.preferences.TermuxAppSharedPreferences;
 import com.termux.shared.shell.TermuxSession;
-import com.termux.shared.shell.TermuxTerminalSessionClientBase;
+import com.termux.shared.terminal.TermuxTerminalSessionClientBase;
 import com.termux.shared.logger.Logger;
 import com.termux.shared.notification.NotificationUtils;
 import com.termux.shared.packages.PermissionUtils;
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java
index 8beb797146..c1f1185b03 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java
@@ -16,7 +16,7 @@
 import com.termux.shared.shell.TermuxSession;
 import com.termux.shared.interact.DialogUtils;
 import com.termux.app.TermuxActivity;
-import com.termux.shared.shell.TermuxTerminalSessionClientBase;
+import com.termux.shared.terminal.TermuxTerminalSessionClientBase;
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.app.TermuxService;
 import com.termux.shared.settings.properties.TermuxPropertyConstants;
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/TermuxTerminalSessionClientBase.java b/termux-shared/src/main/java/com/termux/shared/terminal/TermuxTerminalSessionClientBase.java
similarity index 97%
rename from termux-shared/src/main/java/com/termux/shared/shell/TermuxTerminalSessionClientBase.java
rename to termux-shared/src/main/java/com/termux/shared/terminal/TermuxTerminalSessionClientBase.java
index ac5014c9e2..1f77eaa188 100644
--- a/termux-shared/src/main/java/com/termux/shared/shell/TermuxTerminalSessionClientBase.java
+++ b/termux-shared/src/main/java/com/termux/shared/terminal/TermuxTerminalSessionClientBase.java
@@ -1,4 +1,4 @@
-package com.termux.shared.shell;
+package com.termux.shared.terminal;
 
 import com.termux.shared.logger.Logger;
 import com.termux.terminal.TerminalSession;

From 1132028bd20cbff0691d8f1e2cace5f0864816c7 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Tue, 13 Apr 2021 16:34:24 +0500
Subject: [PATCH 345/912] Add TermuxTerminalViewClientBase to
 com.termux.shared.terminal package and extend that in
 TermuxTerminalViewClient

---
 .../terminal/TermuxTerminalViewClient.java    |  41 +------
 .../TermuxTerminalViewClientBase.java         | 105 ++++++++++++++++++
 2 files changed, 107 insertions(+), 39 deletions(-)
 create mode 100644 termux-shared/src/main/java/com/termux/shared/terminal/TermuxTerminalViewClientBase.java

diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
index 39ca33d94b..e906b01cca 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
@@ -21,6 +21,7 @@
 import com.termux.R;
 import com.termux.app.TermuxActivity;
 import com.termux.shared.shell.ShellUtils;
+import com.termux.shared.terminal.TermuxTerminalViewClientBase;
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.app.activities.ReportActivity;
 import com.termux.app.models.ReportInfo;
@@ -35,7 +36,6 @@
 import com.termux.terminal.KeyHandler;
 import com.termux.terminal.TerminalEmulator;
 import com.termux.terminal.TerminalSession;
-import com.termux.view.TerminalViewClient;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -44,7 +44,7 @@
 
 import androidx.drawerlayout.widget.DrawerLayout;
 
-public class TermuxTerminalViewClient implements TerminalViewClient {
+public class TermuxTerminalViewClient extends TermuxTerminalViewClientBase {
 
     final TermuxActivity mActivity;
 
@@ -440,41 +440,4 @@ public void doPaste() {
             session.getEmulator().paste(paste.toString());
     }
 
-
-
-    @Override
-    public void logError(String tag, String message) {
-        Logger.logError(tag, message);
-    }
-
-    @Override
-    public void logWarn(String tag, String message) {
-        Logger.logWarn(tag, message);
-    }
-
-    @Override
-    public void logInfo(String tag, String message) {
-        Logger.logInfo(tag, message);
-    }
-
-    @Override
-    public void logDebug(String tag, String message) {
-        Logger.logDebug(tag, message);
-    }
-
-    @Override
-    public void logVerbose(String tag, String message) {
-        Logger.logVerbose(tag, message);
-    }
-
-    @Override
-    public void logStackTraceWithMessage(String tag, String message, Exception e) {
-        Logger.logStackTraceWithMessage(tag, message, e);
-    }
-
-    @Override
-    public void logStackTrace(String tag, Exception e) {
-        Logger.logStackTrace(tag, e);
-    }
-
 }
diff --git a/termux-shared/src/main/java/com/termux/shared/terminal/TermuxTerminalViewClientBase.java b/termux-shared/src/main/java/com/termux/shared/terminal/TermuxTerminalViewClientBase.java
new file mode 100644
index 0000000000..701582ad69
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/terminal/TermuxTerminalViewClientBase.java
@@ -0,0 +1,105 @@
+package com.termux.shared.terminal;
+
+import android.view.KeyEvent;
+import android.view.MotionEvent;
+
+import com.termux.shared.logger.Logger;
+import com.termux.terminal.TerminalSession;
+import com.termux.view.TerminalViewClient;
+
+public class TermuxTerminalViewClientBase implements TerminalViewClient {
+
+    public TermuxTerminalViewClientBase() {
+    }
+
+    @Override
+    public float onScale(float scale) {
+        return 1.0f;
+    }
+
+    @Override
+    public void onSingleTapUp(MotionEvent e) {
+    }
+
+    public boolean shouldBackButtonBeMappedToEscape() {
+        return false;
+    }
+
+    public boolean shouldEnforceCharBasedInput() {
+        return false;
+    }
+
+    public boolean shouldUseCtrlSpaceWorkaround() {
+        return false;
+    }
+
+    @Override
+    public void copyModeChanged(boolean copyMode) {
+    }
+
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent e, TerminalSession session) {
+        return false;
+    }
+
+    @Override
+    public boolean onKeyUp(int keyCode, KeyEvent e) {
+        return false;
+    }
+
+    @Override
+    public boolean onLongPress(MotionEvent event) {
+        return false;
+    }
+
+    @Override
+    public boolean readControlKey() {
+        return false;
+    }
+
+    @Override
+    public boolean readAltKey() {
+        return false;
+    }
+
+    @Override
+    public boolean onCodePoint(int codePoint, boolean ctrlDown, TerminalSession session) {
+        return false;
+    }
+
+    @Override
+    public void logError(String tag, String message) {
+        Logger.logError(tag, message);
+    }
+
+    @Override
+    public void logWarn(String tag, String message) {
+        Logger.logWarn(tag, message);
+    }
+
+    @Override
+    public void logInfo(String tag, String message) {
+        Logger.logInfo(tag, message);
+    }
+
+    @Override
+    public void logDebug(String tag, String message) {
+        Logger.logDebug(tag, message);
+    }
+
+    @Override
+    public void logVerbose(String tag, String message) {
+        Logger.logVerbose(tag, message);
+    }
+
+    @Override
+    public void logStackTraceWithMessage(String tag, String message, Exception e) {
+        Logger.logStackTraceWithMessage(tag, message, e);
+    }
+
+    @Override
+    public void logStackTrace(String tag, Exception e) {
+        Logger.logStackTrace(tag, e);
+    }
+
+}

From d19cf435be6f7f4456400bedde03be5f3ffcb7f1 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Tue, 13 Apr 2021 16:57:24 +0500
Subject: [PATCH 346/912] Add ".sh" extension to apt_info_script file

---
 .../main/res/raw/{apt_info_script. => apt_info_script.sh}    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
 rename termux-shared/src/main/res/raw/{apt_info_script. => apt_info_script.sh} (94%)

diff --git a/termux-shared/src/main/res/raw/apt_info_script. b/termux-shared/src/main/res/raw/apt_info_script.sh
similarity index 94%
rename from termux-shared/src/main/res/raw/apt_info_script.
rename to termux-shared/src/main/res/raw/apt_info_script.sh
index 3319e9ba18..4812c1003d 100644
--- a/termux-shared/src/main/res/raw/apt_info_script.
+++ b/termux-shared/src/main/res/raw/apt_info_script.sh
@@ -20,7 +20,7 @@ subscribed_repositories() {
 			else
 				echo "#### sources.list.d/$(basename "$filename")"
 			fi
-			echo "\`$supl_sources\`"
+			echo "\`$supl_sources\`  "
 		fi
 	done < <(find "@TERMUX_PREFIX@/etc/apt/sources.list.d" -maxdepth 1 ! -type d)
 }
@@ -37,7 +37,7 @@ updatable_packages() {
 		if [ -z "$updatable" ];then
 			echo "All packages up to date"
 		else
-			echo "\`$updatable\`"
+			echo $'```\n'"$updatable"$'\n```\n'
 		fi
 	fi
 }
@@ -50,6 +50,7 @@ $(subscribed_repositories)
 
 
 ### Updatable Packages
+
 $(updatable_packages)
 ##
 

From ae1c9bacd6f58bf550cba28e9a0b66e969307a44 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Tue, 13 Apr 2021 16:58:18 +0500
Subject: [PATCH 347/912] Bump to v0.109

---
 app/build.gradle               | 4 ++--
 terminal-emulator/build.gradle | 2 +-
 terminal-view/build.gradle     | 2 +-
 termux-shared/build.gradle     | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index fc866cd572..7bcd6bed29 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -26,8 +26,8 @@ android {
         applicationId "com.termux"
         minSdkVersion project.properties.minSdkVersion.toInteger()
         targetSdkVersion project.properties.targetSdkVersion.toInteger()
-        versionCode 108
-        versionName "0.108"
+        versionCode 109
+        versionName "0.109"
 
         manifestPlaceholders.TERMUX_PACKAGE_NAME = "com.termux"
         manifestPlaceholders.TERMUX_APP_NAME = "Termux"
diff --git a/terminal-emulator/build.gradle b/terminal-emulator/build.gradle
index d899a96ff3..20232c6523 100644
--- a/terminal-emulator/build.gradle
+++ b/terminal-emulator/build.gradle
@@ -59,7 +59,7 @@ publishing {
         bar(MavenPublication) {
             groupId 'com.termux'
             artifactId 'terminal-emulator'
-            version '0.106.1'
+            version '0.109'
             artifact("$buildDir/outputs/aar/terminal-emulator-release.aar")
         }
     }
diff --git a/terminal-view/build.gradle b/terminal-view/build.gradle
index b196e223f4..d83e8b8390 100644
--- a/terminal-view/build.gradle
+++ b/terminal-view/build.gradle
@@ -37,7 +37,7 @@ publishing {
         bar(MavenPublication) {
             groupId 'com.termux'
             artifactId 'terminal-view'
-            version '0.106.1'
+            version '0.109'
             artifact("$buildDir/outputs/aar/terminal-view-release.aar")
         }
     }
diff --git a/termux-shared/build.gradle b/termux-shared/build.gradle
index a152325322..c01d8d6e4f 100644
--- a/termux-shared/build.gradle
+++ b/termux-shared/build.gradle
@@ -50,7 +50,7 @@ publishing {
         bar(MavenPublication) {
             groupId 'com.termux'
             artifactId 'termux-shared'
-            version '0.108'
+            version '0.109'
             artifact("$buildDir/outputs/aar/termux-shared-release.aar")
         }
     }

From cde0bd22465cc1e05c6e362910befcc2f1cea628 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 15 Apr 2021 02:15:55 +0500
Subject: [PATCH 348/912] Prevent DebuggingPreferencesFragment and
 TerminalIOPreferencesFragment from being removed during minification

Fixes #2005
---
 .../app/fragments/settings/DebuggingPreferencesFragment.java    | 2 ++
 .../app/fragments/settings/TerminalIOPreferencesFragment.java   | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/app/src/main/java/com/termux/app/fragments/settings/DebuggingPreferencesFragment.java b/app/src/main/java/com/termux/app/fragments/settings/DebuggingPreferencesFragment.java
index 09da15c3ed..814426b66e 100644
--- a/app/src/main/java/com/termux/app/fragments/settings/DebuggingPreferencesFragment.java
+++ b/app/src/main/java/com/termux/app/fragments/settings/DebuggingPreferencesFragment.java
@@ -3,6 +3,7 @@
 import android.content.Context;
 import android.os.Bundle;
 
+import androidx.annotation.Keep;
 import androidx.annotation.Nullable;
 import androidx.preference.ListPreference;
 import androidx.preference.PreferenceCategory;
@@ -14,6 +15,7 @@
 import com.termux.shared.settings.preferences.TermuxAppSharedPreferences;
 import com.termux.shared.logger.Logger;
 
+@Keep
 public class DebuggingPreferencesFragment extends PreferenceFragmentCompat {
 
     @Override
diff --git a/app/src/main/java/com/termux/app/fragments/settings/TerminalIOPreferencesFragment.java b/app/src/main/java/com/termux/app/fragments/settings/TerminalIOPreferencesFragment.java
index 987f9dadbe..ef0a56c2c8 100644
--- a/app/src/main/java/com/termux/app/fragments/settings/TerminalIOPreferencesFragment.java
+++ b/app/src/main/java/com/termux/app/fragments/settings/TerminalIOPreferencesFragment.java
@@ -3,6 +3,7 @@
 import android.content.Context;
 import android.os.Bundle;
 
+import androidx.annotation.Keep;
 import androidx.preference.PreferenceDataStore;
 import androidx.preference.PreferenceFragmentCompat;
 import androidx.preference.PreferenceManager;
@@ -10,6 +11,7 @@
 import com.termux.R;
 import com.termux.shared.settings.preferences.TermuxAppSharedPreferences;
 
+@Keep
 public class TerminalIOPreferencesFragment extends PreferenceFragmentCompat {
 
     @Override

From 3306c3c2a2691324b67ea3005f08cb5a35a9f306 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 15 Apr 2021 05:01:41 +0500
Subject: [PATCH 349/912] Add support to include source jar files for libraries
 published by termux

---
 terminal-emulator/build.gradle | 5 +++++
 terminal-view/build.gradle     | 8 +++++++-
 termux-shared/build.gradle     | 6 ++++++
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/terminal-emulator/build.gradle b/terminal-emulator/build.gradle
index 20232c6523..9a046c5e5b 100644
--- a/terminal-emulator/build.gradle
+++ b/terminal-emulator/build.gradle
@@ -53,6 +53,10 @@ dependencies {
     testImplementation 'junit:junit:4.13.2'
 }
 
+task sourceJar(type: Jar) {
+    from android.sourceSets.main.java.srcDirs
+    classifier "sources"
+}
 
 publishing {
     publications {
@@ -60,6 +64,7 @@ publishing {
             groupId 'com.termux'
             artifactId 'terminal-emulator'
             version '0.109'
+            artifact(sourceJar)
             artifact("$buildDir/outputs/aar/terminal-emulator-release.aar")
         }
     }
diff --git a/terminal-view/build.gradle b/terminal-view/build.gradle
index d83e8b8390..e41d9e8049 100644
--- a/terminal-view/build.gradle
+++ b/terminal-view/build.gradle
@@ -29,7 +29,12 @@ android {
 }
 
 dependencies {
-    testImplementation 'junit:junit:4.13.1'
+    testImplementation 'junit:junit:4.13.2'
+}
+
+task sourceJar(type: Jar) {
+    from android.sourceSets.main.java.srcDirs
+    classifier "sources"
 }
 
 publishing {
@@ -38,6 +43,7 @@ publishing {
             groupId 'com.termux'
             artifactId 'terminal-view'
             version '0.109'
+            artifact(sourceJar)
             artifact("$buildDir/outputs/aar/terminal-view-release.aar")
         }
     }
diff --git a/termux-shared/build.gradle b/termux-shared/build.gradle
index c01d8d6e4f..f3202df361 100644
--- a/termux-shared/build.gradle
+++ b/termux-shared/build.gradle
@@ -45,12 +45,18 @@ dependencies {
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 }
 
+task sourceJar(type: Jar) {
+    from android.sourceSets.main.java.srcDirs
+    classifier "sources"
+}
+
 publishing {
     publications {
         bar(MavenPublication) {
             groupId 'com.termux'
             artifactId 'termux-shared'
             version '0.109'
+            artifact(sourceJar)
             artifact("$buildDir/outputs/aar/termux-shared-release.aar")
         }
     }

From 3af5730354a5f78eb5d1e279a2ca51af9b817e30 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 15 Apr 2021 05:03:44 +0500
Subject: [PATCH 350/912] Add support for allowing IDE to show documentation in
 .gradle files

---
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 4d9ca16491..1f3fdbc528 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From a6ae656c9fa87e0b97e7c7b2ae346f936911b38c Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 15 Apr 2021 05:14:31 +0500
Subject: [PATCH 351/912] Bump to v0.110

---
 app/build.gradle               | 4 ++--
 gradle.properties              | 3 +++
 terminal-emulator/build.gradle | 2 +-
 terminal-view/build.gradle     | 2 +-
 termux-shared/build.gradle     | 2 +-
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 4fb53eefff..7f3af26eb7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -26,8 +26,8 @@ android {
         applicationId "com.termux"
         minSdkVersion project.properties.minSdkVersion.toInteger()
         targetSdkVersion project.properties.targetSdkVersion.toInteger()
-        versionCode 109
-        versionName "0.109"
+        versionCode project.properties.termuxVersionCode.toInteger()
+        versionName project.properties.termuxVersion
 
         manifestPlaceholders.TERMUX_PACKAGE_NAME = "com.termux"
         manifestPlaceholders.TERMUX_APP_NAME = "Termux"
diff --git a/gradle.properties b/gradle.properties
index b0b9199f6a..9875614951 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -15,6 +15,9 @@
 org.gradle.jvmargs=-Xmx2048M
 android.useAndroidX=true
 
+termuxVersion=0.110
+termuxVersionCode=110
+
 minSdkVersion=24
 targetSdkVersion=28
 ndkVersion=22.0.7026061
diff --git a/terminal-emulator/build.gradle b/terminal-emulator/build.gradle
index 9a046c5e5b..54417be303 100644
--- a/terminal-emulator/build.gradle
+++ b/terminal-emulator/build.gradle
@@ -63,7 +63,7 @@ publishing {
         bar(MavenPublication) {
             groupId 'com.termux'
             artifactId 'terminal-emulator'
-            version '0.109'
+            version project.properties.termuxVersion
             artifact(sourceJar)
             artifact("$buildDir/outputs/aar/terminal-emulator-release.aar")
         }
diff --git a/terminal-view/build.gradle b/terminal-view/build.gradle
index e41d9e8049..565fb766c9 100644
--- a/terminal-view/build.gradle
+++ b/terminal-view/build.gradle
@@ -42,7 +42,7 @@ publishing {
         bar(MavenPublication) {
             groupId 'com.termux'
             artifactId 'terminal-view'
-            version '0.109'
+            version project.properties.termuxVersion
             artifact(sourceJar)
             artifact("$buildDir/outputs/aar/terminal-view-release.aar")
         }
diff --git a/termux-shared/build.gradle b/termux-shared/build.gradle
index f3202df361..c4de70873c 100644
--- a/termux-shared/build.gradle
+++ b/termux-shared/build.gradle
@@ -55,7 +55,7 @@ publishing {
         bar(MavenPublication) {
             groupId 'com.termux'
             artifactId 'termux-shared'
-            version '0.109'
+            version project.properties.termuxVersion
             artifact(sourceJar)
             artifact("$buildDir/outputs/aar/termux-shared-release.aar")
         }

From d6eb5e3511587780e0899cde43a7b0760bce4622 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Tue, 20 Apr 2021 12:39:54 +0500
Subject: [PATCH 352/912] Fix termux-reset

The TMPDIR was being automatically cleared and recreated even if it didn't already exist when TermuxService was stopped. This left an empty TMPDIR in the PREFIX directory when termux-reset was run and on termux restart the bootstrap wasn't installed again because PREFIX directory already existed. This resulted in a broken environment since no binaries/libs existed under PREFIX and /system/bin/sh was loaded.

This issue was created due to v0.109.
---
 app/src/main/java/com/termux/app/TermuxService.java          | 2 +-
 .../src/main/java/com/termux/shared/shell/ShellUtils.java    | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxService.java b/app/src/main/java/com/termux/app/TermuxService.java
index 64ca368524..39c92023be 100644
--- a/app/src/main/java/com/termux/app/TermuxService.java
+++ b/app/src/main/java/com/termux/app/TermuxService.java
@@ -157,7 +157,7 @@ public int onStartCommand(Intent intent, int flags, int startId) {
     public void onDestroy() {
         Logger.logVerbose(LOG_TAG, "onDestroy");
 
-        ShellUtils.clearTermuxTMPDIR(this);
+        ShellUtils.clearTermuxTMPDIR(this, true);
 
         actionReleaseWakeLock(false);
         if (!mWantsToStop)
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/ShellUtils.java b/termux-shared/src/main/java/com/termux/shared/shell/ShellUtils.java
index af32758e28..47ad08bbe7 100644
--- a/termux-shared/src/main/java/com/termux/shared/shell/ShellUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/shell/ShellUtils.java
@@ -150,7 +150,10 @@ public static String getExecutableBasename(String executable) {
         return (lastSlash == -1) ? executable : executable.substring(lastSlash + 1);
     }
 
-    public static void clearTermuxTMPDIR(Context context) {
+    public static void clearTermuxTMPDIR(Context context, boolean onlyIfExists) {
+        if(onlyIfExists && !FileUtils.directoryFileExists(TermuxConstants.TERMUX_TMP_PREFIX_DIR_PATH, false))
+            return;
+
         String errmsg;
         errmsg = FileUtils.clearDirectory(context, "$TMPDIR", FileUtils.getCanonicalPath(TermuxConstants.TERMUX_TMP_PREFIX_DIR_PATH, null, false));
         if (errmsg != null) {

From 107927f5a15028c0be35d28bfe7e188cca655d0a Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Tue, 20 Apr 2021 12:49:43 +0500
Subject: [PATCH 353/912] Fix cases where bootstrap was not reinstalled even if
 PREFIX was broken

The TermuxInstaller.setupBootstrapIfNeeded() previously only checked if PREFIX directory existed or not to decide whether to install bootstrap or not. Now it will also check if its empty or only contains the tmp directory, since in that case the PREFIX must be deleted and bootstrap reinstalled, otherwise a broken environment will be loaded since no termux binaries/libs would exist.

It will now also delete any file at the prefix or staging prefix path, even if its not a directory. If the user does not want the bootstrap to be installed for some reason, then any other file other than "tmp" can be created under PREFIX.
---
 .../java/com/termux/app/TermuxInstaller.java  | 28 +++++++++++++++----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxInstaller.java b/app/src/main/java/com/termux/app/TermuxInstaller.java
index bc25838043..5b3b6b2bc9 100644
--- a/app/src/main/java/com/termux/app/TermuxInstaller.java
+++ b/app/src/main/java/com/termux/app/TermuxInstaller.java
@@ -62,10 +62,21 @@ static void setupBootstrapIfNeeded(final Activity activity, final Runnable whenD
             return;
         }
 
+        final String PREFIX_FILE_PATH = TermuxConstants.TERMUX_PREFIX_DIR_PATH;
         final File PREFIX_FILE = TermuxConstants.TERMUX_PREFIX_DIR;
-        if (PREFIX_FILE.isDirectory()) {
-            whenDone.run();
-            return;
+
+        // If prefix directory exists
+        if (FileUtils.directoryFileExists(PREFIX_FILE_PATH, false)) {
+             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 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);
@@ -80,12 +91,19 @@ public void run() {
                     final String STAGING_PREFIX_PATH = TermuxConstants.TERMUX_STAGING_PREFIX_DIR_PATH;
                     final File STAGING_PREFIX_FILE = new File(STAGING_PREFIX_PATH);
 
-                    errmsg = FileUtils.clearDirectory(activity, "prefix staging directory", STAGING_PREFIX_PATH);
+                    // Delete prefix staging directory or any file at its destination
+                    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
+                    errmsg = FileUtils.deleteFile(activity, "prefix directory", PREFIX_FILE_PATH, true);
                     if (errmsg != null) {
                         throw new RuntimeException(errmsg);
                     }
 
-                    Logger.logInfo(LOG_TAG, "Extracting bootstrap zip to prefix staging directory \"" + TermuxConstants.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);

From 1d06ff9bf0abe8dd206dcb527979c4fa02eb5e49 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Tue, 20 Apr 2021 13:05:15 +0500
Subject: [PATCH 354/912] Bump gradle to v7.0

---
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 1f3fdbc528..3c4101c3ec 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From 5d911ef93f3a71ad59f15f8edf48a74a99027e2a Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 21 Apr 2021 07:01:59 +0500
Subject: [PATCH 355/912] Bump to v0.111

---
 gradle.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 9875614951..99681235a6 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -15,8 +15,8 @@
 org.gradle.jvmargs=-Xmx2048M
 android.useAndroidX=true
 
-termuxVersion=0.110
-termuxVersionCode=110
+termuxVersion=0.111
+termuxVersionCode=111
 
 minSdkVersion=24
 targetSdkVersion=28

From 0fe608f91ebfb1cdc7ac0025e810d153a39fa199 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 21 Apr 2021 13:55:25 +0500
Subject: [PATCH 356/912] Revert "Bump to v0.111"

This reverts commit 5d911ef93f3a71ad59f15f8edf48a74a99027e2a.
---
 gradle.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 99681235a6..9875614951 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -15,8 +15,8 @@
 org.gradle.jvmargs=-Xmx2048M
 android.useAndroidX=true
 
-termuxVersion=0.111
-termuxVersionCode=111
+termuxVersion=0.110
+termuxVersionCode=110
 
 minSdkVersion=24
 targetSdkVersion=28

From b34f60b1b0368666fb2c3edca203fcad74241762 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 21 Apr 2021 14:06:57 +0500
Subject: [PATCH 357/912] Fix the bootstrap reinstallation logic for when
 PREFIX is a symlink

Changes were made to bootstrap reinstallation logic in 107927f5, but it wasn't considering that PREFIX may be a symlink file to a directory instead of a directory file. With this commit, the previous behaviour of termux is restored where PREFIX can optionally be a symlink to a valid directory where the symlink isn't broken/dangling.
---
 app/src/main/java/com/termux/app/TermuxInstaller.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxInstaller.java b/app/src/main/java/com/termux/app/TermuxInstaller.java
index 5b3b6b2bc9..a600e534d5 100644
--- a/app/src/main/java/com/termux/app/TermuxInstaller.java
+++ b/app/src/main/java/com/termux/app/TermuxInstaller.java
@@ -65,8 +65,8 @@ static void setupBootstrapIfNeeded(final Activity activity, final Runnable whenD
         final String PREFIX_FILE_PATH = TermuxConstants.TERMUX_PREFIX_DIR_PATH;
         final File PREFIX_FILE = TermuxConstants.TERMUX_PREFIX_DIR;
 
-        // If prefix directory exists
-        if (FileUtils.directoryFileExists(PREFIX_FILE_PATH, false)) {
+        // If prefix directory exists, even if its a symlink to a valid directory and symlink is not broken/dangling
+        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()))) {

From 8f9771adceb9c2d2b0e59e3422d76f6acf7ebc6c Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 21 Apr 2021 14:07:25 +0500
Subject: [PATCH 358/912] Bump to v0.111

---
 gradle.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 9875614951..99681235a6 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -15,8 +15,8 @@
 org.gradle.jvmargs=-Xmx2048M
 android.useAndroidX=true
 
-termuxVersion=0.110
-termuxVersionCode=110
+termuxVersion=0.111
+termuxVersionCode=111
 
 minSdkVersion=24
 targetSdkVersion=28

From c9abfe5438761b5f87ba3a7a815b38b761b99e97 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 21 Apr 2021 16:51:08 +0500
Subject: [PATCH 359/912] Update README

---
 README.md | 41 +++++++++++++++++++++++++++++++++--------
 1 file changed, 33 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 0eecba0068..7b1ef24b26 100644
--- a/README.md
+++ b/README.md
@@ -25,16 +25,32 @@ Issue https://github.com/termux/termux-app/issues/1072 needs extra attention.
 
 ## Installation
 
-Termux application can be obtained from [F-Droid](https://f-droid.org/en/packages/com.termux/).
+Termux can be obtained through various sources listed below.
+
+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 an error on installation but 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 app or its plugin APKs from your device first, then install all new APKs from the same new source.
+
+Following is a list of Termux app and its plugins.
+
+- [Termux](https://github.com/termux/termux-app)
+- [Termux:API](https://github.com/termux/termux-api)
+- [Termux:Boot](https://github.com/termux/termux-boot)
+- [Termux:Float](https://github.com/termux/termux-float)
+- [Termux:Styling](https://github.com/termux/termux-styling)
+- [Termux:Tasker](https://github.com/termux/termux-tasker)
+- [Termux:Widget](https://github.com/termux/termux-widget)
+
+ If you wish to install Termux from a difference source, you must uninstall all the apps listed above before installing from new source. Go to `Android Settings` -> `Applications` and then look for the following 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, its strongly suggesting to go through the application list in Android settings and double check if installation is failing.
+
+### F-Droid
+
+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.
+
+### Debug Builds
+
+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.
+##
 
-Additionally we provide per-commit debug builds for those who want to try
-out the latest features or test their pull request. This build can be obtained
-from one of the workflow runs listed on [Github Actions](https://github.com/termux/termux-app/actions)
-page.
 
-Signature keys of all offered builds are different. Before you switch the
-installation source, you will have to uninstall the Termux application and
-all currently installed plugins.
 
 ## Terminal resources
 
@@ -68,3 +84,12 @@ all currently installed plugins.
 
 - Android Terminal Emulator: Android terminal app which Termux terminal handling
   is based on. Inactive. [Source](https://github.com/jackpal/Android-Terminal-Emulator).
+##
+
+
+
+## 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 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 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.

From 01f2ed089289b01b05c06edfdc1d8095f2770e1d Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 21 Apr 2021 16:51:20 +0500
Subject: [PATCH 360/912] Update LICENSE

---
 LICENSE.md | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/LICENSE.md b/LICENSE.md
index 7e951d4453..5beaae1c97 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,3 +1,7 @@
-Released under [the GPLv3 license](https://www.gnu.org/licenses/gpl.html).
+This repository is released under [GPLv3 only](https://www.gnu.org/licenses/gpl-3.0.html) license.
 
-Contains code from `Terminal Emulator for Android` by which is released under [the Apache License 2.0](https://www.apache.org/licenses/).
+### 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 [terminal-shared](#terminal-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 [terminal-shared](#terminal-shared) module.

From fdcf6cb6e1412e0337dc0bd2139f4aa03adac7d9 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 21 Apr 2021 17:00:38 +0500
Subject: [PATCH 361/912] Update LICENSE

---
 LICENSE.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/LICENSE.md b/LICENSE.md
index 5beaae1c97..ae2940e342 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -2,6 +2,6 @@ This repository is released under [GPLv3 only](https://www.gnu.org/licenses/gpl-
 
 ### 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 [terminal-shared](#terminal-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 [terminal-shared](#terminal-shared) module.
+- [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 [terminal-shared](terminal-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 [terminal-shared](terminal-shared) module.

From 2e156d462121e0dd2a00593b185130ef2435700c Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 21 Apr 2021 17:01:52 +0500
Subject: [PATCH 362/912] Update LICENSE

---
 LICENSE.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/LICENSE.md b/LICENSE.md
index ae2940e342..f6dd0a8b5b 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -3,5 +3,5 @@ This repository is released under [GPLv3 only](https://www.gnu.org/licenses/gpl-
 ### 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 [terminal-shared](terminal-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 [terminal-shared](terminal-shared) module.
+- [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.

From 0aa5a123b7adfe4fc01d76d60ce47ed20d382658 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 22 Apr 2021 19:57:08 +0500
Subject: [PATCH 363/912] Bump to v0.112

This only reverts the versioning login change done in a6ae656c since that caused F-Droid bot and Github Packages to fail to pick up new releases. The versions must be bumped directly in `build.gradle` file in future and not through other files like `gradle.properties`.
---
 app/build.gradle               | 4 ++--
 terminal-emulator/build.gradle | 2 +-
 terminal-view/build.gradle     | 2 +-
 termux-shared/build.gradle     | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 7f3af26eb7..30124a4aef 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -26,8 +26,8 @@ android {
         applicationId "com.termux"
         minSdkVersion project.properties.minSdkVersion.toInteger()
         targetSdkVersion project.properties.targetSdkVersion.toInteger()
-        versionCode project.properties.termuxVersionCode.toInteger()
-        versionName project.properties.termuxVersion
+        versionCode 112
+        versionName "0.112"
 
         manifestPlaceholders.TERMUX_PACKAGE_NAME = "com.termux"
         manifestPlaceholders.TERMUX_APP_NAME = "Termux"
diff --git a/terminal-emulator/build.gradle b/terminal-emulator/build.gradle
index 54417be303..db3f3e39e6 100644
--- a/terminal-emulator/build.gradle
+++ b/terminal-emulator/build.gradle
@@ -63,7 +63,7 @@ publishing {
         bar(MavenPublication) {
             groupId 'com.termux'
             artifactId 'terminal-emulator'
-            version project.properties.termuxVersion
+            version "0.112"
             artifact(sourceJar)
             artifact("$buildDir/outputs/aar/terminal-emulator-release.aar")
         }
diff --git a/terminal-view/build.gradle b/terminal-view/build.gradle
index 565fb766c9..3e78671ba2 100644
--- a/terminal-view/build.gradle
+++ b/terminal-view/build.gradle
@@ -42,7 +42,7 @@ publishing {
         bar(MavenPublication) {
             groupId 'com.termux'
             artifactId 'terminal-view'
-            version project.properties.termuxVersion
+            version "0.112"
             artifact(sourceJar)
             artifact("$buildDir/outputs/aar/terminal-view-release.aar")
         }
diff --git a/termux-shared/build.gradle b/termux-shared/build.gradle
index c4de70873c..b34e407bbb 100644
--- a/termux-shared/build.gradle
+++ b/termux-shared/build.gradle
@@ -55,7 +55,7 @@ publishing {
         bar(MavenPublication) {
             groupId 'com.termux'
             artifactId 'termux-shared'
-            version project.properties.termuxVersion
+            version "0.112"
             artifact(sourceJar)
             artifact("$buildDir/outputs/aar/termux-shared-release.aar")
         }

From 0d4bfb7bd5dfc640fa73e3aa197578e34fa155f3 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Mon, 26 Apr 2021 01:11:35 +0200
Subject: [PATCH 364/912] Replace jcenter() with mavenCentral()

This is since JCenter is being shut down.
---
 build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 78a9f1b233..01d0fe73a4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
     repositories {
-        jcenter()
+        mavenCentral()
         google()
     }
     dependencies {
@@ -11,7 +11,7 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 

From 93e1b132786d5cc7b314f2e42fa3430fb0a4103a Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Mon, 26 Apr 2021 12:43:55 +0500
Subject: [PATCH 365/912] Update README

---
 README.md | 117 ++++++++++++++++++++++++++++++++++++++----------------
 1 file changed, 82 insertions(+), 35 deletions(-)

diff --git a/README.md b/README.md
index 7b1ef24b26..a961421bee 100644
--- a/README.md
+++ b/README.md
@@ -6,40 +6,46 @@
 
 [Termux](https://termux.com) is an Android terminal application and Linux environment.
 
-- [Termux Reddit community](https://reddit.com/r/termux)
-- [Termux Wiki](https://wiki.termux.com/wiki/)
-- [Termux Twitter](http://twitter.com/termux/)
-
-Note that this repository is for the app itself (the user interface and the
-terminal emulation). For the packages installable inside the app, see
-[termux/termux-packages](https://github.com/termux/termux-packages)
+Note that this repository is for the app itself (the user interface and the terminal emulation). For the packages installable inside the app, see [termux/termux-packages](https://github.com/termux/termux-packages).
 
 ***
 
-**@termux is looking for Termux Application maintainer for implementing new features,
-fixing bugs and reviewing pull requests since 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.
 
 ***
 
-## Installation
+### Contents
+- [Termux App and Plugins](#Termux-App-and-Plugins)
+- [Installation](#Installation)
+- [Uninstallation](#Uninstallation)
+- [Important Links](#Important-Links)
+##
 
-Termux can be obtained through various sources listed below.
 
-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 an error on installation but 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 app or its plugin APKs from your device first, then install all new APKs from the same new source.
 
-Following is a list of Termux app and its plugins.
+## Termux App and Plugins
+
+The core [Termux](https://github.com/termux/termux-app) app comes with the following optional plugin apps.
 
-- [Termux](https://github.com/termux/termux-app)
 - [Termux:API](https://github.com/termux/termux-api)
 - [Termux:Boot](https://github.com/termux/termux-boot)
 - [Termux:Float](https://github.com/termux/termux-float)
 - [Termux:Styling](https://github.com/termux/termux-styling)
 - [Termux:Tasker](https://github.com/termux/termux-tasker)
 - [Termux:Widget](https://github.com/termux/termux-widget)
+##
 
- If you wish to install Termux from a difference source, you must uninstall all the apps listed above before installing from new source. Go to `Android Settings` -> `Applications` and then look for the following 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, its strongly suggesting to go through the application list in Android settings and double check if installation is failing.
+
+
+## Installation
+
+Termux can be obtained through various sources listed below.
+
+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 an error on installation but 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 uninstallation.
 
 ### F-Droid
 
@@ -48,48 +54,89 @@ Termux application can be obtained from F-Droid [here](https://f-droid.org/en/pa
 ### Debug Builds
 
 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.
+
+### Google Playstore **(Deprecated)**
+
+**Termux and its plugins are no longer updated on playstore due to [android 10 issues](https://play.google.com/store/apps/details?id=com.termux).** There are currently no immediate plans to resume updates on 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 switch to a different mirror and then run `pkg upgrade` command to update all packages to the latest available versions if you want, 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 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 its available on your device and search `termux` in the applications list.
+
+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.
 ##
 
 
 
-## Terminal resources
+## Important Links
+
+### Community
+All community links are available [here](https://wiki.termux.com/wiki/Community).
+
+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](http://twitter.com/termux/)
+- [Termux Reports Email](mailto:termuxreports@groups.io)
+
+### Wikis
+
+- [Termux Wiki](https://wiki.termux.com/wiki/)
+- [Termux App Wiki](https://github.com/termux/termux-app/wiki)
+- [Termux Packages Wiki](https://github.com/termux/termux-packages/wiki)
+
+### Miscellaneous
+- [FAQ](https://wiki.termux.com/wiki/FAQ)
+- [Termux File System Layout](https://github.com/termux/termux-packages/wiki/Termux-file-system-layout)
+- [Differences From Linux](https://wiki.termux.com/wiki/Differences_from_Linux)
+- [Package Management](https://wiki.termux.com/wiki/Package_Management)
+- [Remote_Access](https://wiki.termux.com/wiki/Remote_Access)
+- [Backing up Termux](https://wiki.termux.com/wiki/Backing_up_Termux)
+- [Terminal Settings](https://wiki.termux.com/wiki/Terminal_Settings)
+- [Touch Keyboard](https://wiki.termux.com/wiki/Touch_Keyboard)
+- [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)
+- [Termux and Android 10](https://github.com/termux/termux-packages/wiki/Termux-and-Android-10)
+
+### Terminal resources
 
 - [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
+### 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).
+- 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](http://www.iterm2.com/documentation.html)
-  (which includes [iTerm2 proprietary escape codes](http://www.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).
+- 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).
+- 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](http://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).
+- Android Terminal Emulator: Android terminal app which Termux terminal handling is based on. Inactive. [Source](https://github.com/jackpal/Android-Terminal-Emulator).
 ##
 
 
 
 ## 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 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 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.

From cfebb3358d4c7675a7d69aecad8e05487baa5ef4 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Tue, 27 Apr 2021 15:50:57 +0500
Subject: [PATCH 366/912] Update README

---
 README.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index a961421bee..fdb49de0b4 100644
--- a/README.md
+++ b/README.md
@@ -21,6 +21,7 @@ Issue https://github.com/termux/termux-app/issues/1072 needs extra attention.
 - [Installation](#Installation)
 - [Uninstallation](#Uninstallation)
 - [Important Links](#Important-Links)
+- [For Devs and Contributors](#For-Devs-and-Contributors)
 ##
 
 
@@ -41,9 +42,9 @@ The core [Termux](https://github.com/termux/termux-app) app comes with the follo
 
 ## Installation
 
-Termux can be obtained through various sources listed below.
+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. Android Package Manager will also normally not allow installation of APKs with a different signatures and you will get an error on installation but 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 uninstallation.
 
@@ -57,7 +58,7 @@ For users who don't want to wait for F-Droid releases and want to try out the la
 
 ### Google Playstore **(Deprecated)**
 
-**Termux and its plugins are no longer updated on playstore due to [android 10 issues](https://play.google.com/store/apps/details?id=com.termux).** There are currently no immediate plans to resume updates on 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.
+**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://play.google.com/store/apps/details?id=com.termux).** 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 switch to a different mirror and then run `pkg upgrade` command to update all packages to the latest available versions if you want, or at least update `termux-tools` package with `pkg install termux-tools` command.
 ##

From b84854af92b11f4ec3f1ce35483d52953a9ab6cd Mon Sep 17 00:00:00 2001
From: agnostic-apollo <31106828+agnostic-apollo@users.noreply.github.com>
Date: Sat, 1 May 2021 19:35:52 +0500
Subject: [PATCH 367/912] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index fdb49de0b4..8736b56193 100644
--- a/README.md
+++ b/README.md
@@ -58,7 +58,7 @@ For users who don't want to wait for F-Droid releases and want to try out the la
 
 ### Google Playstore **(Deprecated)**
 
-**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://play.google.com/store/apps/details?id=com.termux).** 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.
+**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 switch to a different mirror and then run `pkg upgrade` command to update all packages to the latest available versions if you want, or at least update `termux-tools` package with `pkg install termux-tools` command.
 ##

From b268b6edf742db9d344e5631b1dd134e54a39351 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 1 May 2021 23:31:02 +0500
Subject: [PATCH 368/912] Disable error flashes when clearing TMPDIR directory
 on termux app exit

Rooted users were getting `Clearing $TMPDIR directory at path "/data/data/com.termux/files/usr/tmp" failed` flash errors when they exited Termux if directories existed in TMPDIR that only had `root` user ownership, since they would fail to get cleared since clearing was being run as the termux app user instead of as the root user. Now errors will only be logged to logcat.
---
 .../src/main/java/com/termux/shared/shell/ShellUtils.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/shell/ShellUtils.java b/termux-shared/src/main/java/com/termux/shared/shell/ShellUtils.java
index 47ad08bbe7..fe1efc8da5 100644
--- a/termux-shared/src/main/java/com/termux/shared/shell/ShellUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/shell/ShellUtils.java
@@ -157,7 +157,7 @@ public static void clearTermuxTMPDIR(Context context, boolean onlyIfExists) {
         String errmsg;
         errmsg = FileUtils.clearDirectory(context, "$TMPDIR", FileUtils.getCanonicalPath(TermuxConstants.TERMUX_TMP_PREFIX_DIR_PATH, null, false));
         if (errmsg != null) {
-            Logger.logErrorAndShowToast(context, errmsg);
+            Logger.logError(errmsg);
         }
     }
 

From 42ad3723fd56c1b3db923eb3617e9107f7905813 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Mon, 3 May 2021 00:39:42 +0500
Subject: [PATCH 369/912] Fix NullPointerExceptions for cases when
 TermuxActivity tries to access TermuxService when it doesn't hold a reference

Fixes #2026
---
 .../terminal/TermuxTerminalSessionClient.java | 48 ++++++++++++++-----
 1 file changed, 35 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java
index c1f1185b03..98003d0d7d 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java
@@ -74,7 +74,9 @@ public void onTitleChanged(TerminalSession updatedSession) {
 
     @Override
     public void onSessionFinished(final TerminalSession finishedSession) {
-        if (mActivity.getTermuxService().wantsToStop()) {
+        TermuxService service = mActivity.getTermuxService();
+
+        if (service == null || service.wantsToStop()) {
             // The service wants to stop as soon as possible.
             mActivity.finishActivityIfNotFinishing();
             return;
@@ -82,7 +84,7 @@ public void onSessionFinished(final TerminalSession finishedSession) {
 
         if (mActivity.isVisible() && finishedSession != mActivity.getCurrentSession()) {
             // Show toast for non-current sessions that exit.
-            int indexOfSession = mActivity.getTermuxService().getIndexOfSession(finishedSession);
+            int indexOfSession = service.getIndexOfSession(finishedSession);
             // Verify that session was not removed before we got told about it finishing:
             if (indexOfSession >= 0)
                 mActivity.showToast(toToastTitle(finishedSession) + " - exited", true);
@@ -91,7 +93,7 @@ public void onSessionFinished(final TerminalSession finishedSession) {
         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 (mActivity.getTermuxService().getTermuxSessionsSize() > 1) {
+            if (service.getTermuxSessionsSize() > 1) {
                 removeFinishedSession(finishedSession);
             }
         } else {
@@ -161,6 +163,7 @@ void notifyOfSessionChange() {
 
     public void switchToSession(boolean forward) {
         TermuxService service = mActivity.getTermuxService();
+        if (service == null) return;
 
         TerminalSession currentTerminalSession = mActivity.getCurrentSession();
         int index = service.getIndexOfSession(currentTerminalSession);
@@ -177,7 +180,10 @@ public void switchToSession(boolean forward) {
     }
 
     public void switchToSession(int index) {
-        TermuxSession termuxSession = mActivity.getTermuxService().getTermuxSession(index);
+        TermuxService service = mActivity.getTermuxService();
+        if (service == null) return;
+
+        TermuxSession termuxSession = service.getTermuxSession(index);
         if (termuxSession != null)
             setCurrentSession(termuxSession.getTerminalSession());
     }
@@ -193,7 +199,10 @@ public void renameSession(final TerminalSession sessionToRename) {
     }
 
     public void addNewSession(boolean isFailSafe, String sessionName) {
-        if (mActivity.getTermuxService().getTermuxSessionsSize() >= MAX_SESSIONS) {
+        TermuxService service = mActivity.getTermuxService();
+        if (service == null) return;
+
+        if (service.getTermuxSessionsSize() >= MAX_SESSIONS) {
             new AlertDialog.Builder(mActivity).setTitle(R.string.title_max_terminals_reached).setMessage(R.string.msg_max_terminals_reached)
                 .setPositiveButton(android.R.string.ok, null).show();
         } else {
@@ -206,7 +215,7 @@ public void addNewSession(boolean isFailSafe, String sessionName) {
                 workingDirectory = currentSession.getCwd();
             }
 
-            TermuxSession newTermuxSession = mActivity.getTermuxService().createTermuxSession(null, null, null, workingDirectory, isFailSafe, sessionName);
+            TermuxSession newTermuxSession = service.createTermuxSession(null, null, null, workingDirectory, isFailSafe, sessionName);
             if (newTermuxSession == null) return;
 
             TerminalSession newTerminalSession = newTermuxSession.getTerminalSession();
@@ -226,14 +235,17 @@ public void setCurrentStoredSession() {
 
     /** The current session as stored or the last one if that does not exist. */
     public TerminalSession getCurrentStoredSessionOrLast() {
-        TerminalSession stored = getCurrentStoredSession(mActivity);
+        TerminalSession stored = getCurrentStoredSession();
 
         if (stored != null) {
             // If a stored session is in the list of currently running sessions, then return it
             return stored;
         } else {
             // Else return the last session currently running
-            TermuxSession termuxSession = mActivity.getTermuxService().getLastTermuxSession();
+            TermuxService service = mActivity.getTermuxService();
+            if (service == null) return null;
+
+            TermuxSession termuxSession = service.getLastTermuxSession();
             if (termuxSession != null)
                 return termuxSession.getTerminalSession();
             else
@@ -241,7 +253,7 @@ public TerminalSession getCurrentStoredSessionOrLast() {
         }
     }
 
-    private TerminalSession getCurrentStoredSession(TermuxActivity context) {
+    private TerminalSession getCurrentStoredSession() {
         String sessionHandle = mActivity.getPreferences().getCurrentSession();
 
         // If no session is stored in shared preferences
@@ -249,16 +261,20 @@ private TerminalSession getCurrentStoredSession(TermuxActivity context) {
             return null;
 
         // Check if the session handle found matches one of the currently running sessions
-        return context.getTermuxService().getTerminalSessionForHandle(sessionHandle);
+        TermuxService service = mActivity.getTermuxService();
+        if (service == null) return null;
+
+        return service.getTerminalSessionForHandle(sessionHandle);
     }
 
     public void removeFinishedSession(TerminalSession finishedSession) {
         // Return pressed with finished session - remove it.
         TermuxService service = mActivity.getTermuxService();
+        if (service == null) return;
 
         int index = service.removeTermuxSession(finishedSession);
 
-        int size = mActivity.getTermuxService().getTermuxSessionsSize();
+        int size = service.getTermuxSessionsSize();
         if (size == 0) {
             // There are no sessions to show, so finish the activity.
             mActivity.finishActivityIfNotFinishing();
@@ -278,7 +294,10 @@ public void termuxSessionListNotifyUpdated() {
 
     public void checkAndScrollToSession(TerminalSession session) {
         if (!mActivity.isVisible()) return;
-        final int indexOfSession = mActivity.getTermuxService().getIndexOfSession(session);
+        TermuxService service = mActivity.getTermuxService();
+        if (service == null) return;
+
+        final int indexOfSession = service.getIndexOfSession(session);
         if (indexOfSession < 0) return;
         final ListView termuxSessionsListView = mActivity.findViewById(R.id.terminal_sessions_list);
         if (termuxSessionsListView == null) return;
@@ -290,7 +309,10 @@ public void checkAndScrollToSession(TerminalSession session) {
 
 
     String toToastTitle(TerminalSession session) {
-        final int indexOfSession = mActivity.getTermuxService().getIndexOfSession(session);
+        TermuxService service = mActivity.getTermuxService();
+        if (service == null) return null;
+
+        final int indexOfSession = service.getIndexOfSession(session);
         if (indexOfSession < 0) return null;
         StringBuilder toastTitle = new StringBuilder("[" + (indexOfSession + 1) + "]");
         if (!TextUtils.isEmpty(session.mSessionName)) {

From 4711094614f88ad62c6421e536dcb023119d16fb Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Mon, 3 May 2021 00:40:03 +0500
Subject: [PATCH 370/912] Bump ndk to v22.1.7171670

Will also remove requirement for F-Droid metadata/com.termux.yml ndk version patch

https://gitlab.com/fdroid/fdroiddata/-/commit/1fe5c6b905b725bb17179b5bce01fd06d094dd96#54c3cc576ac595d35a41ce9e4a69e1c905fd6ea4
---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 99681235a6..bcb6c60ce3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -20,7 +20,7 @@ termuxVersionCode=111
 
 minSdkVersion=24
 targetSdkVersion=28
-ndkVersion=22.0.7026061
+ndkVersion=22.1.7171670
 compileSdkVersion=29
 
 markwonVersion=4.6.2

From f3f58c8fc7966cb55ef9297a306577a935b28f51 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <31106828+agnostic-apollo@users.noreply.github.com>
Date: Mon, 3 May 2021 16:07:18 +0500
Subject: [PATCH 371/912] Update README.md

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 8736b56193..3a07a7c2e8 100644
--- a/README.md
+++ b/README.md
@@ -8,6 +8,8 @@
 
 Note that this repository is for the app itself (the user interface and the terminal emulation). For the packages installable inside the app, see [termux/termux-packages](https://github.com/termux/termux-packages).
 
+Quick how-to about Termux package management is available at [Package Management](https://github.com/termux/termux-packages/wiki/Package-Management). It also has info on how to fix **`repository is under maintenance or down`** errors when running `apt` or `pkg` commands.
+
 ***
 
 **@termux is looking for Termux Application maintainers for implementing new features, fixing bugs and reviewing pull requests since current one (@fornwall) is inactive.**

From 3e7b3604a48a1fe312b082d3c19be21ea4b9addb Mon Sep 17 00:00:00 2001
From: agnostic-apollo <31106828+agnostic-apollo@users.noreply.github.com>
Date: Mon, 3 May 2021 16:08:04 +0500
Subject: [PATCH 372/912] Update LICENSE.md

---
 LICENSE.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LICENSE.md b/LICENSE.md
index f6dd0a8b5b..b9aa696f7e 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,4 +1,4 @@
-This repository is released under [GPLv3 only](https://www.gnu.org/licenses/gpl-3.0.html) license.
+The `termux/termux-app` repository is released under [GPLv3 only](https://www.gnu.org/licenses/gpl-3.0.html) license.
 
 ### Exceptions
 

From bc52a4e90c3a94f56d9aaa0bb775c2cbe787cb13 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <31106828+agnostic-apollo@users.noreply.github.com>
Date: Mon, 3 May 2021 16:28:02 +0500
Subject: [PATCH 373/912] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 3a07a7c2e8..f27125f79e 100644
--- a/README.md
+++ b/README.md
@@ -62,7 +62,7 @@ For users who don't want to wait for F-Droid releases and want to try out the la
 
 **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 switch to a different mirror and then run `pkg upgrade` command to update all packages to the latest available versions if you want, or at least update `termux-tools` package with `pkg install termux-tools` command.
+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.
 ##
 
 

From 4850678d557c8de654576ca41fe9e46404cb9b8b Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 8 May 2021 03:14:20 +0500
Subject: [PATCH 374/912] Move Build.ID and Build.DISPLAY to Software section
 of device info markdown

---
 .../src/main/java/com/termux/shared/termux/TermuxUtils.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
index 374355c74a..3e08b9fe56 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
@@ -223,6 +223,8 @@ public static String getDeviceInfoMarkdownString(@NonNull final Context context)
             appendPropertyToMarkdown(markdownString, "RELEASE", Build.VERSION.RELEASE);
         else
             appendPropertyToMarkdown(markdownString, "CODENAME", Build.VERSION.CODENAME);
+        appendPropertyToMarkdown(markdownString, "ID", Build.ID);
+        appendPropertyToMarkdown(markdownString, "DISPLAY", Build.DISPLAY);
         appendPropertyToMarkdown(markdownString, "INCREMENTAL", Build.VERSION.INCREMENTAL);
         appendPropertyToMarkdownIfSet(markdownString, "SECURITY_PATCH", systemProperties.getProperty("ro.build.version.security_patch"));
         appendPropertyToMarkdownIfSet(markdownString, "IS_DEBUGGABLE", systemProperties.getProperty("ro.debuggable"));
@@ -236,8 +238,6 @@ public static String getDeviceInfoMarkdownString(@NonNull final Context context)
         appendPropertyToMarkdown(markdownString, "BRAND", Build.BRAND);
         appendPropertyToMarkdown(markdownString, "MODEL", Build.MODEL);
         appendPropertyToMarkdown(markdownString, "PRODUCT", Build.PRODUCT);
-        appendPropertyToMarkdown(markdownString, "DISPLAY", Build.DISPLAY);
-        appendPropertyToMarkdown(markdownString, "ID", Build.ID);
         appendPropertyToMarkdown(markdownString, "BOARD", Build.BOARD);
         appendPropertyToMarkdown(markdownString, "HARDWARE", Build.HARDWARE);
         appendPropertyToMarkdown(markdownString, "DEVICE", Build.DEVICE);

From 596aa56b38b469f082e363953b9ff71f599642f4 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 8 May 2021 03:24:09 +0500
Subject: [PATCH 375/912] Update report issue message to ask users to provide
 details on what they were doing that caused the Termux app crash

---
 termux-shared/src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/termux-shared/src/main/res/values/strings.xml b/termux-shared/src/main/res/values/strings.xml
index d1b4e49456..71bd7bca5e 100644
--- a/termux-shared/src/main/res/values/strings.xml
+++ b/termux-shared/src/main/res/values/strings.xml
@@ -73,7 +73,7 @@
 
 
     <!-- TermuxUtils -->
-    <string name="msg_report_issue">If you want to report this issue, then copy its text from the options menu (3-dots on top right) and post an issue on one of the following links. If you are posting on Github, then post it in the repository at which the report belongs at. You may optionally remove any device specific info that you consider private or don\'t want to share or that is not relevant to the issue.</string>
+    <string name="msg_report_issue">If you want to report this issue, then copy its text from the options menu (3-dots on top right) and post an issue on one of the following links.\n\nIf you are posting a Termux app crash report, then please provide details on what you were doing that caused the crash and how to reproduce it, if possible.\n\nIf you are posting an issue on Github, then post it in the repository at which the report belongs at. You may optionally remove any device specific info that you consider private or don\'t want to share or that is not relevant to the issue.</string>
 
 
 

From 4d1851e6beb5afb9c8de952797364fb4ff14faf2 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 8 May 2021 04:16:51 +0500
Subject: [PATCH 376/912] Fix issues where soft keyboard was not shown in some
 cases when hardware keyboard was attached

For Termux app to be able to show a soft keyboard while a hardware keyboard is attached requires either of 2 cases:

1. User has enabled "Show on-screen keyboard while hardware keyboard is attached" toggle in Android "Language and Input" settings.
2. The toggle is disabled, but the soft keyboard app overrides the default implementation of `InputMethodService.onEvaluateInputViewShown()` and returns `true`. Some keyboard apps have a setting for this, like HackerKeyboard, but its not supported by all keyboard apps.

https://cs.android.com/android/platform/superproject/+/android-11.0.0_r3:frameworks/base/core/java/android/inputmethodservice/InputMethodService.java;l=1751

Termux previously didn't forcefully show a keyboard when the drawer "KEYBOARD" toggle button was pressed and only did that for the "KEYBOARD" extra keys toggle button. This prevented the keyboard to be shown for case 2 even when the user attempted to show the keyboard with the drawer "KEYBOARD" toggle. Now both buttons will forcefully show the keyboard.

Moreover, previously at app startup for case 2, the keyboard wasn't being shown. Now it will automatically be shown without requiring a manual press of a "KEYBOARD" toggle button.

This may also solve the issue where the soft keyboard wouldn't show even when the toggle of case 1 was enabled.
---
 .../java/com/termux/app/TermuxActivity.java   | 19 +-----
 .../terminal/TermuxTerminalViewClient.java    | 60 ++++++++++++++++++-
 2 files changed, 61 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index f323d0fe22..003dec958d 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -237,7 +237,7 @@ public void onStart() {
     public void onResume() {
         super.onResume();
 
-        setSoftKeyboardState();
+        mTermuxTerminalViewClient.setSoftKeyboardState();
     }
 
     /**
@@ -418,8 +418,7 @@ private void setNewSessionButtonView() {
 
     private void setToggleKeyboardView() {
         findViewById(R.id.toggle_keyboard_button).setOnClickListener(v -> {
-            InputMethodManager inputMethodManager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
-            inputMethodManager.toggleSoftInput(InputMethodManager.SHOW_IMPLICIT, 0);
+            TermuxTerminalViewClient.toggleSoftKeyboard(this);
             getDrawer().closeDrawers();
         });
 
@@ -429,19 +428,7 @@ private void setToggleKeyboardView() {
         });
     }
 
-    private void setSoftKeyboardState() {
-        // If soft keyboard is to disabled
-        if (!mPreferences.getSoftKeyboardEnabled()) {
-            getWindow().setFlags(WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM, WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM);
-        } else {
-            getWindow().clearFlags(WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM);
-        }
 
-        // If soft keyboard is to be hidden on startup
-        if (mProperties.shouldSoftKeyboardBeHiddenOnStartup()) {
-            getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN);
-        }
-    }
 
 
 
@@ -780,7 +767,7 @@ private void reloadTermuxActivityStyling() {
 
         setTerminalToolbarHeight();
 
-        setSoftKeyboardState();
+        mTermuxTerminalViewClient.setSoftKeyboardState();
 
         // To change the activity and drawer theme, activity needs to be recreated.
         // But this will destroy the activity, and will call the onCreate() again.
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
index e906b01cca..400db111e3 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
@@ -7,6 +7,7 @@
 import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.Intent;
+import android.inputmethodservice.InputMethodService;
 import android.media.AudioManager;
 import android.net.Uri;
 import android.text.TextUtils;
@@ -14,6 +15,7 @@
 import android.view.InputDevice;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
+import android.view.WindowManager;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.ListView;
 import android.widget.Toast;
@@ -36,6 +38,7 @@
 import com.termux.terminal.KeyHandler;
 import com.termux.terminal.TerminalEmulator;
 import com.termux.terminal.TerminalSession;
+import com.termux.view.TerminalView;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -122,8 +125,7 @@ public boolean onKeyDown(int keyCode, KeyEvent e, TerminalSession currentSession
             } else if (keyCode == KeyEvent.KEYCODE_DPAD_LEFT) {
                 mActivity.getDrawer().closeDrawers();
             } else if (unicodeChar == 'k'/* keyboard */) {
-                InputMethodManager imm = (InputMethodManager) mActivity.getSystemService(Context.INPUT_METHOD_SERVICE);
-                imm.toggleSoftInput(InputMethodManager.SHOW_FORCED, 0);
+                toggleSoftKeyboard(mActivity);
             } else if (unicodeChar == 'm'/* menu */) {
                 mActivity.getTerminalView().showContextMenu();
             } else if (unicodeChar == 'r'/* rename */) {
@@ -151,6 +153,8 @@ public boolean onKeyDown(int keyCode, KeyEvent e, TerminalSession currentSession
 
     }
 
+
+
     @Override
     public boolean onKeyUp(int keyCode, KeyEvent e) {
         return handleVirtualKeys(keyCode, e, false);
@@ -337,6 +341,58 @@ public void changeFontSize(boolean increase) {
     }
 
 
+    /**
+     * Toggle the soft keyboard. The {@link InputMethodManager#SHOW_FORCED} is passed as
+     * {@code showFlags} so that keyboard is forcefully shown if it needs to be enabled.
+     *
+     * This is also important for soft keyboard to be shown when a hardware keyboard is attached, and
+     * user has disabled the {@code Show on-screen keyboard while hardware keyboard is attached} toggle
+     * in Android "Language and Input" settings but the current soft keyboard app overrides the
+     * default implementation of {@link InputMethodService#onEvaluateInputViewShown()} and returns
+     * {@code true}.
+     */
+    public static void toggleSoftKeyboard(Context context) {
+        InputMethodManager inputMethodManager = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
+        inputMethodManager.toggleSoftInput(InputMethodManager.SHOW_FORCED, 0);
+    }
+
+    /**
+     * Show the soft keyboard. The {@code 0} value is passed as {@code flags} so that keyboard is
+     * forcefully shown.
+     *
+     * This is also important for soft keyboard to be shown on app startup when a hardware keyboard
+     * is attached, and user has disabled the {@code Show on-screen keyboard while hardware keyboard
+     * is attached} toggle in Android "Language and Input" settings but the current soft keyboard app
+     * overrides the default implementation of {@link InputMethodService#onEvaluateInputViewShown()}
+     * and returns {@code true}.
+     * https://cs.android.com/android/platform/superproject/+/android-11.0.0_r3:frameworks/base/core/java/android/inputmethodservice/InputMethodService.java;l=1751
+     *
+     * Also check {@link InputMethodService#onShowInputRequested(int, boolean)} which must return
+     * {@code true}, which can be done by failing its {@code ((flags&InputMethod.SHOW_EXPLICIT) == 0)}
+     * check by passing {@code 0} as {@code flags}.
+     * https://cs.android.com/android/platform/superproject/+/android-11.0.0_r3:frameworks/base/core/java/android/inputmethodservice/InputMethodService.java;l=2022
+     */
+    public static void showSoftKeyboard(Context context, TerminalView terminalView) {
+        InputMethodManager inputMethodManager = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
+        inputMethodManager.showSoftInput(terminalView, 0);
+    }
+
+    public void setSoftKeyboardState() {
+        // If soft keyboard is to disabled
+        if (!mActivity.getPreferences().getSoftKeyboardEnabled()) {
+            mActivity.getWindow().setFlags(WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM, WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM);
+        } else {
+            mActivity.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM);
+            showSoftKeyboard(mActivity, mActivity.getTerminalView());
+        }
+
+        // If soft keyboard is to be hidden on startup
+        if (mActivity.getProperties().shouldSoftKeyboardBeHiddenOnStartup()) {
+            mActivity.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN);
+        }
+    }
+
+
 
     public void shareSessionTranscript() {
         TerminalSession session = mActivity.getCurrentSession();

From 39c69db820efec991e6bbfef9bd7ea4cc50912be Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sun, 9 May 2021 07:28:12 +0500
Subject: [PATCH 377/912] Fix issues where soft keyboard was not shown in some
 cases when hardware keyboard was attached v2

This is an update to 4d1851e6 commit.

The toggle logic change previously was actually being applied to ctrl+alt+k hardware keyboard shortcut instead of the mentioned extra keys "KEYBOARD" toggle. However, now it applies to the extra keys "KEYBOARD" toggle button as well, in addition to  drawer "KEYBOARD" toggle button and ctrl+alt+k hardware keyboard shortcut. They will all behave the same now.

Updated onSingleTapUp() to also forcefully show keyboard.

Fixed issue where "hide-soft-keyboard-on-startup" property wasn't respected anymore due to forced keyboard showing done in 4d1851e6.

Removed "stateAlwaysVisible" flag from AndroidManifest since its ignored in Android 10 by default and not needed due to usage of InputMethodManager.showSoftInput(). https://developer.android.com/reference/android/view/WindowManager.LayoutParams#SOFT_INPUT_STATE_ALWAYS_VISIBLE

Moved "adjustResize" from AndroidManifest into java code (which is also deprecated in API 30) to centralize keyboard logic.
---
 app/src/main/AndroidManifest.xml              |  3 +-
 .../java/com/termux/app/TermuxActivity.java   | 13 +--
 .../terminal/TermuxTerminalViewClient.java    | 88 ++++++++++++++++---
 .../terminal/io/TerminalToolbarViewPager.java |  1 +
 .../terminal/io/extrakeys/ExtraKeysView.java  | 12 ++-
 5 files changed, 92 insertions(+), 25 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index cef9943d05..ee6eae63cc 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -57,8 +57,7 @@
             android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation"
             android:label="@string/application_name"
             android:launchMode="singleTask"
-            android:resizeableActivity="true"
-            android:windowSoftInputMode="adjustResize|stateAlwaysVisible">
+            android:resizeableActivity="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index 003dec958d..1381998e9d 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -25,7 +25,6 @@
 import android.view.ViewGroup;
 import android.view.WindowManager;
 import android.view.autofill.AutofillManager;
-import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
 import android.widget.ListView;
 import android.widget.Toast;
@@ -237,7 +236,7 @@ public void onStart() {
     public void onResume() {
         super.onResume();
 
-        mTermuxTerminalViewClient.setSoftKeyboardState();
+        mTermuxTerminalViewClient.setSoftKeyboardState(true);
     }
 
     /**
@@ -418,7 +417,7 @@ private void setNewSessionButtonView() {
 
     private void setToggleKeyboardView() {
         findViewById(R.id.toggle_keyboard_button).setOnClickListener(v -> {
-            TermuxTerminalViewClient.toggleSoftKeyboard(this);
+            mTermuxTerminalViewClient.onToggleSoftKeyboardRequest();
             getDrawer().closeDrawers();
         });
 
@@ -447,8 +446,6 @@ private void setTermuxTerminalViewAndClients() {
         // Set {@link TerminalView#TERMINAL_VIEW_KEY_LOGGING_ENABLED} value
         mTerminalView.setIsTerminalViewKeyLoggingEnabled(mPreferences.getTerminalViewKeyLoggingEnabled());
 
-        mTerminalView.requestFocus();
-
         mTermuxTerminalSessionClient.checkForFontAndColors();
     }
 
@@ -677,6 +674,10 @@ public TerminalView getTerminalView() {
         return mTerminalView;
     }
 
+    public TermuxTerminalViewClient getTermuxTerminalViewClient() {
+        return mTermuxTerminalViewClient;
+    }
+
     public TermuxTerminalSessionClient getTermuxTerminalSessionClient() {
         return mTermuxTerminalSessionClient;
     }
@@ -767,7 +768,7 @@ private void reloadTermuxActivityStyling() {
 
         setTerminalToolbarHeight();
 
-        mTermuxTerminalViewClient.setSoftKeyboardState();
+        mTermuxTerminalViewClient.setSoftKeyboardState(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.
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
index 400db111e3..57cb573280 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
@@ -1,6 +1,7 @@
 package com.termux.app.terminal;
 
 import android.annotation.SuppressLint;
+import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.ActivityNotFoundException;
 import android.content.ClipData;
@@ -15,6 +16,7 @@
 import android.view.InputDevice;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
+import android.view.View;
 import android.view.WindowManager;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.ListView;
@@ -38,7 +40,6 @@
 import com.termux.terminal.KeyHandler;
 import com.termux.terminal.TerminalEmulator;
 import com.termux.terminal.TerminalSession;
-import com.termux.view.TerminalView;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -75,8 +76,7 @@ public float onScale(float scale) {
 
     @Override
     public void onSingleTapUp(MotionEvent e) {
-        InputMethodManager mgr = (InputMethodManager) mActivity.getSystemService(Context.INPUT_METHOD_SERVICE);
-        mgr.showSoftInput(mActivity.getTerminalView(), InputMethodManager.SHOW_IMPLICIT);
+        showSoftKeyboard(mActivity, mActivity.getTerminalView());
     }
 
     @Override
@@ -125,7 +125,7 @@ public boolean onKeyDown(int keyCode, KeyEvent e, TerminalSession currentSession
             } else if (keyCode == KeyEvent.KEYCODE_DPAD_LEFT) {
                 mActivity.getDrawer().closeDrawers();
             } else if (unicodeChar == 'k'/* keyboard */) {
-                toggleSoftKeyboard(mActivity);
+                onToggleSoftKeyboardRequest();
             } else if (unicodeChar == 'm'/* menu */) {
                 mActivity.getTerminalView().showContextMenu();
             } else if (unicodeChar == 'r'/* rename */) {
@@ -372,23 +372,83 @@ public static void toggleSoftKeyboard(Context context) {
      * check by passing {@code 0} as {@code flags}.
      * https://cs.android.com/android/platform/superproject/+/android-11.0.0_r3:frameworks/base/core/java/android/inputmethodservice/InputMethodService.java;l=2022
      */
-    public static void showSoftKeyboard(Context context, TerminalView terminalView) {
+    public static void showSoftKeyboard(Context context, View view) {
         InputMethodManager inputMethodManager = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
-        inputMethodManager.showSoftInput(terminalView, 0);
+        inputMethodManager.showSoftInput(view, 0);
     }
 
-    public void setSoftKeyboardState() {
-        // If soft keyboard is to disabled
+    public static void hideSoftKeyboard(Context context, View view) {
+        InputMethodManager inputMethodManager = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
+        inputMethodManager.hideSoftInputFromWindow(view.getWindowToken(), 0);
+    }
+
+    public static void disableSoftKeyboard(Activity activity, View view) {
+        hideSoftKeyboard(activity, view);
+        setDisableSoftKeyboardFlags(activity);
+    }
+
+    public static void setDisableSoftKeyboardFlags(Activity activity) {
+        activity.getWindow().setFlags(WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM, WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM);
+    }
+
+    public static void clearDisableSoftKeyboardFlags(Activity activity) {
+        activity.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM);
+    }
+
+    public void setResizeTerminalViewForSoftKeyboardFlags() {
+        // TODO: The flag is deprecated for API 30 and WindowInset API should be used
+        // https://developer.android.com/reference/android/view/WindowManager.LayoutParams#SOFT_INPUT_ADJUST_RESIZE
+        // https://medium.com/androiddevelopers/animating-your-keyboard-fb776a8fb66d
+        // https://stackoverflow.com/a/65194077/14686958
+        mActivity.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
+    }
+
+    /**
+     * Called when user requests the soft keyboard to be toggled via "KEYBOARD" toggle button in
+     * drawer or extra keys, or with ctrl+alt+k hardware keyboard shortcut.
+     */
+    public void onToggleSoftKeyboardRequest() {
+        // If soft keyboard is disabled by user for Termux
         if (!mActivity.getPreferences().getSoftKeyboardEnabled()) {
-            mActivity.getWindow().setFlags(WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM, WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM);
+            disableSoftKeyboard(mActivity, mActivity.getTerminalView());
         } else {
-            mActivity.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM);
-            showSoftKeyboard(mActivity, mActivity.getTerminalView());
+            clearDisableSoftKeyboardFlags(mActivity);
+            toggleSoftKeyboard(mActivity);
         }
+    }
+
+    public void setSoftKeyboardState(boolean isStartup) {
+        // If soft keyboard is disabled by user for Termux
+        if (!mActivity.getPreferences().getSoftKeyboardEnabled()) {
+            disableSoftKeyboard(mActivity, mActivity.getTerminalView());
+        } else {
+            // Set flag to automatically push up TerminalView when keyboard is opened instead of showing over it
+            setResizeTerminalViewForSoftKeyboardFlags();
+
+            // Clear any previous flags to disable soft keyboard in case setting updated
+            clearDisableSoftKeyboardFlags(mActivity);
+
+            // If soft keyboard is to be hidden on startup
+            if (isStartup && mActivity.getProperties().shouldSoftKeyboardBeHiddenOnStartup()) {
+                hideSoftKeyboard(mActivity, mActivity.getTerminalView());
+            } else {
+                // Force show soft keyboard
+                showSoftKeyboard(mActivity, mActivity.getTerminalView());
+
+                mActivity.getTerminalView().setOnFocusChangeListener(new View.OnFocusChangeListener() {
+                    @Override
+                    public void onFocusChange(View view, boolean hasFocus) {
+                        if (hasFocus) {
+                            showSoftKeyboard(mActivity, mActivity.getTerminalView());
+                        } else {
+                            hideSoftKeyboard(mActivity, mActivity.getTerminalView());
+                        }
+                    }
+                });
 
-        // If soft keyboard is to be hidden on startup
-        if (mActivity.getProperties().shouldSoftKeyboardBeHiddenOnStartup()) {
-            mActivity.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN);
+                // Request focus for TerminalView
+                mActivity.getTerminalView().requestFocus();
+            }
         }
     }
 
diff --git a/app/src/main/java/com/termux/app/terminal/io/TerminalToolbarViewPager.java b/app/src/main/java/com/termux/app/terminal/io/TerminalToolbarViewPager.java
index 06bdfe19a9..5e7adfb891 100644
--- a/app/src/main/java/com/termux/app/terminal/io/TerminalToolbarViewPager.java
+++ b/app/src/main/java/com/termux/app/terminal/io/TerminalToolbarViewPager.java
@@ -44,6 +44,7 @@ public Object instantiateItem(@NonNull ViewGroup collection, int position) {
             if (position == 0) {
                 layout = inflater.inflate(R.layout.view_terminal_toolbar_extra_keys, collection, false);
                 ExtraKeysView extraKeysView = (ExtraKeysView) layout;
+                extraKeysView.setTermuxTerminalViewClient(mActivity.getTermuxTerminalViewClient());
                 mActivity.setExtraKeysView(extraKeysView);
                 extraKeysView.reload(mActivity.getProperties().getExtraKeysInfo());
 
diff --git a/app/src/main/java/com/termux/app/terminal/io/extrakeys/ExtraKeysView.java b/app/src/main/java/com/termux/app/terminal/io/extrakeys/ExtraKeysView.java
index da4cbeaf6d..31afa07fed 100644
--- a/app/src/main/java/com/termux/app/terminal/io/extrakeys/ExtraKeysView.java
+++ b/app/src/main/java/com/termux/app/terminal/io/extrakeys/ExtraKeysView.java
@@ -23,12 +23,12 @@
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.View;
-import android.view.inputmethod.InputMethodManager;
 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;
@@ -44,6 +44,8 @@ public final class ExtraKeysView extends GridLayout {
     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);
     }
@@ -82,8 +84,8 @@ public ExtraKeysView(Context context, AttributeSet attrs) {
     private void sendKey(View view, String keyName, boolean forceCtrlDown, boolean forceLeftAltDown) {
         TerminalView terminalView = view.findViewById(R.id.terminal_view);
         if ("KEYBOARD".equals(keyName)) {
-            InputMethodManager imm = (InputMethodManager) getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
-            imm.toggleSoftInput(0, 0);
+            if(mTermuxTerminalViewClient != null)
+                mTermuxTerminalViewClient.onToggleSoftKeyboardRequest();
         } else if ("DRAWER".equals(keyName)) {
             DrawerLayout drawer = view.findViewById(R.id.drawer_layout);
             drawer.openDrawer(Gravity.LEFT);
@@ -379,4 +381,8 @@ public void reload(ExtraKeysInfo infos) {
         }
     }
 
+    public void setTermuxTerminalViewClient(TermuxTerminalViewClient termuxTerminalViewClient) {
+        this.mTermuxTerminalViewClient = termuxTerminalViewClient;
+    }
+
 }

From 116b9b42d81e0733edd1d66ec80758c5969db844 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sun, 9 May 2021 21:07:23 +0500
Subject: [PATCH 378/912] Bump compileSdkVersion (NOT targetSdkVersion) to 30

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index bcb6c60ce3..5db9519171 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -21,7 +21,7 @@ termuxVersionCode=111
 minSdkVersion=24
 targetSdkVersion=28
 ndkVersion=22.1.7171670
-compileSdkVersion=29
+compileSdkVersion=30
 
 markwonVersion=4.6.2
 

From 4ecea144bb4d3dd511fa551410f9a481ddd43b92 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sun, 9 May 2021 21:08:54 +0500
Subject: [PATCH 379/912] Create KeyboardUtils

---
 .../terminal/TermuxTerminalViewClient.java    |  94 ++++------------
 termux-shared/build.gradle                    |   1 +
 .../com/termux/shared/view/KeyboardUtils.java | 101 ++++++++++++++++++
 3 files changed, 121 insertions(+), 75 deletions(-)
 create mode 100644 termux-shared/src/main/java/com/termux/shared/view/KeyboardUtils.java

diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
index 57cb573280..2fe87e9207 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
@@ -1,14 +1,12 @@
 package com.termux.app.terminal;
 
 import android.annotation.SuppressLint;
-import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.ActivityNotFoundException;
 import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.Intent;
-import android.inputmethodservice.InputMethodService;
 import android.media.AudioManager;
 import android.net.Uri;
 import android.text.TextUtils;
@@ -17,8 +15,6 @@
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.View;
-import android.view.WindowManager;
-import android.view.inputmethod.InputMethodManager;
 import android.widget.ListView;
 import android.widget.Toast;
 
@@ -37,6 +33,7 @@
 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.terminal.KeyHandler;
 import com.termux.terminal.TerminalEmulator;
 import com.termux.terminal.TerminalSession;
@@ -57,6 +54,8 @@ public class TermuxTerminalViewClient extends TermuxTerminalViewClientBase {
     /** Keeping track of the special keys acting as Ctrl and Fn for the soft keyboard and other hardware keys. */
     boolean mVirtualControlKeyDown, mVirtualFnKeyDown;
 
+    private static final String LOG_TAG = "TermuxTerminalViewClient";
+
     public TermuxTerminalViewClient(TermuxActivity activity, TermuxTerminalSessionClient termuxTerminalSessionClient) {
         this.mActivity = activity;
         this.mTermuxTerminalSessionClient = termuxTerminalSessionClient;
@@ -76,7 +75,8 @@ public float onScale(float scale) {
 
     @Override
     public void onSingleTapUp(MotionEvent e) {
-        showSoftKeyboard(mActivity, mActivity.getTerminalView());
+        if (!KeyboardUtils.areDisableSoftKeyboardFlagsSet(mActivity))
+            KeyboardUtils.showSoftKeyboard(mActivity, mActivity.getTerminalView());
     }
 
     @Override
@@ -341,67 +341,7 @@ public void changeFontSize(boolean increase) {
     }
 
 
-    /**
-     * Toggle the soft keyboard. The {@link InputMethodManager#SHOW_FORCED} is passed as
-     * {@code showFlags} so that keyboard is forcefully shown if it needs to be enabled.
-     *
-     * This is also important for soft keyboard to be shown when a hardware keyboard is attached, and
-     * user has disabled the {@code Show on-screen keyboard while hardware keyboard is attached} toggle
-     * in Android "Language and Input" settings but the current soft keyboard app overrides the
-     * default implementation of {@link InputMethodService#onEvaluateInputViewShown()} and returns
-     * {@code true}.
-     */
-    public static void toggleSoftKeyboard(Context context) {
-        InputMethodManager inputMethodManager = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
-        inputMethodManager.toggleSoftInput(InputMethodManager.SHOW_FORCED, 0);
-    }
-
-    /**
-     * Show the soft keyboard. The {@code 0} value is passed as {@code flags} so that keyboard is
-     * forcefully shown.
-     *
-     * This is also important for soft keyboard to be shown on app startup when a hardware keyboard
-     * is attached, and user has disabled the {@code Show on-screen keyboard while hardware keyboard
-     * is attached} toggle in Android "Language and Input" settings but the current soft keyboard app
-     * overrides the default implementation of {@link InputMethodService#onEvaluateInputViewShown()}
-     * and returns {@code true}.
-     * https://cs.android.com/android/platform/superproject/+/android-11.0.0_r3:frameworks/base/core/java/android/inputmethodservice/InputMethodService.java;l=1751
-     *
-     * Also check {@link InputMethodService#onShowInputRequested(int, boolean)} which must return
-     * {@code true}, which can be done by failing its {@code ((flags&InputMethod.SHOW_EXPLICIT) == 0)}
-     * check by passing {@code 0} as {@code flags}.
-     * https://cs.android.com/android/platform/superproject/+/android-11.0.0_r3:frameworks/base/core/java/android/inputmethodservice/InputMethodService.java;l=2022
-     */
-    public static void showSoftKeyboard(Context context, View view) {
-        InputMethodManager inputMethodManager = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
-        inputMethodManager.showSoftInput(view, 0);
-    }
-
-    public static void hideSoftKeyboard(Context context, View view) {
-        InputMethodManager inputMethodManager = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
-        inputMethodManager.hideSoftInputFromWindow(view.getWindowToken(), 0);
-    }
-
-    public static void disableSoftKeyboard(Activity activity, View view) {
-        hideSoftKeyboard(activity, view);
-        setDisableSoftKeyboardFlags(activity);
-    }
 
-    public static void setDisableSoftKeyboardFlags(Activity activity) {
-        activity.getWindow().setFlags(WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM, WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM);
-    }
-
-    public static void clearDisableSoftKeyboardFlags(Activity activity) {
-        activity.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM);
-    }
-
-    public void setResizeTerminalViewForSoftKeyboardFlags() {
-        // TODO: The flag is deprecated for API 30 and WindowInset API should be used
-        // https://developer.android.com/reference/android/view/WindowManager.LayoutParams#SOFT_INPUT_ADJUST_RESIZE
-        // https://medium.com/androiddevelopers/animating-your-keyboard-fb776a8fb66d
-        // https://stackoverflow.com/a/65194077/14686958
-        mActivity.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
-    }
 
     /**
      * Called when user requests the soft keyboard to be toggled via "KEYBOARD" toggle button in
@@ -410,38 +350,42 @@ public void setResizeTerminalViewForSoftKeyboardFlags() {
     public void onToggleSoftKeyboardRequest() {
         // If soft keyboard is disabled by user for Termux
         if (!mActivity.getPreferences().getSoftKeyboardEnabled()) {
-            disableSoftKeyboard(mActivity, mActivity.getTerminalView());
+            KeyboardUtils.disableSoftKeyboard(mActivity, mActivity.getTerminalView());
         } else {
-            clearDisableSoftKeyboardFlags(mActivity);
-            toggleSoftKeyboard(mActivity);
+            KeyboardUtils.clearDisableSoftKeyboardFlags(mActivity);
+            KeyboardUtils.toggleSoftKeyboard(mActivity);
         }
+
     }
 
     public void setSoftKeyboardState(boolean isStartup) {
         // If soft keyboard is disabled by user for Termux
         if (!mActivity.getPreferences().getSoftKeyboardEnabled()) {
-            disableSoftKeyboard(mActivity, mActivity.getTerminalView());
+            Logger.logVerbose(LOG_TAG, "Maintaining disabled soft keyboard");
+            KeyboardUtils.disableSoftKeyboard(mActivity, mActivity.getTerminalView());
         } else {
             // Set flag to automatically push up TerminalView when keyboard is opened instead of showing over it
-            setResizeTerminalViewForSoftKeyboardFlags();
+            KeyboardUtils.setResizeTerminalViewForSoftKeyboardFlags(mActivity);
 
             // Clear any previous flags to disable soft keyboard in case setting updated
-            clearDisableSoftKeyboardFlags(mActivity);
+            KeyboardUtils.clearDisableSoftKeyboardFlags(mActivity);
 
             // If soft keyboard is to be hidden on startup
             if (isStartup && mActivity.getProperties().shouldSoftKeyboardBeHiddenOnStartup()) {
-                hideSoftKeyboard(mActivity, mActivity.getTerminalView());
+                Logger.logVerbose(LOG_TAG, "Hiding soft keyboard on startup");
+                KeyboardUtils.hideSoftKeyboard(mActivity, mActivity.getTerminalView());
             } else {
                 // Force show soft keyboard
-                showSoftKeyboard(mActivity, mActivity.getTerminalView());
+                Logger.logVerbose(LOG_TAG, "Showing soft keyboard");
+                KeyboardUtils.showSoftKeyboard(mActivity, mActivity.getTerminalView());
 
                 mActivity.getTerminalView().setOnFocusChangeListener(new View.OnFocusChangeListener() {
                     @Override
                     public void onFocusChange(View view, boolean hasFocus) {
                         if (hasFocus) {
-                            showSoftKeyboard(mActivity, mActivity.getTerminalView());
+                            KeyboardUtils.showSoftKeyboard(mActivity, mActivity.getTerminalView());
                         } else {
-                            hideSoftKeyboard(mActivity, mActivity.getTerminalView());
+                            KeyboardUtils.hideSoftKeyboard(mActivity, mActivity.getTerminalView());
                         }
                     }
                 });
diff --git a/termux-shared/build.gradle b/termux-shared/build.gradle
index b34e407bbb..cc49fb91df 100644
--- a/termux-shared/build.gradle
+++ b/termux-shared/build.gradle
@@ -6,6 +6,7 @@ android {
 
     dependencies {
         implementation "androidx.annotation:annotation:1.2.0"
+        implementation "androidx.core:core:1.5.0-rc01"
         implementation "com.google.guava:guava:24.1-jre"
         implementation "io.noties.markwon:core:$markwonVersion"
         implementation "io.noties.markwon:ext-strikethrough:$markwonVersion"
diff --git a/termux-shared/src/main/java/com/termux/shared/view/KeyboardUtils.java b/termux-shared/src/main/java/com/termux/shared/view/KeyboardUtils.java
new file mode 100644
index 0000000000..a71bb328e1
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/view/KeyboardUtils.java
@@ -0,0 +1,101 @@
+package com.termux.shared.view;
+
+import android.app.Activity;
+import android.content.Context;
+import android.inputmethodservice.InputMethodService;
+import android.view.View;
+import android.view.WindowInsets;
+import android.view.WindowManager;
+import android.view.inputmethod.InputMethodManager;
+
+import androidx.core.view.WindowInsetsCompat;
+
+import com.termux.shared.logger.Logger;
+
+public class KeyboardUtils {
+
+    private static final String LOG_TAG = "KeyboardUtils";
+
+    /**
+     * Toggle the soft keyboard. The {@link InputMethodManager#SHOW_FORCED} is passed as
+     * {@code showFlags} so that keyboard is forcefully shown if it needs to be enabled.
+     *
+     * This is also important for soft keyboard to be shown when a hardware keyboard is attached, and
+     * user has disabled the {@code Show on-screen keyboard while hardware keyboard is attached} toggle
+     * in Android "Language and Input" settings but the current soft keyboard app overrides the
+     * default implementation of {@link InputMethodService#onEvaluateInputViewShown()} and returns
+     * {@code true}.
+     */
+    public static void toggleSoftKeyboard(Context context) {
+        InputMethodManager inputMethodManager = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
+        inputMethodManager.toggleSoftInput(InputMethodManager.SHOW_FORCED, 0);
+    }
+
+    /**
+     * Show the soft keyboard. The {@code 0} value is passed as {@code flags} so that keyboard is
+     * forcefully shown.
+     *
+     * This is also important for soft keyboard to be shown on app startup when a hardware keyboard
+     * is attached, and user has disabled the {@code Show on-screen keyboard while hardware keyboard
+     * is attached} toggle in Android "Language and Input" settings but the current soft keyboard app
+     * overrides the default implementation of {@link InputMethodService#onEvaluateInputViewShown()}
+     * and returns {@code true}.
+     * https://cs.android.com/android/platform/superproject/+/android-11.0.0_r3:frameworks/base/core/java/android/inputmethodservice/InputMethodService.java;l=1751
+     *
+     * Also check {@link InputMethodService#onShowInputRequested(int, boolean)} which must return
+     * {@code true}, which can be done by failing its {@code ((flags&InputMethod.SHOW_EXPLICIT) == 0)}
+     * check by passing {@code 0} as {@code flags}.
+     * https://cs.android.com/android/platform/superproject/+/android-11.0.0_r3:frameworks/base/core/java/android/inputmethodservice/InputMethodService.java;l=2022
+     */
+    public static void showSoftKeyboard(Context context, View view) {
+        InputMethodManager inputMethodManager = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
+        inputMethodManager.showSoftInput(view, 0);
+    }
+
+    public static void hideSoftKeyboard(Context context, View view) {
+        InputMethodManager inputMethodManager = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
+        inputMethodManager.hideSoftInputFromWindow(view.getWindowToken(), 0);
+    }
+
+    public static void disableSoftKeyboard(Activity activity, View view) {
+        hideSoftKeyboard(activity, view);
+        setDisableSoftKeyboardFlags(activity);
+    }
+
+    public static void setDisableSoftKeyboardFlags(Activity activity) {
+        activity.getWindow().setFlags(WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM, WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM);
+    }
+
+    public static void clearDisableSoftKeyboardFlags(Activity activity) {
+        activity.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM);
+    }
+
+    public static boolean areDisableSoftKeyboardFlagsSet(Activity activity) {
+        return (activity.getWindow().getAttributes().flags & WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM) != 0;
+    }
+
+    public static void setResizeTerminalViewForSoftKeyboardFlags(Activity activity) {
+        // TODO: The flag is deprecated for API 30 and WindowInset API should be used
+        // https://developer.android.com/reference/android/view/WindowManager.LayoutParams#SOFT_INPUT_ADJUST_RESIZE
+        // https://medium.com/androiddevelopers/animating-your-keyboard-fb776a8fb66d
+        // https://stackoverflow.com/a/65194077/14686958
+        activity.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
+    }
+
+    /** Check if keyboard visible. Does not work on android 7 but does on android 11 avd. */
+    public static boolean isSoftKeyboardVisible(Activity activity) {
+        WindowInsets insets = activity.getWindow().getDecorView().getRootWindowInsets();
+
+        if (insets != null) {
+            WindowInsetsCompat insetsCompat = WindowInsetsCompat.toWindowInsetsCompat(insets);
+            if (insetsCompat != null && insetsCompat.isVisible(WindowInsetsCompat.Type.ime())) {
+                Logger.logVerbose(LOG_TAG, "Keyboard visible");
+                return true;
+            }
+        }
+
+        Logger.logVerbose(LOG_TAG, "Keyboard not visible");
+        return false;
+    }
+
+}

From fe8c3ba216d2fc145eb33707accb4abfad87125d Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Mon, 10 May 2021 05:21:54 +0500
Subject: [PATCH 380/912] Update KeyboardUtils will null checks and add
 setSoftKeyboardVisibility()

---
 .../com/termux/shared/view/KeyboardUtils.java | 71 +++++++++++++------
 1 file changed, 49 insertions(+), 22 deletions(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/view/KeyboardUtils.java b/termux-shared/src/main/java/com/termux/shared/view/KeyboardUtils.java
index a71bb328e1..e6b713a5a9 100644
--- a/termux-shared/src/main/java/com/termux/shared/view/KeyboardUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/view/KeyboardUtils.java
@@ -8,6 +8,7 @@
 import android.view.WindowManager;
 import android.view.inputmethod.InputMethodManager;
 
+import androidx.annotation.NonNull;
 import androidx.core.view.WindowInsetsCompat;
 
 import com.termux.shared.logger.Logger;
@@ -16,6 +17,15 @@ public class KeyboardUtils {
 
     private static final String LOG_TAG = "KeyboardUtils";
 
+    public static void setSoftKeyboardVisibility(@NonNull final Runnable showSoftKeyboardRunnable, final Activity activity, final View view, final boolean visible) {
+        if (visible) {
+            view.postDelayed(showSoftKeyboardRunnable, 1000);
+        } else {
+            view.removeCallbacks(showSoftKeyboardRunnable);
+            hideSoftKeyboard(activity, view);
+        }
+    }
+
     /**
      * Toggle the soft keyboard. The {@link InputMethodManager#SHOW_FORCED} is passed as
      * {@code showFlags} so that keyboard is forcefully shown if it needs to be enabled.
@@ -26,9 +36,11 @@ public class KeyboardUtils {
      * default implementation of {@link InputMethodService#onEvaluateInputViewShown()} and returns
      * {@code true}.
      */
-    public static void toggleSoftKeyboard(Context context) {
+    public static void toggleSoftKeyboard(final Context context) {
+        if (context == null) return;
         InputMethodManager inputMethodManager = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
-        inputMethodManager.toggleSoftInput(InputMethodManager.SHOW_FORCED, 0);
+        if (inputMethodManager != null)
+            inputMethodManager.toggleSoftInput(InputMethodManager.SHOW_FORCED, 0);
     }
 
     /**
@@ -47,50 +59,65 @@ public static void toggleSoftKeyboard(Context context) {
      * check by passing {@code 0} as {@code flags}.
      * https://cs.android.com/android/platform/superproject/+/android-11.0.0_r3:frameworks/base/core/java/android/inputmethodservice/InputMethodService.java;l=2022
      */
-    public static void showSoftKeyboard(Context context, View view) {
+    public static void showSoftKeyboard(final Context context, final View view) {
+        if (context == null || view == null) return;
         InputMethodManager inputMethodManager = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
-        inputMethodManager.showSoftInput(view, 0);
+        if (inputMethodManager != null)
+            inputMethodManager.showSoftInput(view, 0);
     }
 
-    public static void hideSoftKeyboard(Context context, View view) {
+    public static void hideSoftKeyboard(final Context context, final View view) {
+        if (context == null || view == null) return;
         InputMethodManager inputMethodManager = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
-        inputMethodManager.hideSoftInputFromWindow(view.getWindowToken(), 0);
+        if (inputMethodManager != null)
+            inputMethodManager.hideSoftInputFromWindow(view.getWindowToken(), 0);
     }
 
-    public static void disableSoftKeyboard(Activity activity, View view) {
+    public static void disableSoftKeyboard(final Activity activity, final View view) {
+        if (activity == null || view == null) return;
         hideSoftKeyboard(activity, view);
         setDisableSoftKeyboardFlags(activity);
     }
 
-    public static void setDisableSoftKeyboardFlags(Activity activity) {
-        activity.getWindow().setFlags(WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM, WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM);
+    public static void setDisableSoftKeyboardFlags(final Activity activity) {
+        if (activity != null && activity.getWindow() != null)
+            activity.getWindow().setFlags(WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM, WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM);
     }
 
-    public static void clearDisableSoftKeyboardFlags(Activity activity) {
-        activity.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM);
+    public static void clearDisableSoftKeyboardFlags(final Activity activity) {
+        if (activity != null && activity.getWindow() != null)
+            activity.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM);
     }
 
-    public static boolean areDisableSoftKeyboardFlagsSet(Activity activity) {
+    public static boolean areDisableSoftKeyboardFlagsSet(final Activity activity) {
+        if (activity == null ||  activity.getWindow() == null) return false;
         return (activity.getWindow().getAttributes().flags & WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM) != 0;
     }
 
-    public static void setResizeTerminalViewForSoftKeyboardFlags(Activity activity) {
+    public static void setSoftKeyboardAlwaysHiddenFlags(final Activity activity) {
+        if (activity != null && activity.getWindow() != null)
+            activity.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN);
+    }
+
+    public static void setResizeTerminalViewForSoftKeyboardFlags(final Activity activity) {
         // TODO: The flag is deprecated for API 30 and WindowInset API should be used
         // https://developer.android.com/reference/android/view/WindowManager.LayoutParams#SOFT_INPUT_ADJUST_RESIZE
         // https://medium.com/androiddevelopers/animating-your-keyboard-fb776a8fb66d
         // https://stackoverflow.com/a/65194077/14686958
-        activity.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
+        if (activity != null && activity.getWindow() != null)
+            activity.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
     }
 
     /** Check if keyboard visible. Does not work on android 7 but does on android 11 avd. */
-    public static boolean isSoftKeyboardVisible(Activity activity) {
-        WindowInsets insets = activity.getWindow().getDecorView().getRootWindowInsets();
-
-        if (insets != null) {
-            WindowInsetsCompat insetsCompat = WindowInsetsCompat.toWindowInsetsCompat(insets);
-            if (insetsCompat != null && insetsCompat.isVisible(WindowInsetsCompat.Type.ime())) {
-                Logger.logVerbose(LOG_TAG, "Keyboard visible");
-                return true;
+    public static boolean isSoftKeyboardVisible(final Activity activity) {
+        if (activity != null && activity.getWindow() != null) {
+            WindowInsets insets = activity.getWindow().getDecorView().getRootWindowInsets();
+            if (insets != null) {
+                WindowInsetsCompat insetsCompat = WindowInsetsCompat.toWindowInsetsCompat(insets);
+                if (insetsCompat != null && insetsCompat.isVisible(WindowInsetsCompat.Type.ime())) {
+                    Logger.logVerbose(LOG_TAG, "Keyboard visible");
+                    return true;
+                }
             }
         }
 

From e4e638bd318baf6ad344c898c3baa9093975e53f Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Mon, 10 May 2021 06:03:29 +0500
Subject: [PATCH 381/912] Allow users to enable/disable keyboard instead of
 just show/hide with keyboard toggle buttons

This `soft-keyboard-toggle-behaviour` key can be used to change the behaviour. The default behaviour is `show/hide`. The user can set the value to `enable/disable` in `termux.properties` file to change default behaviour of keyboard toggle buttons to enable/disable. In this mode, tapping the keyboard toggle button will disable (and hide) the keyboard and tapping on the terminal view will not open the keybaord automatically, until the keyboard toggle button is pressed again manually. This applies to split screen and floating keyboard as well. The keyboard can also be enabled from Settings -> Keyboard I/O -> Soft Keyboard toggle. Running `termux-reload-settings` command will also update the behaviour instantaneously if changed.

Fixed issue where "hide-soft-keyboard-on-startup" property wouldn't work if Termux app was switched back from another app. Fixes #1098

Fixed issue where soft keyboard may not show on startup on some devices but it still may fail sometimes.

The `TermuxPropertyConstants` class has been updated to `v0.7.0`. Check its Changelog sections for info on changes.
---
 .../java/com/termux/app/TermuxActivity.java   |  4 +-
 .../terminal/TermuxTerminalViewClient.java    | 61 +++++++++++++------
 .../properties/TermuxPropertyConstants.java   | 17 +++++-
 .../properties/TermuxSharedProperties.java    | 16 +++++
 .../com/termux/shared/view/KeyboardUtils.java |  4 +-
 5 files changed, 80 insertions(+), 22 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index 1381998e9d..3942ea39da 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -236,7 +236,7 @@ public void onStart() {
     public void onResume() {
         super.onResume();
 
-        mTermuxTerminalViewClient.setSoftKeyboardState(true);
+        mTermuxTerminalViewClient.setSoftKeyboardState(true, false);
     }
 
     /**
@@ -768,7 +768,7 @@ private void reloadTermuxActivityStyling() {
 
         setTerminalToolbarHeight();
 
-        mTermuxTerminalViewClient.setSoftKeyboardState(true);
+        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.
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
index 2fe87e9207..93e387d16f 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
@@ -54,6 +54,8 @@ public class TermuxTerminalViewClient extends TermuxTerminalViewClientBase {
     /** Keeping track of the special keys acting as Ctrl and Fn for the soft keyboard and other hardware keys. */
     boolean mVirtualControlKeyDown, mVirtualFnKeyDown;
 
+    private Runnable mShowSoftKeyboardRunnable;
+
     private static final String LOG_TAG = "TermuxTerminalViewClient";
 
     public TermuxTerminalViewClient(TermuxActivity activity, TermuxTerminalSessionClient termuxTerminalSessionClient) {
@@ -77,6 +79,8 @@ public float onScale(float scale) {
     public void onSingleTapUp(MotionEvent e) {
         if (!KeyboardUtils.areDisableSoftKeyboardFlagsSet(mActivity))
             KeyboardUtils.showSoftKeyboard(mActivity, mActivity.getTerminalView());
+        else
+            Logger.logVerbose(LOG_TAG, "Not showing keyboard onSingleTapUp since its disabled");
     }
 
     @Override
@@ -342,23 +346,40 @@ public void changeFontSize(boolean increase) {
 
 
 
-
     /**
      * Called when user requests the soft keyboard to be toggled via "KEYBOARD" toggle button in
      * drawer or extra keys, or with ctrl+alt+k hardware keyboard shortcut.
      */
     public void onToggleSoftKeyboardRequest() {
-        // If soft keyboard is disabled by user for Termux
-        if (!mActivity.getPreferences().getSoftKeyboardEnabled()) {
-            KeyboardUtils.disableSoftKeyboard(mActivity, mActivity.getTerminalView());
-        } else {
-            KeyboardUtils.clearDisableSoftKeyboardFlags(mActivity);
-            KeyboardUtils.toggleSoftKeyboard(mActivity);
+        // If soft keyboard toggle behaviour is enable/disabled
+        if (mActivity.getProperties().shouldEnableDisableSoftKeyboardOnToggle()) {
+            // If soft keyboard is visible
+            if (!KeyboardUtils.areDisableSoftKeyboardFlagsSet(mActivity)) {
+                Logger.logVerbose(LOG_TAG, "Disabling soft keyboard on toggle");
+                mActivity.getPreferences().setSoftKeyboardEnabled(false);
+                KeyboardUtils.disableSoftKeyboard(mActivity, mActivity.getTerminalView());
+            } else {
+                Logger.logVerbose(LOG_TAG, "Enabling soft keyboard on toggle");
+                mActivity.getPreferences().setSoftKeyboardEnabled(true);
+                KeyboardUtils.clearDisableSoftKeyboardFlags(mActivity);
+                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().getSoftKeyboardEnabled()) {
+                Logger.logVerbose(LOG_TAG, "Maintaining disabled soft keyboard on toggle");
+                KeyboardUtils.disableSoftKeyboard(mActivity, mActivity.getTerminalView());
+            } else {
+                Logger.logVerbose(LOG_TAG, "Showing/Hiding soft keyboard on toggle");
+                KeyboardUtils.clearDisableSoftKeyboardFlags(mActivity);
+                KeyboardUtils.toggleSoftKeyboard(mActivity);
+            }
         }
-
     }
 
-    public void setSoftKeyboardState(boolean isStartup) {
+    public void setSoftKeyboardState(boolean isStartup, boolean isReloadTermuxProperties) {
         // If soft keyboard is disabled by user for Termux
         if (!mActivity.getPreferences().getSoftKeyboardEnabled()) {
             Logger.logVerbose(LOG_TAG, "Maintaining disabled soft keyboard");
@@ -374,19 +395,25 @@ public void setSoftKeyboardState(boolean isStartup) {
             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 {
-                // Force show soft keyboard
-                Logger.logVerbose(LOG_TAG, "Showing soft keyboard");
-                KeyboardUtils.showSoftKeyboard(mActivity, mActivity.getTerminalView());
+                // Do not force show soft keyboard if termux-reload-settings command was run with hardware keyboard
+                if (isReloadTermuxProperties)
+                    return;
+
+                if (mShowSoftKeyboardRunnable == null) {
+                    mShowSoftKeyboardRunnable = () -> {
+                        Logger.logVerbose(LOG_TAG, "Showing soft keyboard on focus change");
+                        KeyboardUtils.showSoftKeyboard(mActivity, mActivity.getTerminalView());
+                    };
+                }
 
                 mActivity.getTerminalView().setOnFocusChangeListener(new View.OnFocusChangeListener() {
                     @Override
                     public void onFocusChange(View view, boolean hasFocus) {
-                        if (hasFocus) {
-                            KeyboardUtils.showSoftKeyboard(mActivity, mActivity.getTerminalView());
-                        } else {
-                            KeyboardUtils.hideSoftKeyboard(mActivity, mActivity.getTerminalView());
-                        }
+                        // Force show soft keyboard if TerminalView has focus and close it if it doesn't
+                        KeyboardUtils.setSoftKeyboardVisibility(mShowSoftKeyboardRunnable, mActivity, mActivity.getTerminalView(), hasFocus);
                     }
                 });
 
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java b/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java
index 588db5d24e..3e1c62182b 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java
@@ -10,7 +10,7 @@
 import java.util.Set;
 
 /*
- * Version: v0.6.0
+ * Version: v0.7.0
  *
  * Changelog
  *
@@ -33,6 +33,9 @@
  *
  * - 0.6.0 (2021-04-07)
  *      - Updated javadocs.
+ *
+ * - 0.7.0 (2021-05-09)
+ *      - Add `*SOFT_KEYBOARD_TOGGLE_BEHAVIOUR*`.
  */
 
 /**
@@ -166,6 +169,15 @@ public final class TermuxPropertyConstants {
 
 
 
+    /** Defines the key for whether toggle soft keyboard request will show/hide or enable/disable keyboard */
+    public static final String SOFT_KEYBOARD_TOGGLE_BEHAVIOUR =  "soft-keyboard-toggle-behaviour"; // Default: "soft-keyboard-toggle-behaviour"
+
+    public static final String IVALUE_SOFT_KEYBOARD_TOGGLE_BEHAVIOUR_SHOW_HIDE = "show/hide";
+    public static final String IVALUE_SOFT_KEYBOARD_TOGGLE_BEHAVIOUR_ENABLE_DISABLE = "enable/disable";
+    public static final String DEFAULT_IVALUE_SOFT_KEYBOARD_TOGGLE_BEHAVIOUR = IVALUE_SOFT_KEYBOARD_TOGGLE_BEHAVIOUR_SHOW_HIDE;
+
+
+
 
 
     /** Defines the set for keys loaded by termux
@@ -198,7 +210,8 @@ public final class TermuxPropertyConstants {
         // String
         KEY_DEFAULT_WORKING_DIRECTORY,
         KEY_EXTRA_KEYS,
-        KEY_EXTRA_KEYS_STYLE
+        KEY_EXTRA_KEYS_STYLE,
+        SOFT_KEYBOARD_TOGGLE_BEHAVIOUR
     ));
 
     /** Defines the set for keys loaded by termux that have default boolean behaviour
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxSharedProperties.java b/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxSharedProperties.java
index 124fe6ae09..617e8208e0 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxSharedProperties.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxSharedProperties.java
@@ -211,6 +211,8 @@ public static Object getInternalTermuxPropertyValueFromValue(Context context, St
                 return (String) getExtraKeysInternalPropertyValueFromValue(value);
             case TermuxPropertyConstants.KEY_EXTRA_KEYS_STYLE:
                 return (String) getExtraKeysStyleInternalPropertyValueFromValue(value);
+            case TermuxPropertyConstants.SOFT_KEYBOARD_TOGGLE_BEHAVIOUR:
+                return (String) getSoftKeyboardToggleBehaviourInternalPropertyValueFromValue(value);
             default:
                 // default boolean behaviour
                 if (TermuxPropertyConstants.TERMUX_DEFAULT_BOOLEAN_BEHAVIOUR_PROPERTIES_LIST.contains(key))
@@ -373,6 +375,16 @@ public static String getExtraKeysStyleInternalPropertyValueFromValue(String valu
         return SharedProperties.getDefaultIfNull(value, TermuxPropertyConstants.DEFAULT_IVALUE_EXTRA_KEYS_STYLE);
     }
 
+    /**
+     * Returns the value itself if it is not {@code null}, otherwise returns {@link TermuxPropertyConstants#DEFAULT_IVALUE_SOFT_KEYBOARD_TOGGLE_BEHAVIOUR}.
+     *
+     * @param value {@link String} value to convert.
+     * @return Returns the internal value for value.
+     */
+    public static String getSoftKeyboardToggleBehaviourInternalPropertyValueFromValue(String value) {
+        return SharedProperties.getDefaultIfNull(value, TermuxPropertyConstants.DEFAULT_IVALUE_SOFT_KEYBOARD_TOGGLE_BEHAVIOUR);
+    }
+
 
 
 
@@ -421,6 +433,10 @@ public String getDefaultWorkingDirectory() {
         return (String) getInternalPropertyValue(TermuxPropertyConstants.KEY_DEFAULT_WORKING_DIRECTORY, true);
     }
 
+    public boolean shouldEnableDisableSoftKeyboardOnToggle() {
+        return (boolean) TermuxPropertyConstants.IVALUE_SOFT_KEYBOARD_TOGGLE_BEHAVIOUR_ENABLE_DISABLE.equals(getInternalPropertyValue(TermuxPropertyConstants.SOFT_KEYBOARD_TOGGLE_BEHAVIOUR, true));
+    }
+
 
 
 
diff --git a/termux-shared/src/main/java/com/termux/shared/view/KeyboardUtils.java b/termux-shared/src/main/java/com/termux/shared/view/KeyboardUtils.java
index e6b713a5a9..3891086dec 100644
--- a/termux-shared/src/main/java/com/termux/shared/view/KeyboardUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/view/KeyboardUtils.java
@@ -19,7 +19,9 @@ public class KeyboardUtils {
 
     public static void setSoftKeyboardVisibility(@NonNull final Runnable showSoftKeyboardRunnable, final Activity activity, final View view, final boolean visible) {
         if (visible) {
-            view.postDelayed(showSoftKeyboardRunnable, 1000);
+            // A Runnable with a delay is used, otherwise soft keyboard may not automatically open
+            // on some devices, but still may fail
+            view.postDelayed(showSoftKeyboardRunnable, 500);
         } else {
             view.removeCallbacks(showSoftKeyboardRunnable);
             hideSoftKeyboard(activity, view);

From e6dac9335236f58d567c6e1aa93021b4fb6174de Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Mon, 10 May 2021 07:10:38 +0500
Subject: [PATCH 382/912] Preserve the termux.properties literal string values
 internally that were being converted to boolean on load time

The `TermuxPropertyConstants` class has been updated to `v0.8.0`. Check its Changelog sections for info on changes.
---
 .../properties/TermuxPropertyConstants.java   | 76 ++++++++++++------
 .../properties/TermuxSharedProperties.java    | 78 +++++++++----------
 2 files changed, 90 insertions(+), 64 deletions(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java b/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java
index 3e1c62182b..bedc27f3c9 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java
@@ -10,7 +10,7 @@
 import java.util.Set;
 
 /*
- * Version: v0.7.0
+ * Version: v0.8.0
  *
  * Changelog
  *
@@ -36,6 +36,11 @@
  *
  * - 0.7.0 (2021-05-09)
  *      - Add `*SOFT_KEYBOARD_TOGGLE_BEHAVIOUR*`.
+ *
+ * - 0.8.0 (2021-05-10)
+ *      - Change the `KEY_USE_BACK_KEY_AS_ESCAPE_KEY` and `KEY_VIRTUAL_VOLUME_KEYS_DISABLED` booleans
+ *          to `KEY_BACK_KEY_BEHAVIOUR` and `KEY_VOLUME_KEYS_BEHAVIOUR` String internal values.
+ *      - Renamed `SOFT_KEYBOARD_TOGGLE_BEHAVIOUR` to `KEY_SOFT_KEYBOARD_TOGGLE_BEHAVIOUR`.
  */
 
 /**
@@ -51,13 +56,7 @@
  */
 public final class TermuxPropertyConstants {
 
-    /** Defines the key for whether to use back key as the escape key */
-    public static final String KEY_USE_BACK_KEY_AS_ESCAPE_KEY =  "back-key"; // Default: "back-key"
-
-    public static final String VALUE_BACK_KEY_BEHAVIOUR_BACK = "back";
-    public static final String VALUE_BACK_KEY_BEHAVIOUR_ESCAPE = "escape";
-
-
+    /* boolean */
 
     /** Defines the key for whether to enforce character based input to fix the issue where for some devices like Samsung, the letters might not appear until enter is pressed */
     public static final String KEY_ENFORCE_CHAR_BASED_INPUT =  "enforce-char-based-input"; // Default: "enforce-char-based-input"
@@ -89,13 +88,9 @@ public final class TermuxPropertyConstants {
 
 
 
-    /** Defines the key for whether virtual volume keys are disabled */
-    public static final String KEY_VIRTUAL_VOLUME_KEYS_DISABLED =  "volume-keys"; // Default: "volume-keys"
-
-    public static final String VALUE_VOLUME_KEY_BEHAVIOUR_VOLUME = "volume";
-    public static final String VALUE_VOLUME_KEY_BEHAVIOUR_VIRTUAL = "virtual";
 
 
+    /* int */
 
     /** Defines the key for the bell behaviour */
     public static final String KEY_BELL_BEHAVIOUR =  "bell-character"; // Default: "bell-character"
@@ -120,7 +115,11 @@ public final class TermuxPropertyConstants {
 
 
 
-    /** Defines the key for the bell behaviour */
+
+
+    /* float */
+
+    /** Defines the key for the terminal toolbar height */
     public static final String KEY_TERMINAL_TOOLBAR_HEIGHT_SCALE_FACTOR =  "terminal-toolbar-height"; // Default: "terminal-toolbar-height"
     public static final float IVALUE_TERMINAL_TOOLBAR_HEIGHT_SCALE_FACTOR_MIN = 0.4f;
     public static final float IVALUE_TERMINAL_TOOLBAR_HEIGHT_SCALE_FACTOR_MAX = 3;
@@ -128,6 +127,10 @@ public final class TermuxPropertyConstants {
 
 
 
+
+
+    /* Integer */
+
     /** Defines the key for create session shortcut */
     public static final String KEY_SHORTCUT_CREATE_SESSION =  "shortcut.create-session"; // Default: "shortcut.create-session"
     /** Defines the key for next session shortcut */
@@ -153,6 +156,19 @@ public final class TermuxPropertyConstants {
 
 
 
+
+
+    /* String */
+
+    /** Defines the key for whether back key will behave as escape key or literal back key */
+    public static final String KEY_BACK_KEY_BEHAVIOUR =  "back-key"; // Default: "back-key"
+
+    public static final String IVALUE_BACK_KEY_BEHAVIOUR_BACK = "back";
+    public static final String IVALUE_BACK_KEY_BEHAVIOUR_ESCAPE = "escape";
+    public static final String DEFAULT_IVALUE_BACK_KEY_BEHAVIOUR = IVALUE_BACK_KEY_BEHAVIOUR_BACK;
+
+
+
     /** Defines the key for the default working directory */
     public static final String KEY_DEFAULT_WORKING_DIRECTORY =  "default-working-directory"; // Default: "default-working-directory"
     /** Defines the default working directory */
@@ -162,15 +178,16 @@ public final class TermuxPropertyConstants {
 
     /** Defines the key for extra keys */
     public static final String KEY_EXTRA_KEYS =  "extra-keys"; // Default: "extra-keys"
+    public static final String DEFAULT_IVALUE_EXTRA_KEYS = "[[ESC, TAB, CTRL, ALT, {key: '-', popup: '|'}, DOWN, UP]]";
+
     /** Defines the key for extra keys style */
     public static final String KEY_EXTRA_KEYS_STYLE =  "extra-keys-style"; // Default: "extra-keys-style"
-    public static final String DEFAULT_IVALUE_EXTRA_KEYS = "[[ESC, TAB, CTRL, ALT, {key: '-', popup: '|'}, DOWN, UP]]";
     public static final String DEFAULT_IVALUE_EXTRA_KEYS_STYLE = "default";
 
 
 
     /** Defines the key for whether toggle soft keyboard request will show/hide or enable/disable keyboard */
-    public static final String SOFT_KEYBOARD_TOGGLE_BEHAVIOUR =  "soft-keyboard-toggle-behaviour"; // Default: "soft-keyboard-toggle-behaviour"
+    public static final String KEY_SOFT_KEYBOARD_TOGGLE_BEHAVIOUR =  "soft-keyboard-toggle-behaviour"; // Default: "soft-keyboard-toggle-behaviour"
 
     public static final String IVALUE_SOFT_KEYBOARD_TOGGLE_BEHAVIOUR_SHOW_HIDE = "show/hide";
     public static final String IVALUE_SOFT_KEYBOARD_TOGGLE_BEHAVIOUR_ENABLE_DISABLE = "enable/disable";
@@ -178,41 +195,50 @@ public final class TermuxPropertyConstants {
 
 
 
+    /** Defines the key for whether volume keys will behave as virtual or literal volume keys */
+    public static final String KEY_VOLUME_KEYS_BEHAVIOUR =  "volume-keys"; // Default: "volume-keys"
+
+    public static final String IVALUE_VOLUME_KEY_BEHAVIOUR_VIRTUAL = "virtual";
+    public static final String IVALUE_VOLUME_KEY_BEHAVIOUR_VOLUME = "volume";
+    public static final String DEFAULT_IVALUE_VOLUME_KEYS_BEHAVIOUR = IVALUE_VOLUME_KEY_BEHAVIOUR_VIRTUAL;
+
+
+
 
 
     /** Defines the set for keys loaded by termux
      * Setting this to {@code null} will make {@link SharedProperties} throw an exception.
      * */
     public static final Set<String> TERMUX_PROPERTIES_LIST = new HashSet<>(Arrays.asList(
-        // boolean
+        /* boolean */
         KEY_ENFORCE_CHAR_BASED_INPUT,
         KEY_HIDE_SOFT_KEYBOARD_ON_STARTUP,
-        KEY_USE_BACK_KEY_AS_ESCAPE_KEY,
         KEY_USE_BLACK_UI,
         KEY_USE_CTRL_SPACE_WORKAROUND,
         KEY_USE_FULLSCREEN,
         KEY_USE_FULLSCREEN_WORKAROUND,
-        KEY_VIRTUAL_VOLUME_KEYS_DISABLED,
         TermuxConstants.PROP_ALLOW_EXTERNAL_APPS,
 
-        // int
+        /* int */
         KEY_BELL_BEHAVIOUR,
 
-        // float
+        /* float */
         KEY_TERMINAL_TOOLBAR_HEIGHT_SCALE_FACTOR,
 
-        // Integer
+        /* Integer */
         KEY_SHORTCUT_CREATE_SESSION,
         KEY_SHORTCUT_NEXT_SESSION,
         KEY_SHORTCUT_PREVIOUS_SESSION,
         KEY_SHORTCUT_RENAME_SESSION,
 
-        // String
+        /* String */
+        KEY_BACK_KEY_BEHAVIOUR,
         KEY_DEFAULT_WORKING_DIRECTORY,
         KEY_EXTRA_KEYS,
         KEY_EXTRA_KEYS_STYLE,
-        SOFT_KEYBOARD_TOGGLE_BEHAVIOUR
-    ));
+        KEY_SOFT_KEYBOARD_TOGGLE_BEHAVIOUR,
+        KEY_VOLUME_KEYS_BEHAVIOUR
+        ));
 
     /** Defines the set for keys loaded by termux that have default boolean behaviour
      * "true" -> true
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxSharedProperties.java b/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxSharedProperties.java
index 617e8208e0..4d294d108d 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxSharedProperties.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxSharedProperties.java
@@ -181,38 +181,39 @@ public static Object getInternalTermuxPropertyValueFromValue(Context context, St
           - If the value is not null and does exist in MAP_*, then internal value returned by map will be used.
          */
         switch (key) {
-            // boolean
-            case TermuxPropertyConstants.KEY_USE_BACK_KEY_AS_ESCAPE_KEY:
-                return (boolean) getUseBackKeyAsEscapeKeyInternalPropertyValueFromValue(value);
+            /* boolean */
             case TermuxPropertyConstants.KEY_USE_BLACK_UI:
                 return (boolean) getUseBlackUIInternalPropertyValueFromValue(context, value);
-            case TermuxPropertyConstants.KEY_VIRTUAL_VOLUME_KEYS_DISABLED:
-                return (boolean) getVolumeKeysDisabledInternalPropertyValueFromValue(value);
 
-            // int
+            /* int */
             case TermuxPropertyConstants.KEY_BELL_BEHAVIOUR:
                 return (int) getBellBehaviourInternalPropertyValueFromValue(value);
 
-            // float
+            /* float */
             case TermuxPropertyConstants.KEY_TERMINAL_TOOLBAR_HEIGHT_SCALE_FACTOR:
                 return (float) getTerminalToolbarHeightScaleFactorInternalPropertyValueFromValue(value);
 
-            // Integer (may be null)
+            /* Integer (may be null) */
             case TermuxPropertyConstants.KEY_SHORTCUT_CREATE_SESSION:
             case TermuxPropertyConstants.KEY_SHORTCUT_NEXT_SESSION:
             case TermuxPropertyConstants.KEY_SHORTCUT_PREVIOUS_SESSION:
             case TermuxPropertyConstants.KEY_SHORTCUT_RENAME_SESSION:
                 return (Integer) getCodePointForSessionShortcuts(key, value);
 
-            // String (may be null)
+            /* String (may be null) */
+            case TermuxPropertyConstants.KEY_BACK_KEY_BEHAVIOUR:
+                return (String) getBackKeyBehaviourInternalPropertyValueFromValue(value);
             case TermuxPropertyConstants.KEY_DEFAULT_WORKING_DIRECTORY:
                 return (String) getDefaultWorkingDirectoryInternalPropertyValueFromValue(value);
             case TermuxPropertyConstants.KEY_EXTRA_KEYS:
                 return (String) getExtraKeysInternalPropertyValueFromValue(value);
             case TermuxPropertyConstants.KEY_EXTRA_KEYS_STYLE:
                 return (String) getExtraKeysStyleInternalPropertyValueFromValue(value);
-            case TermuxPropertyConstants.SOFT_KEYBOARD_TOGGLE_BEHAVIOUR:
+            case TermuxPropertyConstants.KEY_SOFT_KEYBOARD_TOGGLE_BEHAVIOUR:
                 return (String) getSoftKeyboardToggleBehaviourInternalPropertyValueFromValue(value);
+            case TermuxPropertyConstants.KEY_VOLUME_KEYS_BEHAVIOUR:
+                return (String) getVolumeKeysBehaviourInternalPropertyValueFromValue(value);
+
             default:
                 // default boolean behaviour
                 if (TermuxPropertyConstants.TERMUX_DEFAULT_BOOLEAN_BEHAVIOUR_PROPERTIES_LIST.contains(key))
@@ -230,15 +231,7 @@ else if (TermuxPropertyConstants.TERMUX_DEFAULT_INVERETED_BOOLEAN_BEHAVIOUR_PROP
 
 
 
-    /**
-     * Returns {@code true} if value is not {@code null} and equals {@link TermuxPropertyConstants#VALUE_BACK_KEY_BEHAVIOUR_ESCAPE}, otherwise false.
-     *
-     * @param value The {@link String} value to convert.
-     * @return Returns the internal value for value.
-     */
-    public static boolean getUseBackKeyAsEscapeKeyInternalPropertyValueFromValue(String value) {
-        return SharedProperties.getDefaultIfNull(value, TermuxPropertyConstants.VALUE_BACK_KEY_BEHAVIOUR_BACK).equals(TermuxPropertyConstants.VALUE_BACK_KEY_BEHAVIOUR_ESCAPE);
-    }
+
 
     /**
      * Returns {@code true} or {@code false} if value is the literal string "true" or "false" respectively regardless of case.
@@ -252,17 +245,6 @@ public static boolean getUseBlackUIInternalPropertyValueFromValue(Context contex
         return SharedProperties.getBooleanValueForStringValue(value, nightMode == Configuration.UI_MODE_NIGHT_YES);
     }
 
-    /**
-     * Returns {@code true} if value is not {@code null} and equals
-     * {@link TermuxPropertyConstants#VALUE_VOLUME_KEY_BEHAVIOUR_VOLUME}, otherwise {@code false}.
-     *
-     * @param value The {@link String} value to convert.
-     * @return Returns the internal value for value.
-     */
-    public static boolean getVolumeKeysDisabledInternalPropertyValueFromValue(String value) {
-        return SharedProperties.getDefaultIfNull(value, TermuxPropertyConstants.VALUE_VOLUME_KEY_BEHAVIOUR_VIRTUAL).equals(TermuxPropertyConstants.VALUE_VOLUME_KEY_BEHAVIOUR_VOLUME);
-    }
-
     /**
      * Returns the internal value after mapping it based on
      * {@code TermuxPropertyConstants#MAP_BELL_BEHAVIOUR} if the value is not {@code null}
@@ -336,6 +318,16 @@ public static Integer getCodePointForSessionShortcuts(String key, String value)
         return codePoint;
     }
 
+    /**
+     * Returns the value itself if it is not {@code null}, otherwise returns {@link TermuxPropertyConstants#DEFAULT_IVALUE_BACK_KEY_BEHAVIOUR}.
+     *
+     * @param value {@link String} value to convert.
+     * @return Returns the internal value for value.
+     */
+    public static String getBackKeyBehaviourInternalPropertyValueFromValue(String value) {
+        return SharedProperties.getDefaultIfNull(value, TermuxPropertyConstants.DEFAULT_IVALUE_BACK_KEY_BEHAVIOUR);
+    }
+
     /**
      * Returns the path itself if a directory exists at it and is readable, otherwise returns
      *  {@link TermuxPropertyConstants#DEFAULT_IVALUE_DEFAULT_WORKING_DIRECTORY}.
@@ -385,6 +377,15 @@ public static String getSoftKeyboardToggleBehaviourInternalPropertyValueFromValu
         return SharedProperties.getDefaultIfNull(value, TermuxPropertyConstants.DEFAULT_IVALUE_SOFT_KEYBOARD_TOGGLE_BEHAVIOUR);
     }
 
+    /**
+     * Returns the value itself if it is not {@code null}, otherwise returns {@link TermuxPropertyConstants#DEFAULT_IVALUE_VOLUME_KEYS_BEHAVIOUR}.
+     *
+     * @param value {@link String} value to convert.
+     * @return Returns the internal value for value.
+     */
+    public static String getVolumeKeysBehaviourInternalPropertyValueFromValue(String value) {
+        return SharedProperties.getDefaultIfNull(value, TermuxPropertyConstants.DEFAULT_IVALUE_VOLUME_KEYS_BEHAVIOUR);
+    }
 
 
 
@@ -397,10 +398,6 @@ public boolean shouldSoftKeyboardBeHiddenOnStartup() {
         return (boolean) getInternalPropertyValue(TermuxPropertyConstants.KEY_HIDE_SOFT_KEYBOARD_ON_STARTUP, true);
     }
 
-    public boolean isBackKeyTheEscapeKey() {
-        return (boolean) getInternalPropertyValue(TermuxPropertyConstants.KEY_USE_BACK_KEY_AS_ESCAPE_KEY, true);
-    }
-
     public boolean isUsingBlackUI() {
         return (boolean) getInternalPropertyValue(TermuxPropertyConstants.KEY_USE_BLACK_UI, true);
     }
@@ -417,10 +414,6 @@ public boolean isUsingFullScreenWorkAround() {
         return (boolean) getInternalPropertyValue(TermuxPropertyConstants.KEY_USE_FULLSCREEN_WORKAROUND, true);
     }
 
-    public boolean areVirtualVolumeKeysDisabled() {
-        return (boolean) getInternalPropertyValue(TermuxPropertyConstants.KEY_VIRTUAL_VOLUME_KEYS_DISABLED, true);
-    }
-
     public int getBellBehaviour() {
         return (int) getInternalPropertyValue(TermuxPropertyConstants.KEY_BELL_BEHAVIOUR, true);
     }
@@ -429,14 +422,21 @@ public float getTerminalToolbarHeightScaleFactor() {
         return rangeTerminalToolbarHeightScaleFactorValue((float) getInternalPropertyValue(TermuxPropertyConstants.KEY_TERMINAL_TOOLBAR_HEIGHT_SCALE_FACTOR, true));
     }
 
+    public boolean isBackKeyTheEscapeKey() {
+        return (boolean) TermuxPropertyConstants.IVALUE_BACK_KEY_BEHAVIOUR_ESCAPE.equals(getInternalPropertyValue(TermuxPropertyConstants.KEY_BACK_KEY_BEHAVIOUR, true));
+    }
+
     public String getDefaultWorkingDirectory() {
         return (String) getInternalPropertyValue(TermuxPropertyConstants.KEY_DEFAULT_WORKING_DIRECTORY, true);
     }
 
     public boolean shouldEnableDisableSoftKeyboardOnToggle() {
-        return (boolean) TermuxPropertyConstants.IVALUE_SOFT_KEYBOARD_TOGGLE_BEHAVIOUR_ENABLE_DISABLE.equals(getInternalPropertyValue(TermuxPropertyConstants.SOFT_KEYBOARD_TOGGLE_BEHAVIOUR, true));
+        return (boolean) TermuxPropertyConstants.IVALUE_SOFT_KEYBOARD_TOGGLE_BEHAVIOUR_ENABLE_DISABLE.equals(getInternalPropertyValue(TermuxPropertyConstants.KEY_SOFT_KEYBOARD_TOGGLE_BEHAVIOUR, true));
     }
 
+    public boolean areVirtualVolumeKeysDisabled() {
+        return (boolean) TermuxPropertyConstants.IVALUE_VOLUME_KEY_BEHAVIOUR_VOLUME.equals(getInternalPropertyValue(TermuxPropertyConstants.KEY_VOLUME_KEYS_BEHAVIOUR, true));
+    }
 
 
 

From 90c9a7b3bc79972cb3765f7bad2681d7dd58bf1b Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 12 May 2021 21:56:23 +0500
Subject: [PATCH 383/912] Allow users to disable soft keyboard automatically if
 hardware keyboard is connected

Users can enable this behaviour by enabling the `Termux Settings` -> `Keyboard I/O` -> `Soft Keyboard Only If No Hardware` toggle.

Currently, for this case, soft keyboard will be disabled on Termux app startup and when switching back from another app. Soft keyboard can be temporarily enabled in show/hide soft keyboard toggle behaviour with keyboard toggle buttons and will continue to work when tapping on terminal view for opening and back button for closing, until Termux app is switched to another app. After returning back, keyboard will be disabled until toggle is pressed again.

This also may help for the Lineage OS bug where blank space is shown where soft keyboard should be if "Show soft keyboard" toggle in "Language and Input" is disabled. Check KeyboardUtils.shouldSoftKeyboardBeDisabled() and https://github.com/termux/termux-app/issues/1995#issuecomment-837080079 for details.

The `TermuxPreferenceConstants` class has been updated to `v0.10.0`. Check its Changelog sections for info on changes.
---
 .../TerminalIOPreferencesFragment.java        |  5 ++
 .../terminal/TermuxTerminalViewClient.java    |  8 +-
 app/src/main/res/values/strings.xml           |  7 +-
 .../main/res/xml/terminal_io_preferences.xml  |  6 ++
 .../TermuxAppSharedPreferences.java           |  8 ++
 .../TermuxPreferenceConstants.java            | 13 ++-
 .../com/termux/shared/view/KeyboardUtils.java | 81 +++++++++++++++++--
 7 files changed, 115 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/com/termux/app/fragments/settings/TerminalIOPreferencesFragment.java b/app/src/main/java/com/termux/app/fragments/settings/TerminalIOPreferencesFragment.java
index ef0a56c2c8..d9500f841d 100644
--- a/app/src/main/java/com/termux/app/fragments/settings/TerminalIOPreferencesFragment.java
+++ b/app/src/main/java/com/termux/app/fragments/settings/TerminalIOPreferencesFragment.java
@@ -53,6 +53,9 @@ public void putBoolean(String key, boolean value) {
             case "soft_keyboard_enabled":
                     mPreferences.setSoftKeyboardEnabled(value);
                 break;
+            case "soft_keyboard_enabled_only_if_no_hardware":
+                mPreferences.setSoftKeyboardEnabledOnlyIfNoHardware(value);
+                break;
             default:
                 break;
         }
@@ -63,6 +66,8 @@ public boolean getBoolean(String key, boolean defValue) {
         switch (key) {
             case "soft_keyboard_enabled":
                 return mPreferences.getSoftKeyboardEnabled();
+            case "soft_keyboard_enabled_only_if_no_hardware":
+                return mPreferences.getSoftKeyboardEnabledOnlyIfNoHardware();
             default:
                 return false;
         }
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
index 93e387d16f..18a0d39b03 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
@@ -80,7 +80,7 @@ public void onSingleTapUp(MotionEvent e) {
         if (!KeyboardUtils.areDisableSoftKeyboardFlagsSet(mActivity))
             KeyboardUtils.showSoftKeyboard(mActivity, mActivity.getTerminalView());
         else
-            Logger.logVerbose(LOG_TAG, "Not showing keyboard onSingleTapUp since its disabled");
+            Logger.logVerbose(LOG_TAG, "Not showing soft keyboard onSingleTapUp since its disabled");
     }
 
     @Override
@@ -380,8 +380,10 @@ public void onToggleSoftKeyboardRequest() {
     }
 
     public void setSoftKeyboardState(boolean isStartup, boolean isReloadTermuxProperties) {
-        // If soft keyboard is disabled by user for Termux
-        if (!mActivity.getPreferences().getSoftKeyboardEnabled()) {
+        // If soft keyboard is disabled by user for Termux (check function docs for Termux behaviour info)
+        if (KeyboardUtils.shouldSoftKeyboardBeDisabled(mActivity,
+                mActivity.getPreferences().getSoftKeyboardEnabled(),
+                    mActivity.getPreferences().getSoftKeyboardEnabledOnlyIfNoHardware())) {
             Logger.logVerbose(LOG_TAG, "Maintaining disabled soft keyboard");
             KeyboardUtils.disableSoftKeyboard(mActivity, mActivity.getTerminalView());
         } else {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0cebd0b560..b12521886c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -151,8 +151,13 @@
         <string name="keyboard_header">Keyboard</string>
 
             <!-- Soft Keyboard -->
-            <string name="soft_keyboard_title">Soft Keyboard</string>
+            <string name="soft_keyboard_title">Soft Keyboard Enabled</string>
             <string name="soft_keyboard_off">Soft keyboard will be disabled.</string>
             <string name="soft_keyboard_on">Soft keyboard will be enabled. (Default)</string>
 
+            <!-- Soft Keyboard Only If No Hardware-->
+            <string name="soft_keyboard_enabled_only_if_no_hardware_title">Soft Keyboard If No Hardware</string>
+            <string name="soft_keyboard_enabled_only_if_no_hardware_off">Soft keyboard will be enabled even if hardware keyboard is connected. (Default)</string>
+            <string name="soft_keyboard_enabled_only_if_no_hardware_on">Soft keyboard will be enabled only if no hardware keyboard is connected.</string>
+
 </resources>
diff --git a/app/src/main/res/xml/terminal_io_preferences.xml b/app/src/main/res/xml/terminal_io_preferences.xml
index d20e7c58bf..6aecbf482c 100644
--- a/app/src/main/res/xml/terminal_io_preferences.xml
+++ b/app/src/main/res/xml/terminal_io_preferences.xml
@@ -10,6 +10,12 @@
             app:summaryOn="@string/soft_keyboard_on"
             app:title="@string/soft_keyboard_title" />
 
+        <SwitchPreferenceCompat
+            app:key="soft_keyboard_enabled_only_if_no_hardware"
+            app:summaryOff="@string/soft_keyboard_enabled_only_if_no_hardware_off"
+            app:summaryOn="@string/soft_keyboard_enabled_only_if_no_hardware_on"
+            app:title="@string/soft_keyboard_enabled_only_if_no_hardware_title" />
+
     </PreferenceCategory>
 
 </PreferenceScreen>
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxAppSharedPreferences.java b/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxAppSharedPreferences.java
index 086e50d75e..7c6656cdb3 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxAppSharedPreferences.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxAppSharedPreferences.java
@@ -62,6 +62,14 @@ public void setSoftKeyboardEnabled(boolean value) {
         SharedPreferenceUtils.setBoolean(mSharedPreferences, TERMUX_APP.KEY_SOFT_KEYBOARD_ENABLED, value, false);
     }
 
+    public boolean getSoftKeyboardEnabledOnlyIfNoHardware() {
+        return SharedPreferenceUtils.getBoolean(mSharedPreferences, TERMUX_APP.KEY_SOFT_KEYBOARD_ENABLED_ONLY_IF_NO_HARDWARE, TERMUX_APP.DEFAULT_VALUE_KEY_SOFT_KEYBOARD_ENABLED_ONLY_IF_NO_HARDWARE);
+    }
+
+    public void setSoftKeyboardEnabledOnlyIfNoHardware(boolean value) {
+        SharedPreferenceUtils.setBoolean(mSharedPreferences, TERMUX_APP.KEY_SOFT_KEYBOARD_ENABLED_ONLY_IF_NO_HARDWARE, value, false);
+    }
+
 
 
     public boolean getKeepScreenOn() {
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxPreferenceConstants.java b/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxPreferenceConstants.java
index 633b7c3441..efec9d9863 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxPreferenceConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxPreferenceConstants.java
@@ -1,7 +1,7 @@
 package com.termux.shared.settings.preferences;
 
 /*
- * Version: v0.9.0
+ * Version: v0.10.0
  *
  * Changelog
  *
@@ -40,6 +40,10 @@
  *
  * - 0.9.0 (2021-04-07)
  *      - Updated javadocs.
+ *
+ * - 0.10.0 (2021-05-12)
+ *      - Added following to `TERMUX_APP`:
+ *          `KEY_SOFT_KEYBOARD_ENABLED_ONLY_IF_NO_HARDWARE` and `DEFAULT_VALUE_KEY_SOFT_KEYBOARD_ENABLED_ONLY_IF_NO_HARDWARE`.
  */
 
 /**
@@ -70,6 +74,13 @@ public static final class TERMUX_APP {
         public static final String KEY_SOFT_KEYBOARD_ENABLED = "soft_keyboard_enabled";
         public static final boolean DEFAULT_VALUE_KEY_SOFT_KEYBOARD_ENABLED = true;
 
+        /**
+         * Defines the key for whether the soft keyboard will be enabled only if no hardware keyboard
+         * attached, for cases where users want to use a hardware keyboard instead.
+         */
+        public static final String KEY_SOFT_KEYBOARD_ENABLED_ONLY_IF_NO_HARDWARE = "soft_keyboard_enabled_only_if_no_hardware";
+        public static final boolean DEFAULT_VALUE_KEY_SOFT_KEYBOARD_ENABLED_ONLY_IF_NO_HARDWARE = false;
+
 
         /**
          * Defines the key for whether to always keep screen on.
diff --git a/termux-shared/src/main/java/com/termux/shared/view/KeyboardUtils.java b/termux-shared/src/main/java/com/termux/shared/view/KeyboardUtils.java
index 3891086dec..a54b4fa9f9 100644
--- a/termux-shared/src/main/java/com/termux/shared/view/KeyboardUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/view/KeyboardUtils.java
@@ -2,6 +2,7 @@
 
 import android.app.Activity;
 import android.content.Context;
+import android.content.res.Configuration;
 import android.inputmethodservice.InputMethodService;
 import android.view.View;
 import android.view.WindowInsets;
@@ -32,8 +33,8 @@ public static void setSoftKeyboardVisibility(@NonNull final Runnable showSoftKey
      * Toggle the soft keyboard. The {@link InputMethodManager#SHOW_FORCED} is passed as
      * {@code showFlags} so that keyboard is forcefully shown if it needs to be enabled.
      *
-     * This is also important for soft keyboard to be shown when a hardware keyboard is attached, and
-     * user has disabled the {@code Show on-screen keyboard while hardware keyboard is attached} toggle
+     * This is also important for soft keyboard to be shown when a hardware keyboard is connected, and
+     * user has disabled the {@code Show on-screen keyboard while hardware keyboard is connected} toggle
      * in Android "Language and Input" settings but the current soft keyboard app overrides the
      * default implementation of {@link InputMethodService#onEvaluateInputViewShown()} and returns
      * {@code true}.
@@ -50,8 +51,8 @@ public static void toggleSoftKeyboard(final Context context) {
      * forcefully shown.
      *
      * This is also important for soft keyboard to be shown on app startup when a hardware keyboard
-     * is attached, and user has disabled the {@code Show on-screen keyboard while hardware keyboard
-     * is attached} toggle in Android "Language and Input" settings but the current soft keyboard app
+     * is connected, and user has disabled the {@code Show on-screen keyboard while hardware keyboard
+     * is connected} toggle in Android "Language and Input" settings but the current soft keyboard app
      * overrides the default implementation of {@link InputMethodService#onEvaluateInputViewShown()}
      * and returns {@code true}.
      * https://cs.android.com/android/platform/superproject/+/android-11.0.0_r3:frameworks/base/core/java/android/inputmethodservice/InputMethodService.java;l=1751
@@ -110,21 +111,85 @@ public static void setResizeTerminalViewForSoftKeyboardFlags(final Activity acti
             activity.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
     }
 
-    /** Check if keyboard visible. Does not work on android 7 but does on android 11 avd. */
+    /**
+     * Check if soft keyboard is visible.
+     * Does not work on android 7 but does on android 11 avd.
+     *
+     * @param activity The Activity of the root view for which the visibility should be checked.
+     * @return Returns {@code true} if soft keyboard is visible, otherwise {@code false}.
+     */
     public static boolean isSoftKeyboardVisible(final Activity activity) {
         if (activity != null && activity.getWindow() != null) {
             WindowInsets insets = activity.getWindow().getDecorView().getRootWindowInsets();
             if (insets != null) {
                 WindowInsetsCompat insetsCompat = WindowInsetsCompat.toWindowInsetsCompat(insets);
-                if (insetsCompat != null && insetsCompat.isVisible(WindowInsetsCompat.Type.ime())) {
-                    Logger.logVerbose(LOG_TAG, "Keyboard visible");
+                if (insetsCompat.isVisible(WindowInsetsCompat.Type.ime())) {
+                    Logger.logVerbose(LOG_TAG, "Soft keyboard visible");
                     return true;
                 }
             }
         }
 
-        Logger.logVerbose(LOG_TAG, "Keyboard not visible");
+        Logger.logVerbose(LOG_TAG, "Soft keyboard not visible");
         return false;
     }
 
+    /**
+     * Check if hardware keyboard is connected.
+     * Based on default implementation of {@link InputMethodService#onEvaluateInputViewShown()}.
+     *
+     * https://developer.android.com/guide/topics/resources/providing-resources#ImeQualifier
+     *
+     * @param context The Context for operations.
+     * @return Returns {@code true} if device has hardware keys for text input or an external hardware
+     * keyboard is connected, otherwise {@code false}.
+     */
+    public static boolean isHardKeyboardConnected(final Context context) {
+        if (context == null) return false;
+
+        Configuration config = context.getResources().getConfiguration();
+        return config.keyboard != Configuration.KEYBOARD_NOKEYS
+            || config.hardKeyboardHidden == Configuration.HARDKEYBOARDHIDDEN_NO;
+    }
+
+    /**
+     * Check if soft keyboard should be disabled based on user configuration.
+     *
+     * @param context The Context for operations.
+     * @return Returns {@code true} if device has soft keyboard should be disabled, otherwise {@code false}.
+     */
+    public static boolean shouldSoftKeyboardBeDisabled(final Context context, final boolean isSoftKeyboardEnabled, final boolean isSoftKeyboardEnabledOnlyIfNoHardware) {
+        // If soft keyboard is disabled by user regardless of hardware keyboard
+        if (!isSoftKeyboardEnabled) {
+            return true;
+        } else {
+            /*
+             * Currently, for this case, soft keyboard will be disabled on Termux app startup and
+             * when switching back from another app. Soft keyboard can be temporarily enabled in
+             * show/hide soft keyboard toggle behaviour with keyboard toggle buttons and will continue
+             * to work when tapping on terminal view for opening and back button for closing, until
+             * Termux app is switched to another app. After returning back, keyboard will be disabled
+             * until toggle is pressed again.
+             * This may also be helpful for the Lineage OS bug where if "Show soft keyboard" toggle
+             * in "Language and Input" is disabled and Termux is started without a hardware keyboard
+             * in landscape mode, and then the keyboard is connected and phone is rotated to portrait
+             * mode and then keyboard is toggled with Termux keyboard toggle buttons, then a blank
+             * space is shown in-place of the soft keyboard. Its likely related to
+             * WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE which pushes up the view when
+             * keyboard is opened instead of the keyboard opening on top of the view (hiding stuff).
+             * If the "Show soft keyboard" toggle was disabled, then this resizing shouldn't happen.
+             * But it seems resizing does happen, but keyboard is never opened since its not supposed to.
+             * https://github.com/termux/termux-app/issues/1995#issuecomment-837080079
+             */
+            // If soft keyboard is disabled by user only if hardware keyboard is connected
+            if(isSoftKeyboardEnabledOnlyIfNoHardware) {
+                boolean isHardKeyboardConnected = KeyboardUtils.isHardKeyboardConnected(context);
+                Logger.logVerbose(LOG_TAG, "Hardware keyboard connected=" + isHardKeyboardConnected);
+                return isHardKeyboardConnected;
+            } else {
+                return false;
+            }
+        }
+    }
+
 }

From d42514d8c958eadb5eb6c59c47b3bf62ea2ab472 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 13 May 2021 05:07:45 +0500
Subject: [PATCH 384/912] Moved Termux app settings into dedicated "directory"
 in Termux Settings and added About page

The `TermuxConstants` class has been updated to `v0.20.0`. Check its Changelog sections for info on changes.
---
 .../termux/app/activities/ReportActivity.java |  4 +-
 .../app/activities/SettingsActivity.java      | 32 +++++++++
 .../settings/TermuxPreferencesFragment.java   | 46 ++++++++++++
 .../DebuggingPreferencesFragment.java         | 10 +--
 .../TerminalIOPreferencesFragment.java        |  8 +--
 .../com/termux/app/models/UserAction.java     |  3 +-
 ...l => markdown_adapter_node_code_block.xml} |  0
 ....xml => markdown_adapter_node_default.xml} |  0
 .../res/layout/preference_markdown_text.xml   | 20 ++++++
 app/src/main/res/values/strings.xml           | 69 ++++++++++--------
 .../main/res/xml/debugging_preferences.xml    | 33 ---------
 app/src/main/res/xml/root_preferences.xml     | 14 ++--
 .../main/res/xml/terminal_io_preferences.xml  | 21 ------
 .../res/xml/termux_debugging_preferences.xml  | 33 +++++++++
 app/src/main/res/xml/termux_preferences.xml   | 13 ++++
 .../xml/termux_terminal_io_preferences.xml    | 21 ++++++
 .../termux/shared/markdown/MarkdownUtils.java |  2 +-
 .../termux/shared/termux/TermuxConstants.java | 46 +++++++++++-
 .../com/termux/shared/termux/TermuxUtils.java | 71 +++++++++++++++++++
 19 files changed, 344 insertions(+), 102 deletions(-)
 create mode 100644 app/src/main/java/com/termux/app/fragments/settings/TermuxPreferencesFragment.java
 rename app/src/main/java/com/termux/app/fragments/settings/{ => termux}/DebuggingPreferencesFragment.java (92%)
 rename app/src/main/java/com/termux/app/fragments/settings/{ => termux}/TerminalIOPreferencesFragment.java (88%)
 rename app/src/main/res/layout/{activity_report_adapter_node_code_block.xml => markdown_adapter_node_code_block.xml} (100%)
 rename app/src/main/res/layout/{activity_report_adapter_node_default.xml => markdown_adapter_node_default.xml} (100%)
 create mode 100644 app/src/main/res/layout/preference_markdown_text.xml
 delete mode 100644 app/src/main/res/xml/debugging_preferences.xml
 delete mode 100644 app/src/main/res/xml/terminal_io_preferences.xml
 create mode 100644 app/src/main/res/xml/termux_debugging_preferences.xml
 create mode 100644 app/src/main/res/xml/termux_preferences.xml
 create mode 100644 app/src/main/res/xml/termux_terminal_io_preferences.xml

diff --git a/app/src/main/java/com/termux/app/activities/ReportActivity.java b/app/src/main/java/com/termux/app/activities/ReportActivity.java
index 2491005a02..5f6b0b3928 100644
--- a/app/src/main/java/com/termux/app/activities/ReportActivity.java
+++ b/app/src/main/java/com/termux/app/activities/ReportActivity.java
@@ -92,8 +92,8 @@ private void updateUI(Bundle bundle) {
 
         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))
+        final MarkwonAdapter adapter = MarkwonAdapter.builderTextViewIsRoot(R.layout.markdown_adapter_node_default)
+            .include(FencedCodeBlock.class, SimpleEntry.create(R.layout.markdown_adapter_node_code_block, R.id.code_text_view))
             .build();
 
         recyclerView.setLayoutManager(new LinearLayoutManager(this));
diff --git a/app/src/main/java/com/termux/app/activities/SettingsActivity.java b/app/src/main/java/com/termux/app/activities/SettingsActivity.java
index b30b1a5799..afb7373e97 100644
--- a/app/src/main/java/com/termux/app/activities/SettingsActivity.java
+++ b/app/src/main/java/com/termux/app/activities/SettingsActivity.java
@@ -1,12 +1,18 @@
 package com.termux.app.activities;
 
+import android.content.Context;
 import android.os.Bundle;
 
 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.app.models.ReportInfo;
+import com.termux.app.models.UserAction;
+import com.termux.shared.termux.TermuxConstants;
+import com.termux.shared.termux.TermuxUtils;
 
 public class SettingsActivity extends AppCompatActivity {
 
@@ -37,6 +43,32 @@ public static class RootPreferencesFragment extends PreferenceFragmentCompat {
         @Override
         public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
             setPreferencesFromResource(R.xml.root_preferences, rootKey);
+
+            setAboutOnPreferenceClickListener();
+        }
+
+        private void setAboutOnPreferenceClickListener() {
+            Context context = getContext();
+            Preference about = findPreference("about");
+            if (context != null && about != null) {
+                about.setOnPreferenceClickListener(preference -> {
+                    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(TermuxUtils.getDeviceInfoMarkdownString(context));
+                    aboutString.append("\n\n").append(TermuxUtils.getImportantLinksMarkdownString(context));
+
+                    ReportActivity.startReportActivity(context, new ReportInfo(UserAction.ABOUT, TermuxConstants.TERMUX_APP.TERMUX_SETTINGS_ACTIVITY_NAME, title, null, aboutString.toString(), null, false));
+
+                    return true;
+                });
+            }
         }
     }
 
diff --git a/app/src/main/java/com/termux/app/fragments/settings/TermuxPreferencesFragment.java b/app/src/main/java/com/termux/app/fragments/settings/TermuxPreferencesFragment.java
new file mode 100644
index 0000000000..67543f63c0
--- /dev/null
+++ b/app/src/main/java/com/termux/app/fragments/settings/TermuxPreferencesFragment.java
@@ -0,0 +1,46 @@
+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) {
+        PreferenceManager preferenceManager = getPreferenceManager();
+        preferenceManager.setPreferenceDataStore(TermuxPreferencesDataStore.getInstance(getContext()));
+
+        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 = new TermuxAppSharedPreferences(context);
+    }
+
+    public static synchronized TermuxPreferencesDataStore getInstance(Context context) {
+        if (mInstance == null) {
+            mInstance = new TermuxPreferencesDataStore(context.getApplicationContext());
+        }
+        return mInstance;
+    }
+
+}
diff --git a/app/src/main/java/com/termux/app/fragments/settings/DebuggingPreferencesFragment.java b/app/src/main/java/com/termux/app/fragments/settings/termux/DebuggingPreferencesFragment.java
similarity index 92%
rename from app/src/main/java/com/termux/app/fragments/settings/DebuggingPreferencesFragment.java
rename to app/src/main/java/com/termux/app/fragments/settings/termux/DebuggingPreferencesFragment.java
index 814426b66e..279cdc6526 100644
--- a/app/src/main/java/com/termux/app/fragments/settings/DebuggingPreferencesFragment.java
+++ b/app/src/main/java/com/termux/app/fragments/settings/termux/DebuggingPreferencesFragment.java
@@ -1,4 +1,4 @@
-package com.termux.app.fragments.settings;
+package com.termux.app.fragments.settings.termux;
 
 import android.content.Context;
 import android.os.Bundle;
@@ -23,7 +23,7 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         PreferenceManager preferenceManager = getPreferenceManager();
         preferenceManager.setPreferenceDataStore(DebuggingPreferencesDataStore.getInstance(getContext()));
 
-        setPreferencesFromResource(R.xml.debugging_preferences, rootKey);
+        setPreferencesFromResource(R.xml.termux_debugging_preferences, rootKey);
 
         PreferenceCategory loggingCategory = findPreference("logging");
 
@@ -125,11 +125,11 @@ public void putBoolean(String key, boolean value) {
     public boolean getBoolean(String key, boolean defValue) {
         switch (key) {
             case "terminal_view_key_logging_enabled":
-                return mPreferences.getTerminalViewKeyLoggingEnabled();
+                return mPreferences.isTerminalViewKeyLoggingEnabled();
             case "plugin_error_notifications_enabled":
-                return mPreferences.getPluginErrorNotificationsEnabled();
+                return mPreferences.arePluginErrorNotificationsEnabled();
             case "crash_report_notifications_enabled":
-                return mPreferences.getCrashReportNotificationsEnabled();
+                return mPreferences.areCrashReportNotificationsEnabled();
             default:
                 return false;
         }
diff --git a/app/src/main/java/com/termux/app/fragments/settings/TerminalIOPreferencesFragment.java b/app/src/main/java/com/termux/app/fragments/settings/termux/TerminalIOPreferencesFragment.java
similarity index 88%
rename from app/src/main/java/com/termux/app/fragments/settings/TerminalIOPreferencesFragment.java
rename to app/src/main/java/com/termux/app/fragments/settings/termux/TerminalIOPreferencesFragment.java
index d9500f841d..2e750c85da 100644
--- a/app/src/main/java/com/termux/app/fragments/settings/TerminalIOPreferencesFragment.java
+++ b/app/src/main/java/com/termux/app/fragments/settings/termux/TerminalIOPreferencesFragment.java
@@ -1,4 +1,4 @@
-package com.termux.app.fragments.settings;
+package com.termux.app.fragments.settings.termux;
 
 import android.content.Context;
 import android.os.Bundle;
@@ -19,7 +19,7 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         PreferenceManager preferenceManager = getPreferenceManager();
         preferenceManager.setPreferenceDataStore(TerminalIOPreferencesDataStore.getInstance(getContext()));
 
-        setPreferencesFromResource(R.xml.terminal_io_preferences, rootKey);
+        setPreferencesFromResource(R.xml.termux_terminal_io_preferences, rootKey);
     }
 
 }
@@ -65,9 +65,9 @@ public void putBoolean(String key, boolean value) {
     public boolean getBoolean(String key, boolean defValue) {
         switch (key) {
             case "soft_keyboard_enabled":
-                return mPreferences.getSoftKeyboardEnabled();
+                return mPreferences.isSoftKeyboardEnabled();
             case "soft_keyboard_enabled_only_if_no_hardware":
-                return mPreferences.getSoftKeyboardEnabledOnlyIfNoHardware();
+                return mPreferences.isSoftKeyboardEnabledOnlyIfNoHardware();
             default:
                 return false;
         }
diff --git a/app/src/main/java/com/termux/app/models/UserAction.java b/app/src/main/java/com/termux/app/models/UserAction.java
index ad56fbefaf..ee47605a07 100644
--- a/app/src/main/java/com/termux/app/models/UserAction.java
+++ b/app/src/main/java/com/termux/app/models/UserAction.java
@@ -2,8 +2,9 @@
 
 public enum UserAction {
 
-    PLUGIN_EXECUTION_COMMAND("plugin execution command"),
+    ABOUT("about"),
     CRASH_REPORT("crash report"),
+    PLUGIN_EXECUTION_COMMAND("plugin execution command"),
     REPORT_ISSUE_FROM_TRANSCRIPT("report issue from transcript");
 
     private final String name;
diff --git a/app/src/main/res/layout/activity_report_adapter_node_code_block.xml b/app/src/main/res/layout/markdown_adapter_node_code_block.xml
similarity index 100%
rename from app/src/main/res/layout/activity_report_adapter_node_code_block.xml
rename to app/src/main/res/layout/markdown_adapter_node_code_block.xml
diff --git a/app/src/main/res/layout/activity_report_adapter_node_default.xml b/app/src/main/res/layout/markdown_adapter_node_default.xml
similarity index 100%
rename from app/src/main/res/layout/activity_report_adapter_node_default.xml
rename to app/src/main/res/layout/markdown_adapter_node_default.xml
diff --git a/app/src/main/res/layout/preference_markdown_text.xml b/app/src/main/res/layout/preference_markdown_text.xml
new file mode 100644
index 0000000000..f77049e350
--- /dev/null
+++ b/app/src/main/res/layout/preference_markdown_text.xml
@@ -0,0 +1,20 @@
+<?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>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b12521886c..0c00943eff 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -122,42 +122,55 @@
     <!-- Termux Settings -->
     <string name="title_activity_termux_settings">&TERMUX_APP_NAME; Settings</string>
 
-    <!-- Debugging Preferences -->
-    <string name="debugging_preferences">Debugging</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>
 
-        <!-- Logging Category -->
-        <string name="logging_header">Logging</string>
+        <!-- Debugging Preferences -->
+        <string name="termux_debugging_preferences_title">Debugging</string>
+        <string name="termux_debugging_preferences_summary">Preferences for debugging</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>
+            <!-- Logging Category -->
+            <string name="termux_logging_header">Logging</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>
+                <!-- Log Level -->
+                <string name="termux_log_level_title">Log Level</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 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>
 
-    <!-- Terminal IO Preferences -->
-    <string name="terminal_io_preferences">Terminal I/O</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>
 
-        <!-- Keyboard Category -->
-        <string name="keyboard_header">Keyboard</string>
 
-            <!-- Soft Keyboard -->
-            <string name="soft_keyboard_title">Soft Keyboard Enabled</string>
-            <string name="soft_keyboard_off">Soft keyboard will be disabled.</string>
-            <string name="soft_keyboard_on">Soft keyboard will be enabled. (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>
 
-            <!-- Soft Keyboard Only If No Hardware-->
-            <string name="soft_keyboard_enabled_only_if_no_hardware_title">Soft Keyboard If No Hardware</string>
-            <string name="soft_keyboard_enabled_only_if_no_hardware_off">Soft keyboard will be enabled even if hardware keyboard is connected. (Default)</string>
-            <string name="soft_keyboard_enabled_only_if_no_hardware_on">Soft keyboard will be enabled only if no hardware keyboard is connected.</string>
+            <!-- Keyboard Category -->
+            <string name="termux_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>
+
+
+    <!-- About Preferences -->
+    <string name="about_preferences_title">About</string>
 
 </resources>
diff --git a/app/src/main/res/xml/debugging_preferences.xml b/app/src/main/res/xml/debugging_preferences.xml
deleted file mode 100644
index 48e44f98d1..0000000000
--- a/app/src/main/res/xml/debugging_preferences.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<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>
diff --git a/app/src/main/res/xml/root_preferences.xml b/app/src/main/res/xml/root_preferences.xml
index 75dd8826ac..297b490366 100644
--- a/app/src/main/res/xml/root_preferences.xml
+++ b/app/src/main/res/xml/root_preferences.xml
@@ -1,13 +1,15 @@
 <PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <Preference
-        app:title="@string/debugging_preferences"
-        app:summary="Preferences for debugging"
-        app:fragment="com.termux.app.fragments.settings.DebuggingPreferencesFragment"/>
+        app:key="termux"
+        app:title="@string/termux_preferences_title"
+        app:summary="@string/termux_preferences_summary"
+        app:fragment="com.termux.app.fragments.settings.TermuxPreferencesFragment"/>
 
     <Preference
-        app:title="@string/terminal_io_preferences"
-        app:summary="Preferences for terminal I/O"
-        app:fragment="com.termux.app.fragments.settings.TerminalIOPreferencesFragment"/>
+        app:key="about"
+        app:title="@string/about_preferences_title"
+        app:persistent="false"/>
+    <!-- app:layout="@layout/preference_markdown_text" -->
 
 </PreferenceScreen>
diff --git a/app/src/main/res/xml/terminal_io_preferences.xml b/app/src/main/res/xml/terminal_io_preferences.xml
deleted file mode 100644
index 6aecbf482c..0000000000
--- a/app/src/main/res/xml/terminal_io_preferences.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<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" />
-
-        <SwitchPreferenceCompat
-            app:key="soft_keyboard_enabled_only_if_no_hardware"
-            app:summaryOff="@string/soft_keyboard_enabled_only_if_no_hardware_off"
-            app:summaryOn="@string/soft_keyboard_enabled_only_if_no_hardware_on"
-            app:title="@string/soft_keyboard_enabled_only_if_no_hardware_title" />
-
-    </PreferenceCategory>
-
-</PreferenceScreen>
diff --git a/app/src/main/res/xml/termux_debugging_preferences.xml b/app/src/main/res/xml/termux_debugging_preferences.xml
new file mode 100644
index 0000000000..b59d931de7
--- /dev/null
+++ b/app/src/main/res/xml/termux_debugging_preferences.xml
@@ -0,0 +1,33 @@
+<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>
diff --git a/app/src/main/res/xml/termux_preferences.xml b/app/src/main/res/xml/termux_preferences.xml
new file mode 100644
index 0000000000..f28c775dc5
--- /dev/null
+++ b/app/src/main/res/xml/termux_preferences.xml
@@ -0,0 +1,13 @@
+<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"/>
+
+</PreferenceScreen>
diff --git a/app/src/main/res/xml/termux_terminal_io_preferences.xml b/app/src/main/res/xml/termux_terminal_io_preferences.xml
new file mode 100644
index 0000000000..ea9a0eb509
--- /dev/null
+++ b/app/src/main/res/xml/termux_terminal_io_preferences.xml
@@ -0,0 +1,21 @@
+<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>
diff --git a/termux-shared/src/main/java/com/termux/shared/markdown/MarkdownUtils.java b/termux-shared/src/main/java/com/termux/shared/markdown/MarkdownUtils.java
index 86ddd03fff..470624de29 100644
--- a/termux-shared/src/main/java/com/termux/shared/markdown/MarkdownUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/markdown/MarkdownUtils.java
@@ -179,7 +179,7 @@ public void configureSpansFactory(@NonNull MarkwonSpansFactory.Builder builder)
                             .setFactory(Code.class, (configuration, props) -> new Object[]{
                                 new BackgroundColorSpan(ContextCompat.getColor(context, R.color.background_markdown_code_inline)),
                                 new TypefaceSpan("monospace"),
-                                new AbsoluteSizeSpan(8)
+                                new AbsoluteSizeSpan(48)
                             })
                             // NB! both ordered and bullet list items
                             .setFactory(ListItem.class, (configuration, props) -> new BulletSpan());
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
index d0bcab1ddb..fe8c526dbe 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
@@ -3,9 +3,11 @@
 import android.annotation.SuppressLint;
 
 import java.io.File;
+import java.util.Arrays;
+import java.util.List;
 
 /*
- * Version: v0.19.0
+ * Version: v0.20.0
  *
  * Changelog
  *
@@ -135,6 +137,11 @@
  *      - Added `TERMUX_SERVICE.EXTRA_STDIN`.
  *      - Added `RUN_COMMAND_SERVICE.EXTRA_STDIN`.
  *      - Deprecated `TERMUX_ACTIVITY.EXTRA_RELOAD_STYLE`.
+ *
+ * - 0.20.0 (2021-05-13)
+ *      - Added `TERMUX_WIKI`, `TERMUX_WIKI_URL`, `TERMUX_PLUGIN_APP_NAMES_LIST`, `TERMUX_PLUGIN_APP_PACKAGE_NAMES_LIST`.
+ *      - Added `TERMUX_SETTINGS_ACTIVITY_NAME`.
+ *
  */
 
 /**
@@ -194,6 +201,12 @@ public final class TermuxConstants {
     /** Termux support email mailto url */
     public static final String TERMUX_SUPPORT_EMAIL_MAILTO_URL = "mailto:" + TERMUX_SUPPORT_EMAIL_URL; // Default: "mailto:termuxreports@groups.io"
 
+    /** Termux Wiki */
+    public static final String TERMUX_WIKI = "Termux Wiki"; // Default: "Termux Wiki"
+
+    /** Termux Wiki url */
+    public static final String TERMUX_WIKI_URL = "https://wiki.termux.com"; // Default: "https://wiki.termux.com"
+
     /** Termux Reddit subreddit */
     public static final String TERMUX_REDDIT_SUBREDDIT = "r/termux"; // Default: "r/termux"
 
@@ -314,6 +327,30 @@ public final class TermuxConstants {
 
 
 
+    /*
+     * Termux plugin apps lists.
+     */
+
+    public static final List<String> TERMUX_PLUGIN_APP_NAMES_LIST = Arrays.asList(
+        TERMUX_API_APP_NAME,
+        TERMUX_BOOT_APP_NAME,
+        TERMUX_FLOAT_APP_NAME,
+        TERMUX_STYLING_APP_NAME,
+        TERMUX_TASKER_APP_NAME,
+        TERMUX_WIDGET_APP_NAME);
+
+    public static final List<String> TERMUX_PLUGIN_APP_PACKAGE_NAMES_LIST = Arrays.asList(
+        TERMUX_API_PACKAGE_NAME,
+        TERMUX_BOOT_PACKAGE_NAME,
+        TERMUX_FLOAT_PACKAGE_NAME,
+        TERMUX_STYLING_PACKAGE_NAME,
+        TERMUX_TASKER_PACKAGE_NAME,
+        TERMUX_WIDGET_PACKAGE_NAME);
+
+
+
+
+
     /*
      * Termux packages urls.
      */
@@ -654,6 +691,13 @@ public static final class TERMUX_ACTIVITY {
 
 
 
+        /** Termux app settings activity name. */
+        public static final String TERMUX_SETTINGS_ACTIVITY_NAME = TERMUX_PACKAGE_NAME + ".app.activities.SettingsActivity"; // Default: "com.termux.app.activities.SettingsActivity"
+
+
+
+
+
         /** Termux app core service name. */
         public static final String TERMUX_SERVICE_NAME = TERMUX_PACKAGE_NAME + ".app.TermuxService"; // Default: "com.termux.app.TermuxService"
 
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
index 3e08b9fe56..545e1c245b 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
@@ -132,6 +132,38 @@ public static void sendTermuxOpenedBroadcast(@NonNull Context context) {
         }
     }
 
+    /**
+     * Get a markdown {@link String} for the apps info of all/any termux plugin apps installed.
+     *
+     * @param currentPackageContext The context of current package.
+     * @return Returns the markdown {@link String}.
+     */
+    public static String getTermuxPluginAppsInfoMarkdownString(@NonNull final Context currentPackageContext) {
+        if (currentPackageContext == null) return "null";
+
+        StringBuilder markdownString = new StringBuilder();
+
+        List<String> termuxPluginAppPackageNamesList = TermuxConstants.TERMUX_PLUGIN_APP_PACKAGE_NAMES_LIST;
+
+        if (termuxPluginAppPackageNamesList != null) {
+            for (int i = 0; i < termuxPluginAppPackageNamesList.size(); i++) {
+                String termuxPluginAppPackageName = termuxPluginAppPackageNamesList.get(i);
+                Context termuxPluginAppContext = PackageUtils.getContextForPackage(currentPackageContext, termuxPluginAppPackageName);
+                // If the package context for the plugin app is not null, then assume its installed and get its info
+                if (termuxPluginAppContext != null) {
+                    if (i != 0)
+                        markdownString.append("\n\n");
+                    markdownString.append(TermuxUtils.getAppInfoMarkdownString(termuxPluginAppContext, false));
+                }
+            }
+        }
+
+        if (markdownString.toString().isEmpty())
+            return null;
+
+        return markdownString.toString();
+    }
+
     /**
      * Get a markdown {@link String} for the app info. If the {@code context} passed is different
      * from the {@link TermuxConstants#TERMUX_PACKAGE_NAME} package context, then this function
@@ -291,6 +323,45 @@ public static String getReportIssueMarkdownString(@NonNull final Context context
         return markdownString.toString();
     }
 
+    /**
+     * Get a markdown {@link String} for important links.
+     *
+     * @param context The context for operations.
+     * @return Returns the markdown {@link String}.
+     */
+    public static String getImportantLinksMarkdownString(@NonNull final Context context) {
+        if (context == null) return "null";
+
+        StringBuilder markdownString = new StringBuilder();
+
+        markdownString.append("## Important Links");
+
+        markdownString.append("\n\n### Github\n");
+        markdownString.append("\n").append(MarkdownUtils.getLinkMarkdownString(TermuxConstants.TERMUX_APP_NAME, TermuxConstants.TERMUX_GITHUB_REPO_URL)).append("  ");
+        markdownString.append("\n").append(MarkdownUtils.getLinkMarkdownString(TermuxConstants.TERMUX_API_APP_NAME, TermuxConstants.TERMUX_API_GITHUB_REPO_URL)).append("  ");
+        markdownString.append("\n").append(MarkdownUtils.getLinkMarkdownString(TermuxConstants.TERMUX_BOOT_APP_NAME, TermuxConstants.TERMUX_BOOT_GITHUB_REPO_URL)).append("  ");
+        markdownString.append("\n").append(MarkdownUtils.getLinkMarkdownString(TermuxConstants.TERMUX_FLOAT_APP_NAME, TermuxConstants.TERMUX_FLOAT_GITHUB_REPO_URL)).append("  ");
+        markdownString.append("\n").append(MarkdownUtils.getLinkMarkdownString(TermuxConstants.TERMUX_STYLING_APP_NAME, TermuxConstants.TERMUX_STYLING_GITHUB_REPO_URL)).append("  ");
+        markdownString.append("\n").append(MarkdownUtils.getLinkMarkdownString(TermuxConstants.TERMUX_TASKER_APP_NAME, TermuxConstants.TERMUX_TASKER_GITHUB_REPO_URL)).append("  ");
+        markdownString.append("\n").append(MarkdownUtils.getLinkMarkdownString(TermuxConstants.TERMUX_WIDGET_APP_NAME, TermuxConstants.TERMUX_WIDGET_GITHUB_REPO_URL)).append("  ");
+        markdownString.append("\n").append(MarkdownUtils.getLinkMarkdownString(TermuxConstants.TERMUX_PACKAGES_GITHUB_REPO_NAME, TermuxConstants.TERMUX_PACKAGES_GITHUB_REPO_URL)).append("  ");
+
+        markdownString.append("\n\n### Email\n");
+        markdownString.append("\n").append(MarkdownUtils.getLinkMarkdownString(TermuxConstants.TERMUX_SUPPORT_EMAIL_URL, TermuxConstants.TERMUX_SUPPORT_EMAIL_MAILTO_URL)).append("  ");
+
+        markdownString.append("\n\n### Reddit\n");
+        markdownString.append("\n").append(MarkdownUtils.getLinkMarkdownString(TermuxConstants.TERMUX_REDDIT_SUBREDDIT, TermuxConstants.TERMUX_REDDIT_SUBREDDIT_URL)).append("  ");
+
+        markdownString.append("\n\n### Wiki\n");
+        markdownString.append("\n").append(MarkdownUtils.getLinkMarkdownString(TermuxConstants.TERMUX_WIKI, TermuxConstants.TERMUX_WIKI_URL)).append("  ");
+        markdownString.append("\n").append(MarkdownUtils.getLinkMarkdownString(TermuxConstants.TERMUX_APP_NAME, TermuxConstants.TERMUX_GITHUB_WIKI_REPO_URL)).append("  ");
+        markdownString.append("\n").append(MarkdownUtils.getLinkMarkdownString(TermuxConstants.TERMUX_PACKAGES_GITHUB_REPO_NAME, TermuxConstants.TERMUX_PACKAGES_GITHUB_WIKI_REPO_URL)).append("  ");
+
+        markdownString.append("\n##\n");
+
+        return markdownString.toString();
+    }
+
 
 
     /**

From 4629276500a889344ff74d485ded15f337c4b86c Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 13 May 2021 05:08:25 +0500
Subject: [PATCH 385/912] Changed TermuxAppSharedPreferences function naming
 convention

---
 .../main/java/com/termux/app/TermuxActivity.java | 10 +++++-----
 .../app/terminal/TermuxTerminalViewClient.java   |  6 +++---
 .../java/com/termux/app/utils/CrashUtils.java    |  2 +-
 .../java/com/termux/app/utils/PluginUtils.java   |  2 +-
 .../termux/shared/packages/PermissionUtils.java  |  2 +-
 .../preferences/TermuxAppSharedPreferences.java  | 16 ++++++++--------
 6 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index 3942ea39da..9cf396a815 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -225,7 +225,7 @@ public void onStart() {
 
         // 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());
+        mTerminalView.setIsTerminalViewKeyLoggingEnabled(mPreferences.isTerminalViewKeyLoggingEnabled());
 
         // The current terminal session may have changed while being away, force
         // a refresh of the displayed terminal.
@@ -353,7 +353,7 @@ private void setDrawerTheme() {
 
     private void setTerminalToolbarView(Bundle savedInstanceState) {
         final ViewPager terminalToolbarViewPager = findViewById(R.id.terminal_toolbar_view_pager);
-        if (mPreferences.getShowTerminalToolbar()) terminalToolbarViewPager.setVisibility(View.VISIBLE);
+        if (mPreferences.shouldShowTerminalToolbar()) terminalToolbarViewPager.setVisibility(View.VISIBLE);
 
         ViewGroup.LayoutParams layoutParams = terminalToolbarViewPager.getLayoutParams();
         mTerminalToolbarDefaultHeight = layoutParams.height;
@@ -441,10 +441,10 @@ private void setTermuxTerminalViewAndClients() {
         mTerminalView.setTerminalViewClient(mTermuxTerminalViewClient);
 
         mTerminalView.setTextSize(mPreferences.getFontSize());
-        mTerminalView.setKeepScreenOn(mPreferences.getKeepScreenOn());
+        mTerminalView.setKeepScreenOn(mPreferences.shouldKeepScreenOn());
 
         // Set {@link TerminalView#TERMINAL_VIEW_KEY_LOGGING_ENABLED} value
-        mTerminalView.setIsTerminalViewKeyLoggingEnabled(mPreferences.getTerminalViewKeyLoggingEnabled());
+        mTerminalView.setIsTerminalViewKeyLoggingEnabled(mPreferences.isTerminalViewKeyLoggingEnabled());
 
         mTermuxTerminalSessionClient.checkForFontAndColors();
     }
@@ -508,7 +508,7 @@ public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuIn
         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.getKeepScreenOn());
+        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_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);
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
index 18a0d39b03..8b2a3f9451 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
@@ -368,7 +368,7 @@ public void onToggleSoftKeyboardRequest() {
         // If soft keyboard toggle behaviour is show/hide
         else {
             // If soft keyboard is disabled by user for Termux
-            if (!mActivity.getPreferences().getSoftKeyboardEnabled()) {
+            if (!mActivity.getPreferences().isSoftKeyboardEnabled()) {
                 Logger.logVerbose(LOG_TAG, "Maintaining disabled soft keyboard on toggle");
                 KeyboardUtils.disableSoftKeyboard(mActivity, mActivity.getTerminalView());
             } else {
@@ -382,8 +382,8 @@ public void onToggleSoftKeyboardRequest() {
     public void setSoftKeyboardState(boolean isStartup, boolean isReloadTermuxProperties) {
         // If soft keyboard is disabled by user for Termux (check function docs for Termux behaviour info)
         if (KeyboardUtils.shouldSoftKeyboardBeDisabled(mActivity,
-                mActivity.getPreferences().getSoftKeyboardEnabled(),
-                    mActivity.getPreferences().getSoftKeyboardEnabledOnlyIfNoHardware())) {
+                mActivity.getPreferences().isSoftKeyboardEnabled(),
+                    mActivity.getPreferences().isSoftKeyboardEnabledOnlyIfNoHardware())) {
             Logger.logVerbose(LOG_TAG, "Maintaining disabled soft keyboard");
             KeyboardUtils.disableSoftKeyboard(mActivity, mActivity.getTerminalView());
         } else {
diff --git a/app/src/main/java/com/termux/app/utils/CrashUtils.java b/app/src/main/java/com/termux/app/utils/CrashUtils.java
index a192e5ab2e..f2d6011bc0 100644
--- a/app/src/main/java/com/termux/app/utils/CrashUtils.java
+++ b/app/src/main/java/com/termux/app/utils/CrashUtils.java
@@ -49,7 +49,7 @@ public static void notifyCrash(final Context context, final String logTagParam)
 
         TermuxAppSharedPreferences preferences = new TermuxAppSharedPreferences(context);
         // If user has disabled notifications for crashes
-        if (!preferences.getCrashReportNotificationsEnabled())
+        if (!preferences.areCrashReportNotificationsEnabled())
             return;
 
         new Thread() {
diff --git a/app/src/main/java/com/termux/app/utils/PluginUtils.java b/app/src/main/java/com/termux/app/utils/PluginUtils.java
index 98d469194a..72d4af5337 100644
--- a/app/src/main/java/com/termux/app/utils/PluginUtils.java
+++ b/app/src/main/java/com/termux/app/utils/PluginUtils.java
@@ -141,7 +141,7 @@ public static void processPluginExecutionCommandError(final Context context, Str
 
         TermuxAppSharedPreferences preferences = new TermuxAppSharedPreferences(context);
         // If user has disabled notifications for plugin, then just return
-        if (!preferences.getPluginErrorNotificationsEnabled() && !forceNotification)
+        if (!preferences.arePluginErrorNotificationsEnabled() && !forceNotification)
             return;
 
         // Flash the errmsg
diff --git a/termux-shared/src/main/java/com/termux/shared/packages/PermissionUtils.java b/termux-shared/src/main/java/com/termux/shared/packages/PermissionUtils.java
index da522b066e..65c0f73db0 100644
--- a/termux-shared/src/main/java/com/termux/shared/packages/PermissionUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/packages/PermissionUtils.java
@@ -76,7 +76,7 @@ public static boolean validateDisplayOverOtherAppsPermissionForPostAndroid10(Con
         
         if (!PermissionUtils.checkDisplayOverOtherAppsPermission(context)) {
             TermuxAppSharedPreferences preferences = new TermuxAppSharedPreferences(context);
-            if (preferences.getPluginErrorNotificationsEnabled())
+            if (preferences.arePluginErrorNotificationsEnabled())
                 Logger.showToast(context, context.getString(R.string.error_display_over_other_apps_permission_not_granted), true);
             return false;
         } else {
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxAppSharedPreferences.java b/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxAppSharedPreferences.java
index 7c6656cdb3..4e66c8f599 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxAppSharedPreferences.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxAppSharedPreferences.java
@@ -38,7 +38,7 @@ private static SharedPreferences getPrivateSharedPreferences(Context context) {
 
 
 
-    public boolean getShowTerminalToolbar() {
+    public boolean shouldShowTerminalToolbar() {
         return SharedPreferenceUtils.getBoolean(mSharedPreferences, TERMUX_APP.KEY_SHOW_TERMINAL_TOOLBAR, TERMUX_APP.DEFAULT_VALUE_SHOW_TERMINAL_TOOLBAR);
     }
 
@@ -47,14 +47,14 @@ public void setShowTerminalToolbar(boolean value) {
     }
 
     public boolean toogleShowTerminalToolbar() {
-        boolean currentValue = getShowTerminalToolbar();
+        boolean currentValue = shouldShowTerminalToolbar();
         setShowTerminalToolbar(!currentValue);
         return !currentValue;
     }
 
 
 
-    public boolean getSoftKeyboardEnabled() {
+    public boolean isSoftKeyboardEnabled() {
         return SharedPreferenceUtils.getBoolean(mSharedPreferences, TERMUX_APP.KEY_SOFT_KEYBOARD_ENABLED, TERMUX_APP.DEFAULT_VALUE_KEY_SOFT_KEYBOARD_ENABLED);
     }
 
@@ -62,7 +62,7 @@ public void setSoftKeyboardEnabled(boolean value) {
         SharedPreferenceUtils.setBoolean(mSharedPreferences, TERMUX_APP.KEY_SOFT_KEYBOARD_ENABLED, value, false);
     }
 
-    public boolean getSoftKeyboardEnabledOnlyIfNoHardware() {
+    public boolean isSoftKeyboardEnabledOnlyIfNoHardware() {
         return SharedPreferenceUtils.getBoolean(mSharedPreferences, TERMUX_APP.KEY_SOFT_KEYBOARD_ENABLED_ONLY_IF_NO_HARDWARE, TERMUX_APP.DEFAULT_VALUE_KEY_SOFT_KEYBOARD_ENABLED_ONLY_IF_NO_HARDWARE);
     }
 
@@ -72,7 +72,7 @@ public void setSoftKeyboardEnabledOnlyIfNoHardware(boolean value) {
 
 
 
-    public boolean getKeepScreenOn() {
+    public boolean shouldKeepScreenOn() {
         return SharedPreferenceUtils.getBoolean(mSharedPreferences, TERMUX_APP.KEY_KEEP_SCREEN_ON, TERMUX_APP.DEFAULT_VALUE_KEEP_SCREEN_ON);
     }
 
@@ -151,7 +151,7 @@ public void setLastNotificationId(int notificationId) {
 
 
 
-    public boolean getTerminalViewKeyLoggingEnabled() {
+    public boolean isTerminalViewKeyLoggingEnabled() {
         return SharedPreferenceUtils.getBoolean(mSharedPreferences, TERMUX_APP.KEY_TERMINAL_VIEW_KEY_LOGGING_ENABLED, TERMUX_APP.DEFAULT_VALUE_TERMINAL_VIEW_KEY_LOGGING_ENABLED);
     }
 
@@ -161,7 +161,7 @@ public void setTerminalViewKeyLoggingEnabled(boolean value) {
 
 
 
-    public boolean getPluginErrorNotificationsEnabled() {
+    public boolean arePluginErrorNotificationsEnabled() {
         return SharedPreferenceUtils.getBoolean(mSharedPreferences, TERMUX_APP.KEY_PLUGIN_ERROR_NOTIFICATIONS_ENABLED, TERMUX_APP.DEFAULT_VALUE_PLUGIN_ERROR_NOTIFICATIONS_ENABLED);
     }
 
@@ -171,7 +171,7 @@ public void setPluginErrorNotificationsEnabled(boolean value) {
 
 
 
-    public boolean getCrashReportNotificationsEnabled() {
+    public boolean areCrashReportNotificationsEnabled() {
         return SharedPreferenceUtils.getBoolean(mSharedPreferences, TERMUX_APP.KEY_CRASH_REPORT_NOTIFICATIONS_ENABLED, TERMUX_APP.DEFAULT_VALUE_CRASH_REPORT_NOTIFICATIONS_ENABLED);
     }
 

From 1e30022ce7d79c26632aba675fe0da999271225a Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 13 May 2021 15:40:09 +0500
Subject: [PATCH 386/912] Add support for APK signing certificate SHA-256
 digest and detecting APK release type and add them to App Info reports

The `TermuxConstants` class has been updated to `v0.21.0`. Check its Changelog sections for info on changes.
---
 .../com/termux/shared/data/DataUtils.java     | 22 ++++++++++--
 .../termux/shared/packages/PackageUtils.java  | 34 ++++++++++++++++++-
 .../termux/shared/termux/TermuxConstants.java | 33 +++++++++++++++++-
 .../com/termux/shared/termux/TermuxUtils.java | 22 ++++++++++++
 4 files changed, 107 insertions(+), 4 deletions(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/data/DataUtils.java b/termux-shared/src/main/java/com/termux/shared/data/DataUtils.java
index 61b7fff2a9..9a6af5a086 100644
--- a/termux-shared/src/main/java/com/termux/shared/data/DataUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/data/DataUtils.java
@@ -10,6 +10,8 @@ public class DataUtils {
 
     public static final int TRANSACTION_SIZE_LIMIT_IN_BYTES = 100 * 1024; // 100KB
 
+    private static final char[] HEX_ARRAY = "0123456789ABCDEF".toCharArray();
+
     public static String getTruncatedCommandOutput(String text, int maxLength, boolean fromEnd, boolean onNewline, boolean addPrefix) {
         if (text == null) return null;
 
@@ -43,7 +45,7 @@ public static String getTruncatedCommandOutput(String text, int maxLength, boole
     /**
      * Get the {@code float} from a {@link String}.
      *
-     * @param value The {@link String value.
+     * @param value The {@link String} value.
      * @param def The default value if failed to read a valid value.
      * @return Returns the {@code float} value after parsing the {@link String} value, otherwise
      * returns default if failed to read a valid value, like in case of an exception.
@@ -62,7 +64,7 @@ public static float getFloatFromString(String value, float def) {
     /**
      * Get the {@code int} from a {@link String}.
      *
-     * @param value The {@link String value.
+     * @param value The {@link String} value.
      * @param def The default value if failed to read a valid value.
      * @return Returns the {@code int} value after parsing the {@link String} value, otherwise
      * returns default if failed to read a valid value, like in case of an exception.
@@ -78,6 +80,22 @@ public static int getIntFromString(String value, int def) {
         }
     }
 
+    /**
+     * Get the {@code hex string} from a {@link byte[]}.
+     *
+     * @param bytes The {@link byte[]} value.
+     * @return Returns the {@code hex string} value.
+     */
+    public static String bytesToHex(byte[] bytes) {
+        char[] hexChars = new char[bytes.length * 2];
+        for (int j = 0; j < bytes.length; j++) {
+            int v = bytes[j] & 0xFF;
+            hexChars[j * 2] = HEX_ARRAY[v >>> 4];
+            hexChars[j * 2 + 1] = HEX_ARRAY[v & 0x0F];
+        }
+        return new String(hexChars);
+    }
+
     /**
      * Get an {@code int} from {@link Bundle} that is stored as a {@link String}.
      *
diff --git a/termux-shared/src/main/java/com/termux/shared/packages/PackageUtils.java b/termux-shared/src/main/java/com/termux/shared/packages/PackageUtils.java
index 75b8b8c4a6..b1192e7e95 100644
--- a/termux-shared/src/main/java/com/termux/shared/packages/PackageUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/packages/PackageUtils.java
@@ -3,11 +3,15 @@
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
 
 import androidx.annotation.NonNull;
 
+import com.termux.shared.data.DataUtils;
 import com.termux.shared.logger.Logger;
 
+import java.security.MessageDigest;
+
 public class PackageUtils {
 
     /**
@@ -32,8 +36,19 @@ public static Context getContextForPackage(@NonNull final Context context, Strin
      * @return Returns the {@link PackageInfo}. This will be {@code null} if an exception is raised.
      */
     public static PackageInfo getPackageInfoForPackage(@NonNull final Context context) {
+            return getPackageInfoForPackage(context, 0);
+    }
+
+    /**
+     * Get the {@link PackageInfo} for the package associated with the {@code context}.
+     *
+     * @param context The {@link Context} for the package.
+     * @param flags The flags to pass to {@link PackageManager#getPackageInfo(String, int)}.
+     * @return Returns the {@link PackageInfo}. This will be {@code null} if an exception is raised.
+     */
+    public static PackageInfo getPackageInfoForPackage(@NonNull final Context context, final int flags) {
         try {
-            return context.getPackageManager().getPackageInfo(context.getPackageName(), 0);
+            return context.getPackageManager().getPackageInfo(context.getPackageName(), flags);
         } catch (final Exception e) {
             return null;
         }
@@ -107,4 +122,21 @@ public static String getVersionNameForPackage(@NonNull final Context context) {
         }
     }
 
+
+    /**
+     * Get the {@code SHA-256 digest} of signing certificate for the package associated with the {@code context}.
+     *
+     * @param context The {@link Context} for the package.
+     * @return Returns the{@code SHA-256 digest}. This will be {@code null} if an exception is raised.
+     */
+    public static String getSigningCertificateSHA256DigestForPackage(@NonNull final Context context) {
+        try {
+            PackageInfo packageInfo = getPackageInfoForPackage(context, PackageManager.GET_SIGNATURES);
+            if (packageInfo == null) return null;
+            return DataUtils.bytesToHex(MessageDigest.getInstance("SHA-256").digest(packageInfo.signatures[0].toByteArray()));
+        } catch (final Exception e) {
+            return null;
+        }
+    }
+
 }
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
index fe8c526dbe..2f4284d9ac 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
@@ -7,7 +7,7 @@
 import java.util.List;
 
 /*
- * Version: v0.20.0
+ * Version: v0.21.0
  *
  * Changelog
  *
@@ -142,6 +142,11 @@
  *      - Added `TERMUX_WIKI`, `TERMUX_WIKI_URL`, `TERMUX_PLUGIN_APP_NAMES_LIST`, `TERMUX_PLUGIN_APP_PACKAGE_NAMES_LIST`.
  *      - Added `TERMUX_SETTINGS_ACTIVITY_NAME`.
  *
+ * - 0.21.0 (2021-05-13)
+ *      - Added `APK_RELEASE_FDROID`, `APK_RELEASE_FDROID_SIGNING_CERTIFICATE_SHA256_DIGEST`,
+ *      - Added `APK_RELEASE_GITHUB_DEBUG_BUILD`, `APK_RELEASE_GITHUB_DEBUG_BUILD_SIGNING_CERTIFICATE_SHA256_DIGEST`,
+ *      - Added `APK_RELEASE_GOOGLE_PLAYSTORE`, `APK_RELEASE_GOOGLE_PLAYSTORE_SIGNING_CERTIFICATE_SHA256_DIGEST`.
+ *
  */
 
 /**
@@ -351,6 +356,32 @@ public final class TermuxConstants {
 
 
 
+    /*
+     * Termux APK releases.
+     */
+
+    /** F-Droid APK release */
+    public static final String APK_RELEASE_FDROID = "F-Droid"; // Default: "F-Droid"
+
+    /** F-Droid APK release signing certificate SHA-256 digest */
+    public static final String APK_RELEASE_FDROID_SIGNING_CERTIFICATE_SHA256_DIGEST = "228FB2CFE90831C1499EC3CCAF61E96E8E1CE70766B9474672CE427334D41C42"; // Default: "228FB2CFE90831C1499EC3CCAF61E96E8E1CE70766B9474672CE427334D41C42"
+
+    /** Github Debug Build APK release */
+    public static final String APK_RELEASE_GITHUB_DEBUG_BUILD = "Github Debug Build"; // Default: "Github Debug Build"
+
+    /** Github Debug Build APK release signing certificate SHA-256 digest */
+    public static final String APK_RELEASE_GITHUB_DEBUG_BUILD_SIGNING_CERTIFICATE_SHA256_DIGEST = "B6DA01480EEFD5FBF2CD3771B8D1021EC791304BDD6C4BF41D3FAABAD48EE5E1"; // Default: "B6DA01480EEFD5FBF2CD3771B8D1021EC791304BDD6C4BF41D3FAABAD48EE5E1"
+
+    /** Google Play Store APK release */
+    public static final String APK_RELEASE_GOOGLE_PLAYSTORE = "Google Play Store"; // Default: "Google Play Store"
+
+    /** Google Play Store APK release signing certificate SHA-256 digest */
+    public static final String APK_RELEASE_GOOGLE_PLAYSTORE_SIGNING_CERTIFICATE_SHA256_DIGEST = "738F0A30A04D3C8A1BE304AF18D0779BCF3EA88FB60808F657A3521861C2EBF9"; // Default: "738F0A30A04D3C8A1BE304AF18D0779BCF3EA88FB60808F657A3521861C2EBF9"
+
+
+
+
+
     /*
      * Termux packages urls.
      */
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
index 545e1c245b..706f556ba6 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
@@ -227,6 +227,13 @@ public static String getAppInfoMarkdownStringInner(@NonNull final Context contex
         appendPropertyToMarkdown(markdownString,"TARGET_SDK", PackageUtils.getTargetSDKForPackage(context));
         appendPropertyToMarkdown(markdownString,"IS_DEBUG_BUILD", PackageUtils.isAppForPackageADebugBuild(context));
 
+        String signingCertificateSHA256Digest = PackageUtils.getSigningCertificateSHA256DigestForPackage(context);
+        Logger.logError("'" + signingCertificateSHA256Digest + "'");
+        if (signingCertificateSHA256Digest != null) {
+            appendPropertyToMarkdown(markdownString,"APK_RELEASE", getAPKRelease(signingCertificateSHA256Digest));
+            appendPropertyToMarkdown(markdownString,"SIGNING_CERTIFICATE_SHA256_DIGEST", signingCertificateSHA256Digest);
+        }
+
         return markdownString.toString();
     }
 
@@ -490,4 +497,19 @@ public static String getCurrentTimeStamp() {
         return df.format(new Date());
     }
 
+    public static String getAPKRelease(String signingCertificateSHA256Digest) {
+        if (signingCertificateSHA256Digest == null) return "null";
+
+        switch (signingCertificateSHA256Digest.toUpperCase()) {
+            case TermuxConstants.APK_RELEASE_FDROID_SIGNING_CERTIFICATE_SHA256_DIGEST:
+                return TermuxConstants.APK_RELEASE_FDROID;
+            case TermuxConstants.APK_RELEASE_GITHUB_DEBUG_BUILD_SIGNING_CERTIFICATE_SHA256_DIGEST:
+                return TermuxConstants.APK_RELEASE_GITHUB_DEBUG_BUILD;
+            case TermuxConstants.APK_RELEASE_GOOGLE_PLAYSTORE_SIGNING_CERTIFICATE_SHA256_DIGEST:
+                return TermuxConstants.APK_RELEASE_GOOGLE_PLAYSTORE;
+            default:
+                return "Unknown";
+        }
+    }
+
 }

From af115c996627f7f5000f8036be4e0769c7ed0436 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 13 May 2021 17:37:01 +0500
Subject: [PATCH 387/912] Add generic functions to show a message in dialog and
 exit app with an error message

---
 .../java/com/termux/app/TermuxInstaller.java  |  6 ++-
 termux-shared/build.gradle                    |  1 +
 .../termux/shared/interact/DialogUtils.java   | 38 ++++++++++++++-
 .../main/res/layout/dialog_show_message.xml   | 48 +++++++++++++++++++
 termux-shared/src/main/res/values/colors.xml  |  1 +
 5 files changed, 91 insertions(+), 3 deletions(-)
 create mode 100644 termux-shared/src/main/res/layout/dialog_show_message.xml

diff --git a/app/src/main/java/com/termux/app/TermuxInstaller.java b/app/src/main/java/com/termux/app/TermuxInstaller.java
index a600e534d5..0bcff56f12 100644
--- a/app/src/main/java/com/termux/app/TermuxInstaller.java
+++ b/app/src/main/java/com/termux/app/TermuxInstaller.java
@@ -12,6 +12,7 @@
 
 import com.termux.R;
 import com.termux.shared.file.FileUtils;
+import com.termux.shared.interact.DialogUtils;
 import com.termux.shared.logger.Logger;
 import com.termux.shared.termux.TermuxConstants;
 
@@ -57,8 +58,9 @@ static void setupBootstrapIfNeeded(final Activity activity, final Runnable whenD
         if (!isPrimaryUser) {
             String bootstrapErrorMessage = activity.getString(R.string.bootstrap_error_not_primary_user_message, TermuxConstants.TERMUX_PREFIX_DIR_PATH);
             Logger.logError(LOG_TAG, 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();
+            DialogUtils.exitAppWithErrorMessage(activity,
+                activity.getString(R.string.bootstrap_error_title),
+                bootstrapErrorMessage);
             return;
         }
 
diff --git a/termux-shared/build.gradle b/termux-shared/build.gradle
index cc49fb91df..06238e984d 100644
--- a/termux-shared/build.gradle
+++ b/termux-shared/build.gradle
@@ -5,6 +5,7 @@ android {
     compileSdkVersion project.properties.compileSdkVersion.toInteger()
 
     dependencies {
+        implementation 'androidx.appcompat:appcompat:1.2.0'
         implementation "androidx.annotation:annotation:1.2.0"
         implementation "androidx.core:core:1.5.0-rc01"
         implementation "com.google.guava:guava:24.1-jre"
diff --git a/termux-shared/src/main/java/com/termux/shared/interact/DialogUtils.java b/termux-shared/src/main/java/com/termux/shared/interact/DialogUtils.java
index 1a5fa8344d..d6e8174186 100644
--- a/termux-shared/src/main/java/com/termux/shared/interact/DialogUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/interact/DialogUtils.java
@@ -2,13 +2,19 @@
 
 import android.app.Activity;
 import android.app.AlertDialog;
+import android.content.Context;
 import android.content.DialogInterface;
 import android.text.Selection;
 import android.util.TypedValue;
 import android.view.KeyEvent;
+import android.view.LayoutInflater;
+import android.view.View;
 import android.view.ViewGroup.LayoutParams;
 import android.widget.EditText;
 import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import com.termux.shared.R;
 
 public final class DialogUtils {
 
@@ -61,11 +67,41 @@ public static void textInput(Activity activity, int titleText, String initialTex
             builder.setNegativeButton(negativeButtonText, (dialog, which) -> onNegative.onTextSet(input.getText().toString()));
         }
 
-        if (onDismiss != null) builder.setOnDismissListener(onDismiss);
+        if (onDismiss != null)
+            builder.setOnDismissListener(onDismiss);
 
         dialogHolder[0] = builder.create();
         dialogHolder[0].setCanceledOnTouchOutside(false);
         dialogHolder[0].show();
     }
 
+    public static void showMessage(Context context, String titleText, String messageText, final DialogInterface.OnDismissListener onDismiss) {
+
+        AlertDialog.Builder builder = new AlertDialog.Builder(context, R.style.Theme_AppCompat_Light_Dialog)
+            .setPositiveButton(android.R.string.ok, null);
+
+        LayoutInflater inflater = (LayoutInflater) context.getSystemService( Context.LAYOUT_INFLATER_SERVICE );
+        View view = inflater.inflate(R.layout.dialog_show_message, null);
+        if (view != null) {
+            builder.setView(view);
+
+            TextView titleView = view.findViewById(R.id.dialog_title);
+            if (titleView != null)
+                titleView.setText(titleText);
+
+            TextView messageView = view.findViewById(R.id.dialog_message);
+            if (messageView != null)
+                messageView.setText(messageText);
+        }
+
+        if (onDismiss != null)
+            builder.setOnDismissListener(onDismiss);
+
+        builder.show();
+    }
+
+    public static void exitAppWithErrorMessage(Context context, String titleText, String messageText) {
+        showMessage(context, titleText, messageText, dialog -> System.exit(0));
+    }
+
 }
diff --git a/termux-shared/src/main/res/layout/dialog_show_message.xml b/termux-shared/src/main/res/layout/dialog_show_message.xml
new file mode 100644
index 0000000000..f074d08c10
--- /dev/null
+++ b/termux-shared/src/main/res/layout/dialog_show_message.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/dark_red"
+        android:paddingStart="24dp"
+        android:paddingTop="16dp"
+        android:paddingEnd="24dp"
+        android:paddingBottom="16dp">
+        <TextView
+            android:id="@+id/dialog_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="@style/TextAppearance.AppCompat.Title"
+            android:textColor="@android:color/white"/>
+    </LinearLayout>
+
+    <ScrollView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" >
+        <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingStart="24dp"
+                android:paddingTop="16dp"
+                android:paddingEnd="24dp"
+                android:paddingBottom="16dp"
+                android:scrollbars="vertical">
+            <TextView
+                android:id="@+id/dialog_message"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textSize="14sp"
+                android:textColor="@android:color/tab_indicator_text"/>
+        </LinearLayout>
+    </ScrollView>
+
+</LinearLayout>
+
+
+
+
+
diff --git a/termux-shared/src/main/res/values/colors.xml b/termux-shared/src/main/res/values/colors.xml
index cc83b56d07..1b54c29535 100644
--- a/termux-shared/src/main/res/values/colors.xml
+++ b/termux-shared/src/main/res/values/colors.xml
@@ -2,4 +2,5 @@
 <resources>
     <color name="background_markdown_code_inline">#1F000000</color>
     <color name="background_markdown_code_block">#0F000000</color>
+    <color name="dark_red">#FF0000</color>
 </resources>

From 79df863b75d1a9c75b65a16714fda7f9318ba038 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Fri, 14 May 2021 03:54:13 +0500
Subject: [PATCH 388/912] Ensure we read/write to/from current
 SharedPreferences

When getting SharedPreferences of other termux sharedUserId app packages, we get its Context first and if its null, it would mean that the package is not installed or likely has a different signature. For this case, we force exit the app in some places, since that shouldn't occur. Previously, if it was null, we were defaulting to getting SharedPreferences of current package context instead, which would mix keys of other packages with current one. SharedPreferences of other app packages aren't being used currently, so this isn't an issue, this commit just fixes the issue for future.

Force exit will also be triggered if Termux is forked and TermuxConstants.TERMUX_PACKAGE_NAME is not updated to the same value as applicationId since TermuxActivity.onCreate() will fail to get SharedPreferences of TermuxConstants.TERMUX_PACKAGE_NAME.

Moreover, its normally not allowed to install apps with different signatures, but if its done, we "may" need AndroidManifest `queries` entries in andorid 11, check PackageUtils.getSigningCertificateSHA256DigestForPackage() for details.
---
 .../java/com/termux/app/TermuxActivity.java   | 35 +++++++++++--
 .../com/termux/app/TermuxApplication.java     |  3 +-
 .../java/com/termux/app/TermuxService.java    |  5 +-
 .../settings/TermuxPreferencesFragment.java   |  4 +-
 .../termux/DebuggingPreferencesFragment.java  | 10 ++--
 .../termux/TerminalIOPreferencesFragment.java |  7 ++-
 .../java/com/termux/app/utils/CrashUtils.java |  4 +-
 .../com/termux/app/utils/PluginUtils.java     |  4 +-
 .../termux/shared/interact/DialogUtils.java   |  9 ++++
 .../notification/NotificationUtils.java       |  4 +-
 .../termux/shared/packages/PackageUtils.java  | 49 ++++++++++++++++++-
 .../shared/packages/PermissionUtils.java      |  4 +-
 .../TermuxAppSharedPreferences.java           | 45 +++++++++++++++--
 .../TermuxTaskerAppSharedPreferences.java     | 47 ++++++++++++++++--
 .../com/termux/shared/termux/TermuxUtils.java |  3 +-
 .../main/res/layout/dialog_show_message.xml   |  4 +-
 termux-shared/src/main/res/values/strings.xml | 17 +++++--
 17 files changed, 218 insertions(+), 36 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index 9cf396a815..582d141588 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -129,10 +129,16 @@ public final class TermuxActivity extends Activity implements ServiceConnection
      */
     private boolean mIsVisible;
 
+    /**
+     * 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;
@@ -159,8 +165,7 @@ public void onCreate(Bundle savedInstanceState) {
         // notification with the crash details if it did
         CrashUtils.notifyCrash(this, LOG_TAG);
 
-        // Load termux shared preferences and properties
-        mPreferences = new TermuxAppSharedPreferences(this);
+        // Load termux shared properties
         mProperties = new TermuxAppSharedProperties(this);
 
         setActivityTheme();
@@ -169,6 +174,15 @@ public void onCreate(Bundle savedInstanceState) {
 
         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;
+        }
+
         View content = findViewById(android.R.id.content);
         content.setOnApplyWindowInsetsListener((v, insets) -> {
             mNavBarHeight = insets.getSystemWindowInsetBottom();
@@ -211,6 +225,8 @@ public void onStart() {
 
         Logger.logDebug(LOG_TAG, "onStart");
 
+        if (mIsInvalidState) return;
+
         mIsVisible = true;
 
         if (mTermuxService != null) {
@@ -236,6 +252,10 @@ public void onStart() {
     public void onResume() {
         super.onResume();
 
+        Logger.logVerbose(LOG_TAG, "onResume");
+
+        if (mIsInvalidState) return;
+
         mTermuxTerminalViewClient.setSoftKeyboardState(true, false);
     }
 
@@ -302,6 +322,8 @@ protected void onStop() {
 
         Logger.logDebug(LOG_TAG, "onStop");
 
+        if (mIsInvalidState) return;
+
         mIsVisible = false;
 
         // Store current session in shared preferences so that it can be restored later in
@@ -318,12 +340,19 @@ public void 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;
         }
-        unbindService(this);
+
+        try {
+            unbindService(this);
+        } catch (Exception e) {
+            // ignore.
+        }
     }
 
     @Override
diff --git a/app/src/main/java/com/termux/app/TermuxApplication.java b/app/src/main/java/com/termux/app/TermuxApplication.java
index 3bc6689ca4..beb666343c 100644
--- a/app/src/main/java/com/termux/app/TermuxApplication.java
+++ b/app/src/main/java/com/termux/app/TermuxApplication.java
@@ -20,7 +20,8 @@ public void onCreate() {
 
     private void setLogLevel() {
         // Load the log level from shared preferences and set it to the {@link Logger.CURRENT_LOG_LEVEL}
-        TermuxAppSharedPreferences preferences = new TermuxAppSharedPreferences(getApplicationContext());
+        TermuxAppSharedPreferences preferences = TermuxAppSharedPreferences.build(getApplicationContext());
+        if (preferences == null) return;
         preferences.setLogLevel(null, preferences.getLogLevel());
         Logger.logDebug("Starting Application");
     }
diff --git a/app/src/main/java/com/termux/app/TermuxService.java b/app/src/main/java/com/termux/app/TermuxService.java
index 39c92023be..3457b7d8e3 100644
--- a/app/src/main/java/com/termux/app/TermuxService.java
+++ b/app/src/main/java/com/termux/app/TermuxService.java
@@ -743,8 +743,9 @@ private synchronized void updateNotification() {
 
     private void setCurrentStoredTerminalSession(TerminalSession session) {
         if (session == null) return;
-        // Make the newly created session the current one to be displayed:
-        TermuxAppSharedPreferences preferences = new TermuxAppSharedPreferences(this);
+        // Make the newly created session the current one to be displayed
+        TermuxAppSharedPreferences preferences = TermuxAppSharedPreferences.build(this);
+        if (preferences == null) return;
         preferences.setCurrentSession(session.mHandle);
     }
 
diff --git a/app/src/main/java/com/termux/app/fragments/settings/TermuxPreferencesFragment.java b/app/src/main/java/com/termux/app/fragments/settings/TermuxPreferencesFragment.java
index 67543f63c0..b92472c672 100644
--- a/app/src/main/java/com/termux/app/fragments/settings/TermuxPreferencesFragment.java
+++ b/app/src/main/java/com/termux/app/fragments/settings/TermuxPreferencesFragment.java
@@ -33,12 +33,12 @@ class TermuxPreferencesDataStore extends PreferenceDataStore {
 
     private TermuxPreferencesDataStore(Context context) {
         mContext = context;
-        mPreferences = new TermuxAppSharedPreferences(context);
+        mPreferences = TermuxAppSharedPreferences.build(context, true);
     }
 
     public static synchronized TermuxPreferencesDataStore getInstance(Context context) {
         if (mInstance == null) {
-            mInstance = new TermuxPreferencesDataStore(context.getApplicationContext());
+            mInstance = new TermuxPreferencesDataStore(context);
         }
         return mInstance;
     }
diff --git a/app/src/main/java/com/termux/app/fragments/settings/termux/DebuggingPreferencesFragment.java b/app/src/main/java/com/termux/app/fragments/settings/termux/DebuggingPreferencesFragment.java
index 279cdc6526..dd5795eb01 100644
--- a/app/src/main/java/com/termux/app/fragments/settings/termux/DebuggingPreferencesFragment.java
+++ b/app/src/main/java/com/termux/app/fragments/settings/termux/DebuggingPreferencesFragment.java
@@ -28,7 +28,7 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         PreferenceCategory loggingCategory = findPreference("logging");
 
         if (loggingCategory != null) {
-            final ListPreference logLevelListPreference = setLogLevelListPreferenceData(findPreference("log_level"), getActivity());
+            final ListPreference logLevelListPreference = setLogLevelListPreferenceData(findPreference("log_level"), getContext());
             loggingCategory.addPreference(logLevelListPreference);
         }
     }
@@ -60,12 +60,12 @@ class DebuggingPreferencesDataStore extends PreferenceDataStore {
 
     private DebuggingPreferencesDataStore(Context context) {
         mContext = context;
-        mPreferences = new TermuxAppSharedPreferences(context);
+        mPreferences = TermuxAppSharedPreferences.build(context, true);
     }
 
     public static synchronized DebuggingPreferencesDataStore getInstance(Context context) {
         if (mInstance == null) {
-            mInstance = new DebuggingPreferencesDataStore(context.getApplicationContext());
+            mInstance = new DebuggingPreferencesDataStore(context);
         }
         return mInstance;
     }
@@ -75,6 +75,7 @@ public static synchronized DebuggingPreferencesDataStore getInstance(Context con
     @Override
     @Nullable
     public String getString(String key, @Nullable String defValue) {
+        if (mPreferences == null) return null;
         if (key == null) return null;
 
         switch (key) {
@@ -87,6 +88,7 @@ public String getString(String key, @Nullable String defValue) {
 
     @Override
     public void putString(String key, @Nullable String value) {
+        if (mPreferences == null) return;
         if (key == null) return;
 
         switch (key) {
@@ -104,6 +106,7 @@ public void putString(String key, @Nullable String value) {
 
     @Override
     public void putBoolean(String key, boolean value) {
+        if (mPreferences == null) return;
         if (key == null) return;
 
         switch (key) {
@@ -123,6 +126,7 @@ public void putBoolean(String key, boolean value) {
 
     @Override
     public boolean getBoolean(String key, boolean defValue) {
+        if (mPreferences == null) return false;
         switch (key) {
             case "terminal_view_key_logging_enabled":
                 return mPreferences.isTerminalViewKeyLoggingEnabled();
diff --git a/app/src/main/java/com/termux/app/fragments/settings/termux/TerminalIOPreferencesFragment.java b/app/src/main/java/com/termux/app/fragments/settings/termux/TerminalIOPreferencesFragment.java
index 2e750c85da..109daf9569 100644
--- a/app/src/main/java/com/termux/app/fragments/settings/termux/TerminalIOPreferencesFragment.java
+++ b/app/src/main/java/com/termux/app/fragments/settings/termux/TerminalIOPreferencesFragment.java
@@ -33,12 +33,12 @@ class TerminalIOPreferencesDataStore extends PreferenceDataStore {
 
     private TerminalIOPreferencesDataStore(Context context) {
         mContext = context;
-        mPreferences = new TermuxAppSharedPreferences(context);
+        mPreferences = TermuxAppSharedPreferences.build(context, true);
     }
 
     public static synchronized TerminalIOPreferencesDataStore getInstance(Context context) {
         if (mInstance == null) {
-            mInstance = new TerminalIOPreferencesDataStore(context.getApplicationContext());
+            mInstance = new TerminalIOPreferencesDataStore(context);
         }
         return mInstance;
     }
@@ -47,6 +47,7 @@ public static synchronized TerminalIOPreferencesDataStore getInstance(Context co
 
     @Override
     public void putBoolean(String key, boolean value) {
+        if (mPreferences == null) return;
         if (key == null) return;
 
         switch (key) {
@@ -63,6 +64,8 @@ public void putBoolean(String key, boolean value) {
 
     @Override
     public boolean getBoolean(String key, boolean defValue) {
+        if (mPreferences == null) return false;
+
         switch (key) {
             case "soft_keyboard_enabled":
                 return mPreferences.isSoftKeyboardEnabled();
diff --git a/app/src/main/java/com/termux/app/utils/CrashUtils.java b/app/src/main/java/com/termux/app/utils/CrashUtils.java
index f2d6011bc0..670277b75d 100644
--- a/app/src/main/java/com/termux/app/utils/CrashUtils.java
+++ b/app/src/main/java/com/termux/app/utils/CrashUtils.java
@@ -47,7 +47,9 @@ public static void notifyCrash(final Context context, final String logTagParam)
         if (context == null) return;
 
 
-        TermuxAppSharedPreferences preferences = new TermuxAppSharedPreferences(context);
+        TermuxAppSharedPreferences preferences = TermuxAppSharedPreferences.build(context);
+        if (preferences == null) return;
+
         // If user has disabled notifications for crashes
         if (!preferences.areCrashReportNotificationsEnabled())
             return;
diff --git a/app/src/main/java/com/termux/app/utils/PluginUtils.java b/app/src/main/java/com/termux/app/utils/PluginUtils.java
index 72d4af5337..d1b7dba9c4 100644
--- a/app/src/main/java/com/termux/app/utils/PluginUtils.java
+++ b/app/src/main/java/com/termux/app/utils/PluginUtils.java
@@ -139,7 +139,9 @@ public static void processPluginExecutionCommandError(final Context context, Str
         }
 
 
-        TermuxAppSharedPreferences preferences = new TermuxAppSharedPreferences(context);
+        TermuxAppSharedPreferences preferences = TermuxAppSharedPreferences.build(context);
+        if (preferences == null) return;
+
         // If user has disabled notifications for plugin, then just return
         if (!preferences.arePluginErrorNotificationsEnabled() && !forceNotification)
             return;
diff --git a/termux-shared/src/main/java/com/termux/shared/interact/DialogUtils.java b/termux-shared/src/main/java/com/termux/shared/interact/DialogUtils.java
index d6e8174186..e70c4dcb49 100644
--- a/termux-shared/src/main/java/com/termux/shared/interact/DialogUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/interact/DialogUtils.java
@@ -75,6 +75,15 @@ public static void textInput(Activity activity, int titleText, String initialTex
         dialogHolder[0].show();
     }
 
+    /**
+     * Show a message in a dialog
+     *
+     * @param context The {@link Context} to use to start the dialog. An {@link Activity} {@link Context}
+     *                must be passed, otherwise exceptions will be thrown.
+     * @param titleText The title text of the dialog.
+     * @param messageText The message text of the dialog.
+     * @param onDismiss The {@link DialogInterface.OnDismissListener} to run when dialog is dismissed.
+     */
     public static void showMessage(Context context, String titleText, String messageText, final DialogInterface.OnDismissListener onDismiss) {
 
         AlertDialog.Builder builder = new AlertDialog.Builder(context, R.style.Theme_AppCompat_Light_Dialog)
diff --git a/termux-shared/src/main/java/com/termux/shared/notification/NotificationUtils.java b/termux-shared/src/main/java/com/termux/shared/notification/NotificationUtils.java
index fe9d87e6d1..b31072e87a 100644
--- a/termux-shared/src/main/java/com/termux/shared/notification/NotificationUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/notification/NotificationUtils.java
@@ -61,7 +61,9 @@ public static NotificationManager getNotificationManager(final Context context)
     public synchronized static int getNextNotificationId(final Context context) {
         if (context == null) return TermuxPreferenceConstants.TERMUX_APP.DEFAULT_VALUE_KEY_LAST_NOTIFICATION_ID;
 
-        TermuxAppSharedPreferences preferences = new TermuxAppSharedPreferences(context);
+        TermuxAppSharedPreferences preferences = TermuxAppSharedPreferences.build(context);
+        if (preferences == null) return TermuxPreferenceConstants.TERMUX_APP.DEFAULT_VALUE_KEY_LAST_NOTIFICATION_ID;
+
         int lastNotificationId = preferences.getLastNotificationId();
 
         int nextNotificationId = lastNotificationId + 1;
diff --git a/termux-shared/src/main/java/com/termux/shared/packages/PackageUtils.java b/termux-shared/src/main/java/com/termux/shared/packages/PackageUtils.java
index b1192e7e95..054aa5c82d 100644
--- a/termux-shared/src/main/java/com/termux/shared/packages/PackageUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/packages/PackageUtils.java
@@ -7,28 +7,62 @@
 
 import androidx.annotation.NonNull;
 
+import com.termux.shared.R;
 import com.termux.shared.data.DataUtils;
+import com.termux.shared.interact.DialogUtils;
 import com.termux.shared.logger.Logger;
+import com.termux.shared.termux.TermuxConstants;
 
 import java.security.MessageDigest;
 
+import javax.annotation.Nullable;
+
 public class PackageUtils {
 
+    private static final String LOG_TAG = "PackageUtils";
+
     /**
      * Get the {@link Context} for the package name.
      *
      * @param context The {@link Context} to use to get the {@link Context} of the {@code packageName}.
+     * @param packageName The package name whose {@link Context} to get.
      * @return Returns the {@link Context}. This will {@code null} if an exception is raised.
      */
+    @Nullable
     public static Context getContextForPackage(@NonNull final Context context, String packageName) {
         try {
             return context.createPackageContext(packageName, Context.CONTEXT_RESTRICTED);
         } catch (Exception e) {
-            Logger.logStackTraceWithMessage("Failed to get \"" + packageName + "\" package context.", e);
+            Logger.logVerbose(LOG_TAG, "Failed to get \"" + packageName + "\" package context: " + e.getMessage());
             return null;
         }
     }
 
+    /**
+     * Get the {@link Context} for a package name.
+     *
+     * @param context The {@link Context} to use to get the {@link Context} of the {@code packageName}.
+     * @param packageName The package name whose {@link Context} to get.
+     * @param exitAppOnError If {@code true} and failed to get package context, then a dialog will
+     *                       be shown which when dismissed will exit the app.
+     * @return Returns the {@link Context}. This will {@code null} if an exception is raised.
+     */
+    @Nullable
+    public static Context getContextForPackageOrExitApp(@NonNull Context context, String packageName, final boolean exitAppOnError) {
+        Context packageContext = getContextForPackage(context, packageName);
+
+        if (packageContext == null && exitAppOnError) {
+            String errorMessage = context.getString(R.string.error_get_package_context_failed_message,
+                packageName, TermuxConstants.TERMUX_GITHUB_REPO_URL);
+            Logger.logError(LOG_TAG, errorMessage);
+            DialogUtils.exitAppWithErrorMessage(context,
+                context.getString(R.string.error_get_package_context_failed_title),
+                errorMessage);
+        }
+
+        return packageContext;
+    }
+
     /**
      * Get the {@link PackageInfo} for the package associated with the {@code context}.
      *
@@ -46,6 +80,7 @@ public static PackageInfo getPackageInfoForPackage(@NonNull final Context contex
      * @param flags The flags to pass to {@link PackageManager#getPackageInfo(String, int)}.
      * @return Returns the {@link PackageInfo}. This will be {@code null} if an exception is raised.
      */
+    @Nullable
     public static PackageInfo getPackageInfoForPackage(@NonNull final Context context, final int flags) {
         try {
             return context.getPackageManager().getPackageInfo(context.getPackageName(), flags);
@@ -100,6 +135,7 @@ public static Boolean isAppForPackageADebugBuild(@NonNull final Context context)
      * @param context The {@link Context} for the package.
      * @return Returns the {@code versionCode}. This will be {@code null} if an exception is raised.
      */
+    @Nullable
     public static Integer getVersionCodeForPackage(@NonNull final Context context) {
         try {
             return getPackageInfoForPackage(context).versionCode;
@@ -114,6 +150,7 @@ public static Integer getVersionCodeForPackage(@NonNull final Context context) {
      * @param context The {@link Context} for the package.
      * @return Returns the {@code versionName}. This will be {@code null} if an exception is raised.
      */
+    @Nullable
     public static String getVersionNameForPackage(@NonNull final Context context) {
         try {
             return getPackageInfoForPackage(context).versionName;
@@ -122,15 +159,23 @@ public static String getVersionNameForPackage(@NonNull final Context context) {
         }
     }
 
-
     /**
      * Get the {@code SHA-256 digest} of signing certificate for the package associated with the {@code context}.
      *
      * @param context The {@link Context} for the package.
      * @return Returns the{@code SHA-256 digest}. This will be {@code null} if an exception is raised.
      */
+    @Nullable
     public static String getSigningCertificateSHA256DigestForPackage(@NonNull final Context context) {
         try {
+            /*
+            * Todo: We may need AndroidManifest queries entries if package is installed but with a different signature on android 11
+            * https://developer.android.com/training/package-visibility
+            * Need a device that allows (manual) installation of apk with mismatched signature of
+            * sharedUserId apps to test. Currently, if its done, PackageManager just doesn't load
+            * the package and removes its apk automatically if its installed as a user app instead of system app
+            * W/PackageManager: Failed to parse /path/to/com.termux.tasker.apk: Signature mismatch for shared user: SharedUserSetting{xxxxxxx com.termux/10xxx}
+            */
             PackageInfo packageInfo = getPackageInfoForPackage(context, PackageManager.GET_SIGNATURES);
             if (packageInfo == null) return null;
             return DataUtils.bytesToHex(MessageDigest.getInstance("SHA-256").digest(packageInfo.signatures[0].toByteArray()));
diff --git a/termux-shared/src/main/java/com/termux/shared/packages/PermissionUtils.java b/termux-shared/src/main/java/com/termux/shared/packages/PermissionUtils.java
index 65c0f73db0..e6a8569c03 100644
--- a/termux-shared/src/main/java/com/termux/shared/packages/PermissionUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/packages/PermissionUtils.java
@@ -75,7 +75,9 @@ public static boolean validateDisplayOverOtherAppsPermissionForPostAndroid10(Con
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) return true;
         
         if (!PermissionUtils.checkDisplayOverOtherAppsPermission(context)) {
-            TermuxAppSharedPreferences preferences = new TermuxAppSharedPreferences(context);
+            TermuxAppSharedPreferences preferences = TermuxAppSharedPreferences.build(context);
+            if (preferences == null) return false;
+
             if (preferences.arePluginErrorNotificationsEnabled())
                 Logger.showToast(context, context.getString(R.string.error_display_over_other_apps_permission_not_granted), true);
             return false;
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxAppSharedPreferences.java b/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxAppSharedPreferences.java
index 4e66c8f599..c2979ee08c 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxAppSharedPreferences.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxAppSharedPreferences.java
@@ -1,16 +1,20 @@
 package com.termux.shared.settings.preferences;
 
+import android.app.Activity;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.util.TypedValue;
 
+import androidx.annotation.NonNull;
+
+import com.termux.shared.packages.PackageUtils;
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.logger.Logger;
-import com.termux.shared.termux.TermuxUtils;
 import com.termux.shared.data.DataUtils;
 import com.termux.shared.settings.preferences.TermuxPreferenceConstants.TERMUX_APP;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 public class TermuxAppSharedPreferences {
 
@@ -24,15 +28,48 @@ public class TermuxAppSharedPreferences {
 
     private static final String LOG_TAG = "TermuxAppSharedPreferences";
 
-    public TermuxAppSharedPreferences(@Nonnull Context context) {
-        // We use the default context if failed to get termux package context
-        mContext = DataUtils.getDefaultIfNull(TermuxUtils.getTermuxPackageContext(context), context);
+    private TermuxAppSharedPreferences(@Nonnull Context context) {
+        mContext = context;
         mSharedPreferences = getPrivateSharedPreferences(mContext);
 
         setFontVariables(context);
     }
 
+    /**
+     * Get the {@link Context} for a package name.
+     *
+     * @param context The {@link Context} to use to get the {@link Context} of the
+     *                {@link TermuxConstants#TERMUX_PACKAGE_NAME}.
+     * @return Returns the {@link TermuxAppSharedPreferences}. This will {@code null} if an exception is raised.
+     */
+    @Nullable
+    public static TermuxAppSharedPreferences build(@NonNull final Context context) {
+        Context termuxPackageContext = PackageUtils.getContextForPackage(context, TermuxConstants.TERMUX_PACKAGE_NAME);
+        if (termuxPackageContext == null)
+            return null;
+        else
+            return new TermuxAppSharedPreferences(termuxPackageContext);
+    }
+
+    /**
+     * Get the {@link Context} for a package name.
+     *
+     * @param context The {@link Activity} to use to get the {@link Context} of the
+     *                {@link TermuxConstants#TERMUX_PACKAGE_NAME}.
+     * @param exitAppOnError If {@code true} and failed to get package context, then a dialog will
+     *                       be shown which when dismissed will exit the app.
+     * @return Returns the {@link TermuxAppSharedPreferences}. This will {@code null} if an exception is raised.
+     */
+    public static TermuxAppSharedPreferences build(@NonNull final Context context, final boolean exitAppOnError) {
+        Context termuxPackageContext = PackageUtils.getContextForPackageOrExitApp(context, TermuxConstants.TERMUX_PACKAGE_NAME, exitAppOnError);
+        if (termuxPackageContext == null)
+            return null;
+        else
+            return new TermuxAppSharedPreferences(termuxPackageContext);
+    }
+
     private static SharedPreferences getPrivateSharedPreferences(Context context) {
+        if (context == null) return null;
         return SharedPreferenceUtils.getPrivateSharedPreferences(context, TermuxConstants.TERMUX_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION);
     }
 
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxTaskerAppSharedPreferences.java b/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxTaskerAppSharedPreferences.java
index b2f0ba7846..412c9b2299 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxTaskerAppSharedPreferences.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxTaskerAppSharedPreferences.java
@@ -1,15 +1,18 @@
 package com.termux.shared.settings.preferences;
 
+import android.app.Activity;
 import android.content.Context;
 import android.content.SharedPreferences;
 
+import androidx.annotation.NonNull;
+
+import com.termux.shared.packages.PackageUtils;
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.settings.preferences.TermuxPreferenceConstants.TERMUX_TASKER_APP;
-import com.termux.shared.data.DataUtils;
 import com.termux.shared.logger.Logger;
-import com.termux.shared.termux.TermuxUtils;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 public class TermuxTaskerAppSharedPreferences {
 
@@ -20,18 +23,52 @@ public class TermuxTaskerAppSharedPreferences {
 
     private static final String LOG_TAG = "TermuxTaskerAppSharedPreferences";
 
-    public TermuxTaskerAppSharedPreferences(@Nonnull Context context) {
-        // We use the default context if failed to get termux-tasker package context
-        mContext = DataUtils.getDefaultIfNull(TermuxUtils.getTermuxTaskerPackageContext(context), context);
+    private  TermuxTaskerAppSharedPreferences(@Nonnull Context context) {
+        mContext = context;
         mSharedPreferences = getPrivateSharedPreferences(mContext);
         mMultiProcessSharedPreferences = getPrivateAndMultiProcessSharedPreferences(mContext);
     }
 
+    /**
+     * Get the {@link Context} for a package name.
+     *
+     * @param context The {@link Context} to use to get the {@link Context} of the
+     *                {@link TermuxConstants#TERMUX_TASKER_PACKAGE_NAME}.
+     * @return Returns the {@link TermuxTaskerAppSharedPreferences}. This will {@code null} if an exception is raised.
+     */
+    @Nullable
+    public static TermuxTaskerAppSharedPreferences build(@NonNull final Context context) {
+        Context termuxTaskerPackageContext = PackageUtils.getContextForPackage(context, TermuxConstants.TERMUX_TASKER_PACKAGE_NAME);
+        if (termuxTaskerPackageContext == null)
+            return null;
+        else
+            return new  TermuxTaskerAppSharedPreferences(termuxTaskerPackageContext);
+    }
+
+    /**
+     * Get the {@link Context} for a package name.
+     *
+     * @param context The {@link Activity} to use to get the {@link Context} of the
+     *                {@link TermuxConstants#TERMUX_TASKER_PACKAGE_NAME}.
+     * @param exitAppOnError If {@code true} and failed to get package context, then a dialog will
+     *                       be shown which when dismissed will exit the app.
+     * @return Returns the {@link TermuxAppSharedPreferences}. This will {@code null} if an exception is raised.
+     */
+    public static  TermuxTaskerAppSharedPreferences build(@NonNull final Context context, final boolean exitAppOnError) {
+        Context termuxTaskerPackageContext = PackageUtils.getContextForPackageOrExitApp(context, TermuxConstants.TERMUX_TASKER_PACKAGE_NAME, exitAppOnError);
+        if (termuxTaskerPackageContext == null)
+            return null;
+        else
+            return new  TermuxTaskerAppSharedPreferences(termuxTaskerPackageContext);
+    }
+
     private static SharedPreferences getPrivateSharedPreferences(Context context) {
+        if (context == null) return null;
         return SharedPreferenceUtils.getPrivateSharedPreferences(context, TermuxConstants.TERMUX_TASKER_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION);
     }
 
     private static SharedPreferences getPrivateAndMultiProcessSharedPreferences(Context context) {
+        if (context == null) return null;
         return SharedPreferenceUtils.getPrivateAndMultiProcessSharedPreferences(context, TermuxConstants.TERMUX_TASKER_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION);
     }
 
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
index 706f556ba6..6ad9a18e03 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
@@ -228,7 +228,6 @@ public static String getAppInfoMarkdownStringInner(@NonNull final Context contex
         appendPropertyToMarkdown(markdownString,"IS_DEBUG_BUILD", PackageUtils.isAppForPackageADebugBuild(context));
 
         String signingCertificateSHA256Digest = PackageUtils.getSigningCertificateSHA256DigestForPackage(context);
-        Logger.logError("'" + signingCertificateSHA256Digest + "'");
         if (signingCertificateSHA256Digest != null) {
             appendPropertyToMarkdown(markdownString,"APK_RELEASE", getAPKRelease(signingCertificateSHA256Digest));
             appendPropertyToMarkdown(markdownString,"SIGNING_CERTIFICATE_SHA256_DIGEST", signingCertificateSHA256Digest);
@@ -381,7 +380,7 @@ public static String getImportantLinksMarkdownString(@NonNull final Context cont
      */
     public static String geAPTInfoMarkdownString(@NonNull final Context context) {
 
-        String aptInfoScript = null;
+        String aptInfoScript;
         InputStream inputStream = context.getResources().openRawResource(com.termux.shared.R.raw.apt_info_script);
         try {
             aptInfoScript = IOUtils.toString(inputStream, Charset.defaultCharset());
diff --git a/termux-shared/src/main/res/layout/dialog_show_message.xml b/termux-shared/src/main/res/layout/dialog_show_message.xml
index f074d08c10..f5dd82f13c 100644
--- a/termux-shared/src/main/res/layout/dialog_show_message.xml
+++ b/termux-shared/src/main/res/layout/dialog_show_message.xml
@@ -35,8 +35,10 @@
                 android:id="@+id/dialog_message"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:autoLink="web|email"
                 android:textSize="14sp"
-                android:textColor="@android:color/tab_indicator_text"/>
+                android:textColor="@android:color/tab_indicator_text"
+                android:textColorLink="@android:color/black"/>
         </LinearLayout>
     </ScrollView>
 
diff --git a/termux-shared/src/main/res/values/strings.xml b/termux-shared/src/main/res/values/strings.xml
index 71bd7bca5e..d9eedf3316 100644
--- a/termux-shared/src/main/res/values/strings.xml
+++ b/termux-shared/src/main/res/values/strings.xml
@@ -61,6 +61,13 @@
     <string name="error_file_not_executable">The %1$s at path is not executable. Permission Denied.</string>
 
 
+
+    <!-- PackageUtils -->
+    <string name="error_get_package_context_failed_title">Failed To Get Package Context</string>
+    <string name="error_get_package_context_failed_message">Failed to get package context for the \"%1$s\" package. This may be because the app package is not installed or it has different APK signature from the current app. Check install instruction at %2$s for more details.</string>
+
+
+
     <!-- PermissionUtils -->
     <string name="message_sudo_please_grant_permissions">Please grant permissions on next screen</string>
     <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>
@@ -72,11 +79,6 @@
 
 
 
-    <!-- TermuxUtils -->
-    <string name="msg_report_issue">If you want to report this issue, then copy its text from the options menu (3-dots on top right) and post an issue on one of the following links.\n\nIf you are posting a Termux app crash report, then please provide details on what you were doing that caused the crash and how to reproduce it, if possible.\n\nIf you are posting an issue on Github, then post it in the repository at which the report belongs at. You may optionally remove any device specific info that you consider private or don\'t want to share or that is not relevant to the issue.</string>
-
-
-
     <!-- ShellUtils -->
     <string name="error_sending_sigkill_to_process">Sending SIGKILL to process on user request or because android is killing the execution service</string>
     <string name="error_execution_cancelled">Execution has been cancelled since execution service is being killed</string>
@@ -87,6 +89,11 @@
 
 
 
+    <!-- TermuxUtils -->
+    <string name="msg_report_issue">If you want to report this issue, then copy its text from the options menu (3-dots on top right) and post an issue on one of the following links.\n\nIf you are posting a Termux app crash report, then please provide details on what you were doing that caused the crash and how to reproduce it, if possible.\n\nIf you are posting an issue on Github, then post it in the repository at which the report belongs at. You may optionally remove any device specific info that you consider private or don\'t want to share or that is not relevant to the issue.</string>
+
+
+
     <!-- Log Level -->
     <string name="log_level_title">Log Level</string>
     <string name="log_level_off">"Off"</string>

From 6de3713049e61a838fe094192bb27d0f691b318e Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Fri, 14 May 2021 05:19:18 +0500
Subject: [PATCH 389/912] Add in-app Donation link in Termux Settings for non
 google playstore releases

The `TermuxConstants` class has been updated to `v0.22.0`. Check its Changelog sections for info on changes.
---
 .../app/activities/SettingsActivity.java      | 32 ++++++++-
 app/src/main/res/values/strings.xml           |  7 +-
 app/src/main/res/xml/root_preferences.xml     |  8 ++-
 .../termux/shared/interact/ShareUtils.java    | 20 ++++++
 .../termux/shared/termux/TermuxConstants.java | 67 ++++++++++++-------
 5 files changed, 105 insertions(+), 29 deletions(-)

diff --git a/app/src/main/java/com/termux/app/activities/SettingsActivity.java b/app/src/main/java/com/termux/app/activities/SettingsActivity.java
index afb7373e97..08ac7fef59 100644
--- a/app/src/main/java/com/termux/app/activities/SettingsActivity.java
+++ b/app/src/main/java/com/termux/app/activities/SettingsActivity.java
@@ -11,6 +11,8 @@
 import com.termux.R;
 import com.termux.app.models.ReportInfo;
 import com.termux.app.models.UserAction;
+import com.termux.shared.interact.ShareUtils;
+import com.termux.shared.packages.PackageUtils;
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.termux.TermuxUtils;
 
@@ -44,10 +46,11 @@ public static class RootPreferencesFragment extends PreferenceFragmentCompat {
         public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
             setPreferencesFromResource(R.xml.root_preferences, rootKey);
 
-            setAboutOnPreferenceClickListener();
+            configureAboutPreference();
+            configureDonatePreference();
         }
 
-        private void setAboutOnPreferenceClickListener() {
+        private void configureAboutPreference() {
             Context context = getContext();
             Preference about = findPreference("about");
             if (context != null && about != null) {
@@ -70,6 +73,31 @@ private void setAboutOnPreferenceClickListener() {
                 });
             }
         }
+
+        private void configureDonatePreference() {
+            Context context = getContext();
+            Preference donate = findPreference("donate");
+            if (context != null && donate != 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)) {
+                        donate.setVisible(false);
+                        return;
+                    } else {
+                        donate.setVisible(true);
+                    }
+                }
+
+                donate.setOnPreferenceClickListener(preference -> {
+                    ShareUtils.openURL(context, TermuxConstants.TERMUX_DONATE_URL);
+                    return true;
+                });
+            }
+        }
     }
 
 }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0c00943eff..c149c4cba3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -170,7 +170,10 @@
                 <string name="termux_soft_keyboard_enabled_only_if_no_hardware_on">Soft keyboard will be enabled only if no hardware keyboard is connected.</string>
 
 
-    <!-- About Preferences -->
-    <string name="about_preferences_title">About</string>
+    <!-- About Preference -->
+    <string name="about_preference_title">About</string>
+
+    <!-- Donate Preference -->
+    <string name="donate_preference_title">Donate</string>
 
 </resources>
diff --git a/app/src/main/res/xml/root_preferences.xml b/app/src/main/res/xml/root_preferences.xml
index 297b490366..f8efef7b70 100644
--- a/app/src/main/res/xml/root_preferences.xml
+++ b/app/src/main/res/xml/root_preferences.xml
@@ -8,8 +8,14 @@
 
     <Preference
         app:key="about"
-        app:title="@string/about_preferences_title"
+        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"/>
+
 </PreferenceScreen>
diff --git a/termux-shared/src/main/java/com/termux/shared/interact/ShareUtils.java b/termux-shared/src/main/java/com/termux/shared/interact/ShareUtils.java
index c4efab2352..2f38a3a929 100644
--- a/termux-shared/src/main/java/com/termux/shared/interact/ShareUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/interact/ShareUtils.java
@@ -4,6 +4,7 @@
 import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.Intent;
+import android.net.Uri;
 
 import androidx.core.content.ContextCompat;
 
@@ -13,6 +14,8 @@
 
 public class ShareUtils {
 
+    private static final String LOG_TAG = "ShareUtils";
+
     /**
      * Open the system app chooser that allows the user to select which app to send the intent.
      *
@@ -68,4 +71,21 @@ public static void copyTextToClipboard(final Context context, final String text,
         }
     }
 
+    /**
+     * Open a url.
+     *
+     * @param context The context for operations.
+     * @param url The url to open.
+     */
+    public static void openURL(final Context context, final String url) {
+        if (context == null || url == null || url.isEmpty()) return;
+        try {
+            Uri uri = Uri.parse(url);
+            Intent intent = new Intent(Intent.ACTION_VIEW, uri);
+            context.startActivity(intent);
+        } catch (Exception e) {
+            Logger.logStackTraceWithMessage(LOG_TAG, "Failed to open the url \"" + url + "\"", e);
+        }
+    }
+
 }
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
index 2f4284d9ac..3d79dee7d7 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
@@ -144,8 +144,11 @@
  *
  * - 0.21.0 (2021-05-13)
  *      - Added `APK_RELEASE_FDROID`, `APK_RELEASE_FDROID_SIGNING_CERTIFICATE_SHA256_DIGEST`,
- *      - Added `APK_RELEASE_GITHUB_DEBUG_BUILD`, `APK_RELEASE_GITHUB_DEBUG_BUILD_SIGNING_CERTIFICATE_SHA256_DIGEST`,
- *      - Added `APK_RELEASE_GOOGLE_PLAYSTORE`, `APK_RELEASE_GOOGLE_PLAYSTORE_SIGNING_CERTIFICATE_SHA256_DIGEST`.
+ *          `APK_RELEASE_GITHUB_DEBUG_BUILD`, `APK_RELEASE_GITHUB_DEBUG_BUILD_SIGNING_CERTIFICATE_SHA256_DIGEST`,
+ *          `APK_RELEASE_GOOGLE_PLAYSTORE`, `APK_RELEASE_GOOGLE_PLAYSTORE_SIGNING_CERTIFICATE_SHA256_DIGEST`.
+ *
+ * - 0.22.0 (2021-05-13)
+ *      - Added `TERMUX_DONATE_URL`.
  *
  */
 
@@ -200,24 +203,6 @@ public final class TermuxConstants {
     /** Termux Github organization url */
     public static final String TERMUX_GITHUB_ORGANIZATION_URL = "https://github.com" + "/" + TERMUX_GITHUB_ORGANIZATION_NAME; // Default: "https://github.com/termux"
 
-    /** Termux support email url */
-    public static final String TERMUX_SUPPORT_EMAIL_URL = "termuxreports@groups.io"; // Default: "termuxreports@groups.io"
-
-    /** Termux support email mailto url */
-    public static final String TERMUX_SUPPORT_EMAIL_MAILTO_URL = "mailto:" + TERMUX_SUPPORT_EMAIL_URL; // Default: "mailto:termuxreports@groups.io"
-
-    /** Termux Wiki */
-    public static final String TERMUX_WIKI = "Termux Wiki"; // Default: "Termux Wiki"
-
-    /** Termux Wiki url */
-    public static final String TERMUX_WIKI_URL = "https://wiki.termux.com"; // Default: "https://wiki.termux.com"
-
-    /** Termux Reddit subreddit */
-    public static final String TERMUX_REDDIT_SUBREDDIT = "r/termux"; // Default: "r/termux"
-
-    /** Termux Reddit subreddit url */
-    public static final String TERMUX_REDDIT_SUBREDDIT_URL = "https://www.reddit.com/r/termux"; // Default: "https://www.reddit.com/r/termux"
-
     /** F-Droid packages base url */
     public static final String FDROID_PACKAGES_BASE_URL = "https://f-droid.org/en/packages"; // Default: "https://f-droid.org/en/packages"
 
@@ -239,8 +224,6 @@ public final class TermuxConstants {
     public static final String TERMUX_GITHUB_REPO_URL = TERMUX_GITHUB_ORGANIZATION_URL + "/" + TERMUX_GITHUB_REPO_NAME; // Default: "https://github.com/termux/termux-app"
     /** Termux Github issues repo url */
     public static final String TERMUX_GITHUB_ISSUES_REPO_URL = TERMUX_GITHUB_REPO_URL + "/issues"; // Default: "https://github.com/termux/termux-app/issues"
-    /** Termux Github wiki repo url */
-    public static final String TERMUX_GITHUB_WIKI_REPO_URL = TERMUX_GITHUB_REPO_URL + "/wiki"; // Default: "https://github.com/termux/termux-app/wiki"
     /** Termux F-Droid package url */
     public static final String TERMUX_FDROID_PACKAGE_URL = FDROID_PACKAGES_BASE_URL + "/" + TERMUX_PACKAGE_NAME; // Default: "https://f-droid.org/en/packages/com.termux"
 
@@ -392,8 +375,6 @@ public final class TermuxConstants {
     public static final String TERMUX_PACKAGES_GITHUB_REPO_URL = TERMUX_GITHUB_ORGANIZATION_URL + "/" + TERMUX_PACKAGES_GITHUB_REPO_NAME; // Default: "https://github.com/termux/termux-packages"
     /** Termux Packages Github issues repo url */
     public static final String TERMUX_PACKAGES_GITHUB_ISSUES_REPO_URL = TERMUX_PACKAGES_GITHUB_REPO_URL + "/issues"; // Default: "https://github.com/termux/termux-packages/issues"
-    /** Termux Packages wiki repo url */
-    public static final String TERMUX_PACKAGES_GITHUB_WIKI_REPO_URL = TERMUX_PACKAGES_GITHUB_REPO_URL + "/wiki"; // Default: "https://github.com/termux/termux-packages/wiki"
 
 
     /** Termux Game Packages Github repo name */
@@ -439,6 +420,44 @@ public final class TermuxConstants {
 
 
 
+    /*
+     * Termux miscellaneous urls.
+     */
+
+    /** Termux Wiki */
+    public static final String TERMUX_WIKI = TERMUX_APP_NAME + " Wiki"; // Default: "Termux Wiki"
+
+    /** Termux Wiki url */
+    public static final String TERMUX_WIKI_URL = "https://wiki.termux.com"; // Default: "https://wiki.termux.com"
+
+    /** Termux Github wiki repo url */
+    public static final String TERMUX_GITHUB_WIKI_REPO_URL = TERMUX_GITHUB_REPO_URL + "/wiki"; // Default: "https://github.com/termux/termux-app/wiki"
+
+    /** Termux Packages wiki repo url */
+    public static final String TERMUX_PACKAGES_GITHUB_WIKI_REPO_URL = TERMUX_PACKAGES_GITHUB_REPO_URL + "/wiki"; // Default: "https://github.com/termux/termux-packages/wiki"
+
+
+    /** Termux support email url */
+    public static final String TERMUX_SUPPORT_EMAIL_URL = "termuxreports@groups.io"; // Default: "termuxreports@groups.io"
+
+    /** Termux support email mailto url */
+    public static final String TERMUX_SUPPORT_EMAIL_MAILTO_URL = "mailto:" + TERMUX_SUPPORT_EMAIL_URL; // Default: "mailto:termuxreports@groups.io"
+
+
+    /** Termux Reddit subreddit */
+    public static final String TERMUX_REDDIT_SUBREDDIT = "r/termux"; // Default: "r/termux"
+
+    /** Termux Reddit subreddit url */
+    public static final String TERMUX_REDDIT_SUBREDDIT_URL = "https://www.reddit.com/r/termux"; // Default: "https://www.reddit.com/r/termux"
+
+
+    /** Termux donate url */
+    public static final String TERMUX_DONATE_URL = TERMUX_PACKAGES_GITHUB_REPO_URL + "/wiki/Donate"; // Default: "https://github.com/termux/termux-packages/wiki/Donate"
+
+
+
+
+
     /*
      * Termux app core directory paths.
      */

From 339b2a24a2a05416cd3b313d94551cc7ba5d59fa Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Fri, 14 May 2021 06:47:42 +0500
Subject: [PATCH 390/912] Add support for setting Termux:Tasker log level from
 TermuxSettings

---
 .../app/activities/SettingsActivity.java      |  41 ++++---
 .../settings/TermuxPreferencesFragment.java   |   5 +-
 .../TermuxTaskerPreferencesFragment.java      |  49 +++++++++
 .../termux/DebuggingPreferencesFragment.java  |  25 +++--
 .../termux/TerminalIOPreferencesFragment.java |   5 +-
 .../DebuggingPreferencesFragment.java         | 101 ++++++++++++++++++
 app/src/main/res/values/strings.xml           |   5 +
 app/src/main/res/xml/root_preferences.xml     |   7 ++
 .../termux_tasker_debugging_preferences.xml   |  15 +++
 .../res/xml/termux_tasker_preferences.xml     |   8 ++
 10 files changed, 239 insertions(+), 22 deletions(-)
 create mode 100644 app/src/main/java/com/termux/app/fragments/settings/TermuxTaskerPreferencesFragment.java
 create mode 100644 app/src/main/java/com/termux/app/fragments/settings/termux_tasker/DebuggingPreferencesFragment.java
 create mode 100644 app/src/main/res/xml/termux_tasker_debugging_preferences.xml
 create mode 100644 app/src/main/res/xml/termux_tasker_preferences.xml

diff --git a/app/src/main/java/com/termux/app/activities/SettingsActivity.java b/app/src/main/java/com/termux/app/activities/SettingsActivity.java
index 08ac7fef59..5ef65a3d00 100644
--- a/app/src/main/java/com/termux/app/activities/SettingsActivity.java
+++ b/app/src/main/java/com/termux/app/activities/SettingsActivity.java
@@ -3,6 +3,7 @@
 import android.content.Context;
 import android.os.Bundle;
 
+import androidx.annotation.NonNull;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.preference.Preference;
@@ -13,6 +14,7 @@
 import com.termux.app.models.UserAction;
 import com.termux.shared.interact.ShareUtils;
 import com.termux.shared.packages.PackageUtils;
+import com.termux.shared.settings.preferences.TermuxTaskerAppSharedPreferences;
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.termux.TermuxUtils;
 
@@ -44,17 +46,29 @@ public boolean onSupportNavigateUp() {
     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);
 
-            configureAboutPreference();
-            configureDonatePreference();
+            configureTermuxTaskerPreference(context);
+            configureAboutPreference(context);
+            configureDonatePreference(context);
         }
 
-        private void configureAboutPreference() {
-            Context context = getContext();
-            Preference about = findPreference("about");
-            if (context != null && about != null) {
-                about.setOnPreferenceClickListener(preference -> {
+        private void configureTermuxTaskerPreference(@NonNull Context context) {
+            Preference termuxTaskerPrefernce = findPreference("termux_tasker");
+            if (termuxTaskerPrefernce != 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
+                termuxTaskerPrefernce.setVisible(preferences != null);
+            }
+        }
+
+        private void configureAboutPreference(@NonNull Context context) {
+            Preference aboutPreference = findPreference("about");
+            if (aboutPreference != null) {
+                aboutPreference.setOnPreferenceClickListener(preference -> {
                     String title = "About";
 
                     StringBuilder aboutString = new StringBuilder();
@@ -74,10 +88,9 @@ private void configureAboutPreference() {
             }
         }
 
-        private void configureDonatePreference() {
-            Context context = getContext();
-            Preference donate = findPreference("donate");
-            if (context != null && donate != null) {
+        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
@@ -85,14 +98,14 @@ private void configureDonatePreference() {
                     // 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)) {
-                        donate.setVisible(false);
+                        donatePreference.setVisible(false);
                         return;
                     } else {
-                        donate.setVisible(true);
+                        donatePreference.setVisible(true);
                     }
                 }
 
-                donate.setOnPreferenceClickListener(preference -> {
+                donatePreference.setOnPreferenceClickListener(preference -> {
                     ShareUtils.openURL(context, TermuxConstants.TERMUX_DONATE_URL);
                     return true;
                 });
diff --git a/app/src/main/java/com/termux/app/fragments/settings/TermuxPreferencesFragment.java b/app/src/main/java/com/termux/app/fragments/settings/TermuxPreferencesFragment.java
index b92472c672..273fa0f552 100644
--- a/app/src/main/java/com/termux/app/fragments/settings/TermuxPreferencesFragment.java
+++ b/app/src/main/java/com/termux/app/fragments/settings/TermuxPreferencesFragment.java
@@ -16,8 +16,11 @@ 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(getContext()));
+        preferenceManager.setPreferenceDataStore(TermuxPreferencesDataStore.getInstance(context));
 
         setPreferencesFromResource(R.xml.termux_preferences, rootKey);
     }
diff --git a/app/src/main/java/com/termux/app/fragments/settings/TermuxTaskerPreferencesFragment.java b/app/src/main/java/com/termux/app/fragments/settings/TermuxTaskerPreferencesFragment.java
new file mode 100644
index 0000000000..b86685b60b
--- /dev/null
+++ b/app/src/main/java/com/termux/app/fragments/settings/TermuxTaskerPreferencesFragment.java
@@ -0,0 +1,49 @@
+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;
+    }
+
+}
diff --git a/app/src/main/java/com/termux/app/fragments/settings/termux/DebuggingPreferencesFragment.java b/app/src/main/java/com/termux/app/fragments/settings/termux/DebuggingPreferencesFragment.java
index dd5795eb01..72ced348a6 100644
--- a/app/src/main/java/com/termux/app/fragments/settings/termux/DebuggingPreferencesFragment.java
+++ b/app/src/main/java/com/termux/app/fragments/settings/termux/DebuggingPreferencesFragment.java
@@ -4,6 +4,7 @@
 import android.os.Bundle;
 
 import androidx.annotation.Keep;
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.preference.ListPreference;
 import androidx.preference.PreferenceCategory;
@@ -20,20 +21,32 @@ 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(getContext()));
+        preferenceManager.setPreferenceDataStore(DebuggingPreferencesDataStore.getInstance(context));
 
         setPreferencesFromResource(R.xml.termux_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;
 
-        if (loggingCategory != null) {
-            final ListPreference logLevelListPreference = setLogLevelListPreferenceData(findPreference("log_level"), getContext());
+            setLogLevelListPreferenceData(logLevelListPreference, context, preferences.getLogLevel());
             loggingCategory.addPreference(logLevelListPreference);
         }
     }
 
-    protected ListPreference setLogLevelListPreferenceData(ListPreference logLevelListPreference, Context context) {
+    public static ListPreference setLogLevelListPreferenceData(ListPreference logLevelListPreference, Context context, int logLevel) {
         if (logLevelListPreference == null)
             logLevelListPreference = new ListPreference(context);
 
@@ -43,8 +56,8 @@ protected ListPreference setLogLevelListPreferenceData(ListPreference logLevelLi
         logLevelListPreference.setEntryValues(logLevels);
         logLevelListPreference.setEntries(logLevelLabels);
 
-        logLevelListPreference.setValue(String.valueOf(Logger.getLogLevel()));
-        logLevelListPreference.setDefaultValue(Logger.getLogLevel());
+        logLevelListPreference.setValue(String.valueOf(logLevel));
+        logLevelListPreference.setDefaultValue(Logger.DEFAULT_LOG_LEVEL);
 
         return logLevelListPreference;
     }
diff --git a/app/src/main/java/com/termux/app/fragments/settings/termux/TerminalIOPreferencesFragment.java b/app/src/main/java/com/termux/app/fragments/settings/termux/TerminalIOPreferencesFragment.java
index 109daf9569..46e7504940 100644
--- a/app/src/main/java/com/termux/app/fragments/settings/termux/TerminalIOPreferencesFragment.java
+++ b/app/src/main/java/com/termux/app/fragments/settings/termux/TerminalIOPreferencesFragment.java
@@ -16,8 +16,11 @@ 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(getContext()));
+        preferenceManager.setPreferenceDataStore(TerminalIOPreferencesDataStore.getInstance(context));
 
         setPreferencesFromResource(R.xml.termux_terminal_io_preferences, rootKey);
     }
diff --git a/app/src/main/java/com/termux/app/fragments/settings/termux_tasker/DebuggingPreferencesFragment.java b/app/src/main/java/com/termux/app/fragments/settings/termux_tasker/DebuggingPreferencesFragment.java
new file mode 100644
index 0000000000..a66708140f
--- /dev/null
+++ b/app/src/main/java/com/termux/app/fragments/settings/termux_tasker/DebuggingPreferencesFragment.java
@@ -0,0 +1,101 @@
+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;
+        }
+    }
+
+}
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c149c4cba3..fe0851c995 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -170,6 +170,11 @@
                 <string name="termux_soft_keyboard_enabled_only_if_no_hardware_on">Soft keyboard will be enabled only if no hardware keyboard is connected.</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>
+
+
     <!-- About Preference -->
     <string name="about_preference_title">About</string>
 
diff --git a/app/src/main/res/xml/root_preferences.xml b/app/src/main/res/xml/root_preferences.xml
index f8efef7b70..39c6093ed0 100644
--- a/app/src/main/res/xml/root_preferences.xml
+++ b/app/src/main/res/xml/root_preferences.xml
@@ -6,6 +6,13 @@
         app:summary="@string/termux_preferences_summary"
         app:fragment="com.termux.app.fragments.settings.TermuxPreferencesFragment"/>
 
+    <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="about"
         app:title="@string/about_preference_title"
diff --git a/app/src/main/res/xml/termux_tasker_debugging_preferences.xml b/app/src/main/res/xml/termux_tasker_debugging_preferences.xml
new file mode 100644
index 0000000000..8bfd8c7738
--- /dev/null
+++ b/app/src/main/res/xml/termux_tasker_debugging_preferences.xml
@@ -0,0 +1,15 @@
+<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>
diff --git a/app/src/main/res/xml/termux_tasker_preferences.xml b/app/src/main/res/xml/termux_tasker_preferences.xml
new file mode 100644
index 0000000000..9aa72485bc
--- /dev/null
+++ b/app/src/main/res/xml/termux_tasker_preferences.xml
@@ -0,0 +1,8 @@
+<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>

From 2f828255eeca61e1e92442c1a48b7c409830549d Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Fri, 14 May 2021 07:05:14 +0500
Subject: [PATCH 391/912] Generate potentially long running reports in
 background threads instead of main UI thread

---
 .../app/activities/SettingsActivity.java      | 23 +++++++------
 .../terminal/TermuxTerminalViewClient.java    | 32 ++++++++++++-------
 app/src/main/res/values/strings.xml           |  4 ++-
 3 files changed, 37 insertions(+), 22 deletions(-)

diff --git a/app/src/main/java/com/termux/app/activities/SettingsActivity.java b/app/src/main/java/com/termux/app/activities/SettingsActivity.java
index 5ef65a3d00..3e3c23dea4 100644
--- a/app/src/main/java/com/termux/app/activities/SettingsActivity.java
+++ b/app/src/main/java/com/termux/app/activities/SettingsActivity.java
@@ -69,19 +69,24 @@ private void configureAboutPreference(@NonNull Context context) {
             Preference aboutPreference = findPreference("about");
             if (aboutPreference != null) {
                 aboutPreference.setOnPreferenceClickListener(preference -> {
-                    String title = "About";
+                    new Thread() {
+                        @Override
+                        public void run() {
+                            String title = "About";
 
-                    StringBuilder aboutString = new StringBuilder();
-                    aboutString.append(TermuxUtils.getAppInfoMarkdownString(context, false));
+                            StringBuilder aboutString = new StringBuilder();
+                            aboutString.append(TermuxUtils.getAppInfoMarkdownString(context, false));
 
-                    String termuxPluginAppsInfo =  TermuxUtils.getTermuxPluginAppsInfoMarkdownString(context);
-                    if (termuxPluginAppsInfo != null)
-                        aboutString.append("\n\n").append(termuxPluginAppsInfo);
+                            String termuxPluginAppsInfo =  TermuxUtils.getTermuxPluginAppsInfoMarkdownString(context);
+                            if (termuxPluginAppsInfo != null)
+                                aboutString.append("\n\n").append(termuxPluginAppsInfo);
 
-                    aboutString.append("\n\n").append(TermuxUtils.getDeviceInfoMarkdownString(context));
-                    aboutString.append("\n\n").append(TermuxUtils.getImportantLinksMarkdownString(context));
+                            aboutString.append("\n\n").append(TermuxUtils.getDeviceInfoMarkdownString(context));
+                            aboutString.append("\n\n").append(TermuxUtils.getImportantLinksMarkdownString(context));
 
-                    ReportActivity.startReportActivity(context, new ReportInfo(UserAction.ABOUT, TermuxConstants.TERMUX_APP.TERMUX_SETTINGS_ACTIVITY_NAME, title, null, aboutString.toString(), null, false));
+                            ReportActivity.startReportActivity(context, new ReportInfo(UserAction.ABOUT, TermuxConstants.TERMUX_APP.TERMUX_SETTINGS_ACTIVITY_NAME, title, null, aboutString.toString(), null, false));
+                        }
+                    }.start();
 
                     return true;
                 });
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
index 8b2a3f9451..7700cc6252 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
@@ -494,26 +494,34 @@ public void reportIssueFromTranscript() {
         TerminalSession session = mActivity.getCurrentSession();
         if (session == null) return;
 
-        String transcriptText = ShellUtils.getTerminalSessionTranscriptText(session, false, true);
+        final String transcriptText = ShellUtils.getTerminalSessionTranscriptText(session, false, true);
         if (transcriptText == null) return;
 
-        transcriptText = DataUtils.getTruncatedCommandOutput(transcriptText, DataUtils.TRANSACTION_SIZE_LIMIT_IN_BYTES, false, true, false).trim();
+        Logger.showToast(mActivity, mActivity.getString(R.string.msg_generating_report), true);
+
+        new Thread() {
+            @Override
+            public void run() {
 
-        StringBuilder reportString = new StringBuilder();
+                String transcriptTextTruncated = DataUtils.getTruncatedCommandOutput(transcriptText, DataUtils.TRANSACTION_SIZE_LIMIT_IN_BYTES, false, true, false).trim();
 
-        String title = TermuxConstants.TERMUX_APP_NAME + " Report Issue";
+                StringBuilder reportString = new StringBuilder();
 
-        reportString.append("## Transcript\n");
-        reportString.append("\n").append(MarkdownUtils.getMarkdownCodeForString(transcriptText, true));
+                String title = TermuxConstants.TERMUX_APP_NAME + " Report Issue";
 
-        reportString.append("\n\n").append(TermuxUtils.getAppInfoMarkdownString(mActivity, true));
-        reportString.append("\n\n").append(TermuxUtils.getDeviceInfoMarkdownString(mActivity));
+                reportString.append("## Transcript\n");
+                reportString.append("\n").append(MarkdownUtils.getMarkdownCodeForString(transcriptTextTruncated, true));
 
-        String termuxAptInfo = TermuxUtils.geAPTInfoMarkdownString(mActivity);
-        if (termuxAptInfo != null)
-            reportString.append("\n\n").append(termuxAptInfo);
+                reportString.append("\n\n").append(TermuxUtils.getAppInfoMarkdownString(mActivity, true));
+                reportString.append("\n\n").append(TermuxUtils.getDeviceInfoMarkdownString(mActivity));
 
-        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));
+                String termuxAptInfo = TermuxUtils.geAPTInfoMarkdownString(mActivity);
+                if (termuxAptInfo != null)
+                    reportString.append("\n\n").append(termuxAptInfo);
+
+                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));
+            }
+        }.start();
     }
 
     public void doPaste() {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index fe0851c995..ca4cb76663 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -66,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>
@@ -75,7 +75,9 @@
     <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="error_styling_not_installed">The &TERMUX_STYLING_APP_NAME; Plugin App is not installed.</string>
     <string name="action_styling_install">Install</string>

From 27dc211e2d7735bb3857d524b3a59e85dd84033f Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Fri, 14 May 2021 08:05:08 +0500
Subject: [PATCH 392/912] Update .gitattributes

---
 .gitattributes | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index 21c2769ab9..253738449b 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,5 +1,5 @@
 *           text=auto
-*.bat       eol=crlf
-*.gradle    eol=lf
-*.mk        eol=lf
-*.sh        eol=lf
+*.bat       text eol=crlf
+*.gradle    text eol=lf
+*.mk        text eol=lf
+*.sh        text eol=lf

From 11f5c0afd105b0647c610e13e39a5f72d9917e4d Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Fri, 14 May 2021 08:41:15 +0500
Subject: [PATCH 393/912] Normalize gradlew.bat

---
 gradlew.bat | 178 ++++++++++++++++++++++++++--------------------------
 1 file changed, 89 insertions(+), 89 deletions(-)

diff --git a/gradlew.bat b/gradlew.bat
index ac1b06f938..107acd32c4 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -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

From 31298b88575e12ea73e484cfd760ea3f030dcbd5 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 15 May 2021 16:35:54 +0500
Subject: [PATCH 394/912] Allow users to enable terminal cursor blinking with
 termux.properties

This `terminal-cursor-blink-rate` key can be used to enable terminal cursor blinking. The user can set an int value between `100` and `2000` which will be used as blink rate in millisecond. The default value is `0`, which disables cursor blinking. So adding an entry like `terminal-cursor-blink-rate=600` to `~/termux.properties` file will make the cursor attempt to blink every 600ms. Running `termux-reload-settings` command will also update the cursor blinking rate instantaneously if changed.

A background thread is used to control the blinking by toggling the cursor visibility and then invalidating the view every x milliseconds set. This will have a performance impact, so use wisely and at your own risk.

If the cursor itself is disabled, which is controlled by whether DECSET_BIT_CURSOR_ENABLED (DECSET 25, DECTCEM), then blinking will be automatically disabled. You can enable the cursor with `tput cnorm` or `echo -e '\e[?25h'` and disable it with `tput civis` or `echo -e '\e[?25l'`.

Note that you can also change the cursor color by adding `cursor` property to `~/colors.properties` file, like `cursor=#FFFFFF` for a white cursor.

The `TermuxPropertyConstants` class has been updated to `v0.9.0`. Check its Changelog sections for info on changes.

Closes #153
---
 .../java/com/termux/app/TermuxActivity.java   |   9 ++
 .../terminal/TermuxTerminalSessionClient.java |  13 ++
 .../terminal/TermuxTerminalViewClient.java    |  12 ++
 .../com/termux/terminal/TerminalEmulator.java |  47 ++++++--
 .../terminal/TerminalSessionClient.java       |   2 +
 .../java/com/termux/terminal/DecSetTest.java  |  24 ++--
 .../com/termux/view/TerminalRenderer.java     |   2 +-
 .../java/com/termux/view/TerminalView.java    | 113 +++++++++++++++++-
 .../properties/TermuxPropertyConstants.java   |  15 ++-
 .../properties/TermuxSharedProperties.java    |  35 ++++++
 .../TermuxTerminalSessionClientBase.java      |   6 +
 11 files changed, 254 insertions(+), 24 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index 582d141588..766f941f45 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -257,6 +257,9 @@ public void onResume() {
         if (mIsInvalidState) return;
 
         mTermuxTerminalViewClient.setSoftKeyboardState(true, false);
+
+        // Start terminal cursor blinking if enabled
+        mTermuxTerminalViewClient.setTerminalCursorBlinkerState(true);
     }
 
     /**
@@ -330,6 +333,9 @@ protected void onStop() {
         // {@link #onStart} if needed.
         mTermuxTerminalSessionClient.setCurrentStoredSession();
 
+        // Stop terminal cursor blinking if enabled
+        mTermuxTerminalViewClient.setTerminalCursorBlinkerState(false);
+
         unregisterTermuxActivityBroadcastReceiever();
         getDrawer().closeDrawers();
     }
@@ -799,6 +805,9 @@ private void reloadTermuxActivityStyling() {
 
         mTermuxTerminalViewClient.setSoftKeyboardState(false, true);
 
+        mTermuxTerminalViewClient.setTerminalCursorBlinkerState(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.
         // We need to investigate if enabling this is wise, since all stored variables and
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java
index 98003d0d7d..7d11689048 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java
@@ -137,6 +137,19 @@ public void onColorsChanged(TerminalSession changedSession) {
             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);
+    }
+
 
 
     /** Try switching to session. */
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
index 7700cc6252..6c4be3855f 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
@@ -427,6 +427,18 @@ public void onFocusChange(View view, boolean hasFocus) {
 
 
 
+    public void setTerminalCursorBlinkerState(boolean start) {
+        if (start) {
+            // Set/Update the cursor blinking rate
+            mActivity.getTerminalView().setTerminalCursorBlinkerRate(mActivity.getProperties().getTerminalCursorBlinkRate());
+        }
+
+        // Set the new state of cursor blinker
+        mActivity.getTerminalView().setTerminalCursorBlinkerState(start, true);
+    }
+
+
+
     public void shareSessionTranscript() {
         TerminalSession session = mActivity.getCurrentSession();
         if (session == null) return;
diff --git a/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java b/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
index 8f449dab2d..f5fb10e855 100644
--- a/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
+++ b/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
@@ -108,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 visible, {@link #isShowingCursor()}. */
-    private static final int DECSET_BIT_SHOWING_CURSOR = 1 << 4;
+    /** DECSET 25 - if the cursor should be enabled, {@link #isCursorEnabled()}. */
+    private static final int DECSET_BIT_CURSOR_ENABLED = 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;
@@ -205,6 +205,18 @@ 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.
@@ -261,7 +273,7 @@ static int mapDecSetBitToInternalBit(int decsetBit) {
             case 7:
                 return DECSET_BIT_AUTOWRAP;
             case 25:
-                return DECSET_BIT_SHOWING_CURSOR;
+                return DECSET_BIT_CURSOR_ENABLED;
             case 66:
                 return DECSET_BIT_APPLICATION_KEYPAD;
             case 69:
@@ -381,10 +393,28 @@ public boolean isReverseVideo() {
         return isDecsetInternalBitSet(DECSET_BIT_REVERSE_VIDEO);
     }
 
-    public boolean isShowingCursor() {
-        return isDecsetInternalBitSet(DECSET_BIT_SHOWING_CURSOR);
+
+
+    public boolean isCursorEnabled() {
+        return isDecsetInternalBitSet(DECSET_BIT_CURSOR_ENABLED);
+    }
+    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);
     }
@@ -1054,7 +1084,10 @@ public void doDecSetOrReset(boolean setting, int externalBit) {
             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 isShowingCursor().
+            case 25: // Hide/show cursor - no action needed, renderer will check with shouldCursorBeVisible().
+                if (mClient != null)
+                    mClient.onTerminalCursorStateChange(setting);
+                break;
             case 40: // Allow 80 => 132 Mode, ignore.
             case 45: // TODO: Reverse wrap-around. Implement???
             case 66: // Application keypad (DECNKM).
@@ -2318,7 +2351,7 @@ public void reset() {
         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_SHOWING_CURSOR, true);
+        setDecsetinternalBit(DECSET_BIT_CURSOR_ENABLED, true);
         mSavedDecSetFlags = mSavedStateMain.mSavedDecFlags = mSavedStateAlt.mSavedDecFlags = mCurrentDecSetFlags;
 
         // XXX: Should we set terminal driver back to IUTF8 with termios?
diff --git a/terminal-emulator/src/main/java/com/termux/terminal/TerminalSessionClient.java b/terminal-emulator/src/main/java/com/termux/terminal/TerminalSessionClient.java
index c275ca82d3..9c99803023 100644
--- a/terminal-emulator/src/main/java/com/termux/terminal/TerminalSessionClient.java
+++ b/terminal-emulator/src/main/java/com/termux/terminal/TerminalSessionClient.java
@@ -19,6 +19,8 @@ public interface TerminalSessionClient {
 
     void onColorsChanged(TerminalSession session);
 
+    void onTerminalCursorStateChange(boolean state);
+
 
     void logError(String tag, String message);
 
diff --git a/terminal-emulator/src/test/java/com/termux/terminal/DecSetTest.java b/terminal-emulator/src/test/java/com/termux/terminal/DecSetTest.java
index 9d4b5e26bf..f31f1fb833 100644
--- a/terminal-emulator/src/test/java/com/termux/terminal/DecSetTest.java
+++ b/terminal-emulator/src/test/java/com/termux/terminal/DecSetTest.java
@@ -16,23 +16,23 @@
 public class DecSetTest extends TerminalTestCase {
 
 	/** DECSET 25, DECTCEM, controls visibility of the cursor. */
-	public void testShowHideCursor() {
+	public void testEnableDisableCursor() {
 		withTerminalSized(3, 3);
-		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());
+		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());
 
-		enterString("\033[?25l"); // Hide Cursor (DECTCEM), again.
-		assertFalse(mTerminal.isShowingCursor());
+		enterString("\033[?25l"); // Disable Cursor (DECTCEM), again.
+		assertFalse(mTerminal.isCursorEnabled());
 		mTerminal.reset();
-		assertTrue("Resetting the terminal should show the cursor", mTerminal.isShowingCursor());
+		assertTrue("Resetting the terminal should enable the cursor", mTerminal.isCursorEnabled());
 
 		enterString("\033[?25l");
-		assertFalse(mTerminal.isShowingCursor());
-		enterString("\033c"); // RIS resetting should reveal cursor.
-		assertTrue(mTerminal.isShowingCursor());
+		assertFalse(mTerminal.isCursorEnabled());
+		enterString("\033c"); // RIS resetting should enabled cursor.
+		assertTrue(mTerminal.isCursorEnabled());
 	}
 
 	/** DECSET 2004, controls bracketed paste mode. */
diff --git a/terminal-view/src/main/java/com/termux/view/TerminalRenderer.java b/terminal-view/src/main/java/com/termux/view/TerminalRenderer.java
index 5c9caf1c6d..6189dd6712 100644
--- a/terminal-view/src/main/java/com/termux/view/TerminalRenderer.java
+++ b/terminal-view/src/main/java/com/termux/view/TerminalRenderer.java
@@ -61,7 +61,7 @@ public final void render(TerminalEmulator mEmulator, Canvas canvas, int topRow,
         final int columns = mEmulator.mColumns;
         final int cursorCol = mEmulator.getCursorCol();
         final int cursorRow = mEmulator.getCursorRow();
-        final boolean cursorVisible = mEmulator.isShowingCursor();
+        final boolean cursorVisible = mEmulator.shouldCursorBeVisible();
         final TerminalBuffer screen = mEmulator.getScreen();
         final int[] palette = mEmulator.mColors.mCurrentColors;
         final int cursorShape = mEmulator.getCursorStyle();
diff --git a/terminal-view/src/main/java/com/termux/view/TerminalView.java b/terminal-view/src/main/java/com/termux/view/TerminalView.java
index 3a0f005261..0e5ef38e24 100644
--- a/terminal-view/src/main/java/com/termux/view/TerminalView.java
+++ b/terminal-view/src/main/java/com/termux/view/TerminalView.java
@@ -8,6 +8,8 @@
 import android.graphics.Canvas;
 import android.graphics.Typeface;
 import android.os.Build;
+import android.os.Handler;
+import android.os.Looper;
 import android.text.Editable;
 import android.text.InputType;
 import android.text.TextUtils;
@@ -52,6 +54,14 @@ public final class TerminalView extends View {
 
     private TextSelectionCursorController mTextSelectionCursorController;
 
+    private Handler mTerminalCursorBlinkerHandler;
+    private TerminalCursorBlinkerThread mTerminalCursorBlinkerThread;
+    private int mTerminalCursorBlinkerRate;
+    public static final int TERMINAL_CURSOR_BLINK_RATE_MIN = 100;
+    public static final int TERMINAL_CURSOR_BLINK_RATE_MAX = 2000;
+
+    private boolean mRendering;
+
     /** The top row of text to display. Ranges from -activeTranscriptRows to 0. */
     int mTopRow;
     int[] mDefaultSelectors = new int[]{-1,-1,-1,-1};
@@ -209,6 +219,8 @@ public void onLongPress(MotionEvent event) {
         mAccessibilityEnabled = am.isEnabled();
     }
 
+
+
     /**
      * @param client The {@link TerminalViewClient} interface implementation to allow
      *                           for communication between {@link TerminalView} and its client.
@@ -218,7 +230,7 @@ public void setTerminalViewClient(TerminalViewClient client) {
     }
 
     /**
-     * Sets terminal view key logging is enabled or not.
+     * Sets whether terminal view key logging is enabled or not.
      *
      * @param value The boolean value that defines the state.
      */
@@ -226,6 +238,8 @@ public void setIsTerminalViewKeyLoggingEnabled(boolean value) {
         TERMINAL_VIEW_KEY_LOGGING_ENABLED = value;
     }
 
+
+
     /**
      * Attach a {@link TerminalSession} to this view.
      *
@@ -755,7 +769,10 @@ protected void onDraw(Canvas canvas) {
             if (mTextSelectionCursorController != null) {
                 mTextSelectionCursorController.getSelectors(sel);
             }
+
+            mRendering = true;
             mRenderer.render(mEmulator, canvas, mTopRow, sel[0], sel[1], sel[2], sel[3]);
+            mRendering = false;
 
             // render the text selection handles
             renderTextSelection();
@@ -799,7 +816,6 @@ public void setTopRow(int mTopRow) {
 
 
 
-
     /**
      * Define functions required for AutoFill API
      */
@@ -825,6 +841,98 @@ public AutofillValue getAutofillValue() {
 
 
 
+    /**
+     * Set terminal cursor blinker rate. It must be between {@link #TERMINAL_CURSOR_BLINK_RATE_MIN}
+     * and {@link #TERMINAL_CURSOR_BLINK_RATE_MAX}.
+     *
+     * @param blinkRate The value to set.
+     */
+    public void setTerminalCursorBlinkerRate(int blinkRate) {
+        mTerminalCursorBlinkerRate = blinkRate;
+    }
+
+    /**
+     * Sets whether cursor blinking should be started or stopped. Cursor blinking will only be
+     * started if {@link #mTerminalCursorBlinkerRate} does not equal 0 and is between
+     * {@link #TERMINAL_CURSOR_BLINK_RATE_MIN} and {@link #TERMINAL_CURSOR_BLINK_RATE_MAX}.
+     *
+     * @param start If cursor blinking should be started or stopped.
+     * @param startOnlyIfCursorEnabled If set to {@code true}, then it will also be checked if the
+     *                                 cursor is even enabled by {@link TerminalEmulator} before
+     *                                 starting the cursor blinking thread.
+     */
+    public synchronized void setTerminalCursorBlinkerState(boolean start, boolean startOnlyIfCursorEnabled) {
+        // Stop any existing cursor blinker threads
+        stopTerminalCursorBlinkerThread();
+
+        if (mEmulator == null) return;
+
+        mEmulator.setCursorBlinkingEnabled(false);
+
+        if (start) {
+            // If cursor blinking is not enabled
+            if (mTerminalCursorBlinkerRate == 0) {
+                mClient.logVerbose(LOG_TAG, "Cursor blinking is not enabled");
+                return;
+            }
+            // If cursor blinking rate is not valid
+            else if (mTerminalCursorBlinkerRate < TERMINAL_CURSOR_BLINK_RATE_MIN || mTerminalCursorBlinkerRate > TERMINAL_CURSOR_BLINK_RATE_MAX) {
+                mClient.logError(LOG_TAG, "startCursorBlinkerThread: The cursor blink rate must be in between " + TERMINAL_CURSOR_BLINK_RATE_MIN + "-" + TERMINAL_CURSOR_BLINK_RATE_MAX + ": " + mTerminalCursorBlinkerRate);
+                return;
+            }
+            // If cursor is not enabled
+            else if (startOnlyIfCursorEnabled && ! mEmulator.isCursorEnabled()) {
+                mClient.logVerbose(LOG_TAG, "Ignoring call to start cursor blinking since cursor is not enabled");
+                return;
+            }
+
+            // Start cursor blinker thread
+            mClient.logVerbose(LOG_TAG, "Starting cursor blinker thread with the blink rate: " + mTerminalCursorBlinkerRate);
+            if (mTerminalCursorBlinkerHandler == null) mTerminalCursorBlinkerHandler = new Handler(Looper.getMainLooper());
+            mTerminalCursorBlinkerThread = new TerminalCursorBlinkerThread(mTerminalCursorBlinkerRate);
+            mEmulator.setCursorBlinkingEnabled(true);
+            mTerminalCursorBlinkerThread.run();
+        }
+    }
+
+    /**
+     * Stops the terminal cursor blinker thread
+     */
+    private void stopTerminalCursorBlinkerThread() {
+        if (mTerminalCursorBlinkerHandler != null && mTerminalCursorBlinkerThread != null) {
+            mClient.logVerbose(LOG_TAG, "Stopping cursor blinker thread");
+            mTerminalCursorBlinkerHandler.removeCallbacks(mTerminalCursorBlinkerThread);
+        }
+    }
+
+    private class TerminalCursorBlinkerThread implements Runnable {
+        int mBlinkRate;
+        boolean mCursorVisible;
+
+        public TerminalCursorBlinkerThread(int blinkRate) {
+            mBlinkRate = blinkRate;
+        }
+
+        public void run() {
+            try {
+                if (mEmulator != null) {
+                    mCursorVisible = !mCursorVisible;
+                    // Toggle the blink state and then invalidate() the view so
+                    // that onDraw() is called, which then calls TerminalRenderer.render()
+                    // which checks with TerminalEmulator.shouldCursorBeVisible() to decide whether
+                    // to draw the cursor or not
+                    mEmulator.setCursorBlinkState(mCursorVisible);
+                    if (!mRendering)
+                        invalidate();
+                }
+            } finally {
+                // Recall the Runnable after mBlinkRate milliseconds to toggle the blink state
+                mTerminalCursorBlinkerHandler.postDelayed(mTerminalCursorBlinkerThread, mBlinkRate);
+            }
+        }
+    }
+
+
 
     /**
      * Define functions required for text selection and its handles.
@@ -920,7 +1028,6 @@ protected void onDetachedFromWindow() {
 
 
 
-
     /**
      * Define functions required for long hold toolbar.
      */
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java b/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java
index bedc27f3c9..c84a0f38c0 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java
@@ -10,7 +10,7 @@
 import java.util.Set;
 
 /*
- * Version: v0.8.0
+ * Version: v0.9.0
  *
  * Changelog
  *
@@ -41,6 +41,10 @@
  *      - Change the `KEY_USE_BACK_KEY_AS_ESCAPE_KEY` and `KEY_VIRTUAL_VOLUME_KEYS_DISABLED` booleans
  *          to `KEY_BACK_KEY_BEHAVIOUR` and `KEY_VOLUME_KEYS_BEHAVIOUR` String internal values.
  *      - Renamed `SOFT_KEYBOARD_TOGGLE_BEHAVIOUR` to `KEY_SOFT_KEYBOARD_TOGGLE_BEHAVIOUR`.
+ *
+ * - 0.9.0 (2021-05-14)
+ *      - Add `*KEY_TERMINAL_CURSOR_BLINK_RATE*`.
+ *
  */
 
 /**
@@ -115,6 +119,14 @@ public final class TermuxPropertyConstants {
 
 
 
+    /** Defines the key for the terminal cursor blink rate */
+    public static final String KEY_TERMINAL_CURSOR_BLINK_RATE =  "terminal-cursor-blink-rate"; // Default: "terminal-cursor-blink-rate"
+    public static final int IVALUE_TERMINAL_CURSOR_BLINK_RATE_MIN = 100;
+    public static final int IVALUE_TERMINAL_CURSOR_BLINK_RATE_MAX = 2000;
+    public static final int DEFAULT_IVALUE_TERMINAL_CURSOR_BLINK_RATE = 0;
+
+
+
 
 
     /* float */
@@ -221,6 +233,7 @@ public final class TermuxPropertyConstants {
 
         /* int */
         KEY_BELL_BEHAVIOUR,
+        KEY_TERMINAL_CURSOR_BLINK_RATE,
 
         /* float */
         KEY_TERMINAL_TOOLBAR_HEIGHT_SCALE_FACTOR,
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxSharedProperties.java b/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxSharedProperties.java
index 4d294d108d..68acf87278 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxSharedProperties.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxSharedProperties.java
@@ -188,6 +188,8 @@ public static Object getInternalTermuxPropertyValueFromValue(Context context, St
             /* int */
             case TermuxPropertyConstants.KEY_BELL_BEHAVIOUR:
                 return (int) getBellBehaviourInternalPropertyValueFromValue(value);
+            case TermuxPropertyConstants.KEY_TERMINAL_CURSOR_BLINK_RATE:
+                return (int) getTerminalCursorBlinkRateInternalPropertyValueFromValue(value);
 
             /* float */
             case TermuxPropertyConstants.KEY_TERMINAL_TOOLBAR_HEIGHT_SCALE_FACTOR:
@@ -257,6 +259,35 @@ public static int getBellBehaviourInternalPropertyValueFromValue(String value) {
         return SharedProperties.getDefaultIfNull(TermuxPropertyConstants.MAP_BELL_BEHAVIOUR.get(SharedProperties.toLowerCase(value)), TermuxPropertyConstants.DEFAULT_IVALUE_BELL_BEHAVIOUR);
     }
 
+    /**
+     * Returns the int for the value if its not null and is between
+     * {@code TermuxPropertyConstants#IVALUE_TERMINAL_TOOLBAR_HEIGHT_SCALE_FACTOR_MIN} and
+     * {@code TermuxPropertyConstants#IVALUE_TERMINAL_TOOLBAR_HEIGHT_SCALE_FACTOR_MAX},
+     * otherwise returns {@code TermuxPropertyConstants#DEFAULT_IVALUE_TERMINAL_TOOLBAR_HEIGHT_SCALE_FACTOR}.
+     *
+     * @param value The {@link String} value to convert.
+     * @return Returns the internal value for value.
+     */
+    public static float getTerminalCursorBlinkRateInternalPropertyValueFromValue(String value) {
+        return rangeTerminalCursorBlinkRateValue(DataUtils.getIntFromString(value, TermuxPropertyConstants.DEFAULT_IVALUE_TERMINAL_CURSOR_BLINK_RATE));
+    }
+
+    /**
+     * Returns the value itself if it is between
+     * {@code TermuxPropertyConstants#IVALUE_TERMINAL_CURSOR_BLINK_RATE_MIN} and
+     * {@code TermuxPropertyConstants#IVALUE_TERMINAL_CURSOR_BLINK_RATE_MAX},
+     * otherwise returns {@code TermuxPropertyConstants#DEFAULT_IVALUE_TERMINAL_CURSOR_BLINK_RATE}.
+     *
+     * @param value The value to clamp.
+     * @return Returns the clamped value.
+     */
+    public static int rangeTerminalCursorBlinkRateValue(int value) {
+        return (int) DataUtils.rangedOrDefault(value,
+            TermuxPropertyConstants.DEFAULT_IVALUE_TERMINAL_CURSOR_BLINK_RATE,
+            TermuxPropertyConstants.IVALUE_TERMINAL_CURSOR_BLINK_RATE_MIN,
+            TermuxPropertyConstants.IVALUE_TERMINAL_CURSOR_BLINK_RATE_MAX);
+    }
+
     /**
      * Returns the int for the value if its not null and is between
      * {@code TermuxPropertyConstants#IVALUE_TERMINAL_TOOLBAR_HEIGHT_SCALE_FACTOR_MIN} and
@@ -418,6 +449,10 @@ public int getBellBehaviour() {
         return (int) getInternalPropertyValue(TermuxPropertyConstants.KEY_BELL_BEHAVIOUR, true);
     }
 
+    public int getTerminalCursorBlinkRate() {
+        return rangeTerminalCursorBlinkRateValue((int) getInternalPropertyValue(TermuxPropertyConstants.KEY_TERMINAL_CURSOR_BLINK_RATE, true));
+    }
+
     public float getTerminalToolbarHeightScaleFactor() {
         return rangeTerminalToolbarHeightScaleFactorValue((float) getInternalPropertyValue(TermuxPropertyConstants.KEY_TERMINAL_TOOLBAR_HEIGHT_SCALE_FACTOR, true));
     }
diff --git a/termux-shared/src/main/java/com/termux/shared/terminal/TermuxTerminalSessionClientBase.java b/termux-shared/src/main/java/com/termux/shared/terminal/TermuxTerminalSessionClientBase.java
index 1f77eaa188..6261972b8a 100644
--- a/termux-shared/src/main/java/com/termux/shared/terminal/TermuxTerminalSessionClientBase.java
+++ b/termux-shared/src/main/java/com/termux/shared/terminal/TermuxTerminalSessionClientBase.java
@@ -33,6 +33,12 @@ public void onBell(TerminalSession session) {
     public void onColorsChanged(TerminalSession changedSession) {
     }
 
+    @Override
+    public void onTerminalCursorStateChange(boolean state) {
+    }
+
+
+
     @Override
     public void logError(String tag, String message) {
         Logger.logError(tag, message);

From f8ccbb4953e835c78a5bdcb170121207b5622d6a Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sun, 16 May 2021 01:31:34 +0500
Subject: [PATCH 395/912] Log invalid values stored in termux.properties file
 during load time

All external and internal values were already logged and required log level to be set to "Verbose" in Termux Settings, but now invalid  values and the default value used instead will be logged at log level "Normal" as well.

The `TermuxPropertyConstants` class has been updated to `v0.10.0`. Check its Changelog sections for info on changes.
---
 .../terminal/io/extrakeys/ExtraKeysInfo.java  |   6 +
 .../com/termux/app/utils/PluginUtils.java     |   2 +-
 .../settings/properties/SharedProperties.java | 121 ++++++++++++++++--
 .../properties/TermuxPropertyConstants.java   |  26 +++-
 .../properties/TermuxSharedProperties.java    |  85 +++++-------
 5 files changed, 179 insertions(+), 61 deletions(-)

diff --git a/app/src/main/java/com/termux/app/terminal/io/extrakeys/ExtraKeysInfo.java b/app/src/main/java/com/termux/app/terminal/io/extrakeys/ExtraKeysInfo.java
index 26fec3d6a3..98cc6afc4e 100644
--- a/app/src/main/java/com/termux/app/terminal/io/extrakeys/ExtraKeysInfo.java
+++ b/app/src/main/java/com/termux/app/terminal/io/extrakeys/ExtraKeysInfo.java
@@ -1,5 +1,9 @@
 package com.termux.app.terminal.io.extrakeys;
 
+import com.termux.shared.logger.Logger;
+import com.termux.shared.settings.properties.TermuxPropertyConstants;
+import com.termux.shared.settings.properties.TermuxSharedProperties;
+
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -238,6 +242,8 @@ CharDisplayMap getSelectedCharMap() {
             case "none":
                 return new CharDisplayMap();
             default:
+                if (!TermuxPropertyConstants.DEFAULT_IVALUE_EXTRA_KEYS_STYLE.equals(style))
+                    Logger.logError(TermuxSharedProperties.LOG_TAG, "The style \"" + style + "\" for the key \"" + TermuxPropertyConstants.KEY_EXTRA_KEYS_STYLE + "\" is invalid. Using default style instead.");
                 return defaultCharDisplay;
         }
     }
diff --git a/app/src/main/java/com/termux/app/utils/PluginUtils.java b/app/src/main/java/com/termux/app/utils/PluginUtils.java
index d1b7dba9c4..b1d5c5db74 100644
--- a/app/src/main/java/com/termux/app/utils/PluginUtils.java
+++ b/app/src/main/java/com/termux/app/utils/PluginUtils.java
@@ -322,7 +322,7 @@ public static void setupPluginCommandErrorsNotificationChannel(final Context con
      */
     public static String checkIfRunCommandServiceAllowExternalAppsPolicyIsViolated(final Context context) {
         String errmsg = null;
-        if (!SharedProperties.isPropertyValueTrue(context, TermuxPropertyConstants.getTermuxPropertiesFile(), TermuxConstants.PROP_ALLOW_EXTERNAL_APPS)) {
+        if (!SharedProperties.isPropertyValueTrue(context, TermuxPropertyConstants.getTermuxPropertiesFile(), TermuxConstants.PROP_ALLOW_EXTERNAL_APPS, true)) {
             errmsg = context.getString(R.string.error_run_command_service_allow_external_apps_ungranted);
         }
 
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/properties/SharedProperties.java b/termux-shared/src/main/java/com/termux/shared/settings/properties/SharedProperties.java
index 9c808e93b2..30ec08a5be 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/properties/SharedProperties.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/properties/SharedProperties.java
@@ -3,6 +3,7 @@
 import android.content.Context;
 import android.widget.Toast;
 
+import com.google.common.collect.BiMap;
 import com.google.common.collect.ImmutableBiMap;
 import com.google.common.primitives.Primitives;
 import com.termux.shared.logger.Logger;
@@ -289,12 +290,14 @@ public static Object getInternalProperty(Context context, File propertiesFile, S
      * @param context The {@link Context} for the {@link #getPropertiesFromFile(Context,File)}call.
      * @param propertiesFile The {@link File} to read the {@link Properties} from.
      * @param key The key to read.
+     * @param logErrorOnInvalidValue If {@code true}, then an error will be logged if key value
+     *                               was found in {@link Properties} but was invalid.
      * @return Returns the {@code true} if the {@link Properties} key {@link String} value equals "true",
      * regardless of case. If the key does not exist in the file or does not equal "true", then
      * {@code false} will be returned.
      */
-    public static boolean isPropertyValueTrue(Context context, File propertiesFile, String key) {
-        return (boolean) getBooleanValueForStringValue((String) getProperty(context, propertiesFile, key, null), false);
+    public static boolean isPropertyValueTrue(Context context, File propertiesFile, String key, boolean logErrorOnInvalidValue) {
+        return (boolean) getBooleanValueForStringValue(key, (String) getProperty(context, propertiesFile, key, null), false, logErrorOnInvalidValue, LOG_TAG);
     }
 
     /**
@@ -304,12 +307,14 @@ public static boolean isPropertyValueTrue(Context context, File propertiesFile,
      * @param context The {@link Context} for the {@link #getPropertiesFromFile(Context,File)} call.
      * @param propertiesFile The {@link File} to read the {@link Properties} from.
      * @param key The key to read.
+     * @param logErrorOnInvalidValue If {@code true}, then an error will be logged if key value
+     *                               was found in {@link Properties} but was invalid.
      * @return Returns the {@code true} if the {@link Properties} key {@link String} value equals "false",
      * regardless of case. If the key does not exist in the file or does not equal "false", then
      * {@code true} will be returned.
      */
-    public static boolean isPropertyValueFalse(Context context, File propertiesFile, String key) {
-        return (boolean) getInvertedBooleanValueForStringValue((String) getProperty(context, propertiesFile, key, null), true);
+    public static boolean isPropertyValueFalse(Context context, File propertiesFile, String key, boolean logErrorOnInvalidValue) {
+        return (boolean) getInvertedBooleanValueForStringValue(key, (String) getProperty(context, propertiesFile, key, null), true, logErrorOnInvalidValue, LOG_TAG);
     }
 
 
@@ -413,16 +418,20 @@ public static Map<String, Object> getMapCopy(Map<String, Object> map) {
 
 
 
+
     /**
      * Get the boolean value for the {@link String} value.
      *
      * @param value The {@link String} value to convert.
      * @param def The default {@link boolean} value to return.
+     * @param logErrorOnInvalidValue If {@code true}, then an error will be logged if {@code value}
+     *                               was not {@code null} and was invalid.
+     * @param logTag If log tag to use for logging errors.
      * @return Returns {@code true} or {@code false} if value is the literal string "true" or "false" respectively,
      * regardless of case. Otherwise returns default value.
      */
-    public static boolean getBooleanValueForStringValue(String value, boolean def) {
-        return (boolean) getDefaultIfNull(MAP_GENERIC_BOOLEAN.get(toLowerCase(value)), def);
+    public static boolean getBooleanValueForStringValue(String key, String value, boolean def, boolean logErrorOnInvalidValue, String logTag) {
+        return (boolean) getDefaultIfNotInMap(key, MAP_GENERIC_BOOLEAN, toLowerCase(value), def, logErrorOnInvalidValue, logTag);
     }
 
     /**
@@ -430,11 +439,107 @@ public static boolean getBooleanValueForStringValue(String value, boolean def) {
      *
      * @param value The {@link String} value to convert.
      * @param def The default {@link boolean} value to return.
+     * @param logErrorOnInvalidValue If {@code true}, then an error will be logged if {@code value}
+     *                               was not {@code null} and was invalid.
+     * @param logTag If log tag to use for logging errors.
      * @return Returns {@code true} or {@code false} if value is the literal string "false" or "true" respectively,
      * regardless of case. Otherwise returns default value.
      */
-    public static boolean getInvertedBooleanValueForStringValue(String value, boolean def) {
-        return (boolean) getDefaultIfNull(MAP_GENERIC_INVERTED_BOOLEAN.get(toLowerCase(value)), def);
+    public static boolean getInvertedBooleanValueForStringValue(String key, String value, boolean def, boolean logErrorOnInvalidValue, String logTag) {
+        return (boolean) getDefaultIfNotInMap(key, MAP_GENERIC_INVERTED_BOOLEAN, toLowerCase(value), def, logErrorOnInvalidValue, logTag);
+    }
+
+    /**
+     * Get the value for the {@code inputValue} {@link Object} key from a {@link BiMap<>}, otherwise
+     * default value if key not found in {@code map}.
+     *
+     * @param key The shared properties {@link String} key value for which the value is being returned.
+     * @param map The {@link BiMap<>} value to get the value from.
+     * @param inputValue The {@link Object} key value of the map.
+     * @param defaultOutputValue The default {@link boolean} value to return if {@code inputValue} not found in map.
+     *            The default value must exist as a value in the {@link BiMap<>} passed.
+     * @param logErrorOnInvalidValue If {@code true}, then an error will be logged if {@code inputValue}
+     *                               was not {@code null} and was not found in the map.
+     * @param logTag If log tag to use for logging errors.
+     * @return Returns the value for the {@code inputValue} key from the map if it exists. Otherwise
+     * returns default value.
+     */
+    public static Object getDefaultIfNotInMap(String key, @Nonnull BiMap<?, ?> map, Object inputValue, Object defaultOutputValue, boolean logErrorOnInvalidValue, String logTag) {
+        Object outputValue = map.get(inputValue);
+        if (outputValue == null) {
+            Object defaultInputValue = map.inverse().get(defaultOutputValue);
+            if (defaultInputValue == null)
+                Logger.logError(LOG_TAG, "The default output value \"" + defaultOutputValue + "\" for the key \"" + key + "\" does not exist as a value in the BiMap passed to getDefaultIfNotInMap(): " + map.values());
+
+            if (logErrorOnInvalidValue && inputValue != null) {
+                if (key != null)
+                    Logger.logError(logTag, "The value \"" + inputValue + "\" for the key \"" + key + "\" is invalid. Using default value \"" + defaultInputValue + "\" instead.");
+                else
+                    Logger.logError(logTag, "The value \"" + inputValue + "\" is invalid. Using default value \"" + defaultInputValue + "\" instead.");
+            }
+
+            return defaultOutputValue;
+        } else {
+            return outputValue;
+        }
+    }
+
+    /**
+     * Get the {@code int} {@code value} as is if between {@code min} and {@code max} (inclusive), otherwise
+     * return default value.
+     *
+     * @param key The shared properties {@link String} key value for which the value is being returned.
+     * @param value The {@code int} value to check.
+     * @param def The default {@code int} value if {@code value} not in range.
+     * @param min The min allowed {@code int} value.
+     * @param max The max allowed {@code int} value.
+     * @param logErrorOnInvalidValue If {@code true}, then an error will be logged if {@code value}
+     *                               not in range.
+     * @param ignoreErrorIfValueZero If logging error should be ignored if value equals 0.
+     * @param logTag If log tag to use for logging errors.
+     * @return Returns the {@code value} as is if within range. Otherwise returns default value.
+     */
+    public static int getDefaultIfNotInRange(String key, int value, int def, int min, int max, boolean logErrorOnInvalidValue, boolean ignoreErrorIfValueZero, String logTag) {
+        if (value < min || value > max) {
+            if (logErrorOnInvalidValue && (!ignoreErrorIfValueZero || value != 0)) {
+                if (key != null)
+                    Logger.logError(logTag, "The value \"" + value + "\" for the key \"" + key + "\" is not within the range " + min +  "-" + max +  " (inclusive). Using default value \"" + def + "\" instead.");
+                else
+                    Logger.logError(logTag, "The value \"" + value + "\" is not within the range " + min +  "-" + max +  " (inclusive). Using default value \"" + def + "\" instead.");
+            }
+            return def;
+        } else {
+            return value;
+        }
+    }
+
+    /**
+     * Get the {@code float} {@code value} as is if between {@code min} and {@code max} (inclusive), otherwise
+     * return default value.
+     *
+     * @param key The shared properties {@link String} key value for which the value is being returned.
+     * @param value The {@code float} value to check.
+     * @param def The default {@code float} value if {@code value} not in range.
+     * @param min The min allowed {@code float} value.
+     * @param max The max allowed {@code float} value.
+     * @param logErrorOnInvalidValue If {@code true}, then an error will be logged if {@code value}
+     *                               not in range.
+     * @param ignoreErrorIfValueZero If logging error should be ignored if value equals 0.
+     * @param logTag If log tag to use for logging errors.
+     * @return Returns the {@code value} as is if within range. Otherwise returns default value.
+     */
+    public static float getDefaultIfNotInRange(String key, float value, float def, float min, float max, boolean logErrorOnInvalidValue, boolean ignoreErrorIfValueZero, String logTag) {
+        if (value < min || value > max) {
+            if (logErrorOnInvalidValue && (!ignoreErrorIfValueZero || value != 0)) {
+                if (key != null)
+                    Logger.logError(logTag, "The value \"" + value + "\" for the key \"" + key + "\" is not within the range " + min +  "-" + max +  " (inclusive). Using default value \"" + def + "\" instead.");
+                else
+                    Logger.logError(logTag, "The value \"" + value + "\" is not within the range " + min +  "-" + max +  " (inclusive). Using default value \"" + def + "\" instead.");
+            }
+            return def;
+        } else {
+            return value;
+        }
     }
 
     /**
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java b/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java
index c84a0f38c0..593705c7d8 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java
@@ -10,7 +10,7 @@
 import java.util.Set;
 
 /*
- * Version: v0.9.0
+ * Version: v0.10.0
  *
  * Changelog
  *
@@ -45,6 +45,9 @@
  * - 0.9.0 (2021-05-14)
  *      - Add `*KEY_TERMINAL_CURSOR_BLINK_RATE*`.
  *
+ * - 0.10.0 (2021-05-15)
+ *      - Add `MAP_BACK_KEY_BEHAVIOUR`, `MAP_SOFT_KEYBOARD_TOGGLE_BEHAVIOUR`, `MAP_VOLUME_KEYS_BEHAVIOUR`.
+ *
  */
 
 /**
@@ -179,6 +182,13 @@ public final class TermuxPropertyConstants {
     public static final String IVALUE_BACK_KEY_BEHAVIOUR_ESCAPE = "escape";
     public static final String DEFAULT_IVALUE_BACK_KEY_BEHAVIOUR = IVALUE_BACK_KEY_BEHAVIOUR_BACK;
 
+    /** Defines the bidirectional map for back key behaviour values and their internal values */
+    public static final ImmutableBiMap<String, String> MAP_BACK_KEY_BEHAVIOUR =
+        new ImmutableBiMap.Builder<String, String>()
+            .put(IVALUE_BACK_KEY_BEHAVIOUR_BACK, IVALUE_BACK_KEY_BEHAVIOUR_BACK)
+            .put(IVALUE_BACK_KEY_BEHAVIOUR_ESCAPE, IVALUE_BACK_KEY_BEHAVIOUR_ESCAPE)
+            .build();
+
 
 
     /** Defines the key for the default working directory */
@@ -205,6 +215,13 @@ public final class TermuxPropertyConstants {
     public static final String IVALUE_SOFT_KEYBOARD_TOGGLE_BEHAVIOUR_ENABLE_DISABLE = "enable/disable";
     public static final String DEFAULT_IVALUE_SOFT_KEYBOARD_TOGGLE_BEHAVIOUR = IVALUE_SOFT_KEYBOARD_TOGGLE_BEHAVIOUR_SHOW_HIDE;
 
+    /** Defines the bidirectional map for toggle soft keyboard behaviour values and their internal values */
+    public static final ImmutableBiMap<String, String> MAP_SOFT_KEYBOARD_TOGGLE_BEHAVIOUR =
+        new ImmutableBiMap.Builder<String, String>()
+            .put(IVALUE_SOFT_KEYBOARD_TOGGLE_BEHAVIOUR_SHOW_HIDE, IVALUE_SOFT_KEYBOARD_TOGGLE_BEHAVIOUR_SHOW_HIDE)
+            .put(IVALUE_SOFT_KEYBOARD_TOGGLE_BEHAVIOUR_ENABLE_DISABLE, IVALUE_SOFT_KEYBOARD_TOGGLE_BEHAVIOUR_ENABLE_DISABLE)
+            .build();
+
 
 
     /** Defines the key for whether volume keys will behave as virtual or literal volume keys */
@@ -214,6 +231,13 @@ public final class TermuxPropertyConstants {
     public static final String IVALUE_VOLUME_KEY_BEHAVIOUR_VOLUME = "volume";
     public static final String DEFAULT_IVALUE_VOLUME_KEYS_BEHAVIOUR = IVALUE_VOLUME_KEY_BEHAVIOUR_VIRTUAL;
 
+    /** Defines the bidirectional map for volume keys behaviour values and their internal values */
+    public static final ImmutableBiMap<String, String> MAP_VOLUME_KEYS_BEHAVIOUR =
+        new ImmutableBiMap.Builder<String, String>()
+            .put(IVALUE_VOLUME_KEY_BEHAVIOUR_VIRTUAL, IVALUE_VOLUME_KEY_BEHAVIOUR_VIRTUAL)
+            .put(IVALUE_VOLUME_KEY_BEHAVIOUR_VOLUME, IVALUE_VOLUME_KEY_BEHAVIOUR_VOLUME)
+            .build();
+
 
 
 
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxSharedProperties.java b/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxSharedProperties.java
index 68acf87278..2532a74eb0 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxSharedProperties.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxSharedProperties.java
@@ -19,7 +19,7 @@ public class TermuxSharedProperties implements SharedPropertiesParser {
     protected final SharedProperties mSharedProperties;
     protected final File mPropertiesFile;
 
-    private static final String LOG_TAG = "TermuxSharedProperties";
+    public static final String LOG_TAG = "TermuxSharedProperties";
 
     public TermuxSharedProperties(@Nonnull Context context) {
         mContext = context;
@@ -76,12 +76,14 @@ public String getPropertyValue(String key, String def, boolean cached) {
      * @param cached If {@code true}, then the value is checked from the the {@link Properties} in-memory cache.
      *               Otherwise the {@link Properties} object is read directly from the file
      *               and value is checked from it.
+     * @param logErrorOnInvalidValue If {@code true}, then an error will be logged if key value
+     *                               was found in {@link Properties} but was invalid.
      * @return Returns the {@code true} if the {@link Properties} key {@link String} value equals "true",
      * regardless of case. If the key does not exist in the file or does not equal "true", then
      * {@code false} will be returned.
      */
-    public boolean isPropertyValueTrue(String key, boolean cached) {
-        return (boolean) SharedProperties.getBooleanValueForStringValue((String) getPropertyValue(key, null, cached), false);
+    public boolean isPropertyValueTrue(String key, boolean cached, boolean logErrorOnInvalidValue) {
+        return (boolean) SharedProperties.getBooleanValueForStringValue(key, (String) getPropertyValue(key, null, cached), false, logErrorOnInvalidValue, LOG_TAG);
     }
 
     /**
@@ -92,12 +94,14 @@ public boolean isPropertyValueTrue(String key, boolean cached) {
      * @param cached If {@code true}, then the value is checked from the the {@link Properties} in-memory cache.
      *               Otherwise the {@link Properties} object is read directly from the file
      *               and value is checked from it.
+     * @param logErrorOnInvalidValue If {@code true}, then an error will be logged if key value
+     *                               was found in {@link Properties} but was invalid.
      * @return Returns {@code true} if the {@link Properties} key {@link String} value equals "false",
      * regardless of case. If the key does not exist in the file or does not equal "false", then
      * {@code true} will be returned.
      */
-    public boolean isPropertyValueFalse(String key, boolean cached) {
-        return (boolean) SharedProperties.getInvertedBooleanValueForStringValue((String) getPropertyValue(key, null, cached), true);
+    public boolean isPropertyValueFalse(String key, boolean cached, boolean logErrorOnInvalidValue) {
+        return (boolean) SharedProperties.getInvertedBooleanValueForStringValue(key, (String) getPropertyValue(key, null, cached), true, logErrorOnInvalidValue, LOG_TAG);
     }
 
 
@@ -143,7 +147,7 @@ public Object getInternalPropertyValue(String key, boolean cached) {
                 // A null value can still be returned by
                 // {@link #getInternalPropertyValueFromValue(Context,String,String)} for some keys
                 value = getInternalPropertyValueFromValue(mContext, key, null);
-                Logger.logWarn(LOG_TAG, "The value for \"" + key + "\" not found in SharedProperties cahce, force returning default value: `" + value +  "`");
+                Logger.logWarn(LOG_TAG, "The value for \"" + key + "\" not found in SharedProperties cache, force returning default value: `" + value +  "`");
                 return value;
             }
         } else {
@@ -219,10 +223,10 @@ public static Object getInternalTermuxPropertyValueFromValue(Context context, St
             default:
                 // default boolean behaviour
                 if (TermuxPropertyConstants.TERMUX_DEFAULT_BOOLEAN_BEHAVIOUR_PROPERTIES_LIST.contains(key))
-                    return (boolean) SharedProperties.getBooleanValueForStringValue(value, false);
+                    return (boolean) SharedProperties.getBooleanValueForStringValue(key, value, false, true, LOG_TAG);
                 // default inverted boolean behaviour
                 else if (TermuxPropertyConstants.TERMUX_DEFAULT_INVERETED_BOOLEAN_BEHAVIOUR_PROPERTIES_LIST.contains(key))
-                    return (boolean) SharedProperties.getInvertedBooleanValueForStringValue(value, true);
+                    return (boolean) SharedProperties.getInvertedBooleanValueForStringValue(key, value, true, true, LOG_TAG);
                 // just use String object as is (may be null)
                 else
                     return value;
@@ -233,8 +237,6 @@ else if (TermuxPropertyConstants.TERMUX_DEFAULT_INVERETED_BOOLEAN_BEHAVIOUR_PROP
 
 
 
-
-
     /**
      * Returns {@code true} or {@code false} if value is the literal string "true" or "false" respectively regardless of case.
      * Otherwise returns {@code true} if the night mode is currently enabled in the system.
@@ -244,7 +246,7 @@ else if (TermuxPropertyConstants.TERMUX_DEFAULT_INVERETED_BOOLEAN_BEHAVIOUR_PROP
      */
     public static boolean getUseBlackUIInternalPropertyValueFromValue(Context context, String value) {
         int nightMode = context.getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
-        return SharedProperties.getBooleanValueForStringValue(value, nightMode == Configuration.UI_MODE_NIGHT_YES);
+        return SharedProperties.getBooleanValueForStringValue(TermuxPropertyConstants.KEY_USE_BLACK_UI, value, nightMode == Configuration.UI_MODE_NIGHT_YES, true, LOG_TAG);
     }
 
     /**
@@ -256,7 +258,7 @@ public static boolean getUseBlackUIInternalPropertyValueFromValue(Context contex
      * @return Returns the internal value for value.
      */
     public static int getBellBehaviourInternalPropertyValueFromValue(String value) {
-        return SharedProperties.getDefaultIfNull(TermuxPropertyConstants.MAP_BELL_BEHAVIOUR.get(SharedProperties.toLowerCase(value)), TermuxPropertyConstants.DEFAULT_IVALUE_BELL_BEHAVIOUR);
+        return (int) SharedProperties.getDefaultIfNotInMap(TermuxPropertyConstants.KEY_BELL_BEHAVIOUR, TermuxPropertyConstants.MAP_BELL_BEHAVIOUR, SharedProperties.toLowerCase(value), TermuxPropertyConstants.DEFAULT_IVALUE_BELL_BEHAVIOUR, true, LOG_TAG);
     }
 
     /**
@@ -269,23 +271,12 @@ public static int getBellBehaviourInternalPropertyValueFromValue(String value) {
      * @return Returns the internal value for value.
      */
     public static float getTerminalCursorBlinkRateInternalPropertyValueFromValue(String value) {
-        return rangeTerminalCursorBlinkRateValue(DataUtils.getIntFromString(value, TermuxPropertyConstants.DEFAULT_IVALUE_TERMINAL_CURSOR_BLINK_RATE));
-    }
-
-    /**
-     * Returns the value itself if it is between
-     * {@code TermuxPropertyConstants#IVALUE_TERMINAL_CURSOR_BLINK_RATE_MIN} and
-     * {@code TermuxPropertyConstants#IVALUE_TERMINAL_CURSOR_BLINK_RATE_MAX},
-     * otherwise returns {@code TermuxPropertyConstants#DEFAULT_IVALUE_TERMINAL_CURSOR_BLINK_RATE}.
-     *
-     * @param value The value to clamp.
-     * @return Returns the clamped value.
-     */
-    public static int rangeTerminalCursorBlinkRateValue(int value) {
-        return (int) DataUtils.rangedOrDefault(value,
-            TermuxPropertyConstants.DEFAULT_IVALUE_TERMINAL_CURSOR_BLINK_RATE,
-            TermuxPropertyConstants.IVALUE_TERMINAL_CURSOR_BLINK_RATE_MIN,
-            TermuxPropertyConstants.IVALUE_TERMINAL_CURSOR_BLINK_RATE_MAX);
+        return SharedProperties.getDefaultIfNotInRange(TermuxPropertyConstants.KEY_TERMINAL_CURSOR_BLINK_RATE,
+                    DataUtils.getIntFromString(value, TermuxPropertyConstants.DEFAULT_IVALUE_TERMINAL_CURSOR_BLINK_RATE),
+                    TermuxPropertyConstants.DEFAULT_IVALUE_TERMINAL_CURSOR_BLINK_RATE,
+                    TermuxPropertyConstants.IVALUE_TERMINAL_CURSOR_BLINK_RATE_MIN,
+                    TermuxPropertyConstants.IVALUE_TERMINAL_CURSOR_BLINK_RATE_MAX,
+                    true, true, LOG_TAG);
     }
 
     /**
@@ -298,23 +289,12 @@ public static int rangeTerminalCursorBlinkRateValue(int value) {
      * @return Returns the internal value for value.
      */
     public static float getTerminalToolbarHeightScaleFactorInternalPropertyValueFromValue(String value) {
-        return rangeTerminalToolbarHeightScaleFactorValue(DataUtils.getFloatFromString(value, TermuxPropertyConstants.DEFAULT_IVALUE_TERMINAL_TOOLBAR_HEIGHT_SCALE_FACTOR));
-    }
-
-    /**
-     * Returns the value itself if it is between
-     * {@code TermuxPropertyConstants#IVALUE_TERMINAL_TOOLBAR_HEIGHT_SCALE_FACTOR_MIN} and
-     * {@code TermuxPropertyConstants#IVALUE_TERMINAL_TOOLBAR_HEIGHT_SCALE_FACTOR_MAX},
-     * otherwise returns {@code TermuxPropertyConstants#DEFAULT_IVALUE_TERMINAL_TOOLBAR_HEIGHT_SCALE_FACTOR}.
-     *
-     * @param value The value to clamp.
-     * @return Returns the clamped value.
-     */
-    public static float rangeTerminalToolbarHeightScaleFactorValue(float value) {
-        return DataUtils.rangedOrDefault(value,
+        return SharedProperties.getDefaultIfNotInRange(TermuxPropertyConstants.KEY_TERMINAL_TOOLBAR_HEIGHT_SCALE_FACTOR,
+            DataUtils.getFloatFromString(value, TermuxPropertyConstants.DEFAULT_IVALUE_TERMINAL_TOOLBAR_HEIGHT_SCALE_FACTOR),
             TermuxPropertyConstants.DEFAULT_IVALUE_TERMINAL_TOOLBAR_HEIGHT_SCALE_FACTOR,
             TermuxPropertyConstants.IVALUE_TERMINAL_TOOLBAR_HEIGHT_SCALE_FACTOR_MIN,
-            TermuxPropertyConstants.IVALUE_TERMINAL_TOOLBAR_HEIGHT_SCALE_FACTOR_MAX);
+            TermuxPropertyConstants.IVALUE_TERMINAL_TOOLBAR_HEIGHT_SCALE_FACTOR_MAX,
+            true, true, LOG_TAG);
     }
 
     /**
@@ -356,7 +336,7 @@ public static Integer getCodePointForSessionShortcuts(String key, String value)
      * @return Returns the internal value for value.
      */
     public static String getBackKeyBehaviourInternalPropertyValueFromValue(String value) {
-        return SharedProperties.getDefaultIfNull(value, TermuxPropertyConstants.DEFAULT_IVALUE_BACK_KEY_BEHAVIOUR);
+        return (String) SharedProperties.getDefaultIfNotInMap(TermuxPropertyConstants.KEY_BACK_KEY_BEHAVIOUR, TermuxPropertyConstants.MAP_BACK_KEY_BEHAVIOUR, SharedProperties.toLowerCase(value), TermuxPropertyConstants.DEFAULT_IVALUE_BACK_KEY_BEHAVIOUR, true, LOG_TAG);
     }
 
     /**
@@ -370,8 +350,9 @@ public static String getDefaultWorkingDirectoryInternalPropertyValueFromValue(St
         if (path == null || path.isEmpty()) return TermuxPropertyConstants.DEFAULT_IVALUE_DEFAULT_WORKING_DIRECTORY;
         File workDir = new File(path);
         if (!workDir.exists() || !workDir.isDirectory() || !workDir.canRead()) {
-            // Fallback to default directory if user configured working directory does not exist
-            // or is not a directory or is not readable.
+            // Fallback to default directory if user configured working directory does not exist,
+            // is not a directory or is not readable.
+            Logger.logError(LOG_TAG, "The path \"" + path + "\" for the key \"" + TermuxPropertyConstants.KEY_DEFAULT_WORKING_DIRECTORY + "\" does not exist, is not a directory or is not readable. Using default value \"" + TermuxPropertyConstants.DEFAULT_IVALUE_DEFAULT_WORKING_DIRECTORY + "\" instead.");
             return TermuxPropertyConstants.DEFAULT_IVALUE_DEFAULT_WORKING_DIRECTORY;
         } else {
             return path;
@@ -405,7 +386,7 @@ public static String getExtraKeysStyleInternalPropertyValueFromValue(String valu
      * @return Returns the internal value for value.
      */
     public static String getSoftKeyboardToggleBehaviourInternalPropertyValueFromValue(String value) {
-        return SharedProperties.getDefaultIfNull(value, TermuxPropertyConstants.DEFAULT_IVALUE_SOFT_KEYBOARD_TOGGLE_BEHAVIOUR);
+        return (String) SharedProperties.getDefaultIfNotInMap(TermuxPropertyConstants.KEY_SOFT_KEYBOARD_TOGGLE_BEHAVIOUR, TermuxPropertyConstants.MAP_SOFT_KEYBOARD_TOGGLE_BEHAVIOUR, SharedProperties.toLowerCase(value), TermuxPropertyConstants.DEFAULT_IVALUE_SOFT_KEYBOARD_TOGGLE_BEHAVIOUR, true, LOG_TAG);
     }
 
     /**
@@ -415,12 +396,13 @@ public static String getSoftKeyboardToggleBehaviourInternalPropertyValueFromValu
      * @return Returns the internal value for value.
      */
     public static String getVolumeKeysBehaviourInternalPropertyValueFromValue(String value) {
-        return SharedProperties.getDefaultIfNull(value, TermuxPropertyConstants.DEFAULT_IVALUE_VOLUME_KEYS_BEHAVIOUR);
+        return (String) SharedProperties.getDefaultIfNotInMap(TermuxPropertyConstants.KEY_VOLUME_KEYS_BEHAVIOUR, TermuxPropertyConstants.MAP_VOLUME_KEYS_BEHAVIOUR, SharedProperties.toLowerCase(value), TermuxPropertyConstants.DEFAULT_IVALUE_VOLUME_KEYS_BEHAVIOUR, true, LOG_TAG);
     }
 
 
 
 
+
     public boolean isEnforcingCharBasedInput() {
         return (boolean) getInternalPropertyValue(TermuxPropertyConstants.KEY_ENFORCE_CHAR_BASED_INPUT, true);
     }
@@ -450,11 +432,11 @@ public int getBellBehaviour() {
     }
 
     public int getTerminalCursorBlinkRate() {
-        return rangeTerminalCursorBlinkRateValue((int) getInternalPropertyValue(TermuxPropertyConstants.KEY_TERMINAL_CURSOR_BLINK_RATE, true));
+        return (int) getInternalPropertyValue(TermuxPropertyConstants.KEY_TERMINAL_CURSOR_BLINK_RATE, true);
     }
 
     public float getTerminalToolbarHeightScaleFactor() {
-        return rangeTerminalToolbarHeightScaleFactorValue((float) getInternalPropertyValue(TermuxPropertyConstants.KEY_TERMINAL_TOOLBAR_HEIGHT_SCALE_FACTOR, true));
+        return (float) getInternalPropertyValue(TermuxPropertyConstants.KEY_TERMINAL_TOOLBAR_HEIGHT_SCALE_FACTOR, true);
     }
 
     public boolean isBackKeyTheEscapeKey() {
@@ -476,6 +458,7 @@ public boolean areVirtualVolumeKeysDisabled() {
 
 
 
+
     public void dumpPropertiesToLog() {
         Properties properties = getProperties(true);
         StringBuilder propertiesDump = new StringBuilder();

From 6524a619f6c759cd1d0d40762edb80c4ec34e40c Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Sun, 16 May 2021 19:40:25 +0300
Subject: [PATCH 396/912] update bootstrap archives

---
 app/build.gradle | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 30124a4aef..20d82f40e3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -155,11 +155,11 @@ clean {
 
 task downloadBootstraps() {
     doLast {
-        def version = "2021.04.13-r1"
-        downloadBootstrap("aarch64", "ff82e5755d947cd1f3e0b30916d125c6ddd8ba3254801ca7499d73653417e158", version)
-        downloadBootstrap("arm",     "53a7df2d6d0a36a8c9ab5259c8b5457c93b8bae8aec2321a470236b6da54e59a", version)
-        downloadBootstrap("i686",    "f0e1399a13ebed6c5229fde161f9848d9f5eeae7b8cd82f31250a813b52e371", version)
-        downloadBootstrap("x86_64",  "e36c4d8c933dc12b3f48937b7747c7a4dcfaa70f0dd89ad5e8b4465930075ae9", version)
+        def version = "2021.05.16-r1"
+        downloadBootstrap("aarch64", "6e340d8ab11d1225b89ee920e0884cbbd944d37765d81c5b06ef34579564fd9a", version)
+        downloadBootstrap("arm",     "3f02bc2b5bd45c2ec5170527e39ee0413246698f11be4799c7bde6d364cfd780", version)
+        downloadBootstrap("i686",    "36a3733fb2d8531d7f8abd989b711919872b9e8a79d7eb2e8b00bef467199187", version)
+        downloadBootstrap("x86_64",  "3885376cc514220c0803e38f70b25f837854029fff2b7fda7a81452623cd9074", version)
     }
 }
 

From 89a1e027130811fa8692a9fe0fc8f1e054f8e7e1 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sun, 16 May 2021 19:08:11 +0500
Subject: [PATCH 397/912] Updates to terminal cursor blinking

Fixed bug where cursor would become invisible when long holding (arrow) keys when editing commands (outside of text editors like nano).

Updated javadocs with info on how cursor blinking works

"Performance Improvements" and removed redundant mRendering check
---
 .../terminal/TermuxTerminalViewClient.java    |  15 +-
 .../java/com/termux/view/TerminalView.java    | 135 ++++++++++++------
 .../properties/TermuxPropertyConstants.java   |   5 +-
 3 files changed, 105 insertions(+), 50 deletions(-)

diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
index 6c4be3855f..246181199c 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
@@ -429,12 +429,15 @@ public void onFocusChange(View view, boolean hasFocus) {
 
     public void setTerminalCursorBlinkerState(boolean start) {
         if (start) {
-            // Set/Update the cursor blinking rate
-            mActivity.getTerminalView().setTerminalCursorBlinkerRate(mActivity.getProperties().getTerminalCursorBlinkRate());
+            // 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);
         }
-
-        // Set the new state of cursor blinker
-        mActivity.getTerminalView().setTerminalCursorBlinkerState(start, true);
     }
 
 
@@ -455,7 +458,7 @@ public void shareSessionTranscript() {
             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("Failed to get share session transcript of length " + transcriptText.length(), e);
+            Logger.logStackTraceWithMessage(LOG_TAG,"Failed to get share session transcript of length " + transcriptText.length(), e);
         }
     }
 
diff --git a/terminal-view/src/main/java/com/termux/view/TerminalView.java b/terminal-view/src/main/java/com/termux/view/TerminalView.java
index 0e5ef38e24..5f72bbeea1 100644
--- a/terminal-view/src/main/java/com/termux/view/TerminalView.java
+++ b/terminal-view/src/main/java/com/termux/view/TerminalView.java
@@ -55,13 +55,12 @@ public final class TerminalView extends View {
     private TextSelectionCursorController mTextSelectionCursorController;
 
     private Handler mTerminalCursorBlinkerHandler;
-    private TerminalCursorBlinkerThread mTerminalCursorBlinkerThread;
+    private TerminalCursorBlinkerRunnable mTerminalCursorBlinkerRunnable;
     private int mTerminalCursorBlinkerRate;
+    private boolean mCursorInvisibleIgnoreOnce;
     public static final int TERMINAL_CURSOR_BLINK_RATE_MIN = 100;
     public static final int TERMINAL_CURSOR_BLINK_RATE_MAX = 2000;
 
-    private boolean mRendering;
-
     /** The top row of text to display. Ranges from -activeTranscriptRows to 0. */
     int mTopRow;
     int[] mDefaultSelectors = new int[]{-1,-1,-1,-1};
@@ -699,6 +698,10 @@ public void inputCodePoint(int codePoint, boolean controlDownFromEvent, boolean
 
     /** Input the specified keyCode if applicable and return if the input was consumed. */
     public boolean handleKeyCode(int keyCode, int keyMod) {
+        // Ensure cursor is shown when a key is pressed down like long hold on (arrow) keys
+        if (mEmulator != null)
+            mEmulator.setCursorBlinkState(true);
+
         TerminalEmulator term = mTermSession.getEmulator();
         String code = KeyHandler.getCode(keyCode, keyMod, term.isCursorKeysApplicationMode(), term.isKeypadApplicationMode());
         if (code == null) return false;
@@ -770,9 +773,7 @@ protected void onDraw(Canvas canvas) {
                 mTextSelectionCursorController.getSelectors(sel);
             }
 
-            mRendering = true;
             mRenderer.render(mEmulator, canvas, mTopRow, sel[0], sel[1], sel[2], sel[3]);
-            mRendering = false;
 
             // render the text selection handles
             renderTextSelection();
@@ -843,91 +844,141 @@ public AutofillValue getAutofillValue() {
 
     /**
      * Set terminal cursor blinker rate. It must be between {@link #TERMINAL_CURSOR_BLINK_RATE_MIN}
-     * and {@link #TERMINAL_CURSOR_BLINK_RATE_MAX}.
+     * and {@link #TERMINAL_CURSOR_BLINK_RATE_MAX}, otherwise it will be disabled.
+     *
+     * The {@link #setTerminalCursorBlinkerState(boolean, boolean)} must be called after this
+     * for changes to take effect if not disabling.
      *
      * @param blinkRate The value to set.
+     * @return Returns {@code true} if setting blinker rate was successfully set, otherwise [@code false}.
      */
-    public void setTerminalCursorBlinkerRate(int blinkRate) {
-        mTerminalCursorBlinkerRate = blinkRate;
+    public synchronized boolean setTerminalCursorBlinkerRate(int blinkRate) {
+        boolean result;
+
+        // If cursor blinking rate is not valid
+        if (blinkRate != 0 && (blinkRate < TERMINAL_CURSOR_BLINK_RATE_MIN || blinkRate > TERMINAL_CURSOR_BLINK_RATE_MAX)) {
+            mClient.logError(LOG_TAG, "The cursor blink rate must be in between " + TERMINAL_CURSOR_BLINK_RATE_MIN + "-" + TERMINAL_CURSOR_BLINK_RATE_MAX + ": " + blinkRate);
+            mTerminalCursorBlinkerRate = 0;
+            result = false;
+        } else {
+            mClient.logVerbose(LOG_TAG, "Setting cursor blinker rate to " + blinkRate);
+            mTerminalCursorBlinkerRate = blinkRate;
+            result = true;
+        }
+
+        if (mTerminalCursorBlinkerRate == 0) {
+            mClient.logVerbose(LOG_TAG, "Cursor blinker disabled");
+            stopTerminalCursorBlinker();
+        }
+
+        return result;
     }
 
     /**
-     * Sets whether cursor blinking should be started or stopped. Cursor blinking will only be
+     * Sets whether cursor blinker should be started or stopped. Cursor blinker will only be
      * started if {@link #mTerminalCursorBlinkerRate} does not equal 0 and is between
      * {@link #TERMINAL_CURSOR_BLINK_RATE_MIN} and {@link #TERMINAL_CURSOR_BLINK_RATE_MAX}.
      *
-     * @param start If cursor blinking should be started or stopped.
+     * This should be called when the view holding this activity is resumed or stopped so that
+     * cursor blinker does not run when activity is not visible.
+     *
+     * It should also be called on the
+     * {@link com.termux.terminal.TerminalSessionClient#onTerminalCursorStateChange(boolean)}
+     * callback when cursor is enabled or disabled so that blinker is disabled if cursor is not
+     * to be shown. It should also be checked if activity is visible if blinker is to be started
+     * before calling this.
+     *
+     * How cursor blinker starting works is by registering a {@link Runnable} with the looper of
+     * the main thread of the app which when run, toggles the cursor blinking state and re-registers
+     * itself to be called with the delay set by {@link #mTerminalCursorBlinkerRate}. When cursor
+     * blinking needs to be disabled, we just cancel any callbacks registered. We don't run our own
+     * "thread" and let the thread for the main looper do the work for us, whose usage is also
+     * required to update the UI, since it also handles other calls to update the UI as well based
+     * on a queue.
+     *
+     * Note that when moving cursor in text editors like nano, the cursor state is quickly
+     * toggled `-> off -> on`, which would call this very quickly sequentially. So that if cursor
+     * is moved 2 or more times quickly, like long hold on arrow keys, it would trigger
+     * `-> off -> on -> off -> on -> ...`, and the "on" callback at index 2 is automatically
+     * cancelled by next "off" callback at index 3 before getting a chance to be run. For this case
+     * we log only if {@link #TERMINAL_VIEW_KEY_LOGGING_ENABLED} is enabled, otherwise would clutter
+     * the log. We don't start the blinking with a delay to immediately show cursor in case it was
+     * previously not visible.
+     *
+     * @param start If cursor blinker should be started or stopped.
      * @param startOnlyIfCursorEnabled If set to {@code true}, then it will also be checked if the
      *                                 cursor is even enabled by {@link TerminalEmulator} before
-     *                                 starting the cursor blinking thread.
+     *                                 starting the cursor blinker.
      */
     public synchronized void setTerminalCursorBlinkerState(boolean start, boolean startOnlyIfCursorEnabled) {
-        // Stop any existing cursor blinker threads
-        stopTerminalCursorBlinkerThread();
+        // Stop any existing cursor blinker callbacks
+        stopTerminalCursorBlinker();
 
         if (mEmulator == null) return;
 
         mEmulator.setCursorBlinkingEnabled(false);
 
         if (start) {
-            // If cursor blinking is not enabled
-            if (mTerminalCursorBlinkerRate == 0) {
-                mClient.logVerbose(LOG_TAG, "Cursor blinking is not enabled");
+            // If cursor blinker is not enabled or is not valid
+            if (mTerminalCursorBlinkerRate < TERMINAL_CURSOR_BLINK_RATE_MIN || mTerminalCursorBlinkerRate > TERMINAL_CURSOR_BLINK_RATE_MAX)
                 return;
-            }
-            // If cursor blinking rate is not valid
-            else if (mTerminalCursorBlinkerRate < TERMINAL_CURSOR_BLINK_RATE_MIN || mTerminalCursorBlinkerRate > TERMINAL_CURSOR_BLINK_RATE_MAX) {
-                mClient.logError(LOG_TAG, "startCursorBlinkerThread: The cursor blink rate must be in between " + TERMINAL_CURSOR_BLINK_RATE_MIN + "-" + TERMINAL_CURSOR_BLINK_RATE_MAX + ": " + mTerminalCursorBlinkerRate);
-                return;
-            }
-            // If cursor is not enabled
+            // If cursor blinder is to be started only if cursor is enabled
             else if (startOnlyIfCursorEnabled && ! mEmulator.isCursorEnabled()) {
-                mClient.logVerbose(LOG_TAG, "Ignoring call to start cursor blinking since cursor is not enabled");
+                if (TERMINAL_VIEW_KEY_LOGGING_ENABLED)
+                    mClient.logVerbose(LOG_TAG, "Ignoring call to start cursor blinker since cursor is not enabled");
                 return;
             }
 
-            // Start cursor blinker thread
-            mClient.logVerbose(LOG_TAG, "Starting cursor blinker thread with the blink rate: " + mTerminalCursorBlinkerRate);
-            if (mTerminalCursorBlinkerHandler == null) mTerminalCursorBlinkerHandler = new Handler(Looper.getMainLooper());
-            mTerminalCursorBlinkerThread = new TerminalCursorBlinkerThread(mTerminalCursorBlinkerRate);
+            // Start cursor blinker runnable
+            if (TERMINAL_VIEW_KEY_LOGGING_ENABLED)
+                mClient.logVerbose(LOG_TAG, "Starting cursor blinker with the blink rate " + mTerminalCursorBlinkerRate);
+            if (mTerminalCursorBlinkerHandler == null)
+                mTerminalCursorBlinkerHandler = new Handler(Looper.getMainLooper());
+            mTerminalCursorBlinkerRunnable = new TerminalCursorBlinkerRunnable(mEmulator, mTerminalCursorBlinkerRate);
             mEmulator.setCursorBlinkingEnabled(true);
-            mTerminalCursorBlinkerThread.run();
+            mTerminalCursorBlinkerRunnable.run();
         }
     }
 
     /**
-     * Stops the terminal cursor blinker thread
+     * Cancel the terminal cursor blinker callbacks
      */
-    private void stopTerminalCursorBlinkerThread() {
-        if (mTerminalCursorBlinkerHandler != null && mTerminalCursorBlinkerThread != null) {
-            mClient.logVerbose(LOG_TAG, "Stopping cursor blinker thread");
-            mTerminalCursorBlinkerHandler.removeCallbacks(mTerminalCursorBlinkerThread);
+    private void stopTerminalCursorBlinker() {
+        if (mTerminalCursorBlinkerHandler != null && mTerminalCursorBlinkerRunnable != null) {
+            if (TERMINAL_VIEW_KEY_LOGGING_ENABLED)
+                mClient.logVerbose(LOG_TAG, "Stopping cursor blinker");
+            mTerminalCursorBlinkerHandler.removeCallbacks(mTerminalCursorBlinkerRunnable);
         }
     }
 
-    private class TerminalCursorBlinkerThread implements Runnable {
-        int mBlinkRate;
-        boolean mCursorVisible;
+    private class TerminalCursorBlinkerRunnable implements Runnable {
 
-        public TerminalCursorBlinkerThread(int blinkRate) {
+        private final TerminalEmulator mEmulator;
+        private final int mBlinkRate;
+
+        // Initialize with false so that initial blink state is visible after toggling
+        boolean mCursorVisible = false;
+
+        public TerminalCursorBlinkerRunnable(TerminalEmulator emulator, int blinkRate) {
+            mEmulator = emulator;
             mBlinkRate = blinkRate;
         }
 
         public void run() {
             try {
                 if (mEmulator != null) {
-                    mCursorVisible = !mCursorVisible;
                     // Toggle the blink state and then invalidate() the view so
                     // that onDraw() is called, which then calls TerminalRenderer.render()
                     // which checks with TerminalEmulator.shouldCursorBeVisible() to decide whether
                     // to draw the cursor or not
+                    mCursorVisible = !mCursorVisible;
+                    //mClient.logVerbose(LOG_TAG, "Toggling cursor blink state to " + mCursorVisible);
                     mEmulator.setCursorBlinkState(mCursorVisible);
-                    if (!mRendering)
-                        invalidate();
+                    invalidate();
                 }
             } finally {
                 // Recall the Runnable after mBlinkRate milliseconds to toggle the blink state
-                mTerminalCursorBlinkerHandler.postDelayed(mTerminalCursorBlinkerThread, mBlinkRate);
+                mTerminalCursorBlinkerHandler.postDelayed(this, mBlinkRate);
             }
         }
     }
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java b/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java
index 593705c7d8..78a381cc25 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java
@@ -3,6 +3,7 @@
 import com.google.common.collect.ImmutableBiMap;
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.logger.Logger;
+import com.termux.view.TerminalView;
 
 import java.io.File;
 import java.util.Arrays;
@@ -124,8 +125,8 @@ public final class TermuxPropertyConstants {
 
     /** Defines the key for the terminal cursor blink rate */
     public static final String KEY_TERMINAL_CURSOR_BLINK_RATE =  "terminal-cursor-blink-rate"; // Default: "terminal-cursor-blink-rate"
-    public static final int IVALUE_TERMINAL_CURSOR_BLINK_RATE_MIN = 100;
-    public static final int IVALUE_TERMINAL_CURSOR_BLINK_RATE_MAX = 2000;
+    public static final int IVALUE_TERMINAL_CURSOR_BLINK_RATE_MIN = TerminalView.TERMINAL_CURSOR_BLINK_RATE_MIN;
+    public static final int IVALUE_TERMINAL_CURSOR_BLINK_RATE_MAX = TerminalView.TERMINAL_CURSOR_BLINK_RATE_MAX;
     public static final int DEFAULT_IVALUE_TERMINAL_CURSOR_BLINK_RATE = 0;
 
 

From 58d577066a03a40e2d7a8c160cfc13c1694ab2a7 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sun, 16 May 2021 19:52:08 +0500
Subject: [PATCH 398/912] Release terminal beep SoundPool resources on activity
 stop to attempt to prevent exception

The following exception may be thrown, likely because of unreleased resources.

Related https://stackoverflow.com/a/28708351/14686958

java.util.concurrent.TimeoutException: android.media.SoundPool.finalize() timed out after 10 seconds
  at android.media.SoundPool.native_release(Native Method)
  at android.media.SoundPool.release(SoundPool.java:177)
  at android.media.SoundPool.finalize(SoundPool.java:182)
  at java.lang.Daemons$FinalizerDaemon.doFinalize(Daemons.java:250)
  at java.lang.Daemons$FinalizerDaemon.runInternal(Daemons.java:237)
  at java.lang.Daemons$Daemon.run(Daemons.java:103)
  at java.lang.Thread.run(Thread.java:764)
---
 .../terminal/TermuxTerminalSessionClient.java | 55 ++++++++++++++++---
 1 file changed, 48 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java
index 7d11689048..7033ac5084 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java
@@ -37,20 +37,39 @@ public class TermuxTerminalSessionClient extends TermuxTerminalSessionClientBase
 
     private static final int MAX_SESSIONS = 8;
 
-    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 SoundPool mBellSoundPool;
 
-    private final int mBellSoundId;
+    private int mBellSoundId;
 
     private static final String LOG_TAG = "TermuxTerminalSessionClient";
 
     public TermuxTerminalSessionClient(TermuxActivity activity) {
         this.mActivity = activity;
+    }
+
+    /**
+     * 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();
+    }
 
-        mBellSoundId = mBellSoundPool.load(activity, R.raw.bell, 1);
+    /**
+     * Should be called when mActivity.onStop() is called
+     */
+    public void onStop() {
+        // 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();
     }
 
+
+
     @Override
     public void onTextChanged(TerminalSession changedSession) {
         if (!mActivity.isVisible()) return;
@@ -122,13 +141,12 @@ public void onBell(TerminalSession session) {
                 BellHandler.getInstance(mActivity).doBell();
                 break;
             case TermuxPropertyConstants.IVALUE_BELL_BEHAVIOUR_BEEP:
-                mBellSoundPool.play(mBellSoundId, 1.f, 1.f, 1, 0, 1.f);
+                getBellSoundPool().play(mBellSoundId, 1.f, 1.f, 1, 0, 1.f);
                 break;
             case TermuxPropertyConstants.IVALUE_BELL_BEHAVIOUR_IGNORE:
                 // Ignore the bell character.
                 break;
         }
-
     }
 
     @Override
@@ -152,6 +170,29 @@ public void onTerminalCursorStateChange(boolean enabled) {
 
 
 
+    /** 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. */
     public void setCurrentSession(TerminalSession session) {
         if (session == null) return;

From d736b1eba5608924080021a236255ba731892016 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sun, 16 May 2021 20:45:44 +0500
Subject: [PATCH 399/912] Implement TermuxActivity callbacks in
 TermuxTerminalViewClient and TermuxTerminalSessionClient

---
 .../java/com/termux/app/TermuxActivity.java   | 195 +++++++++---------
 .../terminal/TermuxTerminalSessionClient.java |  37 ++++
 .../terminal/TermuxTerminalViewClient.java    |  50 +++++
 3 files changed, 179 insertions(+), 103 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index 766f941f45..7bf806be1e 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -229,23 +229,13 @@ public void onStart() {
 
         mIsVisible = true;
 
-        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();
-        }
+        if (mTermuxTerminalSessionClient != null)
+            mTermuxTerminalSessionClient.onStart();
 
-        registerTermuxActivityBroadcastReceiver();
+        if (mTermuxTerminalViewClient != null)
+            mTermuxTerminalViewClient.onStart();
 
-        // 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.isTerminalViewKeyLoggingEnabled());
-
-        // The current terminal session may have changed while being away, force
-        // a refresh of the displayed terminal.
-        mTerminalView.onScreenUpdated();
+        registerTermuxActivityBroadcastReceiver();
     }
 
     @Override
@@ -256,12 +246,64 @@ public void onResume() {
 
         if (mIsInvalidState) return;
 
-        mTermuxTerminalViewClient.setSoftKeyboardState(true, false);
+        if (mTermuxTerminalSessionClient != null)
+            mTermuxTerminalSessionClient.onResume();
+
+        if (mTermuxTerminalViewClient != null)
+            mTermuxTerminalViewClient.onResume();
+    }
+
+    @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();
+
+        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.
+        }
+    }
 
-        // Start terminal cursor blinking if enabled
-        mTermuxTerminalViewClient.setTerminalCursorBlinkerState(true);
+    @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
@@ -319,53 +361,7 @@ public void onServiceDisconnected(ComponentName name) {
         finishActivityIfNotFinishing();
     }
 
-    @Override
-    protected void onStop() {
-        super.onStop();
-
-        Logger.logDebug(LOG_TAG, "onStop");
-
-        if (mIsInvalidState) return;
-
-        mIsVisible = false;
-
-        // Store current session in shared preferences so that it can be restored later in
-        // {@link #onStart} if needed.
-        mTermuxTerminalSessionClient.setCurrentStoredSession();
-
-        // Stop terminal cursor blinking if enabled
-        mTermuxTerminalViewClient.setTerminalCursorBlinkerState(false);
 
-        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);
-    }
 
 
 
@@ -386,6 +382,32 @@ private void setDrawerTheme() {
 
 
 
+    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 = findViewById(R.id.terminal_toolbar_view_pager);
         if (mPreferences.shouldShowTerminalToolbar()) terminalToolbarViewPager.setVisibility(View.VISIBLE);
@@ -466,36 +488,6 @@ private void setToggleKeyboardView() {
 
 
 
-    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.shouldKeepScreenOn());
-
-        // Set {@link TerminalView#TERMINAL_VIEW_KEY_LOGGING_ENABLED} value
-        mTerminalView.setIsTerminalViewKeyLoggingEnabled(mPreferences.isTerminalViewKeyLoggingEnabled());
-
-        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() {
@@ -780,7 +772,7 @@ public void onReceive(Context context, Intent intent) {
                         return;
                     case TERMUX_ACTIVITY.ACTION_RELOAD_STYLE:
                         Logger.logDebug(LOG_TAG, "Received intent to reload styling");
-                        reloadTermuxActivityStyling();
+                        reloadActivityStyling();
                         return;
                     default:
                 }
@@ -788,11 +780,7 @@ public void onReceive(Context context, Intent intent) {
         }
     }
 
-    private void reloadTermuxActivityStyling() {
-        if (mTermuxTerminalSessionClient != null) {
-            mTermuxTerminalSessionClient.checkForFontAndColors();
-        }
-
+    private void reloadActivityStyling() {
         if (mProperties!= null) {
             mProperties.loadTermuxPropertiesFromDisk();
 
@@ -803,10 +791,11 @@ private void reloadTermuxActivityStyling() {
 
         setTerminalToolbarHeight();
 
-        mTermuxTerminalViewClient.setSoftKeyboardState(false, true);
-
-        mTermuxTerminalViewClient.setTerminalCursorBlinkerState(true);
+        if (mTermuxTerminalSessionClient != null)
+            mTermuxTerminalSessionClient.onReload();
 
+        if (mTermuxTerminalViewClient != null)
+            mTermuxTerminalViewClient.onReload();
 
         // To change the activity and drawer theme, activity needs to be recreated.
         // But this will destroy the activity, and will call the onCreate() again.
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java
index 7033ac5084..4e836aef38 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java
@@ -47,6 +47,31 @@ public TermuxTerminalSessionClient(TermuxActivity activity) {
         this.mActivity = activity;
     }
 
+    /**
+     * 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
      */
@@ -61,6 +86,10 @@ public void onResume() {
      * 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
@@ -68,6 +97,14 @@ public void onStop() {
         releaseBellSoundPool();
     }
 
+    /**
+     * Should be called when mActivity.reloadActivityStyling() is called
+     */
+    public void onReload() {
+        // Set terminal fonts and colors
+        checkForFontAndColors();
+    }
+
 
 
     @Override
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
index 246181199c..83ea528f5d 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
@@ -63,6 +63,56 @@ public TermuxTerminalViewClient(TermuxActivity activity, TermuxTerminalSessionCl
         this.mTermuxTerminalSessionClient = termuxTerminalSessionClient;
     }
 
+    /**
+     * 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
+        mActivity.getTerminalView().setIsTerminalViewKeyLoggingEnabled(mActivity.getPreferences().isTerminalViewKeyLoggingEnabled());
+    }
+
+    /**
+     * Should be called when mActivity.onResume() is called
+     */
+    public void onResume() {
+        // Show the soft keyboard if required
+        setSoftKeyboardState(true, false);
+
+        // Start terminal cursor blinking if enabled
+        setTerminalCursorBlinkerState(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);
+    }
+
+
+
     @Override
     public float onScale(float scale) {
         if (scale < 0.9f || scale > 1.1f) {

From b711a467c189b21742164ef185416751e3d58d7a Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sun, 16 May 2021 23:44:43 +0500
Subject: [PATCH 400/912] Bump to v0.113

---
 app/build.gradle               | 4 ++--
 terminal-emulator/build.gradle | 2 +-
 terminal-view/build.gradle     | 2 +-
 termux-shared/build.gradle     | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 20d82f40e3..c540083510 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -26,8 +26,8 @@ android {
         applicationId "com.termux"
         minSdkVersion project.properties.minSdkVersion.toInteger()
         targetSdkVersion project.properties.targetSdkVersion.toInteger()
-        versionCode 112
-        versionName "0.112"
+        versionCode 113
+        versionName "0.113"
 
         manifestPlaceholders.TERMUX_PACKAGE_NAME = "com.termux"
         manifestPlaceholders.TERMUX_APP_NAME = "Termux"
diff --git a/terminal-emulator/build.gradle b/terminal-emulator/build.gradle
index db3f3e39e6..0ca52b83bf 100644
--- a/terminal-emulator/build.gradle
+++ b/terminal-emulator/build.gradle
@@ -63,7 +63,7 @@ publishing {
         bar(MavenPublication) {
             groupId 'com.termux'
             artifactId 'terminal-emulator'
-            version "0.112"
+            version "0.113"
             artifact(sourceJar)
             artifact("$buildDir/outputs/aar/terminal-emulator-release.aar")
         }
diff --git a/terminal-view/build.gradle b/terminal-view/build.gradle
index 3e78671ba2..c2273772c6 100644
--- a/terminal-view/build.gradle
+++ b/terminal-view/build.gradle
@@ -42,7 +42,7 @@ publishing {
         bar(MavenPublication) {
             groupId 'com.termux'
             artifactId 'terminal-view'
-            version "0.112"
+            version "0.113"
             artifact(sourceJar)
             artifact("$buildDir/outputs/aar/terminal-view-release.aar")
         }
diff --git a/termux-shared/build.gradle b/termux-shared/build.gradle
index 06238e984d..74128b0b6c 100644
--- a/termux-shared/build.gradle
+++ b/termux-shared/build.gradle
@@ -57,7 +57,7 @@ publishing {
         bar(MavenPublication) {
             groupId 'com.termux'
             artifactId 'termux-shared'
-            version "0.112"
+            version "0.113"
             artifact(sourceJar)
             artifact("$buildDir/outputs/aar/termux-shared-release.aar")
         }

From e08e3b536e1b3d0a3d67fa96b182b403379697d3 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sun, 23 May 2021 21:14:30 +0500
Subject: [PATCH 401/912] Do not close soft keyboard when toolbar text input
 view is focused on

The TerminalToolbarViewPager EditText was requesting focus when it was selected. This called the TerminalView.onFocusChange() event with hasFocus=false, which closed the soft keyboard. Now soft keyboard will only be closed if both of them don't have focus.

Fixes #2077
---
 .../termux/app/terminal/TermuxTerminalViewClient.java    | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
index 83ea528f5d..f08a25269c 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
@@ -15,6 +15,7 @@
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.View;
+import android.widget.EditText;
 import android.widget.ListView;
 import android.widget.Toast;
 
@@ -464,8 +465,12 @@ public void setSoftKeyboardState(boolean isStartup, boolean isReloadTermuxProper
                 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);
+                        // 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();
+                        KeyboardUtils.setSoftKeyboardVisibility(mShowSoftKeyboardRunnable, mActivity, mActivity.getTerminalView(), hasFocus || textInputViewHasFocus);
                     }
                 });
 

From 6837db0015d220dbde21fbdd1b38bc419e15c18a Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Thu, 3 Jun 2021 20:52:17 +0300
Subject: [PATCH 402/912] update bootstrap archives

---
 app/build.gradle | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index c540083510..77a9f7c51d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -155,11 +155,11 @@ clean {
 
 task downloadBootstraps() {
     doLast {
-        def version = "2021.05.16-r1"
-        downloadBootstrap("aarch64", "6e340d8ab11d1225b89ee920e0884cbbd944d37765d81c5b06ef34579564fd9a", version)
-        downloadBootstrap("arm",     "3f02bc2b5bd45c2ec5170527e39ee0413246698f11be4799c7bde6d364cfd780", version)
-        downloadBootstrap("i686",    "36a3733fb2d8531d7f8abd989b711919872b9e8a79d7eb2e8b00bef467199187", version)
-        downloadBootstrap("x86_64",  "3885376cc514220c0803e38f70b25f837854029fff2b7fda7a81452623cd9074", version)
+        def version = "2021.06.03-r1"
+        downloadBootstrap("aarch64", "cfe2c7f0b8e97c08ae2dd6a40475c49508fc0f12361b35bb3db98004a58b78a8", version)
+        downloadBootstrap("arm",     "f9709b116ae5cb48c567be43351da00cc1ce510a76a550d6a7f0fcf4c7073911", version)
+        downloadBootstrap("i686",    "1caef06592b447203bc4164c1c5adb8b627a1b9029df6411bd9f2e932af8ae6a", version)
+        downloadBootstrap("x86_64",   "9387c512aaab1a8e37662672332190e240b910d07f42b34fea015db30e054c4", version)
     }
 }
 

From 7620800cd5705dfb93c8d684abd7f949a826b6b8 Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Fri, 4 Jun 2021 19:17:19 +0300
Subject: [PATCH 403/912] bump bootstraps again

Include latest changes to pkg & termux-change-repo
---
 app/build.gradle | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 77a9f7c51d..3d6273e416 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -155,11 +155,11 @@ clean {
 
 task downloadBootstraps() {
     doLast {
-        def version = "2021.06.03-r1"
-        downloadBootstrap("aarch64", "cfe2c7f0b8e97c08ae2dd6a40475c49508fc0f12361b35bb3db98004a58b78a8", version)
-        downloadBootstrap("arm",     "f9709b116ae5cb48c567be43351da00cc1ce510a76a550d6a7f0fcf4c7073911", version)
-        downloadBootstrap("i686",    "1caef06592b447203bc4164c1c5adb8b627a1b9029df6411bd9f2e932af8ae6a", version)
-        downloadBootstrap("x86_64",   "9387c512aaab1a8e37662672332190e240b910d07f42b34fea015db30e054c4", version)
+        def version = "2021.06.04-r1"
+        downloadBootstrap("aarch64", "115409ec8abe096080f9e6d9b2765e009c818b3e5aff0133792182009388b81e", version)
+        downloadBootstrap("arm",     "c289688d4f9aabd86240a4d3e25bd89c1a96641e0d085d9ee5a471e9f019e16f", version)
+        downloadBootstrap("i686",    "63cfb8e39cac20cecbe9e9890f49a30d7454d4c4dfa2b22b5d0cc6de1dc59726", version)
+        downloadBootstrap("x86_64",  "db47007825e65f8ed15fc46d6b8e3119b01ca4a9856d7c7e5604cf804e753ba2", version)
     }
 }
 

From cb8b0225cadaa8f51f32065ee914cb7ce0f38d1e Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sun, 6 Jun 2021 06:15:47 +0500
Subject: [PATCH 404/912] Add pluginIntent field to ExecutionCommand

---
 .../java/com/termux/shared/models/ExecutionCommand.java     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/models/ExecutionCommand.java b/termux-shared/src/main/java/com/termux/shared/models/ExecutionCommand.java
index 76e5853219..5ee3948faf 100644
--- a/termux-shared/src/main/java/com/termux/shared/models/ExecutionCommand.java
+++ b/termux-shared/src/main/java/com/termux/shared/models/ExecutionCommand.java
@@ -2,6 +2,7 @@
 
 import android.app.Activity;
 import android.app.PendingIntent;
+import android.content.Intent;
 import android.net.Uri;
 
 import androidx.annotation.NonNull;
@@ -106,9 +107,10 @@ public int getValue() {
 
 
     /** Defines if {@link ExecutionCommand} was started because of an external plugin request
-     * like {@link TERMUX_SERVICE#ACTION_SERVICE_EXECUTE} intent or from within Termux app itself.
-     */
+     * like {@link TERMUX_SERVICE#ACTION_SERVICE_EXECUTE} intent or from within Termux app itself. */
     public boolean isPluginExecutionCommand;
+    /** Defines the {@link Intent} received from the external plugin which started the {@link ExecutionCommand}. */
+    public Intent pluginIntent;
     /** Defines {@link PendingIntent} that should be sent if an external plugin requested the execution. */
     public PendingIntent pluginPendingIntent;
 

From 1ad038ece54c44cf13d19ad14cbd05a556b649e9 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sun, 6 Jun 2021 21:34:12 +0500
Subject: [PATCH 405/912] Fix issue where soft keyboard would not show in some
 cases

1. If `soft-keyboard-toggle-behaviour=enable/disable` was set, then pressing keyboard toggle wouldn't show the keyboard after switching back from another app if keyboard was previously disabled by user.
2. If switching back from another app, like when opening url with context menu "Select URL" long press and returning to termux with back button, then soft keyboard wouldn't automatically open like it does on app startup.

Also fixed issue where OnFocusChangeListener wasn't being set up if keyboard had to be hidden or disabled on startup.

Fixes #2111, Fixes #2112
---
 .../java/com/termux/app/TermuxActivity.java   | 12 +++
 .../terminal/TermuxTerminalViewClient.java    | 93 +++++++++++++------
 2 files changed, 79 insertions(+), 26 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index 7bf806be1e..91215ba242 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -129,6 +129,11 @@ 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.
      */
@@ -160,6 +165,7 @@ 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
@@ -251,6 +257,8 @@ public void onResume() {
 
         if (mTermuxTerminalViewClient != null)
             mTermuxTerminalViewClient.onResume();
+
+        isOnResumeAfterOnCreate = false;
     }
 
     @Override
@@ -691,6 +699,10 @@ public boolean isVisible() {
         return mIsVisible;
     }
 
+    public boolean isOnResumeAfterOnCreate() {
+        return isOnResumeAfterOnCreate;
+    }
+
 
 
     public TermuxService getTermuxService() {
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
index f08a25269c..231f40bba8 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
@@ -57,6 +57,9 @@ public class TermuxTerminalViewClient extends TermuxTerminalViewClientBase {
 
     private Runnable mShowSoftKeyboardRunnable;
 
+    private boolean mShowSoftKeyboardIgnoreOnce;
+    private boolean mShowSoftKeyboardWithDelayOnce;
+
     private static final String LOG_TAG = "TermuxTerminalViewClient";
 
     public TermuxTerminalViewClient(TermuxActivity activity, TermuxTerminalSessionClient termuxTerminalSessionClient) {
@@ -410,10 +413,19 @@ public void onToggleSoftKeyboardRequest() {
                 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);
-                KeyboardUtils.showSoftKeyboard(mActivity, mActivity.getTerminalView());
+                if(mShowSoftKeyboardWithDelayOnce) {
+                    mShowSoftKeyboardWithDelayOnce = false;
+                    mActivity.getTerminalView().postDelayed(getShowSoftKeyboardRunnable(), 500);
+                    mActivity.getTerminalView().requestFocus();
+                } else
+                    KeyboardUtils.showSoftKeyboard(mActivity, mActivity.getTerminalView());
             }
         }
         // If soft keyboard toggle behaviour is show/hide
@@ -431,12 +443,20 @@ public void onToggleSoftKeyboardRequest() {
     }
 
     public void setSoftKeyboardState(boolean isStartup, boolean isReloadTermuxProperties) {
+        boolean noRequestFocus = false;
+
         // 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())) {
+            mActivity.getPreferences().isSoftKeyboardEnabled(),
+            mActivity.getPreferences().isSoftKeyboardEnabledOnlyIfNoHardware())) {
             Logger.logVerbose(LOG_TAG, "Maintaining disabled soft keyboard");
             KeyboardUtils.disableSoftKeyboard(mActivity, mActivity.getTerminalView());
+            noRequestFocus = 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.setResizeTerminalViewForSoftKeyboardFlags(mActivity);
@@ -450,34 +470,55 @@ public void setSoftKeyboardState(boolean isStartup, boolean isReloadTermuxProper
                 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;
-
-                if (mShowSoftKeyboardRunnable == null) {
-                    mShowSoftKeyboardRunnable = () -> {
-                        Logger.logVerbose(LOG_TAG, "Showing soft keyboard on focus change");
-                        KeyboardUtils.showSoftKeyboard(mActivity, mActivity.getTerminalView());
-                    };
-                }
+                noRequestFocus = 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();
-                        KeyboardUtils.setSoftKeyboardVisibility(mShowSoftKeyboardRunnable, 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 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");
+                }
 
-                // Request focus for TerminalView
-                mActivity.getTerminalView().requestFocus();
+                KeyboardUtils.setSoftKeyboardVisibility(getShowSoftKeyboardRunnable(), mActivity, mActivity.getTerminalView(), hasFocus || textInputViewHasFocus);
             }
+        });
+
+        // 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 && !noRequestFocus) {
+            // 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;
     }
 
 

From 7ef925543739739809d79ddc2dc1c82343b780a9 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sun, 6 Jun 2021 22:15:21 +0500
Subject: [PATCH 406/912] Remove hardcoded wiki.termux.com url from
 HelpActivity

---
 .../main/java/com/termux/app/activities/HelpActivity.java   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/termux/app/activities/HelpActivity.java b/app/src/main/java/com/termux/app/activities/HelpActivity.java
index fa32bfc4e2..facbf36e5a 100644
--- a/app/src/main/java/com/termux/app/activities/HelpActivity.java
+++ b/app/src/main/java/com/termux/app/activities/HelpActivity.java
@@ -12,6 +12,8 @@
 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 {
 
@@ -39,7 +41,7 @@ protected void onCreate(Bundle savedInstanceState) {
         mWebView.setWebViewClient(new WebViewClient() {
             @Override
             public boolean shouldOverrideUrlLoading(WebView view, String url) {
-                if (url.startsWith("https://wiki.termux.com")) {
+                if (url.equals(TermuxConstants.TERMUX_WIKI_URL) || url.startsWith(TermuxConstants.TERMUX_WIKI_URL + "/")) {
                     // Inline help.
                     setContentView(progressLayout);
                     return false;
@@ -60,7 +62,7 @@ public void onPageFinished(WebView view, String url) {
                 setContentView(mWebView);
             }
         });
-        mWebView.loadUrl("https://wiki.termux.com/wiki/Main_Page");
+        mWebView.loadUrl(TermuxConstants.TERMUX_WIKI_URL);
     }
 
     @Override

From e7dd0eeebe98aaf41a31944e0b6eb62d5f4db8bf Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 10 Jun 2021 03:06:10 +0500
Subject: [PATCH 407/912] Fix issue where soft keyboard overlaps extra keys or
 terminal in some cases

Check TermuxActivityRootView javadocs for details.
---
 .../java/com/termux/app/TermuxActivity.java   |  45 +++-
 .../app/terminal/TermuxActivityRootView.java  | 227 ++++++++++++++++++
 .../terminal/TermuxTerminalViewClient.java    |   9 +-
 app/src/main/res/layout/activity_termux.xml   | 132 +++++-----
 .../com/termux/shared/view/KeyboardUtils.java |   2 +-
 .../com/termux/shared/view/ViewUtils.java     |  98 ++++++++
 6 files changed, 447 insertions(+), 66 deletions(-)
 create mode 100644 app/src/main/java/com/termux/app/terminal/TermuxActivityRootView.java
 create mode 100644 termux-shared/src/main/java/com/termux/shared/view/ViewUtils.java

diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index 91215ba242..51ac549486 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -30,6 +30,7 @@
 import android.widget.Toast;
 
 import com.termux.R;
+import com.termux.app.terminal.TermuxActivityRootView;
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.termux.TermuxConstants.TERMUX_APP.TERMUX_ACTIVITY;
 import com.termux.app.activities.HelpActivity;
@@ -68,7 +69,6 @@
  */
 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
@@ -77,7 +77,7 @@ public final class TermuxActivity extends Activity implements ServiceConnection
     TermuxService mTermuxService;
 
     /**
-     * The main view of the activity showing the terminal. Initialized in onCreate().
+     * The {@link TerminalView} shown in  {@link TermuxActivity} that displays the terminal.
      */
     TerminalView mTerminalView;
 
@@ -103,6 +103,16 @@ 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.
      */
@@ -189,6 +199,10 @@ public void onCreate(Bundle savedInstanceState) {
             return;
         }
 
+        mTermuxActivityRootView = findViewById(R.id.activity_termux_root_view);
+        mTermuxActivityRootView.setActivity(this);
+        mTermuxActivityBottomSpaceView = findViewById(R.id.activity_termux_bottom_space_view);
+
         View content = findViewById(android.R.id.content);
         content.setOnApplyWindowInsetsListener((v, insets) -> {
             mNavBarHeight = insets.getSystemWindowInsetBottom();
@@ -241,6 +255,8 @@ public void onStart() {
         if (mTermuxTerminalViewClient != null)
             mTermuxTerminalViewClient.onStart();
 
+        addTermuxActivityRootViewGlobalLayoutListener();
+
         registerTermuxActivityBroadcastReceiver();
     }
 
@@ -277,6 +293,8 @@ protected void onStop() {
         if (mTermuxTerminalViewClient != null)
             mTermuxTerminalViewClient.onStop();
 
+        removeTermuxActivityRootViewGlobalLayoutListener();
+
         unregisterTermuxActivityBroadcastReceiever();
         getDrawer().closeDrawers();
     }
@@ -390,6 +408,17 @@ private void setDrawerTheme() {
 
 
 
+    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);
@@ -438,8 +467,8 @@ private void setTerminalToolbarHeight() {
         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);
     }
 
@@ -679,6 +708,14 @@ public int getNavBarHeight() {
         return mNavBarHeight;
     }
 
+    public TermuxActivityRootView getTermuxActivityRootView() {
+        return mTermuxActivityRootView;
+    }
+
+    public View getTermuxActivityBottomSpaceView() {
+        return mTermuxActivityBottomSpaceView;
+    }
+
     public ExtraKeysView getExtraKeysView() {
         return mExtraKeysView;
     }
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxActivityRootView.java b/app/src/main/java/com/termux/app/terminal/TermuxActivityRootView.java
new file mode 100644
index 0000000000..33b6510f6b
--- /dev/null
+++ b/app/src/main/java/com/termux/app/terminal/TermuxActivityRootView.java
@@ -0,0 +1,227 @@
+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.inputmethod.EditorInfo;
+import android.widget.FrameLayout;
+import android.widget.LinearLayout;
+
+import androidx.annotation.Nullable;
+
+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;
+
+    /** Log root view events. */
+    private boolean ROOT_VIEW_LOGGING_ENABLED = false;
+
+    private static final String LOG_TAG = "TermuxActivityRootView";
+
+    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;
+
+        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);
+        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);
+        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, "onGlobalLayout: windowAvailableRect " + windowAvailableRect.bottom + ", bottomSpaceViewRect " + bottomSpaceViewRect.bottom + ", diff " + (bottomSpaceViewRect.bottom - windowAvailableRect.bottom) + ", bottom " + params.bottomMargin + ", isVisible " + isVisible + ", 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, "onGlobalLayout: 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.
+                marginBottom = 0;
+                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) {
+                if (ROOT_VIEW_LOGGING_ENABLED)
+                    Logger.logVerbose(LOG_TAG, "onGlobalLayout: Resetting margin since visible due to extra margin");
+                setMargin = true;
+                // lastMarginBottom must be invalid. May also happen when keyboards are changed.
+                lastMarginBottom = null;
+            }
+
+            if (setMargin) {
+                if (ROOT_VIEW_LOGGING_ENABLED)
+                    Logger.logVerbose(LOG_TAG, "onGlobalLayout: Setting bottom margin to 0");
+                params.setMargins(0, 0, 0, 0);
+                setLayoutParams(params);
+            } else {
+                if (ROOT_VIEW_LOGGING_ENABLED)
+                    Logger.logVerbose(LOG_TAG, "onGlobalLayout: 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, "onGlobalLayout: 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 ((bottomSpaceViewRect.bottom - windowAvailableRect.bottom) > 0) {
+                if (ROOT_VIEW_LOGGING_ENABLED)
+                    Logger.logVerbose(LOG_TAG, "onGlobalLayout: Force setting margin since not visible despite margin");
+                setMargin = true;
+            }
+
+            if (setMargin) {
+                if (ROOT_VIEW_LOGGING_ENABLED)
+                    Logger.logVerbose(LOG_TAG, "onGlobalLayout: 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, "onGlobalLayout: Bottom margin already equals " + pxHidden);
+            }
+        }
+    }
+
+}
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
index 231f40bba8..611e8ce246 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
@@ -79,10 +79,13 @@ public void onCreate() {
      * 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
-        mActivity.getTerminalView().setIsTerminalViewKeyLoggingEnabled(mActivity.getPreferences().isTerminalViewKeyLoggingEnabled());
+        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);
     }
 
     /**
@@ -459,7 +462,7 @@ public void setSoftKeyboardState(boolean isStartup, boolean isReloadTermuxProper
                 mShowSoftKeyboardWithDelayOnce = true;
         } else {
             // Set flag to automatically push up TerminalView when keyboard is opened instead of showing over it
-            KeyboardUtils.setResizeTerminalViewForSoftKeyboardFlags(mActivity);
+            KeyboardUtils.setSoftInputModeAdjustResize(mActivity);
 
             // Clear any previous flags to disable soft keyboard in case setting updated
             KeyboardUtils.clearDisableSoftKeyboardFlags(mActivity);
diff --git a/app/src/main/res/layout/activity_termux.xml b/app/src/main/res/layout/activity_termux.xml
index 12ee0d46c0..32bb354b72 100644
--- a/app/src/main/res/layout/activity_termux.xml
+++ b/app/src/main/res/layout/activity_termux.xml
@@ -1,80 +1,96 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.termux.app.terminal.TermuxActivityRootView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/activity_termux_root_view"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:fitsSystemWindows="true">
 
-    <androidx.drawerlayout.widget.DrawerLayout
-        android:id="@+id/drawer_layout"
+    <RelativeLayout
         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="0dp"
+        android:layout_weight="1"
+        android:orientation="vertical">
 
-        <com.termux.view.TerminalView
-            android:id="@+id/terminal_view"
+        <androidx.drawerlayout.widget.DrawerLayout
+            android:id="@+id/drawer_layout"
             android:layout_width="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" />
+            android:layout_alignParentTop="true"
+            android:layout_above="@+id/terminal_toolbar_view_pager"
+            android:layout_height="match_parent">
 
-        <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"
+            <com.termux.view.TerminalView
+                android:id="@+id/terminal_view"
                 android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_gravity="top"
-                android:layout_weight="1"
-                android:choiceMode="singleChoice"
-                android:longClickable="true" />
+                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" />
 
             <LinearLayout
-                style="?android:attr/buttonBarStyle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
+                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">
 
-                <Button
-                    android:id="@+id/toggle_keyboard_button"
-                    style="?android:attr/buttonBarButtonStyle"
+                <ListView
+                    android:id="@+id/terminal_sessions_list"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
+                    android:layout_height="0dp"
+                    android:layout_gravity="top"
                     android:layout_weight="1"
-                    android:text="@string/action_toggle_soft_keyboard" />
+                    android:choiceMode="singleChoice"
+                    android:longClickable="true" />
 
-                <Button
-                    android:id="@+id/new_session_button"
-                    style="?android:attr/buttonBarButtonStyle"
+                <LinearLayout
+                    style="?android:attr/buttonBarStyle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="@string/action_new_session" />
+                    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>
             </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>
 
-    <androidx.viewpager.widget.ViewPager
-        android:id="@+id/terminal_toolbar_view_pager"
-        android:visibility="gone"
+    <View
+        android:id="@+id/activity_termux_bottom_space_view"
         android:layout_width="match_parent"
-        android:layout_height="37.5dp"
-        android:background="@android:drawable/screen_background_dark_transparent"
-        android:layout_alignParentBottom="true" />
-</RelativeLayout>
+        android:layout_height="1dp"
+        android:background="@android:color/transparent" />
+
+</com.termux.app.terminal.TermuxActivityRootView>
diff --git a/termux-shared/src/main/java/com/termux/shared/view/KeyboardUtils.java b/termux-shared/src/main/java/com/termux/shared/view/KeyboardUtils.java
index a54b4fa9f9..eee44ec23d 100644
--- a/termux-shared/src/main/java/com/termux/shared/view/KeyboardUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/view/KeyboardUtils.java
@@ -102,7 +102,7 @@ public static void setSoftKeyboardAlwaysHiddenFlags(final Activity activity) {
             activity.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN);
     }
 
-    public static void setResizeTerminalViewForSoftKeyboardFlags(final Activity activity) {
+    public static void setSoftInputModeAdjustResize(final Activity activity) {
         // TODO: The flag is deprecated for API 30 and WindowInset API should be used
         // https://developer.android.com/reference/android/view/WindowManager.LayoutParams#SOFT_INPUT_ADJUST_RESIZE
         // https://medium.com/androiddevelopers/animating-your-keyboard-fb776a8fb66d
diff --git a/termux-shared/src/main/java/com/termux/shared/view/ViewUtils.java b/termux-shared/src/main/java/com/termux/shared/view/ViewUtils.java
new file mode 100644
index 0000000000..fe7422f61e
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/view/ViewUtils.java
@@ -0,0 +1,98 @@
+package com.termux.shared.view;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.ContextWrapper;
+import android.graphics.Rect;
+import android.util.TypedValue;
+import android.view.View;
+
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+
+public class ViewUtils {
+
+    /**
+     * Check if a {@link View} is fully visible and not hidden or partially covered by another view.
+     *
+     * https://stackoverflow.com/a/51078418/14686958
+     *
+     * @param view The {@link View} to check.
+     * @return Returns {@code true} if view is fully visible.
+     */
+    public static boolean isViewFullyVisible(View view) {
+        Rect[] windowAndViewRects = getWindowAndViewRects(view);
+        if (windowAndViewRects == null)
+            return false;
+        return windowAndViewRects[0].contains(windowAndViewRects[1]);
+    }
+
+    /**
+     * Get the {@link Rect} of a {@link View} and the  {@link Rect} of the window inside which it
+     * exists.
+     *
+     * https://stackoverflow.com/a/51078418/14686958
+     *
+     * @param view The {@link View} inside the window whose {@link Rect} to get.
+     * @return Returns {@link Rect[]} if view is visible where Rect[0] will contain window
+     * {@link Rect} and Rect[1] will contain view {@link Rect}. This will be {@code null}
+     * if view is not visible.
+     */
+    @Nullable
+    public static Rect[] getWindowAndViewRects(View view) {
+        if (view == null || !view.isShown())
+            return null;
+
+        // windowRect - will hold available area where content remain visible to users
+        // Takes into account screen decorations (e.g. statusbar)
+        Rect windowRect = new Rect();
+        view.getWindowVisibleDisplayFrame(windowRect);
+
+        // If there is actionbar, get his height
+        int actionBarHeight = 0;
+        Context context = view.getContext();
+        if (context instanceof AppCompatActivity) {
+            androidx.appcompat.app.ActionBar actionBar = ((AppCompatActivity) context).getSupportActionBar();
+            if (actionBar != null) actionBarHeight = actionBar.getHeight();
+        } else if (context instanceof Activity) {
+            android.app.ActionBar actionBar = ((Activity) context).getActionBar();
+            if (actionBar != null) actionBarHeight = actionBar.getHeight();
+        }
+
+        // windowAvailableRect - takes into account actionbar and statusbar height
+        Rect windowAvailableRect;
+        windowAvailableRect = new Rect(windowRect.left, windowRect.top + actionBarHeight, windowRect.right, windowRect.bottom);
+
+        // viewRect - holds position of the view in window
+        // (methods as getGlobalVisibleRect, getHitRect, getDrawingRect can return different result,
+        // when partialy visible)
+        Rect viewRect;
+        final int[] viewsLocationInWindow = new int[2];
+        view.getLocationInWindow(viewsLocationInWindow);
+        int viewLeft = viewsLocationInWindow[0];
+        int viewTop = viewsLocationInWindow[1];
+        int viewRight = viewLeft + view.getWidth();
+        int viewBottom = viewTop + view.getHeight();
+        viewRect = new Rect(viewLeft, viewTop, viewRight, viewBottom);
+
+        return new Rect[]{windowAvailableRect, viewRect};
+    }
+
+    /** Get the {@link Activity} associated with the {@link Context} if available. */
+    @Nullable
+    public static Activity getActivity(Context context) {
+        while (context instanceof ContextWrapper) {
+            if (context instanceof Activity) {
+                return (Activity)context;
+            }
+            context = ((ContextWrapper)context).getBaseContext();
+        }
+        return null;
+    }
+
+    /** Convert value in device independent pixels (dp) to pixels (px) units. */
+    public static int dpToPx(Context context, int dp) {
+        return (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp, context.getResources().getDisplayMetrics());
+    }
+
+}

From 0b4bbaf23d349e65b2f2c69b53c0a579cac92ddc Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 10 Jun 2021 03:55:31 +0500
Subject: [PATCH 408/912] Allow users to adjust terminal transcript rows with
 termux.properties

This `terminal-transcript-rows` key can be used to adjust the terminal transcript rows. The user can set an integer value between `100` and `50000`. The default value is still `2000`. So adding an entry like `terminal-transcript-rows=10000` to `termux.properties` file will allow users to scroll back ~10000 lines of command output. After updating the value, termux must be restarted. You can also run `termux-reload-settings` command so that termux loads the updated value, but only new sessions will use the updated value, existing sessions will not be affected.

You can test this with the following, where `70` is number of `x` characters per line and `10001` is the number of lines to print.
`x="$(printf 'x%.0s' {1..70})"; for i in {1..10001}; do echo "$i:$x"; done`

Be advised that using large values may have a performance impact depending on your device capabilities, so use at your own risk.

Closes #2071
---
 .../java/com/termux/app/TermuxActivity.java   |  3 +
 .../java/com/termux/app/TermuxService.java    | 17 +++++
 .../properties/TermuxAppSharedProperties.java | 12 ++-
 .../com/termux/terminal/TerminalEmulator.java | 16 +++-
 .../com/termux/terminal/TerminalSession.java  |  7 +-
 .../shared/models/ExecutionCommand.java       |  4 +
 .../properties/TermuxPropertyConstants.java   | 15 +++-
 .../properties/TermuxSharedProperties.java    | 73 +++++++++++++++----
 .../termux/shared/shell/TermuxSession.java    |  2 +-
 9 files changed, 128 insertions(+), 21 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index 51ac549486..35aaa4fc70 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -846,6 +846,9 @@ private void reloadActivityStyling() {
         if (mTermuxTerminalViewClient != null)
             mTermuxTerminalViewClient.onReload();
 
+        if (mTermuxService != null)
+            mTermuxService.setTerminalTranscriptRows();
+
         // To change the activity and drawer theme, activity needs to be recreated.
         // But this will destroy the activity, and will call the onCreate() again.
         // We need to investigate if enabling this is wise, since all stored variables and
diff --git a/app/src/main/java/com/termux/app/TermuxService.java b/app/src/main/java/com/termux/app/TermuxService.java
index 3457b7d8e3..71a4eb81c7 100644
--- a/app/src/main/java/com/termux/app/TermuxService.java
+++ b/app/src/main/java/com/termux/app/TermuxService.java
@@ -20,6 +20,7 @@
 import android.widget.ArrayAdapter;
 
 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.termux.TermuxConstants;
@@ -106,6 +107,8 @@ class LocalBinder extends Binder {
     /** 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
@@ -503,6 +506,7 @@ public synchronized TermuxSession createTermuxSession(ExecutionCommand execution
         // 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, sessionName, executionCommand.isPluginExecutionCommand);
         if (newTermuxSession == null) {
             Logger.logError(LOG_TAG, "Failed to execute new TermuxSession command for:\n" + executionCommand.getCommandIdAndLabelLogString());
@@ -560,6 +564,19 @@ public void onTermuxSessionExited(final TermuxSession termuxSession) {
         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);
+    }
+
 
 
 
diff --git a/app/src/main/java/com/termux/app/settings/properties/TermuxAppSharedProperties.java b/app/src/main/java/com/termux/app/settings/properties/TermuxAppSharedProperties.java
index 2ad4209532..6c2e03713a 100644
--- a/app/src/main/java/com/termux/app/settings/properties/TermuxAppSharedProperties.java
+++ b/app/src/main/java/com/termux/app/settings/properties/TermuxAppSharedProperties.java
@@ -5,7 +5,6 @@
 import com.termux.app.terminal.io.KeyboardShortcut;
 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;
 
@@ -17,7 +16,7 @@
 
 import javax.annotation.Nonnull;
 
-public class TermuxAppSharedProperties extends TermuxSharedProperties implements SharedPropertiesParser {
+public class TermuxAppSharedProperties extends TermuxSharedProperties {
 
     private ExtraKeysInfo mExtraKeysInfo;
     private List<KeyboardShortcut> mSessionShortcuts = new ArrayList<>();
@@ -96,4 +95,13 @@ public ExtraKeysInfo getExtraKeysInfo() {
         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.KEY_TERMINAL_TRANSCRIPT_ROWS);
+    }
+
 }
diff --git a/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java b/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
index f5fb10e855..7c04488d97 100644
--- a/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
+++ b/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
@@ -137,6 +137,11 @@ public final class TerminalEmulator {
     /** 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 normal screen buffer. Stores the characters that appear on the screen of the emulated terminal. */
     private final TerminalBuffer mMainBuffer;
     /**
@@ -294,9 +299,9 @@ static int mapDecSetBitToInternalBit(int decsetBit) {
         }
     }
 
-    public TerminalEmulator(TerminalOutput session, int columns, int rows, int transcriptRows, TerminalSessionClient client) {
+    public TerminalEmulator(TerminalOutput session, int columns, int rows, Integer transcriptRows, TerminalSessionClient client) {
         mSession = session;
-        mScreen = mMainBuffer = new TerminalBuffer(columns, transcriptRows, rows);
+        mScreen = mMainBuffer = new TerminalBuffer(columns, getTerminalTranscriptRows(transcriptRows), rows);
         mAltBuffer = new TerminalBuffer(columns, rows, rows);
         mClient = client;
         mRows = rows;
@@ -317,6 +322,13 @@ public boolean isAlternateBufferActive() {
         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.
      */
diff --git a/terminal-emulator/src/main/java/com/termux/terminal/TerminalSession.java b/terminal-emulator/src/main/java/com/termux/terminal/TerminalSession.java
index 688c8e58e7..3770827987 100644
--- a/terminal-emulator/src/main/java/com/termux/terminal/TerminalSession.java
+++ b/terminal-emulator/src/main/java/com/termux/terminal/TerminalSession.java
@@ -74,14 +74,17 @@ 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, TerminalSessionClient client) {
+    public TerminalSession(String shellPath, String cwd, String[] args, String[] env, Integer transcriptRows, TerminalSessionClient client) {
         this.mShellPath = shellPath;
         this.mCwd = cwd;
         this.mArgs = args;
         this.mEnv = env;
+        this.mTranscriptRows = transcriptRows;
         this.mClient = client;
     }
 
@@ -118,7 +121,7 @@ public String getTitle() {
      * @param rows    The number of rows in the terminal window.
      */
     public void initializeEmulator(int columns, int rows) {
-        mEmulator = new TerminalEmulator(this, columns, rows, /* transcript= */2000, mClient);
+        mEmulator = new TerminalEmulator(this, columns, rows, mTranscriptRows, mClient);
 
         int[] processId = new int[1];
         mTerminalFileDescriptor = JNI.createSubprocess(mShellPath, mCwd, mArgs, mEnv, processId, rows, columns);
diff --git a/termux-shared/src/main/java/com/termux/shared/models/ExecutionCommand.java b/termux-shared/src/main/java/com/termux/shared/models/ExecutionCommand.java
index 5ee3948faf..7fb8f96397 100644
--- a/termux-shared/src/main/java/com/termux/shared/models/ExecutionCommand.java
+++ b/termux-shared/src/main/java/com/termux/shared/models/ExecutionCommand.java
@@ -81,6 +81,10 @@ public int getValue() {
     public String workingDirectory;
 
 
+    /** The terminal transcript rows for the {@link ExecutionCommand}. */
+    public Integer terminalTranscriptRows;
+
+
     /** If the {@link ExecutionCommand} is a background or a foreground terminal session command. */
     public boolean inBackground;
     /** If the {@link ExecutionCommand} is meant to start a failsafe terminal session. */
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java b/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java
index 78a381cc25..3d1ae2823a 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java
@@ -3,6 +3,7 @@
 import com.google.common.collect.ImmutableBiMap;
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.logger.Logger;
+import com.termux.terminal.TerminalEmulator;
 import com.termux.view.TerminalView;
 
 import java.io.File;
@@ -11,7 +12,7 @@
 import java.util.Set;
 
 /*
- * Version: v0.10.0
+ * Version: v0.11.0
  *
  * Changelog
  *
@@ -49,6 +50,9 @@
  * - 0.10.0 (2021-05-15)
  *      - Add `MAP_BACK_KEY_BEHAVIOUR`, `MAP_SOFT_KEYBOARD_TOGGLE_BEHAVIOUR`, `MAP_VOLUME_KEYS_BEHAVIOUR`.
  *
+ * - 0.11.0 (2021-06-10)
+ *      - Add `*KEY_TERMINAL_TRANSCRIPT_ROWS*`.
+ *
  */
 
 /**
@@ -131,6 +135,14 @@ public final class TermuxPropertyConstants {
 
 
 
+    /** Defines the key for the terminal transcript rows */
+    public static final String KEY_TERMINAL_TRANSCRIPT_ROWS =  "terminal-transcript-rows"; // Default: "terminal-transcript-rows"
+    public static final int IVALUE_TERMINAL_TRANSCRIPT_ROWS_MIN = TerminalEmulator.TERMINAL_TRANSCRIPT_ROWS_MIN;
+    public static final int IVALUE_TERMINAL_TRANSCRIPT_ROWS_MAX = TerminalEmulator.TERMINAL_TRANSCRIPT_ROWS_MAX;
+    public static final int DEFAULT_IVALUE_TERMINAL_TRANSCRIPT_ROWS = TerminalEmulator.DEFAULT_TERMINAL_TRANSCRIPT_ROWS;
+
+
+
 
 
     /* float */
@@ -259,6 +271,7 @@ public final class TermuxPropertyConstants {
         /* int */
         KEY_BELL_BEHAVIOUR,
         KEY_TERMINAL_CURSOR_BLINK_RATE,
+        KEY_TERMINAL_TRANSCRIPT_ROWS,
 
         /* float */
         KEY_TERMINAL_TOOLBAR_HEIGHT_SCALE_FACTOR,
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxSharedProperties.java b/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxSharedProperties.java
index 2532a74eb0..16d0ce9c24 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxSharedProperties.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxSharedProperties.java
@@ -13,7 +13,7 @@
 
 import javax.annotation.Nonnull;
 
-public class TermuxSharedProperties implements SharedPropertiesParser {
+public class TermuxSharedProperties {
 
     protected final Context mContext;
     protected final SharedProperties mSharedProperties;
@@ -24,7 +24,7 @@ public class TermuxSharedProperties implements SharedPropertiesParser {
     public TermuxSharedProperties(@Nonnull Context context) {
         mContext = context;
         mPropertiesFile = TermuxPropertyConstants.getTermuxPropertiesFile();
-        mSharedProperties = new SharedProperties(context, mPropertiesFile, TermuxPropertyConstants.TERMUX_PROPERTIES_LIST, this);
+        mSharedProperties = new SharedProperties(context, mPropertiesFile, TermuxPropertyConstants.TERMUX_PROPERTIES_LIST, new SharedPropertiesParserClient());
         loadTermuxPropertiesFromDisk();
     }
 
@@ -146,24 +146,47 @@ public Object getInternalPropertyValue(String key, boolean cached) {
                 // {@link #loadTermuxPropertiesFromDisk()} call
                 // A null value can still be returned by
                 // {@link #getInternalPropertyValueFromValue(Context,String,String)} for some keys
-                value = getInternalPropertyValueFromValue(mContext, key, null);
+                value = getInternalTermuxPropertyValueFromValue(mContext, key, null);
                 Logger.logWarn(LOG_TAG, "The value for \"" + key + "\" not found in SharedProperties cache, force returning default value: `" + value +  "`");
                 return value;
             }
         } else {
             // We get the property value directly from file and return its internal value
-            return getInternalPropertyValueFromValue(mContext, key, mSharedProperties.getProperty(key, false));
+            return getInternalTermuxPropertyValueFromValue(mContext, key, mSharedProperties.getProperty(key, false));
         }
     }
 
+
+
+
+
     /**
-     * Override the
-     * {@link SharedPropertiesParser#getInternalPropertyValueFromValue(Context,String,String)}
-     * interface function.
+     * Get the internal {@link Object} value for the key passed from the file returned by
+     * {@link TermuxPropertyConstants#getTermuxPropertiesFile()}. The {@link Properties} object is
+     * read directly from the file and internal value is returned for the property value against the key.
+     *
+     * @param context The context for operations.
+     * @param key The key for which the internal object is required.
+     * @return Returns the {@link Object} object. This will be {@code null} if key is not found or
+     * the object stored against the key is {@code null}.
      */
-    @Override
-    public Object getInternalPropertyValueFromValue(Context context, String key, String value) {
-        return getInternalTermuxPropertyValueFromValue(context, key, value);
+    public static Object getInternalPropertyValue(Context context, String key) {
+        return SharedProperties.getInternalProperty(context, TermuxPropertyConstants.getTermuxPropertiesFile(), key, new SharedPropertiesParserClient());
+    }
+
+    /**
+     * The class that implements the {@link SharedPropertiesParser} interface.
+     */
+    public static class SharedPropertiesParserClient implements SharedPropertiesParser {
+        /**
+         * Override the
+         * {@link SharedPropertiesParser#getInternalPropertyValueFromValue(Context,String,String)}
+         * interface function.
+         */
+        @Override
+        public Object getInternalPropertyValueFromValue(Context context, String key, String value) {
+            return getInternalTermuxPropertyValueFromValue(context, key, value);
+        }
     }
 
     /**
@@ -194,6 +217,8 @@ public static Object getInternalTermuxPropertyValueFromValue(Context context, St
                 return (int) getBellBehaviourInternalPropertyValueFromValue(value);
             case TermuxPropertyConstants.KEY_TERMINAL_CURSOR_BLINK_RATE:
                 return (int) getTerminalCursorBlinkRateInternalPropertyValueFromValue(value);
+            case TermuxPropertyConstants.KEY_TERMINAL_TRANSCRIPT_ROWS:
+                return (int) getTerminalTranscriptRowsInternalPropertyValueFromValue(value);
 
             /* float */
             case TermuxPropertyConstants.KEY_TERMINAL_TOOLBAR_HEIGHT_SCALE_FACTOR:
@@ -263,9 +288,9 @@ public static int getBellBehaviourInternalPropertyValueFromValue(String value) {
 
     /**
      * Returns the int for the value if its not null and is between
-     * {@code TermuxPropertyConstants#IVALUE_TERMINAL_TOOLBAR_HEIGHT_SCALE_FACTOR_MIN} and
-     * {@code TermuxPropertyConstants#IVALUE_TERMINAL_TOOLBAR_HEIGHT_SCALE_FACTOR_MAX},
-     * otherwise returns {@code TermuxPropertyConstants#DEFAULT_IVALUE_TERMINAL_TOOLBAR_HEIGHT_SCALE_FACTOR}.
+     * {@code TermuxPropertyConstants#IVALUE_TERMINAL_CURSOR_BLINK_RATE_MIN} and
+     * {@code TermuxPropertyConstants#IVALUE_TERMINAL_CURSOR_BLINK_RATE_MAX},
+     * otherwise returns {@code TermuxPropertyConstants#DEFAULT_IVALUE_TERMINAL_CURSOR_BLINK_RATE}.
      *
      * @param value The {@link String} value to convert.
      * @return Returns the internal value for value.
@@ -279,6 +304,24 @@ public static float getTerminalCursorBlinkRateInternalPropertyValueFromValue(Str
                     true, true, LOG_TAG);
     }
 
+    /**
+     * Returns the int for the value if its not null and is between
+     * {@code TermuxPropertyConstants#IVALUE_TERMINAL_TRANSCRIPT_ROWS_MIN} and
+     * {@code TermuxPropertyConstants#IVALUE_TERMINAL_TRANSCRIPT_ROWS_MAX},
+     * otherwise returns {@code TermuxPropertyConstants#DEFAULT_IVALUE_TERMINAL_TRANSCRIPT_ROWS}.
+     *
+     * @param value The {@link String} value to convert.
+     * @return Returns the internal value for value.
+     */
+    public static float getTerminalTranscriptRowsInternalPropertyValueFromValue(String value) {
+        return SharedProperties.getDefaultIfNotInRange(TermuxPropertyConstants.KEY_TERMINAL_TRANSCRIPT_ROWS,
+            DataUtils.getIntFromString(value, TermuxPropertyConstants.DEFAULT_IVALUE_TERMINAL_TRANSCRIPT_ROWS),
+            TermuxPropertyConstants.DEFAULT_IVALUE_TERMINAL_TRANSCRIPT_ROWS,
+            TermuxPropertyConstants.IVALUE_TERMINAL_TRANSCRIPT_ROWS_MIN,
+            TermuxPropertyConstants.IVALUE_TERMINAL_TRANSCRIPT_ROWS_MAX,
+            true, true, LOG_TAG);
+    }
+
     /**
      * Returns the int for the value if its not null and is between
      * {@code TermuxPropertyConstants#IVALUE_TERMINAL_TOOLBAR_HEIGHT_SCALE_FACTOR_MIN} and
@@ -435,6 +478,10 @@ public int getTerminalCursorBlinkRate() {
         return (int) getInternalPropertyValue(TermuxPropertyConstants.KEY_TERMINAL_CURSOR_BLINK_RATE, true);
     }
 
+    public int getTerminalTranscriptRows() {
+        return (int) getInternalPropertyValue(TermuxPropertyConstants.KEY_TERMINAL_TRANSCRIPT_ROWS, true);
+    }
+
     public float getTerminalToolbarHeightScaleFactor() {
         return (float) getInternalPropertyValue(TermuxPropertyConstants.KEY_TERMINAL_TOOLBAR_HEIGHT_SCALE_FACTOR, true);
     }
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/TermuxSession.java b/termux-shared/src/main/java/com/termux/shared/shell/TermuxSession.java
index 825910b1cb..5bc654ce8b 100644
--- a/termux-shared/src/main/java/com/termux/shared/shell/TermuxSession.java
+++ b/termux-shared/src/main/java/com/termux/shared/shell/TermuxSession.java
@@ -109,7 +109,7 @@ public static TermuxSession execute(@NonNull final Context context, @NonNull Exe
         Logger.logDebug(LOG_TAG, executionCommand.toString());
 
         Logger.logDebug(LOG_TAG, "Running \"" + executionCommand.getCommandIdAndLabelLogString() + "\" TermuxSession");
-        TerminalSession terminalSession = new TerminalSession(executionCommand.executable, executionCommand.workingDirectory, executionCommand.arguments, environment, terminalSessionClient);
+        TerminalSession terminalSession = new TerminalSession(executionCommand.executable, executionCommand.workingDirectory, executionCommand.arguments, environment, executionCommand.terminalTranscriptRows, terminalSessionClient);
 
         if (sessionName != null) {
             terminalSession.mSessionName = sessionName;

From f545ebf0bd5b4f4ca0ba0c5b163be78b8f168904 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 10 Jun 2021 06:14:12 +0500
Subject: [PATCH 409/912] Allow users to set terminal cursor style with
 termux.properties
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This `terminal-cursor-style` key can be used to set the terminal cursor style. The user can set a string value to `block` for `■`, `underline` for `_` or `bar` for `|` cursor style. The default value is still `block`. So adding an entry like `terminal-cursor-style=bar` to `termux.properties` file will allow users to change to the `bar` cursor style. After updating the value, termux must be restarted. You can also run `termux-reload-settings` command so that termux loads the updated value, but only new sessions will use the updated value, existing sessions will not be affected unless you Reset them from terminal's long hold options menu `More` -> `Reset` or restart termux activity after double back press to exit.

You can temporarily switch to different cursor styles with (or add to `.bashrc` but resetting will restore default `bar` style):

- block: `echo -e "\033[2 q"`
- underline: `echo -e "\033[4 q"`
- bar: ` echo -e "\033[6 q"`

Closes #2075
---
 .../terminal/TermuxTerminalSessionClient.java |  7 +++
 .../com/termux/terminal/TerminalEmulator.java | 45 ++++++++++++++-----
 .../terminal/TerminalSessionClient.java       |  5 +++
 .../com/termux/terminal/TerminalTest.java     | 18 ++++----
 .../com/termux/view/TerminalRenderer.java     |  4 +-
 .../properties/TermuxPropertyConstants.java   | 27 ++++++++++-
 .../properties/TermuxSharedProperties.java    | 42 ++++++++++++-----
 .../TermuxTerminalSessionClientBase.java      |  7 +++
 8 files changed, 120 insertions(+), 35 deletions(-)

diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java
index 4e836aef38..8b4ec00062 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java
@@ -207,6 +207,13 @@ public void onTerminalCursorStateChange(boolean enabled) {
 
 
 
+    @Override
+    public Integer getTerminalCursorStyle() {
+        return mActivity.getProperties().getTerminalCursorStyle();
+    }
+
+
+
     /** Initialize and get mBellSoundPool */
     private synchronized SoundPool getBellSoundPool() {
         if (mBellSoundPool == null) {
diff --git a/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java b/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
index 7c04488d97..1fe8f0a9ca 100644
--- a/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
+++ b/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
@@ -38,10 +38,6 @@ 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;
 
@@ -126,14 +122,14 @@ 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;
 
@@ -142,6 +138,19 @@ public final class TerminalEmulator {
     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;
     /**
@@ -312,6 +321,7 @@ public TerminalEmulator(TerminalOutput session, int columns, int rows, Integer t
 
     public void updateTerminalSessionClient(TerminalSessionClient client) {
         mClient = client;
+        setCursorStyle();
     }
 
     public TerminalBuffer getScreen() {
@@ -396,11 +406,24 @@ public int getCursorCol() {
         return mCursorCol;
     }
 
-    /** {@link #CURSOR_STYLE_BAR}, {@link #CURSOR_STYLE_BLOCK} or {@link #CURSOR_STYLE_UNDERLINE} */
+    /** Get the terminal cursor style. It will be one of {@link #TERMINAL_CURSOR_STYLES_LIST} */
     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);
     }
@@ -818,15 +841,15 @@ public void processCodePoint(int b) {
                                     case 0: // Blinking block.
                                     case 1: // Blinking block.
                                     case 2: // Steady block.
-                                        mCursorStyle = CURSOR_STYLE_BLOCK;
+                                        mCursorStyle = TERMINAL_CURSOR_STYLE_BLOCK;
                                         break;
                                     case 3: // Blinking underline.
                                     case 4: // Steady underline.
-                                        mCursorStyle = CURSOR_STYLE_UNDERLINE;
+                                        mCursorStyle = TERMINAL_CURSOR_STYLE_UNDERLINE;
                                         break;
                                     case 5: // Blinking bar (xterm addition).
                                     case 6: // Steady bar (xterm addition).
-                                        mCursorStyle = CURSOR_STYLE_BAR;
+                                        mCursorStyle = TERMINAL_CURSOR_STYLE_BAR;
                                         break;
                                 }
                                 break;
@@ -2342,7 +2365,7 @@ public void clearScrollCounter() {
 
     /** Reset terminal state so user can interact with it regardless of present state. */
     public void reset() {
-        mCursorStyle = CURSOR_STYLE_BLOCK;
+        setCursorStyle();
         mArgIndex = 0;
         mContinueSequence = false;
         mEscapeState = ESC_NONE;
diff --git a/terminal-emulator/src/main/java/com/termux/terminal/TerminalSessionClient.java b/terminal-emulator/src/main/java/com/termux/terminal/TerminalSessionClient.java
index 9c99803023..f8d83d061e 100644
--- a/terminal-emulator/src/main/java/com/termux/terminal/TerminalSessionClient.java
+++ b/terminal-emulator/src/main/java/com/termux/terminal/TerminalSessionClient.java
@@ -22,6 +22,11 @@ public interface TerminalSessionClient {
     void onTerminalCursorStateChange(boolean state);
 
 
+
+    Integer getTerminalCursorStyle();
+
+
+
     void logError(String tag, String message);
 
     void logWarn(String tag, String message);
diff --git a/terminal-emulator/src/test/java/com/termux/terminal/TerminalTest.java b/terminal-emulator/src/test/java/com/termux/terminal/TerminalTest.java
index af63fda104..390c0496ec 100644
--- a/terminal-emulator/src/test/java/com/termux/terminal/TerminalTest.java
+++ b/terminal-emulator/src/test/java/com/termux/terminal/TerminalTest.java
@@ -103,23 +103,23 @@ public void testDeviceStatusReport() throws Exception {
 	/** Test the cursor shape changes using DECSCUSR. */
 	public void testSetCursorStyle() throws Exception {
 		withTerminalSized(5, 5);
-		assertEquals(TerminalEmulator.CURSOR_STYLE_BLOCK, mTerminal.getCursorStyle());
+		assertEquals(TerminalEmulator.TERMINAL_CURSOR_STYLE_BLOCK, mTerminal.getCursorStyle());
 		enterString("\033[3 q");
-		assertEquals(TerminalEmulator.CURSOR_STYLE_UNDERLINE, mTerminal.getCursorStyle());
+		assertEquals(TerminalEmulator.TERMINAL_CURSOR_STYLE_UNDERLINE, mTerminal.getCursorStyle());
 		enterString("\033[5 q");
-		assertEquals(TerminalEmulator.CURSOR_STYLE_BAR, mTerminal.getCursorStyle());
+		assertEquals(TerminalEmulator.TERMINAL_CURSOR_STYLE_BAR, mTerminal.getCursorStyle());
 		enterString("\033[0 q");
-		assertEquals(TerminalEmulator.CURSOR_STYLE_BLOCK, mTerminal.getCursorStyle());
+		assertEquals(TerminalEmulator.TERMINAL_CURSOR_STYLE_BLOCK, mTerminal.getCursorStyle());
 		enterString("\033[6 q");
-		assertEquals(TerminalEmulator.CURSOR_STYLE_BAR, mTerminal.getCursorStyle());
+		assertEquals(TerminalEmulator.TERMINAL_CURSOR_STYLE_BAR, mTerminal.getCursorStyle());
 		enterString("\033[4 q");
-		assertEquals(TerminalEmulator.CURSOR_STYLE_UNDERLINE, mTerminal.getCursorStyle());
+		assertEquals(TerminalEmulator.TERMINAL_CURSOR_STYLE_UNDERLINE, mTerminal.getCursorStyle());
 		enterString("\033[1 q");
-		assertEquals(TerminalEmulator.CURSOR_STYLE_BLOCK, mTerminal.getCursorStyle());
+		assertEquals(TerminalEmulator.TERMINAL_CURSOR_STYLE_BLOCK, mTerminal.getCursorStyle());
 		enterString("\033[4 q");
-		assertEquals(TerminalEmulator.CURSOR_STYLE_UNDERLINE, mTerminal.getCursorStyle());
+		assertEquals(TerminalEmulator.TERMINAL_CURSOR_STYLE_UNDERLINE, mTerminal.getCursorStyle());
 		enterString("\033[2 q");
-		assertEquals(TerminalEmulator.CURSOR_STYLE_BLOCK, mTerminal.getCursorStyle());
+		assertEquals(TerminalEmulator.TERMINAL_CURSOR_STYLE_BLOCK, mTerminal.getCursorStyle());
 	}
 
 	public void testPaste() {
diff --git a/terminal-view/src/main/java/com/termux/view/TerminalRenderer.java b/terminal-view/src/main/java/com/termux/view/TerminalRenderer.java
index 6189dd6712..f9c5b53aab 100644
--- a/terminal-view/src/main/java/com/termux/view/TerminalRenderer.java
+++ b/terminal-view/src/main/java/com/termux/view/TerminalRenderer.java
@@ -200,8 +200,8 @@ private void drawTextRun(Canvas canvas, char[] text, int[] palette, float y, int
         if (cursor != 0) {
             mTextPaint.setColor(cursor);
             float cursorHeight = mFontLineSpacingAndAscent - mFontAscent;
-            if (cursorStyle == TerminalEmulator.CURSOR_STYLE_UNDERLINE) cursorHeight /= 4.;
-            else if (cursorStyle == TerminalEmulator.CURSOR_STYLE_BAR) right -= ((right - left) * 3) / 4.;
+            if (cursorStyle == TerminalEmulator.TERMINAL_CURSOR_STYLE_UNDERLINE) cursorHeight /= 4.;
+            else if (cursorStyle == TerminalEmulator.TERMINAL_CURSOR_STYLE_BAR) right -= ((right - left) * 3) / 4.;
             canvas.drawRect(left, y - cursorHeight, right, y, mTextPaint);
         }
 
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java b/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java
index 3d1ae2823a..02fe3ed1a3 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java
@@ -12,7 +12,7 @@
 import java.util.Set;
 
 /*
- * Version: v0.11.0
+ * Version: v0.12.0
  *
  * Changelog
  *
@@ -53,6 +53,8 @@
  * - 0.11.0 (2021-06-10)
  *      - Add `*KEY_TERMINAL_TRANSCRIPT_ROWS*`.
  *
+ * - 0.12.0 (2021-06-10)
+ *      - Add `*KEY_TERMINAL_CURSOR_STYLE*`.
  */
 
 /**
@@ -135,6 +137,28 @@ public final class TermuxPropertyConstants {
 
 
 
+    /** Defines the key for the terminal cursor style */
+    public static final String KEY_TERMINAL_CURSOR_STYLE =  "terminal-cursor-style"; // Default: "terminal-cursor-style"
+
+    public static final String VALUE_TERMINAL_CURSOR_STYLE_BLOCK = "block";
+    public static final String VALUE_TERMINAL_CURSOR_STYLE_UNDERLINE = "underline";
+    public static final String VALUE_TERMINAL_CURSOR_STYLE_BAR = "bar";
+
+    public static final int IVALUE_TERMINAL_CURSOR_STYLE_BLOCK = TerminalEmulator.TERMINAL_CURSOR_STYLE_BLOCK;
+    public static final int IVALUE_TERMINAL_CURSOR_STYLE_UNDERLINE = TerminalEmulator.TERMINAL_CURSOR_STYLE_UNDERLINE;
+    public static final int IVALUE_TERMINAL_CURSOR_STYLE_BAR = TerminalEmulator.TERMINAL_CURSOR_STYLE_BAR;
+    public static final int DEFAULT_IVALUE_TERMINAL_CURSOR_STYLE = TerminalEmulator.DEFAULT_TERMINAL_CURSOR_STYLE;
+
+    /** Defines the bidirectional map for terminal cursor styles and their internal values */
+    public static final ImmutableBiMap<String, Integer> MAP_TERMINAL_CURSOR_STYLE =
+        new ImmutableBiMap.Builder<String, Integer>()
+            .put(VALUE_TERMINAL_CURSOR_STYLE_BLOCK, IVALUE_TERMINAL_CURSOR_STYLE_BLOCK)
+            .put(VALUE_TERMINAL_CURSOR_STYLE_UNDERLINE, IVALUE_TERMINAL_CURSOR_STYLE_UNDERLINE)
+            .put(VALUE_TERMINAL_CURSOR_STYLE_BAR, IVALUE_TERMINAL_CURSOR_STYLE_BAR)
+            .build();
+
+
+
     /** Defines the key for the terminal transcript rows */
     public static final String KEY_TERMINAL_TRANSCRIPT_ROWS =  "terminal-transcript-rows"; // Default: "terminal-transcript-rows"
     public static final int IVALUE_TERMINAL_TRANSCRIPT_ROWS_MIN = TerminalEmulator.TERMINAL_TRANSCRIPT_ROWS_MIN;
@@ -271,6 +295,7 @@ public final class TermuxPropertyConstants {
         /* int */
         KEY_BELL_BEHAVIOUR,
         KEY_TERMINAL_CURSOR_BLINK_RATE,
+        KEY_TERMINAL_CURSOR_STYLE,
         KEY_TERMINAL_TRANSCRIPT_ROWS,
 
         /* float */
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxSharedProperties.java b/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxSharedProperties.java
index 16d0ce9c24..1ffc8f3bb0 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxSharedProperties.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxSharedProperties.java
@@ -217,6 +217,8 @@ public static Object getInternalTermuxPropertyValueFromValue(Context context, St
                 return (int) getBellBehaviourInternalPropertyValueFromValue(value);
             case TermuxPropertyConstants.KEY_TERMINAL_CURSOR_BLINK_RATE:
                 return (int) getTerminalCursorBlinkRateInternalPropertyValueFromValue(value);
+            case TermuxPropertyConstants.KEY_TERMINAL_CURSOR_STYLE:
+                return (int) getTerminalCursorStyleInternalPropertyValueFromValue(value);
             case TermuxPropertyConstants.KEY_TERMINAL_TRANSCRIPT_ROWS:
                 return (int) getTerminalTranscriptRowsInternalPropertyValueFromValue(value);
 
@@ -277,7 +279,7 @@ public static boolean getUseBlackUIInternalPropertyValueFromValue(Context contex
     /**
      * Returns the internal value after mapping it based on
      * {@code TermuxPropertyConstants#MAP_BELL_BEHAVIOUR} if the value is not {@code null}
-     * and is valid, otherwise returns {@code TermuxPropertyConstants#DEFAULT_IVALUE_BELL_BEHAVIOUR}.
+     * and is valid, otherwise returns {@link TermuxPropertyConstants#DEFAULT_IVALUE_BELL_BEHAVIOUR}.
      *
      * @param value The {@link String} value to convert.
      * @return Returns the internal value for value.
@@ -288,14 +290,14 @@ public static int getBellBehaviourInternalPropertyValueFromValue(String value) {
 
     /**
      * Returns the int for the value if its not null and is between
-     * {@code TermuxPropertyConstants#IVALUE_TERMINAL_CURSOR_BLINK_RATE_MIN} and
-     * {@code TermuxPropertyConstants#IVALUE_TERMINAL_CURSOR_BLINK_RATE_MAX},
-     * otherwise returns {@code TermuxPropertyConstants#DEFAULT_IVALUE_TERMINAL_CURSOR_BLINK_RATE}.
+     * {@link TermuxPropertyConstants#IVALUE_TERMINAL_CURSOR_BLINK_RATE_MIN} and
+     * {@link TermuxPropertyConstants#IVALUE_TERMINAL_CURSOR_BLINK_RATE_MAX},
+     * otherwise returns {@link TermuxPropertyConstants#DEFAULT_IVALUE_TERMINAL_CURSOR_BLINK_RATE}.
      *
      * @param value The {@link String} value to convert.
      * @return Returns the internal value for value.
      */
-    public static float getTerminalCursorBlinkRateInternalPropertyValueFromValue(String value) {
+    public static int getTerminalCursorBlinkRateInternalPropertyValueFromValue(String value) {
         return SharedProperties.getDefaultIfNotInRange(TermuxPropertyConstants.KEY_TERMINAL_CURSOR_BLINK_RATE,
                     DataUtils.getIntFromString(value, TermuxPropertyConstants.DEFAULT_IVALUE_TERMINAL_CURSOR_BLINK_RATE),
                     TermuxPropertyConstants.DEFAULT_IVALUE_TERMINAL_CURSOR_BLINK_RATE,
@@ -304,16 +306,28 @@ public static float getTerminalCursorBlinkRateInternalPropertyValueFromValue(Str
                     true, true, LOG_TAG);
     }
 
+    /**
+     * Returns the internal value after mapping it based on
+     * {@link TermuxPropertyConstants#MAP_TERMINAL_CURSOR_STYLE} if the value is not {@code null}
+     * and is valid, otherwise returns {@link TermuxPropertyConstants#DEFAULT_IVALUE_TERMINAL_CURSOR_STYLE}.
+     *
+     * @param value The {@link String} value to convert.
+     * @return Returns the internal value for value.
+     */
+    public static int getTerminalCursorStyleInternalPropertyValueFromValue(String value) {
+        return (int) SharedProperties.getDefaultIfNotInMap(TermuxPropertyConstants.KEY_TERMINAL_CURSOR_STYLE, TermuxPropertyConstants.MAP_TERMINAL_CURSOR_STYLE, SharedProperties.toLowerCase(value), TermuxPropertyConstants.DEFAULT_IVALUE_TERMINAL_CURSOR_STYLE, true, LOG_TAG);
+    }
+
     /**
      * Returns the int for the value if its not null and is between
-     * {@code TermuxPropertyConstants#IVALUE_TERMINAL_TRANSCRIPT_ROWS_MIN} and
-     * {@code TermuxPropertyConstants#IVALUE_TERMINAL_TRANSCRIPT_ROWS_MAX},
-     * otherwise returns {@code TermuxPropertyConstants#DEFAULT_IVALUE_TERMINAL_TRANSCRIPT_ROWS}.
+     * {@link TermuxPropertyConstants#IVALUE_TERMINAL_TRANSCRIPT_ROWS_MIN} and
+     * {@link TermuxPropertyConstants#IVALUE_TERMINAL_TRANSCRIPT_ROWS_MAX},
+     * otherwise returns {@link TermuxPropertyConstants#DEFAULT_IVALUE_TERMINAL_TRANSCRIPT_ROWS}.
      *
      * @param value The {@link String} value to convert.
      * @return Returns the internal value for value.
      */
-    public static float getTerminalTranscriptRowsInternalPropertyValueFromValue(String value) {
+    public static int getTerminalTranscriptRowsInternalPropertyValueFromValue(String value) {
         return SharedProperties.getDefaultIfNotInRange(TermuxPropertyConstants.KEY_TERMINAL_TRANSCRIPT_ROWS,
             DataUtils.getIntFromString(value, TermuxPropertyConstants.DEFAULT_IVALUE_TERMINAL_TRANSCRIPT_ROWS),
             TermuxPropertyConstants.DEFAULT_IVALUE_TERMINAL_TRANSCRIPT_ROWS,
@@ -324,9 +338,9 @@ public static float getTerminalTranscriptRowsInternalPropertyValueFromValue(Stri
 
     /**
      * Returns the int for the value if its not null and is between
-     * {@code TermuxPropertyConstants#IVALUE_TERMINAL_TOOLBAR_HEIGHT_SCALE_FACTOR_MIN} and
-     * {@code TermuxPropertyConstants#IVALUE_TERMINAL_TOOLBAR_HEIGHT_SCALE_FACTOR_MAX},
-     * otherwise returns {@code TermuxPropertyConstants#DEFAULT_IVALUE_TERMINAL_TOOLBAR_HEIGHT_SCALE_FACTOR}.
+     * {@link TermuxPropertyConstants#IVALUE_TERMINAL_TOOLBAR_HEIGHT_SCALE_FACTOR_MIN} and
+     * {@link TermuxPropertyConstants#IVALUE_TERMINAL_TOOLBAR_HEIGHT_SCALE_FACTOR_MAX},
+     * otherwise returns {@link TermuxPropertyConstants#DEFAULT_IVALUE_TERMINAL_TOOLBAR_HEIGHT_SCALE_FACTOR}.
      *
      * @param value The {@link String} value to convert.
      * @return Returns the internal value for value.
@@ -478,6 +492,10 @@ public int getTerminalCursorBlinkRate() {
         return (int) getInternalPropertyValue(TermuxPropertyConstants.KEY_TERMINAL_CURSOR_BLINK_RATE, true);
     }
 
+    public int getTerminalCursorStyle() {
+        return (int) getInternalPropertyValue(TermuxPropertyConstants.KEY_TERMINAL_CURSOR_STYLE, true);
+    }
+
     public int getTerminalTranscriptRows() {
         return (int) getInternalPropertyValue(TermuxPropertyConstants.KEY_TERMINAL_TRANSCRIPT_ROWS, true);
     }
diff --git a/termux-shared/src/main/java/com/termux/shared/terminal/TermuxTerminalSessionClientBase.java b/termux-shared/src/main/java/com/termux/shared/terminal/TermuxTerminalSessionClientBase.java
index 6261972b8a..6df69a723f 100644
--- a/termux-shared/src/main/java/com/termux/shared/terminal/TermuxTerminalSessionClientBase.java
+++ b/termux-shared/src/main/java/com/termux/shared/terminal/TermuxTerminalSessionClientBase.java
@@ -39,6 +39,13 @@ public void onTerminalCursorStateChange(boolean state) {
 
 
 
+    @Override
+    public Integer getTerminalCursorStyle() {
+        return null;
+    }
+
+
+
     @Override
     public void logError(String tag, String message) {
         Logger.logError(tag, message);

From e119d34bcaf16ffa68300e7dc0140918d01c1622 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 10 Jun 2021 08:03:12 +0500
Subject: [PATCH 410/912] Fix issue where terminal cursor blinking would not
 automatically start again if termux activity was restarted after exiting it
 with double back press

---
 .../terminal/TermuxTerminalViewClient.java    | 22 +++++++++++++++++--
 .../com/termux/terminal/TerminalEmulator.java |  1 +
 .../java/com/termux/view/TerminalView.java    |  9 +++++++-
 .../com/termux/view/TerminalViewClient.java   |  2 ++
 .../TermuxTerminalViewClientBase.java         |  5 +++++
 5 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
index 611e8ce246..6d49e9cc01 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
@@ -60,6 +60,8 @@ public class TermuxTerminalViewClient extends TermuxTerminalViewClientBase {
     private boolean mShowSoftKeyboardIgnoreOnce;
     private boolean mShowSoftKeyboardWithDelayOnce;
 
+    private boolean mTerminalCursorBlinkerStateAlreadySet;
+
     private static final String LOG_TAG = "TermuxTerminalViewClient";
 
     public TermuxTerminalViewClient(TermuxActivity activity, TermuxTerminalSessionClient termuxTerminalSessionClient) {
@@ -95,8 +97,7 @@ public void onResume() {
         // Show the soft keyboard if required
         setSoftKeyboardState(true, false);
 
-        // Start terminal cursor blinking if enabled
-        setTerminalCursorBlinkerState(true);
+        mTerminalCursorBlinkerStateAlreadySet = false;
     }
 
     /**
@@ -118,6 +119,23 @@ public void onReload() {
         setTerminalCursorBlinkerState(true);
     }
 
+    /**
+     * Should be called when {@link com.termux.view.TerminalView#mEmulator}
+     */
+    @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
diff --git a/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java b/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
index 1fe8f0a9ca..1bd5adc536 100644
--- a/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
+++ b/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
@@ -322,6 +322,7 @@ public TerminalEmulator(TerminalOutput session, int columns, int rows, Integer t
     public void updateTerminalSessionClient(TerminalSessionClient client) {
         mClient = client;
         setCursorStyle();
+        setCursorBlinkState(true);
     }
 
     public TerminalBuffer getScreen() {
diff --git a/terminal-view/src/main/java/com/termux/view/TerminalView.java b/terminal-view/src/main/java/com/termux/view/TerminalView.java
index 5f72bbeea1..84756fed35 100644
--- a/terminal-view/src/main/java/com/termux/view/TerminalView.java
+++ b/terminal-view/src/main/java/com/termux/view/TerminalView.java
@@ -755,6 +755,7 @@ public void updateSize() {
         if (mEmulator == null || (newColumns != mEmulator.mColumns || newRows != mEmulator.mRows)) {
             mTermSession.updateSize(newColumns, newRows);
             mEmulator = mTermSession.getEmulator();
+            mClient.onEmulatorSet();
 
             mTopRow = 0;
             scrollTo(0, 0);
@@ -880,7 +881,13 @@ public synchronized boolean setTerminalCursorBlinkerRate(int blinkRate) {
      * {@link #TERMINAL_CURSOR_BLINK_RATE_MIN} and {@link #TERMINAL_CURSOR_BLINK_RATE_MAX}.
      *
      * This should be called when the view holding this activity is resumed or stopped so that
-     * cursor blinker does not run when activity is not visible.
+     * cursor blinker does not run when activity is not visible. Ensure that {@link #mEmulator}
+     * is set when you call this to start cursor blinking by waiting for {@link TerminalViewClient#onEmulatorSet()}
+     * event after calling {@link #attachSession(TerminalSession)} for the first session added in the
+     * activity, otherwise blinking will not start. Do not call this directly after
+     * {@link #attachSession(TerminalSession)} since {@link #updateSize()} may return without
+     * setting {@link #mEmulator} since width/height may be 0. Its called again in
+     * {@link #onSizeChanged(int, int, int, int)}.
      *
      * It should also be called on the
      * {@link com.termux.terminal.TerminalSessionClient#onTerminalCursorStateChange(boolean)}
diff --git a/terminal-view/src/main/java/com/termux/view/TerminalViewClient.java b/terminal-view/src/main/java/com/termux/view/TerminalViewClient.java
index 3e454f9a23..c1f9f94a86 100644
--- a/terminal-view/src/main/java/com/termux/view/TerminalViewClient.java
+++ b/terminal-view/src/main/java/com/termux/view/TerminalViewClient.java
@@ -56,6 +56,8 @@ public interface TerminalViewClient {
     boolean onCodePoint(int codePoint, boolean ctrlDown, TerminalSession session);
 
 
+    void onEmulatorSet();
+
 
     void logError(String tag, String message);
 
diff --git a/termux-shared/src/main/java/com/termux/shared/terminal/TermuxTerminalViewClientBase.java b/termux-shared/src/main/java/com/termux/shared/terminal/TermuxTerminalViewClientBase.java
index 701582ad69..7f0648d8df 100644
--- a/termux-shared/src/main/java/com/termux/shared/terminal/TermuxTerminalViewClientBase.java
+++ b/termux-shared/src/main/java/com/termux/shared/terminal/TermuxTerminalViewClientBase.java
@@ -67,6 +67,11 @@ public boolean onCodePoint(int codePoint, boolean ctrlDown, TerminalSession sess
         return false;
     }
 
+    @Override
+    public void onEmulatorSet() {
+
+    }
+
     @Override
     public void logError(String tag, String message) {
         Logger.logError(tag, message);

From 19c690d02ba76133d492479b74340d807b9a24c7 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 10 Jun 2021 08:06:43 +0500
Subject: [PATCH 411/912] Fix issue where if termux installer failed with an
 exception after prefix directory was already created, then try again would
 load a broken environment.

---
 app/src/main/java/com/termux/app/TermuxInstaller.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/com/termux/app/TermuxInstaller.java b/app/src/main/java/com/termux/app/TermuxInstaller.java
index 0bcff56f12..7a1b5456a8 100644
--- a/app/src/main/java/com/termux/app/TermuxInstaller.java
+++ b/app/src/main/java/com/termux/app/TermuxInstaller.java
@@ -173,6 +173,7 @@ public void run() {
                                     activity.finish();
                                 }).setPositiveButton(R.string.bootstrap_error_try_again, (dialog, which) -> {
                                 dialog.dismiss();
+                                FileUtils.deleteFile(activity, "prefix directory", PREFIX_FILE_PATH, true);
                                 TermuxInstaller.setupBootstrapIfNeeded(activity, whenDone);
                             }).show();
                         } catch (WindowManager.BadTokenException e1) {

From fd80cdaf23f7d364b7c60717743d818d45f5e2a3 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Fri, 11 Jun 2021 02:39:11 +0500
Subject: [PATCH 412/912] Change default extra keys style

If a user does not define a custom value in termux.properties file, then by default 2 rows will be shown with all arrow keys (up/down/left/right) for ease of terminal use.
---
 .../shared/settings/properties/TermuxPropertyConstants.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java b/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java
index 02fe3ed1a3..b3e426ec5e 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java
@@ -237,7 +237,8 @@ public final class TermuxPropertyConstants {
 
     /** Defines the key for extra keys */
     public static final String KEY_EXTRA_KEYS =  "extra-keys"; // Default: "extra-keys"
-    public static final String DEFAULT_IVALUE_EXTRA_KEYS = "[[ESC, TAB, CTRL, ALT, {key: '-', popup: '|'}, DOWN, UP]]";
+    //public static final String DEFAULT_IVALUE_EXTRA_KEYS = "[[ESC, TAB, CTRL, ALT, {key: '-', popup: '|'}, DOWN, UP]]"; // Single row
+    public static final String DEFAULT_IVALUE_EXTRA_KEYS = "[['ESC','/',{key: '-', popup: '|'},'HOME','UP','END','PGUP'], ['TAB','CTRL','ALT','LEFT','DOWN','RIGHT','PGDN']]"; // Double row
 
     /** Defines the key for extra keys style */
     public static final String KEY_EXTRA_KEYS_STYLE =  "extra-keys-style"; // Default: "extra-keys-style"

From 7ac62c984053bd56740b18bd92ccab3220258dbc Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Fri, 11 Jun 2021 02:54:47 +0500
Subject: [PATCH 413/912] Allow users to disable terminal session change toast

The user can add `disable-terminal-session-change-toast=true` entry to `termux.properties` file to disable terminal session change toast. The default value is `false`. Running `termux-reload-settings` command will also update the behaviour instantaneously if changed.

Closes #2118
---
 .../termux/app/terminal/TermuxTerminalSessionClient.java   | 6 ++++--
 .../settings/properties/TermuxPropertyConstants.java       | 7 +++++++
 .../shared/settings/properties/TermuxSharedProperties.java | 4 ++++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java
index 8b4ec00062..312a548333 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java
@@ -255,8 +255,10 @@ public void setCurrentSession(TerminalSession session) {
     void notifyOfSessionChange() {
         if (!mActivity.isVisible()) return;
 
-        TerminalSession session = mActivity.getCurrentSession();
-        mActivity.showToast(toToastTitle(session), false);
+        if (!mActivity.getProperties().areTerminalSessionChangeToastsDisabled()) {
+            TerminalSession session = mActivity.getCurrentSession();
+            mActivity.showToast(toToastTitle(session), false);
+        }
     }
 
     public void switchToSession(boolean forward) {
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java b/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java
index b3e426ec5e..75ea1cf863 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java
@@ -72,6 +72,11 @@ public final class TermuxPropertyConstants {
 
     /* boolean */
 
+    /** Defines the key for whether a toast will be shown when user changes the terminal session */
+    public static final String KEY_DISABLE_TERMINAL_SESSION_CHANGE_TOAST =  "disable-terminal-session-change-toast"; // Default: "disable-terminal-session-change-toast"
+
+
+
     /** Defines the key for whether to enforce character based input to fix the issue where for some devices like Samsung, the letters might not appear until enter is pressed */
     public static final String KEY_ENFORCE_CHAR_BASED_INPUT =  "enforce-char-based-input"; // Default: "enforce-char-based-input"
 
@@ -285,6 +290,7 @@ public final class TermuxPropertyConstants {
      * */
     public static final Set<String> TERMUX_PROPERTIES_LIST = new HashSet<>(Arrays.asList(
         /* boolean */
+        KEY_DISABLE_TERMINAL_SESSION_CHANGE_TOAST,
         KEY_ENFORCE_CHAR_BASED_INPUT,
         KEY_HIDE_SOFT_KEYBOARD_ON_STARTUP,
         KEY_USE_BLACK_UI,
@@ -323,6 +329,7 @@ public final class TermuxPropertyConstants {
      * default: false
      * */
     public static final Set<String> TERMUX_DEFAULT_BOOLEAN_BEHAVIOUR_PROPERTIES_LIST = new HashSet<>(Arrays.asList(
+        KEY_DISABLE_TERMINAL_SESSION_CHANGE_TOAST,
         KEY_ENFORCE_CHAR_BASED_INPUT,
         KEY_HIDE_SOFT_KEYBOARD_ON_STARTUP,
         KEY_USE_CTRL_SPACE_WORKAROUND,
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxSharedProperties.java b/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxSharedProperties.java
index 1ffc8f3bb0..c253a7dab3 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxSharedProperties.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxSharedProperties.java
@@ -460,6 +460,10 @@ public static String getVolumeKeysBehaviourInternalPropertyValueFromValue(String
 
 
 
+    public boolean areTerminalSessionChangeToastsDisabled() {
+        return (boolean) getInternalPropertyValue(TermuxPropertyConstants.KEY_DISABLE_TERMINAL_SESSION_CHANGE_TOAST, true);
+    }
+
     public boolean isEnforcingCharBasedInput() {
         return (boolean) getInternalPropertyValue(TermuxPropertyConstants.KEY_ENFORCE_CHAR_BASED_INPUT, true);
     }

From 4dfed3320e088cf888ad1600da4bd3148f06c3ed Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Fri, 11 Jun 2021 02:57:56 +0500
Subject: [PATCH 414/912] Bump to v0.114

---
 app/build.gradle               | 4 ++--
 terminal-emulator/build.gradle | 2 +-
 terminal-view/build.gradle     | 2 +-
 termux-shared/build.gradle     | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 3d6273e416..c63e735e12 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -26,8 +26,8 @@ android {
         applicationId "com.termux"
         minSdkVersion project.properties.minSdkVersion.toInteger()
         targetSdkVersion project.properties.targetSdkVersion.toInteger()
-        versionCode 113
-        versionName "0.113"
+        versionCode 114
+        versionName "0.114"
 
         manifestPlaceholders.TERMUX_PACKAGE_NAME = "com.termux"
         manifestPlaceholders.TERMUX_APP_NAME = "Termux"
diff --git a/terminal-emulator/build.gradle b/terminal-emulator/build.gradle
index 0ca52b83bf..bffcd6816a 100644
--- a/terminal-emulator/build.gradle
+++ b/terminal-emulator/build.gradle
@@ -63,7 +63,7 @@ publishing {
         bar(MavenPublication) {
             groupId 'com.termux'
             artifactId 'terminal-emulator'
-            version "0.113"
+            version "0.114"
             artifact(sourceJar)
             artifact("$buildDir/outputs/aar/terminal-emulator-release.aar")
         }
diff --git a/terminal-view/build.gradle b/terminal-view/build.gradle
index c2273772c6..0957b12520 100644
--- a/terminal-view/build.gradle
+++ b/terminal-view/build.gradle
@@ -42,7 +42,7 @@ publishing {
         bar(MavenPublication) {
             groupId 'com.termux'
             artifactId 'terminal-view'
-            version "0.113"
+            version "0.114"
             artifact(sourceJar)
             artifact("$buildDir/outputs/aar/terminal-view-release.aar")
         }
diff --git a/termux-shared/build.gradle b/termux-shared/build.gradle
index 74128b0b6c..3364cdc765 100644
--- a/termux-shared/build.gradle
+++ b/termux-shared/build.gradle
@@ -57,7 +57,7 @@ publishing {
         bar(MavenPublication) {
             groupId 'com.termux'
             artifactId 'termux-shared'
-            version "0.113"
+            version "0.114"
             artifact(sourceJar)
             artifact("$buildDir/outputs/aar/termux-shared-release.aar")
         }

From 0fb18c0c8bc978c7487a2f8350ca05ae412c18dd Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sun, 13 Jun 2021 00:25:09 +0500
Subject: [PATCH 415/912] Remove left over lines from gradle.properties

---
 gradle.properties | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 5db9519171..c8f9ae0514 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -15,9 +15,6 @@
 org.gradle.jvmargs=-Xmx2048M
 android.useAndroidX=true
 
-termuxVersion=0.111
-termuxVersionCode=111
-
 minSdkVersion=24
 targetSdkVersion=28
 ndkVersion=22.1.7171670

From f0f6927273b964c49a0efeb52badb43204fa0187 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sun, 13 Jun 2021 00:29:52 +0500
Subject: [PATCH 416/912] Rename variable

---
 .../java/com/termux/shared/termux/TermuxConstants.java | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
index 3d79dee7d7..7961920146 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
@@ -7,7 +7,7 @@
 import java.util.List;
 
 /*
- * Version: v0.21.0
+ * Version: v0.23.0
  *
  * Changelog
  *
@@ -150,6 +150,8 @@
  * - 0.22.0 (2021-05-13)
  *      - Added `TERMUX_DONATE_URL`.
  *
+ * - 0.23.0 (2021-06-12)
+ *      - Rename `INTERNAL_PRIVATE_APP_DATA_DIR_PATH` to `TERMUX_INTERNAL_PRIVATE_APP_DATA_DIR_PATH`.
  */
 
 /**
@@ -464,14 +466,14 @@ public final class TermuxConstants {
 
     /** Termux app internal private app data directory path */
     @SuppressLint("SdCardPath")
-    public static final String INTERNAL_PRIVATE_APP_DATA_DIR_PATH = "/data/data/" + TERMUX_PACKAGE_NAME; // Default: "/data/data/com.termux"
+    public static final String TERMUX_INTERNAL_PRIVATE_APP_DATA_DIR_PATH = "/data/data/" + TERMUX_PACKAGE_NAME; // Default: "/data/data/com.termux"
     /** Termux app internal private app data directory */
-    public static final File INTERNAL_PRIVATE_APP_DATA_DIR = new File(INTERNAL_PRIVATE_APP_DATA_DIR_PATH);
+    public static final File TERMUX_INTERNAL_PRIVATE_APP_DATA_DIR = new File(TERMUX_INTERNAL_PRIVATE_APP_DATA_DIR_PATH);
 
 
 
     /** Termux app Files directory path */
-    public static final String TERMUX_FILES_DIR_PATH = INTERNAL_PRIVATE_APP_DATA_DIR_PATH + "/files"; // Default: "/data/data/com.termux/files"
+    public static final String TERMUX_FILES_DIR_PATH = TERMUX_INTERNAL_PRIVATE_APP_DATA_DIR_PATH + "/files"; // Default: "/data/data/com.termux/files"
     /** Termux app Files directory */
     public static final File TERMUX_FILES_DIR = new File(TERMUX_FILES_DIR_PATH);
 

From 5f2ccca4239c8d32436a35798e9cd5a0e0f57568 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sun, 13 Jun 2021 00:44:56 +0500
Subject: [PATCH 417/912] Redo fix execution commands exceptions not being
 logged or sent back to plugins

The f62febbf commit mentioned that it solved "the bug where Termux:Tasker would hang indefinitely if Runtime.getRuntime().exec raised an exception, like for invalid or missing interpreter errors and Termux:Tasker wasn't notified of it. Now the errmsg will be used to send any exceptions back to Termux:Tasker and other 3rd party calls."

This however was still broken due to local design changes made to TermuxTask after testing was already done. This commit should solve that problem. Moreover, now a notification will be shown if execution commands **fail to start** that are run by plugins that don't expect the result back, like with Termux:Widget or RUN_COMMAND intent. This should make it easier for users to debug problems, since otherwise logcat needs to be looked. But logcat would still need to be looked if commands/scripts fail after they have started due to internal errors. Notifications can be disabled from Termux Settings by disabling the "Plugin Error Notifications" toggle.
---
 app/src/main/java/com/termux/app/TermuxService.java    | 10 ++++++++++
 .../main/java/com/termux/shared/shell/TermuxTask.java  |  5 ++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/termux/app/TermuxService.java b/app/src/main/java/com/termux/app/TermuxService.java
index 71a4eb81c7..66d56eda4d 100644
--- a/app/src/main/java/com/termux/app/TermuxService.java
+++ b/app/src/main/java/com/termux/app/TermuxService.java
@@ -419,6 +419,11 @@ public synchronized TermuxTask createTermuxTask(ExecutionCommand executionComman
         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.logStackTracesWithMessage(LOG_TAG, "(" + executionCommand.errCode + ") " + executionCommand.errmsg, executionCommand.throwableList);
             return null;
         }
 
@@ -510,6 +515,11 @@ public synchronized TermuxSession createTermuxSession(ExecutionCommand execution
         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.logStackTracesWithMessage(LOG_TAG, "(" + executionCommand.errCode + ") " + executionCommand.errmsg, executionCommand.throwableList);
             return null;
         }
 
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/TermuxTask.java b/termux-shared/src/main/java/com/termux/shared/shell/TermuxTask.java
index 1234284d12..4507b30f1c 100644
--- a/termux-shared/src/main/java/com/termux/shared/shell/TermuxTask.java
+++ b/termux-shared/src/main/java/com/termux/shared/shell/TermuxTask.java
@@ -70,8 +70,11 @@ public static TermuxTask execute(@NonNull final Context context, @NonNull Execut
 
         final String[] commandArray = ShellUtils.setupProcessArgs(executionCommand.executable, executionCommand.arguments);
 
-        if (!executionCommand.setState(ExecutionState.EXECUTING))
+        if (!executionCommand.setState(ExecutionState.EXECUTING)) {
+            executionCommand.setStateFailed(ExecutionCommand.RESULT_CODE_FAILED, context.getString(R.string.error_failed_to_execute_termux_task_command, executionCommand.getCommandIdAndLabelLogString()), null);
+            TermuxTask.processTermuxTaskResult(null, executionCommand);
             return null;
+        }
 
         Logger.logDebug(LOG_TAG, executionCommand.toString());
 

From f77c88633e78469efe67ea5097941e22b330c5eb Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sun, 20 Jun 2021 05:57:57 +0500
Subject: [PATCH 418/912] Fix issue where terminal cursor blinking would not
 automatically start again if termux activity is started after device display
 timeout with double tap and not power button.

Fixes #2138
---
 .../app/terminal/TermuxTerminalViewClient.java  |  9 +++++++++
 .../main/java/com/termux/view/TerminalView.java | 17 ++++++++++-------
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
index 6d49e9cc01..99f2d8ef0a 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
@@ -98,6 +98,15 @@ public void onResume() {
         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;
+        }
     }
 
     /**
diff --git a/terminal-view/src/main/java/com/termux/view/TerminalView.java b/terminal-view/src/main/java/com/termux/view/TerminalView.java
index 84756fed35..dc86207cbd 100644
--- a/terminal-view/src/main/java/com/termux/view/TerminalView.java
+++ b/terminal-view/src/main/java/com/termux/view/TerminalView.java
@@ -881,13 +881,16 @@ public synchronized boolean setTerminalCursorBlinkerRate(int blinkRate) {
      * {@link #TERMINAL_CURSOR_BLINK_RATE_MIN} and {@link #TERMINAL_CURSOR_BLINK_RATE_MAX}.
      *
      * This should be called when the view holding this activity is resumed or stopped so that
-     * cursor blinker does not run when activity is not visible. Ensure that {@link #mEmulator}
-     * is set when you call this to start cursor blinking by waiting for {@link TerminalViewClient#onEmulatorSet()}
-     * event after calling {@link #attachSession(TerminalSession)} for the first session added in the
-     * activity, otherwise blinking will not start. Do not call this directly after
-     * {@link #attachSession(TerminalSession)} since {@link #updateSize()} may return without
-     * setting {@link #mEmulator} since width/height may be 0. Its called again in
-     * {@link #onSizeChanged(int, int, int, int)}.
+     * cursor blinker does not run when activity is not visible. If you call this on onResume()
+     * to start cursor blinking, then ensure that {@link #mEmulator} is set, otherwise wait for the
+     * {@link TerminalViewClient#onEmulatorSet()} event after calling {@link #attachSession(TerminalSession)}
+     * for the first session added in the activity since blinking will not start if {@link #mEmulator}
+     * is not set, like if activity is started again after exiting it with double back press. Do not
+     * call this directly after {@link #attachSession(TerminalSession)} since {@link #updateSize()}
+     * may return without setting {@link #mEmulator} since width/height may be 0. Its called again in
+     * {@link #onSizeChanged(int, int, int, int)}. Calling on onResume() if emulator is already set
+     * is necessary, since onEmulatorSet() may not be called after activity is started after device
+     * display timeout with double tap and not power button.
      *
      * It should also be called on the
      * {@link com.termux.terminal.TerminalSessionClient#onTerminalCursorStateChange(boolean)}

From b7b12ebe84911748b9757d795a8def0d5d6b716e Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Mon, 21 Jun 2021 03:36:20 +0500
Subject: [PATCH 419/912] Move from github packages to jitpack.io for hosting
 termux library packages

Github Package hosting is considered a private repository since it requires github APIs keys if a hosted library needs to be imported as a dependency. Importing from private repositories is not allowed as per F-Droid policy so termux plugin apps can't import termux libraries as dependencies so hence we move to Jitpack. Check https://github.com/termux/termux-app/issues/2011#issuecomment-824837387.

Version number of all published libraries from termux-app must be the same.

Importing can be done with the following way.

Add to root level build.gradle

```
allprojects {
    repositories {
        google()
        mavenCentral()
        //mavenLocal()
        maven { url "https://jitpack.io" }
    }
}
```

Add to app module level build.gradle if you want to import `termux-shared`

```
 dependencies {
    implementation 'com.github.termux:termux-shared:0.115'
}
```

Check https://github.com/jitpack/jitpack.io#building-with-jitpack for other details, like including commit or branch level import.

If you are updating the libraries as well and want to test locally, run `./gradlew publishReleasePublicationToMavenLocal` from root directory of termux-app to publish library to local maven repository. You may need to rebuild project before it, library files will be published at `~/.m2/repository/com/github/termux/termux-shared/0.115`. If you want to import the updated library in a project, then uncomment the `mavenLocal()` line in the build.gradle and run sync gradle with project files.

Making changes to library after dependencies have already been cached without incrementing version number may need deleting gradle cache if syncing gradle files doesn't work after publishing changes. Open gradle right sidebar in android studio, then right click on top level entry, then select "Refresh Gradle Dependencies", which will redownload/refresh all dependencies and will take a lot of time. Instead running `find ~/.gradle/caches/ -type d -name "*com.github.termux*" -prune -exec rm -rf "{}" \; -print` and then running gradle sync should be enough.

Using "com.termux" instead of "com.github.termux" will require a DNS TXT record to be added from git.termux.com to https://github.com/termux at termux.com

https://jitpack.io/docs/#custom-domain-name
---
 .github/workflows/publish_libraries.yml | 26 ----------------------
 build.gradle                            |  1 +
 terminal-emulator/build.gradle          | 29 +++++++++----------------
 terminal-view/build.gradle              | 29 +++++++++----------------
 termux-shared/build.gradle              | 29 +++++++++----------------
 5 files changed, 31 insertions(+), 83 deletions(-)
 delete mode 100644 .github/workflows/publish_libraries.yml

diff --git a/.github/workflows/publish_libraries.yml b/.github/workflows/publish_libraries.yml
deleted file mode 100644
index 077539deba..0000000000
--- a/.github/workflows/publish_libraries.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-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
diff --git a/build.gradle b/build.gradle
index 01d0fe73a4..2f618dec77 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,6 +12,7 @@ allprojects {
     repositories {
         google()
         mavenCentral()
+        maven { url "https://jitpack.io" }
     }
 }
 
diff --git a/terminal-emulator/build.gradle b/terminal-emulator/build.gradle
index bffcd6816a..3642ba49f2 100644
--- a/terminal-emulator/build.gradle
+++ b/terminal-emulator/build.gradle
@@ -58,25 +58,16 @@ task sourceJar(type: Jar) {
     classifier "sources"
 }
 
-publishing {
-    publications {
-        bar(MavenPublication) {
-            groupId 'com.termux'
-            artifactId 'terminal-emulator'
-            version "0.114"
-            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")
+afterEvaluate {
+    publishing {
+        publications {
+            // Creates a Maven publication called "release".
+            release(MavenPublication) {
+                from components.release
+                groupId = 'com.github.termux'
+                artifactId = 'terminal-emulator'
+                version = '0.114'
+                artifact(sourceJar)
             }
         }
     }
diff --git a/terminal-view/build.gradle b/terminal-view/build.gradle
index 0957b12520..d3fb6cfd38 100644
--- a/terminal-view/build.gradle
+++ b/terminal-view/build.gradle
@@ -37,25 +37,16 @@ task sourceJar(type: Jar) {
     classifier "sources"
 }
 
-publishing {
-    publications {
-        bar(MavenPublication) {
-            groupId 'com.termux'
-            artifactId 'terminal-view'
-            version "0.114"
-            artifact(sourceJar)
-            artifact("$buildDir/outputs/aar/terminal-view-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")
+afterEvaluate {
+    publishing {
+        publications {
+            // Creates a Maven publication called "release".
+            release(MavenPublication) {
+                from components.release
+                groupId = 'com.github.termux'
+                artifactId = 'terminal-view'
+                version = '0.114'
+                artifact(sourceJar)
             }
         }
     }
diff --git a/termux-shared/build.gradle b/termux-shared/build.gradle
index 3364cdc765..a6a39d3e0c 100644
--- a/termux-shared/build.gradle
+++ b/termux-shared/build.gradle
@@ -52,25 +52,16 @@ task sourceJar(type: Jar) {
     classifier "sources"
 }
 
-publishing {
-    publications {
-        bar(MavenPublication) {
-            groupId 'com.termux'
-            artifactId 'termux-shared'
-            version "0.114"
-            artifact(sourceJar)
-            artifact("$buildDir/outputs/aar/termux-shared-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")
+afterEvaluate {
+    publishing {
+        publications {
+            // Creates a Maven publication called "release".
+            release(MavenPublication) {
+                from components.release
+                groupId = 'com.github.termux'
+                artifactId = 'termux-shared'
+                version = '0.114'
+                artifact(sourceJar)
             }
         }
     }

From 7f36d7bbd0bb378b571f65154036fbbb271f5e65 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Mon, 21 Jun 2021 04:59:11 +0500
Subject: [PATCH 420/912] Move ReportActivity to termux-shared so that other
 termux plugins can use it too

---
 app/src/main/AndroidManifest.xml                       |  2 +-
 .../com/termux/app/activities/SettingsActivity.java    |  5 +++--
 .../termux/app/terminal/TermuxTerminalViewClient.java  |  6 +++---
 app/src/main/java/com/termux/app/utils/CrashUtils.java |  6 +++---
 .../main/java/com/termux/app/utils/PluginUtils.java    |  6 +++---
 app/src/main/res/values/strings.xml                    |  9 ---------
 app/src/main/res/values/styles.xml                     |  9 ---------
 .../com/termux/shared}/activities/ReportActivity.java  |  6 +++---
 .../java/com/termux/shared}/models/ReportInfo.java     |  6 +++---
 .../src/main/res/drawable/ic_copy.xml                  |  0
 .../src/main/res/drawable/ic_error_notification.xml    |  0
 .../src/main/res/drawable/ic_share.xml                 |  0
 .../src/main/res/layout/activity_report.xml            |  0
 .../res/layout/markdown_adapter_node_code_block.xml    |  0
 .../main/res/layout/markdown_adapter_node_default.xml  |  0
 .../src/main/res/layout/partial_toolbar.xml            |  0
 .../src/main/res/menu/menu_report.xml                  |  0
 {app => termux-shared}/src/main/res/values/dimens.xml  |  0
 termux-shared/src/main/res/values/strings.xml          |  7 +++++++
 termux-shared/src/main/res/values/styles.xml           | 10 ++++++++++
 20 files changed, 36 insertions(+), 36 deletions(-)
 rename {app/src/main/java/com/termux/app => termux-shared/src/main/java/com/termux/shared}/activities/ReportActivity.java (98%)
 rename {app/src/main/java/com/termux/app => termux-shared/src/main/java/com/termux/shared}/models/ReportInfo.java (90%)
 rename {app => termux-shared}/src/main/res/drawable/ic_copy.xml (100%)
 rename {app => termux-shared}/src/main/res/drawable/ic_error_notification.xml (100%)
 rename {app => termux-shared}/src/main/res/drawable/ic_share.xml (100%)
 rename {app => termux-shared}/src/main/res/layout/activity_report.xml (100%)
 rename {app => termux-shared}/src/main/res/layout/markdown_adapter_node_code_block.xml (100%)
 rename {app => termux-shared}/src/main/res/layout/markdown_adapter_node_default.xml (100%)
 rename {app => termux-shared}/src/main/res/layout/partial_toolbar.xml (100%)
 rename {app => termux-shared}/src/main/res/menu/menu_report.xml (100%)
 rename {app => termux-shared}/src/main/res/values/dimens.xml (100%)
 create mode 100644 termux-shared/src/main/res/values/styles.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ee6eae63cc..d2357492cf 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -102,7 +102,7 @@
             android:theme="@style/Theme.AppCompat.Light.DarkActionBar" />
 
         <activity
-            android:name=".app.activities.ReportActivity"
+            android:name=".shared.activities.ReportActivity"
             android:theme="@style/Theme.AppCompat.TermuxReportActivity"
             android:documentLaunchMode="intoExisting"
             />
diff --git a/app/src/main/java/com/termux/app/activities/SettingsActivity.java b/app/src/main/java/com/termux/app/activities/SettingsActivity.java
index 3e3c23dea4..9c2015b877 100644
--- a/app/src/main/java/com/termux/app/activities/SettingsActivity.java
+++ b/app/src/main/java/com/termux/app/activities/SettingsActivity.java
@@ -10,7 +10,8 @@
 import androidx.preference.PreferenceFragmentCompat;
 
 import com.termux.R;
-import com.termux.app.models.ReportInfo;
+import com.termux.shared.activities.ReportActivity;
+import com.termux.shared.models.ReportInfo;
 import com.termux.app.models.UserAction;
 import com.termux.shared.interact.ShareUtils;
 import com.termux.shared.packages.PackageUtils;
@@ -84,7 +85,7 @@ public void run() {
                             aboutString.append("\n\n").append(TermuxUtils.getDeviceInfoMarkdownString(context));
                             aboutString.append("\n\n").append(TermuxUtils.getImportantLinksMarkdownString(context));
 
-                            ReportActivity.startReportActivity(context, new ReportInfo(UserAction.ABOUT, TermuxConstants.TERMUX_APP.TERMUX_SETTINGS_ACTIVITY_NAME, title, null, aboutString.toString(), null, false));
+                            ReportActivity.startReportActivity(context, new ReportInfo(UserAction.ABOUT.getName(), TermuxConstants.TERMUX_APP.TERMUX_SETTINGS_ACTIVITY_NAME, title, null, aboutString.toString(), null, false));
                         }
                     }.start();
 
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
index 99f2d8ef0a..41574ce08f 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
@@ -24,8 +24,8 @@
 import com.termux.shared.shell.ShellUtils;
 import com.termux.shared.terminal.TermuxTerminalViewClientBase;
 import com.termux.shared.termux.TermuxConstants;
-import com.termux.app.activities.ReportActivity;
-import com.termux.app.models.ReportInfo;
+import com.termux.shared.activities.ReportActivity;
+import com.termux.shared.models.ReportInfo;
 import com.termux.app.models.UserAction;
 import com.termux.app.terminal.io.KeyboardShortcut;
 import com.termux.app.terminal.io.extrakeys.ExtraKeysView;
@@ -660,7 +660,7 @@ public void run() {
                 if (termuxAptInfo != null)
                     reportString.append("\n\n").append(termuxAptInfo);
 
-                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));
+                ReportActivity.startReportActivity(mActivity, new ReportInfo(UserAction.REPORT_ISSUE_FROM_TRANSCRIPT.getName(), TermuxConstants.TERMUX_APP.TERMUX_ACTIVITY_NAME, title, null, reportString.toString(), "\n\n" + TermuxUtils.getReportIssueMarkdownString(mActivity), false));
             }
         }.start();
     }
diff --git a/app/src/main/java/com/termux/app/utils/CrashUtils.java b/app/src/main/java/com/termux/app/utils/CrashUtils.java
index 670277b75d..55a65ef423 100644
--- a/app/src/main/java/com/termux/app/utils/CrashUtils.java
+++ b/app/src/main/java/com/termux/app/utils/CrashUtils.java
@@ -9,10 +9,10 @@
 import androidx.annotation.Nullable;
 
 import com.termux.R;
-import com.termux.app.activities.ReportActivity;
+import com.termux.shared.activities.ReportActivity;
 import com.termux.shared.notification.NotificationUtils;
 import com.termux.shared.file.FileUtils;
-import com.termux.app.models.ReportInfo;
+import com.termux.shared.models.ReportInfo;
 import com.termux.app.models.UserAction;
 import com.termux.shared.settings.preferences.TermuxAppSharedPreferences;
 import com.termux.shared.settings.preferences.TermuxPreferenceConstants;
@@ -89,7 +89,7 @@ public void run() {
 
                 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));
+                Intent notificationIntent = ReportActivity.newInstance(context, new ReportInfo(UserAction.CRASH_REPORT.getName(), 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
diff --git a/app/src/main/java/com/termux/app/utils/PluginUtils.java b/app/src/main/java/com/termux/app/utils/PluginUtils.java
index b1d5c5db74..2ea2a0f2dd 100644
--- a/app/src/main/java/com/termux/app/utils/PluginUtils.java
+++ b/app/src/main/java/com/termux/app/utils/PluginUtils.java
@@ -11,16 +11,16 @@
 import androidx.annotation.Nullable;
 
 import com.termux.R;
+import com.termux.shared.activities.ReportActivity;
 import com.termux.shared.notification.NotificationUtils;
 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.app.models.ReportInfo;
+import com.termux.shared.models.ReportInfo;
 import com.termux.shared.models.ExecutionCommand;
 import com.termux.app.models.UserAction;
 import com.termux.shared.data.DataUtils;
@@ -159,7 +159,7 @@ public static void processPluginExecutionCommandError(final Context context, Str
         reportString.append("\n\n").append(TermuxUtils.getAppInfoMarkdownString(context, true));
         reportString.append("\n\n").append(TermuxUtils.getDeviceInfoMarkdownString(context));
 
-        Intent notificationIntent = ReportActivity.newInstance(context, new ReportInfo(UserAction.PLUGIN_EXECUTION_COMMAND, logTag, title, null, reportString.toString(), null,true));
+        Intent notificationIntent = ReportActivity.newInstance(context, new ReportInfo(UserAction.PLUGIN_EXECUTION_COMMAND.getName(), 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
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ca4cb76663..c226924c9a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -105,15 +105,6 @@
 
 
 
-    <!-- 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>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index c747fed795..8859b8c106 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -44,15 +44,6 @@
     </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>
diff --git a/app/src/main/java/com/termux/app/activities/ReportActivity.java b/termux-shared/src/main/java/com/termux/shared/activities/ReportActivity.java
similarity index 98%
rename from app/src/main/java/com/termux/app/activities/ReportActivity.java
rename to termux-shared/src/main/java/com/termux/shared/activities/ReportActivity.java
index 5f6b0b3928..e960ff050f 100644
--- a/app/src/main/java/com/termux/app/activities/ReportActivity.java
+++ b/termux-shared/src/main/java/com/termux/shared/activities/ReportActivity.java
@@ -1,4 +1,4 @@
-package com.termux.app.activities;
+package com.termux.shared.activities;
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.ActionBar;
@@ -14,11 +14,11 @@
 import android.view.MenuInflater;
 import android.view.MenuItem;
 
-import com.termux.R;
+import com.termux.shared.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 com.termux.shared.models.ReportInfo;
 
 import org.commonmark.node.FencedCodeBlock;
 
diff --git a/app/src/main/java/com/termux/app/models/ReportInfo.java b/termux-shared/src/main/java/com/termux/shared/models/ReportInfo.java
similarity index 90%
rename from app/src/main/java/com/termux/app/models/ReportInfo.java
rename to termux-shared/src/main/java/com/termux/shared/models/ReportInfo.java
index 05c8853d20..824c11ac73 100644
--- a/app/src/main/java/com/termux/app/models/ReportInfo.java
+++ b/termux-shared/src/main/java/com/termux/shared/models/ReportInfo.java
@@ -1,4 +1,4 @@
-package com.termux.app.models;
+package com.termux.shared.models;
 
 import com.termux.shared.markdown.MarkdownUtils;
 import com.termux.shared.termux.TermuxUtils;
@@ -8,7 +8,7 @@
 public class ReportInfo implements Serializable {
 
     /** The user action that was being processed for which the report was generated. */
-    public final UserAction userAction;
+    public final String userAction;
     /** The internal app component that sent the report. */
     public final String sender;
     /** The report title. */
@@ -26,7 +26,7 @@ public class ReportInfo implements Serializable {
     /** The timestamp for the report. */
     public final String reportTimestamp;
 
-    public ReportInfo(UserAction userAction, String sender, String reportTitle, String reportStringPrefix, String reportString, String reportStringSuffix, boolean addReportInfoToMarkdown) {
+    public ReportInfo(String userAction, String sender, String reportTitle, String reportStringPrefix, String reportString, String reportStringSuffix, boolean addReportInfoToMarkdown) {
         this.userAction = userAction;
         this.sender = sender;
         this.reportTitle = reportTitle;
diff --git a/app/src/main/res/drawable/ic_copy.xml b/termux-shared/src/main/res/drawable/ic_copy.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_copy.xml
rename to termux-shared/src/main/res/drawable/ic_copy.xml
diff --git a/app/src/main/res/drawable/ic_error_notification.xml b/termux-shared/src/main/res/drawable/ic_error_notification.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_error_notification.xml
rename to termux-shared/src/main/res/drawable/ic_error_notification.xml
diff --git a/app/src/main/res/drawable/ic_share.xml b/termux-shared/src/main/res/drawable/ic_share.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_share.xml
rename to termux-shared/src/main/res/drawable/ic_share.xml
diff --git a/app/src/main/res/layout/activity_report.xml b/termux-shared/src/main/res/layout/activity_report.xml
similarity index 100%
rename from app/src/main/res/layout/activity_report.xml
rename to termux-shared/src/main/res/layout/activity_report.xml
diff --git a/app/src/main/res/layout/markdown_adapter_node_code_block.xml b/termux-shared/src/main/res/layout/markdown_adapter_node_code_block.xml
similarity index 100%
rename from app/src/main/res/layout/markdown_adapter_node_code_block.xml
rename to termux-shared/src/main/res/layout/markdown_adapter_node_code_block.xml
diff --git a/app/src/main/res/layout/markdown_adapter_node_default.xml b/termux-shared/src/main/res/layout/markdown_adapter_node_default.xml
similarity index 100%
rename from app/src/main/res/layout/markdown_adapter_node_default.xml
rename to termux-shared/src/main/res/layout/markdown_adapter_node_default.xml
diff --git a/app/src/main/res/layout/partial_toolbar.xml b/termux-shared/src/main/res/layout/partial_toolbar.xml
similarity index 100%
rename from app/src/main/res/layout/partial_toolbar.xml
rename to termux-shared/src/main/res/layout/partial_toolbar.xml
diff --git a/app/src/main/res/menu/menu_report.xml b/termux-shared/src/main/res/menu/menu_report.xml
similarity index 100%
rename from app/src/main/res/menu/menu_report.xml
rename to termux-shared/src/main/res/menu/menu_report.xml
diff --git a/app/src/main/res/values/dimens.xml b/termux-shared/src/main/res/values/dimens.xml
similarity index 100%
rename from app/src/main/res/values/dimens.xml
rename to termux-shared/src/main/res/values/dimens.xml
diff --git a/termux-shared/src/main/res/values/strings.xml b/termux-shared/src/main/res/values/strings.xml
index d9eedf3316..b1049f8e82 100644
--- a/termux-shared/src/main/res/values/strings.xml
+++ b/termux-shared/src/main/res/values/strings.xml
@@ -74,6 +74,13 @@
 
 
 
+    <!-- ReportActivity -->
+    <string name="action_copy">Copy</string>
+    <string name="action_share">Share</string>
+    <string name="title_report_text">Report Text</string>
+
+
+
     <!-- ShareUtils -->
     <string name="title_share_with">Share With</string>
 
diff --git a/termux-shared/src/main/res/values/styles.xml b/termux-shared/src/main/res/values/styles.xml
new file mode 100644
index 0000000000..1541ea3945
--- /dev/null
+++ b/termux-shared/src/main/res/values/styles.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+    <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>
+</resources>

From 69e5deedc758b16c764c23dc5ddad9e05a05935b Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 23 Jun 2021 03:36:36 +0500
Subject: [PATCH 421/912] Move to com.termux domain for termux libraries
 published with jitpack

A DNS TXT record has been added from git.termux.com to https://github.com/termux at termux.com by @fornwall

```
dig txt git.termux.com

;; ANSWER SECTION:
git.termux.com.300INTXT"https://github.com/termux"
```

https://jitpack.io/docs/#custom-domain-name
---
 terminal-emulator/build.gradle | 2 +-
 terminal-view/build.gradle     | 2 +-
 termux-shared/build.gradle     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/terminal-emulator/build.gradle b/terminal-emulator/build.gradle
index 3642ba49f2..c60d4ad0af 100644
--- a/terminal-emulator/build.gradle
+++ b/terminal-emulator/build.gradle
@@ -64,7 +64,7 @@ afterEvaluate {
             // Creates a Maven publication called "release".
             release(MavenPublication) {
                 from components.release
-                groupId = 'com.github.termux'
+                groupId = 'com.termux'
                 artifactId = 'terminal-emulator'
                 version = '0.114'
                 artifact(sourceJar)
diff --git a/terminal-view/build.gradle b/terminal-view/build.gradle
index d3fb6cfd38..87270cc716 100644
--- a/terminal-view/build.gradle
+++ b/terminal-view/build.gradle
@@ -43,7 +43,7 @@ afterEvaluate {
             // Creates a Maven publication called "release".
             release(MavenPublication) {
                 from components.release
-                groupId = 'com.github.termux'
+                groupId = 'com.termux'
                 artifactId = 'terminal-view'
                 version = '0.114'
                 artifact(sourceJar)
diff --git a/termux-shared/build.gradle b/termux-shared/build.gradle
index a6a39d3e0c..9a0d8e3ca2 100644
--- a/termux-shared/build.gradle
+++ b/termux-shared/build.gradle
@@ -58,7 +58,7 @@ afterEvaluate {
             // Creates a Maven publication called "release".
             release(MavenPublication) {
                 from components.release
-                groupId = 'com.github.termux'
+                groupId = 'com.termux'
                 artifactId = 'termux-shared'
                 version = '0.114'
                 artifact(sourceJar)

From 80b495e50b130d26dd2d7b8483b0019875c9a0c3 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 24 Jun 2021 23:59:56 +0500
Subject: [PATCH 422/912] Move storage permission logic to PermissionUtils and
 add disable battery optimizations code

Option to disable battery optimizations will be added in termux settings later.
---
 .../java/com/termux/app/TermuxActivity.java   | 15 ++---
 .../shared/packages/PermissionUtils.java      | 65 +++++++++++++------
 2 files changed, 53 insertions(+), 27 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index 35aaa4fc70..a3885fe5b8 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -31,6 +31,7 @@
 
 import com.termux.R;
 import com.termux.app.terminal.TermuxActivityRootView;
+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;
@@ -165,8 +166,6 @@ 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";
@@ -683,22 +682,22 @@ private void requestAutoFill() {
      * For processes to access shared internal storage (/sdcard) we need this permission.
      */
     public boolean ensureStoragePermissionGranted() {
-        if (checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED) {
+        if (PermissionUtils.checkPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE)) {
             return true;
         } else {
-            Logger.logDebug(LOG_TAG, "Storage permission not granted, requesting permission.");
-            requestPermissions(new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, REQUESTCODE_PERMISSION_STORAGE);
+            Logger.logInfo(LOG_TAG, "Storage permission not granted, requesting permission.");
+            PermissionUtils.requestPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE, PermissionUtils.REQUEST_GRANT_STORAGE_PERMISSION);
             return false;
         }
     }
 
     @Override
     public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
-        if (requestCode == REQUESTCODE_PERMISSION_STORAGE && grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-            Logger.logDebug(LOG_TAG, "Storage permission granted by user on request.");
+        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.");
             TermuxInstaller.setupStorageSymlinks(this);
         } else {
-            Logger.logDebug(LOG_TAG, "Storage permission denied by user on request.");
+            Logger.logInfo(LOG_TAG, "Storage permission denied by user on request.");
         }
     }
 
diff --git a/termux-shared/src/main/java/com/termux/shared/packages/PermissionUtils.java b/termux-shared/src/main/java/com/termux/shared/packages/PermissionUtils.java
index e6a8569c03..ddd36b7a7d 100644
--- a/termux-shared/src/main/java/com/termux/shared/packages/PermissionUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/packages/PermissionUtils.java
@@ -1,11 +1,13 @@
 package com.termux.shared.packages;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Build;
+import android.os.PowerManager;
 import android.provider.Settings;
 
 import androidx.core.content.ContextCompat;
@@ -19,13 +21,23 @@
 
 public class PermissionUtils {
 
-    public static final int ACTION_MANAGE_OVERLAY_PERMISSION_REQUEST_CODE = 0;
+    public static final int REQUEST_GRANT_STORAGE_PERMISSION = 1000;
+
+    public static final int REQUEST_DISABLE_BATTERY_OPTIMIZATIONS = 2000;
+    public static final int REQUEST_GRANT_DISPLAY_OVER_OTHER_APPS_PERMISSION = 2001;
 
     private static final String LOG_TAG = "PermissionUtils";
 
+
+    public static boolean checkPermission(Context context, String permission) {
+        if (permission == null) return false;
+        return checkPermissions(context, new String[]{permission});
+    }
+
     public static boolean checkPermissions(Context context, String[] permissions) {
-        int result;
+        if (permissions == null) return false;
 
+        int result;
         for (String p:permissions) {
             result = ContextCompat.checkSelfPermission(context,p);
             if (result != PackageManager.PERMISSION_GRANTED) {
@@ -35,18 +47,25 @@ public static boolean checkPermissions(Context context, String[] permissions) {
         return true;
     }
 
-    public static void askPermissions(Activity context, String[] permissions) {
-        if (context == null || permissions == null) return;
+
+
+    public static void requestPermission(Activity activity, String permission, int requestCode) {
+        if (permission == null) return;
+        requestPermissions(activity, new String[]{permission}, requestCode);
+    }
+
+    public static void requestPermissions(Activity activity, String[] permissions, int requestCode) {
+        if (activity == null || permissions == null) return;
 
         int result;
-        Logger.showToast(context, context.getString(R.string.message_sudo_please_grant_permissions), true);
+        Logger.showToast(activity, activity.getString(R.string.message_sudo_please_grant_permissions), true);
         try {Thread.sleep(1000);} catch (InterruptedException e) {e.printStackTrace();}
 
         for (String permission:permissions) {
-            result = ContextCompat.checkSelfPermission(context, permission);
+            result = ContextCompat.checkSelfPermission(activity, permission);
             if (result != PackageManager.PERMISSION_GRANTED) {
                 Logger.logDebug(LOG_TAG, "Requesting Permissions: " + Arrays.toString(permissions));
-                context.requestPermissions(new String[]{permission}, 0);
+                activity.requestPermissions(new String[]{permission}, requestCode);
             }
         }
     }
@@ -54,27 +73,20 @@ public static void askPermissions(Activity context, String[] permissions) {
 
 
     public static boolean checkDisplayOverOtherAppsPermission(Context context) {
-        boolean permissionGranted;
-
-        permissionGranted = Settings.canDrawOverlays(context);
-        if (!permissionGranted) {
-            Logger.logWarn(LOG_TAG, TermuxConstants.TERMUX_APP_NAME + " App does not have Display over other apps (SYSTEM_ALERT_WINDOW) permission");
-            return false;
-        } else {
-            Logger.logDebug(LOG_TAG, TermuxConstants.TERMUX_APP_NAME + " App already has Display over other apps (SYSTEM_ALERT_WINDOW) permission");
-            return true;
-        }
+        return Settings.canDrawOverlays(context);
     }
 
-    public static void askDisplayOverOtherAppsPermission(Activity context) {
+    public static void requestDisplayOverOtherAppsPermission(Activity context, int requestCode) {
         Intent intent = new Intent(Settings.ACTION_MANAGE_OVERLAY_PERMISSION, Uri.parse("package:" + context.getPackageName()));
-        context.startActivityForResult(intent, ACTION_MANAGE_OVERLAY_PERMISSION_REQUEST_CODE);
+        context.startActivityForResult(intent, requestCode);
     }
 
     public static boolean validateDisplayOverOtherAppsPermissionForPostAndroid10(Context context) {
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) return true;
         
         if (!PermissionUtils.checkDisplayOverOtherAppsPermission(context)) {
+            Logger.logWarn(LOG_TAG, TermuxConstants.TERMUX_APP_NAME + " App does not have Display over other apps (SYSTEM_ALERT_WINDOW) permission");
+
             TermuxAppSharedPreferences preferences = TermuxAppSharedPreferences.build(context);
             if (preferences == null) return false;
 
@@ -82,8 +94,23 @@ public static boolean validateDisplayOverOtherAppsPermissionForPostAndroid10(Con
                 Logger.showToast(context, context.getString(R.string.error_display_over_other_apps_permission_not_granted), true);
             return false;
         } else {
+            Logger.logDebug(LOG_TAG, TermuxConstants.TERMUX_APP_NAME + " App already has Display over other apps (SYSTEM_ALERT_WINDOW) permission");
             return true;
         }
     }
 
+
+
+    public static boolean checkIfBatteryOptimizationsDisabled(Context context) {
+        PowerManager powerManager = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
+        return powerManager.isIgnoringBatteryOptimizations(context.getPackageName());
+    }
+
+    @SuppressLint("BatteryLife")
+    public static void requestDisableBatteryOptimizations(Activity activity, int requestCode) {
+        Intent intent = new Intent(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS);
+        intent.setData(Uri.parse("package:" + activity.getPackageName()));
+        activity.startActivityForResult(intent, requestCode);
+    }
+
 }

From 679e0de04465a152a76fafcae50841a9ee78e029 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 26 Jun 2021 06:01:06 +0500
Subject: [PATCH 423/912] Fix suppressed exceptions not being logged and long
 logcat message being truncated

If an exception is thrown, the exception message might not contain the full errors. Individual failures may get added to suppressed throwables which can be extracted from the exception object by calling `Throwable[] getSuppressed()`. So just logging the exception message and stacktrace may not be enough, the suppressed throwables need to be logged as well.

The Logger class will now log the suppressed throwables as well if they are found in the exception.

This was mainly a concern for FileUtils where guava MoreUtils library was used to delete directories but exceptions weren't being fully logged on failures, like bootstrap failures, so user wouldn't know what really caused the failure.

https://github.com/google/guava/blob/v30.1.1/guava/src/com/google/common/io/MoreFiles.java#L775

The FileUtils will be fixed in a future commit.

This also adds support with "log*Extended()" functions so that logcat entries longer than LOGGER_ENTRY_MAX_PAYLOAD do not get truncated by android. This is done by splitting the log message into multiple messages if the limit is crossed. This is specially necessary for logging long stacktraces, suppressed throwables and errmsg of ExecutionCommand, etc.
---
 .../java/com/termux/shared/logger/Logger.java | 213 +++++++++++++++---
 1 file changed, 187 insertions(+), 26 deletions(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/logger/Logger.java b/termux-shared/src/main/java/com/termux/shared/logger/Logger.java
index 0560625b73..0794c61cd5 100644
--- a/termux-shared/src/main/java/com/termux/shared/logger/Logger.java
+++ b/termux-shared/src/main/java/com/termux/shared/logger/Logger.java
@@ -12,6 +12,7 @@
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.StringWriter;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
@@ -27,7 +28,25 @@ public class Logger {
     public static final int DEFAULT_LOG_LEVEL = LOG_LEVEL_NORMAL;
     private static int CURRENT_LOG_LEVEL = DEFAULT_LOG_LEVEL;
 
-    public static final int LOGGER_ENTRY_SIZE_LIMIT_IN_BYTES = 4 * 1024; // 4KB
+    /**
+     * The maximum size of the log entry payload that can be written to the logger. An attempt to
+     * write more than this amount will result in a truncated log entry.
+     *
+     * The limit is 4068 but this includes log tag and log level prefix "D/" before log tag and ": "
+     * suffix after it.
+     *
+     * #define LOGGER_ENTRY_MAX_PAYLOAD 4068
+     * https://cs.android.com/android/_/android/platform/system/core/+/android10-release:liblog/include/log/log_read.h;l=127
+     */
+    public static final int LOGGER_ENTRY_MAX_PAYLOAD = 4068; // 4068 bytes
+
+    /**
+     * The maximum safe size of the log entry payload that can be written to the logger, based on
+     * {@link #LOGGER_ENTRY_MAX_PAYLOAD}. Using 4000 as a safe limit to give log tag and its
+     * prefix/suffix max 68 characters for itself. Use "log*Extended()" functions to use max possible
+     * limit if tag is already known.
+     */
+    public static final int LOGGER_ENTRY_MAX_SAFE_PAYLOAD = 4000; // 4000 bytes
 
 
 
@@ -44,6 +63,40 @@ else if (logLevel == Log.VERBOSE && CURRENT_LOG_LEVEL >= LOG_LEVEL_VERBOSE)
             Log.v(getFullTag(tag), message);
     }
 
+    public static void logExtendedMessage(int logLevel, String tag, String message) {
+        if (message == null) return;
+
+        int cutOffIndex;
+        int nextNewlineIndex;
+        String prefix = "";
+
+        // -8 for prefix "(xx/xx)" (max 99 sections), - log tag length, -4 for log tag prefix "D/" and suffix ": "
+        int maxEntrySize = LOGGER_ENTRY_MAX_PAYLOAD - 8 - getFullTag(tag).length() - 4;
+
+        List<String> messagesList = new ArrayList<>();
+
+        while(!message.isEmpty()) {
+            if (message.length() > maxEntrySize) {
+                cutOffIndex = maxEntrySize;
+                nextNewlineIndex = message.lastIndexOf('\n', cutOffIndex);
+                if (nextNewlineIndex != -1) {
+                    cutOffIndex = nextNewlineIndex + 1;
+                }
+                messagesList.add(message.substring(0, cutOffIndex));
+                message = message.substring(cutOffIndex);
+            } else {
+                messagesList.add(message);
+                break;
+            }
+        }
+
+        for(int i=0; i<messagesList.size(); i++) {
+            if (messagesList.size() > 1)
+                prefix = "(" + (i + 1) + "/" + messagesList.size() + ")\n";
+            logMessage(logLevel, tag, prefix + messagesList.get(i));
+        }
+    }
+
 
 
     public static void logError(String tag, String message) {
@@ -54,6 +107,14 @@ public static void logError(String message) {
         logMessage(Log.ERROR, DEFAULT_LOG_TAG, message);
     }
 
+    public static void logErrorExtended(String tag, String message) {
+        logExtendedMessage(Log.ERROR, tag, message);
+    }
+
+    public static void logErrorExtended(String message) {
+        logExtendedMessage(Log.ERROR, DEFAULT_LOG_TAG, message);
+    }
+
 
 
     public static void logWarn(String tag, String message) {
@@ -64,6 +125,14 @@ public static void logWarn(String message) {
         logMessage(Log.WARN, DEFAULT_LOG_TAG, message);
     }
 
+    public static void logWarnExtended(String tag, String message) {
+        logExtendedMessage(Log.WARN, tag, message);
+    }
+
+    public static void logWarnExtended(String message) {
+        logExtendedMessage(Log.WARN, DEFAULT_LOG_TAG, message);
+    }
+
 
 
     public static void logInfo(String tag, String message) {
@@ -74,6 +143,14 @@ public static void logInfo(String message) {
         logMessage(Log.INFO, DEFAULT_LOG_TAG, message);
     }
 
+    public static void logInfoExtended(String tag, String message) {
+        logExtendedMessage(Log.INFO, tag, message);
+    }
+
+    public static void logInfoExtended(String message) {
+        logExtendedMessage(Log.INFO, DEFAULT_LOG_TAG, message);
+    }
+
 
 
     public static void logDebug(String tag, String message) {
@@ -84,6 +161,14 @@ public static void logDebug(String message) {
         logMessage(Log.DEBUG, DEFAULT_LOG_TAG, message);
     }
 
+    public static void logDebugExtended(String tag, String message) {
+        logExtendedMessage(Log.DEBUG, tag, message);
+    }
+
+    public static void logDebugExtended(String message) {
+        logExtendedMessage(Log.DEBUG, DEFAULT_LOG_TAG, message);
+    }
+
 
 
     public static void logVerbose(String tag, String message) {
@@ -94,6 +179,14 @@ public static void logVerbose(String message) {
         logMessage(Log.VERBOSE, DEFAULT_LOG_TAG, message);
     }
 
+    public static void logVerboseExtended(String tag, String message) {
+        logExtendedMessage(Log.VERBOSE, tag, message);
+    }
+
+    public static void logVerboseExtended(String message) {
+        logExtendedMessage(Log.VERBOSE, DEFAULT_LOG_TAG, message);
+    }
+
 
 
     public static void logErrorAndShowToast(Context context, String tag, String message) {
@@ -126,48 +219,103 @@ public static void logDebugAndShowToast(Context context, String message) {
 
 
 
+    public static void logStackTraceWithMessage(String tag, String message, Throwable throwable, boolean getSuppressed) {
+        Logger.logErrorExtended(tag, getMessageAndStackTraceString(message, throwable, getSuppressed));
+    }
+
     public static void logStackTraceWithMessage(String tag, String message, Throwable throwable) {
-        if (CURRENT_LOG_LEVEL >= LOG_LEVEL_NORMAL)
-            Log.e(getFullTag(tag), getMessageAndStackTraceString(message, throwable));
+        logStackTraceWithMessage(tag, message, throwable, true);
+    }
+
+    public static void logStackTraceWithMessage(String message, Throwable throwable, boolean getSuppressed) {
+        logStackTraceWithMessage(DEFAULT_LOG_TAG, message, throwable, getSuppressed);
     }
 
     public static void logStackTraceWithMessage(String message, Throwable throwable) {
-        logStackTraceWithMessage(DEFAULT_LOG_TAG, message, throwable);
+        logStackTraceWithMessage(DEFAULT_LOG_TAG, message, throwable, true);
+    }
+
+
+    public static void logStackTrace(String tag, Throwable throwable, boolean getSuppressed) {
+        logStackTraceWithMessage(tag, null, throwable, getSuppressed);
     }
 
     public static void logStackTrace(String tag, Throwable throwable) {
-        logStackTraceWithMessage(tag, null, throwable);
+        logStackTraceWithMessage(tag, null, throwable, true);
+    }
+
+
+    public static void logStackTrace(Throwable throwable, boolean getSuppressed) {
+        logStackTraceWithMessage(DEFAULT_LOG_TAG, null, throwable, getSuppressed);
     }
 
     public static void logStackTrace(Throwable throwable) {
-        logStackTraceWithMessage(DEFAULT_LOG_TAG, null, throwable);
+        logStackTraceWithMessage(DEFAULT_LOG_TAG, null, throwable, true);
+    }
+
+
+
+    public static void logStackTracesWithMessage(String tag, String message, List<Throwable> throwablesList, boolean getSuppressed) {
+        Logger.logErrorExtended(tag, getMessageAndStackTracesString(message, throwablesList, getSuppressed));
     }
 
-    public static void logStackTracesWithMessage(String tag, String message, List<Throwable> throwableList) {
-        if (CURRENT_LOG_LEVEL >= LOG_LEVEL_NORMAL)
-            Log.e(getFullTag(tag), getMessageAndStackTracesString(message, throwableList));
+    public static void logStackTracesWithMessage(String tag, String message, List<Throwable> throwablesList) {
+        Logger.logErrorExtended(tag, getMessageAndStackTracesString(message, throwablesList, true));
     }
 
+
+
     public static String getMessageAndStackTraceString(String message, Throwable throwable) {
+        return getMessageAndStackTraceString(message, throwable, true);
+    }
+
+    public static String getMessageAndStackTraceString(String message, Throwable throwable, boolean getSuppressed) {
         if (message == null && throwable == null)
             return null;
         else if (message != null && throwable != null)
-            return message + ":\n" + getStackTraceString(throwable);
+            return message + ":\n" + getStackTraceString(throwable, getSuppressed);
         else if (throwable == null)
             return message;
         else
-            return getStackTraceString(throwable);
+            return getStackTraceString(throwable, getSuppressed);
     }
 
-    public static String getMessageAndStackTracesString(String message, List<Throwable> throwableList) {
-        if (message == null && (throwableList == null || throwableList.size() == 0))
+
+
+    public static String getMessageAndStackTracesString(String message, List<Throwable> throwablesList) {
+        return getMessageAndStackTracesString(message, throwablesList, true);
+    }
+
+    public static String getMessageAndStackTracesString(String message, List<Throwable> throwablesList, boolean getSuppressed) {
+        if (message == null && (throwablesList == null || throwablesList.size() == 0))
             return null;
-        else if (message != null && (throwableList != null && throwableList.size() != 0))
-            return message + ":\n" + getStackTracesString(null, getStackTraceStringArray(throwableList));
-        else if (throwableList == null || throwableList.size() == 0)
+        else if (message != null && (throwablesList != null && throwablesList.size() != 0))
+            return message + ":\n" + getStackTracesString(null, getStackTracesStringArray(throwablesList, getSuppressed));
+        else if (throwablesList == null || throwablesList.size() == 0)
             return message;
         else
-            return getStackTracesString(null, getStackTraceStringArray(throwableList));
+            return getStackTracesString(null, getStackTracesStringArray(throwablesList, getSuppressed));
+    }
+
+
+
+    public static String getStackTraceString(Throwable throwable, boolean getSuppressed) {
+        if (throwable == null) return null;
+
+        StringBuilder stackTraceString = new StringBuilder();
+        stackTraceString.append(getStackTraceString(throwable));
+
+        if (getSuppressed) {
+            Throwable[] suppressedThrowablesArray = throwable.getSuppressed();
+            if (suppressedThrowablesArray != null && suppressedThrowablesArray.length > 0) {
+                for (Throwable suppressedThrowable : suppressedThrowablesArray) {
+                    if (suppressedThrowable == null) continue;
+                    stackTraceString.append("\n\n").append(getStackTraceString(suppressedThrowable));
+                }
+            }
+        }
+
+        return stackTraceString.toString();
     }
 
     public static String getStackTraceString(Throwable throwable) {
@@ -182,27 +330,40 @@ public static String getStackTraceString(Throwable throwable) {
             pw.close();
             stackTraceString = errors.toString();
             errors.close();
-        } catch (IOException e1) {
-            e1.printStackTrace();
+        } catch (IOException e) {
+            e.printStackTrace();
         }
 
         return stackTraceString;
     }
 
-    public static String[] getStackTraceStringArray(Throwable throwable) {
-        return getStackTraceStringArray(Collections.singletonList(throwable));
+
+
+    public static String[] getStackTracesStringArray(Throwable throwable, boolean getSuppressed) {
+        return getStackTracesStringArray(Collections.singletonList(throwable), getSuppressed);
     }
 
-    public static String[] getStackTraceStringArray(List<Throwable> throwableList) {
-        if (throwableList == null) return null;
+    public static String[] getStackTracesStringArray(Throwable throwable) {
+        return getStackTracesStringArray(Collections.singletonList(throwable), true);
+    }
 
-        final String[] stackTraceStringArray = new String[throwableList.size()];
-        for (int i = 0; i < throwableList.size(); i++) {
-            stackTraceStringArray[i] = getStackTraceString(throwableList.get(i));
+    public static String[] getStackTracesStringArray(List<Throwable> throwablesList) {
+        return getStackTracesStringArray(throwablesList, true);
+
+    }
+
+    public static String[] getStackTracesStringArray(List<Throwable> throwablesList, boolean getSuppressed) {
+        if (throwablesList == null) return null;
+
+        final String[] stackTraceStringArray = new String[throwablesList.size()];
+        for (int i = 0; i < throwablesList.size(); i++) {
+            stackTraceStringArray[i] = getStackTraceString(throwablesList.get(i), getSuppressed);
         }
         return stackTraceStringArray;
     }
 
+
+
     public static String getStackTracesString(String label, String[] stackTraceStringArray) {
         if (label == null) label = "StackTraces:";
         StringBuilder stackTracesString = new StringBuilder(label);

From 4494bc66e4be7a46c28d331a7177e9f6cc24f721 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 26 Jun 2021 07:23:34 +0500
Subject: [PATCH 424/912] Implement Errno system

This commit adds onto 679e0de0

If an exception is thrown, the exception message might not contain the full errors. Individual failures may get added to suppressed throwables. FileUtils functions previously just returned the exception message as errmsg which did not contain full error info.

Now `Error` class has been implemented which will used to return errors, including suppressed throwables. Each `Error` object will have an error type, code, message and a list of throwables in case multiple throwables need to returned, in addition to the suppressed throwables list in each throwable.

A supportive `Errno` base class has been implemented as well which other errno classes can inherit of which some have been added. Each `Errno` object will have an error type, code and message and can be converted to an `Error` object if needed.

Requirement for `Context` object has been removed from FileUtils so that they can be called from anywhere in code instead of having to pass around `Context` objects. Previously, `string.xml` was used to store error messages in case multi language support had to be added in future since error messages are displayed to users and not just for dev usage. However, now this will have to handled in java code if needed, based on locale.

The termux related file utils have also been moved from FileUtils to TermuxFileUtils
---
 .../java/com/termux/app/TermuxInstaller.java  |  40 +-
 .../java/com/termux/app/utils/CrashUtils.java |  17 +-
 .../com/termux/shared/crash/CrashHandler.java |   9 +-
 .../com/termux/shared/file/FileUtils.java     | 553 ++++++++----------
 .../termux/shared/file/TermuxFileUtils.java   | 123 ++++
 .../shared/file/filesystem/FileTypes.java     |   2 +-
 .../shared/file/tests/FileUtilsTests.java     |  96 +--
 .../termux/shared/models/errors/Errno.java    |  89 +++
 .../termux/shared/models/errors/Error.java    | 249 ++++++++
 .../shared/models/errors/FileUtilsErrno.java  |  81 +++
 .../shared/models/errors/FunctionErrno.java   |  20 +
 .../com/termux/shared/shell/ShellUtils.java   |  11 +-
 termux-shared/src/main/res/values/strings.xml |  47 +-
 13 files changed, 904 insertions(+), 433 deletions(-)
 create mode 100644 termux-shared/src/main/java/com/termux/shared/file/TermuxFileUtils.java
 create mode 100644 termux-shared/src/main/java/com/termux/shared/models/errors/Errno.java
 create mode 100644 termux-shared/src/main/java/com/termux/shared/models/errors/Error.java
 create mode 100644 termux-shared/src/main/java/com/termux/shared/models/errors/FileUtilsErrno.java
 create mode 100644 termux-shared/src/main/java/com/termux/shared/models/errors/FunctionErrno.java

diff --git a/app/src/main/java/com/termux/app/TermuxInstaller.java b/app/src/main/java/com/termux/app/TermuxInstaller.java
index 7a1b5456a8..6b4782ebf2 100644
--- a/app/src/main/java/com/termux/app/TermuxInstaller.java
+++ b/app/src/main/java/com/termux/app/TermuxInstaller.java
@@ -14,6 +14,7 @@
 import com.termux.shared.file.FileUtils;
 import com.termux.shared.interact.DialogUtils;
 import com.termux.shared.logger.Logger;
+import com.termux.shared.models.errors.Error;
 import com.termux.shared.termux.TermuxConstants;
 
 import java.io.BufferedReader;
@@ -88,21 +89,21 @@ public void run() {
                 try {
                     Logger.logInfo(LOG_TAG, "Installing " + TermuxConstants.TERMUX_APP_NAME + " bootstrap packages.");
 
-                    String errmsg;
+                    Error error;
 
                     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
-                    errmsg = FileUtils.deleteFile(activity, "prefix staging directory", STAGING_PREFIX_PATH, true);
-                    if (errmsg != null) {
-                        throw new RuntimeException(errmsg);
+                    error = FileUtils.deleteFile("prefix staging directory", STAGING_PREFIX_PATH, true);
+                    if (error != null) {
+                        throw new RuntimeException(error.toString());
                     }
 
                     // Delete prefix directory or any file at its destination
-                    errmsg = FileUtils.deleteFile(activity, "prefix directory", PREFIX_FILE_PATH, true);
-                    if (errmsg != null) {
-                        throw new RuntimeException(errmsg);
+                    error = FileUtils.deleteFile("prefix directory", PREFIX_FILE_PATH, true);
+                    if (error != null) {
+                        throw new RuntimeException(error.toString());
                     }
 
                     Logger.logInfo(LOG_TAG, "Extracting bootstrap zip to prefix staging directory \"" + STAGING_PREFIX_PATH + "\".");
@@ -125,14 +126,14 @@ public void run() {
                                     String newPath = STAGING_PREFIX_PATH + "/" + parts[1];
                                     symlinks.add(Pair.create(oldPath, newPath));
 
-                                    ensureDirectoryExists(activity, new File(newPath).getParentFile());
+                                    ensureDirectoryExists(new File(newPath).getParentFile());
                                 }
                             } else {
                                 String zipEntryName = zipEntry.getName();
                                 File targetFile = new File(STAGING_PREFIX_PATH, zipEntryName);
                                 boolean isDirectory = zipEntry.isDirectory();
 
-                                ensureDirectoryExists(activity, isDirectory ? targetFile : targetFile.getParentFile());
+                                ensureDirectoryExists(isDirectory ? targetFile : targetFile.getParentFile());
 
                                 if (!isDirectory) {
                                     try (FileOutputStream outStream = new FileOutputStream(targetFile)) {
@@ -173,7 +174,7 @@ public void run() {
                                     activity.finish();
                                 }).setPositiveButton(R.string.bootstrap_error_try_again, (dialog, which) -> {
                                 dialog.dismiss();
-                                FileUtils.deleteFile(activity, "prefix directory", PREFIX_FILE_PATH, true);
+                                FileUtils.deleteFile("prefix directory", PREFIX_FILE_PATH, true);
                                 TermuxInstaller.setupBootstrapIfNeeded(activity, whenDone);
                             }).show();
                         } catch (WindowManager.BadTokenException e1) {
@@ -201,12 +202,13 @@ static void setupStorageSymlinks(final Context context) {
         new Thread() {
             public void run() {
                 try {
-                    String errmsg;
+                    Error error;
                     File storageDir = TermuxConstants.TERMUX_STORAGE_HOME_DIR;
 
-                    errmsg = FileUtils.clearDirectory(context, "~/storage", storageDir.getAbsolutePath());
-                    if (errmsg != null) {
-                        Logger.logErrorAndShowToast(context, LOG_TAG, errmsg);
+                    error = FileUtils.clearDirectory("~/storage", storageDir.getAbsolutePath());
+                    if (error != null) {
+                        Logger.logErrorAndShowToast(context, LOG_TAG, error.getMessage());
+                        Logger.logErrorExtended(LOG_TAG, error.toString());
                         return;
                     }
 
@@ -249,12 +251,12 @@ public void run() {
         }.start();
     }
 
-    private static void ensureDirectoryExists(Context context, File directory) {
-        String errmsg;
+    private static void ensureDirectoryExists(File directory) {
+        Error error;
 
-        errmsg = FileUtils.createDirectoryFile(context, directory.getAbsolutePath());
-        if (errmsg != null) {
-            throw new RuntimeException(errmsg);
+        error = FileUtils.createDirectoryFile(directory.getAbsolutePath());
+        if (error != null) {
+            throw new RuntimeException(error.toString());
         }
     }
 
diff --git a/app/src/main/java/com/termux/app/utils/CrashUtils.java b/app/src/main/java/com/termux/app/utils/CrashUtils.java
index 55a65ef423..63cd03562d 100644
--- a/app/src/main/java/com/termux/app/utils/CrashUtils.java
+++ b/app/src/main/java/com/termux/app/utils/CrashUtils.java
@@ -10,6 +10,7 @@
 
 import com.termux.R;
 import com.termux.shared.activities.ReportActivity;
+import com.termux.shared.models.errors.Error;
 import com.termux.shared.notification.NotificationUtils;
 import com.termux.shared.file.FileUtils;
 import com.termux.shared.models.ReportInfo;
@@ -62,25 +63,25 @@ public void run() {
                 if (!FileUtils.regularFileExists(TermuxConstants.TERMUX_CRASH_LOG_FILE_PATH, false))
                     return;
 
-                String errmsg;
+                Error error;
                 StringBuilder reportStringBuilder = new StringBuilder();
 
                 // Read report string from crash log file
-                errmsg = FileUtils.readStringFromFile(context, "crash log", TermuxConstants.TERMUX_CRASH_LOG_FILE_PATH, Charset.defaultCharset(), reportStringBuilder, false);
-                if (errmsg != null) {
-                    Logger.logError(logTag, errmsg);
+                error = FileUtils.readStringFromFile("crash log", TermuxConstants.TERMUX_CRASH_LOG_FILE_PATH, Charset.defaultCharset(), reportStringBuilder, false);
+                if (error != null) {
+                    Logger.logErrorExtended(logTag, error.toString());
                     return;
                 }
 
                 // Move crash log file to backup location if it exists
-                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);
+                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());
                 }
 
                 String reportString = reportStringBuilder.toString();
 
-                if (reportString == null || reportString.isEmpty())
+                if (reportString.isEmpty())
                     return;
 
                 // Send a notification to show the crash log which when clicked will open the {@link ReportActivity}
diff --git a/termux-shared/src/main/java/com/termux/shared/crash/CrashHandler.java b/termux-shared/src/main/java/com/termux/shared/crash/CrashHandler.java
index 8cdbdf246b..1f7c82ad36 100644
--- a/termux-shared/src/main/java/com/termux/shared/crash/CrashHandler.java
+++ b/termux-shared/src/main/java/com/termux/shared/crash/CrashHandler.java
@@ -7,6 +7,7 @@
 import com.termux.shared.file.FileUtils;
 import com.termux.shared.logger.Logger;
 import com.termux.shared.markdown.MarkdownUtils;
+import com.termux.shared.models.errors.Error;
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.termux.TermuxUtils;
 
@@ -57,7 +58,7 @@ public static void logCrash(final Context context, final Thread thread, final Th
         reportString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Crash Thread", thread.toString(), "-"));
         reportString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Crash Timestamp", TermuxUtils.getCurrentTimeStamp(), "-"));
 
-        reportString.append("\n\n").append(Logger.getStackTracesMarkdownString("Stacktrace", Logger.getStackTraceStringArray(throwable)));
+        reportString.append("\n\n").append(Logger.getStackTracesMarkdownString("Stacktrace", Logger.getStackTracesStringArray(throwable)));
         reportString.append("\n\n").append(TermuxUtils.getAppInfoMarkdownString(context, true));
         reportString.append("\n\n").append(TermuxUtils.getDeviceInfoMarkdownString(context));
 
@@ -65,9 +66,9 @@ public static void logCrash(final Context context, final Thread thread, final Th
         Logger.logError(reportString.toString());
 
         // Write report string to crash log file
-        String errmsg = FileUtils.writeStringToFile(context, "crash log", TermuxConstants.TERMUX_CRASH_LOG_FILE_PATH, Charset.defaultCharset(), reportString.toString(), false);
-        if (errmsg != null) {
-            Logger.logError(LOG_TAG, errmsg);
+        Error error = FileUtils.writeStringToFile("crash log", TermuxConstants.TERMUX_CRASH_LOG_FILE_PATH, Charset.defaultCharset(), reportString.toString(), false);
+        if (error != null) {
+            Logger.logErrorExtended(LOG_TAG, error.toString());
         }
     }
 
diff --git a/termux-shared/src/main/java/com/termux/shared/file/FileUtils.java b/termux-shared/src/main/java/com/termux/shared/file/FileUtils.java
index 71b1ae15dd..4bc81933b9 100644
--- a/termux-shared/src/main/java/com/termux/shared/file/FileUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/file/FileUtils.java
@@ -1,18 +1,18 @@
 package com.termux.shared.file;
 
-import android.content.Context;
 import android.os.Build;
 import android.system.Os;
 
 import androidx.annotation.NonNull;
 
 import com.google.common.io.RecursiveDeleteOption;
-import com.termux.shared.R;
-import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.file.filesystem.FileType;
 import com.termux.shared.file.filesystem.FileTypes;
 import com.termux.shared.data.DataUtils;
 import com.termux.shared.logger.Logger;
+import com.termux.shared.models.errors.Error;
+import com.termux.shared.models.errors.FileUtilsErrno;
+import com.termux.shared.models.errors.FunctionErrno;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
@@ -21,9 +21,7 @@
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.nio.charset.Charset;
 import java.nio.file.LinkOption;
@@ -32,45 +30,18 @@
 
 public class FileUtils {
 
-    private static final String LOG_TAG = "FileUtils";
-
-    /**
-     * Replace "$PREFIX/" or "~/" prefix with termux absolute paths.
-     *
-     * @param path The {@code path} to expand.
-     * @return Returns the {@code expand path}.
-     */
-    public static String getExpandedTermuxPath(String path) {
-        if (path != null && !path.isEmpty()) {
-            path = path.replaceAll("^\\$PREFIX$", TermuxConstants.TERMUX_PREFIX_DIR_PATH);
-            path = path.replaceAll("^\\$PREFIX/", TermuxConstants.TERMUX_PREFIX_DIR_PATH + "/");
-            path = path.replaceAll("^~/$", TermuxConstants.TERMUX_HOME_DIR_PATH);
-            path = path.replaceAll("^~/", TermuxConstants.TERMUX_HOME_DIR_PATH + "/");
-        }
+    /** Required file permissions for the executable file for app usage. Executable file must have read and execute permissions */
+    public static final String APP_EXECUTABLE_FILE_PERMISSIONS = "r-x"; // Default: "r-x"
+    /** Required file permissions for the working directory for app usage. 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 APP_WORKING_DIRECTORY_PERMISSIONS = "rwx"; // Default: "rwx"
 
-        return path;
-    }
-
-    /**
-     * Replace termux absolute paths with "$PREFIX/" or "~/" prefix.
-     *
-     * @param path The {@code path} to unexpand.
-     * @return Returns the {@code unexpand path}.
-     */
-    public static String getUnExpandedTermuxPath(String path) {
-        if (path != null && !path.isEmpty()) {
-            path = path.replaceAll("^" + Pattern.quote(TermuxConstants.TERMUX_PREFIX_DIR_PATH) + "/", "\\$PREFIX/");
-            path = path.replaceAll("^" + Pattern.quote(TermuxConstants.TERMUX_HOME_DIR_PATH) + "/", "~/");
-        }
-
-        return path;
-    }
+    private static final String LOG_TAG = "FileUtils";
 
     /**
-     * If {@code expandPath} is enabled, then input path is first attempted to be expanded by calling
-     * {@link #getExpandedTermuxPath(String)}.
+     * Get canonical path.
      *
-     * Then if path is already an absolute path, then it is used as is to get canonical path.
+     * If path is already an absolute path, then it is used as is to get canonical path.
      * If path is not an absolute path and {code prefixForNonAbsolutePath} is not {@code null}, then
      * {code prefixForNonAbsolutePath} + "/" is prefixed before path before getting canonical path.
      * If path is not an absolute path and {code prefixForNonAbsolutePath} is {@code null}, then
@@ -85,12 +56,9 @@ public static String getUnExpandedTermuxPath(String path) {
      *                                 will automatically do this anyways.
      * @return Returns the {@code canonical path}.
      */
-    public static String getCanonicalPath(String path, final String prefixForNonAbsolutePath, final boolean expandPath) {
+    public static String getCanonicalPath(String path, final String prefixForNonAbsolutePath) {
         if (path == null) path = "";
 
-        if (expandPath)
-            path = getExpandedTermuxPath(path);
-
         String absolutePath;
 
         // If path is already an absolute path
@@ -160,7 +128,6 @@ public static boolean isPathInDirPath(String path, final String dirPath, final b
     }
 
 
-
     /**
      * Checks whether a regular file exists at {@code filePath}.
      *
@@ -215,7 +182,7 @@ public static boolean fileExists(final String filePath, final boolean followLink
      *
      * This function is a wrapper for
      * {@link FileTypes#getFileType(String, boolean)}
-     * 
+     *
      * @param filePath The {@code path} for file to check.
      * @param followLinks The {@code boolean} that decides if symlinks will be followed while
      *                       finding type. If set to {@code true}, then type of symlink target will
@@ -236,7 +203,6 @@ public static FileType getFileType(final String filePath, final boolean followLi
      * If the {@code parentDirPath} is not {@code null}, then setting of missing permissions will
      * only be done if {@code path} is under {@code parentDirPath}.
      *
-     * @param context The {@link Context} to get error string.
      * @param label The optional label for the regular file. This can optionally be {@code null}.
      * @param filePath The {@code path} for file to validate. Symlinks will not be followed.
      * @param parentDirPath The optional {@code parent directory path} to restrict operations to.
@@ -249,21 +215,21 @@ public static FileType getFileType(final String filePath, final boolean followLi
      * @param ignoreErrorsIfPathIsUnderParentDirPath The {@code boolean} that decides if permission
      *                                               errors are to be ignored if path is under
      *                                               {@code parentDirPath}.
-     * @return Returns the {@code errmsg} if path is not a regular file, or validating permissions
+     * @return Returns the {@code error} if path is not a regular file, or validating permissions
      * failed, otherwise {@code null}.
      */
-    public static String validateRegularFileExistenceAndPermissions(@NonNull final Context context, String label, final String filePath, final String parentDirPath,
+    public static Error validateRegularFileExistenceAndPermissions(String label, final String filePath, final String parentDirPath,
                                                                     final String permissionsToCheck, final boolean setPermissions, final boolean setMissingPermissionsOnly,
                                                                     final boolean ignoreErrorsIfPathIsUnderParentDirPath) {
         label = (label == null ? "" : label + " ");
-        if (filePath == null || filePath.isEmpty()) return context.getString(R.string.error_null_or_empty_parameter, label + "regular file path", "validateRegularFileExistenceAndPermissions");
+        if (filePath == null || filePath.isEmpty()) return FunctionErrno.ERRNO_NULL_OR_EMPTY_PARAMETER.getError(label + "regular file path", "validateRegularFileExistenceAndPermissions");
 
         try {
             FileType fileType = getFileType(filePath, false);
 
             // If file exists but not a regular file
             if (fileType != FileType.NO_EXIST && fileType != FileType.REGULAR) {
-                return context.getString(R.string.error_non_regular_file_found, label + "file");
+                return FileUtilsErrno.ERRNO_NON_REGULAR_FILE_FOUND.getError(label + "file");
             }
 
             boolean isPathUnderParentDirPath = false;
@@ -286,7 +252,7 @@ public static String validateRegularFileExistenceAndPermissions(@NonNull final C
             // If path is not a regular file
             // Regular files cannot be automatically created so we do not ignore if missing
             if (fileType != FileType.REGULAR) {
-                return context.getString(R.string.error_no_regular_file_found, label + "file");
+                return FileUtilsErrno.ERRNO_NO_REGULAR_FILE_FOUND.getError(label + "file");
             }
 
             // If there is not parentDirPath restriction or path is not under parentDirPath or
@@ -294,11 +260,11 @@ public static String validateRegularFileExistenceAndPermissions(@NonNull final C
             if (parentDirPath == null || !isPathUnderParentDirPath || !ignoreErrorsIfPathIsUnderParentDirPath) {
                 if (permissionsToCheck != null) {
                     // Check if permissions are missing
-                    return checkMissingFilePermissions(context, label + "regular", filePath, permissionsToCheck, false);
+                    return checkMissingFilePermissions(label + "regular", filePath, permissionsToCheck, false);
                 }
             }
         } catch (Exception e) {
-            return context.getString(R.string.error_validate_file_existence_and_permissions_failed_with_exception, label + "file", filePath, e.getMessage());
+            return FileUtilsErrno.ERRNO_VALIDATE_FILE_EXISTENCE_AND_PERMISSIONS_FAILED_WITH_EXCEPTION.getError(e, label + "file", filePath, e.getMessage());
         }
 
         return null;
@@ -312,7 +278,6 @@ public static String validateRegularFileExistenceAndPermissions(@NonNull final C
      * setting of missing permissions will only be done if {@code path} is under
      * {@code parentDirPath} or equals {@code parentDirPath}.
      *
-     * @param context The {@link Context} to get error string.
      * @param label The optional label for the directory file. This can optionally be {@code null}.
      * @param filePath The {@code path} for file to validate or create. Symlinks will not be followed.
      * @param parentDirPath The optional {@code parent directory path} to restrict operations to.
@@ -330,14 +295,14 @@ public static String validateRegularFileExistenceAndPermissions(@NonNull final C
      * @param ignoreIfNotExecutable The {@code boolean} that decides if missing executable permission
      *                              error is to be ignored. This allows making an attempt to set
      *                              executable permissions, but ignoring if it fails.
-     * @return Returns the {@code errmsg} if path is not a directory file, failed to create it,
+     * @return Returns the {@code error} if path is not a directory file, failed to create it,
      * or validating permissions failed, otherwise {@code null}.
      */
-    public static String validateDirectoryFileExistenceAndPermissions(@NonNull final Context context, String label, final String filePath, final String parentDirPath, final boolean createDirectoryIfMissing,
+    public static Error validateDirectoryFileExistenceAndPermissions(String label, final String filePath, final String parentDirPath, final boolean createDirectoryIfMissing,
                                                                       final String permissionsToCheck, final boolean setPermissions, final boolean setMissingPermissionsOnly,
                                                                       final boolean ignoreErrorsIfPathIsInParentDirPath, final boolean ignoreIfNotExecutable) {
         label = (label == null ? "" : label + " ");
-        if (filePath == null || filePath.isEmpty()) return context.getString(R.string.error_null_or_empty_parameter, label + "directory file path", "validateDirectoryExistenceAndPermissions");
+        if (filePath == null || filePath.isEmpty()) return FunctionErrno.ERRNO_NULL_OR_EMPTY_PARAMETER.getError(label + "directory file path", "validateDirectoryExistenceAndPermissions");
 
         try {
             File file = new File(filePath);
@@ -345,7 +310,7 @@ public static String validateDirectoryFileExistenceAndPermissions(@NonNull final
 
             // If file exists but not a directory file
             if (fileType != FileType.NO_EXIST && fileType != FileType.DIRECTORY) {
-                return context.getString(R.string.error_non_directory_file_found, label + "directory");
+                return FileUtilsErrno.ERRNO_NON_DIRECTORY_FILE_FOUND.getError(label + "directory");
             }
 
             boolean isPathInParentDirPath = false;
@@ -364,7 +329,7 @@ public static String validateDirectoryFileExistenceAndPermissions(@NonNull final
                         if (file.mkdirs())
                             fileType = getFileType(filePath, false);
                         else
-                            return context.getString(R.string.error_creating_file_failed, label + "directory file", filePath);
+                            return FileUtilsErrno.ERRNO_CREATING_FILE_FAILED.getError(label + "directory file", filePath);
                     }
 
                     // If setPermissions is enabled and path is a directory
@@ -383,16 +348,16 @@ public static String validateDirectoryFileExistenceAndPermissions(@NonNull final
                 // If path is not a directory
                 // Directories can be automatically created so we can ignore if missing with above check
                 if (fileType != FileType.DIRECTORY) {
-                    return context.getString(R.string.error_file_not_found_at_path, label + "directory", filePath);
+                    return FileUtilsErrno.ERRNO_FILE_NOT_FOUND_AT_PATH.getError(label + "directory", filePath);
                 }
 
                 if (permissionsToCheck != null) {
                     // Check if permissions are missing
-                    return checkMissingFilePermissions(context, label + "directory", filePath, permissionsToCheck, ignoreIfNotExecutable);
+                    return checkMissingFilePermissions(label + "directory", filePath, permissionsToCheck, ignoreIfNotExecutable);
                 }
             }
         } catch (Exception e) {
-            return context.getString(R.string.error_validate_directory_existence_and_permissions_failed_with_exception, label + "directory file", filePath, e.getMessage());
+            return FileUtilsErrno.ERRNO_VALIDATE_DIRECTORY_EXISTENCE_AND_PERMISSIONS_FAILED_WITH_EXCEPTION.getError(e, label + "directory file", filePath, e.getMessage());
         }
 
         return null;
@@ -404,31 +369,29 @@ public static String validateDirectoryFileExistenceAndPermissions(@NonNull final
      * Create a regular file at path.
      *
      * This function is a wrapper for
-     * {@link #validateDirectoryFileExistenceAndPermissions(Context, String, String, String, boolean, String, boolean, boolean, boolean, boolean)}.
+     * {@link #validateDirectoryFileExistenceAndPermissions(String, String, String, boolean, String, boolean, boolean, boolean, boolean)}.
      *
-     * @param context The {@link Context} to get error string.
      * @param filePath The {@code path} for regular file to create.
-     * @return Returns the {@code errmsg} if path is not a regular file or failed to create it,
+     * @return Returns the {@code error} if path is not a regular file or failed to create it,
      * otherwise {@code null}.
      */
-    public static String createRegularFile(@NonNull final Context context, final String filePath) {
-        return createRegularFile(context, null, filePath);
+    public static Error createRegularFile(final String filePath) {
+        return createRegularFile(null, filePath);
     }
 
     /**
      * Create a regular file at path.
      *
      * This function is a wrapper for
-     * {@link #validateDirectoryFileExistenceAndPermissions(Context, String, String, String, boolean, String, boolean, boolean, boolean, boolean)}.
+     * {@link #validateDirectoryFileExistenceAndPermissions(String, String, String, boolean, String, boolean, boolean, boolean, boolean)}.
      *
-     * @param context The {@link Context} to get error string.
      * @param label The optional label for the regular file. This can optionally be {@code null}.
      * @param filePath The {@code path} for regular file to create.
-     * @return Returns the {@code errmsg} if path is not a regular file or failed to create it,
+     * @return Returns the {@code error} if path is not a regular file or failed to create it,
      * otherwise {@code null}.
      */
-    public static String createRegularFile(@NonNull final Context context, final String label, final String filePath) {
-        return createRegularFile(context, label, filePath,
+    public static Error createRegularFile(final String label, final String filePath) {
+        return createRegularFile(label, filePath,
             null, false, false);
     }
 
@@ -436,9 +399,8 @@ public static String createRegularFile(@NonNull final Context context, final Str
      * Create a regular file at path.
      *
      * This function is a wrapper for
-     * {@link #validateRegularFileExistenceAndPermissions(Context, String, String, String, String, boolean, boolean, boolean)}.
+     * {@link #validateRegularFileExistenceAndPermissions(String, String, String, String, boolean, boolean, boolean)}.
      *
-     * @param context The {@link Context} to get error string.
      * @param label The optional label for the regular file. This can optionally be {@code null}.
      * @param filePath The {@code path} for regular file to create.
      * @param permissionsToCheck The 3 character string that contains the "r", "w", "x" or "-" in-order.
@@ -446,22 +408,22 @@ public static String createRegularFile(@NonNull final Context context, final Str
      *                              automatically set defined by {@code permissionsToCheck}.
      * @param setMissingPermissionsOnly The {@code boolean} that decides if only missing permissions
      *                                  are to be set or if they should be overridden.
-     * @return Returns the {@code errmsg} if path is not a regular file, failed to create it,
+     * @return Returns the {@code error} if path is not a regular file, failed to create it,
      * or validating permissions failed, otherwise {@code null}.
      */
-    public static String createRegularFile(@NonNull final Context context, String label, final String filePath,
+    public static Error createRegularFile(String label, final String filePath,
                                            final String permissionsToCheck, final boolean setPermissions, final boolean setMissingPermissionsOnly) {
         label = (label == null ? "" : label + " ");
-        if (filePath == null || filePath.isEmpty()) return context.getString(R.string.error_null_or_empty_parameter, label + "file path", "createRegularFile");
+        if (filePath == null || filePath.isEmpty()) return FunctionErrno.ERRNO_NULL_OR_EMPTY_PARAMETER.getError(label + "file path", "createRegularFile");
 
-        String errmsg;
+        Error error;
 
         File file = new File(filePath);
         FileType fileType = getFileType(filePath, false);
 
         // If file exists but not a regular file
         if (fileType != FileType.NO_EXIST && fileType != FileType.REGULAR) {
-            return context.getString(R.string.error_non_regular_file_found, label + "file");
+            return FileUtilsErrno.ERRNO_NON_REGULAR_FILE_FOUND.getError(label + "file");
         }
 
         // If regular file already exists
@@ -470,20 +432,20 @@ public static String createRegularFile(@NonNull final Context context, String la
         }
 
         // Create the file parent directory
-        errmsg = createParentDirectoryFile(context, label + "regular file parent", filePath);
-        if (errmsg != null)
-            return errmsg;
+        error = createParentDirectoryFile(label + "regular file parent", filePath);
+        if (error != null)
+            return error;
 
         try {
             Logger.logVerbose(LOG_TAG, "Creating " + label + "regular file at path \"" + filePath + "\"");
 
             if (!file.createNewFile())
-                return context.getString(R.string.error_creating_file_failed, label + "regular file", filePath);
+                return FileUtilsErrno.ERRNO_CREATING_FILE_FAILED.getError(label + "regular file", filePath);
         } catch (Exception e) {
-            return context.getString(R.string.error_creating_file_failed_with_exception, label + "regular file", filePath, e.getMessage());
+            return FileUtilsErrno.ERRNO_CREATING_FILE_FAILED_WITH_EXCEPTION.getError(e, label + "regular file", filePath, e.getMessage());
         }
 
-        return validateRegularFileExistenceAndPermissions(context, label, filePath,
+        return validateRegularFileExistenceAndPermissions(label, filePath,
             null,
             permissionsToCheck, setPermissions, setMissingPermissionsOnly,
             false);
@@ -495,23 +457,22 @@ public static String createRegularFile(@NonNull final Context context, String la
      * Create parent directory of file at path.
      *
      * This function is a wrapper for
-     * {@link #validateDirectoryFileExistenceAndPermissions(Context, String, String, String, boolean, String, boolean, boolean, boolean, boolean)}.
+     * {@link #validateDirectoryFileExistenceAndPermissions(String, String, String, boolean, String, boolean, boolean, boolean, boolean)}.
      *
-     * @param context The {@link Context} to get error string.
      * @param label The optional label for the parent directory file. This can optionally be {@code null}.
      * @param filePath The {@code path} for file whose parent needs to be created.
-     * @return Returns the {@code errmsg} if parent path is not a directory file or failed to create it,
+     * @return Returns the {@code error} if parent path is not a directory file or failed to create it,
      * otherwise {@code null}.
      */
-    public static String createParentDirectoryFile(@NonNull final Context context, final String label, final String filePath) {
-        if (filePath == null || filePath.isEmpty()) return context.getString(R.string.error_null_or_empty_parameter, label + "file path", "createParentDirectoryFile");
+    public static Error createParentDirectoryFile(final String label, final String filePath) {
+        if (filePath == null || filePath.isEmpty()) return FunctionErrno.ERRNO_NULL_OR_EMPTY_PARAMETER.getError(label + "file path", "createParentDirectoryFile");
 
         File file = new File(filePath);
         String fileParentPath = file.getParent();
 
         if (fileParentPath != null)
-            return createDirectoryFile(context, label, fileParentPath,
-            null, false, false);
+            return createDirectoryFile(label, fileParentPath,
+                null, false, false);
         else
             return null;
     }
@@ -520,41 +481,38 @@ public static String createParentDirectoryFile(@NonNull final Context context, f
      * Create a directory file at path.
      *
      * This function is a wrapper for
-     * {@link #validateDirectoryFileExistenceAndPermissions(Context, String, String, String, boolean, String, boolean, boolean, boolean, boolean)}.
+     * {@link #validateDirectoryFileExistenceAndPermissions(String, String, String, boolean, String, boolean, boolean, boolean, boolean)}.
      *
-     * @param context The {@link Context} to get error string.
      * @param filePath The {@code path} for directory file to create.
-     * @return Returns the {@code errmsg} if path is not a directory file or failed to create it,
+     * @return Returns the {@code error} if path is not a directory file or failed to create it,
      * otherwise {@code null}.
      */
-    public static String createDirectoryFile(@NonNull final Context context, final String filePath) {
-        return createDirectoryFile(context, null, filePath);
+    public static Error createDirectoryFile(final String filePath) {
+        return createDirectoryFile(null, filePath);
     }
 
     /**
      * Create a directory file at path.
      *
      * This function is a wrapper for
-     * {@link #validateDirectoryFileExistenceAndPermissions(Context, String, String, String, boolean, String, boolean, boolean, boolean, boolean)}.
+     * {@link #validateDirectoryFileExistenceAndPermissions(String, String, String, boolean, String, boolean, boolean, boolean, boolean)}.
      *
-     * @param context The {@link Context} to get error string.
      * @param label The optional label for the directory file. This can optionally be {@code null}.
      * @param filePath The {@code path} for directory file to create.
-     * @return Returns the {@code errmsg} if path is not a directory file or failed to create it,
+     * @return Returns the {@code error} if path is not a directory file or failed to create it,
      * otherwise {@code null}.
      */
-    public static String createDirectoryFile(@NonNull final Context context, final String label, final String filePath) {
-        return createDirectoryFile(context, label, filePath,
+    public static Error createDirectoryFile(final String label, final String filePath) {
+        return createDirectoryFile(label, filePath,
             null, false, false);
     }
 
     /**
      * Create a directory file at path.
-     * 
+     *
      * This function is a wrapper for
-     * {@link #validateDirectoryFileExistenceAndPermissions(Context, String, String, String, boolean, String, boolean, boolean, boolean, boolean)}.
+     * {@link #validateDirectoryFileExistenceAndPermissions(String, String, String, boolean, String, boolean, boolean, boolean, boolean)}.
      *
-     * @param context The {@link Context} to get error string.
      * @param label The optional label for the directory file. This can optionally be {@code null}.
      * @param filePath The {@code path} for directory file to create.
      * @param permissionsToCheck The 3 character string that contains the "r", "w", "x" or "-" in-order.
@@ -562,12 +520,12 @@ public static String createDirectoryFile(@NonNull final Context context, final S
      *                              automatically set defined by {@code permissionsToCheck}.
      * @param setMissingPermissionsOnly The {@code boolean} that decides if only missing permissions
      *                                  are to be set or if they should be overridden.
-     * @return Returns the {@code errmsg} if path is not a directory file, failed to create it,
+     * @return Returns the {@code error} if path is not a directory file, failed to create it,
      * or validating permissions failed, otherwise {@code null}.
      */
-    public static String createDirectoryFile(@NonNull final Context context, final String label, final String filePath,
+    public static Error createDirectoryFile(final String label, final String filePath,
                                              final String permissionsToCheck, final boolean setPermissions, final boolean setMissingPermissionsOnly) {
-        return validateDirectoryFileExistenceAndPermissions(context, label, filePath,
+        return validateDirectoryFileExistenceAndPermissions(label, filePath,
             null, true,
             permissionsToCheck, setPermissions, setMissingPermissionsOnly,
             false, false);
@@ -579,19 +537,18 @@ public static String createDirectoryFile(@NonNull final Context context, final S
      * Create a symlink file at path.
      *
      * This function is a wrapper for
-     * {@link #createSymlinkFile(Context, String, String, String, boolean, boolean, boolean)}.
+     * {@link #createSymlinkFile(String, String, String, boolean, boolean, boolean)}.
      *
      * Dangling symlinks will be allowed.
      * Symlink destination will be overwritten if it already exists but only if its a symlink.
      *
-     * @param context The {@link Context} to get error string.
      * @param targetFilePath The {@code path} TO which the symlink file will be created.
      * @param destFilePath The {@code path} AT which the symlink file will be created.
-     * @return Returns the {@code errmsg} if path is not a symlink file, failed to create it,
+     * @return Returns the {@code error} if path is not a symlink file, failed to create it,
      * otherwise {@code null}.
      */
-    public static String createSymlinkFile(@NonNull final Context context, final String targetFilePath, final String destFilePath) {
-        return createSymlinkFile(context, null, targetFilePath, destFilePath,
+    public static Error createSymlinkFile(final String targetFilePath, final String destFilePath) {
+        return createSymlinkFile(null, targetFilePath, destFilePath,
             true, true, true);
     }
 
@@ -599,27 +556,25 @@ public static String createSymlinkFile(@NonNull final Context context, final Str
      * Create a symlink file at path.
      *
      * This function is a wrapper for
-     * {@link #createSymlinkFile(Context, String, String, String, boolean, boolean, boolean)}.
+     * {@link #createSymlinkFile(String, String, String, boolean, boolean, boolean)}.
      *
      * Dangling symlinks will be allowed.
      * Symlink destination will be overwritten if it already exists but only if its a symlink.
      *
-     * @param context The {@link Context} to get error string.
      * @param label The optional label for the symlink file. This can optionally be {@code null}.
      * @param targetFilePath The {@code path} TO which the symlink file will be created.
      * @param destFilePath The {@code path} AT which the symlink file will be created.
-     * @return Returns the {@code errmsg} if path is not a symlink file, failed to create it,
+     * @return Returns the {@code error} if path is not a symlink file, failed to create it,
      * otherwise {@code null}.
      */
-    public static String createSymlinkFile(@NonNull final Context context, String label, final String targetFilePath, final String destFilePath) {
-        return createSymlinkFile(context, label, targetFilePath, destFilePath,
+    public static Error createSymlinkFile(String label, final String targetFilePath, final String destFilePath) {
+        return createSymlinkFile(label, targetFilePath, destFilePath,
             true, true, true);
     }
 
     /**
      * Create a symlink file at path.
      *
-     * @param context The {@link Context} to get error string.
      * @param label The optional label for the symlink file. This can optionally be {@code null}.
      * @param targetFilePath The {@code path} TO which the symlink file will be created.
      * @param destFilePath The {@code path} AT which the symlink file will be created.
@@ -630,16 +585,16 @@ public static String createSymlinkFile(@NonNull final Context context, String la
      *                  deleted before symlink is created.
      * @param overwriteOnlyIfDestIsASymlink The {@code boolean} that decides if overwrite should
      *                                         only be done if destination file is also a symlink.
-     * @return Returns the {@code errmsg} if path is not a symlink file, failed to create it,
+     * @return Returns the {@code error} if path is not a symlink file, failed to create it,
      * or validating permissions failed, otherwise {@code null}.
      */
-    public static String createSymlinkFile(@NonNull final Context context, String label, final String targetFilePath, final String destFilePath,
+    public static Error createSymlinkFile(String label, final String targetFilePath, final String destFilePath,
                                            final boolean allowDangling, final boolean overwrite, final boolean overwriteOnlyIfDestIsASymlink) {
         label = (label == null ? "" : label + " ");
-        if (targetFilePath == null || targetFilePath.isEmpty()) return context.getString(R.string.error_null_or_empty_parameter, label + "target file path", "createSymlinkFile");
-        if (destFilePath == null || destFilePath.isEmpty()) return context.getString(R.string.error_null_or_empty_parameter, label + "destination file path", "createSymlinkFile");
+        if (targetFilePath == null || targetFilePath.isEmpty()) return FunctionErrno.ERRNO_NULL_OR_EMPTY_PARAMETER.getError(label + "target file path", "createSymlinkFile");
+        if (destFilePath == null || destFilePath.isEmpty()) return FunctionErrno.ERRNO_NULL_OR_EMPTY_PARAMETER.getError(label + "destination file path", "createSymlinkFile");
 
-        String errmsg;
+        Error error;
 
         try {
             File destFile = new File(destFilePath);
@@ -659,7 +614,7 @@ public static String createSymlinkFile(@NonNull final Context context, String la
             if (targetFileType == FileType.NO_EXIST) {
                 // If dangling symlink should not be allowed, then return with error
                 if (!allowDangling)
-                    return context.getString(R.string.error_file_not_found_at_path, label + "symlink target file", targetFileAbsolutePath);
+                    return FileUtilsErrno.ERRNO_FILE_NOT_FOUND_AT_PATH.getError(label + "symlink target file", targetFileAbsolutePath);
             }
 
             // If destination exists
@@ -671,24 +626,24 @@ public static String createSymlinkFile(@NonNull final Context context, String la
 
                 // If overwriteOnlyIfDestIsASymlink is enabled but destination file is not a symlink
                 if (overwriteOnlyIfDestIsASymlink && destFileType != FileType.SYMLINK)
-                    return context.getString(R.string.error_cannot_overwrite_a_non_symlink_file_type, label + " file", destFilePath, targetFilePath, destFileType.getName());
+                    return FileUtilsErrno.ERRNO_CANNOT_OVERWRITE_A_NON_SYMLINK_FILE_TYPE.getError(label + " file", destFilePath, targetFilePath, destFileType.getName());
 
                 // Delete the destination file
-                errmsg = deleteFile(context, label + "symlink destination", destFilePath, true);
-                if (errmsg != null)
-                    return errmsg;
+                error = deleteFile(label + "symlink destination", destFilePath, true);
+                if (error != null)
+                    return error;
             } else {
                 // Create the destination file parent directory
-                errmsg = createParentDirectoryFile(context, label + "symlink destination file parent", destFilePath);
-                if (errmsg != null)
-                    return errmsg;
+                error = createParentDirectoryFile(label + "symlink destination file parent", destFilePath);
+                if (error != null)
+                    return error;
             }
 
             // create a symlink at destFilePath to targetFilePath
             Logger.logVerbose(LOG_TAG, "Creating " + label + "symlink file at path \"" + destFilePath + "\" to \"" + targetFilePath + "\"");
             Os.symlink(targetFilePath, destFilePath);
         } catch (Exception e) {
-            return context.getString(R.string.error_creating_symlink_file_failed_with_exception, label + "symlink file", destFilePath, targetFilePath, e.getMessage());
+            return FileUtilsErrno.ERRNO_CREATING_SYMLINK_FILE_FAILED_WITH_EXCEPTION.getError(e, label + "symlink file", destFilePath, targetFilePath, e.getMessage());
         }
 
         return null;
@@ -700,21 +655,20 @@ public static String createSymlinkFile(@NonNull final Context context, String la
      * Copy a regular file from {@code sourceFilePath} to {@code destFilePath}.
      *
      * This function is a wrapper for
-     * {@link #copyOrMoveFile(Context, String, String, String, boolean, boolean, int, boolean, boolean)}.
+     * {@link #copyOrMoveFile(String, String, String, boolean, boolean, int, boolean, boolean)}.
      *
      * If destination file already exists, then it will be overwritten, but only if its a regular
      * file, otherwise an error will be returned.
      *
-     * @param context The {@link Context} to get error string.
      * @param label The optional label for file to copy. This can optionally be {@code null}.
      * @param srcFilePath The {@code source path} for file to copy.
      * @param destFilePath The {@code destination path} for file to copy.
      * @param ignoreNonExistentSrcFile The {@code boolean} that decides if it should be considered an
      *                              error if source file to copied doesn't exist.
-     * @return Returns the {@code errmsg} if copy was not successful, otherwise {@code null}.
+     * @return Returns the {@code error} if copy was not successful, otherwise {@code null}.
      */
-    public static String copyRegularFile(@NonNull final Context context, final String label, final String srcFilePath, final String destFilePath, final boolean ignoreNonExistentSrcFile) {
-        return copyOrMoveFile(context, label, srcFilePath, destFilePath,
+    public static Error copyRegularFile(final String label, final String srcFilePath, final String destFilePath, final boolean ignoreNonExistentSrcFile) {
+        return copyOrMoveFile(label, srcFilePath, destFilePath,
             false, ignoreNonExistentSrcFile, FileType.REGULAR.getValue(),
             true, true);
     }
@@ -723,21 +677,20 @@ public static String copyRegularFile(@NonNull final Context context, final Strin
      * Move a regular file from {@code sourceFilePath} to {@code destFilePath}.
      *
      * This function is a wrapper for
-     * {@link #copyOrMoveFile(Context, String, String, String, boolean, boolean, int, boolean, boolean)}.
+     * {@link #copyOrMoveFile(String, String, String, boolean, boolean, int, boolean, boolean)}.
      *
      * If destination file already exists, then it will be overwritten, but only if its a regular
      * file, otherwise an error will be returned.
      *
-     * @param context The {@link Context} to get error string.
      * @param label The optional label for file to move. This can optionally be {@code null}.
      * @param srcFilePath The {@code source path} for file to move.
      * @param destFilePath The {@code destination path} for file to move.
      * @param ignoreNonExistentSrcFile The {@code boolean} that decides if it should be considered an
      *                              error if source file to moved doesn't exist.
-     * @return Returns the {@code errmsg} if move was not successful, otherwise {@code null}.
+     * @return Returns the {@code error} if move was not successful, otherwise {@code null}.
      */
-    public static String moveRegularFile(@NonNull final Context context, final String label, final String srcFilePath, final String destFilePath, final boolean ignoreNonExistentSrcFile) {
-        return copyOrMoveFile(context, label, srcFilePath, destFilePath,
+    public static Error moveRegularFile(final String label, final String srcFilePath, final String destFilePath, final boolean ignoreNonExistentSrcFile) {
+        return copyOrMoveFile(label, srcFilePath, destFilePath,
             true, ignoreNonExistentSrcFile, FileType.REGULAR.getValue(),
             true, true);
     }
@@ -746,21 +699,20 @@ public static String moveRegularFile(@NonNull final Context context, final Strin
      * Copy a directory file from {@code sourceFilePath} to {@code destFilePath}.
      *
      * This function is a wrapper for
-     * {@link #copyOrMoveFile(Context, String, String, String, boolean, boolean, int, boolean, boolean)}.
+     * {@link #copyOrMoveFile(String, String, String, boolean, boolean, int, boolean, boolean)}.
      *
      * If destination file already exists, then it will be overwritten, but only if its a directory
      * file, otherwise an error will be returned.
      *
-     * @param context The {@link Context} to get error string.
      * @param label The optional label for file to copy. This can optionally be {@code null}.
      * @param srcFilePath The {@code source path} for file to copy.
      * @param destFilePath The {@code destination path} for file to copy.
      * @param ignoreNonExistentSrcFile The {@code boolean} that decides if it should be considered an
      *                              error if source file to copied doesn't exist.
-     * @return Returns the {@code errmsg} if copy was not successful, otherwise {@code null}.
+     * @return Returns the {@code error} if copy was not successful, otherwise {@code null}.
      */
-    public static String copyDirectoryFile(@NonNull final Context context, final String label, final String srcFilePath, final String destFilePath, final boolean ignoreNonExistentSrcFile) {
-        return copyOrMoveFile(context, label, srcFilePath, destFilePath,
+    public static Error copyDirectoryFile(final String label, final String srcFilePath, final String destFilePath, final boolean ignoreNonExistentSrcFile) {
+        return copyOrMoveFile(label, srcFilePath, destFilePath,
             false, ignoreNonExistentSrcFile, FileType.DIRECTORY.getValue(),
             true, true);
     }
@@ -769,22 +721,21 @@ public static String copyDirectoryFile(@NonNull final Context context, final Str
      * Move a directory file from {@code sourceFilePath} to {@code destFilePath}.
      *
      * This function is a wrapper for
-     * {@link #copyOrMoveFile(Context, String, String, String, boolean, boolean, int, boolean, boolean)}.
+     * {@link #copyOrMoveFile(String, String, String, boolean, boolean, int, boolean, boolean)}.
      *
      * If destination file already exists, then it will be overwritten, but only if its a directory
      * file, otherwise an error will be returned.
      *
-     * @param context The {@link Context} to get error string.
      * @param label The optional label for file to move. This can optionally be {@code null}.
      * @param srcFilePath The {@code source path} for file to move.
      * @param destFilePath The {@code destination path} for file to move.
      * @param ignoreNonExistentSrcFile The {@code boolean} that decides if it should be considered an
      *                              error if source file to moved doesn't exist.
-     * @return Returns the {@code errmsg} if move was not successful, otherwise {@code null}.
+     * @return Returns the {@code error} if move was not successful, otherwise {@code null}.
      */
-    public static String moveDirectoryFile(@NonNull final Context context, final String label, final String srcFilePath, final String destFilePath, final boolean ignoreNonExistentSrcFile) {
-        return copyOrMoveFile(context, label, srcFilePath, destFilePath,
-        true, ignoreNonExistentSrcFile, FileType.DIRECTORY.getValue(),
+    public static Error moveDirectoryFile(final String label, final String srcFilePath, final String destFilePath, final boolean ignoreNonExistentSrcFile) {
+        return copyOrMoveFile(label, srcFilePath, destFilePath,
+            true, ignoreNonExistentSrcFile, FileType.DIRECTORY.getValue(),
             true, true);
     }
 
@@ -792,21 +743,20 @@ public static String moveDirectoryFile(@NonNull final Context context, final Str
      * Copy a symlink file from {@code sourceFilePath} to {@code destFilePath}.
      *
      * This function is a wrapper for
-     * {@link #copyOrMoveFile(Context, String, String, String, boolean, boolean, int, boolean, boolean)}.
+     * {@link #copyOrMoveFile(String, String, String, boolean, boolean, int, boolean, boolean)}.
      *
      * If destination file already exists, then it will be overwritten, but only if its a symlink
      * file, otherwise an error will be returned.
      *
-     * @param context The {@link Context} to get error string.
      * @param label The optional label for file to copy. This can optionally be {@code null}.
      * @param srcFilePath The {@code source path} for file to copy.
      * @param destFilePath The {@code destination path} for file to copy.
      * @param ignoreNonExistentSrcFile The {@code boolean} that decides if it should be considered an
      *                              error if source file to copied doesn't exist.
-     * @return Returns the {@code errmsg} if copy was not successful, otherwise {@code null}.
+     * @return Returns the {@code error} if copy was not successful, otherwise {@code null}.
      */
-    public static String copySymlinkFile(@NonNull final Context context, final String label, final String srcFilePath, final String destFilePath, final boolean ignoreNonExistentSrcFile) {
-        return copyOrMoveFile(context, label, srcFilePath, destFilePath,
+    public static Error copySymlinkFile(final String label, final String srcFilePath, final String destFilePath, final boolean ignoreNonExistentSrcFile) {
+        return copyOrMoveFile(label, srcFilePath, destFilePath,
             false, ignoreNonExistentSrcFile, FileType.SYMLINK.getValue(),
             true, true);
     }
@@ -815,21 +765,20 @@ public static String copySymlinkFile(@NonNull final Context context, final Strin
      * Move a symlink file from {@code sourceFilePath} to {@code destFilePath}.
      *
      * This function is a wrapper for
-     * {@link #copyOrMoveFile(Context, String, String, String, boolean, boolean, int, boolean, boolean)}.
+     * {@link #copyOrMoveFile(String, String, String, boolean, boolean, int, boolean, boolean)}.
      *
      * If destination file already exists, then it will be overwritten, but only if its a symlink
      * file, otherwise an error will be returned.
      *
-     * @param context The {@link Context} to get error string.
      * @param label The optional label for file to move. This can optionally be {@code null}.
      * @param srcFilePath The {@code source path} for file to move.
      * @param destFilePath The {@code destination path} for file to move.
      * @param ignoreNonExistentSrcFile The {@code boolean} that decides if it should be considered an
      *                              error if source file to moved doesn't exist.
-     * @return Returns the {@code errmsg} if move was not successful, otherwise {@code null}.
+     * @return Returns the {@code error} if move was not successful, otherwise {@code null}.
      */
-    public static String moveSymlinkFile(@NonNull final Context context, final String label, final String srcFilePath, final String destFilePath, final boolean ignoreNonExistentSrcFile) {
-        return copyOrMoveFile(context, label, srcFilePath, destFilePath,
+    public static Error moveSymlinkFile(final String label, final String srcFilePath, final String destFilePath, final boolean ignoreNonExistentSrcFile) {
+        return copyOrMoveFile(label, srcFilePath, destFilePath,
             true, ignoreNonExistentSrcFile, FileType.SYMLINK.getValue(),
             true, true);
     }
@@ -838,21 +787,20 @@ public static String moveSymlinkFile(@NonNull final Context context, final Strin
      * Copy a file from {@code sourceFilePath} to {@code destFilePath}.
      *
      * This function is a wrapper for
-     * {@link #copyOrMoveFile(Context, String, String, String, boolean, boolean, int, boolean, boolean)}.
+     * {@link #copyOrMoveFile(String, String, String, boolean, boolean, int, boolean, boolean)}.
      *
      * If destination file already exists, then it will be overwritten, but only if its the same file
      * type as the source, otherwise an error will be returned.
      *
-     * @param context The {@link Context} to get error string.
      * @param label The optional label for file to copy. This can optionally be {@code null}.
      * @param srcFilePath The {@code source path} for file to copy.
      * @param destFilePath The {@code destination path} for file to copy.
      * @param ignoreNonExistentSrcFile The {@code boolean} that decides if it should be considered an
      *                              error if source file to copied doesn't exist.
-     * @return Returns the {@code errmsg} if copy was not successful, otherwise {@code null}.
+     * @return Returns the {@code error} if copy was not successful, otherwise {@code null}.
      */
-    public static String copyFile(@NonNull final Context context, final String label, final String srcFilePath, final String destFilePath, final boolean ignoreNonExistentSrcFile) {
-        return copyOrMoveFile(context, label, srcFilePath, destFilePath,
+    public static Error copyFile(final String label, final String srcFilePath, final String destFilePath, final boolean ignoreNonExistentSrcFile) {
+        return copyOrMoveFile(label, srcFilePath, destFilePath,
             false, ignoreNonExistentSrcFile, FileTypes.FILE_TYPE_NORMAL_FLAGS,
             true, true);
     }
@@ -861,25 +809,24 @@ public static String copyFile(@NonNull final Context context, final String label
      * Move a file from {@code sourceFilePath} to {@code destFilePath}.
      *
      * This function is a wrapper for
-     * {@link #copyOrMoveFile(Context, String, String, String, boolean, boolean, int, boolean, boolean)}.
+     * {@link #copyOrMoveFile(String, String, String, boolean, boolean, int, boolean, boolean)}.
      *
      * If destination file already exists, then it will be overwritten, but only if its the same file
      * type as the source, otherwise an error will be returned.
      *
-     * @param context The {@link Context} to get error string.
      * @param label The optional label for file to move. This can optionally be {@code null}.
      * @param srcFilePath The {@code source path} for file to move.
      * @param destFilePath The {@code destination path} for file to move.
      * @param ignoreNonExistentSrcFile The {@code boolean} that decides if it should be considered an
      *                              error if source file to moved doesn't exist.
-     * @return Returns the {@code errmsg} if move was not successful, otherwise {@code null}.
+     * @return Returns the {@code error} if move was not successful, otherwise {@code null}.
      */
-    public static String moveFile(@NonNull final Context context, final String label, final String srcFilePath, final String destFilePath, final boolean ignoreNonExistentSrcFile) {
-        return copyOrMoveFile(context, label, srcFilePath, destFilePath,
+    public static Error moveFile(final String label, final String srcFilePath, final String destFilePath, final boolean ignoreNonExistentSrcFile) {
+        return copyOrMoveFile(label, srcFilePath, destFilePath,
             true, ignoreNonExistentSrcFile, FileTypes.FILE_TYPE_NORMAL_FLAGS,
             true, true);
     }
-    
+
     /**
      * Copy or move a file from {@code sourceFilePath} to {@code destFilePath}.
      *
@@ -890,7 +837,6 @@ public static String moveFile(@NonNull final Context context, final String label
      * then any symlink files found under the directory will be deleted, but not their targets when
      * deleting source after move and deleting destination before copy/move.
      *
-     * @param context The {@link Context} to get error string.
      * @param label The optional label for file to copy or move. This can optionally be {@code null}.
      * @param srcFilePath The {@code source path} for file to copy or move.
      * @param destFilePath The {@code destination path} for file to copy or move.
@@ -910,23 +856,20 @@ public static String moveFile(@NonNull final Context context, final String label
      * @param overwriteOnlyIfDestSameFileTypeAsSrc The {@code boolean} that decides if overwrite should
      *                                         only be done if destination file is also the same file
      *                                          type as the source file.
-     * @return Returns the {@code errmsg} if copy or move was not successful, otherwise {@code null}.
+     * @return Returns the {@code error} if copy or move was not successful, otherwise {@code null}.
      */
-    public static String copyOrMoveFile(@NonNull final Context context, String label, final String srcFilePath, final String destFilePath,
+    public static Error copyOrMoveFile(String label, final String srcFilePath, final String destFilePath,
                                         final boolean moveFile, final boolean ignoreNonExistentSrcFile, int allowedFileTypeFlags,
                                         final boolean overwrite, final boolean overwriteOnlyIfDestSameFileTypeAsSrc) {
         label = (label == null ? "" : label + " ");
-        if (srcFilePath == null || srcFilePath.isEmpty()) return context.getString(R.string.error_null_or_empty_parameter, label + "source file path", "copyOrMoveFile");
-        if (destFilePath == null || destFilePath.isEmpty()) return context.getString(R.string.error_null_or_empty_parameter, label + "destination file path", "copyOrMoveFile");
+        if (srcFilePath == null || srcFilePath.isEmpty()) return FunctionErrno.ERRNO_NULL_OR_EMPTY_PARAMETER.getError(label + "source file path", "copyOrMoveFile");
+        if (destFilePath == null || destFilePath.isEmpty()) return FunctionErrno.ERRNO_NULL_OR_EMPTY_PARAMETER.getError(label + "destination file path", "copyOrMoveFile");
 
         String mode = (moveFile ? "Moving" : "Copying");
         String modePast = (moveFile ? "moved" : "copied");
 
-        String errmsg;
+        Error error;
 
-        InputStream inputStream = null;
-        OutputStream outputStream = null;
-        
         try {
             Logger.logVerbose(LOG_TAG, mode + " " + label + "source file from \"" + srcFilePath + "\" to destination \"" + destFilePath + "\"");
 
@@ -944,18 +887,18 @@ public static String copyOrMoveFile(@NonNull final Context context, String label
                 // If copy or move is to be ignored if source file is not found
                 if (ignoreNonExistentSrcFile)
                     return null;
-                // Else return with error
+                    // Else return with error
                 else
-                    return context.getString(R.string.error_file_not_found_at_path, label + "source file", srcFilePath);
+                    return FileUtilsErrno.ERRNO_FILE_NOT_FOUND_AT_PATH.getError(label + "source file", srcFilePath);
             }
 
             // If the file type of the source file does not exist in the allowedFileTypeFlags, then return with error
             if ((allowedFileTypeFlags & srcFileType.getValue()) <= 0)
-                return context.getString(R.string.error_file_not_an_allowed_file_type, label + "source file meant to be " + modePast, srcFilePath, FileTypes.convertFileTypeFlagsToNamesString(allowedFileTypeFlags));
+                return FileUtilsErrno.ERRNO_FILE_NOT_AN_ALLOWED_FILE_TYPE.getError(label + "source file meant to be " + modePast, srcFilePath, FileTypes.convertFileTypeFlagsToNamesString(allowedFileTypeFlags));
 
             // If source and destination file path are the same
             if (srcFileCanonicalPath.equals(destFileCanonicalPath))
-                return context.getString(R.string.error_copying_or_moving_file_to_same_path, mode + " " + label + "source file", srcFilePath, destFilePath);
+                return FileUtilsErrno.ERRNO_COPYING_OR_MOVING_FILE_TO_SAME_PATH.getError(mode + " " + label + "source file", srcFilePath, destFilePath);
 
             // If destination exists
             if (destFileType != FileType.NO_EXIST) {
@@ -966,12 +909,12 @@ public static String copyOrMoveFile(@NonNull final Context context, String label
 
                 // If overwriteOnlyIfDestSameFileTypeAsSrc is enabled but destination file does not match source file type
                 if (overwriteOnlyIfDestSameFileTypeAsSrc && destFileType != srcFileType)
-                    return context.getString(R.string.error_cannot_overwrite_a_different_file_type, label + "source file", mode.toLowerCase(), srcFilePath, destFilePath, destFileType.getName(), srcFileType.getName());
+                    return FileUtilsErrno.ERRNO_CANNOT_OVERWRITE_A_DIFFERENT_FILE_TYPE.getError(label + "source file", mode.toLowerCase(), srcFilePath, destFilePath, destFileType.getName(), srcFileType.getName());
 
                 // Delete the destination file
-                errmsg = deleteFile(context, label + "destination file", destFilePath, true);
-                if (errmsg != null)
-                    return errmsg;
+                error = deleteFile(label + "destination file", destFilePath, true);
+                if (error != null)
+                    return error;
             }
 
 
@@ -990,7 +933,7 @@ public static String copyOrMoveFile(@NonNull final Context context, String label
                     // If destination directory is a subdirectory of the source directory
                     // Copying is still allowed by copyDirectory() by excluding destination directory files
                     if (srcFileType == FileType.DIRECTORY && destFileCanonicalPath.startsWith(srcFileCanonicalPath + File.separator))
-                        return context.getString(R.string.error_cannot_move_directory_to_sub_directory_of_itself, label + "source directory", srcFilePath, destFilePath);
+                        return FileUtilsErrno.ERRNO_CANNOT_MOVE_DIRECTORY_TO_SUB_DIRECTORY_OF_ITSELF.getError(label + "source directory", srcFilePath, destFilePath);
 
                     // If rename failed, then we copy
                     Logger.logVerbose(LOG_TAG, "Renaming " + label + "source file to destination failed, attempting to copy.");
@@ -1003,9 +946,9 @@ public static String copyOrMoveFile(@NonNull final Context context, String label
                 Logger.logVerbose(LOG_TAG, "Attempting to copy source to destination.");
 
                 // Create the dest file parent directory
-                errmsg = createParentDirectoryFile(context, label + "dest file parent", destFilePath);
-                if (errmsg != null)
-                    return errmsg;
+                error = createParentDirectoryFile(label + "dest file parent", destFilePath);
+                if (error != null)
+                    return error;
 
                 if (srcFileType == FileType.DIRECTORY) {
                     // Will give runtime exceptions on android < 8 due to missing classes like java.nio.file.Path if org.apache.commons.io version > 2.5
@@ -1016,9 +959,9 @@ public static String copyOrMoveFile(@NonNull final Context context, String label
                     } else {
                         // read the target for the source file and create a symlink at dest
                         // source file metadata will be lost
-                        errmsg = createSymlinkFile(context, label + "dest file", Os.readlink(srcFilePath), destFilePath);
-                        if (errmsg != null)
-                            return errmsg;
+                        error = createSymlinkFile(label + "dest file", Os.readlink(srcFilePath), destFilePath);
+                        if (error != null)
+                            return error;
                     }
                 } else {
                     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
@@ -1033,18 +976,15 @@ public static String copyOrMoveFile(@NonNull final Context context, String label
             // If source file had to be moved
             if (moveFile) {
                 // Delete the source file since copying would have succeeded
-                errmsg = deleteFile(context, label + "source file", srcFilePath, true);
-                if (errmsg != null)
-                    return errmsg;
+                error = deleteFile(label + "source file", srcFilePath, true);
+                if (error != null)
+                    return error;
             }
 
             Logger.logVerbose(LOG_TAG, mode + " successful.");
         }
         catch (Exception e) {
-            return context.getString(R.string.error_copying_or_moving_file_failed_with_exception, mode + " " + label + "file", srcFilePath, destFilePath, e.getMessage());
-        } finally {
-            closeCloseable(inputStream);
-            closeCloseable(outputStream);
+            return FileUtilsErrno.ERRNO_COPYING_OR_MOVING_FILE_FAILED_WITH_EXCEPTION.getError(e, mode + " " + label + "file", srcFilePath, destFilePath, e.getMessage());
         }
 
         return null;
@@ -1055,65 +995,61 @@ public static String copyOrMoveFile(@NonNull final Context context, String label
     /**
      * Delete regular file at path.
      *
-     * This function is a wrapper for {@link #deleteFile(Context, String, String, boolean, int)}.
+     * This function is a wrapper for {@link #deleteFile(String, String, boolean, int)}.
      *
-     * @param context The {@link Context} to get error string.
      * @param label The optional label for file to delete. This can optionally be {@code null}.
      * @param filePath The {@code path} for file to delete.
      * @param ignoreNonExistentFile The {@code boolean} that decides if it should be considered an
      *                              error if file to deleted doesn't exist.
-     * @return Returns the {@code errmsg} if deletion was not successful, otherwise {@code null}.
+     * @return Returns the {@code error} if deletion was not successful, otherwise {@code null}.
      */
-    public static String deleteRegularFile(@NonNull final Context context, String label, final String filePath, final boolean ignoreNonExistentFile) {
-        return deleteFile(context, label, filePath, ignoreNonExistentFile, FileType.REGULAR.getValue());
+    public static Error deleteRegularFile(String label, final String filePath, final boolean ignoreNonExistentFile) {
+        return deleteFile(label, filePath, ignoreNonExistentFile, FileType.REGULAR.getValue());
     }
 
     /**
      * Delete directory file at path.
      *
-     * This function is a wrapper for {@link #deleteFile(Context, String, String, boolean, int)}.
+     * This function is a wrapper for {@link #deleteFile(String, String, boolean, int)}.
      *
-     * @param context The {@link Context} to get error string.
      * @param label The optional label for file to delete. This can optionally be {@code null}.
      * @param filePath The {@code path} for file to delete.
      * @param ignoreNonExistentFile The {@code boolean} that decides if it should be considered an
      *                              error if file to deleted doesn't exist.
-     * @return Returns the {@code errmsg} if deletion was not successful, otherwise {@code null}.
+     * @return Returns the {@code error} if deletion was not successful, otherwise {@code null}.
      */
-    public static String deleteDirectoryFile(@NonNull final Context context, String label, final String filePath, final boolean ignoreNonExistentFile) {
-        return deleteFile(context, label, filePath, ignoreNonExistentFile, FileType.DIRECTORY.getValue());
+    public static Error deleteDirectoryFile(String label, final String filePath, final boolean ignoreNonExistentFile) {
+        return deleteFile(label, filePath, ignoreNonExistentFile, FileType.DIRECTORY.getValue());
     }
 
     /**
      * Delete symlink file at path.
      *
-     * This function is a wrapper for {@link #deleteFile(Context, String, String, boolean, int)}.
+     * This function is a wrapper for {@link #deleteFile(String, String, boolean, int)}.
      *
-     * @param context The {@link Context} to get error string.
      * @param label The optional label for file to delete. This can optionally be {@code null}.
      * @param filePath The {@code path} for file to delete.
      * @param ignoreNonExistentFile The {@code boolean} that decides if it should be considered an
      *                              error if file to deleted doesn't exist.
-     * @return Returns the {@code errmsg} if deletion was not successful, otherwise {@code null}.
+     * @return Returns the {@code error} if deletion was not successful, otherwise {@code null}.
      */
-    public static String deleteSymlinkFile(@NonNull final Context context, String label, final String filePath, final boolean ignoreNonExistentFile) {
-        return deleteFile(context, label, filePath, ignoreNonExistentFile, FileType.SYMLINK.getValue());
+    public static Error deleteSymlinkFile(String label, final String filePath, final boolean ignoreNonExistentFile) {
+        return deleteFile(label, filePath, ignoreNonExistentFile, FileType.SYMLINK.getValue());
     }
 
     /**
      * Delete regular, directory or symlink file at path.
      *
-     * This function is a wrapper for {@link #deleteFile(Context, String, String, boolean, int)}.
+     * This function is a wrapper for {@link #deleteFile(String, String, boolean, int)}.
      *
-     * @param context The {@link Context} to get error string.
      * @param label The optional label for file to delete. This can optionally be {@code null}.
      * @param filePath The {@code path} for file to delete.
      * @param ignoreNonExistentFile The {@code boolean} that decides if it should be considered an
      *                              error if file to deleted doesn't exist.
-     * @return Returns the {@code errmsg} if deletion was not successful, otherwise {@code null}.
+     * @return Returns the {@code error} if deletion was not successful, otherwise {@code null}.
      */
-    public static String deleteFile(@NonNull final Context context, String label, final String filePath, final boolean ignoreNonExistentFile) {
-        return deleteFile(context, label, filePath, ignoreNonExistentFile, FileTypes.FILE_TYPE_NORMAL_FLAGS);
+    public static Error deleteFile(String label, final String filePath, final boolean ignoreNonExistentFile) {
+        return deleteFile(label, filePath, ignoreNonExistentFile, FileTypes.FILE_TYPE_NORMAL_FLAGS);
     }
 
     /**
@@ -1124,7 +1060,6 @@ public static String deleteFile(@NonNull final Context context, String label, fi
      * If the {@code filePath} is a canonical path to a directory, then any symlink files found under
      * the directory will be deleted, but not their targets.
      *
-     * @param context The {@link Context} to get error string.
      * @param label The optional label for file to delete. This can optionally be {@code null}.
      * @param filePath The {@code path} for file to delete.
      * @param ignoreNonExistentFile The {@code boolean} that decides if it should be considered an
@@ -1134,12 +1069,12 @@ public static String deleteFile(@NonNull final Context context, String label, fi
      *                             prevent accidental deletion of the wrong type of file, like a
      *                             directory instead of a regular file. You can pass
      *                             {@link FileTypes#FILE_TYPE_ANY_FLAGS} to allow deletion of any file type.
-     * @return Returns the {@code errmsg} if deletion was not successful, otherwise {@code null}.
+     * @return Returns the {@code error} if deletion was not successful, otherwise {@code null}.
      */
-    public static String deleteFile(@NonNull final Context context, String label, final String filePath, final boolean ignoreNonExistentFile, int allowedFileTypeFlags) {
+    public static Error deleteFile(String label, final String filePath, final boolean ignoreNonExistentFile, int allowedFileTypeFlags) {
         label = (label == null ? "" : label + " ");
-        if (filePath == null || filePath.isEmpty()) return context.getString(R.string.error_null_or_empty_parameter, label + "file path", "deleteFile");
-        
+        if (filePath == null || filePath.isEmpty()) return FunctionErrno.ERRNO_NULL_OR_EMPTY_PARAMETER.getError(label + "file path", "deleteFile");
+
         try {
             Logger.logVerbose(LOG_TAG, "Deleting " + label + "file at path \"" + filePath + "\"");
 
@@ -1151,25 +1086,34 @@ public static String deleteFile(@NonNull final Context context, String label, fi
                 // If delete is to be ignored if file does not exist
                 if (ignoreNonExistentFile)
                     return null;
-                // Else return with error
+                    // Else return with error
                 else
-                    return context.getString(R.string.error_file_not_found_at_path, label + "file meant to be deleted", filePath);
+                    return FileUtilsErrno.ERRNO_FILE_NOT_FOUND_AT_PATH.getError(label + "file meant to be deleted", filePath);
             }
 
             // If the file type of the file does not exist in the allowedFileTypeFlags, then return with error
             if ((allowedFileTypeFlags & fileType.getValue()) <= 0)
-                return context.getString(R.string.error_file_not_an_allowed_file_type, label + "file meant to be deleted", filePath, FileTypes.convertFileTypeFlagsToNamesString(allowedFileTypeFlags));
+                return FileUtilsErrno.ERRNO_FILE_NOT_AN_ALLOWED_FILE_TYPE.getError(label + "file meant to be deleted", filePath, FileTypes.convertFileTypeFlagsToNamesString(allowedFileTypeFlags));
 
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                    /* Try to use {@link SecureDirectoryStream} if available for safer directory
-                    deletion, it should be available for android >= 8.0
-                    * https://guava.dev/releases/24.1-jre/api/docs/com/google/common/io/MoreFiles.html#deleteRecursively-java.nio.file.Path-com.google.common.io.RecursiveDeleteOption...-
-                    * https://github.com/google/guava/issues/365
-                    * https://cs.android.com/android/platform/superproject/+/android-11.0.0_r3:libcore/ojluni/src/main/java/sun/nio/fs/UnixSecureDirectoryStream.java
-                    *
-                    * MoreUtils is marked with the @Beta annotation so the API may be removed in
-                    * future but has been there for a few years now
-                    */
+                /*
+                 * Try to use {@link SecureDirectoryStream} if available for safer directory
+                 * deletion, it should be available for android >= 8.0
+                 * https://guava.dev/releases/24.1-jre/api/docs/com/google/common/io/MoreFiles.html#deleteRecursively-java.nio.file.Path-com.google.common.io.RecursiveDeleteOption...-
+                 * https://github.com/google/guava/issues/365
+                 * https://cs.android.com/android/platform/superproject/+/android-11.0.0_r3:libcore/ojluni/src/main/java/sun/nio/fs/UnixSecureDirectoryStream.java
+                 *
+                 * MoreUtils is marked with the @Beta annotation so the API may be removed in
+                 * future but has been there for a few years now.
+                 *
+                 * If an exception is thrown, the exception message might not contain the full errors.
+                 * Individual failures get added to suppressed throwables which can be extracted
+                 * from the exception object by calling `Throwable[] getSuppressed()`. So just logging
+                 * the exception message and stacktrace may not be enough, the suppressed throwables
+                 * need to be logged as well, which the Logger class does if they are found in the
+                 * exception added to the Error that's returned by this function.
+                 * https://github.com/google/guava/blob/v30.1.1/guava/src/com/google/common/io/MoreFiles.java#L775
+                 */
                 //noinspection UnstableApiUsage
                 com.google.common.io.MoreFiles.deleteRecursively(file.toPath(), RecursiveDeleteOption.ALLOW_INSECURE);
             } else {
@@ -1186,10 +1130,10 @@ public static String deleteFile(@NonNull final Context context, String label, fi
             // If file still exists after deleting it
             fileType = getFileType(filePath, false);
             if (fileType != FileType.NO_EXIST)
-                return context.getString(R.string.error_file_still_exists_after_deleting, label + "file meant to be deleted", filePath);
+                return FileUtilsErrno.ERRNO_FILE_STILL_EXISTS_AFTER_DELETING.getError(label + "file meant to be deleted", filePath);
         }
         catch (Exception e) {
-            return context.getString(R.string.error_deleting_file_failed_with_exception, label + "file", filePath, e.getMessage());
+            return FileUtilsErrno.ERRNO_DELETING_FILE_FAILED_WITH_EXCEPTION.getError(e, label + "file", filePath, e.getMessage());
         }
 
         return null;
@@ -1202,14 +1146,13 @@ public static String deleteFile(@NonNull final Context context, String label, fi
      * it will be created automatically.
      *
      * This function is a wrapper for
-     * {@link #clearDirectory(Context, String, String)}.
+     * {@link #clearDirectory(String, String)}.
      *
-     * @param context The {@link Context} to get error string.
      * @param filePath The {@code path} for directory to clear.
-     * @return Returns the {@code errmsg} if clearing was not successful, otherwise {@code null}.
+     * @return Returns the {@code error} if clearing was not successful, otherwise {@code null}.
      */
-    public static String clearDirectory(Context context, String filePath) {
-        return clearDirectory(context, null, filePath);
+    public static Error clearDirectory(String filePath) {
+        return clearDirectory(null, filePath);
     }
 
     /**
@@ -1219,16 +1162,15 @@ public static String clearDirectory(Context context, String filePath) {
      * The {@code filePath} must be the canonical path to a directory since symlinks will not be followed.
      * Any symlink files found under the directory will be deleted, but not their targets.
      *
-     * @param context The {@link Context} to get error string.
      * @param label The optional label for directory to clear. This can optionally be {@code null}.
      * @param filePath The {@code path} for directory to clear.
-     * @return Returns the {@code errmsg} if clearing was not successful, otherwise {@code null}.
+     * @return Returns the {@code error} if clearing was not successful, otherwise {@code null}.
      */
-    public static String clearDirectory(@NonNull final Context context, String label, final String filePath) {
+    public static Error clearDirectory(String label, final String filePath) {
         label = (label == null ? "" : label + " ");
-        if (filePath == null || filePath.isEmpty()) return context.getString(R.string.error_null_or_empty_parameter, label + "file path", "clearDirectory");
+        if (filePath == null || filePath.isEmpty()) return FunctionErrno.ERRNO_NULL_OR_EMPTY_PARAMETER.getError(label + "file path", "clearDirectory");
 
-        String errmsg;
+        Error error;
 
         try {
             Logger.logVerbose(LOG_TAG, "Clearing " + label + "directory at path \"" + filePath + "\"");
@@ -1238,12 +1180,14 @@ public static String clearDirectory(@NonNull final Context context, String label
 
             // If file exists but not a directory file
             if (fileType != FileType.NO_EXIST && fileType != FileType.DIRECTORY) {
-                return context.getString(R.string.error_non_directory_file_found, label + "directory");
+                return FileUtilsErrno.ERRNO_NON_DIRECTORY_FILE_FOUND.getError(label + "directory");
             }
 
             // If directory exists, clear its contents
             if (fileType == FileType.DIRECTORY) {
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                    /* If an exception is thrown, the exception message might not contain the full errors.
+                     * Individual failures get added to suppressed throwables. */
                     //noinspection UnstableApiUsage
                     com.google.common.io.MoreFiles.deleteDirectoryContents(file.toPath(), RecursiveDeleteOption.ALLOW_INSECURE);
                 } else {
@@ -1253,12 +1197,12 @@ public static String clearDirectory(@NonNull final Context context, String label
             }
             // Else create it
             else {
-                errmsg = createDirectoryFile(context, label, filePath);
-                if (errmsg != null)
-                    return errmsg;
+                error = createDirectoryFile(label, filePath);
+                if (error != null)
+                    return error;
             }
         } catch (Exception e) {
-            return context.getString(R.string.error_clearing_directory_failed_with_exception, label + "directory", filePath, e.getMessage());
+            return FileUtilsErrno.ERRNO_CLEARING_DIRECTORY_FAILED_WITH_EXCEPTION.getError(e, label + "directory", filePath, e.getMessage());
         }
 
         return null;
@@ -1269,7 +1213,6 @@ public static String clearDirectory(@NonNull final Context context, String label
     /**
      * Read a {@link String} from file at path with a specific {@link Charset} into {@code dataString}.
      *
-     * @param context The {@link Context} to get error string.
      * @param label The optional label for file to read. This can optionally be {@code null}.
      * @param filePath The {@code path} for file to read.
      * @param charset The {@link Charset} of the file. If this is {@code null},
@@ -1277,21 +1220,21 @@ public static String clearDirectory(@NonNull final Context context, String label
      * @param dataStringBuilder The {@code StringBuilder} to read data into.
      * @param ignoreNonExistentFile The {@code boolean} that decides if it should be considered an
      *                              error if file to read doesn't exist.
-     * @return Returns the {@code errmsg} if reading was not successful, otherwise {@code null}.
+     * @return Returns the {@code error} if reading was not successful, otherwise {@code null}.
      */
-    public static String readStringFromFile(@NonNull final Context context, String label, final String filePath, Charset charset, @NonNull final StringBuilder dataStringBuilder, final boolean ignoreNonExistentFile) {
+    public static Error readStringFromFile(String label, final String filePath, Charset charset, @NonNull final StringBuilder dataStringBuilder, final boolean ignoreNonExistentFile) {
         label = (label == null ? "" : label + " ");
-        if (filePath == null || filePath.isEmpty()) return context.getString(R.string.error_null_or_empty_parameter, label + "file path", "readStringFromFile");
+        if (filePath == null || filePath.isEmpty()) return FunctionErrno.ERRNO_NULL_OR_EMPTY_PARAMETER.getError(label + "file path", "readStringFromFile");
 
         Logger.logVerbose(LOG_TAG, "Reading string from " + label + "file at path \"" + filePath + "\"");
 
-        String errmsg;
+        Error error;
 
         FileType fileType = getFileType(filePath, false);
 
         // If file exists but not a regular file
         if (fileType != FileType.NO_EXIST && fileType != FileType.REGULAR) {
-            return context.getString(R.string.error_non_regular_file_found, label + "file");
+            return FileUtilsErrno.ERRNO_NON_REGULAR_FILE_FOUND.getError(label + "file");
         }
 
         // If file does not exist
@@ -1299,17 +1242,17 @@ public static String readStringFromFile(@NonNull final Context context, String l
             // If reading is to be ignored if file does not exist
             if (ignoreNonExistentFile)
                 return null;
-            // Else return with error
+                // Else return with error
             else
-                return context.getString(R.string.error_file_not_found_at_path, label + "file meant to be read", filePath);
+                return FileUtilsErrno.ERRNO_FILE_NOT_FOUND_AT_PATH.getError(label + "file meant to be read", filePath);
         }
 
         if (charset == null) charset = Charset.defaultCharset();
 
         // Check if charset is supported
-        errmsg = isCharsetSupported(context, charset);
-        if (errmsg != null)
-            return errmsg;
+        error = isCharsetSupported(charset);
+        if (error != null)
+            return error;
 
         FileInputStream fileInputStream = null;
         BufferedReader bufferedReader = null;
@@ -1326,9 +1269,9 @@ public static String readStringFromFile(@NonNull final Context context, String l
                 dataStringBuilder.append(receiveString);
             }
 
-            Logger.logVerbose(LOG_TAG, Logger.getMultiLineLogStringEntry("String", DataUtils.getTruncatedCommandOutput(dataStringBuilder.toString(), Logger.LOGGER_ENTRY_SIZE_LIMIT_IN_BYTES, true, false, true), "-"));
+            Logger.logVerbose(LOG_TAG, Logger.getMultiLineLogStringEntry("String", DataUtils.getTruncatedCommandOutput(dataStringBuilder.toString(), Logger.LOGGER_ENTRY_MAX_SAFE_PAYLOAD, true, false, true), "-"));
         } catch (Exception e) {
-            return context.getString(R.string.error_reading_string_to_file_failed_with_exception, label + "file", filePath, e.getMessage());
+            return FileUtilsErrno.ERRNO_READING_STRING_TO_FILE_FAILED_WITH_EXCEPTION.getError(e, label + "file", filePath, e.getMessage());
         } finally {
             closeCloseable(fileInputStream);
             closeCloseable(bufferedReader);
@@ -1340,40 +1283,39 @@ public static String readStringFromFile(@NonNull final Context context, String l
     /**
      * Write the {@link String} {@code dataString} with a specific {@link Charset} to file at path.
      *
-     * @param context The {@link Context} to get error string.
      * @param label The optional label for file to write. This can optionally be {@code null}.
      * @param filePath The {@code path} for file to write.
      * @param charset The {@link Charset} of the {@code dataString}. If this is {@code null},
      *                then default {@link Charset} will be used.
      * @param append The {@code boolean} that decides if file should be appended to or not.
-     * @return Returns the {@code errmsg} if writing was not successful, otherwise {@code null}.
+     * @return Returns the {@code error} if writing was not successful, otherwise {@code null}.
      */
-    public static String writeStringToFile(@NonNull final Context context, String label, final String filePath, Charset charset, final String dataString, final boolean append) {
+    public static Error writeStringToFile(String label, final String filePath, Charset charset, final String dataString, final boolean append) {
         label = (label == null ? "" : label + " ");
-        if (filePath == null || filePath.isEmpty()) return context.getString(R.string.error_null_or_empty_parameter, label + "file path", "writeStringToFile");
+        if (filePath == null || filePath.isEmpty()) return FunctionErrno.ERRNO_NULL_OR_EMPTY_PARAMETER.getError(label + "file path", "writeStringToFile");
 
-        Logger.logVerbose(LOG_TAG, Logger.getMultiLineLogStringEntry("Writing string to " + label + "file at path \"" + filePath + "\"", DataUtils.getTruncatedCommandOutput(dataString, Logger.LOGGER_ENTRY_SIZE_LIMIT_IN_BYTES, true, false, true), "-"));
+        Logger.logVerbose(LOG_TAG, Logger.getMultiLineLogStringEntry("Writing string to " + label + "file at path \"" + filePath + "\"", DataUtils.getTruncatedCommandOutput(dataString, Logger.LOGGER_ENTRY_MAX_SAFE_PAYLOAD, true, false, true), "-"));
 
-        String errmsg;
+        Error error;
 
         FileType fileType = getFileType(filePath, false);
 
         // If file exists but not a regular file
         if (fileType != FileType.NO_EXIST && fileType != FileType.REGULAR) {
-            return context.getString(R.string.error_non_regular_file_found, label + "file");
+            return FileUtilsErrno.ERRNO_NON_REGULAR_FILE_FOUND.getError(label + "file");
         }
 
         // Create the file parent directory
-        errmsg = createParentDirectoryFile(context, label + "file parent", filePath);
-        if (errmsg != null)
-            return errmsg;
+        error = createParentDirectoryFile(label + "file parent", filePath);
+        if (error != null)
+            return error;
 
         if (charset == null) charset = Charset.defaultCharset();
 
         // Check if charset is supported
-        errmsg = isCharsetSupported(context, charset);
-        if (errmsg != null)
-            return errmsg;
+        error = isCharsetSupported(charset);
+        if (error != null)
+            return error;
 
         FileOutputStream fileOutputStream = null;
         BufferedWriter bufferedWriter = null;
@@ -1385,7 +1327,7 @@ public static String writeStringToFile(@NonNull final Context context, String la
             bufferedWriter.write(dataString);
             bufferedWriter.flush();
         } catch (Exception e) {
-            return context.getString(R.string.error_writing_string_to_file_failed_with_exception, label + "file", filePath, e.getMessage());
+            return FileUtilsErrno.ERRNO_WRITING_STRING_TO_FILE_FAILED_WITH_EXCEPTION.getError(e, label + "file", filePath, e.getMessage());
         } finally {
             closeCloseable(fileOutputStream);
             closeCloseable(bufferedWriter);
@@ -1399,19 +1341,18 @@ public static String writeStringToFile(@NonNull final Context context, String la
     /**
      * Check if a specific {@link Charset} is supported.
      *
-     * @param context The {@link Context} to get error string.
      * @param charset The {@link Charset} to check.
-     * @return Returns the {@code errmsg} if charset is not supported or failed to check it, otherwise {@code null}.
+     * @return Returns the {@code error} if charset is not supported or failed to check it, otherwise {@code null}.
      */
-    public static String isCharsetSupported(@NonNull final Context context, final Charset charset) {
-        if (charset == null) return context.getString(R.string.error_null_or_empty_parameter, "charset", "isCharsetSupported");
+    public static Error isCharsetSupported(final Charset charset) {
+        if (charset == null) return FunctionErrno.ERRNO_NULL_OR_EMPTY_PARAMETER.getError("charset", "isCharsetSupported");
 
         try {
             if (!Charset.isSupported(charset.name())) {
-                return context.getString(R.string.error_unsupported_charset, charset.name());
+                return FileUtilsErrno.ERRNO_UNSUPPORTED_CHARSET.getError(charset.name());
             }
         } catch (Exception e) {
-            return context.getString(R.string.error_checking_if_charset_supported_failed, charset.name(), e.getMessage());
+            return FileUtilsErrno.ERRNO_CHECKING_IF_CHARSET_SUPPORTED_FAILED.getError(e, charset.name(), e.getMessage());
         }
 
         return null;
@@ -1559,52 +1500,50 @@ public static void setMissingFilePermissions(String label, final String filePath
     /**
      * Checking missing permissions for file at path.
      *
-     * @param context The {@link Context} to get error string.
      * @param filePath The {@code path} for file to check permissions for.
      * @param permissionsToCheck The 3 character string that contains the "r", "w", "x" or "-" in-order.
      * @param ignoreIfNotExecutable The {@code boolean} that decides if missing executable permission
      *                              error is to be ignored.
-     * @return Returns the {@code errmsg} if validating permissions failed, otherwise {@code null}.
+     * @return Returns the {@code error} if validating permissions failed, otherwise {@code null}.
      */
-    public static String checkMissingFilePermissions(@NonNull final Context context, final String filePath, final String permissionsToCheck, final boolean ignoreIfNotExecutable) {
-        return checkMissingFilePermissions(context, null, filePath, permissionsToCheck, ignoreIfNotExecutable);
+    public static Error checkMissingFilePermissions(final String filePath, final String permissionsToCheck, final boolean ignoreIfNotExecutable) {
+        return checkMissingFilePermissions(null, filePath, permissionsToCheck, ignoreIfNotExecutable);
     }
 
     /**
      * Checking missing permissions for file at path.
      *
-     * @param context The {@link Context} to get error string.
      * @param label The optional label for the file. This can optionally be {@code null}.
      * @param filePath The {@code path} for file to check permissions for.
      * @param permissionsToCheck The 3 character string that contains the "r", "w", "x" or "-" in-order.
      * @param ignoreIfNotExecutable The {@code boolean} that decides if missing executable permission
      *                              error is to be ignored.
-     * @return Returns the {@code errmsg} if validating permissions failed, otherwise {@code null}.
+     * @return Returns the {@code error} if validating permissions failed, otherwise {@code null}.
      */
-    public static String checkMissingFilePermissions(@NonNull final Context context, String label, final String filePath, final String permissionsToCheck, final boolean ignoreIfNotExecutable) {
+    public static Error checkMissingFilePermissions(String label, final String filePath, final String permissionsToCheck, final boolean ignoreIfNotExecutable) {
         label = (label == null ? "" : label + " ");
-        if (filePath == null || filePath.isEmpty()) return context.getString(R.string.error_null_or_empty_parameter, label + "file path", "checkMissingFilePermissions");
+        if (filePath == null || filePath.isEmpty()) return FunctionErrno.ERRNO_NULL_OR_EMPTY_PARAMETER.getError(label + "file path", "checkMissingFilePermissions");
 
         if (!isValidPermissionString(permissionsToCheck)) {
             Logger.logError(LOG_TAG, "Invalid permissionsToCheck passed to checkMissingFilePermissions: \"" + permissionsToCheck + "\"");
-            return context.getString(R.string.error_invalid_file_permissions_string_to_check);
+            return FileUtilsErrno.ERRNO_INVALID_FILE_PERMISSIONS_STRING_TO_CHECK.getError();
         }
 
         File file = new File(filePath);
 
         // If file is not readable
         if (permissionsToCheck.contains("r") && !file.canRead()) {
-            return context.getString(R.string.error_file_not_readable, label + "file");
+            return FileUtilsErrno.ERRNO_FILE_NOT_READABLE.getError(label + "file");
         }
 
         // If file is not writable
         if (permissionsToCheck.contains("w") && !file.canWrite()) {
-            return context.getString(R.string.error_file_not_writable, label + "file");
+            return FileUtilsErrno.ERRNO_FILE_NOT_WRITABLE.getError(label + "file");
         }
         // If file is not executable
         // This canExecute() will give "avc: granted { execute }" warnings for target sdk 29
         else if (permissionsToCheck.contains("x") && !file.canExecute() && !ignoreIfNotExecutable) {
-            return context.getString(R.string.error_file_not_executable, label + "file");
+            return FileUtilsErrno.ERRNO_FILE_NOT_EXECUTABLE.getError(label + "file");
         }
 
         return null;
@@ -1623,5 +1562,5 @@ public static boolean isValidPermissionString(final String string) {
         if (string == null || string.isEmpty()) return false;
         return Pattern.compile("^([r-])[w-][x-]$", 0).matcher(string).matches();
     }
-    
+
 }
diff --git a/termux-shared/src/main/java/com/termux/shared/file/TermuxFileUtils.java b/termux-shared/src/main/java/com/termux/shared/file/TermuxFileUtils.java
new file mode 100644
index 0000000000..7748a6bc86
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/file/TermuxFileUtils.java
@@ -0,0 +1,123 @@
+package com.termux.shared.file;
+
+import android.os.Environment;
+
+import com.termux.shared.models.errors.Error;
+import com.termux.shared.termux.TermuxConstants;
+
+import java.io.File;
+import java.util.regex.Pattern;
+
+public class TermuxFileUtils {
+    /**
+     * Replace "$PREFIX/" or "~/" prefix with termux absolute paths.
+     *
+     * @param path The {@code path} to expand.
+     * @return Returns the {@code expand path}.
+     */
+    public static String getExpandedTermuxPath(String path) {
+        if (path != null && !path.isEmpty()) {
+            path = path.replaceAll("^\\$PREFIX$", TermuxConstants.TERMUX_PREFIX_DIR_PATH);
+            path = path.replaceAll("^\\$PREFIX/", TermuxConstants.TERMUX_PREFIX_DIR_PATH + "/");
+            path = path.replaceAll("^~/$", TermuxConstants.TERMUX_HOME_DIR_PATH);
+            path = path.replaceAll("^~/", TermuxConstants.TERMUX_HOME_DIR_PATH + "/");
+        }
+
+        return path;
+    }
+
+    /**
+     * Replace termux absolute paths with "$PREFIX/" or "~/" prefix.
+     *
+     * @param path The {@code path} to unexpand.
+     * @return Returns the {@code unexpand path}.
+     */
+    public static String getUnExpandedTermuxPath(String path) {
+        if (path != null && !path.isEmpty()) {
+            path = path.replaceAll("^" + Pattern.quote(TermuxConstants.TERMUX_PREFIX_DIR_PATH) + "/", "\\$PREFIX/");
+            path = path.replaceAll("^" + Pattern.quote(TermuxConstants.TERMUX_HOME_DIR_PATH) + "/", "~/");
+        }
+
+        return path;
+    }
+
+    /**
+     * Get canonical path.
+     *
+     * @param path The {@code path} to convert.
+     * @param prefixForNonAbsolutePath Optional prefix path to prefix before non-absolute paths. This
+     *                                 can be set to {@code null} if non-absolute paths should
+     *                                 be prefixed with "/". The call to {@link File#getCanonicalPath()}
+     *                                 will automatically do this anyways.
+     * @param expandPath The {@code boolean} that decides if input path is first attempted to be expanded by calling
+     *                   {@link TermuxFileUtils#getExpandedTermuxPath(String)} before its passed to
+     *                   {@link FileUtils#getCanonicalPath(String, String)}.
+
+     * @return Returns the {@code canonical path}.
+     */
+    public static String getCanonicalPath(String path, final String prefixForNonAbsolutePath, final boolean expandPath) {
+        if (path == null) path = "";
+
+        if (expandPath)
+            path = getExpandedTermuxPath(path);
+
+        return FileUtils.getCanonicalPath(path, prefixForNonAbsolutePath);
+    }
+
+    /**
+     * Check if {@code path} is under the allowed termux working directory paths. If it is, then
+     * allowed parent path is returned.
+     *
+     * @param path The {@code path} to check.
+     * @return Returns the allowed path if it {@code path} is under it, otherwise {@link TermuxConstants#TERMUX_FILES_DIR_PATH}.
+     */
+    public static String getMatchedAllowedTermuxWorkingDirectoryParentPathForPath(String path) {
+        if (path == null || path.isEmpty()) return TermuxConstants.TERMUX_FILES_DIR_PATH;
+
+        if (path.startsWith(TermuxConstants.TERMUX_STORAGE_HOME_DIR_PATH + "/")) {
+            return TermuxConstants.TERMUX_STORAGE_HOME_DIR_PATH;
+        } if (path.startsWith(Environment.getExternalStorageDirectory().getAbsolutePath() + "/")) {
+            return Environment.getExternalStorageDirectory().getAbsolutePath();
+        } else if (path.startsWith("/sdcard/")) {
+            return "/sdcard";
+        } else {
+            return TermuxConstants.TERMUX_FILES_DIR_PATH;
+        }
+    }
+
+    /**
+     * Validate the existence and permissions of directory file at path as a working directory for
+     * termux app.
+     *
+     * The creation of missing directory and setting of missing permissions will only be done if
+     * {@code path} is under paths returned by {@link #getMatchedAllowedTermuxWorkingDirectoryParentPathForPath(String)}.
+     *
+     * The permissions set to directory will be {@link FileUtils#APP_WORKING_DIRECTORY_PERMISSIONS}.
+     *
+     * @param label The optional label for the directory file. This can optionally be {@code null}.
+     * @param filePath The {@code path} for file to validate or create. Symlinks will not be followed.
+     * @param createDirectoryIfMissing The {@code boolean} that decides if directory file
+     *                                 should be created if its missing.
+     * @param setPermissions The {@code boolean} that decides if permissions are to be
+     *                              automatically set defined by {@code permissionsToCheck}.
+     * @param setMissingPermissionsOnly The {@code boolean} that decides if only missing permissions
+     *                                  are to be set or if they should be overridden.
+     * @param ignoreErrorsIfPathIsInParentDirPath The {@code boolean} that decides if existence
+     *                                  and permission errors are to be ignored if path is
+     *                                  in {@code parentDirPath}.
+     * @param ignoreIfNotExecutable The {@code boolean} that decides if missing executable permission
+     *                              error is to be ignored. This allows making an attempt to set
+     *                              executable permissions, but ignoring if it fails.
+     * @return Returns the {@code error} if path is not a directory file, failed to create it,
+     * or validating permissions failed, otherwise {@code null}.
+     */
+    public static Error validateDirectoryFileExistenceAndPermissions(String label, final String filePath, final boolean createDirectoryIfMissing,
+                                                                     final boolean setPermissions, final boolean setMissingPermissionsOnly,
+                                                                     final boolean ignoreErrorsIfPathIsInParentDirPath, final boolean ignoreIfNotExecutable) {
+        return FileUtils.validateDirectoryFileExistenceAndPermissions(label, filePath,
+            TermuxFileUtils.getMatchedAllowedTermuxWorkingDirectoryParentPathForPath(filePath), createDirectoryIfMissing,
+            FileUtils.APP_WORKING_DIRECTORY_PERMISSIONS, setPermissions, setMissingPermissionsOnly,
+            ignoreErrorsIfPathIsInParentDirPath, ignoreIfNotExecutable);
+    }
+
+}
diff --git a/termux-shared/src/main/java/com/termux/shared/file/filesystem/FileTypes.java b/termux-shared/src/main/java/com/termux/shared/file/filesystem/FileTypes.java
index c6a78d7afe..cf599cd2a5 100644
--- a/termux-shared/src/main/java/com/termux/shared/file/filesystem/FileTypes.java
+++ b/termux-shared/src/main/java/com/termux/shared/file/filesystem/FileTypes.java
@@ -90,7 +90,7 @@ public static FileType getFileType(final String filePath, final boolean followLi
             return getFileType(fileAttributes);
         } catch (Exception e) {
             // If not a ENOENT (No such file or directory) exception
-            if (!e.getMessage().contains("ENOENT"))
+            if (e.getMessage() != null && !e.getMessage().contains("ENOENT"))
                 Logger.logError("Failed to get file type for file at path \"" + filePath + "\": " + e.getMessage());
             return FileType.NO_EXIST;
         }
diff --git a/termux-shared/src/main/java/com/termux/shared/file/tests/FileUtilsTests.java b/termux-shared/src/main/java/com/termux/shared/file/tests/FileUtilsTests.java
index 47f4e86b3c..822053172d 100644
--- a/termux-shared/src/main/java/com/termux/shared/file/tests/FileUtilsTests.java
+++ b/termux-shared/src/main/java/com/termux/shared/file/tests/FileUtilsTests.java
@@ -6,6 +6,7 @@
 
 import com.termux.shared.file.FileUtils;
 import com.termux.shared.logger.Logger;
+import com.termux.shared.models.errors.Error;
 
 import java.io.File;
 import java.nio.charset.Charset;
@@ -31,18 +32,19 @@ public static void runTests(@NonNull final Context context, @NonNull final Strin
             Logger.logInfo(LOG_TAG, "Running tests");
             Logger.logInfo(LOG_TAG, "testRootDirectoryPath: \"" + testRootDirectoryPath + "\"");
 
-            String fileUtilsTestsDirectoryCanonicalPath = FileUtils.getCanonicalPath(testRootDirectoryPath, null, false);
+            String fileUtilsTestsDirectoryCanonicalPath = FileUtils.getCanonicalPath(testRootDirectoryPath, null);
             assertEqual("FileUtilsTests directory path is not a canonical path", testRootDirectoryPath, fileUtilsTestsDirectoryCanonicalPath);
 
-            runTestsInner(context, testRootDirectoryPath);
+            runTestsInner(testRootDirectoryPath);
             Logger.logInfo(LOG_TAG, "All tests successful");
         } catch (Exception e) {
-            Logger.logErrorAndShowToast(context, LOG_TAG, e.getMessage());
+            Logger.logErrorExtended(LOG_TAG, e.getMessage());
+            Logger.showToast(context, e.getMessage() != null ? e.getMessage().replaceAll("(?s)\nFull Error:\n.*", "") : null, true);
         }
     }
 
-    private static void runTestsInner(@NonNull final Context context, @NonNull final String testRootDirectoryPath) throws Exception {
-        String errmsg;
+    private static void runTestsInner(@NonNull final String testRootDirectoryPath) throws Exception {
+        Error error;
         String label;
         String path;
 
@@ -101,20 +103,20 @@ private static void runTestsInner(@NonNull final Context context, @NonNull final
 
         // Create or clear test root directory file
         label = "testRootDirectoryPath";
-        errmsg = FileUtils.clearDirectory(context, label, testRootDirectoryPath);
-        assertEqual("Failed to create " + label + " directory file", null, errmsg);
+        error = FileUtils.clearDirectory(label, testRootDirectoryPath);
+        assertEqual("Failed to create " + label + " directory file", null, error);
 
         if (!FileUtils.directoryFileExists(testRootDirectoryPath, false))
             throwException("The " + label + " directory file does not exist as expected after creation");
 
 
         // Create dir1 directory file
-        errmsg = FileUtils.createDirectoryFile(context, dir1_label, dir1_path);
-        assertEqual("Failed to create " + dir1_label + " directory file", null, errmsg);
+        error = FileUtils.createDirectoryFile(dir1_label, dir1_path);
+        assertEqual("Failed to create " + dir1_label + " directory file", null, error);
 
         // Create dir2 directory file
-        errmsg = FileUtils.createDirectoryFile(context, dir2_label, dir2_path);
-        assertEqual("Failed to create " + dir2_label + " directory file", null, errmsg);
+        error = FileUtils.createDirectoryFile(dir2_label, dir2_path);
+        assertEqual("Failed to create " + dir2_label + " directory file", null, error);
 
 
 
@@ -122,29 +124,29 @@ private static void runTestsInner(@NonNull final Context context, @NonNull final
 
         // Create dir1/sub_dir1 directory file
         label = dir1__sub_dir1_label; path = dir1__sub_dir1_path;
-        errmsg = FileUtils.createDirectoryFile(context, label, path);
-        assertEqual("Failed to create " + label + " directory file", null, errmsg);
+        error = FileUtils.createDirectoryFile(label, path);
+        assertEqual("Failed to create " + label + " directory file", null, error);
         if (!FileUtils.directoryFileExists(path, false))
             throwException("The " + label + " directory file does not exist as expected after creation");
 
         // Create dir1/sub_reg1 regular file
         label = dir1__sub_reg1_label; path = dir1__sub_reg1_path;
-        errmsg = FileUtils.createRegularFile(context, label, path);
-        assertEqual("Failed to create " + label + " regular file", null, errmsg);
+        error = FileUtils.createRegularFile(label, path);
+        assertEqual("Failed to create " + label + " regular file", null, error);
         if (!FileUtils.regularFileExists(path, false))
             throwException("The " + label + " regular file does not exist as expected after creation");
 
         // Create dir1/sub_sym1 -> dir2 absolute symlink file
         label = dir1__sub_sym1_label; path = dir1__sub_sym1_path;
-        errmsg = FileUtils.createSymlinkFile(context, label, dir2_path, path);
-        assertEqual("Failed to create " + label + " symlink file", null, errmsg);
+        error = FileUtils.createSymlinkFile(label, dir2_path, path);
+        assertEqual("Failed to create " + label + " symlink file", null, error);
         if (!FileUtils.symlinkFileExists(path))
             throwException("The " + label + " symlink file does not exist as expected after creation");
 
         // Copy dir1/sub_sym1 symlink file to dir1/sub_sym2
         label = dir1__sub_sym2_label; path = dir1__sub_sym2_path;
-        errmsg = FileUtils.copySymlinkFile(context, label, dir1__sub_sym1_path, path, false);
-        assertEqual("Failed to copy " + dir1__sub_sym1_label + " symlink file to " + label, null, errmsg);
+        error = FileUtils.copySymlinkFile(label, dir1__sub_sym1_path, path, false);
+        assertEqual("Failed to copy " + dir1__sub_sym1_label + " symlink file to " + label, null, error);
         if (!FileUtils.symlinkFileExists(path))
             throwException("The " + label + " symlink file does not exist as expected after copying it from " + dir1__sub_sym1_label);
         if (!new File(path).getCanonicalPath().equals(dir2_path))
@@ -156,25 +158,25 @@ private static void runTestsInner(@NonNull final Context context, @NonNull final
 
         // Write "line1" to dir2/sub_reg1 regular file
         label = dir2__sub_reg1_label; path = dir2__sub_reg1_path;
-        errmsg = FileUtils.writeStringToFile(context, label, path, Charset.defaultCharset(), "line1", false);
-        assertEqual("Failed to write string to " + label + " file with append mode false", null, errmsg);
+        error = FileUtils.writeStringToFile(label, path, Charset.defaultCharset(), "line1", false);
+        assertEqual("Failed to write string to " + label + " file with append mode false", null, error);
         if (!FileUtils.regularFileExists(path, false))
             throwException("The " + label + " file does not exist as expected after writing to it with append mode false");
 
         // Write "line2" to dir2/sub_reg1 regular file
-        errmsg = FileUtils.writeStringToFile(context, label, path, Charset.defaultCharset(), "\nline2", true);
-        assertEqual("Failed to write string to " + label + " file with append mode true", null, errmsg);
+        error = FileUtils.writeStringToFile(label, path, Charset.defaultCharset(), "\nline2", true);
+        assertEqual("Failed to write string to " + label + " file with append mode true", null, error);
 
         // Read dir2/sub_reg1 regular file
         StringBuilder dataStringBuilder = new StringBuilder();
-        errmsg = FileUtils.readStringFromFile(context, label, path, Charset.defaultCharset(), dataStringBuilder, false);
-        assertEqual("Failed to read from " + label + " file", null, errmsg);
+        error = FileUtils.readStringFromFile(label, path, Charset.defaultCharset(), dataStringBuilder, false);
+        assertEqual("Failed to read from " + label + " file", null, error);
         assertEqual("The data read from " + label + " file in not as expected", "line1\nline2", dataStringBuilder.toString());
 
         // Copy dir2/sub_reg1 regular file to dir2/sub_reg2 file
         label = dir2__sub_reg2_label; path = dir2__sub_reg2_path;
-        errmsg = FileUtils.copyRegularFile(context, label, dir2__sub_reg1_path, path, false);
-        assertEqual("Failed to copy " + dir2__sub_reg1_label + " regular file to " + label, null, errmsg);
+        error = FileUtils.copyRegularFile(label, dir2__sub_reg1_path, path, false);
+        assertEqual("Failed to copy " + dir2__sub_reg1_label + " regular file to " + label, null, error);
         if (!FileUtils.regularFileExists(path, false))
             throwException("The " + label + " regular file does not exist as expected after copying it from " + dir2__sub_reg1_label);
 
@@ -184,22 +186,22 @@ private static void runTestsInner(@NonNull final Context context, @NonNull final
 
         // Copy dir1 directory file to dir3
         label = dir3_label; path = dir3_path;
-        errmsg = FileUtils.copyDirectoryFile(context, label, dir2_path, path, false);
-        assertEqual("Failed to copy " + dir2_label + " directory file to " + label, null, errmsg);
+        error = FileUtils.copyDirectoryFile(label, dir2_path, path, false);
+        assertEqual("Failed to copy " + dir2_label + " directory file to " + label, null, error);
         if (!FileUtils.directoryFileExists(path, false))
             throwException("The " + label + " directory file does not exist as expected after copying it from " + dir2_label);
 
         // Copy dir1 directory file to dir3 again to test overwrite
         label = dir3_label; path = dir3_path;
-        errmsg = FileUtils.copyDirectoryFile(context, label, dir2_path, path, false);
-        assertEqual("Failed to copy " + dir2_label + " directory file to " + label, null, errmsg);
+        error = FileUtils.copyDirectoryFile(label, dir2_path, path, false);
+        assertEqual("Failed to copy " + dir2_label + " directory file to " + label, null, error);
         if (!FileUtils.directoryFileExists(path, false))
             throwException("The " + label + " directory file does not exist as expected after copying it from " + dir2_label);
 
         // Move dir3 directory file to dir4
         label = dir4_label; path = dir4_path;
-        errmsg = FileUtils.moveDirectoryFile(context, label, dir3_path, path, false);
-        assertEqual("Failed to move " + dir3_label + " directory file to " + label, null, errmsg);
+        error = FileUtils.moveDirectoryFile(label, dir3_path, path, false);
+        assertEqual("Failed to move " + dir3_label + " directory file to " + label, null, error);
         if (!FileUtils.directoryFileExists(path, false))
             throwException("The " + label + " directory file does not exist as expected after copying it from " + dir3_label);
 
@@ -209,16 +211,16 @@ private static void runTestsInner(@NonNull final Context context, @NonNull final
 
         // Create dir1/sub_sym3 -> dir4 relative symlink file
         label = dir1__sub_sym3_label; path = dir1__sub_sym3_path;
-        errmsg = FileUtils.createSymlinkFile(context, label, "../dir4", path);
-        assertEqual("Failed to create " + label + " symlink file", null, errmsg);
+        error = FileUtils.createSymlinkFile(label, "../dir4", path);
+        assertEqual("Failed to create " + label + " symlink file", null, error);
         if (!FileUtils.symlinkFileExists(path))
             throwException("The " + label + " symlink file does not exist as expected after creation");
 
         // Create dir1/sub_sym3 -> dirX relative dangling symlink file
         // This is to ensure that symlinkFileExists returns true if a symlink file exists but is dangling
         label = dir1__sub_sym3_label; path = dir1__sub_sym3_path;
-        errmsg = FileUtils.createSymlinkFile(context, label, "../dirX", path);
-        assertEqual("Failed to create " + label + " symlink file", null, errmsg);
+        error = FileUtils.createSymlinkFile(label, "../dirX", path);
+        assertEqual("Failed to create " + label + " symlink file", null, error);
         if (!FileUtils.symlinkFileExists(path))
             throwException("The " + label + " dangling symlink file does not exist as expected after creation");
 
@@ -228,8 +230,8 @@ private static void runTestsInner(@NonNull final Context context, @NonNull final
 
         // Delete dir1/sub_sym2 symlink file
         label = dir1__sub_sym2_label; path = dir1__sub_sym2_path;
-        errmsg = FileUtils.deleteSymlinkFile(context, label, path, false);
-        assertEqual("Failed to delete " + label + " symlink file", null, errmsg);
+        error = FileUtils.deleteSymlinkFile(label, path, false);
+        assertEqual("Failed to delete " + label + " symlink file", null, error);
         if (FileUtils.fileExists(path, false))
             throwException("The " + label + " symlink file still exist after deletion");
 
@@ -245,8 +247,8 @@ private static void runTestsInner(@NonNull final Context context, @NonNull final
 
         // Delete dir1 directory file
         label = dir1_label; path = dir1_path;
-        errmsg = FileUtils.deleteDirectoryFile(context, label, path, false);
-        assertEqual("Failed to delete " + label + " directory file", null, errmsg);
+        error = FileUtils.deleteDirectoryFile(label, path, false);
+        assertEqual("Failed to delete " + label + " directory file", null, error);
         if (FileUtils.fileExists(path, false))
             throwException("The " + label + " directory file still exist after deletion");
 
@@ -267,8 +269,8 @@ private static void runTestsInner(@NonNull final Context context, @NonNull final
 
         // Delete dir2/sub_reg1 regular file
         label = dir2__sub_reg1_label; path = dir2__sub_reg1_path;
-        errmsg = FileUtils.deleteRegularFile(context, label, path, false);
-        assertEqual("Failed to delete " + label + " regular file", null, errmsg);
+        error = FileUtils.deleteRegularFile(label, path, false);
+        assertEqual("Failed to delete " + label + " regular file", null, error);
         if (FileUtils.fileExists(path, false))
             throwException("The " + label + " regular file still exist after deletion");
 
@@ -276,6 +278,14 @@ private static void runTestsInner(@NonNull final Context context, @NonNull final
         FileUtils.getFileType("/dev/null", false);
     }
 
+
+
+    public static void assertEqual(@NonNull final String message, final String expected, final Error actual) throws Exception {
+        String actualString = actual != null ? actual.getMessage() : null;
+        if (!equalsRegardingNull(expected, actualString))
+            throwException(message + "\nexpected: \"" + expected + "\"\nactual: \"" + actualString + "\"\nFull Error:\n" + (actual != null ? actual.toString() : ""));
+    }
+
     public static void assertEqual(@NonNull final String message, final String expected, final String actual) throws Exception {
         if (!equalsRegardingNull(expected, actual))
             throwException(message + "\nexpected: \"" + expected + "\"\nactual: \"" + actual + "\"");
diff --git a/termux-shared/src/main/java/com/termux/shared/models/errors/Errno.java b/termux-shared/src/main/java/com/termux/shared/models/errors/Errno.java
new file mode 100644
index 0000000000..0c21f02b7a
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/models/errors/Errno.java
@@ -0,0 +1,89 @@
+package com.termux.shared.models.errors;
+
+import android.app.Activity;
+
+import androidx.annotation.NonNull;
+
+import com.termux.shared.logger.Logger;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+/** The {@link Class} that defines error messages and codes. */
+public class Errno {
+
+    public static final String TYPE = "Error";
+
+
+    public static final Errno ERRNO_SUCCESS = new Errno(TYPE, Activity.RESULT_OK, "Success");
+    public static final Errno ERRNO_MINOR_FAILURES = new Errno(TYPE, Activity.RESULT_FIRST_USER, "Minor failure");
+    public static final Errno ERRNO_FAILED = new Errno(TYPE, Activity.RESULT_FIRST_USER + 1, "Failed");
+    public static final Errno ERRNO_CANCELED = new Errno(TYPE, Activity.RESULT_FIRST_USER + 2, "Cancelled");
+
+    /** The errno type. */
+    protected String type;
+    /** The errno code. */
+    protected final int code;
+    /** The errno message. */
+    protected final String message;
+
+    private static final String LOG_TAG = "Errno";
+
+
+    public Errno(final String type, final int code, final String message) {
+        this.type = type;
+        this.code = code;
+        this.message = message;
+    }
+
+    @NonNull
+    @Override
+    public String toString() {
+        return "type=" + type + ", code=" + code + ", message=\"" + message + "\"";
+    }
+
+
+    public String getType() {
+        return type;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+
+
+    public Error getError() {
+        return new Error(getType(), getCode(), getMessage());
+    }
+
+    public Error getError(Object... args) {
+        try {
+            return new Error(getType(), getCode(), String.format(getMessage(), args));
+        } catch (Exception e) {
+            Logger.logWarn(LOG_TAG, "Exception raised while calling String.format() for error message of errno " + this + " with args" + Arrays.toString(args) + "\n" + e.getMessage());
+            // Return unformatted message as a backup
+            return new Error(getType(), getCode(), getMessage() + ": " + Arrays.toString(args));
+        }
+    }
+
+    public Error getError(Throwable throwable, Object... args) {
+        return getError(Collections.singletonList(throwable), args);
+    }
+
+    public Error getError(List<Throwable> throwablesList, Object... args) {
+        try {
+            return new Error(getType(), getCode(), String.format(getMessage(), args), throwablesList);
+        } catch (Exception e) {
+            Logger.logWarn(LOG_TAG, "Exception raised while calling String.format() for error message of errno " + this + " with args" + Arrays.toString(args) + "\n" + e.getMessage());
+            // Return unformatted message as a backup
+            return new Error(getType(), getCode(), getMessage() + ": " + Arrays.toString(args), throwablesList);
+        }
+    }
+
+}
diff --git a/termux-shared/src/main/java/com/termux/shared/models/errors/Error.java b/termux-shared/src/main/java/com/termux/shared/models/errors/Error.java
new file mode 100644
index 0000000000..b9dba33f28
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/models/errors/Error.java
@@ -0,0 +1,249 @@
+package com.termux.shared.models.errors;
+
+import androidx.annotation.NonNull;
+
+import com.termux.shared.logger.Logger;
+import com.termux.shared.markdown.MarkdownUtils;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public class Error implements Serializable {
+
+    /** The error type. */
+    private String type;
+    /** The error code. */
+    private int code;
+    /** The error message. */
+    private String message;
+    /** The error exceptions. */
+    private List<Throwable> throwablesList = new ArrayList<>();
+
+    private static final String LOG_TAG = "Error";
+
+
+    public Error() {
+        InitError(null, null, null, null);
+    }
+
+    public Error(String type, Integer code, String message, List<Throwable> throwablesList) {
+        InitError(type, code, message, throwablesList);
+    }
+
+    public Error(String type, Integer code, String message, Throwable throwable) {
+        InitError(type, code, message, Collections.singletonList(throwable));
+    }
+
+    public Error(String type, Integer code, String message) {
+        InitError(type, code, message, null);
+    }
+
+    public Error(Integer code, String message, List<Throwable> throwablesList) {
+        InitError(null, code, message, throwablesList);
+    }
+
+    public Error(Integer code, String message, Throwable throwable) {
+        InitError(null, code, message, Collections.singletonList(throwable));
+    }
+
+    public Error(Integer code, String message) {
+        InitError(null, code, message, null);
+    }
+
+    public Error(String message, Throwable throwable) {
+        InitError(null, null, message, Collections.singletonList(throwable));
+    }
+
+    public Error(String message, List<Throwable> throwablesList) {
+        InitError(null, null, message, throwablesList);
+    }
+
+    public Error(String message) {
+        InitError(null, null, message, null);
+    }
+
+    private void InitError(String type, Integer code, String message, List<Throwable> throwablesList) {
+        if (type != null && !type.isEmpty())
+            this.type = type;
+        else
+            this.type = Errno.TYPE;
+
+        if (code != null && code > Errno.ERRNO_SUCCESS.getCode())
+            this.code = code;
+        else
+            this.code = Errno.ERRNO_SUCCESS.getCode();
+
+        this.message = message;
+        this.throwablesList = throwablesList;
+    }
+
+
+    public String getType() {
+        return type;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void prependMessage(String message) {
+        if (message != null && isStateFailed())
+            this.message = message + this.message;
+    }
+
+    public void appendMessage(String message) {
+        if (message != null && isStateFailed())
+            this.message = this.message + message;
+    }
+
+    public List<Throwable> getThrowablesList() {
+        return Collections.unmodifiableList(throwablesList);
+    }
+
+
+    public synchronized boolean setStateFailed(@NonNull Error error) {
+        return setStateFailed(error.getType(), error.getCode(), error.getMessage(), null);
+    }
+
+    public synchronized boolean setStateFailed(@NonNull Error error, Throwable throwable) {
+        return setStateFailed(error.getType(), error.getCode(), error.getMessage(), Collections.singletonList(throwable));
+    }
+    public synchronized boolean setStateFailed(@NonNull Error error, List<Throwable> throwablesList) {
+        return setStateFailed(error.getType(), error.getCode(), error.getMessage(), throwablesList);
+    }
+
+    public synchronized boolean setStateFailed(int code, String message) {
+        return setStateFailed(this.type, code, message, null);
+    }
+
+    public synchronized boolean setStateFailed(int code, String message, Throwable throwable) {
+        return setStateFailed(this.type, code, message, Collections.singletonList(throwable));
+    }
+
+    public synchronized boolean setStateFailed(int code, String message, List<Throwable> throwablesList) {
+        return setStateFailed(this.type, code, message, throwablesList);
+    }
+
+    public synchronized boolean setStateFailed(String type, int code, String message, List<Throwable> throwablesList) {
+        this.message = message;
+        this.throwablesList = throwablesList;
+
+        if (type != null && !type.isEmpty())
+            this.type = type;
+
+        if (code > Errno.ERRNO_SUCCESS.getCode()) {
+            this.code = code;
+            return true;
+        } else {
+            Logger.logWarn(LOG_TAG, "Ignoring invalid error code value \"" + code + "\". Force setting it to RESULT_CODE_FAILED \"" + Errno.ERRNO_FAILED.getCode() + "\"");
+            this.code = Errno.ERRNO_FAILED.getCode();
+            return false;
+        }
+    }
+
+    public boolean isStateFailed() {
+        return code > Errno.ERRNO_SUCCESS.getCode();
+    }
+
+
+    @NonNull
+    @Override
+    public String toString() {
+        return getErrorLogString(this);
+    }
+
+    /**
+     * Get a log friendly {@link String} for {@link Error} error parameters.
+     *
+     * @param error The {@link Error} to convert.
+     * @return Returns the log friendly {@link String}.
+     */
+    public static String getErrorLogString(final Error error) {
+        if (error == null) return "null";
+
+        StringBuilder logString = new StringBuilder();
+
+        logString.append(error.getCodeString());
+        logString.append("\n").append(error.getTypeAndMessageLogString());
+        if (error.throwablesList != null)
+            logString.append("\n").append(error.geStackTracesLogString());
+
+        return logString.toString();
+    }
+
+    /**
+     * Get a minimal log friendly {@link String} for {@link Error} error parameters.
+     *
+     * @param error The {@link Error} to convert.
+     * @return Returns the log friendly {@link String}.
+     */
+    public static String getMinimalErrorLogString(final Error error) {
+        if (error == null) return "null";
+
+        StringBuilder logString = new StringBuilder();
+
+        logString.append(error.getCodeString());
+        logString.append(error.getTypeAndMessageLogString());
+
+        return logString.toString();
+    }
+
+    /**
+     * Get a minimal {@link String} for {@link Error} error parameters.
+     *
+     * @param error The {@link Error} to convert.
+     * @return Returns the {@link String}.
+     */
+    public static String getMinimalErrorString(final Error error) {
+        if (error == null) return "null";
+
+        StringBuilder logString = new StringBuilder();
+
+        logString.append("(").append(error.getCode()).append(") ");
+        logString.append(error.getType()).append(": ").append(error.getMessage());
+
+        return logString.toString();
+    }
+
+    /**
+     * Get a markdown {@link String} for {@link Error}.
+     *
+     * @param error The {@link Error} to convert.
+     * @return Returns the markdown {@link String}.
+     */
+    public static String getErrorMarkdownString(final Error error) {
+        if (error == null) return "null";
+
+        StringBuilder markdownString = new StringBuilder();
+
+        markdownString.append(MarkdownUtils.getSingleLineMarkdownStringEntry("Error Code", error.getCode(), "-"));
+        markdownString.append("\n").append(MarkdownUtils.getMultiLineMarkdownStringEntry((Errno.TYPE.equals(error.getType()) ? "Error Message" : "Error Message (" + error.getType() + ")"), error.message, "-"));
+        markdownString.append("\n\n").append(error.geStackTracesMarkdownString());
+
+        return markdownString.toString();
+    }
+
+
+    public String getCodeString() {
+        return Logger.getSingleLineLogStringEntry("Error Code", code, "-");
+    }
+
+    public String getTypeAndMessageLogString() {
+        return Logger.getMultiLineLogStringEntry(Errno.TYPE.equals(type) ? "Error Message" : "Error Message (" + type + ")", message, "-");
+    }
+
+    public String geStackTracesLogString() {
+        return Logger.getStackTracesString("StackTraces:", Logger.getStackTracesStringArray(throwablesList));
+    }
+
+    public String geStackTracesMarkdownString() {
+        return Logger.getStackTracesMarkdownString("StackTraces", Logger.getStackTracesStringArray(throwablesList));
+    }
+
+}
diff --git a/termux-shared/src/main/java/com/termux/shared/models/errors/FileUtilsErrno.java b/termux-shared/src/main/java/com/termux/shared/models/errors/FileUtilsErrno.java
new file mode 100644
index 0000000000..2935d7a4cb
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/models/errors/FileUtilsErrno.java
@@ -0,0 +1,81 @@
+package com.termux.shared.models.errors;
+
+/** The {@link Class} that defines FileUtils error messages and codes. */
+public class FileUtilsErrno extends Errno {
+
+    public static final String TYPE = "FileUtils Error";
+
+
+    /* Errors for null or empty paths (100-150) */
+    public static final Errno ERRNO_EXECUTABLE_REQUIRED = new Errno(TYPE, 100, "Executable required.");
+    public static final Errno ERRNO_NULL_OR_EMPTY_REGULAR_FILE_PATH = new Errno(TYPE, 101, "The regular file path is null or empty.");
+    public static final Errno ERRNO_NULL_OR_EMPTY_REGULAR_FILE = new Errno(TYPE, 102, "The regular file is null or empty.");
+    public static final Errno ERRNO_NULL_OR_EMPTY_EXECUTABLE_FILE_PATH = new Errno(TYPE, 103, "The executable file path is null or empty.");
+    public static final Errno ERRNO_NULL_OR_EMPTY_EXECUTABLE_FILE = new Errno(TYPE, 104, "The executable file is null or empty.");
+    public static final Errno ERRNO_NULL_OR_EMPTY_DIRECTORY_FILE_PATH = new Errno(TYPE, 105, "The directory file path is null or empty.");
+    public static final Errno ERRNO_NULL_OR_EMPTY_DIRECTORY_FILE = new Errno(TYPE, 106, "The directory file is null or empty.");
+
+
+
+    /* Errors for invalid or not found files at path (150-200) */
+    public static final Errno ERRNO_FILE_NOT_FOUND_AT_PATH = new Errno(TYPE, 150, "The %1$s is not found at path \"%2$s\".");
+
+    public static final Errno ERRNO_NO_REGULAR_FILE_FOUND = new Errno(TYPE, 151, "Regular file not found at %1$s path.");
+    public static final Errno ERRNO_NOT_A_REGULAR_FILE = new Errno(TYPE, 152, "The %1$s at path \"%2$s\" is not a regular file.");
+
+    public static final Errno ERRNO_NON_REGULAR_FILE_FOUND = new Errno(TYPE, 153, "Non-regular file found at %1$s path.");
+    public static final Errno ERRNO_NON_DIRECTORY_FILE_FOUND = new Errno(TYPE, 154, "Non-directory file found at %1$s path.");
+    public static final Errno ERRNO_NON_SYMLINK_FILE_FOUND = new Errno(TYPE, 155, "Non-symlink file found at %1$s path.");
+
+    public static final Errno ERRNO_FILE_NOT_AN_ALLOWED_FILE_TYPE = new Errno(TYPE, 156, "The %1$s found at path \"%2$s\" is not one of allowed file types \"%3$s\".");
+
+    public static final Errno ERRNO_VALIDATE_FILE_EXISTENCE_AND_PERMISSIONS_FAILED_WITH_EXCEPTION = new Errno(TYPE, 157, "Validating file existence and permissions of %1$s at path \"%2$s\" failed.\nException: %3$s");
+    public static final Errno ERRNO_VALIDATE_DIRECTORY_EXISTENCE_AND_PERMISSIONS_FAILED_WITH_EXCEPTION = new Errno(TYPE, 158, "Validating directory existence and permissions of %1$s at path \"%2$s\" failed.\nException: %3$s");
+
+
+
+    /* Errors for file creation (200-250) */
+    public static final Errno ERRNO_CREATING_FILE_FAILED = new Errno(TYPE, 200, "Creating %1$s at path \"%2$s\" failed.");
+    public static final Errno ERRNO_CREATING_FILE_FAILED_WITH_EXCEPTION = new Errno(TYPE, 201, "Creating %1$s at path \"%2$s\" failed.\nException: %3$s");
+
+    public static final Errno ERRNO_CANNOT_OVERWRITE_A_NON_SYMLINK_FILE_TYPE = new Errno(TYPE, 202, "Cannot overwrite %1$s while creating symlink at \"%2$s\" to \"%3$s\" since destination file type \"%4$s\" is not a symlink.");
+    public static final Errno ERRNO_CREATING_SYMLINK_FILE_FAILED_WITH_EXCEPTION = new Errno(TYPE, 203, "Creating %1$s at path \"%2$s\" to \"%3$s\" failed.\nException: %4$s");
+
+
+
+    /* Errors for file copying and moving (250-300) */
+    public static final Errno ERRNO_COPYING_OR_MOVING_FILE_FAILED_WITH_EXCEPTION = new Errno(TYPE, 250, "%1$s from \"%2$s\" to \"%3$s\" failed.\nException: %4$s");
+    public static final Errno ERRNO_COPYING_OR_MOVING_FILE_TO_SAME_PATH = new Errno(TYPE, 251, "%1$s from \"%2$s\" to \"%3$s\" cannot be done since they point to the same path.");
+    public static final Errno ERRNO_CANNOT_OVERWRITE_A_DIFFERENT_FILE_TYPE = new Errno(TYPE, 252, "Cannot overwrite %1$s while %2$s it from \"%3$s\" to \"%4$s\" since destination file type \"%5$s\" is different from source file type \"%6$s\".");
+    public static final Errno ERRNO_CANNOT_MOVE_DIRECTORY_TO_SUB_DIRECTORY_OF_ITSELF = new Errno(TYPE, 253, "Cannot move %1$s from \"%2$s\" to \"%3$s\" since destination is a subdirectory of the source.");
+
+
+
+    /* Errors for file deletion (300-350) */
+    public static final Errno ERRNO_DELETING_FILE_FAILED = new Errno(TYPE, 300, "Deleting %1$s at path \"%2$s\" failed.");
+    public static final Errno ERRNO_DELETING_FILE_FAILED_WITH_EXCEPTION = new Errno(TYPE, 301, "Deleting %1$s at path \"%2$s\" failed.\nException: %3$s");
+    public static final Errno ERRNO_CLEARING_DIRECTORY_FAILED_WITH_EXCEPTION = new Errno(TYPE, 302, "Clearing %1$s at path \"%2$s\" failed.\nException: %3$s");
+    public static final Errno ERRNO_FILE_STILL_EXISTS_AFTER_DELETING = new Errno(TYPE, 303, "The %1$s still exists after deleting it from \"%2$s\".");
+
+
+
+    /* Errors for file reading and writing (350-400) */
+    public static final Errno ERRNO_READING_STRING_TO_FILE_FAILED_WITH_EXCEPTION = new Errno(TYPE, 350, "Reading string from %1$s at path \"%2$s\" failed.\nException: %3$s");
+    public static final Errno ERRNO_WRITING_STRING_TO_FILE_FAILED_WITH_EXCEPTION = new Errno(TYPE, 351, "Writing string to %1$s at path \"%2$s\" failed.\nException: %3$s");
+    public static final Errno ERRNO_UNSUPPORTED_CHARSET = new Errno(TYPE, 352, "Unsupported charset \"%1$s\"");
+    public static final Errno ERRNO_CHECKING_IF_CHARSET_SUPPORTED_FAILED = new Errno(TYPE, 353, "Checking if charset \"%1$s\" is supported failed.\nException: %2$s");
+
+
+
+    /* Errors for invalid file permissions (400-450) */
+    public static final Errno ERRNO_INVALID_FILE_PERMISSIONS_STRING_TO_CHECK = new Errno(TYPE, 400, "The file permission string to check is invalid.");
+    public static final Errno ERRNO_FILE_NOT_READABLE = new Errno(TYPE, 401, "The %1$s at path is not readable. Permission Denied.");
+    public static final Errno ERRNO_FILE_NOT_WRITABLE = new Errno(TYPE, 402, "The %1$s at path is not writable. Permission Denied.");
+    public static final Errno ERRNO_FILE_NOT_EXECUTABLE = new Errno(TYPE, 403, "The %1$s at path is not executable. Permission Denied.");
+
+
+    FileUtilsErrno(final String type, final int code, final String message) {
+        super(type, code, message);
+    }
+
+}
diff --git a/termux-shared/src/main/java/com/termux/shared/models/errors/FunctionErrno.java b/termux-shared/src/main/java/com/termux/shared/models/errors/FunctionErrno.java
new file mode 100644
index 0000000000..8d099b3496
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/models/errors/FunctionErrno.java
@@ -0,0 +1,20 @@
+package com.termux.shared.models.errors;
+
+/** The {@link Class} that defines function error messages and codes. */
+public class FunctionErrno extends Errno {
+
+    public static final String TYPE = "Function Error";
+
+
+    /* Errors for null or empty parameters (100-150) */
+    public static final Errno ERRNO_NULL_OR_EMPTY_PARAMETER = new Errno(TYPE, 100, "The %1$s parameter passed to \"%2$s\" is null or empty.");
+    public static final Errno ERRNO_NULL_OR_EMPTY_PARAMETERS = new Errno(TYPE, 101, "The %1$s parameters passed to \"%2$s\" are null or empty.");
+    public static final Errno ERRNO_UNSET_PARAMETER = new Errno(TYPE, 102, "The %1$s parameter passed to \"%2$s\" must be set.");
+    public static final Errno ERRNO_UNSET_PARAMETERS = new Errno(TYPE, 103, "The %1$s parameters passed to \"%2$s\" must be set.");
+
+
+    FunctionErrno(final String type, final int code, final String message) {
+        super(type, code, message);
+    }
+
+}
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/ShellUtils.java b/termux-shared/src/main/java/com/termux/shared/shell/ShellUtils.java
index fe1efc8da5..89c66f3c1c 100644
--- a/termux-shared/src/main/java/com/termux/shared/shell/ShellUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/shell/ShellUtils.java
@@ -4,6 +4,7 @@
 
 import androidx.annotation.NonNull;
 
+import com.termux.shared.models.errors.Error;
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.file.FileUtils;
 import com.termux.shared.logger.Logger;
@@ -150,14 +151,14 @@ public static String getExecutableBasename(String executable) {
         return (lastSlash == -1) ? executable : executable.substring(lastSlash + 1);
     }
 
-    public static void clearTermuxTMPDIR(Context context, boolean onlyIfExists) {
+    public static void clearTermuxTMPDIR(boolean onlyIfExists) {
         if(onlyIfExists && !FileUtils.directoryFileExists(TermuxConstants.TERMUX_TMP_PREFIX_DIR_PATH, false))
             return;
 
-        String errmsg;
-        errmsg = FileUtils.clearDirectory(context, "$TMPDIR", FileUtils.getCanonicalPath(TermuxConstants.TERMUX_TMP_PREFIX_DIR_PATH, null, false));
-        if (errmsg != null) {
-            Logger.logError(errmsg);
+        Error error;
+        error = FileUtils.clearDirectory("$TMPDIR", FileUtils.getCanonicalPath(TermuxConstants.TERMUX_TMP_PREFIX_DIR_PATH, null));
+        if (error != null) {
+            Logger.logErrorExtended(error.toString());
         }
     }
 
diff --git a/termux-shared/src/main/res/values/strings.xml b/termux-shared/src/main/res/values/strings.xml
index b1049f8e82..21a8504635 100644
--- a/termux-shared/src/main/res/values/strings.xml
+++ b/termux-shared/src/main/res/values/strings.xml
@@ -13,52 +13,7 @@
 
 <resources>
 
-    <!-- FileUtils -->
-    <string name="error_executable_required">Executable required.</string>
-    <string name="error_null_or_empty_parameter">The %1$s is to \"%2$s\" null or empty.</string>
-    <string name="error_null_or_empty_regular_file_path">The regular file path is null or empty.</string>
-    <string name="error_null_or_empty_regular_file">The regular file is null or empty.</string>
-    <string name="error_null_or_empty_executable_file_path">The executable file path is null or empty.</string>
-    <string name="error_null_or_empty_executable_file">The executable file is null or empty.</string>
-    <string name="error_null_or_empty_directory_file_path">The directory file path is null or empty.</string>
-    <string name="error_null_or_empty_directory_file">The directory file is null or empty.</string>
-
-    <string name="error_file_not_found_at_path">The %1$s is not found at path \"%2$s\".</string>
-    <string name="error_no_regular_file_found">Regular file not found at %1$s path.</string>
-    <string name="error_not_a_regular_file">The %1$s at path \"%2$s\" is not a regular file.</string>
-    <string name="error_non_regular_file_found">Non-regular file found at %1$s path.</string>
-    <string name="error_non_directory_file_found">Non-directory file found at %1$s path.</string>
-    <string name="error_non_symlink_file_found">Non-symlink file found at %1$s path.</string>
-    <string name="error_file_not_an_allowed_file_type">The %1$s found at path \"%2$s\" is not one of allowed file types \"%3$s\".</string>
-
-    <string name="error_validate_file_existence_and_permissions_failed_with_exception">Validating file existence and permissions of %1$s at path \"%2$s\" failed.\nException: %3$s</string>
-    <string name="error_validate_directory_existence_and_permissions_failed_with_exception">Validating directory existence and permissions of %1$s at path \"%2$s\" failed.\nException: %3$s</string>
-
-    <string name="error_creating_file_failed">Creating %1$s at path \"%2$s\" failed.</string>
-    <string name="error_creating_file_failed_with_exception">Creating %1$s at path \"%2$s\" failed.\nException: %3$s</string>
-
-    <string name="error_cannot_overwrite_a_non_symlink_file_type">Cannot overwrite %1$s while creating symlink at \"%2$s\" to \"%3$s\" since destination file type \"%4$s\" is not a symlink.</string>
-    <string name="error_creating_symlink_file_failed_with_exception">Creating %1$s at path \"%2$s\" to \"%3$s\" failed.\nException: %4$s</string>
-
-    <string name="error_copying_or_moving_file_failed_with_exception">%1$s from \"%2$s\" to \"%3$s\" failed.\nException: %4$s</string>
-    <string name="error_copying_or_moving_file_to_same_path">%1$s from \"%2$s\" to \"%3$s\" cannot be done since they point to the same path.</string>
-    <string name="error_cannot_overwrite_a_different_file_type">Cannot overwrite %1$s while %2$s it from \"%3$s\" to \"%4$s\" since destination file type \"%5$s\" is different from source file type \"%6$s\".</string>
-    <string name="error_cannot_move_directory_to_sub_directory_of_itself">Cannot move %1$s from \"%2$s\" to \"%3$s\" since destination is a subdirectory of the source.</string>
-
-    <string name="error_file_still_exists_after_deleting">The %1$s still exists after deleting it from \"%2$s\".</string>
-    <string name="error_deleting_file_failed">Deleting %1$s at path \"%2$s\" failed.</string>
-    <string name="error_deleting_file_failed_with_exception">Deleting %1$s at path \"%2$s\" failed.\nException: %3$s</string>
-    <string name="error_clearing_directory_failed_with_exception">Clearing %1$s at path \"%2$s\" failed.\nException: %3$s</string>
-
-    <string name="error_reading_string_to_file_failed_with_exception">Reading string from %1$s at path \"%2$s\" failed.\nException: %3$s</string>
-    <string name="error_writing_string_to_file_failed_with_exception">Writing string to %1$s at path \"%2$s\" failed.\nException: %3$s</string>
-    <string name="error_unsupported_charset">Unsupported charset \"%1$s\"</string>
-    <string name="error_checking_if_charset_supported_failed">Checking if charset \"%1$s\" is suppoted failed.\nException: %2$s</string>
-
-    <string name="error_invalid_file_permissions_string_to_check">The file permission string to check is invalid.</string>
-    <string name="error_file_not_readable">The %1$s at path is not readable. Permission Denied.</string>
-    <string name="error_file_not_writable">The %1$s at path is not writable. Permission Denied.</string>
-    <string name="error_file_not_executable">The %1$s at path is not executable. Permission Denied.</string>
+    <string name="msg_directory_absolute_path">%1$s Directory Absolute Path: \"%2$s\"</string>
 
 
 

From 28f81f2cc78df8e5b98e82f54cfc5b06eefaabf3 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 26 Jun 2021 08:51:30 +0500
Subject: [PATCH 425/912] Fix minor typos and potential errors

---
 .../main/java/com/termux/shared/markdown/MarkdownUtils.java | 4 +++-
 .../com/termux/shared/notification/NotificationUtils.java   | 6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/markdown/MarkdownUtils.java b/termux-shared/src/main/java/com/termux/shared/markdown/MarkdownUtils.java
index 470624de29..28e1fc6a69 100644
--- a/termux-shared/src/main/java/com/termux/shared/markdown/MarkdownUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/markdown/MarkdownUtils.java
@@ -90,10 +90,12 @@ public static int getMaxConsecutiveBackTicksCount(String string) {
 
         int maxCount = 0;
         int matchCount;
+        String match;
 
         Matcher matcher = backticksPattern.matcher(string);
         while(matcher.find()) {
-            matchCount = matcher.group(1).length();
+            match = matcher.group(1);
+            matchCount = match != null ? match.length() : 0;
             if (matchCount > maxCount)
                 maxCount = matchCount;
         }
diff --git a/termux-shared/src/main/java/com/termux/shared/notification/NotificationUtils.java b/termux-shared/src/main/java/com/termux/shared/notification/NotificationUtils.java
index b31072e87a..f6f21c8971 100644
--- a/termux-shared/src/main/java/com/termux/shared/notification/NotificationUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/notification/NotificationUtils.java
@@ -83,7 +83,7 @@ public synchronized static int getNextNotificationId(final Context context) {
      *
      * @param context The {@link Context} for operations.
      * @param title The title for the notification.
-     * @param notifiationText The second line text of 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 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_*}.
@@ -92,11 +92,11 @@ public synchronized static int getNextNotificationId(final Context context) {
      * @return Returns the {@link Notification.Builder}.
      */
     @Nullable
-    public static Notification.Builder geNotificationBuilder(final Context context, final String channelId, final int priority, final CharSequence title, final CharSequence notifiationText, final CharSequence notificationBigText, final PendingIntent pendingIntent, final int notificationMode) {
+    public static Notification.Builder geNotificationBuilder(final Context context, final String channelId, final int priority, final CharSequence title, final CharSequence notificationText, final CharSequence notificationBigText, final PendingIntent pendingIntent, final int notificationMode) {
         if (context == null) return null;
         Notification.Builder builder = new Notification.Builder(context);
         builder.setContentTitle(title);
-        builder.setContentText(notifiationText);
+        builder.setContentText(notificationText);
         builder.setStyle(new Notification.BigTextStyle().bigText(notificationBigText));
         builder.setContentIntent(pendingIntent);
 

From 52f18a73fbd57385e2b7a292292517654528aa1a Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sun, 27 Jun 2021 05:57:16 +0500
Subject: [PATCH 426/912] Bump gradle wrapper to v7.1

---
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 3c4101c3ec..1acc777d74 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From 1c1af3437465cbd4138077900fc3a465b8ee0972 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sun, 27 Jun 2021 05:57:32 +0500
Subject: [PATCH 427/912] Bump gradle to 4.2.1

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 2f618dec77..e49d003ac8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.3'
+        classpath 'com.android.tools.build:gradle:4.2.1'
     }
 }
 

From 2aafcf8435d288ef370ae2963a61caadcfac096a Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Mon, 28 Jun 2021 04:54:39 +0500
Subject: [PATCH 428/912] Add support to send back or store RUN_COMMAND intent
 command results in files and provide way to fix argument splitting sent with
 am command
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

### `RUN_COMMAND` Results in Files

Previously in `v0.109` with a2209dd support was added in RUN_COMMAND intent to send back foreground and background command results with `PendingIntent` to the intent sender. However, this was only usable with java code by android apps. But if you were sending the intent with the `am` command from inside a shell, like tasker `Run Shell` action, you could not get the result back directly. You could technically manually save the output of your script in files under `/sdcard` with redirection and wait for them to be created in the `Run Shell` so that you could process the result. However, this was only possible for background commands and the caller would hang indefinitely if a termux internal `errmsg` was generated like it does for termux-tasker, likely caused by incorrect intent extra arguments, an exception being raised when executing the executable/script, or termux being closed with the exit button, etc.

Now native support has been added inside termux to store results of both foreground and background commands inside files, that also sends back internal `errmsgs` as long as result files extras are valid. This can be used to run synchronous commands from inside termux, with other apps that have `Run commands in Termux environment` (`com.termux.permission.RUN_COMMAND`) like Tasker, from pc over `adb` or inside `adb shell` if you have a rooted device, or from pc if you have setup termux `sshd`. The `RUN_COMMAND` intent can only be sent by the `termux` user itself, by an app that has the permission or by the `root` user. The `shell` user of `adb` cannot send it. A script will be provided at a later time that will automatically detect these cases to easily run `RUN_COMMAND` intent commands which will also automatically create temp directories and do cleanup. This can also be useful inside termux itself, like if you want to start a new foreground session and to automatically store its output to a log file when you exit. Support can also be added for this to be done for termux-boot and termux-widget as well but will require updates for them.

There is obviously a security and privacy concern for this if you use shared storage `/sdcard` to store the result files since malicious apps could read them and optionally modify them for MITM attacks if you are reading the result and processing it unsafely. But users access other files from shared storage anyways for other scripts. Saving the result files on shared storage would only be necessary if you want to read the result back, like in Tasker or over adb since non-termux and non-root users can't access termux private app data directory `/data/data/com.termux`. For internal termux usage, this shouldn't be a concern if files are saved inside termux private app data directory.

The extra constant values are defined by [`TermuxConstants`](https://github.com/termux/termux-app/tree/master/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java) class of the [`termux-shared`](https://github.com/termux/termux-app/tree/master/termux-shared) library. The [`ResultSender`](https://github.com/termux/termux-app/tree/master/termux-shared/src/main/java/com/termux/shared/shell/ResultSender.java) class actually sends back the results.

The following extras have been added:

- The `String` `RUN_COMMAND_SERVICE.EXTRA_RESULT_DIRECTORY` extra for the directory path in which to write the result of the execution command for the execute command caller.

- The `boolean` `RUN_COMMAND_SERVICE.EXTRA_RESULT_SINGLE_FILE` extra for whether the result should be written to a single file or multiple files (`err`, `errmsg`, `stdout`, `stderr`, `exit_code`) in `EXTRA_RESULT_DIRECTORY`.

- The `String` `RUN_COMMAND_SERVICE.EXTRA_RESULT_FILE_BASENAME` extra for the basename of the result file that should be created in `EXTRA_RESULT_DIRECTORY` if `EXTRA_RESULT_SINGLE_FILE` is `true`.

- The `String` `RUN_COMMAND_SERVICE.EXTRA_RESULT_FILE_OUTPUT_FORMAT` extra for the output [`Formatter`](https://docs.oracle.com/javase/7/docs/api/java/util/Formatter.html) format of the `EXTRA_RESULT_FILE_BASENAME` result file.

- The `String` `RUN_COMMAND_SERVICE.EXTRA_RESULT_FILE_ERROR_FORMAT` extra for the error [`Formatter`](https://docs.oracle.com/javase/7/docs/api/java/util/Formatter.html) format of the `EXTRA_RESULT_FILE_BASENAME` result file.

- The `String` `RUN_COMMAND_SERVICE.EXTRA_RESULT_FILES_SUFFIX` extra for the optional suffix of the result files that should be created in `EXTRA_RESULT_DIRECTORY` if `EXTRA_RESULT_SINGLE_FILE` is `false`.

The `err` and `errmsg` are for internal termux errors like invalid intent extras, etc and not related to the shell commands itself. This is the same way Tasker actions and plugins system work with [`%err` and `%errmsg`](https://tasker.joaoapps.com/userguide/en/variables.html#localbuiltin). The `err` will be equal to `Errno.ERRNO_SUCCESS` (`-1`) if no internal errors are set. The `stdout`, `stderr` and `exit_code` are for the shell commands. The `exit_code` is normally `0` for success.

There are two modes for getting back the result in results files.

##### `EXTRA_RESULT_SINGLE_FILE` extra is `true`

Only a single file will be created under `EXTRA_RESULT_DIRECTORY` that will contain the `err`, `errmsg`, `stdout`, `stderr` and `exit_code` in a specific format defined by `RESULT_SENDER.FORMAT_*` constants in `TermuxConstants` class depending on the exit status of the command. By default if the `EXTRA_RESULT_FILE_BASENAME` extra is not passed, the basename of the result file will be set to `<command_path_basename>-<timestamp>.log` where `<timestamp>` will be in the `yyyy-MM-dd_HH.mm.ss.SSS` format. The `EXTRA_RESULT_FILE_OUTPUT_FORMAT` extra can be passed with a custom format that should be used when `err` equals `-1` and `EXTRA_RESULT_FILE_ERROR_FORMAT` extra for when its greater than `-1`. The value `0` is for `Errno.ERRNO_CANCELLED` and should also be considered a failure unlike `exit_code`.

```
am startservice --user 0 -n 'com.termux/com.termux.app.RunCommandService' -a 'com.termux.RUN_COMMAND' --es 'com.termux.RUN_COMMAND_PATH' '$PREFIX/bin/top' --esa 'com.termux.RUN_COMMAND_ARGUMENTS' '-n,5' --ez 'com.termux.RUN_COMMAND_BACKGROUND' '0' --es 'com.termux.RUN_COMMAND_RESULT_DIRECTORY' '/sdcard/.termux-app' --ez 'com.termux.RUN_COMMAND_RESULT_SINGLE_FILE' 'true' --es 'com.termux.RUN_COMMAND_RESULT_FILE_BASENAME' 'top.log'
```

##### `EXTRA_RESULT_SINGLE_FILE` extra is `false`

Separate files will be created under `EXTRA_RESULT_DIRECTORY` for each of the `err`, `errmsg`, `stdout`, `stderr` and `exit_code`. Their basenames (same as mentioned) are defined by the `RESULT_FILE_*` constants in `TermuxConstants` class. If the `EXTRA_RESULT_FILES_SUFFIX` extra is passed, then that will be suffixed to the basename of each file like `err<suffix>`, `stdout<suffix>`, etc.

The `err` file will be created after writing to other result files has already finished and this is the file the caller should optionally wait for  to be created to be notified that the command has finished, like with `test -f "$result_directory/err"` command in an infinite loop (with sleep+timeout) or with `inotify`. After it has been read, caller can start reading from the rest of the result files if they exist. The `errmsg`, `stdout`, `stderr` and `exit_code` files will not be created if nothing is to be written to them, so no do wait for these files.

If you are not passing a unique suffix for each intent, then result files of multiple simultaneous intent commands will conflict with each other. So ideally a temp directory should be created for each intent command and that should be passed as `EXTRA_RESULT_DIRECTORY`. You can use `mktemp` command to create a unique name and create the directory for you.

```
temp_directory="$(/system/bin/mktemp -d --tmpdir="/sdcard/.termux-app" "top.XXXXXX")" || return $?

am startservice --user 0 -n 'com.termux/com.termux.app.RunCommandService' -a 'com.termux.RUN_COMMAND' --es 'com.termux.RUN_COMMAND_PATH' '$PREFIX/bin/top' --esa 'com.termux.RUN_COMMAND_ARGUMENTS' '-n,5' --ez 'com.termux.RUN_COMMAND_BACKGROUND' '1' --es 'com.termux.RUN_COMMAND_RESULT_DIRECTORY' "$temp_directory" --ez 'com.termux.RUN_COMMAND_RESULT_SINGLE_FILE' 'false'
```

Use following if in termux and not in tasker/rooted shell.

```
temp_directory="$(PATH=/system/bin; LD_LIBRARY_PATH=/system/lib64:/system/lib; unset LD_PRELOAD; mktemp -d --tmpdir="/sdcard/.termux-app" "top.XXXXXX")" || return $?
```

Note that since there may be a delay between creation of `result_file`/`err` file and writing to it or flushing to disk, a temp file is created first suffixed with `-<timestamp>` which is then moved to the final destination, since caller may otherwise read from an empty file in some cases otherwise.

Commands will automatically be killed and result up till that point returned if user exits termux app like with the `Exit` button in the notification. The exit code will be `137` (`SIGKILL`).

--------------------

### `RUN_COMMAND` Arguments Splitting with `am` Command

If `am` command is used to send the `RUN_COMMAND` intent and you want to pass an argument with the `--esa com.termux.RUN_COMMAND_ARGUMENTS` string array extra that itself contains a normal comma `,` (`U+002C`, `&comma;`, `&#44;`, `comma`), it must be escaped with a backslash `\,` so that the  argument isn't split into multiple arguments. The only problem is that, the arguments received by the termux will contain `\,` instead of `,` since the reversal isn't done as described in the [am command source](https://android.googlesource.com/platform/frameworks/base/+/21bdaf1/cmds/am/src/com/android/commands/am/Am.java#572) while converting to a string array. There is also no way for the `am` command or termux to know whether `\,` was done to prevent arguments splitting or `\,` was a literal string naturally part of the argument.

```
// Split on commas unless they are preceeded by an escape.
// The escape character must be escaped for the string and
// again for the regex, thus four escape characters become one.
intent.putExtra(key, strings);
```

To fix this termux now supports an alternative method to handle such conditions. If an argument contains a normal comma `,`, then instead of escaping them with a backslash `\,`, replace all normal commas with the comma alternate character `‚` (`#U+201A`, `&sbquo;`, `&#8218;`, `single low-9 quotation mark`) before sending the intent with the `am` command. This way argument splitting will not be done. You can pass the `com.termux.RUN_COMMAND_REPLACE_COMMA_ALTERNATIVE_CHARS_IN_ARGUMENTS` `boolean` extra in the `RUN_COMMAND` intent so that termux replaces all the comma alternate characters back to normal commas. It would be unlikely for the the arguments to naturally contain the comma alternate characters for this to be a problem. Even if they do, they might not be significant for any logic. If they are, then you can set a different character that should be replaced, by passing it in the `com.termux.RUN_COMMAND_COMMA_ALTERNATIVE_CHARS_IN_ARGUMENTS` `String` extra.

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

The following extras have been added:

- The `boolean` `RUN_COMMAND_SERVICE.EXTRA_REPLACE_COMMA_ALTERNATIVE_CHARS_IN_ARGUMENTS` extra for whether to replace comma alternative characters in arguments with normal comma `,` (`U+002C`, `&comma;`, `&#44;`, `comma`).
- The `String` `RUN_COMMAND_SERVICE.EXTRA_COMMA_ALTERNATIVE_CHARS_IN_ARGUMENTS` extra for the comma alternative characters in arguments that should be replaced instead of the default comma alternate character `‚` (`#U+201A`, `&sbquo;`, `&#8218;`, `single low-9 quotation mark`).

```
am startservice --user 0 -n 'com.termux/com.termux.app.RunCommandService' -a 'com.termux.RUN_COMMAND' --es 'com.termux.RUN_COMMAND_PATH' '$PREFIX/bin/bash' --esa 'com.termux.RUN_COMMAND_ARGUMENTS' '-c,echo "Argument with commas here _ and here _ that have been converted to an underscore before sending"; sleep 5' --ez 'com.termux.RUN_COMMAND_BACKGROUND' '0' --ez 'com.termux.RUN_COMMAND_REPLACE_COMMA_ALTERNATIVE_CHARS_IN_ARGUMENTS' 'true' --es 'com.termux.RUN_COMMAND_COMMA_ALTERNATIVE_CHARS_IN_ARGUMENTS' '_'
```

Note that since `0.109`, the `RUN_COMMAND` intent supports `RUN_COMMAND_SERVICE.EXTRA_STDIN`, so instead of passing arguments, just pass a script as `stdin` to the `bash` executable so that you don't have to deal with this "mess". You will have to surround the script with single quotes and escape any single quotes inside the script itself, like each single quote `'` with `'\''`.

--------------------

### Internal Changes

This commit also adds onto 679e0de0 and 4494bc66

The `ExecutionCommand` has been updated and command result variables have been moved to `ResultData` and result configuration to `ResultConfig` since the later two should be agnostic of what type of command there are for. They don't necessarily have to be for terminal/shell commands and can be used for plugin APIs, etc.

The `ResultData` instead of a `String` `errmsg` now stores a list of `Error` objects. This is necessary since multiple errors may be picked up while a command is run, like say working directory is invalid and an error is returned by FileUtils and while sending the result to the caller, the `ResultSender` returns an additional error because result configuration like result directory or result output format was invalid. In these situations `PluginUtils` will show a notification to the user with info of each error thrown.

In addition to above, in `ResultData`, the `stdout` and `stderr` are converted to `StringBuilder` instead of a `String`. This allows for data to be appended to each from various places in code like log debug or error entries for API commands without having to create a new `String` object each time value needs to updated. This can be useful so that the caller doesn't have to check `logcat` for API commands. This does not apply to `ExecutionCommand` since only `TermuxSession` and `TermuxTask` set the data.

The `ResultSender` class is what handles the result of commands whether they need to be sent via `PendingIntent` or to a result directory based on the `ResultConfig` object passed. Result will be sent through both if both of them are not `null`.

The `TermuxConstants` class has been updated to `v0.24.0`. Check its Changelog section for info on changes.
---
 .../com/termux/app/RunCommandService.java     | 100 +++--
 .../java/com/termux/app/TermuxService.java    |  40 +-
 .../com/termux/app/utils/PluginUtils.java     | 257 ++++++-------
 .../com/termux/shared/data/DataUtils.java     |  25 +-
 .../com/termux/shared/data/IntentUtils.java   | 143 +++++++
 .../shared/models/ExecutionCommand.java       | 361 ++++++++----------
 .../termux/shared/models/ResultConfig.java    | 170 +++++++++
 .../com/termux/shared/models/ResultData.java  | 256 +++++++++++++
 .../termux/shared/models/errors/Errno.java    |   2 +-
 .../models/errors/ResultSenderErrno.java      |  20 +
 .../com/termux/shared/shell/ResultSender.java | 335 ++++++++++++++++
 .../termux/shared/shell/TermuxSession.java    |  36 +-
 .../com/termux/shared/shell/TermuxTask.java   |  42 +-
 .../termux/shared/termux/TermuxConstants.java | 160 +++++++-
 .../com/termux/shared/termux/TermuxUtils.java |  13 +-
 15 files changed, 1500 insertions(+), 460 deletions(-)
 create mode 100644 termux-shared/src/main/java/com/termux/shared/data/IntentUtils.java
 create mode 100644 termux-shared/src/main/java/com/termux/shared/models/ResultConfig.java
 create mode 100644 termux-shared/src/main/java/com/termux/shared/models/ResultData.java
 create mode 100644 termux-shared/src/main/java/com/termux/shared/models/errors/ResultSenderErrno.java
 create mode 100644 termux-shared/src/main/java/com/termux/shared/shell/ResultSender.java

diff --git a/app/src/main/java/com/termux/app/RunCommandService.java b/app/src/main/java/com/termux/app/RunCommandService.java
index d81b3ec53e..9817d78500 100644
--- a/app/src/main/java/com/termux/app/RunCommandService.java
+++ b/app/src/main/java/com/termux/app/RunCommandService.java
@@ -10,6 +10,11 @@
 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.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;
@@ -17,7 +22,6 @@
 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;
 
 /**
@@ -60,29 +64,57 @@ public int onStartCommand(Intent intent, int flags, int startId) {
         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(ExecutionCommand.RESULT_CODE_FAILED, errmsg, null);
+            executionCommand.setStateFailed(Errno.ERRNO_FAILED.getCode(), errmsg);
             PluginUtils.processPluginExecutionCommandError(this, LOG_TAG, executionCommand, false);
             return Service.START_NOT_STICKY;
         }
 
-        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.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.inBackground = intent.getBooleanExtra(RUN_COMMAND_SERVICE.EXTRA_BACKGROUND, false);
         executionCommand.sessionAction = intent.getStringExtra(RUN_COMMAND_SERVICE.EXTRA_SESSION_ACTION);
-        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.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.isPluginExecutionCommand = true;
-        executionCommand.pluginPendingIntent = intent.getParcelableExtra(RUN_COMMAND_SERVICE.EXTRA_PENDING_INTENT);
-
-
+        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);
+        }
 
         // 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
@@ -91,7 +123,7 @@ public int onStartCommand(Intent intent, int flags, int startId) {
         // also sent, then its creator is also logged and shown.
         errmsg = PluginUtils.checkIfRunCommandServiceAllowExternalAppsPolicyIsViolated(this);
         if (errmsg != null) {
-            executionCommand.setStateFailed(ExecutionCommand.RESULT_CODE_FAILED, errmsg, null);
+            executionCommand.setStateFailed(Errno.ERRNO_FAILED.getCode(), errmsg);
             PluginUtils.processPluginExecutionCommandError(this, LOG_TAG, executionCommand, true);
             return Service.START_NOT_STICKY;
         }
@@ -101,22 +133,22 @@ public int onStartCommand(Intent intent, int flags, int startId) {
         // 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(ExecutionCommand.RESULT_CODE_FAILED, errmsg, null);
+            executionCommand.setStateFailed(Errno.ERRNO_FAILED.getCode(), errmsg);
             PluginUtils.processPluginExecutionCommandError(this, LOG_TAG, executionCommand, false);
             return Service.START_NOT_STICKY;
         }
 
         // Get canonical path of executable
-        executionCommand.executable = FileUtils.getCanonicalPath(executionCommand.executable, null, true);
+        executionCommand.executable = TermuxFileUtils.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
-        errmsg = FileUtils.validateRegularFileExistenceAndPermissions(this, "executable", executionCommand.executable, null,
-            PluginUtils.PLUGIN_EXECUTABLE_FILE_PERMISSIONS, true, true,
+        error = FileUtils.validateRegularFileExistenceAndPermissions("executable", executionCommand.executable, null,
+            FileUtils.APP_EXECUTABLE_FILE_PERMISSIONS, true, true,
             false);
-        if (errmsg != null) {
-            errmsg  += "\n" + this.getString(R.string.msg_executable_absolute_path, executionCommand.executable);
-            executionCommand.setStateFailed(ExecutionCommand.RESULT_CODE_FAILED, errmsg, null);
+        if (error != null) {
+            error.appendMessage("\n" + this.getString(R.string.msg_executable_absolute_path, executionCommand.executable));
+            executionCommand.setStateFailed(error);
             PluginUtils.processPluginExecutionCommandError(this, LOG_TAG, executionCommand, false);
             return Service.START_NOT_STICKY;
         }
@@ -126,19 +158,19 @@ public int onStartCommand(Intent intent, int flags, int startId) {
         // If workingDirectory is not null or empty
         if (executionCommand.workingDirectory != null && !executionCommand.workingDirectory.isEmpty()) {
             // Get canonical path of workingDirectory
-            executionCommand.workingDirectory = FileUtils.getCanonicalPath(executionCommand.workingDirectory, null, true);
+            executionCommand.workingDirectory = TermuxFileUtils.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 {@link TermuxConstants#TERMUX_FILES_DIR_PATH}
+            // under allowed termux working directory paths.
             // We try to set execute permissions, but ignore if they are missing, since only read and write permissions are required
             // for working directories.
-            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);
+            error = TermuxFileUtils.validateDirectoryFileExistenceAndPermissions("working", executionCommand.workingDirectory,
+                true, true, true,
+                false, true);
+            if (error != null) {
+                error.appendMessage("\n" + this.getString(R.string.msg_working_directory_absolute_path, executionCommand.workingDirectory));
+                executionCommand.setStateFailed(error);
                 PluginUtils.processPluginExecutionCommandError(this, LOG_TAG, executionCommand, false);
                 return Service.START_NOT_STICKY;
             }
@@ -146,7 +178,7 @@ public int onStartCommand(Intent intent, int flags, int startId) {
 
 
 
-        executionCommand.executableUri = new Uri.Builder().scheme(TERMUX_SERVICE.URI_SCHEME_SERVICE_EXECUTE).path(FileUtils.getExpandedTermuxPath(executionCommand.executable)).build();
+        executionCommand.executableUri = new Uri.Builder().scheme(TERMUX_SERVICE.URI_SCHEME_SERVICE_EXECUTE).path(TermuxFileUtils.getExpandedTermuxPath(executionCommand.executable)).build();
 
         Logger.logVerbose(LOG_TAG, executionCommand.toString());
 
@@ -162,7 +194,15 @@ public int onStartCommand(Intent intent, int flags, int startId) {
         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.pluginPendingIntent);
+        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);
+        }
 
         // Start TERMUX_SERVICE and pass it execution intent
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
diff --git a/app/src/main/java/com/termux/app/TermuxService.java b/app/src/main/java/com/termux/app/TermuxService.java
index 66d56eda4d..6404bf46f3 100644
--- a/app/src/main/java/com/termux/app/TermuxService.java
+++ b/app/src/main/java/com/termux/app/TermuxService.java
@@ -23,6 +23,8 @@
 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.termux.TermuxConstants;
 import com.termux.shared.termux.TermuxConstants.TERMUX_APP.TERMUX_ACTIVITY;
 import com.termux.shared.termux.TermuxConstants.TERMUX_APP.TERMUX_SERVICE;
@@ -160,7 +162,7 @@ public int onStartCommand(Intent intent, int flags, int startId) {
     public void onDestroy() {
         Logger.logVerbose(LOG_TAG, "onDestroy");
 
-        ShellUtils.clearTermuxTMPDIR(this, true);
+        ShellUtils.clearTermuxTMPDIR(true);
 
         actionReleaseWakeLock(false);
         if (!mWantsToStop)
@@ -254,22 +256,22 @@ private synchronized void killAllTermuxExecutionCommands() {
         List<TermuxSession> termuxSessions = new ArrayList<>(mTermuxSessions);
         for (int i = 0; i < termuxSessions.size(); i++) {
             ExecutionCommand executionCommand = termuxSessions.get(i).getExecutionCommand();
-            processResult = mWantsToStop || (executionCommand.isPluginExecutionCommand && executionCommand.pluginPendingIntent != null);
+            processResult = mWantsToStop || executionCommand.isPluginExecutionCommandWithPendingResult();
             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.isPluginExecutionCommand && executionCommand.pluginPendingIntent != null)
+            if (executionCommand.isPluginExecutionCommandWithPendingResult())
                 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.pluginPendingIntent != null) {
-                if (executionCommand.setStateFailed(ExecutionCommand.RESULT_CODE_CANCELED, this.getString(com.termux.shared.R.string.error_execution_cancelled), null)) {
+            if (!executionCommand.shouldNotProcessResults() && executionCommand.isPluginExecutionCommandWithPendingResult()) {
+                if (executionCommand.setStateFailed(Errno.ERRNO_CANCELLED.getCode(), this.getString(com.termux.shared.R.string.error_execution_cancelled))) {
                     PluginUtils.processPluginExecutionCommandResult(this, LOG_TAG, executionCommand);
                 }
             }
@@ -357,20 +359,28 @@ private void actionServiceExecute(Intent intent) {
 
         if (executionCommand.executableUri != null) {
             executionCommand.executable = executionCommand.executableUri.getPath();
-            executionCommand.arguments = intent.getStringArrayExtra(TERMUX_SERVICE.EXTRA_ARGUMENTS);
+            executionCommand.arguments = IntentUtils.getStringArrayExtraIfSet(intent, TERMUX_SERVICE.EXTRA_ARGUMENTS, null);
             if (executionCommand.inBackground)
-                executionCommand.stdin = intent.getStringExtra(TERMUX_SERVICE.EXTRA_STDIN);
+                executionCommand.stdin = IntentUtils.getStringExtraIfSet(intent, TERMUX_SERVICE.EXTRA_STDIN, null);
         }
 
-        executionCommand.workingDirectory = intent.getStringExtra(TERMUX_SERVICE.EXTRA_WORKDIR);
+        executionCommand.workingDirectory = IntentUtils.getStringExtraIfSet(intent, TERMUX_SERVICE.EXTRA_WORKDIR, null);
         executionCommand.isFailsafe = intent.getBooleanExtra(TERMUX_ACTIVITY.ACTION_FAILSAFE_SESSION, false);
         executionCommand.sessionAction = intent.getStringExtra(TERMUX_SERVICE.EXTRA_SESSION_ACTION);
-        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.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.isPluginExecutionCommand = true;
-        executionCommand.pluginPendingIntent = intent.getParcelableExtra(TERMUX_SERVICE.EXTRA_PENDING_INTENT);
+        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);
+        }
 
         // Add the execution command to pending plugin execution commands list
         mPendingPluginExecutionCommands.add(executionCommand);
@@ -423,7 +433,7 @@ public synchronized TermuxTask createTermuxTask(ExecutionCommand executionComman
             if (executionCommand.isPluginExecutionCommand)
                 PluginUtils.processPluginExecutionCommandError(this, LOG_TAG, executionCommand, false);
             else
-                Logger.logStackTracesWithMessage(LOG_TAG, "(" + executionCommand.errCode + ") " + executionCommand.errmsg, executionCommand.throwableList);
+                Logger.logErrorExtended(LOG_TAG, executionCommand.toString());
             return null;
         }
 
@@ -519,7 +529,7 @@ public synchronized TermuxSession createTermuxSession(ExecutionCommand execution
             if (executionCommand.isPluginExecutionCommand)
                 PluginUtils.processPluginExecutionCommandError(this, LOG_TAG, executionCommand, false);
             else
-                Logger.logStackTracesWithMessage(LOG_TAG, "(" + executionCommand.errCode + ") " + executionCommand.errmsg, executionCommand.throwableList);
+                Logger.logErrorExtended(LOG_TAG, executionCommand.toString());
             return null;
         }
 
diff --git a/app/src/main/java/com/termux/app/utils/PluginUtils.java b/app/src/main/java/com/termux/app/utils/PluginUtils.java
index 2ea2a0f2dd..6515fd000a 100644
--- a/app/src/main/java/com/termux/app/utils/PluginUtils.java
+++ b/app/src/main/java/com/termux/app/utils/PluginUtils.java
@@ -1,18 +1,23 @@
 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.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.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.shell.ResultSender;
+import com.termux.shared.shell.ShellUtils;
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.termux.TermuxConstants.TERMUX_APP.TERMUX_SERVICE;
 import com.termux.shared.logger.Logger;
@@ -29,12 +34,6 @@
 
 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";
 
     /**
@@ -43,8 +42,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 ExecutionCommand#pluginPendingIntent} is not {@code null}, then the result of commands
-     * are sent back to the {@link PendingIntent} creator.
+     * {@link ResultConfig#resultPendingIntent} or {@link ResultConfig#resultDirectoryPath}
+     * is not {@code null}, then the result of commands are sent back to the command caller.
      *
      * @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.
@@ -54,31 +53,42 @@ public static void processPluginExecutionCommandResult(final Context context, St
         if (executionCommand == null) return;
 
         logTag = DataUtils.getDefaultIfNull(logTag, LOG_TAG);
+        Error error = null;
+        ResultData resultData = executionCommand.resultData;
 
         if (!executionCommand.hasExecuted()) {
-            Logger.logWarn(logTag, "Ignoring call to processPluginExecutionCommandResult() since the execution command state is not higher than the ExecutionState.EXECUTED");
+            Logger.logWarn(logTag, executionCommand.getCommandIdAndLabelLogString() + ": Ignoring call to processPluginExecutionCommandResult() since the execution command state is not higher than the ExecutionState.EXECUTED");
             return;
         }
 
-        Logger.logDebug(LOG_TAG, executionCommand.toString());
-
-        boolean result = true;
-
-        // 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;
-
-            //Combine errmsg and stacktraces
-            if (executionCommand.isStateFailed()) {
-                errmsg = Logger.getMessageAndStackTracesString(executionCommand.errmsg, executionCommand.throwableList);
+        boolean isPluginExecutionCommandWithPendingResult = executionCommand.isPluginExecutionCommandWithPendingResult();
+
+        // Log the output. ResultData should not be logged if pending result since ResultSender will do it
+        Logger.logDebugExtended(logTag, ExecutionCommand.getExecutionOutputLogString(executionCommand, true, !isPluginExecutionCommandWithPendingResult));
+
+        // 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);
+
+            // Send result to caller
+            error = ResultSender.sendCommandResultData(context, logTag, executionCommand.getCommandIdAndLabelLogString(), executionCommand.resultConfig, executionCommand.resultData);
+            if (error != null) {
+                // error will be added to existing Errors
+                resultData.setStateFailed(error);
+                Logger.logDebugExtended(logTag, ExecutionCommand.getExecutionOutputLogString(executionCommand, true, true));
+
+                // Flash and send notification for the error
+                Logger.showToast(context, ResultData.getErrorsListMinimalString(resultData), true);
+                sendPluginCommandErrorNotification(context, logTag, executionCommand, ResultData.getErrorsListMinimalString(resultData));
             }
 
-            // 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() && result)
+        if (!executionCommand.isStateFailed() && error == null)
             executionCommand.setState(ExecutionCommand.ExecutionState.SUCCESS);
     }
 
@@ -86,14 +96,13 @@ public static void processPluginExecutionCommandResult(final Context context, St
      * Process {@link ExecutionCommand} error.
      *
      * The ExecutionCommand currentState must be equal to {@link ExecutionCommand.ExecutionState#FAILED}.
-     * 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.
+     * 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.
      *
      * If the {@link ExecutionCommand#isPluginExecutionCommand} is {@code true} and
-     * {@link ExecutionCommand#pluginPendingIntent} is not {@code null}, then the errors of commands
-     * are sent back to the {@link PendingIntent} creator.
+     * {@link ResultConfig#resultPendingIntent} or {@link ResultConfig#resultDirectoryPath}
+     * is not {@code null}, then the errors of commands are sent back to the command caller.
      *
      * 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
@@ -112,44 +121,93 @@ public static void processPluginExecutionCommandError(final Context context, Str
         if (context == null || executionCommand == null) return;
 
         logTag = DataUtils.getDefaultIfNull(logTag, LOG_TAG);
+        Error error;
+        ResultData resultData = executionCommand.resultData;
 
         if (!executionCommand.isStateFailed()) {
-            Logger.logWarn(logTag, "Ignoring call to processPluginExecutionCommandError() since the execution command is not in ExecutionState.FAILED");
+            Logger.logWarn(logTag, executionCommand.getCommandIdAndLabelLogString() + ": Ignoring call to processPluginExecutionCommandError() since the execution command is not in ExecutionState.FAILED");
             return;
         }
 
-        // Log the error and any exception
-        Logger.logStackTracesWithMessage(logTag, "(" + executionCommand.errCode + ") " + executionCommand.errmsg, executionCommand.throwableList);
-
-
-        // 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;
-
-            //Combine errmsg and stacktraces
-            if (executionCommand.isStateFailed()) {
-                errmsg = Logger.getMessageAndStackTracesString(executionCommand.errmsg, executionCommand.throwableList);
+        boolean isPluginExecutionCommandWithPendingResult = executionCommand.isPluginExecutionCommandWithPendingResult();
+
+        // 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));
+
+        // 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);
+
+            // Send result to caller
+            error = ResultSender.sendCommandResultData(context, logTag, executionCommand.getCommandIdAndLabelLogString(), executionCommand.resultConfig, executionCommand.resultData);
+            if (error != null) {
+                // error will be added to existing Errors
+                resultData.setStateFailed(error);
+                Logger.logErrorExtended(logTag, ExecutionCommand.getExecutionOutputLogString(executionCommand, true, true));
+                forceNotification = true;
             }
 
-            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, then just return
+        // If user has disabled notifications for plugin commands, then just return
         if (!preferences.arePluginErrorNotificationsEnabled() && !forceNotification)
             return;
 
-        // Flash the errmsg
-        Logger.showToast(context, executionCommand.errmsg, true);
+        // Flash and send notification for the error
+        Logger.showToast(context, ResultData.getErrorsListMinimalString(resultData), true);
+        sendPluginCommandErrorNotification(context, logTag, executionCommand, ResultData.getErrorsListMinimalString(resultData));
+
+    }
+
+    /** Set variables which will be used by {@link ResultSender#sendCommandResultData(Context, String, String, ResultConfig, ResultData)}
+     * 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)}
+     * to send back the result by writing it to files in {@link ResultConfig#resultDirectoryPath}. */
+    public static void setPluginResultDirectoryVariables(ExecutionCommand executionCommand) {
+        ResultConfig resultConfig = executionCommand.resultConfig;
 
-        // Send a notification to show the errmsg which when clicked will open the {@link ReportActivity}
+        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) + "-" + TermuxUtils.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
         // to show the details of the error
         String title = TermuxConstants.TERMUX_APP_NAME + " Plugin Execution Command Error";
 
@@ -166,105 +224,20 @@ public static void processPluginExecutionCommandError(final Context context, Str
         setupPluginCommandErrorsNotificationChannel(context);
 
         // Use markdown in notification
-        CharSequence notificationText = MarkdownUtils.getSpannedMarkdownText(context, executionCommand.errmsg);
-        //CharSequence notificationText = executionCommand.errmsg;
+        CharSequence notificationTextCharSequence = MarkdownUtils.getSpannedMarkdownText(context, notificationTextString);
+        //CharSequence notificationTextCharSequence = notificationTextString;
 
         // Build the notification
-        Notification.Builder builder = getPluginCommandErrorsNotificationBuilder(context, title, notificationText, notificationText, pendingIntent, NotificationUtils.NOTIFICATION_MODE_VIBRATE);
-        if (builder == null)  return;
+        Notification.Builder builder = getPluginCommandErrorsNotificationBuilder(context, title, notificationTextCharSequence, notificationTextCharSequence, 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}.
@@ -318,7 +291,7 @@ public static void setupPluginCommandErrorsNotificationChannel(final Context con
      * 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 errmsg} if policy is violated, otherwise {@code null}.
+     * @return Returns the {@code error} if policy is violated, otherwise {@code null}.
      */
     public static String checkIfRunCommandServiceAllowExternalAppsPolicyIsViolated(final Context context) {
         String errmsg = null;
diff --git a/termux-shared/src/main/java/com/termux/shared/data/DataUtils.java b/termux-shared/src/main/java/com/termux/shared/data/DataUtils.java
index 9a6af5a086..368755c53a 100644
--- a/termux-shared/src/main/java/com/termux/shared/data/DataUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/data/DataUtils.java
@@ -2,6 +2,8 @@
 
 import android.os.Bundle;
 
+import androidx.annotation.Nullable;
+
 import java.util.LinkedHashSet;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -23,7 +25,7 @@ public static String getTruncatedCommandOutput(String text, int maxLength, boole
         if (maxLength < 0 || text.length() < maxLength) return text;
 
         if (fromEnd) {
-            text = text.substring(0, Math.min(text.length(), maxLength));
+            text = text.substring(0, maxLength);
         } else {
             int cutOffIndex = text.length() - maxLength;
 
@@ -42,6 +44,21 @@ public static String getTruncatedCommandOutput(String text, int maxLength, boole
         return text;
     }
 
+    /**
+     * Replace a sub string in each item of a {@link String[]}.
+     *
+     * @param array The {@link String[]} to replace in.
+     * @param find The sub string to replace.
+     * @param replace The sub string to replace with.
+     */
+    public static void replaceSubStringsInStringArrayItems(String[] array, String find, String replace) {
+        if(array == null || array.length == 0) return;
+
+        for (int i = 0; i < array.length; i++) {
+            array[i] = array[i].replace(find, replace);
+        }
+    }
+
     /**
      * Get the {@code float} from a {@link String}.
      *
@@ -139,10 +156,14 @@ public static float rangedOrDefault(float value, float def, float min, float max
      * @param def The default {@link Object}.
      * @return Returns {@code object} if it is not {@code null}, otherwise returns {@code def}.
      */
-    public static <T> T getDefaultIfNull(@androidx.annotation.Nullable T object, @androidx.annotation.Nullable T def) {
+    public static <T> T getDefaultIfNull(@Nullable T object, @Nullable T def) {
         return (object == null) ? def : object;
     }
 
+    /** Check if a string is null or empty. */
+    public static boolean isNullOrEmpty(String string) {
+        return string == null || string.isEmpty();
+    }
 
 
     public static LinkedHashSet<CharSequence> extractUrls(String text) {
diff --git a/termux-shared/src/main/java/com/termux/shared/data/IntentUtils.java b/termux-shared/src/main/java/com/termux/shared/data/IntentUtils.java
new file mode 100644
index 0000000000..885eb4232f
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/data/IntentUtils.java
@@ -0,0 +1,143 @@
+package com.termux.shared.data;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.Parcelable;
+
+import androidx.annotation.NonNull;
+
+import java.util.Arrays;
+
+public class IntentUtils {
+
+    private static final String LOG_TAG = "IntentUtils";
+
+
+    /**
+     * Get a {@link String} extra from an {@link Intent} if its not {@code null} or empty.
+     *
+     * @param intent The {@link Intent} to get the extra from.
+     * @param key The {@link String} key name.
+     * @param def The default value if extra is not set.
+     * @param throwExceptionIfNotSet If set to {@code true}, then an exception will be thrown if extra
+     *                               is not set.
+     * @return Returns the {@link String} extra if set, otherwise {@code null}.
+     */
+    public static String getStringExtraIfSet(@NonNull Intent intent, String key, String def, boolean throwExceptionIfNotSet) throws Exception {
+        String value = getStringExtraIfSet(intent, key, def);
+        if (value == null && throwExceptionIfNotSet)
+            throw new Exception("The \"" + key + "\" key string value is null or empty");
+        return value;
+    }
+
+    /**
+     * Get a {@link String} extra from an {@link Intent} if its not {@code null} or empty.
+     *
+     * @param intent The {@link Intent} to get the extra from.
+     * @param key The {@link String} key name.
+     * @param def The default value if extra is not set.
+     * @return Returns the {@link String} extra if set, otherwise {@code null}.
+     */
+    public static String getStringExtraIfSet(@NonNull Intent intent, String key, String def) {
+        String value = intent.getStringExtra(key);
+        if (value == null || value.isEmpty()) {
+            if (def != null && !def.isEmpty())
+                return def;
+            else
+                return null;
+        }
+        return value;
+    }
+
+
+
+    /**
+     * Get a {@link String[]} extra from an {@link Intent} if its not {@code null} or empty.
+     *
+     * @param intent The {@link Intent} to get the extra from.
+     * @param key The {@link String} key name.
+     * @param def The default value if extra is not set.
+     * @param throwExceptionIfNotSet If set to {@code true}, then an exception will be thrown if extra
+     *                               is not set.
+     * @return Returns the {@link String[]} extra if set, otherwise {@code null}.
+     */
+    public static String[] getStringArrayExtraIfSet(@NonNull Intent intent, String key, String[] def, boolean throwExceptionIfNotSet) throws Exception {
+        String[] value = getStringArrayExtraIfSet(intent, key, def);
+        if (value == null && throwExceptionIfNotSet)
+            throw new Exception("The \"" + key + "\" key string array is null or empty");
+        return value;
+    }
+
+    /**
+     * Get a {@link String[]} extra from an {@link Intent} if its not {@code null} or empty.
+     *
+     * @param intent The {@link Intent} to get the extra from.
+     * @param key The {@link String} key name.
+     * @param def The default value if extra is not set.
+     * @return Returns the {@link String[]} extra if set, otherwise {@code null}.
+     */
+    public static String[] getStringArrayExtraIfSet(Intent intent, String key, String[] def) {
+        String[] value = intent.getStringArrayExtra(key);
+        if (value == null || value.length == 0) {
+            if (def != null && def.length != 0)
+                return def;
+            else
+                return null;
+        }
+        return value;
+    }
+
+    public static String getIntentString(Intent intent) {
+        if (intent == null) return null;
+
+        return intent.toString() + "\n" + getBundleString(intent.getExtras());
+    }
+
+    public static String getBundleString(Bundle bundle) {
+        if (bundle == null || bundle.size() == 0) return "Bundle[]";
+
+        StringBuilder bundleString = new StringBuilder("Bundle[\n");
+        boolean first = true;
+        for (String key : bundle.keySet()) {
+            if (!first)
+                bundleString.append("\n");
+
+            bundleString.append(key).append(": `");
+
+            Object value = bundle.get(key);
+            if (value instanceof int[]) {
+                bundleString.append(Arrays.toString((int[]) value));
+            } else if (value instanceof byte[]) {
+                bundleString.append(Arrays.toString((byte[]) value));
+            } else if (value instanceof boolean[]) {
+                bundleString.append(Arrays.toString((boolean[]) value));
+            } else if (value instanceof short[]) {
+                bundleString.append(Arrays.toString((short[]) value));
+            } else if (value instanceof long[]) {
+                bundleString.append(Arrays.toString((long[]) value));
+            } else if (value instanceof float[]) {
+                bundleString.append(Arrays.toString((float[]) value));
+            } else if (value instanceof double[]) {
+                bundleString.append(Arrays.toString((double[]) value));
+            } else if (value instanceof String[]) {
+                bundleString.append(Arrays.toString((String[]) value));
+            } else if (value instanceof CharSequence[]) {
+                bundleString.append(Arrays.toString((CharSequence[]) value));
+            } else if (value instanceof Parcelable[]) {
+                bundleString.append(Arrays.toString((Parcelable[]) value));
+            } else if (value instanceof Bundle) {
+                bundleString.append(getBundleString((Bundle) value));
+            } else {
+                bundleString.append(value);
+            }
+
+            bundleString.append("`");
+
+            first = false;
+        }
+
+        bundleString.append("\n]");
+        return bundleString.toString();
+    }
+
+}
diff --git a/termux-shared/src/main/java/com/termux/shared/models/ExecutionCommand.java b/termux-shared/src/main/java/com/termux/shared/models/ExecutionCommand.java
index 7fb8f96397..77f7716078 100644
--- a/termux-shared/src/main/java/com/termux/shared/models/ExecutionCommand.java
+++ b/termux-shared/src/main/java/com/termux/shared/models/ExecutionCommand.java
@@ -1,18 +1,17 @@
 package com.termux.shared.models;
 
-import android.app.Activity;
-import android.app.PendingIntent;
 import android.content.Intent;
 import android.net.Uri;
 
 import androidx.annotation.NonNull;
 
-import com.termux.shared.termux.TermuxConstants.TERMUX_APP.TERMUX_SERVICE;
+import com.termux.shared.data.IntentUtils;
+import com.termux.shared.models.errors.Error;
 import com.termux.shared.logger.Logger;
 import com.termux.shared.markdown.MarkdownUtils;
 import com.termux.shared.data.DataUtils;
 
-import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 public class ExecutionCommand {
@@ -52,12 +51,6 @@ public int getValue() {
 
     }
 
-    // Define errCode values
-    // TODO: Define custom values for different cases
-    public final static int	RESULT_CODE_OK = Activity.RESULT_OK;
-    public final static int	RESULT_CODE_OK_MINOR_FAILURES = Activity.RESULT_FIRST_USER;
-    public final static int	RESULT_CODE_FAILED = Activity.RESULT_FIRST_USER + 1;
-    public final static int	RESULT_CODE_CANCELED = Activity.RESULT_FIRST_USER + 2;
 
     /** The optional unique id for the {@link ExecutionCommand}. */
     public Integer id;
@@ -110,33 +103,26 @@ public int getValue() {
     public String pluginAPIHelp;
 
 
+    /** Defines the {@link Intent} received which started the command. */
+    public Intent commandIntent;
+
     /** Defines if {@link ExecutionCommand} was started because of an external plugin request
-     * like {@link TERMUX_SERVICE#ACTION_SERVICE_EXECUTE} intent or from within Termux app itself. */
+     * like with an intent or from within Termux app itself. */
     public boolean isPluginExecutionCommand;
-    /** Defines the {@link Intent} received from the external plugin which started the {@link ExecutionCommand}. */
-    public Intent pluginIntent;
-    /** Defines {@link PendingIntent} that should be sent if an external plugin requested the execution. */
-    public PendingIntent pluginPendingIntent;
-
 
-    /** The stdout of shell command. */
-    public String stdout;
-    /** The stderr of shell command. */
-    public String stderr;
-    /** The exit code of shell command. */
-    public Integer exitCode;
+    /** Defines the {@link ResultConfig} for the {@link ExecutionCommand} containing information
+     * on how to handle the result. */
+    public final ResultConfig resultConfig = new ResultConfig();
 
+    /** Defines the {@link ResultData} for the {@link ExecutionCommand} containing information
+     * of the result. */
+    public final ResultData resultData = new ResultData();
 
-    /** The internal error code of {@link ExecutionCommand}. */
-    public Integer errCode = RESULT_CODE_OK;
-    /** The internal error message of {@link ExecutionCommand}. */
-    public String errmsg;
-    /** The internal exceptions of {@link ExecutionCommand}. */
-    public List<Throwable> throwableList  = new ArrayList<>();
 
     /** Defines if processing results already called for this {@link ExecutionCommand}. */
     public boolean processingResultsAlreadyCalled;
 
+    private static final String LOG_TAG = "ExecutionCommand";
 
 
     public ExecutionCommand() {
@@ -156,13 +142,101 @@ public ExecutionCommand(Integer id, String executable, String[] arguments, Strin
         this.isFailsafe = isFailsafe;
     }
 
+
+    public boolean isPluginExecutionCommandWithPendingResult() {
+        return isPluginExecutionCommand && resultConfig.isCommandWithPendingResult();
+    }
+
+
+    public synchronized boolean setState(ExecutionState newState) {
+        // The state transition cannot go back or change if already at {@link ExecutionState#SUCCESS}
+        if (newState.getValue() < currentState.getValue() || currentState == ExecutionState.SUCCESS) {
+            Logger.logError(LOG_TAG, "Invalid "+ getCommandIdAndLabelLogString() + " state transition from \"" + currentState.getName() + "\" to " +  "\"" + newState.getName() + "\"");
+            return false;
+        }
+
+        // The {@link ExecutionState#FAILED} can be set again, like to add more errors, but we don't update
+        // {@link #previousState} with the {@link #currentState} value if its at {@link ExecutionState#FAILED} to
+        // preserve the last valid state
+        if (currentState != ExecutionState.FAILED)
+            previousState = currentState;
+
+        currentState = newState;
+        return  true;
+    }
+
+    public synchronized boolean hasExecuted() {
+        return currentState.getValue() >= ExecutionState.EXECUTED.getValue();
+    }
+
+    public synchronized boolean isExecuting() {
+        return currentState == ExecutionState.EXECUTING;
+    }
+
+    public synchronized boolean isSuccessful() {
+        return currentState == ExecutionState.SUCCESS;
+    }
+
+
+    public synchronized boolean setStateFailed(@NonNull Error error) {
+        return setStateFailed(error.getType(), error.getCode(), error.getMessage(), null);
+    }
+
+    public synchronized boolean setStateFailed(@NonNull Error error, Throwable throwable) {
+        return setStateFailed(error.getType(), error.getCode(), error.getMessage(), Collections.singletonList(throwable));
+    }
+    public synchronized boolean setStateFailed(@NonNull Error error, List<Throwable> throwablesList) {
+        return setStateFailed(error.getType(), error.getCode(), error.getMessage(), throwablesList);
+    }
+
+    public synchronized boolean setStateFailed(int code, String message) {
+        return setStateFailed(null, code, message, null);
+    }
+
+    public synchronized boolean setStateFailed(int code, String message, Throwable throwable) {
+        return setStateFailed(null, code, message, Collections.singletonList(throwable));
+    }
+
+    public synchronized boolean setStateFailed(int code, String message, List<Throwable> throwablesList) {
+        return setStateFailed(null, code, message, throwablesList);
+    }
+    public synchronized boolean setStateFailed(String type, int code, String message, List<Throwable> throwablesList) {
+        if (!this.resultData.setStateFailed(type, code, message, throwablesList)) {
+            Logger.logWarn(LOG_TAG, "setStateFailed for "  + getCommandIdAndLabelLogString() + " resultData encountered an error.");
+        }
+
+        return setState(ExecutionState.FAILED);
+    }
+
+    public synchronized boolean shouldNotProcessResults() {
+        if (processingResultsAlreadyCalled) {
+            return true;
+        } else {
+            processingResultsAlreadyCalled = true;
+            return false;
+        }
+    }
+
+    public synchronized boolean isStateFailed() {
+        if (currentState != ExecutionState.FAILED)
+            return false;
+
+        if (!resultData.isStateFailed()) {
+            Logger.logWarn(LOG_TAG, "The "  + getCommandIdAndLabelLogString() + " has an invalid errCode value set in errors list while having ExecutionState.FAILED state.\n" + resultData.errorsList);
+            return false;
+        } else {
+            return true;
+        }
+    }
+
+
     @NonNull
     @Override
     public String toString() {
         if (!hasExecuted())
             return getExecutionInputLogString(this, true);
         else {
-            return getExecutionOutputLogString(this, true);
+            return getExecutionOutputLogString(this, true, true);
         }
     }
 
@@ -190,15 +264,15 @@ public static String getExecutionInputLogString(final ExecutionCommand execution
         logString.append("\n").append(executionCommand.getInBackgroundLogString());
         logString.append("\n").append(executionCommand.getIsFailsafeLogString());
 
-
         if (!ignoreNull || executionCommand.sessionAction != null)
             logString.append("\n").append(executionCommand.getSessionActionLogString());
 
+        if (!ignoreNull || executionCommand.commandIntent != null)
+            logString.append("\n").append(executionCommand.getCommandIntentLogString());
+
         logString.append("\n").append(executionCommand.getIsPluginExecutionCommandLogString());
-        if (!ignoreNull || executionCommand.isPluginExecutionCommand) {
-            if (!ignoreNull || executionCommand.pluginPendingIntent != null)
-                logString.append("\n").append(executionCommand.getPendingIntentCreatorLogString());
-        }
+        if (executionCommand.isPluginExecutionCommand)
+            logString.append("\n").append(ResultConfig.getResultConfigLogString(executionCommand.resultConfig, ignoreNull));
 
         return logString.toString();
     }
@@ -208,9 +282,10 @@ public static String getExecutionInputLogString(final ExecutionCommand execution
      *
      * @param executionCommand The {@link ExecutionCommand} to convert.
      * @param ignoreNull Set to {@code true} if non-critical {@code null} values are to be ignored.
+     * @param logResultData Set to {@code true} if {@link #resultData} should be logged.
      * @return Returns the log friendly {@link String}.
      */
-    public static String getExecutionOutputLogString(final ExecutionCommand executionCommand, boolean ignoreNull) {
+    public static String getExecutionOutputLogString(final ExecutionCommand executionCommand, boolean ignoreNull, boolean logResultData) {
         if (executionCommand == null) return "null";
 
         StringBuilder logString = new StringBuilder();
@@ -220,32 +295,8 @@ public static String getExecutionOutputLogString(final ExecutionCommand executio
         logString.append("\n").append(executionCommand.getPreviousStateLogString());
         logString.append("\n").append(executionCommand.getCurrentStateLogString());
 
-        logString.append("\n").append(executionCommand.getStdoutLogString());
-        logString.append("\n").append(executionCommand.getStderrLogString());
-        logString.append("\n").append(executionCommand.getExitCodeLogString());
-
-        logString.append(getExecutionErrLogString(executionCommand, ignoreNull));
-
-        return logString.toString();
-    }
-
-    /**
-     * Get a log friendly {@link String} for {@link ExecutionCommand} execution error parameters.
-     *
-     * @param executionCommand The {@link ExecutionCommand} to convert.
-     * @param ignoreNull Set to {@code true} if non-critical {@code null} values are to be ignored.
-     * @return Returns the log friendly {@link String}.
-     */
-    public static String getExecutionErrLogString(final ExecutionCommand executionCommand, boolean ignoreNull) {
-        StringBuilder logString = new StringBuilder();
-
-        if (!ignoreNull || (executionCommand.isStateFailed())) {
-            logString.append("\n").append(executionCommand.getErrCodeLogString());
-            logString.append("\n").append(executionCommand.getErrmsgLogString());
-            logString.append("\n").append(executionCommand.geStackTracesLogString());
-        } else {
-            logString.append("");
-        }
+        if (logResultData)
+            logString.append("\n").append(ResultData.getResultDataLogString(executionCommand.resultData, ignoreNull));
 
         return logString.toString();
     }
@@ -262,7 +313,7 @@ public static String getDetailedLogString(final ExecutionCommand executionComman
         StringBuilder logString = new StringBuilder();
 
         logString.append(getExecutionInputLogString(executionCommand, false));
-        logString.append(getExecutionOutputLogString(executionCommand, false));
+        logString.append(getExecutionOutputLogString(executionCommand, false, true));
 
         logString.append("\n").append(executionCommand.getCommandDescriptionLogString());
         logString.append("\n").append(executionCommand.getCommandHelpLogString());
@@ -299,18 +350,10 @@ public static String getExecutionCommandMarkdownString(final ExecutionCommand ex
 
 
         markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("isPluginExecutionCommand", executionCommand.isPluginExecutionCommand, "-"));
-        if (executionCommand.pluginPendingIntent != null)
-            markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Pending Intent Creator", executionCommand.pluginPendingIntent.getCreatorPackage(), "-"));
-        else
-            markdownString.append("\n").append("**Pending Intent Creator:** -  ");
 
-        markdownString.append("\n\n").append(MarkdownUtils.getMultiLineMarkdownStringEntry("Stdout", executionCommand.stdout, "-"));
-        markdownString.append("\n").append(MarkdownUtils.getMultiLineMarkdownStringEntry("Stderr", executionCommand.stderr, "-"));
-        markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Exit Code", executionCommand.exitCode, "-"));
+        markdownString.append("\n\n").append(ResultConfig.getResultConfigMarkdownString(executionCommand.resultConfig));
 
-        markdownString.append("\n\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Err Code", executionCommand.errCode, "-"));
-        markdownString.append("\n").append("**Errmsg:**\n").append(DataUtils.getDefaultIfNull(executionCommand.errmsg, "-"));
-        markdownString.append("\n\n").append(executionCommand.geStackTracesMarkdownString());
+        markdownString.append("\n\n").append(ResultData.getResultDataMarkdownString(executionCommand.resultData));
 
         if (executionCommand.commandDescription != null || executionCommand.commandHelp != null) {
             if (executionCommand.commandDescription != null)
@@ -329,7 +372,6 @@ public static String getExecutionCommandMarkdownString(final ExecutionCommand ex
     }
 
 
-
     public String getIdLogString() {
         if (id != null)
             return "(" + id + ") ";
@@ -376,21 +418,10 @@ public String getIsFailsafeLogString() {
         return "isFailsafe: `" + isFailsafe + "`";
     }
 
-    public String getIsPluginExecutionCommandLogString() {
-        return "isPluginExecutionCommand: `" + isPluginExecutionCommand + "`";
-    }
-
     public String getSessionActionLogString() {
         return Logger.getSingleLineLogStringEntry("Session Action", sessionAction, "-");
     }
 
-    public String getPendingIntentCreatorLogString() {
-        if (pluginPendingIntent != null)
-            return "Pending Intent Creator: `" + pluginPendingIntent.getCreatorPackage() + "`";
-        else
-            return "Pending Intent Creator: -";
-    }
-
     public String getCommandDescriptionLogString() {
         return Logger.getSingleLineLogStringEntry("Command Description", commandDescription, "-");
     }
@@ -403,36 +434,50 @@ public String getPluginAPIHelpLogString() {
         return Logger.getSingleLineLogStringEntry("Plugin API Help", pluginAPIHelp, "-");
     }
 
-    public String getStdoutLogString() {
-        return Logger.getMultiLineLogStringEntry("Stdout", DataUtils.getTruncatedCommandOutput(stdout, Logger.LOGGER_ENTRY_SIZE_LIMIT_IN_BYTES / 5, false, false, true), "-");
-    }
-
-    public String getStderrLogString() {
-        return Logger.getMultiLineLogStringEntry("Stderr", DataUtils.getTruncatedCommandOutput(stderr, Logger.LOGGER_ENTRY_SIZE_LIMIT_IN_BYTES / 5, false, false, true), "-");
+    public String getCommandIntentLogString() {
+        if (commandIntent == null)
+            return "Command Intent: -";
+        else
+            return Logger.getMultiLineLogStringEntry("Command Intent", IntentUtils.getIntentString(commandIntent), "-");
     }
 
-    public String getExitCodeLogString() {
-        return Logger.getSingleLineLogStringEntry("Exit Code", exitCode, "-");
+    public String getIsPluginExecutionCommandLogString() {
+        return "isPluginExecutionCommand: `" + isPluginExecutionCommand + "`";
     }
 
-    public String getErrCodeLogString() {
-        return Logger.getSingleLineLogStringEntry("Err Code", errCode, "-");
-    }
 
-    public String getErrmsgLogString() {
-        return Logger.getMultiLineLogStringEntry("Errmsg", errmsg, "-");
-    }
+    /**
+     * Get a log friendly {@link String} for {@link List<String>} argumentsArray.
+     * If argumentsArray are null or of size 0, then `Arguments: -` is returned. Otherwise
+     * following format is returned:
+     *
+     * Arguments:
+     * ```
+     * Arg 1: `value`
+     * Arg 2: 'value`
+     * ```
+     *
+     * @param argumentsArray The {@link String[]} argumentsArray to convert.
+     * @return Returns the log friendly {@link String}.
+     */
+    public static String getArgumentsLogString(final String[] argumentsArray) {
+        StringBuilder argumentsString = new StringBuilder("Arguments:");
 
-    public String geStackTracesLogString() {
-        return Logger.getStackTracesString("StackTraces:", Logger.getStackTraceStringArray(throwableList));
-    }
+        if (argumentsArray != null && argumentsArray.length != 0) {
+            argumentsString.append("\n```\n");
+            for (int i = 0; i != argumentsArray.length; i++) {
+                argumentsString.append(Logger.getSingleLineLogStringEntry("Arg " + (i + 1),
+                    DataUtils.getTruncatedCommandOutput(argumentsArray[i], Logger.LOGGER_ENTRY_MAX_SAFE_PAYLOAD / 5, true, false, true),
+                    "-")).append("\n");
+            }
+            argumentsString.append("```");
+        } else{
+            argumentsString.append(" -");
+        }
 
-    public String geStackTracesMarkdownString() {
-        return Logger.getStackTracesMarkdownString("StackTraces", Logger.getStackTraceStringArray(throwableList));
+        return argumentsString.toString();
     }
 
-
-
     /**
      * Get a markdown {@link String} for {@link String[]} argumentsArray.
      * If argumentsArray are null or of size 0, then `**Arguments:** -` is returned. Otherwise
@@ -467,110 +512,4 @@ public static String getArgumentsMarkdownString(final String[] argumentsArray) {
         return argumentsString.toString();
     }
 
-
-    /**
-     * Get a log friendly {@link String} for {@link List<String>} argumentsArray.
-     * If argumentsArray are null or of size 0, then `Arguments: -` is returned. Otherwise
-     * following format is returned:
-     *
-     * Arguments:
-     * ```
-     * Arg 1: `value`
-     * Arg 2: 'value`
-     * ```
-     *
-     * @param argumentsArray The {@link String[]} argumentsArray to convert.
-     * @return Returns the log friendly {@link String}.
-     */
-    public static String getArgumentsLogString(final String[] argumentsArray) {
-        StringBuilder argumentsString = new StringBuilder("Arguments:");
-
-        if (argumentsArray != null && argumentsArray.length != 0) {
-            argumentsString.append("\n```\n");
-            for (int i = 0; i != argumentsArray.length; i++) {
-                argumentsString.append(Logger.getSingleLineLogStringEntry("Arg " + (i + 1),
-                    DataUtils.getTruncatedCommandOutput(argumentsArray[i], Logger.LOGGER_ENTRY_SIZE_LIMIT_IN_BYTES / 5, true, false, true),
-                    "-")).append("`\n");
-            }
-            argumentsString.append("```");
-        } else{
-            argumentsString.append(" -");
-        }
-
-        return argumentsString.toString();
-    }
-
-
-    public synchronized boolean setState(ExecutionState newState) {
-        // The state transition cannot go back or change if already at {@link ExecutionState#SUCCESS}
-        if (newState.getValue() < currentState.getValue() || currentState == ExecutionState.SUCCESS) {
-            Logger.logError("Invalid "+ getCommandIdAndLabelLogString() + " state transition from \"" + currentState.getName() + "\" to " +  "\"" + newState.getName() + "\"");
-            return false;
-        }
-
-        // The {@link ExecutionState#FAILED} can be set again, like to add more errors, but we don't update
-        // {@link #previousState} with the {@link #currentState} value if its at {@link ExecutionState#FAILED} to
-        // preserve the last valid state
-        if (currentState != ExecutionState.FAILED)
-            previousState = currentState;
-
-        currentState = newState;
-        return  true;
-    }
-
-    public synchronized boolean setStateFailed(int errCode, String errmsg,  Throwable throwable) {
-        if (errCode > RESULT_CODE_OK) {
-            this.errCode = errCode;
-        } else {
-            Logger.logWarn("Ignoring invalid "  + getCommandIdAndLabelLogString() + " errCode value \"" + errCode + "\". Force setting it to RESULT_CODE_FAILED \"" + RESULT_CODE_FAILED + "\"");
-            this.errCode = RESULT_CODE_FAILED;
-        }
-
-        this.errmsg = errmsg;
-
-        if (!setState(ExecutionState.FAILED))
-            return false;
-
-        if (this.throwableList == null)
-            this.throwableList =  new ArrayList<>();
-
-        if (throwable != null)
-            this.throwableList.add(throwable);
-
-        return true;
-    }
-
-    public synchronized boolean shouldNotProcessResults() {
-        if (processingResultsAlreadyCalled) {
-            return true;
-        } else {
-            processingResultsAlreadyCalled = true;
-            return false;
-        }
-    }
-
-    public synchronized boolean isStateFailed() {
-        if (currentState != ExecutionState.FAILED)
-            return false;
-
-        if (errCode <= RESULT_CODE_OK) {
-            Logger.logWarn("The "  + getCommandIdAndLabelLogString() + " has an invalid errCode value \"" + errCode + "\" while having ExecutionState.FAILED state.");
-            return false;
-        } else {
-            return true;
-        }
-    }
-
-    public synchronized boolean hasExecuted() {
-        return currentState.getValue() >= ExecutionState.EXECUTED.getValue();
-    }
-
-    public synchronized boolean isExecuting() {
-        return currentState == ExecutionState.EXECUTING;
-    }
-
-    public synchronized boolean isSuccessful() {
-        return currentState == ExecutionState.SUCCESS;
-    }
-
 }
diff --git a/termux-shared/src/main/java/com/termux/shared/models/ResultConfig.java b/termux-shared/src/main/java/com/termux/shared/models/ResultConfig.java
new file mode 100644
index 0000000000..77bdad7ff2
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/models/ResultConfig.java
@@ -0,0 +1,170 @@
+package com.termux.shared.models;
+
+import android.app.PendingIntent;
+
+import androidx.annotation.NonNull;
+
+import com.termux.shared.logger.Logger;
+import com.termux.shared.markdown.MarkdownUtils;
+
+import java.util.Formatter;
+
+public class ResultConfig {
+
+    /** Defines {@link PendingIntent} that should be sent with the result of the command. We cannot
+     * implement {@link java.io.Serializable} because {@link PendingIntent} cannot be serialized. */
+    public PendingIntent resultPendingIntent;
+    /** The key with which to send result {@link android.os.Bundle} in {@link #resultPendingIntent}. */
+    public String resultBundleKey;
+    /** The key with which to send {@link ResultData#stdout} in {@link #resultPendingIntent}. */
+    public String resultStdoutKey;
+    /** The key with which to send {@link ResultData#stderr} in {@link #resultPendingIntent}. */
+    public String resultStderrKey;
+    /** The key with which to send {@link ResultData#exitCode} in {@link #resultPendingIntent}. */
+    public String resultExitCodeKey;
+    /** The key with which to send {@link ResultData#errorsList} errCode in {@link #resultPendingIntent}. */
+    public String resultErrCodeKey;
+    /** The key with which to send {@link ResultData#errorsList} errmsg in {@link #resultPendingIntent}. */
+    public String resultErrmsgKey;
+    /** The key with which to send original length of {@link ResultData#stdout} in {@link #resultPendingIntent}. */
+    public String resultStdoutOriginalLengthKey;
+    /** The key with which to send original length of {@link ResultData#stderr} in {@link #resultPendingIntent}. */
+    public String resultStderrOriginalLengthKey;
+
+
+    /** Defines the directory path in which to write the result of the command. */
+    public String resultDirectoryPath;
+    /** Defines the directory path under which {@link #resultDirectoryPath} can exist. */
+    public String resultDirectoryAllowedParentPath;
+    /** Defines whether the result should be written to a single file or multiple files
+     * (err, error, stdout, stderr, exit_code) in {@link #resultDirectoryPath}. */
+    public boolean resultSingleFile;
+    /** Defines the basename of the result file that should be created in {@link #resultDirectoryPath}
+     * if {@link #resultSingleFile} is {@code true}. */
+    public String resultFileBasename;
+    /** Defines the output {@link Formatter} format of the {@link #resultFileBasename} result file. */
+    public String resultFileOutputFormat;
+    /** Defines the error {@link Formatter} format of the {@link #resultFileBasename} result file. */
+    public String resultFileErrorFormat;
+    /** Defines the suffix of the result files that should be created in {@link #resultDirectoryPath}
+     * if {@link #resultSingleFile} is {@code true}. */
+    public String resultFilesSuffix;
+
+
+    public ResultConfig() {
+    }
+
+
+    public boolean isCommandWithPendingResult() {
+        return resultPendingIntent != null || resultDirectoryPath != null;
+    }
+
+
+    @NonNull
+    @Override
+    public String toString() {
+        return getResultConfigLogString(this, true);
+    }
+
+    /**
+     * Get a log friendly {@link String} for {@link ResultConfig} parameters.
+     *
+     * @param resultConfig The {@link ResultConfig} to convert.
+     * @param ignoreNull Set to {@code true} if non-critical {@code null} values are to be ignored.
+     * @return Returns the log friendly {@link String}.
+     */
+    public static String getResultConfigLogString(final ResultConfig resultConfig, boolean ignoreNull) {
+        if (resultConfig == null) return "null";
+
+        StringBuilder logString = new StringBuilder();
+
+        logString.append("Result Pending: `").append(resultConfig.isCommandWithPendingResult()).append("`\n");
+
+        if (resultConfig.resultPendingIntent != null) {
+            logString.append(resultConfig.getResultPendingIntentVariablesLogString(ignoreNull));
+            if (resultConfig.resultDirectoryPath != null)
+                logString.append("\n");
+        }
+
+        if (resultConfig.resultDirectoryPath != null && !resultConfig.resultDirectoryPath.isEmpty())
+            logString.append(resultConfig.getResultDirectoryVariablesLogString(ignoreNull));
+
+        return logString.toString();
+    }
+    
+    public String getResultPendingIntentVariablesLogString(boolean ignoreNull) {
+        if (resultPendingIntent == null) return "Result PendingIntent Creator: -";
+
+        StringBuilder resultPendingIntentVariablesString = new StringBuilder();
+
+        resultPendingIntentVariablesString.append("Result PendingIntent Creator: `").append(resultPendingIntent.getCreatorPackage()).append("`");
+
+        if (!ignoreNull || resultBundleKey != null)
+            resultPendingIntentVariablesString.append("\n").append(Logger.getSingleLineLogStringEntry("Result Bundle Key", resultBundleKey, "-"));
+        if (!ignoreNull || resultStdoutKey != null)
+            resultPendingIntentVariablesString.append("\n").append(Logger.getSingleLineLogStringEntry("Result Stdout Key", resultStdoutKey, "-"));
+        if (!ignoreNull || resultStderrKey != null)
+            resultPendingIntentVariablesString.append("\n").append(Logger.getSingleLineLogStringEntry("Result Stderr Key", resultStderrKey, "-"));
+        if (!ignoreNull || resultExitCodeKey != null)
+            resultPendingIntentVariablesString.append("\n").append(Logger.getSingleLineLogStringEntry("Result Exit Code Key", resultExitCodeKey, "-"));
+        if (!ignoreNull || resultErrCodeKey != null)
+            resultPendingIntentVariablesString.append("\n").append(Logger.getSingleLineLogStringEntry("Result Err Code Key", resultErrCodeKey, "-"));
+        if (!ignoreNull || resultErrmsgKey != null)
+            resultPendingIntentVariablesString.append("\n").append(Logger.getSingleLineLogStringEntry("Result Error Key", resultErrmsgKey, "-"));
+        if (!ignoreNull || resultStdoutOriginalLengthKey != null)
+            resultPendingIntentVariablesString.append("\n").append(Logger.getSingleLineLogStringEntry("Result Stdout Original Length Key", resultStdoutOriginalLengthKey, "-"));
+        if (!ignoreNull || resultStderrOriginalLengthKey != null)
+            resultPendingIntentVariablesString.append("\n").append(Logger.getSingleLineLogStringEntry("Result Stderr Original Length Key", resultStderrOriginalLengthKey, "-"));
+
+        return resultPendingIntentVariablesString.toString();
+    }
+
+    public String getResultDirectoryVariablesLogString(boolean ignoreNull) {
+        if (resultDirectoryPath == null) return "Result Directory Path: -";
+
+        StringBuilder resultDirectoryVariablesString = new StringBuilder();
+
+        resultDirectoryVariablesString.append(Logger.getSingleLineLogStringEntry("Result Directory Path", resultDirectoryPath, "-"));
+
+        resultDirectoryVariablesString.append("\n").append(Logger.getSingleLineLogStringEntry("Result Single File", resultSingleFile, "-"));
+        if (!ignoreNull || resultFileBasename != null)
+            resultDirectoryVariablesString.append("\n").append(Logger.getSingleLineLogStringEntry("Result File Basename", resultFileBasename, "-"));
+        if (!ignoreNull || resultFileOutputFormat != null)
+            resultDirectoryVariablesString.append("\n").append(Logger.getSingleLineLogStringEntry("Result File Output Format", resultFileOutputFormat, "-"));
+        if (!ignoreNull || resultFileErrorFormat != null)
+            resultDirectoryVariablesString.append("\n").append(Logger.getSingleLineLogStringEntry("Result File Error Format", resultFileErrorFormat, "-"));
+        if (!ignoreNull || resultFilesSuffix != null)
+            resultDirectoryVariablesString.append("\n").append(Logger.getSingleLineLogStringEntry("Result Files Suffix", resultFilesSuffix, "-"));
+
+        return resultDirectoryVariablesString.toString();
+    }
+
+    /**
+     * Get a markdown {@link String} for {@link ResultConfig}.
+     *
+     * @param resultConfig The {@link ResultConfig} to convert.
+     * @return Returns the markdown {@link String}.
+     */
+    public static String getResultConfigMarkdownString(final ResultConfig resultConfig) {
+        if (resultConfig == null) return "null";
+
+        StringBuilder markdownString = new StringBuilder();
+
+        if (resultConfig.resultPendingIntent != null)
+            markdownString.append(MarkdownUtils.getSingleLineMarkdownStringEntry("Result PendingIntent Creator", resultConfig.resultPendingIntent.getCreatorPackage(), "-"));
+        else
+            markdownString.append("**Result PendingIntent Creator:** -  ");
+
+        if (resultConfig.resultDirectoryPath != null) {
+            markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Result Directory Path", resultConfig.resultDirectoryPath, "-"));
+            markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Result Single File", resultConfig.resultSingleFile, "-"));
+            markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Result File Basename", resultConfig.resultFileBasename, "-"));
+            markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Result File Output Format", resultConfig.resultFileOutputFormat, "-"));
+            markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Result File Error Format", resultConfig.resultFileErrorFormat, "-"));
+            markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Result Files Suffix", resultConfig.resultFilesSuffix, "-"));
+        }
+
+        return markdownString.toString();
+    }
+
+}
diff --git a/termux-shared/src/main/java/com/termux/shared/models/ResultData.java b/termux-shared/src/main/java/com/termux/shared/models/ResultData.java
new file mode 100644
index 0000000000..85e1b06b07
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/models/ResultData.java
@@ -0,0 +1,256 @@
+package com.termux.shared.models;
+
+import androidx.annotation.NonNull;
+
+import com.termux.shared.data.DataUtils;
+import com.termux.shared.logger.Logger;
+import com.termux.shared.markdown.MarkdownUtils;
+import com.termux.shared.models.errors.Errno;
+import com.termux.shared.models.errors.Error;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public class ResultData implements Serializable {
+
+    /** The stdout of command. */
+    public final StringBuilder stdout = new StringBuilder();
+    /** The stderr of command. */
+    public final StringBuilder stderr = new StringBuilder();
+    /** The exit code of command. */
+    public Integer exitCode;
+
+    /** The internal errors list of command. */
+    public List<Error> errorsList =  new ArrayList<>();
+
+
+    public ResultData() {
+    }
+
+
+    public void clearStdout() {
+        stdout.setLength(0);
+    }
+
+    public StringBuilder prependStdout(String message) {
+        return stdout.insert(0, message);
+    }
+
+    public StringBuilder prependStdoutLn(String message) {
+        return stdout.insert(0, message + "\n");
+    }
+
+    public StringBuilder appendStdout(String message) {
+        return stdout.append(message);
+    }
+
+    public StringBuilder appendStdoutLn(String message) {
+        return stdout.append(message).append("\n");
+    }
+
+
+    public void clearStderr() {
+        stderr.setLength(0);
+    }
+
+    public StringBuilder prependStderr(String message) {
+        return stderr.insert(0, message);
+    }
+
+    public StringBuilder prependStderrLn(String message) {
+        return stderr.insert(0, message + "\n");
+    }
+
+    public StringBuilder appendStderr(String message) {
+        return stderr.append(message);
+    }
+
+    public StringBuilder appendStderrLn(String message) {
+        return stderr.append(message).append("\n");
+    }
+
+
+    public synchronized boolean setStateFailed(@NonNull Error error) {
+        return setStateFailed(error.getType(), error.getCode(), error.getMessage(), null);
+    }
+
+    public synchronized boolean setStateFailed(@NonNull Error error, Throwable throwable) {
+        return setStateFailed(error.getType(), error.getCode(), error.getMessage(), Collections.singletonList(throwable));
+    }
+    public synchronized boolean setStateFailed(@NonNull Error error, List<Throwable> throwablesList) {
+        return setStateFailed(error.getType(), error.getCode(), error.getMessage(), throwablesList);
+    }
+
+    public synchronized boolean setStateFailed(int code, String message) {
+        return setStateFailed(null, code, message, null);
+    }
+
+    public synchronized boolean setStateFailed(int code, String message, Throwable throwable) {
+        return setStateFailed(null, code, message, Collections.singletonList(throwable));
+    }
+
+    public synchronized boolean setStateFailed(int code, String message, List<Throwable> throwablesList) {
+        return setStateFailed(null, code, message, throwablesList);
+    }
+
+    public synchronized boolean setStateFailed(String type, int code, String message, List<Throwable> throwablesList) {
+        if (errorsList == null)
+            errorsList =  new ArrayList<>();
+
+        Error error = new Error();
+        errorsList.add(error);
+
+        return error.setStateFailed(type, code, message, throwablesList);
+    }
+
+    public boolean isStateFailed() {
+        if (errorsList != null) {
+            for (Error error : errorsList)
+                if (error.isStateFailed())
+                    return true;
+        }
+
+        return false;
+    }
+
+    public int getErrCode() {
+        if (errorsList != null && errorsList.size() > 0)
+            return errorsList.get(errorsList.size() - 1).getCode();
+        else
+            return Errno.ERRNO_SUCCESS.getCode();
+    }
+
+
+    @NonNull
+    @Override
+    public String toString() {
+        return getResultDataLogString(this, true);
+    }
+
+    /**
+     * Get a log friendly {@link String} for {@link ResultData} parameters.
+     *
+     * @param resultData The {@link ResultData} to convert.
+     * @param ignoreNull Set to {@code true} if non-critical {@code null} values are to be ignored.
+     * @return Returns the log friendly {@link String}.
+     */
+    public static String getResultDataLogString(final ResultData resultData, boolean ignoreNull) {
+        if (resultData == null) return "null";
+
+        StringBuilder logString = new StringBuilder();
+
+        logString.append("\n").append(resultData.getStdoutLogString());
+        logString.append("\n").append(resultData.getStderrLogString());
+        logString.append("\n").append(resultData.getExitCodeLogString());
+
+        logString.append("\n\n").append(getErrorsListLogString(resultData));
+
+        return logString.toString();
+    }
+
+
+
+    public String getStdoutLogString() {
+        if (stdout.toString().isEmpty())
+            return Logger.getSingleLineLogStringEntry("Stdout", null, "-");
+        else
+            return Logger.getMultiLineLogStringEntry("Stdout", DataUtils.getTruncatedCommandOutput(stdout.toString(), Logger.LOGGER_ENTRY_MAX_SAFE_PAYLOAD / 5, false, false, true), "-");
+    }
+
+    public String getStderrLogString() {
+        if (stderr.toString().isEmpty())
+            return Logger.getSingleLineLogStringEntry("Stderr", null, "-");
+        else
+            return Logger.getMultiLineLogStringEntry("Stderr", DataUtils.getTruncatedCommandOutput(stderr.toString(), Logger.LOGGER_ENTRY_MAX_SAFE_PAYLOAD / 5, false, false, true), "-");
+    }
+
+    public String getExitCodeLogString() {
+        return Logger.getSingleLineLogStringEntry("Exit Code", exitCode, "-");
+    }
+
+    public static String getErrorsListLogString(final ResultData resultData) {
+        if (resultData == null) return "null";
+
+        StringBuilder logString = new StringBuilder();
+
+        if (resultData.errorsList != null) {
+            for (Error error : resultData.errorsList) {
+                if (error.isStateFailed()) {
+                    if (!logString.toString().isEmpty())
+                        logString.append("\n");
+                    logString.append(Error.getErrorLogString(error));
+                }
+            }
+        }
+
+        return logString.toString();
+    }
+
+    /**
+     * Get a markdown {@link String} for {@link ResultData}.
+     *
+     * @param resultData The {@link ResultData} to convert.
+     * @return Returns the markdown {@link String}.
+     */
+    public static String getResultDataMarkdownString(final ResultData resultData) {
+        if (resultData == null) return "null";
+
+        StringBuilder markdownString = new StringBuilder();
+
+        if (resultData.stdout.toString().isEmpty())
+            markdownString.append(MarkdownUtils.getSingleLineMarkdownStringEntry("Stdout", null, "-"));
+        else
+            markdownString.append(MarkdownUtils.getMultiLineMarkdownStringEntry("Stdout", resultData.stdout.toString(), "-"));
+
+        if (resultData.stderr.toString().isEmpty())
+            markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Stderr", null, "-"));
+        else
+            markdownString.append("\n").append(MarkdownUtils.getMultiLineMarkdownStringEntry("Stderr", resultData.stderr.toString(), "-"));
+
+        markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Exit Code", resultData.exitCode, "-"));
+
+        markdownString.append("\n\n").append(getErrorsListMarkdownString(resultData));
+
+
+        return markdownString.toString();
+    }
+
+    public static String getErrorsListMarkdownString(final ResultData resultData) {
+        if (resultData == null) return "null";
+
+        StringBuilder markdownString = new StringBuilder();
+
+        if (resultData.errorsList != null) {
+            for (Error error : resultData.errorsList) {
+                if (error.isStateFailed()) {
+                    if (!markdownString.toString().isEmpty())
+                        markdownString.append("\n");
+                    markdownString.append(Error.getErrorMarkdownString(error));
+                }
+            }
+        }
+
+        return markdownString.toString();
+    }
+
+    public static String getErrorsListMinimalString(final ResultData resultData) {
+        if (resultData == null) return "null";
+
+        StringBuilder minimalString = new StringBuilder();
+
+        if (resultData.errorsList != null) {
+            for (Error error : resultData.errorsList) {
+                if (error.isStateFailed()) {
+                    if (!minimalString.toString().isEmpty())
+                        minimalString.append("\n");
+                    minimalString.append(Error.getMinimalErrorString(error));
+                }
+            }
+        }
+
+        return minimalString.toString();
+    }
+
+}
diff --git a/termux-shared/src/main/java/com/termux/shared/models/errors/Errno.java b/termux-shared/src/main/java/com/termux/shared/models/errors/Errno.java
index 0c21f02b7a..ce4c702d84 100644
--- a/termux-shared/src/main/java/com/termux/shared/models/errors/Errno.java
+++ b/termux-shared/src/main/java/com/termux/shared/models/errors/Errno.java
@@ -17,9 +17,9 @@ public class Errno {
 
 
     public static final Errno ERRNO_SUCCESS = new Errno(TYPE, Activity.RESULT_OK, "Success");
+    public static final Errno ERRNO_CANCELLED = new Errno(TYPE, Activity.RESULT_CANCELED, "Cancelled");
     public static final Errno ERRNO_MINOR_FAILURES = new Errno(TYPE, Activity.RESULT_FIRST_USER, "Minor failure");
     public static final Errno ERRNO_FAILED = new Errno(TYPE, Activity.RESULT_FIRST_USER + 1, "Failed");
-    public static final Errno ERRNO_CANCELED = new Errno(TYPE, Activity.RESULT_FIRST_USER + 2, "Cancelled");
 
     /** The errno type. */
     protected String type;
diff --git a/termux-shared/src/main/java/com/termux/shared/models/errors/ResultSenderErrno.java b/termux-shared/src/main/java/com/termux/shared/models/errors/ResultSenderErrno.java
new file mode 100644
index 0000000000..1cb928184e
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/models/errors/ResultSenderErrno.java
@@ -0,0 +1,20 @@
+package com.termux.shared.models.errors;
+
+/** The {@link Class} that defines ResultSender error messages and codes. */
+public class ResultSenderErrno extends Errno {
+
+    public static final String TYPE = "ResultSender Error";
+
+
+    /* Errors for null or empty parameters (100-150) */
+    public static final Errno ERROR_RESULT_FILE_BASENAME_NULL_OR_INVALID = new Errno(TYPE, 100, "The result file basename \"%1$s\" is null, empty or contains forward slashes \"/\".");
+    public static final Errno ERROR_RESULT_FILES_SUFFIX_INVALID = new Errno(TYPE, 101, "The result files suffix \"%1$s\" contains forward slashes \"/\".");
+    public static final Errno ERROR_FORMAT_RESULT_ERROR_FAILED_WITH_EXCEPTION = new Errno(TYPE, 102, "Formatting result error failed.\nException: %1$s");
+    public static final Errno ERROR_FORMAT_RESULT_OUTPUT_FAILED_WITH_EXCEPTION = new Errno(TYPE, 103, "Formatting result output failed.\nException: %1$s");
+
+
+    ResultSenderErrno(final String type, final int code, final String message) {
+        super(type, code, message);
+    }
+
+}
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/ResultSender.java b/termux-shared/src/main/java/com/termux/shared/shell/ResultSender.java
new file mode 100644
index 0000000000..2a5e9308be
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/shell/ResultSender.java
@@ -0,0 +1,335 @@
+package com.termux.shared.shell;
+
+import android.app.Activity;
+import android.app.PendingIntent;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+
+import com.termux.shared.R;
+import com.termux.shared.data.DataUtils;
+import com.termux.shared.models.errors.Error;
+import com.termux.shared.file.FileUtils;
+import com.termux.shared.logger.Logger;
+import com.termux.shared.models.ResultConfig;
+import com.termux.shared.models.ResultData;
+import com.termux.shared.models.errors.FunctionErrno;
+import com.termux.shared.models.errors.ResultSenderErrno;
+import com.termux.shared.termux.TermuxConstants.RESULT_SENDER;
+import com.termux.shared.termux.TermuxUtils;
+
+public class ResultSender {
+
+    private static final String LOG_TAG = "ResultSender";
+
+    /**
+     * Send result stored in {@link ResultConfig} to command caller via
+     * {@link ResultConfig#resultPendingIntent} and/or by writing it to files in
+     * {@link ResultConfig#resultDirectoryPath}. If both are not {@code null}, then result will be
+     * sent via both.
+     *
+     * @param context The {@link Context} for operations.
+     * @param logTag The log tag to use for logging.
+     * @param label The label for the command.
+     * @param resultConfig The {@link ResultConfig} object containing information on how to send the result.
+     * @param resultData The {@link ResultData} object containing result data.
+     * @return Returns the {@link Error} if failed to send the result, otherwise {@code null}.
+     */
+    public static Error sendCommandResultData(Context context, String logTag, String label, ResultConfig resultConfig, ResultData resultData) {
+        if (context == null || resultConfig == null || resultData == null)
+            return FunctionErrno.ERRNO_NULL_OR_EMPTY_PARAMETERS.getError("context, resultConfig or resultData", "sendCommandResultData");
+
+        Error error;
+
+        if (resultConfig.resultPendingIntent != null) {
+            error = sendCommandResultDataWithPendingIntent(context, logTag, label, resultConfig, resultData);
+            if (error != null || resultConfig.resultDirectoryPath == null)
+                return error;
+        }
+
+        if (resultConfig.resultDirectoryPath != null) {
+            return sendCommandResultDataToDirectory(context, logTag, label, resultConfig, resultData);
+        } else {
+            return FunctionErrno.ERRNO_UNSET_PARAMETERS.getError("resultConfig.resultPendingIntent or resultConfig.resultDirectoryPath", "sendCommandResultData");
+        }
+    }
+
+    /**
+     * Send result stored in {@link ResultConfig} to command caller via {@link ResultConfig#resultPendingIntent}.
+     *
+     * @param context The {@link Context} for operations.
+     * @param logTag The log tag to use for logging.
+     * @param label The label for the command.
+     * @param resultConfig The {@link ResultConfig} object containing information on how to send the result.
+     * @param resultData The {@link ResultData} object containing result data.
+     * @return Returns the {@link Error} if failed to send the result, otherwise {@code null}.
+     */
+    public static Error sendCommandResultDataWithPendingIntent(Context context, String logTag, String label, ResultConfig resultConfig, ResultData resultData) {
+        if (context == null || resultConfig == null || resultData == null || resultConfig.resultPendingIntent == null || resultConfig.resultBundleKey == null)
+            return FunctionErrno.ERRNO_NULL_OR_EMPTY_PARAMETER.getError("context, resultConfig, resultData, resultConfig.resultPendingIntent or resultConfig.resultBundleKey", "sendCommandResultDataWithPendingIntent");
+
+        logTag = DataUtils.getDefaultIfNull(logTag, LOG_TAG);
+
+        Logger.logDebugExtended(logTag, "Sending result for command \"" + label + "\":\n" + resultConfig.toString() + "\n" + resultData.toString());
+
+        String resultDataStdout = resultData.stdout.toString();
+        String resultDataStderr = resultData.stderr.toString();
+
+        String truncatedStdout = null;
+        String truncatedStderr = null;
+
+        String stdoutOriginalLength = String.valueOf(resultDataStdout.length());
+        String stderrOriginalLength = String.valueOf(resultDataStderr.length());
+
+        // Truncate stdout and stdout to max TRANSACTION_SIZE_LIMIT_IN_BYTES
+        if (resultDataStderr.isEmpty()) {
+            truncatedStdout = DataUtils.getTruncatedCommandOutput(resultDataStdout, DataUtils.TRANSACTION_SIZE_LIMIT_IN_BYTES, false, false, false);
+        } else if (resultDataStdout.isEmpty()) {
+            truncatedStderr = DataUtils.getTruncatedCommandOutput(resultDataStderr, DataUtils.TRANSACTION_SIZE_LIMIT_IN_BYTES, false, false, false);
+        } else {
+            truncatedStdout = DataUtils.getTruncatedCommandOutput(resultDataStdout, DataUtils.TRANSACTION_SIZE_LIMIT_IN_BYTES / 2, false, false, false);
+            truncatedStderr = DataUtils.getTruncatedCommandOutput(resultDataStderr, DataUtils.TRANSACTION_SIZE_LIMIT_IN_BYTES / 2, false, false, false);
+        }
+
+        if (truncatedStdout != null && truncatedStdout.length() < resultDataStdout.length()) {
+            Logger.logWarn(logTag, "The result for command \"" + label + "\" stdout length truncated from " + stdoutOriginalLength + " to " + truncatedStdout.length());
+            resultDataStdout = truncatedStdout;
+        }
+
+        if (truncatedStderr != null && truncatedStderr.length() < resultDataStderr.length()) {
+            Logger.logWarn(logTag, "The result for command \"" + label + "\" stderr length truncated from " + stderrOriginalLength + " to " + truncatedStderr.length());
+            resultDataStderr = truncatedStderr;
+        }
+
+        String resultDataErrmsg = null;
+        if (resultData.isStateFailed()) {
+            resultDataErrmsg = ResultData.getErrorsListLogString(resultData);
+            if (resultDataErrmsg.isEmpty()) resultDataErrmsg = null;
+        }
+
+        String errmsgOriginalLength = (resultDataErrmsg == null) ? null : String.valueOf(resultDataErrmsg.length());
+
+        // Truncate error to max TRANSACTION_SIZE_LIMIT_IN_BYTES / 4
+        // trim from end to preserve start of stacktraces
+        String truncatedErrmsg = DataUtils.getTruncatedCommandOutput(resultDataErrmsg, DataUtils.TRANSACTION_SIZE_LIMIT_IN_BYTES / 4, true, false, false);
+        if (truncatedErrmsg != null && truncatedErrmsg.length() < resultDataErrmsg.length()) {
+            Logger.logWarn(logTag, "The result for command \"" + label + "\" error length truncated from " + errmsgOriginalLength + " to " + truncatedErrmsg.length());
+            resultDataErrmsg = truncatedErrmsg;
+        }
+
+
+        final Bundle resultBundle = new Bundle();
+        resultBundle.putString(resultConfig.resultStdoutKey, resultDataStdout);
+        resultBundle.putString(resultConfig.resultStdoutOriginalLengthKey, stdoutOriginalLength);
+        resultBundle.putString(resultConfig.resultStderrKey, resultDataStderr);
+        resultBundle.putString(resultConfig.resultStderrOriginalLengthKey, stderrOriginalLength);
+        if (resultData.exitCode != null)
+            resultBundle.putInt(resultConfig.resultExitCodeKey, resultData.exitCode);
+        resultBundle.putInt(resultConfig.resultErrCodeKey, resultData.getErrCode());
+        resultBundle.putString(resultConfig.resultErrmsgKey, resultDataErrmsg);
+
+        Intent resultIntent = new Intent();
+        resultIntent.putExtra(resultConfig.resultBundleKey, resultBundle);
+
+        try {
+            resultConfig.resultPendingIntent.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 command \"" + label + "\" creator " + resultConfig.resultPendingIntent.getCreatorPackage() + " does not want the results anymore");
+        }
+
+        return null;
+
+    }
+
+    /**
+     * Send result stored in {@link ResultConfig} to command caller by writing it to files in
+     * {@link ResultConfig#resultDirectoryPath}.
+     *
+     * @param context The {@link Context} for operations.
+     * @param logTag The log tag to use for logging.
+     * @param label The label for the command.
+     * @param resultConfig The {@link ResultConfig} object containing information on how to send the result.
+     * @param resultData The {@link ResultData} object containing result data.
+     * @return Returns the {@link Error} if failed to send the result, otherwise {@code null}.
+     */
+    public static Error sendCommandResultDataToDirectory(Context context, String logTag, String label, ResultConfig resultConfig, ResultData resultData) {
+        if (context == null || resultConfig == null || resultData == null || DataUtils.isNullOrEmpty(resultConfig.resultDirectoryPath))
+            return FunctionErrno.ERRNO_NULL_OR_EMPTY_PARAMETER.getError("context, resultConfig, resultData or resultConfig.resultDirectoryPath", "sendCommandResultDataToDirectory");
+
+        logTag = DataUtils.getDefaultIfNull(logTag, LOG_TAG);
+
+        Error error;
+
+        String resultDataStdout = resultData.stdout.toString();
+        String resultDataStderr = resultData.stderr.toString();
+
+        String resultDataExitCode = "";
+        if (resultData.exitCode != null)
+            resultDataExitCode = String.valueOf(resultData.exitCode);
+
+        String resultDataErrmsg = null;
+        if (resultData.isStateFailed()) {
+            resultDataErrmsg = ResultData.getErrorsListLogString(resultData);
+        }
+        resultDataErrmsg = DataUtils.getDefaultIfNull(resultDataErrmsg, "");
+
+        resultConfig.resultDirectoryPath = FileUtils.getCanonicalPath(resultConfig.resultDirectoryPath, null);
+
+        Logger.logDebugExtended(logTag, "Writing result for command \"" + label + "\":\n" + resultConfig.toString() + "\n" + resultData.toString());
+
+        // If resultDirectoryPath 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 resultDirectoryPath is under resultDirectoryAllowedParentPath.
+        // We try to set execute permissions, but ignore if they are missing, since only read and write
+        // permissions are required for working directories.
+        error = FileUtils.validateDirectoryFileExistenceAndPermissions("result", resultConfig.resultDirectoryPath,
+            resultConfig.resultDirectoryAllowedParentPath, true,
+            FileUtils.APP_WORKING_DIRECTORY_PERMISSIONS, true, true,
+            true, true);
+        if (error != null) {
+            error.appendMessage("\n" + context.getString(R.string.msg_directory_absolute_path, "Result", resultConfig.resultDirectoryPath));
+            return error;
+        }
+
+        if (resultConfig.resultSingleFile) {
+            // If resultFileBasename is null, empty or contains forward slashes "/"
+            if (DataUtils.isNullOrEmpty(resultConfig.resultFileBasename) ||
+                    resultConfig.resultFileBasename.contains("/")) {
+                error = ResultSenderErrno.ERROR_RESULT_FILE_BASENAME_NULL_OR_INVALID.getError(resultConfig.resultFileBasename);
+                return error;
+            }
+
+            String error_or_output;
+
+            if (resultData.isStateFailed()) {
+                try {
+                    if (DataUtils.isNullOrEmpty(resultConfig.resultFileErrorFormat)) {
+                        error_or_output = String.format(RESULT_SENDER.FORMAT_FAILED_ERR__ERRMSG__STDOUT__STDERR__EXIT_CODE,
+                            resultData.getErrCode(), resultDataErrmsg, resultDataStdout, resultDataStderr, resultDataExitCode);
+                    } else {
+                        error_or_output = String.format(resultConfig.resultFileErrorFormat,
+                            resultData.getErrCode(), resultDataErrmsg, resultDataStdout, resultDataStderr, resultDataExitCode);
+                    }
+                } catch (Exception e) {
+                    error = ResultSenderErrno.ERROR_FORMAT_RESULT_ERROR_FAILED_WITH_EXCEPTION.getError(e.getMessage());
+                    return error;
+                }
+            } else {
+                try {
+                    if (DataUtils.isNullOrEmpty(resultConfig.resultFileOutputFormat)) {
+                        if (resultDataStderr.isEmpty() && resultDataExitCode.equals("0"))
+                            error_or_output = String.format(RESULT_SENDER.FORMAT_SUCCESS_STDOUT, resultDataStdout);
+                        else if (resultDataStderr.isEmpty())
+                            error_or_output = String.format(RESULT_SENDER.FORMAT_SUCCESS_STDOUT__EXIT_CODE, resultDataStdout, resultDataExitCode);
+                        else
+                            error_or_output = String.format(RESULT_SENDER.FORMAT_SUCCESS_STDOUT__STDERR__EXIT_CODE, resultDataStdout, resultDataStderr, resultDataExitCode);
+                    } else {
+                        error_or_output = String.format(resultConfig.resultFileOutputFormat, resultDataStdout, resultDataStderr, resultDataExitCode);
+                    }
+                } catch (Exception e) {
+                    error = ResultSenderErrno.ERROR_FORMAT_RESULT_OUTPUT_FAILED_WITH_EXCEPTION.getError(e.getMessage());
+                    return error;
+                }
+            }
+
+            // Write error or output to temp file
+            // Check errCode file creation below for explanation for why temp file is used
+            String temp_filename = resultConfig.resultFileBasename + "-" + TermuxUtils.getCurrentMilliSecondLocalTimeStamp();
+            error = FileUtils.writeStringToFile(temp_filename, resultConfig.resultDirectoryPath + "/" + temp_filename,
+                null, error_or_output, false);
+            if (error != null) {
+                return error;
+            }
+
+            // Move error or output temp file to final destination
+            error = FileUtils.moveRegularFile("error or output temp file", resultConfig.resultDirectoryPath + "/" + temp_filename,
+                resultConfig.resultDirectoryPath + "/" + resultConfig.resultFileBasename, false);
+            if (error != null) {
+                return error;
+            }
+        } else {
+            String filename;
+
+            // Default to no suffix, useful if user expects result in an empty directory, like created with mktemp
+            if (resultConfig.resultFilesSuffix == null)
+                resultConfig.resultFilesSuffix = "";
+
+            // If resultFilesSuffix contains forward slashes "/"
+            if (resultConfig.resultFilesSuffix.contains("/")) {
+                error = ResultSenderErrno.ERROR_RESULT_FILES_SUFFIX_INVALID.getError(resultConfig.resultFilesSuffix);
+                return error;
+            }
+
+            // Write result to result files under resultDirectoryPath
+
+            // Write stdout to file
+            if (!resultDataStdout.isEmpty()) {
+                filename = RESULT_SENDER.RESULT_FILE_STDOUT_PREFIX + resultConfig.resultFilesSuffix;
+                error = FileUtils.writeStringToFile(filename, resultConfig.resultDirectoryPath + "/" + filename,
+                    null, resultDataStdout, false);
+                if (error != null) {
+                    return error;
+                }
+            }
+
+            // Write stderr to file
+            if (!resultDataStderr.isEmpty()) {
+                filename = RESULT_SENDER.RESULT_FILE_STDERR_PREFIX + resultConfig.resultFilesSuffix;
+                error = FileUtils.writeStringToFile(filename, resultConfig.resultDirectoryPath + "/" + filename,
+                    null, resultDataStderr, false);
+                if (error != null) {
+                    return error;
+                }
+            }
+
+            // Write exitCode to file
+            if (!resultDataExitCode.isEmpty()) {
+                filename = RESULT_SENDER.RESULT_FILE_EXIT_CODE_PREFIX + resultConfig.resultFilesSuffix;
+                error = FileUtils.writeStringToFile(filename, resultConfig.resultDirectoryPath + "/" + filename,
+                    null, resultDataExitCode, false);
+                if (error != null) {
+                    return error;
+                }
+            }
+
+            // Write errmsg to file
+            if (resultData.isStateFailed() && !resultDataErrmsg.isEmpty()) {
+                filename = RESULT_SENDER.RESULT_FILE_ERRMSG_PREFIX + resultConfig.resultFilesSuffix;
+                error = FileUtils.writeStringToFile(filename, resultConfig.resultDirectoryPath + "/" + filename,
+                    null, resultDataErrmsg, false);
+                if (error != null) {
+                    return error;
+                }
+            }
+
+            // Write errCode to file
+            // This must be created after writing to other result files has already finished since
+            // caller should wait for this file to be created to be notified that the command has
+            // finished and should then start reading from the rest of the result files if they exist.
+            // Since there may be a delay between creation of errCode file and writing to it or flushing
+            // to disk, we create a temp file first and then move it to the final destination, since
+            // caller may otherwise read from an empty file in some cases.
+
+            // Write errCode to temp file
+            String temp_filename = RESULT_SENDER.RESULT_FILE_ERR_PREFIX + "-" + TermuxUtils.getCurrentMilliSecondLocalTimeStamp();
+            if (!resultConfig.resultFilesSuffix.isEmpty()) temp_filename = temp_filename + "-" + resultConfig.resultFilesSuffix;
+            error = FileUtils.writeStringToFile(temp_filename, resultConfig.resultDirectoryPath + "/" + temp_filename,
+                null, String.valueOf(resultData.getErrCode()), false);
+            if (error != null) {
+                return error;
+            }
+
+            // Move errCode temp file to final destination
+            filename = RESULT_SENDER.RESULT_FILE_ERR_PREFIX + resultConfig.resultFilesSuffix;
+            error = FileUtils.moveRegularFile(RESULT_SENDER.RESULT_FILE_ERR_PREFIX + " temp file", resultConfig.resultDirectoryPath + "/" + temp_filename,
+                resultConfig.resultDirectoryPath + "/" + filename, false);
+            if (error != null) {
+                return error;
+            }
+        }
+
+        return null;
+    }
+
+}
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/TermuxSession.java b/termux-shared/src/main/java/com/termux/shared/shell/TermuxSession.java
index 5bc654ce8b..e40e3e3175 100644
--- a/termux-shared/src/main/java/com/termux/shared/shell/TermuxSession.java
+++ b/termux-shared/src/main/java/com/termux/shared/shell/TermuxSession.java
@@ -7,6 +7,8 @@
 
 import com.termux.shared.R;
 import com.termux.shared.models.ExecutionCommand;
+import com.termux.shared.models.ResultData;
+import com.termux.shared.models.errors.Errno;
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.logger.Logger;
 import com.termux.terminal.TerminalSession;
@@ -51,7 +53,7 @@ private TermuxSession(@NonNull final TerminalSession terminalSession, @NonNull f
      * @param terminalSessionClient The {@link TerminalSessionClient} interface implementation.
      * @param termuxSessionClient The {@link TermuxSessionClient} interface implementation.
      * @param sessionName The optional {@link TerminalSession} name.
-     * @param setStdoutOnExit If set to {@code true}, then the {@link ExecutionCommand#stdout}
+     * @param setStdoutOnExit If set to {@code true}, then the {@link ResultData#stdout}
      *                        available in the {@link TermuxSessionClient#onTermuxSessionExited(TermuxSession)}
      *                        callback will be set to the {@link TerminalSession} transcript. The session
      *                        transcript will contain both stdout and stderr combined, basically
@@ -101,7 +103,7 @@ public static TermuxSession execute(@NonNull final Context context, @NonNull Exe
             executionCommand.commandLabel = processName;
 
         if (!executionCommand.setState(ExecutionCommand.ExecutionState.EXECUTING)) {
-            executionCommand.setStateFailed(ExecutionCommand.RESULT_CODE_FAILED, context.getString(R.string.error_failed_to_execute_termux_session_command, executionCommand.getCommandIdAndLabelLogString()), null);
+            executionCommand.setStateFailed(Errno.ERRNO_FAILED.getCode(), context.getString(R.string.error_failed_to_execute_termux_session_command, executionCommand.getCommandIdAndLabelLogString()));
             TermuxSession.processTermuxSessionResult(null, executionCommand);
             return null;
         }
@@ -122,8 +124,8 @@ public static TermuxSession execute(@NonNull final Context context, @NonNull Exe
      * Signal that this {@link TermuxSession} has finished.  This should be called when
      * {@link TerminalSessionClient#onSessionFinished(TerminalSession)} callback is received by the caller.
      *
-     * If the processes has finished, then sets {@link ExecutionCommand#stdout}, {@link ExecutionCommand#stderr}
-     * and {@link ExecutionCommand#exitCode} for the {@link #mExecutionCommand} of the {@code termuxTask}
+     * If the processes has finished, then sets {@link ResultData#stdout}, {@link ResultData#stderr}
+     * and {@link ResultData#exitCode} for the {@link #mExecutionCommand} of the {@code termuxTask}
      * and then calls {@link #processTermuxSessionResult(TermuxSession, ExecutionCommand)} to process the result}.
      *
      */
@@ -134,9 +136,9 @@ public void finish() {
         int exitCode = mTerminalSession.getExitStatus();
 
         if (exitCode == 0)
-            Logger.logDebug(LOG_TAG, "The \"" + mExecutionCommand.getCommandIdAndLabelLogString() + "\" TermuxSession with exited normally");
+            Logger.logDebug(LOG_TAG, "The \"" + mExecutionCommand.getCommandIdAndLabelLogString() + "\" TermuxSession exited normally");
         else
-            Logger.logDebug(LOG_TAG, "The \"" + mExecutionCommand.getCommandIdAndLabelLogString() + "\" TermuxSession with exited with code: " + exitCode);
+            Logger.logDebug(LOG_TAG, "The \"" + mExecutionCommand.getCommandIdAndLabelLogString() + "\" TermuxSession exited with code: " + exitCode);
 
         // If the execution command has already failed, like SIGKILL was sent, then don't continue
         if (mExecutionCommand.isStateFailed()) {
@@ -144,13 +146,10 @@ public void finish() {
             return;
         }
 
-        if (this.mSetStdoutOnExit)
-            mExecutionCommand.stdout = ShellUtils.getTerminalSessionTranscriptText(mTerminalSession, true, false);
-        else
-            mExecutionCommand.stdout = null;
+        mExecutionCommand.resultData.exitCode = exitCode;
 
-        mExecutionCommand.stderr = null;
-        mExecutionCommand.exitCode = exitCode;
+        if (this.mSetStdoutOnExit)
+            mExecutionCommand.resultData.stdout.append(ShellUtils.getTerminalSessionTranscriptText(mTerminalSession, true, false));
 
         if (!mExecutionCommand.setState(ExecutionCommand.ExecutionState.EXECUTED))
             return;
@@ -162,8 +161,6 @@ public void finish() {
      * Kill this {@link TermuxSession} by sending a {@link OsConstants#SIGILL} to its {@link #mTerminalSession}
      * if its still executing.
      *
-     * We process the results even if
-     *
      * @param context The {@link Context} for operations.
      * @param processResult If set to {@code true}, then the {@link #processTermuxSessionResult(TermuxSession, ExecutionCommand)}
      *                      will be called to process the failure.
@@ -176,16 +173,13 @@ public void killIfExecuting(@NonNull final Context context, boolean processResul
         }
 
         Logger.logDebug(LOG_TAG, "Send SIGKILL to \"" + mExecutionCommand.getCommandIdAndLabelLogString() + "\" TermuxSession");
-        if (mExecutionCommand.setStateFailed(ExecutionCommand.RESULT_CODE_FAILED, context.getString(R.string.error_sending_sigkill_to_process), null)) {
+        if (mExecutionCommand.setStateFailed(Errno.ERRNO_FAILED.getCode(), context.getString(R.string.error_sending_sigkill_to_process))) {
             if (processResult) {
+                mExecutionCommand.resultData.exitCode = 137; // SIGKILL
+
                 // Get whatever output has been set till now in case its needed
                 if (this.mSetStdoutOnExit)
-                    mExecutionCommand.stdout = ShellUtils.getTerminalSessionTranscriptText(mTerminalSession, true, false);
-                else
-                    mExecutionCommand.stdout = null;
-
-                mExecutionCommand.stderr = null;
-                mExecutionCommand.exitCode = 137; // SIGKILL
+                    mExecutionCommand.resultData.stdout.append(ShellUtils.getTerminalSessionTranscriptText(mTerminalSession, true, false));
 
                 TermuxSession.processTermuxSessionResult(this, null);
             }
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/TermuxTask.java b/termux-shared/src/main/java/com/termux/shared/shell/TermuxTask.java
index 4507b30f1c..eac551d70e 100644
--- a/termux-shared/src/main/java/com/termux/shared/shell/TermuxTask.java
+++ b/termux-shared/src/main/java/com/termux/shared/shell/TermuxTask.java
@@ -9,6 +9,8 @@
 
 import com.termux.shared.R;
 import com.termux.shared.models.ExecutionCommand;
+import com.termux.shared.models.ResultData;
+import com.termux.shared.models.errors.Errno;
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.logger.Logger;
 import com.termux.shared.models.ExecutionCommand.ExecutionState;
@@ -29,9 +31,6 @@ public final class TermuxTask {
     private final ExecutionCommand mExecutionCommand;
     private final TermuxTaskClient mTermuxTaskClient;
 
-    private final StringBuilder mStdout = new StringBuilder();
-    private final StringBuilder mStderr = new StringBuilder();
-
     private static final String LOG_TAG = "TermuxTask";
 
     private TermuxTask(@NonNull final Process process, @NonNull final ExecutionCommand executionCommand,
@@ -71,7 +70,7 @@ public static TermuxTask execute(@NonNull final Context context, @NonNull Execut
         final String[] commandArray = ShellUtils.setupProcessArgs(executionCommand.executable, executionCommand.arguments);
 
         if (!executionCommand.setState(ExecutionState.EXECUTING)) {
-            executionCommand.setStateFailed(ExecutionCommand.RESULT_CODE_FAILED, context.getString(R.string.error_failed_to_execute_termux_task_command, executionCommand.getCommandIdAndLabelLogString()), null);
+            executionCommand.setStateFailed(Errno.ERRNO_FAILED.getCode(), context.getString(R.string.error_failed_to_execute_termux_task_command, executionCommand.getCommandIdAndLabelLogString()));
             TermuxTask.processTermuxTaskResult(null, executionCommand);
             return null;
         }
@@ -88,7 +87,7 @@ public static TermuxTask execute(@NonNull final Context context, @NonNull Execut
         try {
             process = Runtime.getRuntime().exec(commandArray, env, new File(executionCommand.workingDirectory));
         } catch (IOException e) {
-            executionCommand.setStateFailed(ExecutionCommand.RESULT_CODE_FAILED, context.getString(R.string.error_failed_to_execute_termux_task_command, executionCommand.getCommandIdAndLabelLogString()), e);
+            executionCommand.setStateFailed(Errno.ERRNO_FAILED.getCode(), context.getString(R.string.error_failed_to_execute_termux_task_command, executionCommand.getCommandIdAndLabelLogString()), e);
             TermuxTask.processTermuxTaskResult(null, executionCommand);
             return null;
         }
@@ -120,8 +119,8 @@ public void run() {
     /**
      * Sets up stdout and stderr readers for the {@link #mProcess} and waits for the process to end.
      *
-     * If the processes finishes, then sets {@link ExecutionCommand#stdout}, {@link ExecutionCommand#stderr}
-     * and {@link ExecutionCommand#exitCode} for the {@link #mExecutionCommand} of the {@code termuxTask}
+     * If the processes finishes, then sets {@link ResultData#stdout}, {@link ResultData#stderr}
+     * and {@link ResultData#exitCode} for the {@link #mExecutionCommand} of the {@code termuxTask}
      * and then calls {@link #processTermuxTaskResult(TermuxTask, ExecutionCommand) to process the result}.
      *
      * @param context The {@link Context} for operations.
@@ -131,15 +130,12 @@ private void executeInner(@NonNull final Context context) throws IllegalThreadSt
 
         Logger.logDebug(LOG_TAG, "Running \"" + mExecutionCommand.getCommandIdAndLabelLogString() + "\" TermuxTask with pid " + pid);
 
-        mExecutionCommand.stdout = null;
-        mExecutionCommand.stderr = null;
-        mExecutionCommand.exitCode = null;
-
+        mExecutionCommand.resultData.exitCode = null;
 
         // setup stdin, and stdout and stderr gobblers
         DataOutputStream STDIN = new DataOutputStream(mProcess.getOutputStream());
-        StreamGobbler STDOUT = new StreamGobbler(pid + "-stdout", mProcess.getInputStream(), mStdout);
-        StreamGobbler STDERR = new StreamGobbler(pid + "-stderr", mProcess.getErrorStream(), mStderr);
+        StreamGobbler STDOUT = new StreamGobbler(pid + "-stdout", mProcess.getInputStream(), mExecutionCommand.resultData.stdout);
+        StreamGobbler STDERR = new StreamGobbler(pid + "-stderr", mProcess.getErrorStream(), mExecutionCommand.resultData.stderr);
 
         // start gobbling
         STDOUT.start();
@@ -153,7 +149,7 @@ private void executeInner(@NonNull final Context context) throws IllegalThreadSt
                 //STDIN.write("exit\n".getBytes(StandardCharsets.UTF_8));
                 //STDIN.flush();
             } catch(IOException e) {
-                if (e.getMessage().contains("EPIPE") || e.getMessage().contains("Stream closed")) {
+                if (e.getMessage() != null && (e.getMessage().contains("EPIPE") || e.getMessage().contains("Stream closed"))) {
                     // Method most horrid to catch broken pipe, in which case we
                     // do nothing. The command is not a shell, the shell closed
                     // STDIN, the script already contained the exit command, etc.
@@ -161,10 +157,8 @@ private void executeInner(@NonNull final Context context) throws IllegalThreadSt
                 } else {
                     // other issues we don't know how to handle, leads to
                     // returning null
-                    mExecutionCommand.setStateFailed(ExecutionCommand.RESULT_CODE_FAILED, context.getString(R.string.error_exception_received_while_executing_termux_task_command, mExecutionCommand.getCommandIdAndLabelLogString(), e.getMessage()), e);
-                    mExecutionCommand.stdout = mStdout.toString();
-                    mExecutionCommand.stderr = mStderr.toString();
-                    mExecutionCommand.exitCode = -1;
+                    mExecutionCommand.setStateFailed(Errno.ERRNO_FAILED.getCode(), context.getString(R.string.error_exception_received_while_executing_termux_task_command, mExecutionCommand.getCommandIdAndLabelLogString(), e.getMessage()), e);
+                    mExecutionCommand.resultData.exitCode = 1;
                     TermuxTask.processTermuxTaskResult(this, null);
                     kill();
                     return;
@@ -201,9 +195,7 @@ private void executeInner(@NonNull final Context context) throws IllegalThreadSt
             return;
         }
 
-        mExecutionCommand.stdout = mStdout.toString();
-        mExecutionCommand.stderr = mStderr.toString();
-        mExecutionCommand.exitCode = exitCode;
+        mExecutionCommand.resultData.exitCode = exitCode;
 
         if (!mExecutionCommand.setState(ExecutionState.EXECUTED))
             return;
@@ -228,13 +220,9 @@ public void killIfExecuting(@NonNull final Context context, boolean processResul
 
         Logger.logDebug(LOG_TAG, "Send SIGKILL to \"" + mExecutionCommand.getCommandIdAndLabelLogString() + "\" TermuxTask");
 
-        if (mExecutionCommand.setStateFailed(ExecutionCommand.RESULT_CODE_FAILED, context.getString(R.string.error_sending_sigkill_to_process), null)) {
+        if (mExecutionCommand.setStateFailed(Errno.ERRNO_FAILED.getCode(), context.getString(R.string.error_sending_sigkill_to_process))) {
             if (processResult) {
-                // Get whatever output has been set till now in case its needed
-                mExecutionCommand.stdout = mStdout.toString();
-                mExecutionCommand.stderr = mStderr.toString();
-                mExecutionCommand.exitCode = 137; // SIGKILL
-
+                mExecutionCommand.resultData.exitCode = 137; // SIGKILL
                 TermuxTask.processTermuxTaskResult(this, null);
             }
         }
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
index 7961920146..e7985a1484 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
@@ -2,12 +2,17 @@
 
 import android.annotation.SuppressLint;
 
+import com.termux.shared.models.ResultConfig;
+import com.termux.shared.models.errors.Errno;
+
 import java.io.File;
 import java.util.Arrays;
+import java.util.Formatter;
+import java.util.IllegalFormatException;
 import java.util.List;
 
 /*
- * Version: v0.23.0
+ * Version: v0.24.0
  *
  * Changelog
  *
@@ -152,6 +157,21 @@
  *
  * - 0.23.0 (2021-06-12)
  *      - Rename `INTERNAL_PRIVATE_APP_DATA_DIR_PATH` to `TERMUX_INTERNAL_PRIVATE_APP_DATA_DIR_PATH`.
+ *
+ * - 0.24.0 (2021-06-27)
+ *      - Add `COMMA_NORMAL`, `COMMA_ALTERNATIVE`.
+ *      - Added following to `TERMUX_APP.TERMUX_SERVICE`:
+ *          `EXTRA_RESULT_DIRECTORY`, `EXTRA_RESULT_SINGLE_FILE`, `EXTRA_RESULT_FILE_BASENAME`,
+ *          `EXTRA_RESULT_FILE_OUTPUT_FORMAT`, `EXTRA_RESULT_FILE_ERROR_FORMAT`, `EXTRA_RESULT_FILES_SUFFIX`.
+ *      - Added following to `TERMUX_APP.RUN_COMMAND_SERVICE`:
+ *          `EXTRA_RESULT_DIRECTORY`, `EXTRA_RESULT_SINGLE_FILE`, `EXTRA_RESULT_FILE_BASENAME`,
+ *          `EXTRA_RESULT_FILE_OUTPUT_FORMAT`, `EXTRA_RESULT_FILE_ERROR_FORMAT`, `EXTRA_RESULT_FILES_SUFFIX`,
+ *          `EXTRA_REPLACE_COMMA_ALTERNATIVE_CHARS_IN_ARGUMENTS`, `EXTRA_COMMA_ALTERNATIVE_CHARS_IN_ARGUMENTS`.
+ *      - Added following to `RESULT_SENDER`:
+ *           `FORMAT_SUCCESS_STDOUT`, `FORMAT_SUCCESS_STDOUT__EXIT_CODE`, `FORMAT_SUCCESS_STDOUT__STDERR__EXIT_CODE`
+ *           `FORMAT_FAILED_ERR__ERRMSG__STDOUT__STDERR__EXIT_CODE`,
+ *           `RESULT_FILE_ERR_PREFIX`, `RESULT_FILE_ERRMSG_PREFIX` `RESULT_FILE_STDOUT_PREFIX`,
+ *           `RESULT_FILE_STDERR_PREFIX`, `RESULT_FILE_EXIT_CODE_PREFIX`.
  */
 
 /**
@@ -636,19 +656,22 @@ public final class TermuxConstants {
     public static final File TERMUX_BOOT_SCRIPTS_DIR = new File(TERMUX_BOOT_SCRIPTS_DIR_PATH);
 
 
-    /** Termux app directory path to store foreground scripts that can be run by the termux launcher widget provided by Termux:Widget */
+    /** Termux app directory path to store foreground scripts that can be run by the termux launcher
+     * widget provided by Termux:Widget */
     public static final String TERMUX_SHORTCUT_SCRIPTS_DIR_PATH = TERMUX_DATA_HOME_DIR_PATH + "/shortcuts"; // Default: "/data/data/com.termux/files/home/.termux/shortcuts"
     /** Termux app directory to store foreground scripts that can be run by the termux launcher widget provided by Termux:Widget */
     public static final File TERMUX_SHORTCUT_SCRIPTS_DIR = new File(TERMUX_SHORTCUT_SCRIPTS_DIR_PATH);
 
 
-    /** Termux app directory path to store background scripts that can be run by the termux launcher widget provided by Termux:Widget */
+    /** Termux app directory path to store background scripts that can be run by the termux launcher
+     * widget provided by Termux:Widget */
     public static final String TERMUX_SHORTCUT_TASKS_SCRIPTS_DIR_PATH = TERMUX_DATA_HOME_DIR_PATH + "/shortcuts/tasks"; // Default: "/data/data/com.termux/files/home/.termux/shortcuts/tasks"
     /** Termux app directory to store background scripts that can be run by the termux launcher widget provided by Termux:Widget */
     public static final File TERMUX_SHORTCUT_TASKS_SCRIPTS_DIR = new File(TERMUX_SHORTCUT_TASKS_SCRIPTS_DIR_PATH);
 
 
-    /** Termux app directory path to store scripts to be run by 3rd party twofortyfouram locale plugin host apps like Tasker app via the Termux:Tasker plugin client */
+    /** Termux app directory path to store scripts to be run by 3rd party twofortyfouram locale plugin
+     * host apps like Tasker app via the Termux:Tasker plugin client */
     public static final String TERMUX_TASKER_SCRIPTS_DIR_PATH = TERMUX_DATA_HOME_DIR_PATH + "/tasker"; // Default: "/data/data/com.termux/files/home/.termux/tasker"
     /** Termux app directory to store scripts to be run by 3rd party twofortyfouram locale plugin host apps like Tasker app via the Termux:Tasker plugin client */
     public static final File TERMUX_TASKER_SCRIPTS_DIR = new File(TERMUX_TASKER_SCRIPTS_DIR_PATH);
@@ -693,10 +716,12 @@ public final class TermuxConstants {
      * Termux app and plugins miscellaneous variables.
      */
 
-    /** Android OS permission declared by Termux app in AndroidManifest.xml which can be requested by 3rd party apps to run various commands in Termux app context */
+    /** Android OS permission declared by Termux app in AndroidManifest.xml which can be requested by
+     * 3rd party apps to run various commands in Termux app context */
     public static final String PERMISSION_RUN_COMMAND = TERMUX_PACKAGE_NAME + ".permission.RUN_COMMAND"; // Default: "com.termux.permission.RUN_COMMAND"
 
-    /** Termux property defined in termux.properties file as a secondary check to PERMISSION_RUN_COMMAND to allow 3rd party apps to run various commands in Termux app context */
+    /** Termux property defined in termux.properties file as a secondary check to PERMISSION_RUN_COMMAND
+     * to allow 3rd party apps to run various commands in Termux app context */
     public static final String PROP_ALLOW_EXTERNAL_APPS = "allow-external-apps"; // Default: "allow-external-apps"
     /** Default value for {@link #PROP_ALLOW_EXTERNAL_APPS} */
     public static final String PROP_DEFAULT_VALUE_ALLOW_EXTERNAL_APPS = "false"; // Default: "false"
@@ -707,6 +732,14 @@ public final class TermuxConstants {
     /** The Uri authority for Termux app file shares */
     public static final String TERMUX_FILE_SHARE_URI_AUTHORITY = TERMUX_PACKAGE_NAME + ".files"; // Default: "com.termux.files"
 
+    /** The normal comma character (U+002C, &comma;, &#44;, comma) */
+    public static final String COMMA_NORMAL = ","; // Default: ","
+
+    /** The alternate comma character (U+201A, &sbquo;, &#8218;, single low-9 quotation mark) that
+     * may be used instead of {@link #COMMA_NORMAL} */
+    public static final String COMMA_ALTERNATIVE = "‚"; // Default: "‚"
+
+
 
 
 
@@ -772,6 +805,7 @@ public static final class TERMUX_SERVICE {
 
             /** Intent action to execute command with TERMUX_SERVICE */
             public static final String ACTION_SERVICE_EXECUTE = TERMUX_PACKAGE_NAME + ".service_execute"; // Default: "com.termux.service_execute"
+
             /** Uri scheme for paths sent via intent to TERMUX_SERVICE */
             public static final String URI_SCHEME_SERVICE_EXECUTE = TERMUX_PACKAGE_NAME + ".file"; // Default: "com.termux.file"
             /** Intent {@code String[]} extra for arguments to the executable of the command for the TERMUX_SERVICE.ACTION_SERVICE_EXECUTE intent */
@@ -792,8 +826,30 @@ public static final class TERMUX_SERVICE {
             public static final String EXTRA_COMMAND_HELP = TERMUX_PACKAGE_NAME + ".execute.command_help"; // Default: "com.termux.execute.command_help"
             /** Intent markdown {@code String} extra for help of the plugin API for the TERMUX_SERVICE.ACTION_SERVICE_EXECUTE intent (Internal Use Only) */
             public static final String EXTRA_PLUGIN_API_HELP = TERMUX_PACKAGE_NAME + ".execute.plugin_api_help"; // Default: "com.termux.execute.plugin_help"
-            /** Intent {@code Parcelable} extra containing pending intent for the execute command caller */
+            /** Intent {@code Parcelable} extra for the pending intent that should be sent with the
+             * result of the execution command to the execute command caller for the TERMUX_SERVICE.ACTION_SERVICE_EXECUTE intent */
             public static final String EXTRA_PENDING_INTENT = "pendingIntent"; // Default: "pendingIntent"
+            /** Intent {@code String} extra for the directory path in which to write the result of the
+             * execution command for the execute command caller for the TERMUX_SERVICE.ACTION_SERVICE_EXECUTE intent */
+            public static final String EXTRA_RESULT_DIRECTORY = TERMUX_PACKAGE_NAME + ".execute.result_directory"; // Default: "com.termux.execute.result_directory"
+            /** Intent {@code boolean} extra for whether the result should be written to a single file
+             * or multiple files (err, errmsg, stdout, stderr, exit_code) in
+             * {@link #EXTRA_RESULT_DIRECTORY} for the TERMUX_SERVICE.ACTION_SERVICE_EXECUTE intent */
+            public static final String EXTRA_RESULT_SINGLE_FILE = TERMUX_PACKAGE_NAME + ".execute.result_single_file"; // Default: "com.termux.execute.result_single_file"
+            /** Intent {@code String} extra for the basename of the result file that should be created
+             * in {@link #EXTRA_RESULT_DIRECTORY} if {@link #EXTRA_RESULT_SINGLE_FILE} is {@code true}
+             * for the TERMUX_SERVICE.ACTION_SERVICE_EXECUTE intent */
+            public static final String EXTRA_RESULT_FILE_BASENAME = TERMUX_PACKAGE_NAME + ".execute.result_file_basename"; // Default: "com.termux.execute.result_file_basename"
+            /** Intent {@code String} extra for the output {@link Formatter} format of the
+             * {@link #EXTRA_RESULT_FILE_BASENAME} result file for the TERMUX_SERVICE.ACTION_SERVICE_EXECUTE intent */
+            public static final String EXTRA_RESULT_FILE_OUTPUT_FORMAT = TERMUX_PACKAGE_NAME + ".execute.result_file_output_format"; // Default: "com.termux.execute.result_file_output_format"
+            /** Intent {@code String} extra for the error {@link Formatter} format of the
+             * {@link #EXTRA_RESULT_FILE_BASENAME} result file for the TERMUX_SERVICE.ACTION_SERVICE_EXECUTE intent */
+            public static final String EXTRA_RESULT_FILE_ERROR_FORMAT = TERMUX_PACKAGE_NAME + ".execute.result_file_error_format"; // Default: "com.termux.execute.result_file_error_format"
+            /** Intent {@code String} extra for the optional suffix of the result files that should
+             * be created in {@link #EXTRA_RESULT_DIRECTORY} if {@link #EXTRA_RESULT_SINGLE_FILE} is
+             * {@code false} for the TERMUX_SERVICE.ACTION_SERVICE_EXECUTE intent */
+            public static final String EXTRA_RESULT_FILES_SUFFIX = TERMUX_PACKAGE_NAME + ".execute.result_files_suffix"; // Default: "com.termux.execute.result_files_suffix"
 
 
 
@@ -864,12 +920,19 @@ public static final class RUN_COMMAND_SERVICE {
             /** Termux RUN_COMMAND Intent help url */
             public static final String RUN_COMMAND_API_HELP_URL = TERMUX_GITHUB_WIKI_REPO_URL + "/RUN_COMMAND-Intent"; // Default: "https://github.com/termux/termux-app/wiki/RUN_COMMAND-Intent"
 
+
             /** Intent action to execute command with RUN_COMMAND_SERVICE */
             public static final String ACTION_RUN_COMMAND = TERMUX_PACKAGE_NAME + ".RUN_COMMAND"; // Default: "com.termux.RUN_COMMAND"
+
             /** Intent {@code String} extra for absolute path of command for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent */
             public static final String EXTRA_COMMAND_PATH = TERMUX_PACKAGE_NAME + ".RUN_COMMAND_PATH"; // Default: "com.termux.RUN_COMMAND_PATH"
             /** Intent {@code String[]} extra for arguments to the executable of the command for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent */
             public static final String EXTRA_ARGUMENTS = TERMUX_PACKAGE_NAME + ".RUN_COMMAND_ARGUMENTS"; // Default: "com.termux.RUN_COMMAND_ARGUMENTS"
+            /** Intent {@code boolean} extra for whether to replace comma alternative characters in arguments with comma characters for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent */
+            public static final String EXTRA_REPLACE_COMMA_ALTERNATIVE_CHARS_IN_ARGUMENTS = TERMUX_PACKAGE_NAME + ".RUN_COMMAND_REPLACE_COMMA_ALTERNATIVE_CHARS_IN_ARGUMENTS"; // Default: "com.termux.RUN_COMMAND_REPLACE_COMMA_ALTERNATIVE_CHARS_IN_ARGUMENTS"
+            /** Intent {@code String} extra for the comma alternative characters in arguments that should be replaced instead of the default {@link #COMMA_ALTERNATIVE} for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent */
+            public static final String EXTRA_COMMA_ALTERNATIVE_CHARS_IN_ARGUMENTS = TERMUX_PACKAGE_NAME + ".RUN_COMMAND_COMMA_ALTERNATIVE_CHARS_IN_ARGUMENTS"; // Default: "com.termux.RUN_COMMAND_COMMA_ALTERNATIVE_CHARS_IN_ARGUMENTS"
+
             /** Intent {@code String} extra for stdin of the command for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent */
             public static final String EXTRA_STDIN = TERMUX_PACKAGE_NAME + ".RUN_COMMAND_STDIN"; // Default: "com.termux.RUN_COMMAND_STDIN"
             /** Intent {@code String} extra for current working directory of command for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent */
@@ -884,8 +947,29 @@ public static final class RUN_COMMAND_SERVICE {
             public static final String EXTRA_COMMAND_DESCRIPTION = TERMUX_PACKAGE_NAME + ".RUN_COMMAND_COMMAND_DESCRIPTION"; // Default: "com.termux.RUN_COMMAND_COMMAND_DESCRIPTION"
             /** Intent markdown {@code String} extra for help of the command for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent */
             public static final String EXTRA_COMMAND_HELP = TERMUX_PACKAGE_NAME + ".RUN_COMMAND_COMMAND_HELP"; // Default: "com.termux.RUN_COMMAND_COMMAND_HELP"
-            /** Intent {@code Parcelable} extra containing pending intent for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent */
+            /** Intent {@code Parcelable} extra for the pending intent that should be sent with the result of the execution command to the execute command caller for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent */
             public static final String EXTRA_PENDING_INTENT = TERMUX_PACKAGE_NAME + ".RUN_COMMAND_PENDING_INTENT"; // Default: "com.termux.RUN_COMMAND_PENDING_INTENT"
+            /** Intent {@code String} extra for the directory path in which to write the result of
+             * the execution command for the execute command caller for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent */
+            public static final String EXTRA_RESULT_DIRECTORY = TERMUX_PACKAGE_NAME + ".RUN_COMMAND_RESULT_DIRECTORY"; // Default: "com.termux.RUN_COMMAND_RESULT_DIRECTORY"
+            /** Intent {@code boolean} extra for whether the result should be written to a single file
+             * or multiple files (err, errmsg, stdout, stderr, exit_code) in
+             * {@link #EXTRA_RESULT_DIRECTORY} for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent */
+            public static final String EXTRA_RESULT_SINGLE_FILE = TERMUX_PACKAGE_NAME + ".RUN_COMMAND_RESULT_SINGLE_FILE"; // Default: "com.termux.RUN_COMMAND_RESULT_SINGLE_FILE"
+            /** Intent {@code String} extra for the basename of the result file that should be created
+             * in {@link #EXTRA_RESULT_DIRECTORY} if {@link #EXTRA_RESULT_SINGLE_FILE} is {@code true}
+             * for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent */
+            public static final String EXTRA_RESULT_FILE_BASENAME = TERMUX_PACKAGE_NAME + ".RUN_COMMAND_RESULT_FILE_BASENAME"; // Default: "com.termux.RUN_COMMAND_RESULT_FILE_BASENAME"
+            /** Intent {@code String} extra for the output {@link Formatter} format of the
+             * {@link #EXTRA_RESULT_FILE_BASENAME} result file for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent */
+            public static final String EXTRA_RESULT_FILE_OUTPUT_FORMAT = TERMUX_PACKAGE_NAME + ".RUN_COMMAND_RESULT_FILE_OUTPUT_FORMAT"; // Default: "com.termux.RUN_COMMAND_RESULT_FILE_OUTPUT_FORMAT"
+            /** Intent {@code String} extra for the error {@link Formatter} format of the
+             * {@link #EXTRA_RESULT_FILE_BASENAME} result file for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent */
+            public static final String EXTRA_RESULT_FILE_ERROR_FORMAT = TERMUX_PACKAGE_NAME + ".RUN_COMMAND_RESULT_FILE_ERROR_FORMAT"; // Default: "com.termux.RUN_COMMAND_RESULT_FILE_ERROR_FORMAT"
+            /** Intent {@code String} extra for the optional suffix of the result files that should be
+             * created in {@link #EXTRA_RESULT_DIRECTORY} if {@link #EXTRA_RESULT_SINGLE_FILE} is
+             * {@code false} for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent */
+            public static final String EXTRA_RESULT_FILES_SUFFIX = TERMUX_PACKAGE_NAME + ".RUN_COMMAND_RESULT_FILES_SUFFIX"; // Default: "com.termux.RUN_COMMAND_RESULT_FILES_SUFFIX"
 
         }
     }
@@ -894,6 +978,66 @@ public static final class RUN_COMMAND_SERVICE {
 
 
 
+    /**
+     * Termux class to send back results of commands to their callers like plugin or 3rd party apps.
+     */
+    public static final class RESULT_SENDER {
+
+        /*
+         * The default `Formatter` format strings to use for `ResultConfig#resultFileBasename`
+         * if `ResultConfig#resultSingleFile` is `true`.
+         */
+
+        /** The {@link Formatter} format string for success if only `stdout` needs to be written to
+         * {@link ResultConfig#resultFileBasename} where `stdout` maps to `%1$s`.
+         * This is used when `err` equals {@link Errno#ERRNO_SUCCESS} (-1) and `stderr` is empty
+         * and `exit_code` equals `0` and {@link ResultConfig#resultFileOutputFormat} is not passed. */
+        public static final String FORMAT_SUCCESS_STDOUT = "%1$s%n";
+        /** The {@link Formatter} format string for success if `stdout` and `exit_code` need to be written to
+         * {@link ResultConfig#resultFileBasename} where `stdout` maps to `%1$s` and `exit_code` to `%2$s`.
+         * This is used when `err` equals {@link Errno#ERRNO_SUCCESS} (-1) and `stderr` is empty
+         * and `exit_code` does not equal `0` and {@link ResultConfig#resultFileOutputFormat} is not passed. */
+        public static final String FORMAT_SUCCESS_STDOUT__EXIT_CODE = "%1$s%n%n%n%nexit_code=`%2$s`%n";
+        /** The {@link Formatter} format string for success if `stdout`, `stderr` and `exit_code` need to be
+         * written to {@link ResultConfig#resultFileBasename} where `stdout` maps to `%1$s`, `stderr`
+         * maps to `%2$s` and `exit_code` to `%3$s`.
+         * This is used when `err` equals {@link Errno#ERRNO_SUCCESS} (-1) and `stderr` is not empty
+         * and {@link ResultConfig#resultFileOutputFormat} is not passed. */
+        public static final String FORMAT_SUCCESS_STDOUT__STDERR__EXIT_CODE = "stdout=%n```%n%1$s%n```%n%n%n%nstderr=%n```%n%2$s%n```%n%n%n%nexit_code=`%3$s`%n";
+        /** The {@link Formatter} format string for failure if `err`, `errmsg`(`error`), `stdout`,
+         * `stderr` and `exit_code` need to be written to {@link ResultConfig#resultFileBasename} where
+         * `err` maps to `%1$s`, `errmsg` maps to `%2$s`, `stdout` maps
+         * to `%3$s`, `stderr` to `%4$s` and `exit_code` maps to `%5$s`.
+         * Do not define an argument greater than `5`, like `%6$s` if you change this value since it will
+         * raise {@link IllegalFormatException}.
+         * This is used when `err` does not equal {@link Errno#ERRNO_SUCCESS} (-1) and
+         * {@link ResultConfig#resultFileErrorFormat} is not passed. */
+        public static final String FORMAT_FAILED_ERR__ERRMSG__STDOUT__STDERR__EXIT_CODE = "err=`%1$s`%n%n%n%nerrmsg=%n```%n%2$s%n```%n%n%n%nstdout=%n```%n%3$s%n```%n%n%n%nstderr=%n```%n%4$s%n```%n%n%n%nexit_code=`%5$s`%n";
+
+
+
+        /*
+         * The default prefixes to use for result files under `ResultConfig#resultDirectoryPath`
+         * if `ResultConfig#resultSingleFile` is `false`.
+         */
+
+        /** The prefix for the err result file. */
+        public static final String RESULT_FILE_ERR_PREFIX = "err";
+        /** The prefix for the errmsg result file. */
+        public static final String RESULT_FILE_ERRMSG_PREFIX = "errmsg";
+        /** The prefix for the stdout result file. */
+        public static final String RESULT_FILE_STDOUT_PREFIX = "stdout";
+        /** The prefix for the stderr result file. */
+        public static final String RESULT_FILE_STDERR_PREFIX = "stderr";
+        /** The prefix for the exitCode result file. */
+        public static final String RESULT_FILE_EXIT_CODE_PREFIX = "exit_code";
+
+    }
+
+
+
+
+
     /**
      * Termux:Styling app constants.
      */
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
index 6ad9a18e03..1296def972 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
@@ -400,18 +400,18 @@ public static String geAPTInfoMarkdownString(@NonNull final Context context) {
 
         ExecutionCommand executionCommand = new ExecutionCommand(1, TermuxConstants.TERMUX_BIN_PREFIX_DIR_PATH + "/bash", null, aptInfoScript, null, true, false);
         TermuxTask termuxTask = TermuxTask.execute(context, executionCommand, null, true);
-        if (termuxTask == null || !executionCommand.isSuccessful() || executionCommand.exitCode != 0) {
+        if (termuxTask == null || !executionCommand.isSuccessful() || executionCommand.resultData.exitCode != 0) {
             Logger.logError(LOG_TAG, executionCommand.toString());
             return null;
         }
 
-        if (executionCommand.stderr != null && !executionCommand.stderr.isEmpty())
+        if (!executionCommand.resultData.stderr.toString().isEmpty())
             Logger.logError(LOG_TAG, executionCommand.toString());
 
         StringBuilder markdownString = new StringBuilder();
 
         markdownString.append("## ").append(TermuxConstants.TERMUX_APP_NAME).append(" APT Info\n\n");
-        markdownString.append(executionCommand.stdout);
+        markdownString.append(executionCommand.resultData.stdout.toString());
 
         return markdownString.toString();
     }
@@ -496,6 +496,13 @@ public static String getCurrentTimeStamp() {
         return df.format(new Date());
     }
 
+    public static String getCurrentMilliSecondLocalTimeStamp() {
+        @SuppressLint("SimpleDateFormat")
+        final SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd_HH.mm.ss.SSS");
+        df.setTimeZone(TimeZone.getDefault());
+        return df.format(new Date());
+    }
+
     public static String getAPKRelease(String signingCertificateSHA256Digest) {
         if (signingCertificateSHA256Digest == null) return "null";
 

From 53c1a49b5baaa57b8777daeb962fdfee841304d8 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Mon, 28 Jun 2021 05:57:45 +0500
Subject: [PATCH 429/912] Make TermuxTask and TermuxSession agnostic to termux
 environment

Those classes shouldn't be tied to termux environment like variables, interpreters and working directory since commands may need to be executed with a different environment like android's or with a different logic. Now both classes use the ShellEnvironmentClient interface to dynamically get the environment to be used which currently for Termux's case is implemented by TermuxShellEnvironmentClient which is just a wrapper for TermuxShellUtils since later implements static functions.
---
 .../java/com/termux/app/TermuxService.java    |  10 +-
 .../shared/shell/ShellEnvironmentClient.java  |  47 ++++++
 .../com/termux/shared/shell/ShellUtils.java   | 134 ----------------
 .../termux/shared/shell/TermuxSession.java    |  22 ++-
 .../shell/TermuxShellEnvironmentClient.java   |  33 ++++
 .../termux/shared/shell/TermuxShellUtils.java | 150 ++++++++++++++++++
 .../com/termux/shared/shell/TermuxTask.java   |  19 ++-
 .../com/termux/shared/termux/TermuxUtils.java |   3 +-
 8 files changed, 265 insertions(+), 153 deletions(-)
 create mode 100644 termux-shared/src/main/java/com/termux/shared/shell/ShellEnvironmentClient.java
 create mode 100644 termux-shared/src/main/java/com/termux/shared/shell/TermuxShellEnvironmentClient.java
 create mode 100644 termux-shared/src/main/java/com/termux/shared/shell/TermuxShellUtils.java

diff --git a/app/src/main/java/com/termux/app/TermuxService.java b/app/src/main/java/com/termux/app/TermuxService.java
index 6404bf46f3..d79f8e5c37 100644
--- a/app/src/main/java/com/termux/app/TermuxService.java
+++ b/app/src/main/java/com/termux/app/TermuxService.java
@@ -25,6 +25,9 @@
 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;
@@ -34,7 +37,6 @@
 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;
@@ -162,7 +164,7 @@ public int onStartCommand(Intent intent, int flags, int startId) {
     public void onDestroy() {
         Logger.logVerbose(LOG_TAG, "onDestroy");
 
-        ShellUtils.clearTermuxTMPDIR(true);
+        TermuxShellUtils.clearTermuxTMPDIR(true);
 
         actionReleaseWakeLock(false);
         if (!mWantsToStop)
@@ -426,7 +428,7 @@ public synchronized TermuxTask createTermuxTask(ExecutionCommand executionComman
         if (Logger.getLogLevel() >= Logger.LOG_LEVEL_VERBOSE)
             Logger.logVerbose(LOG_TAG, executionCommand.toString());
 
-        TermuxTask newTermuxTask = TermuxTask.execute(this, executionCommand, this, false);
+        TermuxTask newTermuxTask = TermuxTask.execute(this, executionCommand, this, new TermuxShellEnvironmentClient(), 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
@@ -522,7 +524,7 @@ public synchronized TermuxSession createTermuxSession(ExecutionCommand execution
         // 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, sessionName, executionCommand.isPluginExecutionCommand);
+        TermuxSession newTermuxSession = TermuxSession.execute(this, executionCommand, getTermuxTerminalSessionClient(), this, new TermuxShellEnvironmentClient(), 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
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/ShellEnvironmentClient.java b/termux-shared/src/main/java/com/termux/shared/shell/ShellEnvironmentClient.java
new file mode 100644
index 0000000000..f8ed9a1024
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/shell/ShellEnvironmentClient.java
@@ -0,0 +1,47 @@
+package com.termux.shared.shell;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+
+public interface ShellEnvironmentClient {
+
+    /**
+     * Get the default working directory path for the environment in case the path that was passed
+     * was {@code null} or empty.
+     *
+     * @return Should return the default working directory path.
+     */
+    @NonNull
+    String getDefaultWorkingDirectoryPath();
+
+    /**
+     * Get the default "/bin" path, likely $PREFIX/bin.
+     *
+     * @return Should return the "/bin" path.
+     */
+    @NonNull
+    String getDefaultBinPath();
+
+    /**
+     * Build the shell environment to be used for commands.
+     *
+     * @param currentPackageContext The {@link Context} for the current package.
+     * @param isFailSafe If running a failsafe session.
+     * @param workingDirectory The working directory for the environment.
+     * @return Should return the build environment.
+     */
+    @NonNull
+    String[] buildEnvironment(Context currentPackageContext, boolean isFailSafe, String workingDirectory);
+
+    /**
+     * Setup process arguments for the file to execute, like interpreter, etc.
+     *
+     * @param fileToExecute The file to execute.
+     * @param arguments     The arguments to pass to the executable.
+     * @return Should return the final process arguments.
+     */
+    @NonNull
+    String[] setupProcessArgs(@NonNull String fileToExecute, String[] arguments);
+
+}
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/ShellUtils.java b/termux-shared/src/main/java/com/termux/shared/shell/ShellUtils.java
index 89c66f3c1c..d6687e05cc 100644
--- a/termux-shared/src/main/java/com/termux/shared/shell/ShellUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/shell/ShellUtils.java
@@ -1,82 +1,13 @@
 package com.termux.shared.shell;
 
-import android.content.Context;
-
-import androidx.annotation.NonNull;
-
-import com.termux.shared.models.errors.Error;
-import com.termux.shared.termux.TermuxConstants;
-import com.termux.shared.file.FileUtils;
-import com.termux.shared.logger.Logger;
-import com.termux.shared.packages.PackageUtils;
-import com.termux.shared.termux.TermuxUtils;
 import com.termux.terminal.TerminalBuffer;
 import com.termux.terminal.TerminalEmulator;
 import com.termux.terminal.TerminalSession;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
 import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
 
 public class ShellUtils {
 
-    public static String[] buildEnvironment(Context currentPackageContext, boolean isFailSafe, String workingDirectory) {
-        TermuxConstants.TERMUX_HOME_DIR.mkdirs();
-
-        if (workingDirectory == null || workingDirectory.isEmpty()) workingDirectory = TermuxConstants.TERMUX_HOME_DIR_PATH;
-
-        List<String> environment = new ArrayList<>();
-
-        // This function may be called by a different package like a plugin, so we get version for Termux package via its context
-        Context termuxPackageContext = TermuxUtils.getTermuxPackageContext(currentPackageContext);
-        if (termuxPackageContext != null) {
-            String termuxVersionName = PackageUtils.getVersionNameForPackage(termuxPackageContext);
-            if (termuxVersionName != null)
-                environment.add("TERMUX_VERSION=" + termuxVersionName);
-        }
-
-        environment.add("TERM=xterm-256color");
-        environment.add("COLORTERM=truecolor");
-        environment.add("HOME=" + TermuxConstants.TERMUX_HOME_DIR_PATH);
-        environment.add("PREFIX=" + TermuxConstants.TERMUX_PREFIX_DIR_PATH);
-        environment.add("BOOTCLASSPATH=" + System.getenv("BOOTCLASSPATH"));
-        environment.add("ANDROID_ROOT=" + System.getenv("ANDROID_ROOT"));
-        environment.add("ANDROID_DATA=" + System.getenv("ANDROID_DATA"));
-        // EXTERNAL_STORAGE is needed for /system/bin/am to work on at least
-        // Samsung S7 - see https://plus.google.com/110070148244138185604/posts/gp8Lk3aCGp3.
-        environment.add("EXTERNAL_STORAGE=" + System.getenv("EXTERNAL_STORAGE"));
-
-        // These variables are needed if running on Android 10 and higher.
-        addToEnvIfPresent(environment, "ANDROID_ART_ROOT");
-        addToEnvIfPresent(environment, "DEX2OATBOOTCLASSPATH");
-        addToEnvIfPresent(environment, "ANDROID_I18N_ROOT");
-        addToEnvIfPresent(environment, "ANDROID_RUNTIME_ROOT");
-        addToEnvIfPresent(environment, "ANDROID_TZDATA_ROOT");
-
-        if (isFailSafe) {
-            // Keep the default path so that system binaries can be used in the failsafe session.
-            environment.add("PATH= " + System.getenv("PATH"));
-        } else {
-            environment.add("LANG=en_US.UTF-8");
-            environment.add("PATH=" + TermuxConstants.TERMUX_BIN_PREFIX_DIR_PATH);
-            environment.add("PWD=" + workingDirectory);
-            environment.add("TMPDIR=" + TermuxConstants.TERMUX_TMP_PREFIX_DIR_PATH);
-        }
-
-        return environment.toArray(new String[0]);
-    }
-
-    public static void addToEnvIfPresent(List<String> environment, String name) {
-        String value = System.getenv(name);
-        if (value != null) {
-            environment.add(name + "=" + value);
-        }
-    }
-
     public static int getPid(Process p) {
         try {
             Field f = p.getClass().getDeclaredField("pid");
@@ -91,77 +22,12 @@ public static int getPid(Process p) {
         }
     }
 
-    public static String[] setupProcessArgs(@NonNull String fileToExecute, String[] arguments) {
-        // The file to execute may either be:
-        // - An elf file, in which we execute it directly.
-        // - A script file without shebang, which we execute with our standard shell $PREFIX/bin/sh instead of the
-        //   system /system/bin/sh. The system shell may vary and may not work at all due to LD_LIBRARY_PATH.
-        // - A file with shebang, which we try to handle with e.g. /bin/foo -> $PREFIX/bin/foo.
-        String interpreter = null;
-        try {
-            File file = new File(fileToExecute);
-            try (FileInputStream in = new FileInputStream(file)) {
-                byte[] buffer = new byte[256];
-                int bytesRead = in.read(buffer);
-                if (bytesRead > 4) {
-                    if (buffer[0] == 0x7F && buffer[1] == 'E' && buffer[2] == 'L' && buffer[3] == 'F') {
-                        // Elf file, do nothing.
-                    } else if (buffer[0] == '#' && buffer[1] == '!') {
-                        // Try to parse shebang.
-                        StringBuilder builder = new StringBuilder();
-                        for (int i = 2; i < bytesRead; i++) {
-                            char c = (char) buffer[i];
-                            if (c == ' ' || c == '\n') {
-                                if (builder.length() == 0) {
-                                    // Skip whitespace after shebang.
-                                } else {
-                                    // End of shebang.
-                                    String executable = builder.toString();
-                                    if (executable.startsWith("/usr") || executable.startsWith("/bin")) {
-                                        String[] parts = executable.split("/");
-                                        String binary = parts[parts.length - 1];
-                                        interpreter = TermuxConstants.TERMUX_BIN_PREFIX_DIR_PATH + "/" + binary;
-                                    }
-                                    break;
-                                }
-                            } else {
-                                builder.append(c);
-                            }
-                        }
-                    } else {
-                        // No shebang and no ELF, use standard shell.
-                        interpreter = TermuxConstants.TERMUX_BIN_PREFIX_DIR_PATH + "/sh";
-                    }
-                }
-            }
-        } catch (IOException e) {
-            // Ignore.
-        }
-
-        List<String> result = new ArrayList<>();
-        if (interpreter != null) result.add(interpreter);
-        result.add(fileToExecute);
-        if (arguments != null) Collections.addAll(result, arguments);
-        return result.toArray(new String[0]);
-    }
-
     public static String getExecutableBasename(String executable) {
         if (executable == null) return null;
         int lastSlash = executable.lastIndexOf('/');
         return (lastSlash == -1) ? executable : executable.substring(lastSlash + 1);
     }
 
-    public static void clearTermuxTMPDIR(boolean onlyIfExists) {
-        if(onlyIfExists && !FileUtils.directoryFileExists(TermuxConstants.TERMUX_TMP_PREFIX_DIR_PATH, false))
-            return;
-
-        Error error;
-        error = FileUtils.clearDirectory("$TMPDIR", FileUtils.getCanonicalPath(TermuxConstants.TERMUX_TMP_PREFIX_DIR_PATH, null));
-        if (error != null) {
-            Logger.logErrorExtended(error.toString());
-        }
-    }
-
     public static String getTerminalSessionTranscriptText(TerminalSession terminalSession, boolean linesJoined, boolean trim) {
         if (terminalSession == null) return null;
 
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/TermuxSession.java b/termux-shared/src/main/java/com/termux/shared/shell/TermuxSession.java
index e40e3e3175..e67ab9fd4d 100644
--- a/termux-shared/src/main/java/com/termux/shared/shell/TermuxSession.java
+++ b/termux-shared/src/main/java/com/termux/shared/shell/TermuxSession.java
@@ -9,7 +9,6 @@
 import com.termux.shared.models.ExecutionCommand;
 import com.termux.shared.models.ResultData;
 import com.termux.shared.models.errors.Errno;
-import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.logger.Logger;
 import com.termux.terminal.TerminalSession;
 import com.termux.terminal.TerminalSessionClient;
@@ -52,6 +51,7 @@ private TermuxSession(@NonNull final TerminalSession terminalSession, @NonNull f
      * @param executionCommand The {@link ExecutionCommand} containing the information for execution command.
      * @param terminalSessionClient The {@link TerminalSessionClient} interface implementation.
      * @param termuxSessionClient The {@link TermuxSessionClient} interface implementation.
+     * @param shellEnvironmentClient The {@link ShellEnvironmentClient} interface implementation.
      * @param sessionName The optional {@link TerminalSession} name.
      * @param setStdoutOnExit If set to {@code true}, then the {@link ResultData#stdout}
      *                        available in the {@link TermuxSessionClient#onTermuxSessionExited(TermuxSession)}
@@ -64,16 +64,24 @@ private TermuxSession(@NonNull final TerminalSession terminalSession, @NonNull f
      */
     public static TermuxSession execute(@NonNull final Context context, @NonNull ExecutionCommand executionCommand,
                                         @NonNull final TerminalSessionClient terminalSessionClient, final TermuxSessionClient termuxSessionClient,
+                                        @NonNull final ShellEnvironmentClient shellEnvironmentClient,
                                         final String sessionName, final boolean setStdoutOnExit) {
-        if (executionCommand.workingDirectory == null || executionCommand.workingDirectory.isEmpty()) executionCommand.workingDirectory = TermuxConstants.TERMUX_HOME_DIR_PATH;
+        if (executionCommand.workingDirectory == null || executionCommand.workingDirectory.isEmpty())
+            executionCommand.workingDirectory = shellEnvironmentClient.getDefaultWorkingDirectoryPath();
+        if (executionCommand.workingDirectory.isEmpty())
+            executionCommand.workingDirectory = "/";
 
-        String[] environment = ShellUtils.buildEnvironment(context, executionCommand.isFailsafe, executionCommand.workingDirectory);
+        String[] environment = shellEnvironmentClient.buildEnvironment(context, executionCommand.isFailsafe, executionCommand.workingDirectory);
+
+        String defaultBinPath = shellEnvironmentClient.getDefaultBinPath();
+        if (defaultBinPath.isEmpty())
+            defaultBinPath = "/system/bin";
 
         boolean isLoginShell = false;
         if (executionCommand.executable == null) {
             if (!executionCommand.isFailsafe) {
                 for (String shellBinary : new String[]{"login", "bash", "zsh"}) {
-                    File shellFile = new File(TermuxConstants.TERMUX_BIN_PREFIX_DIR_PATH, shellBinary);
+                    File shellFile = new File(defaultBinPath, shellBinary);
                     if (shellFile.canExecute()) {
                         executionCommand.executable = shellFile.getAbsolutePath();
                         break;
@@ -88,7 +96,7 @@ public static TermuxSession execute(@NonNull final Context context, @NonNull Exe
             isLoginShell = true;
         }
 
-        String[] processArgs = ShellUtils.setupProcessArgs(executionCommand.executable, executionCommand.arguments);
+        String[] processArgs = shellEnvironmentClient.setupProcessArgs(executionCommand.executable, executionCommand.arguments);
 
         executionCommand.executable = processArgs[0];
         String processName = (isLoginShell ? "-" : "") + ShellUtils.getExecutableBasename(executionCommand.executable);
@@ -199,10 +207,10 @@ public void killIfExecuting(@NonNull final Context context, boolean processResul
      * callback will be called.
      *
      * @param termuxSession The {@link TermuxSession}, which should be set if
-     *                  {@link #execute(Context, ExecutionCommand, TerminalSessionClient, TermuxSessionClient, String, boolean)} 
+     *                  {@link #execute(Context, ExecutionCommand, TerminalSessionClient, TermuxSessionClient, ShellEnvironmentClient, String, boolean)}
      *                   successfully started the process.
      * @param executionCommand The {@link ExecutionCommand}, which should be set if
-     *                          {@link #execute(Context, ExecutionCommand, TerminalSessionClient, TermuxSessionClient, String, boolean)}
+     *                          {@link #execute(Context, ExecutionCommand, TerminalSessionClient, TermuxSessionClient, ShellEnvironmentClient, String, boolean)}
      *                          failed to start the process.
      */
     private static void processTermuxSessionResult(final TermuxSession termuxSession, ExecutionCommand executionCommand) {
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/TermuxShellEnvironmentClient.java b/termux-shared/src/main/java/com/termux/shared/shell/TermuxShellEnvironmentClient.java
new file mode 100644
index 0000000000..a2cb80c636
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/shell/TermuxShellEnvironmentClient.java
@@ -0,0 +1,33 @@
+package com.termux.shared.shell;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+
+public class TermuxShellEnvironmentClient implements ShellEnvironmentClient {
+
+    @NonNull
+    @Override
+    public String getDefaultWorkingDirectoryPath() {
+        return TermuxShellUtils.getDefaultWorkingDirectoryPath();
+    }
+
+    @NonNull
+    @Override
+    public String getDefaultBinPath() {
+        return TermuxShellUtils.getDefaultBinPath();
+    }
+
+    @NonNull
+    @Override
+    public String[] buildEnvironment(Context currentPackageContext, boolean isFailSafe, String workingDirectory) {
+        return TermuxShellUtils.buildEnvironment(currentPackageContext, isFailSafe, workingDirectory);
+    }
+
+    @NonNull
+    @Override
+    public String[] setupProcessArgs(@NonNull String fileToExecute, String[] arguments) {
+        return TermuxShellUtils.setupProcessArgs(fileToExecute, arguments);
+    }
+
+}
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/TermuxShellUtils.java b/termux-shared/src/main/java/com/termux/shared/shell/TermuxShellUtils.java
new file mode 100644
index 0000000000..fade41db30
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/shell/TermuxShellUtils.java
@@ -0,0 +1,150 @@
+package com.termux.shared.shell;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+
+import com.termux.shared.models.errors.Error;
+import com.termux.shared.termux.TermuxConstants;
+import com.termux.shared.file.FileUtils;
+import com.termux.shared.logger.Logger;
+import com.termux.shared.packages.PackageUtils;
+import com.termux.shared.termux.TermuxUtils;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public class TermuxShellUtils {
+
+    public static String getDefaultWorkingDirectoryPath() {
+        return TermuxConstants.TERMUX_HOME_DIR_PATH;
+    }
+
+    public static String getDefaultBinPath() {
+        return TermuxConstants.TERMUX_BIN_PREFIX_DIR_PATH;
+    }
+
+    public static String[] buildEnvironment(Context currentPackageContext, boolean isFailSafe, String workingDirectory) {
+        TermuxConstants.TERMUX_HOME_DIR.mkdirs();
+
+        if (workingDirectory == null || workingDirectory.isEmpty())
+            workingDirectory = getDefaultWorkingDirectoryPath();
+
+        List<String> environment = new ArrayList<>();
+
+        // This function may be called by a different package like a plugin, so we get version for Termux package via its context
+        Context termuxPackageContext = TermuxUtils.getTermuxPackageContext(currentPackageContext);
+        if (termuxPackageContext != null) {
+            String termuxVersionName = PackageUtils.getVersionNameForPackage(termuxPackageContext);
+            if (termuxVersionName != null)
+                environment.add("TERMUX_VERSION=" + termuxVersionName);
+        }
+
+        environment.add("TERM=xterm-256color");
+        environment.add("COLORTERM=truecolor");
+        environment.add("HOME=" + TermuxConstants.TERMUX_HOME_DIR_PATH);
+        environment.add("PREFIX=" + TermuxConstants.TERMUX_PREFIX_DIR_PATH);
+        environment.add("BOOTCLASSPATH=" + System.getenv("BOOTCLASSPATH"));
+        environment.add("ANDROID_ROOT=" + System.getenv("ANDROID_ROOT"));
+        environment.add("ANDROID_DATA=" + System.getenv("ANDROID_DATA"));
+        // EXTERNAL_STORAGE is needed for /system/bin/am to work on at least
+        // Samsung S7 - see https://plus.google.com/110070148244138185604/posts/gp8Lk3aCGp3.
+        environment.add("EXTERNAL_STORAGE=" + System.getenv("EXTERNAL_STORAGE"));
+
+        // These variables are needed if running on Android 10 and higher.
+        addToEnvIfPresent(environment, "ANDROID_ART_ROOT");
+        addToEnvIfPresent(environment, "DEX2OATBOOTCLASSPATH");
+        addToEnvIfPresent(environment, "ANDROID_I18N_ROOT");
+        addToEnvIfPresent(environment, "ANDROID_RUNTIME_ROOT");
+        addToEnvIfPresent(environment, "ANDROID_TZDATA_ROOT");
+
+        if (isFailSafe) {
+            // Keep the default path so that system binaries can be used in the failsafe session.
+            environment.add("PATH= " + System.getenv("PATH"));
+        } else {
+            environment.add("LANG=en_US.UTF-8");
+            environment.add("PATH=" + TermuxConstants.TERMUX_BIN_PREFIX_DIR_PATH);
+            environment.add("PWD=" + workingDirectory);
+            environment.add("TMPDIR=" + TermuxConstants.TERMUX_TMP_PREFIX_DIR_PATH);
+        }
+
+        return environment.toArray(new String[0]);
+    }
+
+    public static void addToEnvIfPresent(List<String> environment, String name) {
+        String value = System.getenv(name);
+        if (value != null) {
+            environment.add(name + "=" + value);
+        }
+    }
+
+    public static String[] setupProcessArgs(@NonNull String fileToExecute, String[] arguments) {
+        // The file to execute may either be:
+        // - An elf file, in which we execute it directly.
+        // - A script file without shebang, which we execute with our standard shell $PREFIX/bin/sh instead of the
+        //   system /system/bin/sh. The system shell may vary and may not work at all due to LD_LIBRARY_PATH.
+        // - A file with shebang, which we try to handle with e.g. /bin/foo -> $PREFIX/bin/foo.
+        String interpreter = null;
+        try {
+            File file = new File(fileToExecute);
+            try (FileInputStream in = new FileInputStream(file)) {
+                byte[] buffer = new byte[256];
+                int bytesRead = in.read(buffer);
+                if (bytesRead > 4) {
+                    if (buffer[0] == 0x7F && buffer[1] == 'E' && buffer[2] == 'L' && buffer[3] == 'F') {
+                        // Elf file, do nothing.
+                    } else if (buffer[0] == '#' && buffer[1] == '!') {
+                        // Try to parse shebang.
+                        StringBuilder builder = new StringBuilder();
+                        for (int i = 2; i < bytesRead; i++) {
+                            char c = (char) buffer[i];
+                            if (c == ' ' || c == '\n') {
+                                if (builder.length() == 0) {
+                                    // Skip whitespace after shebang.
+                                } else {
+                                    // End of shebang.
+                                    String executable = builder.toString();
+                                    if (executable.startsWith("/usr") || executable.startsWith("/bin")) {
+                                        String[] parts = executable.split("/");
+                                        String binary = parts[parts.length - 1];
+                                        interpreter = TermuxConstants.TERMUX_BIN_PREFIX_DIR_PATH + "/" + binary;
+                                    }
+                                    break;
+                                }
+                            } else {
+                                builder.append(c);
+                            }
+                        }
+                    } else {
+                        // No shebang and no ELF, use standard shell.
+                        interpreter = TermuxConstants.TERMUX_BIN_PREFIX_DIR_PATH + "/sh";
+                    }
+                }
+            }
+        } catch (IOException e) {
+            // Ignore.
+        }
+
+        List<String> result = new ArrayList<>();
+        if (interpreter != null) result.add(interpreter);
+        result.add(fileToExecute);
+        if (arguments != null) Collections.addAll(result, arguments);
+        return result.toArray(new String[0]);
+    }
+
+    public static void clearTermuxTMPDIR(boolean onlyIfExists) {
+        if(onlyIfExists && !FileUtils.directoryFileExists(TermuxConstants.TERMUX_TMP_PREFIX_DIR_PATH, false))
+            return;
+
+        Error error;
+        error = FileUtils.clearDirectory("$TMPDIR", FileUtils.getCanonicalPath(TermuxConstants.TERMUX_TMP_PREFIX_DIR_PATH, null));
+        if (error != null) {
+            Logger.logErrorExtended(error.toString());
+        }
+    }
+
+}
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/TermuxTask.java b/termux-shared/src/main/java/com/termux/shared/shell/TermuxTask.java
index eac551d70e..4b2801eaeb 100644
--- a/termux-shared/src/main/java/com/termux/shared/shell/TermuxTask.java
+++ b/termux-shared/src/main/java/com/termux/shared/shell/TermuxTask.java
@@ -11,7 +11,6 @@
 import com.termux.shared.models.ExecutionCommand;
 import com.termux.shared.models.ResultData;
 import com.termux.shared.models.errors.Errno;
-import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.logger.Logger;
 import com.termux.shared.models.ExecutionCommand.ExecutionState;
 
@@ -54,6 +53,7 @@ private TermuxTask(@NonNull final Process process, @NonNull final ExecutionComma
      *                           be called regardless of {@code isSynchronous} value but not if
      *                           {@code null} is returned by this method. This can
      *                           optionally be {@code null}.
+     * @param shellEnvironmentClient The {@link ShellEnvironmentClient} interface implementation.
      * @param isSynchronous If set to {@code true}, then the command will be executed in the
      *                      caller thread and results returned synchronously in the {@link ExecutionCommand}
      *                      sub object of the {@link TermuxTask} returned.
@@ -62,12 +62,17 @@ private TermuxTask(@NonNull final Process process, @NonNull final ExecutionComma
      * @return Returns the {@link TermuxTask}. This will be {@code null} if failed to start the execution command.
      */
     public static TermuxTask execute(@NonNull final Context context, @NonNull ExecutionCommand executionCommand,
-                                     final TermuxTaskClient termuxTaskClient, final boolean isSynchronous) {
-        if (executionCommand.workingDirectory == null || executionCommand.workingDirectory.isEmpty()) executionCommand.workingDirectory = TermuxConstants.TERMUX_HOME_DIR_PATH;
+                                     final TermuxTaskClient termuxTaskClient,
+                                     @NonNull final ShellEnvironmentClient shellEnvironmentClient,
+                                     final boolean isSynchronous) {
+        if (executionCommand.workingDirectory == null || executionCommand.workingDirectory.isEmpty())
+            executionCommand.workingDirectory = shellEnvironmentClient.getDefaultWorkingDirectoryPath();
+        if (executionCommand.workingDirectory.isEmpty())
+            executionCommand.workingDirectory = "/";
 
-        String[] env = ShellUtils.buildEnvironment(context, false, executionCommand.workingDirectory);
+        String[] env = shellEnvironmentClient.buildEnvironment(context, false, executionCommand.workingDirectory);
 
-        final String[] commandArray = ShellUtils.setupProcessArgs(executionCommand.executable, executionCommand.arguments);
+        final String[] commandArray = shellEnvironmentClient.setupProcessArgs(executionCommand.executable, executionCommand.arguments);
 
         if (!executionCommand.setState(ExecutionState.EXECUTING)) {
             executionCommand.setStateFailed(Errno.ERRNO_FAILED.getCode(), context.getString(R.string.error_failed_to_execute_termux_task_command, executionCommand.getCommandIdAndLabelLogString()));
@@ -254,10 +259,10 @@ public void kill() {
      * then the {@link TermuxTaskClient#onTermuxTaskExited(TermuxTask)} callback will be called.
      *
      * @param termuxTask The {@link TermuxTask}, which should be set if
-     *                  {@link #execute(Context, ExecutionCommand, TermuxTaskClient, boolean)}
+     *                  {@link #execute(Context, ExecutionCommand, TermuxTaskClient, ShellEnvironmentClient, boolean)}
      *                   successfully started the process.
      * @param executionCommand The {@link ExecutionCommand}, which should be set if
-     *                          {@link #execute(Context, ExecutionCommand, TermuxTaskClient, boolean)}
+     *                          {@link #execute(Context, ExecutionCommand, TermuxTaskClient, ShellEnvironmentClient, boolean)}
      *                          failed to start the process.
      */
     private static void processTermuxTaskResult(final TermuxTask termuxTask, ExecutionCommand executionCommand) {
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
index 1296def972..71e6a3ae69 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
@@ -16,6 +16,7 @@
 import com.termux.shared.markdown.MarkdownUtils;
 import com.termux.shared.models.ExecutionCommand;
 import com.termux.shared.packages.PackageUtils;
+import com.termux.shared.shell.TermuxShellEnvironmentClient;
 import com.termux.shared.shell.TermuxTask;
 
 import org.apache.commons.io.IOUtils;
@@ -399,7 +400,7 @@ public static String geAPTInfoMarkdownString(@NonNull final Context context) {
         aptInfoScript = aptInfoScript.replaceAll(Pattern.quote("@TERMUX_PREFIX@"), TermuxConstants.TERMUX_PREFIX_DIR_PATH);
 
         ExecutionCommand executionCommand = new ExecutionCommand(1, TermuxConstants.TERMUX_BIN_PREFIX_DIR_PATH + "/bash", null, aptInfoScript, null, true, false);
-        TermuxTask termuxTask = TermuxTask.execute(context, executionCommand, null, true);
+        TermuxTask termuxTask = TermuxTask.execute(context, executionCommand, null, new TermuxShellEnvironmentClient(), true);
         if (termuxTask == null || !executionCommand.isSuccessful() || executionCommand.resultData.exitCode != 0) {
             Logger.logError(LOG_TAG, executionCommand.toString());
             return null;

From e408fdcc084ce38149e1156f828cb2613e55f34a Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Mon, 28 Jun 2021 09:19:20 +0500
Subject: [PATCH 430/912] Show crash notification when bootstrap installation
 or setup storage failures

Sometimes users report that bootstrap installation failed on their devices but provide no details. Since they don't check logcat for the exception or exception is one time only, we can't know what happened. Although, reasons are likely root ownership files.

The notification will show the full stacktrace including suppressed ones for why failure occurred and hopefully be easier to find the problems and we can get reports too.
---
 .../java/com/termux/app/TermuxActivity.java   |  2 +-
 .../java/com/termux/app/TermuxInstaller.java  | 92 +++++++++++--------
 .../java/com/termux/app/utils/CrashUtils.java | 72 ++++++++++-----
 3 files changed, 107 insertions(+), 59 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index a3885fe5b8..bd54677e8a 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -178,7 +178,7 @@ public void onCreate(Bundle savedInstanceState) {
 
         // Check if a crash happened on last run of the app and show a
         // notification with the crash details if it did
-        CrashUtils.notifyCrash(this, LOG_TAG);
+        CrashUtils.notifyAppCrashOnLastRun(this, LOG_TAG);
 
         // Load termux shared properties
         mProperties = new TermuxAppSharedProperties(this);
diff --git a/app/src/main/java/com/termux/app/TermuxInstaller.java b/app/src/main/java/com/termux/app/TermuxInstaller.java
index 6b4782ebf2..83ce3ab9df 100644
--- a/app/src/main/java/com/termux/app/TermuxInstaller.java
+++ b/app/src/main/java/com/termux/app/TermuxInstaller.java
@@ -11,6 +11,7 @@
 import android.view.WindowManager;
 
 import com.termux.R;
+import com.termux.app.utils.CrashUtils;
 import com.termux.shared.file.FileUtils;
 import com.termux.shared.interact.DialogUtils;
 import com.termux.shared.logger.Logger;
@@ -70,14 +71,14 @@ static void setupBootstrapIfNeeded(final Activity activity, final Runnable whenD
 
         // If prefix directory exists, even if its a symlink to a valid directory and symlink is not broken/dangling
         if (FileUtils.directoryFileExists(PREFIX_FILE_PATH, true)) {
-             File[] PREFIX_FILE_LIST =  PREFIX_FILE.listFiles();
+            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 prefix directory \"" + PREFIX_FILE_PATH + "\" exists but is empty or only contains the tmp directory.");
-             } else {
-                 whenDone.run();
-                 return;
-             }
+            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.");
         }
@@ -97,13 +98,15 @@ public void run() {
                     // Delete prefix staging directory or any file at its destination
                     error = FileUtils.deleteFile("prefix staging directory", STAGING_PREFIX_PATH, true);
                     if (error != null) {
-                        throw new RuntimeException(error.toString());
+                        showBootstrapErrorDialog(activity, PREFIX_FILE_PATH, whenDone, Error.getErrorMarkdownString(error));
+                        return;
                     }
 
                     // Delete prefix directory or any file at its destination
                     error = FileUtils.deleteFile("prefix directory", PREFIX_FILE_PATH, true);
                     if (error != null) {
-                        throw new RuntimeException(error.toString());
+                        showBootstrapErrorDialog(activity, PREFIX_FILE_PATH, whenDone, Error.getErrorMarkdownString(error));
+                        return;
                     }
 
                     Logger.logInfo(LOG_TAG, "Extracting bootstrap zip to prefix staging directory \"" + STAGING_PREFIX_PATH + "\".");
@@ -126,14 +129,22 @@ public void run() {
                                     String newPath = STAGING_PREFIX_PATH + "/" + parts[1];
                                     symlinks.add(Pair.create(oldPath, newPath));
 
-                                    ensureDirectoryExists(new File(newPath).getParentFile());
+                                    error = ensureDirectoryExists(new File(newPath).getParentFile());
+                                    if (error != null) {
+                                        showBootstrapErrorDialog(activity, PREFIX_FILE_PATH, whenDone, Error.getErrorMarkdownString(error));
+                                        return;
+                                    }
                                 }
                             } else {
                                 String zipEntryName = zipEntry.getName();
                                 File targetFile = new File(STAGING_PREFIX_PATH, zipEntryName);
                                 boolean isDirectory = zipEntry.isDirectory();
 
-                                ensureDirectoryExists(isDirectory ? targetFile : targetFile.getParentFile());
+                                error = ensureDirectoryExists(isDirectory ? targetFile : targetFile.getParentFile());
+                                if (error != null) {
+                                    showBootstrapErrorDialog(activity, PREFIX_FILE_PATH, whenDone, Error.getErrorMarkdownString(error));
+                                    return;
+                                }
 
                                 if (!isDirectory) {
                                     try (FileOutputStream outStream = new FileOutputStream(targetFile)) {
@@ -164,23 +175,10 @@ public void run() {
 
                     Logger.logInfo(LOG_TAG, "Bootstrap packages installed successfully.");
                     activity.runOnUiThread(whenDone);
+
                 } catch (final Exception 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();
-                                FileUtils.deleteFile("prefix directory", PREFIX_FILE_PATH, true);
-                                TermuxInstaller.setupBootstrapIfNeeded(activity, whenDone);
-                            }).show();
-                        } catch (WindowManager.BadTokenException e1) {
-                            // Activity already dismissed - ignore.
-                        }
-                    });
+                    showBootstrapErrorDialog(activity, PREFIX_FILE_PATH, whenDone, Logger.getStackTracesMarkdownString(null, Logger.getStackTracesStringArray(e)));
+
                 } finally {
                     activity.runOnUiThread(() -> {
                         try {
@@ -194,6 +192,30 @@ public void run() {
         }.start();
     }
 
+    public static void showBootstrapErrorDialog(Activity activity, String PREFIX_FILE_PATH, 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
+        CrashUtils.sendCrashReportNotification(activity, LOG_TAG, "## Bootstrap Error\n\n" + message, true);
+
+        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("prefix directory", PREFIX_FILE_PATH, true);
+                        TermuxInstaller.setupBootstrapIfNeeded(activity, whenDone);
+                    }).show();
+            } catch (WindowManager.BadTokenException e1) {
+                // Activity already dismissed - ignore.
+            }
+        });
+    }
+
     static void setupStorageSymlinks(final Context context) {
         final String LOG_TAG = "termux-storage";
 
@@ -208,7 +230,8 @@ public void run() {
                     error = FileUtils.clearDirectory("~/storage", storageDir.getAbsolutePath());
                     if (error != null) {
                         Logger.logErrorAndShowToast(context, LOG_TAG, error.getMessage());
-                        Logger.logErrorExtended(LOG_TAG, error.toString());
+                        Logger.logErrorExtended(LOG_TAG, "Setup Storage Error\n" + error.toString());
+                        CrashUtils.sendCrashReportNotification(context, LOG_TAG, "## Setup Storage Error\n\n" + Error.getErrorMarkdownString(error), true);
                         return;
                     }
 
@@ -245,19 +268,16 @@ public void run() {
 
                     Logger.logInfo(LOG_TAG, "Storage symlinks created successfully.");
                 } catch (Exception e) {
-                    Logger.logStackTraceWithMessage(LOG_TAG, "Error setting up link", 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);
                 }
             }
         }.start();
     }
 
-    private static void ensureDirectoryExists(File directory) {
-        Error error;
-
-        error = FileUtils.createDirectoryFile(directory.getAbsolutePath());
-        if (error != null) {
-            throw new RuntimeException(error.toString());
-        }
+    private static Error ensureDirectoryExists(File directory) {
+        return FileUtils.createDirectoryFile(directory.getAbsolutePath());
     }
 
     public static byte[] loadZipBytes() {
diff --git a/app/src/main/java/com/termux/app/utils/CrashUtils.java b/app/src/main/java/com/termux/app/utils/CrashUtils.java
index 63cd03562d..3a59d9c19f 100644
--- a/app/src/main/java/com/termux/app/utils/CrashUtils.java
+++ b/app/src/main/java/com/termux/app/utils/CrashUtils.java
@@ -30,8 +30,8 @@ public class CrashUtils {
     private static final String LOG_TAG = "CrashUtils";
 
     /**
-     * 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
+     * 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
      * created by {@link com.termux.shared.crash.CrashHandler}.
      *
      * If the crash log file exists and is not empty and
@@ -44,10 +44,9 @@ public class CrashUtils {
      * @param context The {@link Context} for operations.
      * @param logTagParam The log tag to use for logging.
      */
-    public static void notifyCrash(final Context context, final String logTagParam) {
+    public static void notifyAppCrashOnLastRun(final Context context, final String logTagParam) {
         if (context == null) return;
 
-
         TermuxAppSharedPreferences preferences = TermuxAppSharedPreferences.build(context);
         if (preferences == null) return;
 
@@ -84,29 +83,58 @@ public void run() {
                 if (reportString.isEmpty())
                     return;
 
-                // 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, "A crash log file found at \"" + TermuxConstants.TERMUX_CRASH_LOG_FILE_PATH +  "\".");
+
+                sendCrashReportNotification(context, logTag, reportString, false);
+            }
+        }.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 reportString The text 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}.
+     */
+    public static void sendCrashReportNotification(final Context context, String logTag, String reportString, boolean forceNotification) {
+        if (context == null) return;
+
+        TermuxAppSharedPreferences preferences = TermuxAppSharedPreferences.build(context);
+        if (preferences == null) return;
 
-                Logger.logDebug(logTag, "The crash log file at \"" + TermuxConstants.TERMUX_CRASH_LOG_FILE_PATH +  "\" found. Sending \"" + title + "\" notification.");
+        // If user has disabled notifications for crashes
+        if (!preferences.areCrashReportNotificationsEnabled() && !forceNotification)
+            return;
 
-                Intent notificationIntent = ReportActivity.newInstance(context, new ReportInfo(UserAction.CRASH_REPORT.getName(), logTag, title, null, reportString, "\n\n" + TermuxUtils.getReportIssueMarkdownString(context), true));
-                PendingIntent pendingIntent = PendingIntent.getActivity(context, 0, notificationIntent, PendingIntent.FLAG_UPDATE_CURRENT);
+        logTag = DataUtils.getDefaultIfNull(logTag, LOG_TAG);
 
-                // Setup the notification channel if not already set up
-                setupCrashReportsNotificationChannel(context);
+        // 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";
 
-                // Build the notification
-                Notification.Builder builder = getCrashReportsNotificationBuilder(context, title, null, null, pendingIntent, NotificationUtils.NOTIFICATION_MODE_VIBRATE);
-                if (builder == null)  return;
+        Logger.logDebug(logTag, "Sending \"" + title + "\" notification.");
 
-                // Send the notification
-                int nextNotificationId = NotificationUtils.getNextNotificationId(context);
-                NotificationManager notificationManager = NotificationUtils.getNotificationManager(context);
-                if (notificationManager != null)
-                    notificationManager.notify(nextNotificationId, builder.build());
-            }
-        }.start();
+        Intent notificationIntent = ReportActivity.newInstance(context, new ReportInfo(UserAction.CRASH_REPORT.getName(), 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());
     }
 
     /**

From 9c92251595615411da38817401d5cbf7b7ea5c0e Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Mon, 28 Jun 2021 09:26:42 +0500
Subject: [PATCH 431/912] Fixed issue where back button would not exit the
 activity if bootstrap installation failed and users dismissed the error
 dialog,

---
 .../com/termux/app/terminal/TermuxTerminalViewClient.java  | 7 +++++++
 .../src/main/java/com/termux/view/TerminalView.java        | 5 ++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
index 41574ce08f..88c7585229 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
@@ -245,6 +245,13 @@ public boolean onKeyDown(int keyCode, KeyEvent e, TerminalSession currentSession
 
     @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);
     }
 
diff --git a/terminal-view/src/main/java/com/termux/view/TerminalView.java b/terminal-view/src/main/java/com/termux/view/TerminalView.java
index dc86207cbd..7fa8d51314 100644
--- a/terminal-view/src/main/java/com/termux/view/TerminalView.java
+++ b/terminal-view/src/main/java/com/termux/view/TerminalView.java
@@ -720,7 +720,10 @@ public boolean handleKeyCode(int keyCode, int keyMod) {
     public boolean onKeyUp(int keyCode, KeyEvent event) {
         if (TERMINAL_VIEW_KEY_LOGGING_ENABLED)
             mClient.logInfo(LOG_TAG, "onKeyUp(keyCode=" + keyCode + ", event=" + event + ")");
-        if (mEmulator == null) return true;
+
+        // Do not return for KEYCODE_BACK and send it to the client since user may be trying
+        // to exit the activity.
+        if (mEmulator == null && keyCode != KeyEvent.KEYCODE_BACK) return true;
 
         if (mClient.onKeyUp(keyCode, event)) {
             invalidate();

From 59877a08d134d7a56119d7c80caedac89850baa7 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Mon, 28 Jun 2021 11:05:20 +0500
Subject: [PATCH 432/912] Add termux settings button to left drawer too since
 apparently people can't find the one in context menu

---
 .../main/java/com/termux/app/TermuxActivity.java    | 12 ++++++++++++
 app/src/main/res/layout/activity_termux.xml         | 13 +++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index bd54677e8a..eff4fa3565 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -12,6 +12,7 @@
 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;
@@ -26,6 +27,7 @@
 import android.view.WindowManager;
 import android.view.autofill.AutofillManager;
 import android.widget.EditText;
+import android.widget.ImageButton;
 import android.widget.ListView;
 import android.widget.Toast;
 
@@ -218,6 +220,8 @@ public void onCreate(Bundle savedInstanceState) {
 
         setTerminalToolbarView(savedInstanceState);
 
+        setSettingsButtonView();
+
         setNewSessionButtonView();
 
         setToggleKeyboardView();
@@ -402,6 +406,7 @@ private void setDrawerTheme() {
         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);
         }
     }
 
@@ -496,6 +501,13 @@ private void saveTerminalToolbarTextInput(Bundle savedInstanceState) {
 
 
 
+    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));
diff --git a/app/src/main/res/layout/activity_termux.xml b/app/src/main/res/layout/activity_termux.xml
index 32bb354b72..c659f57711 100644
--- a/app/src/main/res/layout/activity_termux.xml
+++ b/app/src/main/res/layout/activity_termux.xml
@@ -42,6 +42,19 @@
                 android:descendantFocusability="blocksDescendants"
                 android:orientation="vertical">
 
+                <LinearLayout
+                    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"

From d3c34ad1f546d7d410e36dad20565789c420c1bd Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Mon, 28 Jun 2021 11:57:12 +0500
Subject: [PATCH 433/912] Fix issue where cursor blinker wouldn't automatically
 start after session change

The reason was that mTerminalCursorBlinkerRunnable inner class mEmulator wouldn't get updated to the new mEmulator on session change and would still be using the old session's.
---
 .../src/main/java/com/termux/view/TerminalView.java    | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/terminal-view/src/main/java/com/termux/view/TerminalView.java b/terminal-view/src/main/java/com/termux/view/TerminalView.java
index 7fa8d51314..d041248fcf 100644
--- a/terminal-view/src/main/java/com/termux/view/TerminalView.java
+++ b/terminal-view/src/main/java/com/termux/view/TerminalView.java
@@ -760,6 +760,10 @@ public void updateSize() {
             mEmulator = mTermSession.getEmulator();
             mClient.onEmulatorSet();
 
+            // Update mTerminalCursorBlinkerRunnable inner class mEmulator on session change
+            if (mTerminalCursorBlinkerRunnable != null)
+                mTerminalCursorBlinkerRunnable.setEmulator(mEmulator);
+
             mTopRow = 0;
             scrollTo(0, 0);
             invalidate();
@@ -966,7 +970,7 @@ private void stopTerminalCursorBlinker() {
 
     private class TerminalCursorBlinkerRunnable implements Runnable {
 
-        private final TerminalEmulator mEmulator;
+        private TerminalEmulator mEmulator;
         private final int mBlinkRate;
 
         // Initialize with false so that initial blink state is visible after toggling
@@ -977,6 +981,10 @@ public TerminalCursorBlinkerRunnable(TerminalEmulator emulator, int blinkRate) {
             mBlinkRate = blinkRate;
         }
 
+        public void setEmulator(TerminalEmulator emulator) {
+            mEmulator = emulator;
+        }
+
         public void run() {
             try {
                 if (mEmulator != null) {

From 00f805f7ec0932012bd273ca692001c77cb3a8b1 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Mon, 28 Jun 2021 12:19:06 +0500
Subject: [PATCH 434/912] Fix issue where cursor blinker wouldn't automatically
 start after terminal reset if it was disabled before reset

---
 app/src/main/java/com/termux/app/TermuxActivity.java     | 7 +++++--
 .../termux/app/terminal/TermuxTerminalSessionClient.java | 9 +++++++++
 .../src/main/java/com/termux/view/TerminalView.java      | 4 ++++
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index eff4fa3565..12b1278065 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -611,7 +611,7 @@ public boolean onContextItemSelected(MenuItem item) {
                 requestAutoFill();
                 return true;
             case CONTEXT_MENU_RESET_TERMINAL_ID:
-                resetSession(session);
+                onResetTerminalSession(session);
                 return true;
             case CONTEXT_MENU_KILL_PROCESS_ID:
                 showKillSessionDialog(session);
@@ -650,10 +650,13 @@ private void showKillSessionDialog(TerminalSession session) {
         b.show();
     }
 
-    private void resetSession(TerminalSession session) {
+    private void onResetTerminalSession(TerminalSession session) {
         if (session != null) {
             session.reset();
             showToast(getResources().getString(R.string.msg_terminal_reset), true);
+
+            if (mTermuxTerminalSessionClient != null)
+                mTermuxTerminalSessionClient.onResetTerminalSession();
         }
     }
 
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java
index 312a548333..be98ddc926 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java
@@ -205,6 +205,15 @@ public void onTerminalCursorStateChange(boolean enabled) {
         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
diff --git a/terminal-view/src/main/java/com/termux/view/TerminalView.java b/terminal-view/src/main/java/com/termux/view/TerminalView.java
index d041248fcf..432fea80e3 100644
--- a/terminal-view/src/main/java/com/termux/view/TerminalView.java
+++ b/terminal-view/src/main/java/com/termux/view/TerminalView.java
@@ -905,6 +905,10 @@ public synchronized boolean setTerminalCursorBlinkerRate(int blinkRate) {
      * to be shown. It should also be checked if activity is visible if blinker is to be started
      * before calling this.
      *
+     * It should also be called after terminal is reset with {@link TerminalSession#reset()} in case
+     * cursor blinker was disabled before reset due to call to
+     * {@link com.termux.terminal.TerminalSessionClient#onTerminalCursorStateChange(boolean)}.
+     *
      * How cursor blinker starting works is by registering a {@link Runnable} with the looper of
      * the main thread of the app which when run, toggles the cursor blinking state and re-registers
      * itself to be called with the delay set by {@link #mTerminalCursorBlinkerRate}. When cursor

From e5a9b99afe021270d3e085d030b496111bbc2b33 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 30 Jun 2021 02:31:47 +0500
Subject: [PATCH 435/912] Fix issues with TermuxActivityRootView margin
 adjustment

Margin adjustment was causing screen flickering due to invalid values being calculated in landscape and split screen mode.

Attempts to fix issue #2127
---
 .../java/com/termux/app/TermuxActivity.java   |   1 +
 .../app/terminal/TermuxActivityRootView.java  | 111 +++++++++++----
 .../terminal/TermuxTerminalViewClient.java    |   2 +
 termux-shared/build.gradle                    |   1 +
 .../com/termux/shared/view/ViewUtils.java     | 129 +++++++++++++++++-
 5 files changed, 214 insertions(+), 30 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index 12b1278065..75a6f676d1 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -203,6 +203,7 @@ public void onCreate(Bundle savedInstanceState) {
         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) -> {
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxActivityRootView.java b/app/src/main/java/com/termux/app/terminal/TermuxActivityRootView.java
index 33b6510f6b..7e8b0e9d38 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxActivityRootView.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxActivityRootView.java
@@ -7,11 +7,13 @@
 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;
@@ -64,15 +66,18 @@ public class TermuxActivityRootView extends LinearLayout implements ViewTreeObse
     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) {
@@ -118,10 +123,15 @@ public void onGlobalLayout() {
         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);
+        Rect[] windowAndViewRects = ViewUtils.getWindowAndViewRects(bottomSpaceView, mStatusBarHeight);
         if (windowAndViewRects == null)
             return;
 
@@ -129,12 +139,19 @@ public void onGlobalLayout() {
         Rect bottomSpaceViewRect = windowAndViewRects[1];
 
         // If the bottomSpaceViewRect is inside the windowAvailableRect, then it must be completely visible
-        boolean isVisible = windowAvailableRect.contains(bottomSpaceViewRect);
+        //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;
+        boolean isVisibleBecauseExtraMargin = ((bottomSpaceViewRect.bottom - windowAvailableRect.bottom) < 0);
 
-        if (ROOT_VIEW_LOGGING_ENABLED)
-            Logger.logVerbose(LOG_TAG, "onGlobalLayout: windowAvailableRect " + windowAvailableRect.bottom + ", bottomSpaceViewRect " + bottomSpaceViewRect.bottom + ", diff " + (bottomSpaceViewRect.bottom - windowAvailableRect.bottom) + ", bottom " + params.bottomMargin + ", isVisible " + isVisible + ", isVisibleBecauseMargin " + isVisibleBecauseMargin + ", isVisibleBecauseExtraMargin " + isVisibleBecauseExtraMargin);
+        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) {
@@ -148,15 +165,25 @@ public void onGlobalLayout() {
             // 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, "onGlobalLayout: Visible due to margin");
+                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.
-                marginBottom = 0;
+                // 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;
             }
 
@@ -166,21 +193,28 @@ public void onGlobalLayout() {
             // onGlobalLayout: windowAvailableRect 1408, bottomSpaceViewRect 1232, diff -176, bottom 0, isVisible true, isVisibleBecauseMargin false, isVisibleBecauseExtraMargin false
             // onGlobalLayout: Bottom margin already equals 0
             if (isVisibleBecauseExtraMargin) {
-                if (ROOT_VIEW_LOGGING_ENABLED)
-                    Logger.logVerbose(LOG_TAG, "onGlobalLayout: Resetting margin since visible due to extra margin");
-                setMargin = true;
-                // lastMarginBottom must be invalid. May also happen when keyboards are changed.
-                lastMarginBottom = null;
+                // 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, "onGlobalLayout: Setting bottom margin to 0");
+                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, "onGlobalLayout: Bottom margin already equals 0");
+                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
@@ -193,8 +227,9 @@ public void onGlobalLayout() {
         // 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, "onGlobalLayout: pxHidden " + pxHidden + ", bottom " + params.bottomMargin);
+
+            if (root_view_logging_enabled)
+                Logger.logVerbose(LOG_TAG, "pxHidden " + pxHidden + ", bottom " + params.bottomMargin);
 
             boolean setMargin = params.bottomMargin != pxHidden;
 
@@ -205,23 +240,45 @@ public void onGlobalLayout() {
             // 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 ((bottomSpaceViewRect.bottom - windowAvailableRect.bottom) > 0) {
-                if (ROOT_VIEW_LOGGING_ENABLED)
-                    Logger.logVerbose(LOG_TAG, "onGlobalLayout: Force setting margin since not visible despite margin");
+            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, "onGlobalLayout: Setting bottom margin to " + pxHidden);
+                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, "onGlobalLayout: Bottom margin already equals " + pxHidden);
+                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);
+        }
+    }
+
 }
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
index 88c7585229..32bc48b1a6 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
@@ -35,6 +35,7 @@
 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.TerminalEmulator;
 import com.termux.terminal.TerminalSession;
@@ -88,6 +89,7 @@ public void onStart() {
 
         // Piggyback on the terminal view key logging toggle for now, should add a separate toggle in future
         mActivity.getTermuxActivityRootView().setIsRootViewLoggingEnabled(isTerminalViewKeyLoggingEnabled);
+        ViewUtils.setIsViewUtilsLoggingEnabled(isTerminalViewKeyLoggingEnabled);
     }
 
     /**
diff --git a/termux-shared/build.gradle b/termux-shared/build.gradle
index 9a0d8e3ca2..ddfb04af78 100644
--- a/termux-shared/build.gradle
+++ b/termux-shared/build.gradle
@@ -8,6 +8,7 @@ android {
         implementation 'androidx.appcompat:appcompat:1.2.0'
         implementation "androidx.annotation:annotation:1.2.0"
         implementation "androidx.core:core:1.5.0-rc01"
+        implementation "androidx.window:window:1.0.0-alpha08"
         implementation "com.google.guava:guava:24.1-jre"
         implementation "io.noties.markwon:core:$markwonVersion"
         implementation "io.noties.markwon:ext-strikethrough:$markwonVersion"
diff --git a/termux-shared/src/main/java/com/termux/shared/view/ViewUtils.java b/termux-shared/src/main/java/com/termux/shared/view/ViewUtils.java
index fe7422f61e..c578f62558 100644
--- a/termux-shared/src/main/java/com/termux/shared/view/ViewUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/view/ViewUtils.java
@@ -3,25 +3,45 @@
 import android.app.Activity;
 import android.content.Context;
 import android.content.ContextWrapper;
+import android.content.res.Configuration;
+import android.graphics.Point;
 import android.graphics.Rect;
 import android.util.TypedValue;
 import android.view.View;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 
+import com.termux.shared.logger.Logger;
+
 public class ViewUtils {
 
+    /** Log root view events. */
+    public static boolean VIEW_UTILS_LOGGING_ENABLED = false;
+
+    private static final String LOG_TAG = "ViewUtils";
+
+    /**
+     * Sets whether view utils logging is enabled or not.
+     *
+     * @param value The boolean value that defines the state.
+     */
+    public static void setIsViewUtilsLoggingEnabled(boolean value) {
+        VIEW_UTILS_LOGGING_ENABLED = value;
+    }
+
     /**
      * Check if a {@link View} is fully visible and not hidden or partially covered by another view.
      *
      * https://stackoverflow.com/a/51078418/14686958
      *
      * @param view The {@link View} to check.
+     * @param statusBarHeight The status bar height received by {@link View.OnApplyWindowInsetsListener}.
      * @return Returns {@code true} if view is fully visible.
      */
-    public static boolean isViewFullyVisible(View view) {
-        Rect[] windowAndViewRects = getWindowAndViewRects(view);
+    public static boolean isViewFullyVisible(View view, int statusBarHeight) {
+        Rect[] windowAndViewRects = getWindowAndViewRects(view, statusBarHeight);
         if (windowAndViewRects == null)
             return false;
         return windowAndViewRects[0].contains(windowAndViewRects[1]);
@@ -34,15 +54,18 @@ public static boolean isViewFullyVisible(View view) {
      * https://stackoverflow.com/a/51078418/14686958
      *
      * @param view The {@link View} inside the window whose {@link Rect} to get.
+     * @param statusBarHeight The status bar height received by {@link View.OnApplyWindowInsetsListener}.
      * @return Returns {@link Rect[]} if view is visible where Rect[0] will contain window
      * {@link Rect} and Rect[1] will contain view {@link Rect}. This will be {@code null}
      * if view is not visible.
      */
     @Nullable
-    public static Rect[] getWindowAndViewRects(View view) {
+    public static Rect[] getWindowAndViewRects(View view, int statusBarHeight) {
         if (view == null || !view.isShown())
             return null;
 
+        boolean view_utils_logging_enabled = VIEW_UTILS_LOGGING_ENABLED;
+
         // windowRect - will hold available area where content remain visible to users
         // Takes into account screen decorations (e.g. statusbar)
         Rect windowRect = new Rect();
@@ -50,15 +73,20 @@ public static Rect[] getWindowAndViewRects(View view) {
 
         // If there is actionbar, get his height
         int actionBarHeight = 0;
+        boolean isInMultiWindowMode = false;
         Context context = view.getContext();
         if (context instanceof AppCompatActivity) {
             androidx.appcompat.app.ActionBar actionBar = ((AppCompatActivity) context).getSupportActionBar();
             if (actionBar != null) actionBarHeight = actionBar.getHeight();
+            isInMultiWindowMode = ((AppCompatActivity) context).isInMultiWindowMode();
         } else if (context instanceof Activity) {
             android.app.ActionBar actionBar = ((Activity) context).getActionBar();
             if (actionBar != null) actionBarHeight = actionBar.getHeight();
+            isInMultiWindowMode = ((Activity) context).isInMultiWindowMode();
         }
 
+        int displayOrientation = getDisplayOrientation(context);
+
         // windowAvailableRect - takes into account actionbar and statusbar height
         Rect windowAvailableRect;
         windowAvailableRect = new Rect(windowRect.left, windowRect.top + actionBarHeight, windowRect.right, windowRect.bottom);
@@ -71,13 +99,108 @@ public static Rect[] getWindowAndViewRects(View view) {
         view.getLocationInWindow(viewsLocationInWindow);
         int viewLeft = viewsLocationInWindow[0];
         int viewTop = viewsLocationInWindow[1];
+
+        if (view_utils_logging_enabled) {
+            Logger.logVerbose(LOG_TAG, "getWindowAndViewRects:");
+            Logger.logVerbose(LOG_TAG, "windowRect: " + toRectString(windowRect) + ", windowAvailableRect: " + toRectString(windowAvailableRect));
+            Logger.logVerbose(LOG_TAG, "viewsLocationInWindow: " + toPointString(new Point(viewLeft, viewTop)));
+            Logger.logVerbose(LOG_TAG, "activitySize: " + toPointString(getDisplaySize(context, true)) +
+                ", displaySize: " + toPointString(getDisplaySize(context, false)) +
+                ", displayOrientation=" + displayOrientation);
+        }
+
+        if (isInMultiWindowMode) {
+            if (displayOrientation == Configuration.ORIENTATION_PORTRAIT) {
+                // The windowRect.top of the window at the of split screen mode should start right
+                // below the status bar
+                if (statusBarHeight != windowRect.top) {
+                    if (view_utils_logging_enabled)
+                        Logger.logVerbose(LOG_TAG, "Window top does not equal statusBarHeight " + statusBarHeight + " in multi-window portrait mode. Window is possibly bottom app in split screen mode. Adding windowRect.top " + windowRect.top + " to viewTop.");
+                    viewTop += windowRect.top;
+                } else {
+                    if (view_utils_logging_enabled)
+                        Logger.logVerbose(LOG_TAG, "windowRect.top equals statusBarHeight " + statusBarHeight + " in multi-window portrait mode. Window is possibly top app in split screen mode.");
+                }
+
+            } else if (displayOrientation == Configuration.ORIENTATION_LANDSCAPE) {
+                // If window is on the right in landscape mode of split screen, the viewLeft actually
+                // starts at windowRect.left instead of 0 returned by getLocationInWindow
+                viewLeft += windowRect.left;
+            }
+        }
+
         int viewRight = viewLeft + view.getWidth();
         int viewBottom = viewTop + view.getHeight();
         viewRect = new Rect(viewLeft, viewTop, viewRight, viewBottom);
 
+        if (displayOrientation == Configuration.ORIENTATION_LANDSCAPE && viewRight > windowAvailableRect.right) {
+            if (view_utils_logging_enabled)
+                Logger.logVerbose(LOG_TAG, "viewRight " + viewRight + " is greater than windowAvailableRect.right " + windowAvailableRect.right + " in landscape mode. Setting windowAvailableRect.right to viewRight since it may not include navbar height.");
+            windowAvailableRect.right = viewRight;
+        }
+
         return new Rect[]{windowAvailableRect, viewRect};
     }
 
+    /**
+     * Check if {@link Rect} r2 is above r2. An empty rectangle never contains another rectangle.
+     *
+     * @param r1 The base rectangle.
+     * @param r2 The rectangle being tested that should be above.
+     * @return Returns {@code true} if r2 is above r1.
+     */
+    public static boolean isRectAbove(@NonNull Rect r1, @NonNull Rect r2) {
+        // check for empty first
+        return r1.left < r1.right && r1.top < r1.bottom
+            // now check if above
+            && r1.left <= r2.left && r1.bottom >= r2.bottom;
+    }
+
+    /**
+     * Get device orientation.
+     *
+     * Related: https://stackoverflow.com/a/29392593/14686958
+     *
+     * @param context The {@link Context} to check with.
+     * @return {@link Configuration#ORIENTATION_PORTRAIT} or {@link Configuration#ORIENTATION_LANDSCAPE}.
+     */
+    public static int getDisplayOrientation(@NonNull Context context) {
+        Point size = getDisplaySize(context, false);
+        return (size.x < size.y) ? Configuration.ORIENTATION_PORTRAIT : Configuration.ORIENTATION_LANDSCAPE;
+    }
+
+    /**
+     * Get device display size.
+     *
+     * @param context The {@link Context} to check with.
+     * @param activitySize The set to {@link true}, then size returned will be that of the activity
+     *                     and can be smaller than physical display size in multi-window mode.
+     * @return Returns the display size as {@link Point}.
+     */
+    public static Point getDisplaySize( @NonNull Context context, boolean activitySize) {
+        // android.view.WindowManager.getDefaultDisplay() and Display.getSize() are deprecated in
+        // API 30 and give wrong values in API 30 for activitySize=false in multi-window
+        androidx.window.WindowManager windowManager = new androidx.window.WindowManager(context);
+        androidx.window.WindowMetrics windowMetrics;
+        if (activitySize)
+            windowMetrics = windowManager.getCurrentWindowMetrics();
+        else
+            windowMetrics = windowManager.getMaximumWindowMetrics();
+        return new Point(windowMetrics.getBounds().width(), windowMetrics.getBounds().height());
+    }
+
+    /** Convert {@link Rect} to {@link String}. */
+    public static String toRectString(Rect rect) {
+        if (rect == null) return "null";
+        return "(" + rect.left + "," + rect.top + "), (" + rect.right + "," + rect.bottom + ")";
+    }
+
+    /** Convert {@link Point} to {@link String}. */
+    public static String toPointString(Point point) {
+        if (point == null) return "null";
+        return "(" + point.x + "," + point.y + ")";
+    }
+
     /** Get the {@link Activity} associated with the {@link Context} if available. */
     @Nullable
     public static Activity getActivity(Context context) {

From 321350256eae18e5497236522c41940f95933d80 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 30 Jun 2021 02:49:00 +0500
Subject: [PATCH 436/912] Allow users to disable terminal margin adjustment

The user can add `disable-terminal-margin-adjustment=true` entry to `termux.properties` file to disable terminal view margin adjustment that is done to prevent soft keyboard from covering bottom part of terminal view on some devices. Margin adjustment may cause screen flickering on some devices and so should be disabled. The default value is `false`. So adding the entry `disable-terminal-margin-adjustment=true` to `termux.properties` file will disable margin adjustment. Exit termux and restart for changes to take affect after updating value.

In case e5a9b99a did not fix screen flickering issues for #2127, then this can be used to disable it. Closes #2127.
---
 app/src/main/java/com/termux/app/TermuxActivity.java     | 3 ++-
 .../settings/properties/TermuxPropertyConstants.java     | 9 +++++++++
 .../settings/properties/TermuxSharedProperties.java      | 4 ++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index 75a6f676d1..0c13c01972 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -259,7 +259,8 @@ public void onStart() {
         if (mTermuxTerminalViewClient != null)
             mTermuxTerminalViewClient.onStart();
 
-        addTermuxActivityRootViewGlobalLayoutListener();
+        if (!mProperties.isTerminalMarginAdjustmentDisabled())
+            addTermuxActivityRootViewGlobalLayoutListener();
 
         registerTermuxActivityBroadcastReceiver();
     }
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java b/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java
index 75ea1cf863..b9f7a6e18d 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java
@@ -72,6 +72,13 @@ public final class TermuxPropertyConstants {
 
     /* boolean */
 
+    /** Defines the key for whether terminal view margin adjustment that is done to prevent soft
+     * keyboard from covering bottom part of terminal view on some devices is disabled or not.
+     * Margin adjustment may cause screen flickering on some devices and so should be disabled. */
+    public static final String KEY_DISABLE_TERMINAL_MARGIN_ADJUSTMENT =  "disable-terminal-margin-adjustment"; // Default: "disable-terminal-margin-adjustment"
+
+
+
     /** Defines the key for whether a toast will be shown when user changes the terminal session */
     public static final String KEY_DISABLE_TERMINAL_SESSION_CHANGE_TOAST =  "disable-terminal-session-change-toast"; // Default: "disable-terminal-session-change-toast"
 
@@ -290,6 +297,7 @@ public final class TermuxPropertyConstants {
      * */
     public static final Set<String> TERMUX_PROPERTIES_LIST = new HashSet<>(Arrays.asList(
         /* boolean */
+        KEY_DISABLE_TERMINAL_MARGIN_ADJUSTMENT,
         KEY_DISABLE_TERMINAL_SESSION_CHANGE_TOAST,
         KEY_ENFORCE_CHAR_BASED_INPUT,
         KEY_HIDE_SOFT_KEYBOARD_ON_STARTUP,
@@ -329,6 +337,7 @@ public final class TermuxPropertyConstants {
      * default: false
      * */
     public static final Set<String> TERMUX_DEFAULT_BOOLEAN_BEHAVIOUR_PROPERTIES_LIST = new HashSet<>(Arrays.asList(
+        KEY_DISABLE_TERMINAL_MARGIN_ADJUSTMENT,
         KEY_DISABLE_TERMINAL_SESSION_CHANGE_TOAST,
         KEY_ENFORCE_CHAR_BASED_INPUT,
         KEY_HIDE_SOFT_KEYBOARD_ON_STARTUP,
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxSharedProperties.java b/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxSharedProperties.java
index c253a7dab3..d87efde735 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxSharedProperties.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxSharedProperties.java
@@ -460,6 +460,10 @@ public static String getVolumeKeysBehaviourInternalPropertyValueFromValue(String
 
 
 
+    public boolean isTerminalMarginAdjustmentDisabled() {
+        return (boolean) getInternalPropertyValue(TermuxPropertyConstants.KEY_DISABLE_TERMINAL_MARGIN_ADJUSTMENT, true);
+    }
+
     public boolean areTerminalSessionChangeToastsDisabled() {
         return (boolean) getInternalPropertyValue(TermuxPropertyConstants.KEY_DISABLE_TERMINAL_SESSION_CHANGE_TOAST, true);
     }

From 69bebb591635a3d1e5de72f9dc4aaed75ab8a1f6 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 30 Jun 2021 03:04:56 +0500
Subject: [PATCH 437/912] Add termux.properties property for opening terminal
 transcript urls on click

The user can add `terminal-onclick-url-open` entry to `termux.properties` file to enable opening url links in terminal transcript on click or on tap. The default value is `false`. So adding the entry `terminal-onclick-url-open=true` to `termux.properties` file will enable url opening. Running `termux-reload-settings` command will also update the behaviour instantaneously if changed.

This commit just adds the property and doesn't implement the functionality. That will later be merged from #2146.
---
 .../settings/properties/TermuxPropertyConstants.java       | 7 +++++++
 .../shared/settings/properties/TermuxSharedProperties.java | 4 ++++
 2 files changed, 11 insertions(+)

diff --git a/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java b/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java
index b9f7a6e18d..cb3b352bea 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java
@@ -94,6 +94,11 @@ public final class TermuxPropertyConstants {
 
 
 
+    /** Defines the key for whether url links in terminal transcript will automatically open on click or on tap */
+    public static final String KEY_TERMINAL_ONCLICK_URL_OPEN =  "terminal-onclick-url-open"; // Default: "terminal-onclick-url-open"
+
+
+
     /** Defines the key for whether to use black UI */
     public static final String KEY_USE_BLACK_UI =  "use-black-ui"; // Default: "use-black-ui"
 
@@ -301,6 +306,7 @@ public final class TermuxPropertyConstants {
         KEY_DISABLE_TERMINAL_SESSION_CHANGE_TOAST,
         KEY_ENFORCE_CHAR_BASED_INPUT,
         KEY_HIDE_SOFT_KEYBOARD_ON_STARTUP,
+        KEY_TERMINAL_ONCLICK_URL_OPEN,
         KEY_USE_BLACK_UI,
         KEY_USE_CTRL_SPACE_WORKAROUND,
         KEY_USE_FULLSCREEN,
@@ -341,6 +347,7 @@ public final class TermuxPropertyConstants {
         KEY_DISABLE_TERMINAL_SESSION_CHANGE_TOAST,
         KEY_ENFORCE_CHAR_BASED_INPUT,
         KEY_HIDE_SOFT_KEYBOARD_ON_STARTUP,
+        KEY_TERMINAL_ONCLICK_URL_OPEN,
         KEY_USE_CTRL_SPACE_WORKAROUND,
         KEY_USE_FULLSCREEN,
         KEY_USE_FULLSCREEN_WORKAROUND,
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxSharedProperties.java b/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxSharedProperties.java
index d87efde735..992c6f2e23 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxSharedProperties.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxSharedProperties.java
@@ -476,6 +476,10 @@ public boolean shouldSoftKeyboardBeHiddenOnStartup() {
         return (boolean) getInternalPropertyValue(TermuxPropertyConstants.KEY_HIDE_SOFT_KEYBOARD_ON_STARTUP, true);
     }
 
+    public boolean shouldOpenTerminalTranscriptURLOnClick() {
+        return (boolean) getInternalPropertyValue(TermuxPropertyConstants.KEY_TERMINAL_ONCLICK_URL_OPEN, true);
+    }
+
     public boolean isUsingBlackUI() {
         return (boolean) getInternalPropertyValue(TermuxPropertyConstants.KEY_USE_BLACK_UI, true);
     }

From 28b9f93d13fd952ec94397b21333c4367a959d08 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 30 Jun 2021 03:18:44 +0500
Subject: [PATCH 438/912] Compile Url match regex once and not on every use

Needed for #2146.
---
 .../terminal/TermuxTerminalViewClient.java    |   3 +-
 .../com/termux/app/TermuxActivityTest.java    |   4 +-
 .../com/termux/shared/data/DataUtils.java     |  88 ---------------
 .../java/com/termux/shared/data/UrlUtils.java | 103 ++++++++++++++++++
 4 files changed, 107 insertions(+), 91 deletions(-)
 create mode 100644 termux-shared/src/main/java/com/termux/shared/data/UrlUtils.java

diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
index 32bc48b1a6..08201b57d3 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
@@ -21,6 +21,7 @@
 
 import com.termux.R;
 import com.termux.app.TermuxActivity;
+import com.termux.shared.data.UrlUtils;
 import com.termux.shared.shell.ShellUtils;
 import com.termux.shared.terminal.TermuxTerminalViewClientBase;
 import com.termux.shared.termux.TermuxConstants;
@@ -603,7 +604,7 @@ public void showUrlSelection() {
 
         String text = ShellUtils.getTerminalSessionTranscriptText(session, true, true);
 
-        LinkedHashSet<CharSequence> urlSet = DataUtils.extractUrls(text);
+        LinkedHashSet<CharSequence> urlSet = UrlUtils.extractUrls(text);
         if (urlSet.isEmpty()) {
             new AlertDialog.Builder(mActivity).setMessage(R.string.title_select_url_none_found).show();
             return;
diff --git a/app/src/test/java/com/termux/app/TermuxActivityTest.java b/app/src/test/java/com/termux/app/TermuxActivityTest.java
index 090d5cce79..2761382975 100644
--- a/app/src/test/java/com/termux/app/TermuxActivityTest.java
+++ b/app/src/test/java/com/termux/app/TermuxActivityTest.java
@@ -1,6 +1,6 @@
 package com.termux.app;
 
-import com.termux.shared.data.DataUtils;
+import com.termux.shared.data.UrlUtils;
 
 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, DataUtils.extractUrls(text));
+        Assert.assertEquals(expected, UrlUtils.extractUrls(text));
     }
 
     @Test
diff --git a/termux-shared/src/main/java/com/termux/shared/data/DataUtils.java b/termux-shared/src/main/java/com/termux/shared/data/DataUtils.java
index 368755c53a..60bb9fca96 100644
--- a/termux-shared/src/main/java/com/termux/shared/data/DataUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/data/DataUtils.java
@@ -165,92 +165,4 @@ public static boolean isNullOrEmpty(String string) {
         return string == null || string.isEmpty();
     }
 
-
-    public static LinkedHashSet<CharSequence> extractUrls(String text) {
-
-        StringBuilder regex_sb = new StringBuilder();
-
-        regex_sb.append("(");                       // Begin first matching group.
-        regex_sb.append("(?:");                     // Begin scheme group.
-        regex_sb.append("dav|");                    // The DAV proto.
-        regex_sb.append("dict|");                   // The DICT proto.
-        regex_sb.append("dns|");                    // The DNS proto.
-        regex_sb.append("file|");                   // File path.
-        regex_sb.append("finger|");                 // The Finger proto.
-        regex_sb.append("ftp(?:s?)|");              // The FTP proto.
-        regex_sb.append("git|");                    // The Git proto.
-        regex_sb.append("gopher|");                 // The Gopher proto.
-        regex_sb.append("http(?:s?)|");             // The HTTP proto.
-        regex_sb.append("imap(?:s?)|");             // The IMAP proto.
-        regex_sb.append("irc(?:[6s]?)|");           // The IRC proto.
-        regex_sb.append("ip[fn]s|");                // The IPFS proto.
-        regex_sb.append("ldap(?:s?)|");             // The LDAP proto.
-        regex_sb.append("pop3(?:s?)|");             // The POP3 proto.
-        regex_sb.append("redis(?:s?)|");            // The Redis proto.
-        regex_sb.append("rsync|");                  // The Rsync proto.
-        regex_sb.append("rtsp(?:[su]?)|");          // The RTSP proto.
-        regex_sb.append("sftp|");                   // The SFTP proto.
-        regex_sb.append("smb(?:s?)|");              // The SAMBA proto.
-        regex_sb.append("smtp(?:s?)|");             // The SMTP proto.
-        regex_sb.append("svn(?:(?:\\+ssh)?)|");     // The Subversion proto.
-        regex_sb.append("tcp|");                    // The TCP proto.
-        regex_sb.append("telnet|");                 // The Telnet proto.
-        regex_sb.append("tftp|");                   // The TFTP proto.
-        regex_sb.append("udp|");                    // The UDP proto.
-        regex_sb.append("vnc|");                    // The VNC proto.
-        regex_sb.append("ws(?:s?)");                // The Websocket proto.
-        regex_sb.append(")://");                    // End scheme group.
-        regex_sb.append(")");                       // End first matching group.
-
-
-        // Begin second matching group.
-        regex_sb.append("(");
-
-        // User name and/or password in format 'user:pass@'.
-        regex_sb.append("(?:\\S+(?::\\S*)?@)?");
-
-        // Begin host group.
-        regex_sb.append("(?:");
-
-        // IP address (from http://www.regular-expressions.info/examples.html).
-        regex_sb.append("(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)|");
-
-        // Host name or domain.
-        regex_sb.append("(?:(?:[a-z\\u00a1-\\uffff0-9]-*)*[a-z\\u00a1-\\uffff0-9]+)(?:(?:\\.(?:[a-z\\u00a1-\\uffff0-9]-*)*[a-z\\u00a1-\\uffff0-9]+)*(?:\\.(?:[a-z\\u00a1-\\uffff]{2,})))?|");
-
-        // Just path. Used in case of 'file://' scheme.
-        regex_sb.append("/(?:(?:[a-z\\u00a1-\\uffff0-9]-*)*[a-z\\u00a1-\\uffff0-9]+)");
-
-        // End host group.
-        regex_sb.append(")");
-
-        // Port number.
-        regex_sb.append("(?::\\d{1,5})?");
-
-        // Resource path with optional query string.
-        regex_sb.append("(?:/[a-zA-Z0-9:@%\\-._~!$&()*+,;=?/]*)?");
-
-        // Fragment.
-        regex_sb.append("(?:#[a-zA-Z0-9:@%\\-._~!$&()*+,;=?/]*)?");
-
-        // End second matching group.
-        regex_sb.append(")");
-
-        final Pattern urlPattern = Pattern.compile(
-            regex_sb.toString(),
-            Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL);
-
-        LinkedHashSet<CharSequence> urlSet = new LinkedHashSet<>();
-        Matcher matcher = urlPattern.matcher(text);
-
-        while (matcher.find()) {
-            int matchStart = matcher.start(1);
-            int matchEnd = matcher.end();
-            String url = text.substring(matchStart, matchEnd);
-            urlSet.add(url);
-        }
-
-        return urlSet;
-    }
-
 }
diff --git a/termux-shared/src/main/java/com/termux/shared/data/UrlUtils.java b/termux-shared/src/main/java/com/termux/shared/data/UrlUtils.java
new file mode 100644
index 0000000000..8b1b093915
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/data/UrlUtils.java
@@ -0,0 +1,103 @@
+package com.termux.shared.data;
+
+import java.util.LinkedHashSet;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class UrlUtils {
+
+    public static Pattern URL_MATCH_REGEX;
+
+    public static Pattern getUrlMatchRegex() {
+        if (URL_MATCH_REGEX != null) return URL_MATCH_REGEX;
+
+        StringBuilder regex_sb = new StringBuilder();
+
+        regex_sb.append("(");                       // Begin first matching group.
+        regex_sb.append("(?:");                     // Begin scheme group.
+        regex_sb.append("dav|");                    // The DAV proto.
+        regex_sb.append("dict|");                   // The DICT proto.
+        regex_sb.append("dns|");                    // The DNS proto.
+        regex_sb.append("file|");                   // File path.
+        regex_sb.append("finger|");                 // The Finger proto.
+        regex_sb.append("ftp(?:s?)|");              // The FTP proto.
+        regex_sb.append("git|");                    // The Git proto.
+        regex_sb.append("gopher|");                 // The Gopher proto.
+        regex_sb.append("http(?:s?)|");             // The HTTP proto.
+        regex_sb.append("imap(?:s?)|");             // The IMAP proto.
+        regex_sb.append("irc(?:[6s]?)|");           // The IRC proto.
+        regex_sb.append("ip[fn]s|");                // The IPFS proto.
+        regex_sb.append("ldap(?:s?)|");             // The LDAP proto.
+        regex_sb.append("pop3(?:s?)|");             // The POP3 proto.
+        regex_sb.append("redis(?:s?)|");            // The Redis proto.
+        regex_sb.append("rsync|");                  // The Rsync proto.
+        regex_sb.append("rtsp(?:[su]?)|");          // The RTSP proto.
+        regex_sb.append("sftp|");                   // The SFTP proto.
+        regex_sb.append("smb(?:s?)|");              // The SAMBA proto.
+        regex_sb.append("smtp(?:s?)|");             // The SMTP proto.
+        regex_sb.append("svn(?:(?:\\+ssh)?)|");     // The Subversion proto.
+        regex_sb.append("tcp|");                    // The TCP proto.
+        regex_sb.append("telnet|");                 // The Telnet proto.
+        regex_sb.append("tftp|");                   // The TFTP proto.
+        regex_sb.append("udp|");                    // The UDP proto.
+        regex_sb.append("vnc|");                    // The VNC proto.
+        regex_sb.append("ws(?:s?)");                // The Websocket proto.
+        regex_sb.append(")://");                    // End scheme group.
+        regex_sb.append(")");                       // End first matching group.
+
+
+        // Begin second matching group.
+        regex_sb.append("(");
+
+        // User name and/or password in format 'user:pass@'.
+        regex_sb.append("(?:\\S+(?::\\S*)?@)?");
+
+        // Begin host group.
+        regex_sb.append("(?:");
+
+        // IP address (from http://www.regular-expressions.info/examples.html).
+        regex_sb.append("(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)|");
+
+        // Host name or domain.
+        regex_sb.append("(?:(?:[a-z\\u00a1-\\uffff0-9]-*)*[a-z\\u00a1-\\uffff0-9]+)(?:(?:\\.(?:[a-z\\u00a1-\\uffff0-9]-*)*[a-z\\u00a1-\\uffff0-9]+)*(?:\\.(?:[a-z\\u00a1-\\uffff]{2,})))?|");
+
+        // Just path. Used in case of 'file://' scheme.
+        regex_sb.append("/(?:(?:[a-z\\u00a1-\\uffff0-9]-*)*[a-z\\u00a1-\\uffff0-9]+)");
+
+        // End host group.
+        regex_sb.append(")");
+
+        // Port number.
+        regex_sb.append("(?::\\d{1,5})?");
+
+        // Resource path with optional query string.
+        regex_sb.append("(?:/[a-zA-Z0-9:@%\\-._~!$&()*+,;=?/]*)?");
+
+        // Fragment.
+        regex_sb.append("(?:#[a-zA-Z0-9:@%\\-._~!$&()*+,;=?/]*)?");
+
+        // End second matching group.
+        regex_sb.append(")");
+
+        URL_MATCH_REGEX = Pattern.compile(
+            regex_sb.toString(),
+            Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL);
+
+        return URL_MATCH_REGEX;
+    }
+
+    public static LinkedHashSet<CharSequence> extractUrls(String text) {
+        LinkedHashSet<CharSequence> urlSet = new LinkedHashSet<>();
+        Matcher matcher = getUrlMatchRegex().matcher(text);
+
+        while (matcher.find()) {
+            int matchStart = matcher.start(1);
+            int matchEnd = matcher.end();
+            String url = text.substring(matchStart, matchEnd);
+            urlSet.add(url);
+        }
+
+        return urlSet;
+    }
+
+}

From 94c5f3674a4c158295aa7bde9521b1caa78ef5a1 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 30 Jun 2021 03:48:09 +0500
Subject: [PATCH 439/912] Do not start login shell and load ~/.profile if
 starting a failsafe session

This is done by not starting arg `0` with `-`

Fixes #2150.
---
 .../src/main/java/com/termux/shared/shell/TermuxSession.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/shell/TermuxSession.java b/termux-shared/src/main/java/com/termux/shared/shell/TermuxSession.java
index e67ab9fd4d..b1a071d84c 100644
--- a/termux-shared/src/main/java/com/termux/shared/shell/TermuxSession.java
+++ b/termux-shared/src/main/java/com/termux/shared/shell/TermuxSession.java
@@ -91,9 +91,12 @@ public static TermuxSession execute(@NonNull final Context context, @NonNull Exe
 
             if (executionCommand.executable == null) {
                 // Fall back to system shell as last resort:
+                // Do not start a login shell since $HOME/.profile, etc may cause startup failure if they are not valid
                 executionCommand.executable = "/system/bin/sh";
+            } else {
+                isLoginShell = true;
             }
-            isLoginShell = true;
+
         }
 
         String[] processArgs = shellEnvironmentClient.setupProcessArgs(executionCommand.executable, executionCommand.arguments);

From 12f910c32ddd280109dfa1b33a3cbeacac0d7ac3 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 30 Jun 2021 03:57:34 +0500
Subject: [PATCH 440/912] Move Termux app specific logic out of PermissionUtils

---
 .../main/java/com/termux/app/TermuxService.java  |  7 ++++++-
 app/src/main/res/values/strings.xml              |  5 +++++
 .../termux/shared/packages/PermissionUtils.java  | 16 +++++-----------
 termux-shared/src/main/res/values/strings.xml    |  1 -
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxService.java b/app/src/main/java/com/termux/app/TermuxService.java
index d79f8e5c37..fe0b9a5b61 100644
--- a/app/src/main/java/com/termux/app/TermuxService.java
+++ b/app/src/main/java/com/termux/app/TermuxService.java
@@ -640,8 +640,13 @@ private void startTermuxActivity() {
         // 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)) {
+        if (PermissionUtils.validateDisplayOverOtherAppsPermissionForPostAndroid10(this, true)) {
             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);
         }
     }
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c226924c9a..5f396302d8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -91,6 +91,11 @@
 
 
 
+    <!-- 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>
diff --git a/termux-shared/src/main/java/com/termux/shared/packages/PermissionUtils.java b/termux-shared/src/main/java/com/termux/shared/packages/PermissionUtils.java
index ddd36b7a7d..6311ed2419 100644
--- a/termux-shared/src/main/java/com/termux/shared/packages/PermissionUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/packages/PermissionUtils.java
@@ -13,9 +13,7 @@
 import androidx.core.content.ContextCompat;
 
 import com.termux.shared.R;
-import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.logger.Logger;
-import com.termux.shared.settings.preferences.TermuxAppSharedPreferences;
 
 import java.util.Arrays;
 
@@ -81,20 +79,16 @@ public static void requestDisplayOverOtherAppsPermission(Activity context, int r
         context.startActivityForResult(intent, requestCode);
     }
 
-    public static boolean validateDisplayOverOtherAppsPermissionForPostAndroid10(Context context) {
+    public static boolean validateDisplayOverOtherAppsPermissionForPostAndroid10(Context context, boolean logResults) {
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) return true;
         
         if (!PermissionUtils.checkDisplayOverOtherAppsPermission(context)) {
-            Logger.logWarn(LOG_TAG, TermuxConstants.TERMUX_APP_NAME + " App does not have Display over other apps (SYSTEM_ALERT_WINDOW) permission");
-
-            TermuxAppSharedPreferences preferences = TermuxAppSharedPreferences.build(context);
-            if (preferences == null) return false;
-
-            if (preferences.arePluginErrorNotificationsEnabled())
-                Logger.showToast(context, context.getString(R.string.error_display_over_other_apps_permission_not_granted), true);
+            if (logResults)
+                Logger.logWarn(LOG_TAG, context.getPackageName() + " does not have Display over other apps (SYSTEM_ALERT_WINDOW) permission");
             return false;
         } else {
-            Logger.logDebug(LOG_TAG, TermuxConstants.TERMUX_APP_NAME + " App already has Display over other apps (SYSTEM_ALERT_WINDOW) permission");
+            if (logResults)
+                Logger.logDebug(LOG_TAG, context.getPackageName() + " already has Display over other apps (SYSTEM_ALERT_WINDOW) permission");
             return true;
         }
     }
diff --git a/termux-shared/src/main/res/values/strings.xml b/termux-shared/src/main/res/values/strings.xml
index 21a8504635..b6efd5c502 100644
--- a/termux-shared/src/main/res/values/strings.xml
+++ b/termux-shared/src/main/res/values/strings.xml
@@ -25,7 +25,6 @@
 
     <!-- PermissionUtils -->
     <string name="message_sudo_please_grant_permissions">Please grant permissions on next screen</string>
-    <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>
 
 
 

From 6bca378cecbbe6658bc09eed4986c88cfc8b5402 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 30 Jun 2021 04:26:20 +0500
Subject: [PATCH 441/912] Move Android specific utils from TermuxUtils to
 AndroidUtils

---
 .../app/activities/SettingsActivity.java      |   3 +-
 .../terminal/TermuxTerminalViewClient.java    |   3 +-
 .../com/termux/app/utils/PluginUtils.java     |   5 +-
 .../com/termux/shared/crash/CrashHandler.java |   5 +-
 .../com/termux/shared/models/ReportInfo.java  |   4 +-
 .../com/termux/shared/shell/ResultSender.java |   6 +-
 .../termux/shared/termux/AndroidUtils.java    | 181 ++++++++++++++++++
 .../com/termux/shared/termux/TermuxUtils.java | 168 +---------------
 8 files changed, 203 insertions(+), 172 deletions(-)
 create mode 100644 termux-shared/src/main/java/com/termux/shared/termux/AndroidUtils.java

diff --git a/app/src/main/java/com/termux/app/activities/SettingsActivity.java b/app/src/main/java/com/termux/app/activities/SettingsActivity.java
index 9c2015b877..1ae903a6ec 100644
--- a/app/src/main/java/com/termux/app/activities/SettingsActivity.java
+++ b/app/src/main/java/com/termux/app/activities/SettingsActivity.java
@@ -16,6 +16,7 @@
 import com.termux.shared.interact.ShareUtils;
 import com.termux.shared.packages.PackageUtils;
 import com.termux.shared.settings.preferences.TermuxTaskerAppSharedPreferences;
+import com.termux.shared.termux.AndroidUtils;
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.termux.TermuxUtils;
 
@@ -82,7 +83,7 @@ public void run() {
                             if (termuxPluginAppsInfo != null)
                                 aboutString.append("\n\n").append(termuxPluginAppsInfo);
 
-                            aboutString.append("\n\n").append(TermuxUtils.getDeviceInfoMarkdownString(context));
+                            aboutString.append("\n\n").append(AndroidUtils.getDeviceInfoMarkdownString(context));
                             aboutString.append("\n\n").append(TermuxUtils.getImportantLinksMarkdownString(context));
 
                             ReportActivity.startReportActivity(context, new ReportInfo(UserAction.ABOUT.getName(), TermuxConstants.TERMUX_APP.TERMUX_SETTINGS_ACTIVITY_NAME, title, null, aboutString.toString(), null, false));
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
index 08201b57d3..7b3592fb94 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
@@ -24,6 +24,7 @@
 import com.termux.shared.data.UrlUtils;
 import com.termux.shared.shell.ShellUtils;
 import com.termux.shared.terminal.TermuxTerminalViewClientBase;
+import com.termux.shared.termux.AndroidUtils;
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.activities.ReportActivity;
 import com.termux.shared.models.ReportInfo;
@@ -664,7 +665,7 @@ public void run() {
                 reportString.append("\n").append(MarkdownUtils.getMarkdownCodeForString(transcriptTextTruncated, true));
 
                 reportString.append("\n\n").append(TermuxUtils.getAppInfoMarkdownString(mActivity, true));
-                reportString.append("\n\n").append(TermuxUtils.getDeviceInfoMarkdownString(mActivity));
+                reportString.append("\n\n").append(AndroidUtils.getDeviceInfoMarkdownString(mActivity));
 
                 String termuxAptInfo = TermuxUtils.geAPTInfoMarkdownString(mActivity);
                 if (termuxAptInfo != null)
diff --git a/app/src/main/java/com/termux/app/utils/PluginUtils.java b/app/src/main/java/com/termux/app/utils/PluginUtils.java
index 6515fd000a..67fe6c1878 100644
--- a/app/src/main/java/com/termux/app/utils/PluginUtils.java
+++ b/app/src/main/java/com/termux/app/utils/PluginUtils.java
@@ -18,6 +18,7 @@
 import com.termux.shared.notification.NotificationUtils;
 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.shared.logger.Logger;
@@ -193,7 +194,7 @@ public static void setPluginResultDirectoryVariables(ExecutionCommand executionC
 
         // Set default resultFileBasename if resultSingleFile is true to `<executable_basename>-<timestamp>.log`
         if (resultConfig.resultSingleFile && resultConfig.resultFileBasename == null)
-            resultConfig.resultFileBasename = ShellUtils.getExecutableBasename(executionCommand.executable) + "-" + TermuxUtils.getCurrentMilliSecondLocalTimeStamp() + ".log";
+            resultConfig.resultFileBasename = ShellUtils.getExecutableBasename(executionCommand.executable) + "-" + AndroidUtils.getCurrentMilliSecondLocalTimeStamp() + ".log";
     }
 
 
@@ -215,7 +216,7 @@ public static void sendPluginCommandErrorNotification(Context context, String lo
 
         reportString.append(ExecutionCommand.getExecutionCommandMarkdownString(executionCommand));
         reportString.append("\n\n").append(TermuxUtils.getAppInfoMarkdownString(context, true));
-        reportString.append("\n\n").append(TermuxUtils.getDeviceInfoMarkdownString(context));
+        reportString.append("\n\n").append(AndroidUtils.getDeviceInfoMarkdownString(context));
 
         Intent notificationIntent = ReportActivity.newInstance(context, new ReportInfo(UserAction.PLUGIN_EXECUTION_COMMAND.getName(), logTag, title, null, reportString.toString(), null,true));
         PendingIntent pendingIntent = PendingIntent.getActivity(context, 0, notificationIntent, PendingIntent.FLAG_UPDATE_CURRENT);
diff --git a/termux-shared/src/main/java/com/termux/shared/crash/CrashHandler.java b/termux-shared/src/main/java/com/termux/shared/crash/CrashHandler.java
index 1f7c82ad36..8f5e028ed0 100644
--- a/termux-shared/src/main/java/com/termux/shared/crash/CrashHandler.java
+++ b/termux-shared/src/main/java/com/termux/shared/crash/CrashHandler.java
@@ -8,6 +8,7 @@
 import com.termux.shared.logger.Logger;
 import com.termux.shared.markdown.MarkdownUtils;
 import com.termux.shared.models.errors.Error;
+import com.termux.shared.termux.AndroidUtils;
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.termux.TermuxUtils;
 
@@ -56,11 +57,11 @@ public static void logCrash(final Context context, final Thread thread, final Th
 
         reportString.append("## Crash Details\n");
         reportString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Crash Thread", thread.toString(), "-"));
-        reportString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Crash Timestamp", TermuxUtils.getCurrentTimeStamp(), "-"));
+        reportString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Crash Timestamp", AndroidUtils.getCurrentTimeStamp(), "-"));
 
         reportString.append("\n\n").append(Logger.getStackTracesMarkdownString("Stacktrace", Logger.getStackTracesStringArray(throwable)));
         reportString.append("\n\n").append(TermuxUtils.getAppInfoMarkdownString(context, true));
-        reportString.append("\n\n").append(TermuxUtils.getDeviceInfoMarkdownString(context));
+        reportString.append("\n\n").append(AndroidUtils.getDeviceInfoMarkdownString(context));
 
         // Log report string to logcat
         Logger.logError(reportString.toString());
diff --git a/termux-shared/src/main/java/com/termux/shared/models/ReportInfo.java b/termux-shared/src/main/java/com/termux/shared/models/ReportInfo.java
index 824c11ac73..fdb648b239 100644
--- a/termux-shared/src/main/java/com/termux/shared/models/ReportInfo.java
+++ b/termux-shared/src/main/java/com/termux/shared/models/ReportInfo.java
@@ -1,7 +1,7 @@
 package com.termux.shared.models;
 
 import com.termux.shared.markdown.MarkdownUtils;
-import com.termux.shared.termux.TermuxUtils;
+import com.termux.shared.termux.AndroidUtils;
 
 import java.io.Serializable;
 
@@ -34,7 +34,7 @@ public ReportInfo(String userAction, String sender, String reportTitle, String r
         this.reportString = reportString;
         this.reportStringSuffix = reportStringSuffix;
         this.addReportInfoToMarkdown = addReportInfoToMarkdown;
-        this.reportTimestamp = TermuxUtils.getCurrentTimeStamp();
+        this.reportTimestamp = AndroidUtils.getCurrentTimeStamp();
     }
 
     /**
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/ResultSender.java b/termux-shared/src/main/java/com/termux/shared/shell/ResultSender.java
index 2a5e9308be..6e19958af9 100644
--- a/termux-shared/src/main/java/com/termux/shared/shell/ResultSender.java
+++ b/termux-shared/src/main/java/com/termux/shared/shell/ResultSender.java
@@ -15,8 +15,8 @@
 import com.termux.shared.models.ResultData;
 import com.termux.shared.models.errors.FunctionErrno;
 import com.termux.shared.models.errors.ResultSenderErrno;
+import com.termux.shared.termux.AndroidUtils;
 import com.termux.shared.termux.TermuxConstants.RESULT_SENDER;
-import com.termux.shared.termux.TermuxUtils;
 
 public class ResultSender {
 
@@ -235,7 +235,7 @@ else if (resultDataStderr.isEmpty())
 
             // Write error or output to temp file
             // Check errCode file creation below for explanation for why temp file is used
-            String temp_filename = resultConfig.resultFileBasename + "-" + TermuxUtils.getCurrentMilliSecondLocalTimeStamp();
+            String temp_filename = resultConfig.resultFileBasename + "-" + AndroidUtils.getCurrentMilliSecondLocalTimeStamp();
             error = FileUtils.writeStringToFile(temp_filename, resultConfig.resultDirectoryPath + "/" + temp_filename,
                 null, error_or_output, false);
             if (error != null) {
@@ -312,7 +312,7 @@ else if (resultDataStderr.isEmpty())
             // caller may otherwise read from an empty file in some cases.
 
             // Write errCode to temp file
-            String temp_filename = RESULT_SENDER.RESULT_FILE_ERR_PREFIX + "-" + TermuxUtils.getCurrentMilliSecondLocalTimeStamp();
+            String temp_filename = RESULT_SENDER.RESULT_FILE_ERR_PREFIX + "-" + AndroidUtils.getCurrentMilliSecondLocalTimeStamp();
             if (!resultConfig.resultFilesSuffix.isEmpty()) temp_filename = temp_filename + "-" + resultConfig.resultFilesSuffix;
             error = FileUtils.writeStringToFile(temp_filename, resultConfig.resultDirectoryPath + "/" + temp_filename,
                 null, String.valueOf(resultData.getErrCode()), false);
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/AndroidUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/AndroidUtils.java
new file mode 100644
index 0000000000..698d2c2867
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/termux/AndroidUtils.java
@@ -0,0 +1,181 @@
+package com.termux.shared.termux;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.os.Build;
+
+import androidx.annotation.NonNull;
+
+import com.google.common.base.Joiner;
+import com.termux.shared.logger.Logger;
+import com.termux.shared.markdown.MarkdownUtils;
+import com.termux.shared.packages.PackageUtils;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Properties;
+import java.util.TimeZone;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class AndroidUtils {
+
+    /**
+     * Get a markdown {@link String} for the app info for the package associated with the {@code context}.
+     *
+     * @param context The context for operations for the package.
+     * @return Returns the markdown {@link String}.
+     */
+    public static String getAppInfoMarkdownString(@NonNull final Context context) {
+        StringBuilder markdownString = new StringBuilder();
+
+        AndroidUtils.appendPropertyToMarkdown(markdownString,"APP_NAME", PackageUtils.getAppNameForPackage(context));
+        AndroidUtils.appendPropertyToMarkdown(markdownString,"PACKAGE_NAME", PackageUtils.getPackageNameForPackage(context));
+        AndroidUtils.appendPropertyToMarkdown(markdownString,"VERSION_NAME", PackageUtils.getVersionNameForPackage(context));
+        AndroidUtils.appendPropertyToMarkdown(markdownString,"VERSION_CODE", PackageUtils.getVersionCodeForPackage(context));
+        AndroidUtils.appendPropertyToMarkdown(markdownString,"TARGET_SDK", PackageUtils.getTargetSDKForPackage(context));
+        AndroidUtils.appendPropertyToMarkdown(markdownString,"IS_DEBUG_BUILD", PackageUtils.isAppForPackageADebugBuild(context));
+
+        return markdownString.toString();
+    }
+
+    /**
+     * Get a markdown {@link String} for the device info.
+     *
+     * @param context The context for operations.
+     * @return Returns the markdown {@link String}.
+     */
+    public static String getDeviceInfoMarkdownString(@NonNull final Context context) {
+        // Some properties cannot be read with {@link System#getProperty(String)} but can be read
+        // directly by running getprop command
+        Properties systemProperties = getSystemProperties();
+
+        StringBuilder markdownString = new StringBuilder();
+
+        markdownString.append("## Device Info");
+
+        markdownString.append("\n\n### Software\n");
+        appendPropertyToMarkdown(markdownString,"OS_VERSION", getSystemPropertyWithAndroidAPI("os.version"));
+        appendPropertyToMarkdown(markdownString, "SDK_INT", Build.VERSION.SDK_INT);
+        // If its a release version
+        if ("REL".equals(Build.VERSION.CODENAME))
+            appendPropertyToMarkdown(markdownString, "RELEASE", Build.VERSION.RELEASE);
+        else
+            appendPropertyToMarkdown(markdownString, "CODENAME", Build.VERSION.CODENAME);
+        appendPropertyToMarkdown(markdownString, "ID", Build.ID);
+        appendPropertyToMarkdown(markdownString, "DISPLAY", Build.DISPLAY);
+        appendPropertyToMarkdown(markdownString, "INCREMENTAL", Build.VERSION.INCREMENTAL);
+        appendPropertyToMarkdownIfSet(markdownString, "SECURITY_PATCH", systemProperties.getProperty("ro.build.version.security_patch"));
+        appendPropertyToMarkdownIfSet(markdownString, "IS_DEBUGGABLE", systemProperties.getProperty("ro.debuggable"));
+        appendPropertyToMarkdownIfSet(markdownString, "IS_EMULATOR", systemProperties.getProperty("ro.boot.qemu"));
+        appendPropertyToMarkdownIfSet(markdownString, "IS_TREBLE_ENABLED", systemProperties.getProperty("ro.treble.enabled"));
+        appendPropertyToMarkdown(markdownString, "TYPE", Build.TYPE);
+        appendPropertyToMarkdown(markdownString, "TAGS", Build.TAGS);
+
+        markdownString.append("\n\n### Hardware\n");
+        appendPropertyToMarkdown(markdownString, "MANUFACTURER", Build.MANUFACTURER);
+        appendPropertyToMarkdown(markdownString, "BRAND", Build.BRAND);
+        appendPropertyToMarkdown(markdownString, "MODEL", Build.MODEL);
+        appendPropertyToMarkdown(markdownString, "PRODUCT", Build.PRODUCT);
+        appendPropertyToMarkdown(markdownString, "BOARD", Build.BOARD);
+        appendPropertyToMarkdown(markdownString, "HARDWARE", Build.HARDWARE);
+        appendPropertyToMarkdown(markdownString, "DEVICE", Build.DEVICE);
+        appendPropertyToMarkdown(markdownString, "SUPPORTED_ABIS", Joiner.on(", ").skipNulls().join(Build.SUPPORTED_ABIS));
+
+        markdownString.append("\n##\n");
+
+        return markdownString.toString();
+    }
+
+
+
+    public static Properties getSystemProperties() {
+        Properties systemProperties = new Properties();
+
+        // getprop commands returns values in the format `[key]: [value]`
+        // Regex matches string starting with a literal `[`,
+        // followed by one or more characters that do not match a closing square bracket as the key,
+        // followed by a literal `]: [`,
+        // followed by one or more characters as the value,
+        // followed by string ending with literal `]`
+        // multiline values will be ignored
+        Pattern propertiesPattern = Pattern.compile("^\\[([^]]+)]: \\[(.+)]$");
+
+        try {
+            Process process = new ProcessBuilder()
+                .command("/system/bin/getprop")
+                .redirectErrorStream(true)
+                .start();
+
+            InputStream inputStream = process.getInputStream();
+            BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(inputStream));
+            String line, key, value;
+
+            while ((line = bufferedReader.readLine()) != null) {
+                Matcher matcher = propertiesPattern.matcher(line);
+                if (matcher.matches()) {
+                    key = matcher.group(1);
+                    value = matcher.group(2);
+                    if (key != null && value != null && !key.isEmpty() && !value.isEmpty())
+                        systemProperties.put(key, value);
+                }
+            }
+
+            bufferedReader.close();
+            process.destroy();
+
+        } catch (IOException e) {
+            Logger.logStackTraceWithMessage("Failed to get run \"/system/bin/getprop\" to get system properties.", e);
+        }
+
+        //for (String key : systemProperties.stringPropertyNames()) {
+        //    Logger.logVerbose(key + ": " +  systemProperties.get(key));
+        //}
+
+        return systemProperties;
+    }
+
+    private static String getSystemPropertyWithAndroidAPI(@NonNull String property) {
+        try {
+            return System.getProperty(property);
+        } catch (Exception e) {
+            Logger.logVerbose("Failed to get system property \"" + property + "\":" + e.getMessage());
+            return null;
+        }
+    }
+
+    private static void appendPropertyToMarkdownIfSet(StringBuilder markdownString, String label, Object value) {
+        if (value == null) return;
+        if (value instanceof String && (((String) value).isEmpty()) || "REL".equals(value)) return;
+        markdownString.append("\n").append(getPropertyMarkdown(label, value));
+    }
+
+    static void appendPropertyToMarkdown(StringBuilder markdownString, String label, Object value) {
+        markdownString.append("\n").append(getPropertyMarkdown(label, value));
+    }
+
+    private static String getPropertyMarkdown(String label, Object value) {
+        return MarkdownUtils.getSingleLineMarkdownStringEntry(label, value, "-");
+    }
+
+
+
+    public static String getCurrentTimeStamp() {
+        @SuppressLint("SimpleDateFormat")
+        final SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss z");
+        df.setTimeZone(TimeZone.getTimeZone("UTC"));
+        return df.format(new Date());
+    }
+
+    public static String getCurrentMilliSecondLocalTimeStamp() {
+        @SuppressLint("SimpleDateFormat")
+        final SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd_HH.mm.ss.SSS");
+        df.setTimeZone(TimeZone.getDefault());
+        return df.format(new Date());
+    }
+
+}
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
index 71e6a3ae69..3eeb584eca 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
@@ -1,16 +1,12 @@
 package com.termux.shared.termux;
 
-import android.annotation.SuppressLint;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ResolveInfo;
-import android.os.Build;
 
 import androidx.annotation.NonNull;
 
-import com.google.common.base.Joiner;
-
 import com.termux.shared.R;
 import com.termux.shared.logger.Logger;
 import com.termux.shared.markdown.MarkdownUtils;
@@ -21,17 +17,10 @@
 
 import org.apache.commons.io.IOUtils;
 
-import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.nio.charset.Charset;
-import java.text.SimpleDateFormat;
-import java.util.Date;
 import java.util.List;
-import java.util.Properties;
-import java.util.TimeZone;
-import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 public class TermuxUtils {
@@ -117,8 +106,6 @@ public static Context getTermuxWidgetPackageContext(@NonNull Context context) {
      * @param context The Context to send the broadcast.
      */
     public static void sendTermuxOpenedBroadcast(@NonNull Context context) {
-        if (context == null) return;
-
         Intent broadcast = new Intent(TermuxConstants.BROADCAST_TERMUX_OPENED);
         List<ResolveInfo> matches = context.getPackageManager().queryBroadcastReceivers(broadcast, 0);
 
@@ -139,7 +126,7 @@ public static void sendTermuxOpenedBroadcast(@NonNull Context context) {
      * @param currentPackageContext The context of current package.
      * @return Returns the markdown {@link String}.
      */
-    public static String getTermuxPluginAppsInfoMarkdownString(@NonNull final Context currentPackageContext) {
+    public static String getTermuxPluginAppsInfoMarkdownString(final Context currentPackageContext) {
         if (currentPackageContext == null) return "null";
 
         StringBuilder markdownString = new StringBuilder();
@@ -154,7 +141,7 @@ public static String getTermuxPluginAppsInfoMarkdownString(@NonNull final Contex
                 if (termuxPluginAppContext != null) {
                     if (i != 0)
                         markdownString.append("\n\n");
-                    markdownString.append(TermuxUtils.getAppInfoMarkdownString(termuxPluginAppContext, false));
+                    markdownString.append(getAppInfoMarkdownString(termuxPluginAppContext, false));
                 }
             }
         }
@@ -176,7 +163,7 @@ public static String getTermuxPluginAppsInfoMarkdownString(@NonNull final Contex
      * {@link TermuxConstants#TERMUX_PACKAGE_NAME} package as well if its different from current package.
      * @return Returns the markdown {@link String}.
      */
-    public static String getAppInfoMarkdownString(@NonNull final Context currentPackageContext, final boolean returnTermuxPackageInfoToo) {
+    public static String getAppInfoMarkdownString(final Context currentPackageContext, final boolean returnTermuxPackageInfoToo) {
         if (currentPackageContext == null) return "null";
 
         StringBuilder markdownString = new StringBuilder();
@@ -202,7 +189,7 @@ public static String getAppInfoMarkdownString(@NonNull final Context currentPack
             markdownString.append("## ").append(currentAppName).append(" App Info\n");
         markdownString.append(getAppInfoMarkdownStringInner(currentPackageContext));
 
-        if (returnTermuxPackageInfoToo && !isTermuxPackage) {
+        if (returnTermuxPackageInfoToo && termuxPackageContext != null && !isTermuxPackage) {
             markdownString.append("\n\n## ").append(termuxAppName).append(" App Info\n");
             markdownString.append(getAppInfoMarkdownStringInner(termuxPackageContext));
         }
@@ -221,72 +208,17 @@ public static String getAppInfoMarkdownString(@NonNull final Context currentPack
     public static String getAppInfoMarkdownStringInner(@NonNull final Context context) {
         StringBuilder markdownString = new StringBuilder();
 
-        appendPropertyToMarkdown(markdownString,"APP_NAME", PackageUtils.getAppNameForPackage(context));
-        appendPropertyToMarkdown(markdownString,"PACKAGE_NAME", PackageUtils.getPackageNameForPackage(context));
-        appendPropertyToMarkdown(markdownString,"VERSION_NAME", PackageUtils.getVersionNameForPackage(context));
-        appendPropertyToMarkdown(markdownString,"VERSION_CODE", PackageUtils.getVersionCodeForPackage(context));
-        appendPropertyToMarkdown(markdownString,"TARGET_SDK", PackageUtils.getTargetSDKForPackage(context));
-        appendPropertyToMarkdown(markdownString,"IS_DEBUG_BUILD", PackageUtils.isAppForPackageADebugBuild(context));
+        markdownString.append((AndroidUtils.getAppInfoMarkdownString(context)));
 
         String signingCertificateSHA256Digest = PackageUtils.getSigningCertificateSHA256DigestForPackage(context);
         if (signingCertificateSHA256Digest != null) {
-            appendPropertyToMarkdown(markdownString,"APK_RELEASE", getAPKRelease(signingCertificateSHA256Digest));
-            appendPropertyToMarkdown(markdownString,"SIGNING_CERTIFICATE_SHA256_DIGEST", signingCertificateSHA256Digest);
+            AndroidUtils.appendPropertyToMarkdown(markdownString,"APK_RELEASE", getAPKRelease(signingCertificateSHA256Digest));
+            AndroidUtils.appendPropertyToMarkdown(markdownString,"SIGNING_CERTIFICATE_SHA256_DIGEST", signingCertificateSHA256Digest);
         }
 
         return markdownString.toString();
     }
 
-    /**
-     * Get a markdown {@link String} for the device info.
-     *
-     * @param context The context for operations.
-     * @return Returns the markdown {@link String}.
-     */
-    public static String getDeviceInfoMarkdownString(@NonNull final Context context) {
-        if (context == null) return "null";
-
-        // Some properties cannot be read with {@link System#getProperty(String)} but can be read
-        // directly by running getprop command
-        Properties systemProperties = getSystemProperties();
-
-        StringBuilder markdownString = new StringBuilder();
-
-        markdownString.append("## Device Info");
-
-        markdownString.append("\n\n### Software\n");
-        appendPropertyToMarkdown(markdownString,"OS_VERSION", getSystemPropertyWithAndroidAPI("os.version"));
-        appendPropertyToMarkdown(markdownString, "SDK_INT", Build.VERSION.SDK_INT);
-        // If its a release version
-        if ("REL".equals(Build.VERSION.CODENAME))
-            appendPropertyToMarkdown(markdownString, "RELEASE", Build.VERSION.RELEASE);
-        else
-            appendPropertyToMarkdown(markdownString, "CODENAME", Build.VERSION.CODENAME);
-        appendPropertyToMarkdown(markdownString, "ID", Build.ID);
-        appendPropertyToMarkdown(markdownString, "DISPLAY", Build.DISPLAY);
-        appendPropertyToMarkdown(markdownString, "INCREMENTAL", Build.VERSION.INCREMENTAL);
-        appendPropertyToMarkdownIfSet(markdownString, "SECURITY_PATCH", systemProperties.getProperty("ro.build.version.security_patch"));
-        appendPropertyToMarkdownIfSet(markdownString, "IS_DEBUGGABLE", systemProperties.getProperty("ro.debuggable"));
-        appendPropertyToMarkdownIfSet(markdownString, "IS_EMULATOR", systemProperties.getProperty("ro.boot.qemu"));
-        appendPropertyToMarkdownIfSet(markdownString, "IS_TREBLE_ENABLED", systemProperties.getProperty("ro.treble.enabled"));
-        appendPropertyToMarkdown(markdownString, "TYPE", Build.TYPE);
-        appendPropertyToMarkdown(markdownString, "TAGS", Build.TAGS);
-
-        markdownString.append("\n\n### Hardware\n");
-        appendPropertyToMarkdown(markdownString, "MANUFACTURER", Build.MANUFACTURER);
-        appendPropertyToMarkdown(markdownString, "BRAND", Build.BRAND);
-        appendPropertyToMarkdown(markdownString, "MODEL", Build.MODEL);
-        appendPropertyToMarkdown(markdownString, "PRODUCT", Build.PRODUCT);
-        appendPropertyToMarkdown(markdownString, "BOARD", Build.BOARD);
-        appendPropertyToMarkdown(markdownString, "HARDWARE", Build.HARDWARE);
-        appendPropertyToMarkdown(markdownString, "DEVICE", Build.DEVICE);
-        appendPropertyToMarkdown(markdownString, "SUPPORTED_ABIS", Joiner.on(", ").skipNulls().join(Build.SUPPORTED_ABIS));
-
-        markdownString.append("\n##\n");
-
-        return markdownString.toString();
-    }
-
     /**
      * Get a markdown {@link String} for reporting an issue.
      *
@@ -418,92 +350,6 @@ public static String geAPTInfoMarkdownString(@NonNull final Context context) {
     }
 
 
-
-    public static Properties getSystemProperties() {
-        Properties systemProperties = new Properties();
-
-        // getprop commands returns values in the format `[key]: [value]`
-        // Regex matches string starting with a literal `[`,
-        // followed by one or more characters that do not match a closing square bracket as the key,
-        // followed by a literal `]: [`,
-        // followed by one or more characters as the value,
-        // followed by string ending with literal `]`
-        // multiline values will be ignored
-        Pattern propertiesPattern = Pattern.compile("^\\[([^]]+)]: \\[(.+)]$");
-
-        try {
-            Process process = new ProcessBuilder()
-                .command("/system/bin/getprop")
-                .redirectErrorStream(true)
-                .start();
-
-            InputStream inputStream = process.getInputStream();
-            BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(inputStream));
-            String line, key, value;
-
-            while ((line = bufferedReader.readLine()) != null) {
-                Matcher matcher = propertiesPattern.matcher(line);
-                if (matcher.matches()) {
-                    key = matcher.group(1);
-                    value = matcher.group(2);
-                    if (key != null && value != null && !key.isEmpty() && !value.isEmpty())
-                        systemProperties.put(key, value);
-                }
-            }
-
-            bufferedReader.close();
-            process.destroy();
-
-        } catch (IOException e) {
-            Logger.logStackTraceWithMessage("Failed to get run \"/system/bin/getprop\" to get system properties.", e);
-        }
-
-        //for (String key : systemProperties.stringPropertyNames()) {
-        //    Logger.logVerbose(key + ": " +  systemProperties.get(key));
-        //}
-
-        return systemProperties;
-    }
-
-    private static String getSystemPropertyWithAndroidAPI(@NonNull String property) {
-        try {
-            return System.getProperty(property);
-        } catch (Exception e) {
-            Logger.logVerbose("Failed to get system property \"" + property + "\":" + e.getMessage());
-            return null;
-        }
-    }
-
-    private static void appendPropertyToMarkdownIfSet(StringBuilder markdownString, String label, Object value) {
-        if (value == null) return;
-        if (value instanceof String && (((String) value).isEmpty()) || "REL".equals(value)) return;
-        markdownString.append("\n").append(getPropertyMarkdown(label, value));
-    }
-
-    private static void appendPropertyToMarkdown(StringBuilder markdownString, String label, Object value) {
-        markdownString.append("\n").append(getPropertyMarkdown(label, value));
-    }
-
-    private static String getPropertyMarkdown(String label, Object value) {
-        return MarkdownUtils.getSingleLineMarkdownStringEntry(label, value, "-");
-    }
-
-
-
-    public static String getCurrentTimeStamp() {
-        @SuppressLint("SimpleDateFormat")
-        final SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss z");
-        df.setTimeZone(TimeZone.getTimeZone("UTC"));
-        return df.format(new Date());
-    }
-
-    public static String getCurrentMilliSecondLocalTimeStamp() {
-        @SuppressLint("SimpleDateFormat")
-        final SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd_HH.mm.ss.SSS");
-        df.setTimeZone(TimeZone.getDefault());
-        return df.format(new Date());
-    }
-
     public static String getAPKRelease(String signingCertificateSHA256Digest) {
         if (signingCertificateSHA256Digest == null) return "null";
 

From 553913cde13062c097043a5f78507bbd642cf3af Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 30 Jun 2021 04:35:06 +0500
Subject: [PATCH 442/912] Divide dialog utils

---
 .../java/com/termux/app/TermuxActivity.java   |  4 +-
 .../java/com/termux/app/TermuxInstaller.java  |  4 +-
 .../terminal/TermuxTerminalSessionClient.java |  4 +-
 .../TermuxFileReceiverActivity.java           |  4 +-
 .../shared/interact/MessageDialogUtils.java   | 53 +++++++++++++++++++
 ...ogUtils.java => TextInputDialogUtils.java} | 40 +-------------
 .../termux/shared/packages/PackageUtils.java  |  4 +-
 7 files changed, 64 insertions(+), 49 deletions(-)
 create mode 100644 termux-shared/src/main/java/com/termux/shared/interact/MessageDialogUtils.java
 rename termux-shared/src/main/java/com/termux/shared/interact/{DialogUtils.java => TextInputDialogUtils.java} (65%)

diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index 0c13c01972..4da810f76c 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -45,7 +45,7 @@
 import com.termux.app.terminal.TermuxTerminalViewClient;
 import com.termux.app.terminal.io.extrakeys.ExtraKeysView;
 import com.termux.app.settings.properties.TermuxAppSharedProperties;
-import com.termux.shared.interact.DialogUtils;
+import com.termux.shared.interact.TextInputDialogUtils;
 import com.termux.shared.logger.Logger;
 import com.termux.shared.termux.TermuxUtils;
 import com.termux.terminal.TerminalSession;
@@ -514,7 +514,7 @@ private void setNewSessionButtonView() {
         View newSessionButton = findViewById(R.id.new_session_button);
         newSessionButton.setOnClickListener(v -> mTermuxTerminalSessionClient.addNewSession(false, null));
         newSessionButton.setOnLongClickListener(v -> {
-            DialogUtils.textInput(TermuxActivity.this, R.string.title_create_named_session, null,
+            TextInputDialogUtils.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);
diff --git a/app/src/main/java/com/termux/app/TermuxInstaller.java b/app/src/main/java/com/termux/app/TermuxInstaller.java
index 83ce3ab9df..19ade92079 100644
--- a/app/src/main/java/com/termux/app/TermuxInstaller.java
+++ b/app/src/main/java/com/termux/app/TermuxInstaller.java
@@ -13,7 +13,7 @@
 import com.termux.R;
 import com.termux.app.utils.CrashUtils;
 import com.termux.shared.file.FileUtils;
-import com.termux.shared.interact.DialogUtils;
+import com.termux.shared.interact.MessageDialogUtils;
 import com.termux.shared.logger.Logger;
 import com.termux.shared.models.errors.Error;
 import com.termux.shared.termux.TermuxConstants;
@@ -60,7 +60,7 @@ static void setupBootstrapIfNeeded(final Activity activity, final Runnable whenD
         if (!isPrimaryUser) {
             String bootstrapErrorMessage = activity.getString(R.string.bootstrap_error_not_primary_user_message, TermuxConstants.TERMUX_PREFIX_DIR_PATH);
             Logger.logError(LOG_TAG, bootstrapErrorMessage);
-            DialogUtils.exitAppWithErrorMessage(activity,
+            MessageDialogUtils.exitAppWithErrorMessage(activity,
                 activity.getString(R.string.bootstrap_error_title),
                 bootstrapErrorMessage);
             return;
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java
index be98ddc926..e80290d559 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java
@@ -14,7 +14,7 @@
 
 import com.termux.R;
 import com.termux.shared.shell.TermuxSession;
-import com.termux.shared.interact.DialogUtils;
+import com.termux.shared.interact.TextInputDialogUtils;
 import com.termux.app.TermuxActivity;
 import com.termux.shared.terminal.TermuxTerminalSessionClientBase;
 import com.termux.shared.termux.TermuxConstants;
@@ -301,7 +301,7 @@ public void switchToSession(int index) {
     public void renameSession(final TerminalSession sessionToRename) {
         if (sessionToRename == null) return;
 
-        DialogUtils.textInput(mActivity, R.string.title_rename_session, sessionToRename.mSessionName, R.string.action_rename_session_confirm, text -> {
+        TextInputDialogUtils.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);
diff --git a/app/src/main/java/com/termux/filepicker/TermuxFileReceiverActivity.java b/app/src/main/java/com/termux/filepicker/TermuxFileReceiverActivity.java
index ccee576588..ef600dc0a2 100644
--- a/app/src/main/java/com/termux/filepicker/TermuxFileReceiverActivity.java
+++ b/app/src/main/java/com/termux/filepicker/TermuxFileReceiverActivity.java
@@ -9,7 +9,7 @@
 import android.util.Patterns;
 
 import com.termux.R;
-import com.termux.shared.interact.DialogUtils;
+import com.termux.shared.interact.TextInputDialogUtils;
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.termux.TermuxConstants.TERMUX_APP.TERMUX_SERVICE;
 import com.termux.app.TermuxService;
@@ -118,7 +118,7 @@ void handleContentUri(final Uri uri, String subjectFromIntent) {
     }
 
     void promptNameAndSave(final InputStream in, final String attachmentFileName) {
-        DialogUtils.textInput(this, R.string.title_file_received, attachmentFileName, R.string.action_file_received_edit, text -> {
+        TextInputDialogUtils.textInput(this, R.string.title_file_received, attachmentFileName, R.string.action_file_received_edit, text -> {
             File outFile = saveStreamWithName(in, text);
             if (outFile == null) return;
 
diff --git a/termux-shared/src/main/java/com/termux/shared/interact/MessageDialogUtils.java b/termux-shared/src/main/java/com/termux/shared/interact/MessageDialogUtils.java
new file mode 100644
index 0000000000..ef713d5847
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/interact/MessageDialogUtils.java
@@ -0,0 +1,53 @@
+package com.termux.shared.interact;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.TextView;
+
+import com.termux.shared.R;
+
+public class MessageDialogUtils {
+
+    /**
+     * Show a message in a dialog
+     *
+     * @param context The {@link Context} to use to start the dialog. An {@link Activity} {@link Context}
+     *                must be passed, otherwise exceptions will be thrown.
+     * @param titleText The title text of the dialog.
+     * @param messageText The message text of the dialog.
+     * @param onDismiss The {@link DialogInterface.OnDismissListener} to run when dialog is dismissed.
+     */
+    public static void showMessage(Context context, String titleText, String messageText, final DialogInterface.OnDismissListener onDismiss) {
+
+        AlertDialog.Builder builder = new AlertDialog.Builder(context, R.style.Theme_AppCompat_Light_Dialog)
+            .setPositiveButton(android.R.string.ok, null);
+
+        LayoutInflater inflater = (LayoutInflater) context.getSystemService( Context.LAYOUT_INFLATER_SERVICE );
+        View view = inflater.inflate(R.layout.dialog_show_message, null);
+        if (view != null) {
+            builder.setView(view);
+
+            TextView titleView = view.findViewById(R.id.dialog_title);
+            if (titleView != null)
+                titleView.setText(titleText);
+
+            TextView messageView = view.findViewById(R.id.dialog_message);
+            if (messageView != null)
+                messageView.setText(messageText);
+        }
+
+        if (onDismiss != null)
+            builder.setOnDismissListener(onDismiss);
+
+        builder.show();
+    }
+
+    public static void exitAppWithErrorMessage(Context context, String titleText, String messageText) {
+        showMessage(context, titleText, messageText, dialog -> System.exit(0));
+    }
+
+}
diff --git a/termux-shared/src/main/java/com/termux/shared/interact/DialogUtils.java b/termux-shared/src/main/java/com/termux/shared/interact/TextInputDialogUtils.java
similarity index 65%
rename from termux-shared/src/main/java/com/termux/shared/interact/DialogUtils.java
rename to termux-shared/src/main/java/com/termux/shared/interact/TextInputDialogUtils.java
index e70c4dcb49..7d111d06cc 100644
--- a/termux-shared/src/main/java/com/termux/shared/interact/DialogUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/interact/TextInputDialogUtils.java
@@ -16,7 +16,7 @@
 
 import com.termux.shared.R;
 
-public final class DialogUtils {
+public final class TextInputDialogUtils {
 
     public interface TextSetListener {
         void onTextSet(String text);
@@ -75,42 +75,4 @@ public static void textInput(Activity activity, int titleText, String initialTex
         dialogHolder[0].show();
     }
 
-    /**
-     * Show a message in a dialog
-     *
-     * @param context The {@link Context} to use to start the dialog. An {@link Activity} {@link Context}
-     *                must be passed, otherwise exceptions will be thrown.
-     * @param titleText The title text of the dialog.
-     * @param messageText The message text of the dialog.
-     * @param onDismiss The {@link DialogInterface.OnDismissListener} to run when dialog is dismissed.
-     */
-    public static void showMessage(Context context, String titleText, String messageText, final DialogInterface.OnDismissListener onDismiss) {
-
-        AlertDialog.Builder builder = new AlertDialog.Builder(context, R.style.Theme_AppCompat_Light_Dialog)
-            .setPositiveButton(android.R.string.ok, null);
-
-        LayoutInflater inflater = (LayoutInflater) context.getSystemService( Context.LAYOUT_INFLATER_SERVICE );
-        View view = inflater.inflate(R.layout.dialog_show_message, null);
-        if (view != null) {
-            builder.setView(view);
-
-            TextView titleView = view.findViewById(R.id.dialog_title);
-            if (titleView != null)
-                titleView.setText(titleText);
-
-            TextView messageView = view.findViewById(R.id.dialog_message);
-            if (messageView != null)
-                messageView.setText(messageText);
-        }
-
-        if (onDismiss != null)
-            builder.setOnDismissListener(onDismiss);
-
-        builder.show();
-    }
-
-    public static void exitAppWithErrorMessage(Context context, String titleText, String messageText) {
-        showMessage(context, titleText, messageText, dialog -> System.exit(0));
-    }
-
 }
diff --git a/termux-shared/src/main/java/com/termux/shared/packages/PackageUtils.java b/termux-shared/src/main/java/com/termux/shared/packages/PackageUtils.java
index 054aa5c82d..0ef2666409 100644
--- a/termux-shared/src/main/java/com/termux/shared/packages/PackageUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/packages/PackageUtils.java
@@ -9,7 +9,7 @@
 
 import com.termux.shared.R;
 import com.termux.shared.data.DataUtils;
-import com.termux.shared.interact.DialogUtils;
+import com.termux.shared.interact.MessageDialogUtils;
 import com.termux.shared.logger.Logger;
 import com.termux.shared.termux.TermuxConstants;
 
@@ -55,7 +55,7 @@ public static Context getContextForPackageOrExitApp(@NonNull Context context, St
             String errorMessage = context.getString(R.string.error_get_package_context_failed_message,
                 packageName, TermuxConstants.TERMUX_GITHUB_REPO_URL);
             Logger.logError(LOG_TAG, errorMessage);
-            DialogUtils.exitAppWithErrorMessage(context,
+            MessageDialogUtils.exitAppWithErrorMessage(context,
                 context.getString(R.string.error_get_package_context_failed_title),
                 errorMessage);
         }

From 1c7f9166f2b0bbb01e9b222dce3399f5f08d4144 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 30 Jun 2021 05:12:59 +0500
Subject: [PATCH 443/912] Move Termux app specific logic out of
 NotificationUtils

---
 .../java/com/termux/app/utils/CrashUtils.java |  3 +-
 .../com/termux/app/utils/PluginUtils.java     |  3 +-
 .../notification/NotificationUtils.java       | 32 ----------------
 .../notification/TermuxNotificationUtils.java | 38 +++++++++++++++++++
 4 files changed, 42 insertions(+), 34 deletions(-)
 create mode 100644 termux-shared/src/main/java/com/termux/shared/notification/TermuxNotificationUtils.java

diff --git a/app/src/main/java/com/termux/app/utils/CrashUtils.java b/app/src/main/java/com/termux/app/utils/CrashUtils.java
index 3a59d9c19f..1437e234ca 100644
--- a/app/src/main/java/com/termux/app/utils/CrashUtils.java
+++ b/app/src/main/java/com/termux/app/utils/CrashUtils.java
@@ -15,6 +15,7 @@
 import com.termux.shared.file.FileUtils;
 import com.termux.shared.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;
@@ -131,7 +132,7 @@ public static void sendCrashReportNotification(final Context context, String log
         if (builder == null) return;
 
         // Send the notification
-        int nextNotificationId = NotificationUtils.getNextNotificationId(context);
+        int nextNotificationId = TermuxNotificationUtils.getNextNotificationId(context);
         NotificationManager notificationManager = NotificationUtils.getNotificationManager(context);
         if (notificationManager != null)
             notificationManager.notify(nextNotificationId, builder.build());
diff --git a/app/src/main/java/com/termux/app/utils/PluginUtils.java b/app/src/main/java/com/termux/app/utils/PluginUtils.java
index 67fe6c1878..3b445339e3 100644
--- a/app/src/main/java/com/termux/app/utils/PluginUtils.java
+++ b/app/src/main/java/com/termux/app/utils/PluginUtils.java
@@ -16,6 +16,7 @@
 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;
@@ -233,7 +234,7 @@ public static void sendPluginCommandErrorNotification(Context context, String lo
         if (builder == null) return;
 
         // Send the notification
-        int nextNotificationId = NotificationUtils.getNextNotificationId(context);
+        int nextNotificationId = TermuxNotificationUtils.getNextNotificationId(context);
         NotificationManager notificationManager = NotificationUtils.getNotificationManager(context);
         if (notificationManager != null)
             notificationManager.notify(nextNotificationId, builder.build());
diff --git a/termux-shared/src/main/java/com/termux/shared/notification/NotificationUtils.java b/termux-shared/src/main/java/com/termux/shared/notification/NotificationUtils.java
index f6f21c8971..c4250cedf4 100644
--- a/termux-shared/src/main/java/com/termux/shared/notification/NotificationUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/notification/NotificationUtils.java
@@ -10,9 +10,6 @@
 import androidx.annotation.Nullable;
 
 import com.termux.shared.logger.Logger;
-import com.termux.shared.settings.preferences.TermuxAppSharedPreferences;
-import com.termux.shared.settings.preferences.TermuxPreferenceConstants;
-import com.termux.shared.termux.TermuxConstants;
 
 public class NotificationUtils {
 
@@ -49,35 +46,6 @@ public static NotificationManager getNotificationManager(final Context context)
         return (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
     }
 
-    /**
-     * Try to get the next unique notification id that isn't already being used by the app.
-     *
-     * Termux app and its plugin must use unique notification ids from the same pool due to usage of android:sharedUserId.
-     * https://commonsware.com/blog/2017/06/07/jobscheduler-job-ids-libraries.html
-     *
-     * @param context The {@link Context} for operations.
-     * @return Returns the notification id that should be safe to use.
-     */
-    public synchronized static int getNextNotificationId(final Context context) {
-        if (context == null) return TermuxPreferenceConstants.TERMUX_APP.DEFAULT_VALUE_KEY_LAST_NOTIFICATION_ID;
-
-        TermuxAppSharedPreferences preferences = TermuxAppSharedPreferences.build(context);
-        if (preferences == null) return TermuxPreferenceConstants.TERMUX_APP.DEFAULT_VALUE_KEY_LAST_NOTIFICATION_ID;
-
-        int lastNotificationId = preferences.getLastNotificationId();
-
-        int nextNotificationId = lastNotificationId + 1;
-        while(nextNotificationId == TermuxConstants.TERMUX_APP_NOTIFICATION_ID || nextNotificationId == TermuxConstants.TERMUX_RUN_COMMAND_NOTIFICATION_ID) {
-            nextNotificationId++;
-        }
-
-        if (nextNotificationId == Integer.MAX_VALUE || nextNotificationId < 0)
-            nextNotificationId = TermuxPreferenceConstants.TERMUX_APP.DEFAULT_VALUE_KEY_LAST_NOTIFICATION_ID;
-
-        preferences.setLastNotificationId(nextNotificationId);
-        return nextNotificationId;
-    }
-
     /**
      * Get {@link Notification.Builder}.
      *
diff --git a/termux-shared/src/main/java/com/termux/shared/notification/TermuxNotificationUtils.java b/termux-shared/src/main/java/com/termux/shared/notification/TermuxNotificationUtils.java
new file mode 100644
index 0000000000..585cd605fe
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/notification/TermuxNotificationUtils.java
@@ -0,0 +1,38 @@
+package com.termux.shared.notification;
+
+import android.content.Context;
+
+import com.termux.shared.settings.preferences.TermuxAppSharedPreferences;
+import com.termux.shared.settings.preferences.TermuxPreferenceConstants;
+import com.termux.shared.termux.TermuxConstants;
+
+public class TermuxNotificationUtils {
+    /**
+     * Try to get the next unique notification id that isn't already being used by the app.
+     *
+     * Termux app and its plugin must use unique notification ids from the same pool due to usage of android:sharedUserId.
+     * https://commonsware.com/blog/2017/06/07/jobscheduler-job-ids-libraries.html
+     *
+     * @param context The {@link Context} for operations.
+     * @return Returns the notification id that should be safe to use.
+     */
+    public synchronized static int getNextNotificationId(final Context context) {
+        if (context == null) return TermuxPreferenceConstants.TERMUX_APP.DEFAULT_VALUE_KEY_LAST_NOTIFICATION_ID;
+
+        TermuxAppSharedPreferences preferences = TermuxAppSharedPreferences.build(context);
+        if (preferences == null) return TermuxPreferenceConstants.TERMUX_APP.DEFAULT_VALUE_KEY_LAST_NOTIFICATION_ID;
+
+        int lastNotificationId = preferences.getLastNotificationId();
+
+        int nextNotificationId = lastNotificationId + 1;
+        while(nextNotificationId == TermuxConstants.TERMUX_APP_NOTIFICATION_ID || nextNotificationId == TermuxConstants.TERMUX_RUN_COMMAND_NOTIFICATION_ID) {
+            nextNotificationId++;
+        }
+
+        if (nextNotificationId == Integer.MAX_VALUE || nextNotificationId < 0)
+            nextNotificationId = TermuxPreferenceConstants.TERMUX_APP.DEFAULT_VALUE_KEY_LAST_NOTIFICATION_ID;
+
+        preferences.setLastNotificationId(nextNotificationId);
+        return nextNotificationId;
+    }
+}

From 70e1accafe4a17e52c7c5364c78287b04564f9a9 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 30 Jun 2021 05:33:48 +0500
Subject: [PATCH 444/912] Change license for non-termux utils to MIT

Changing the license for non-termux utils from GPLv3 to MIT so that they can be used by other termux plugin apps or apps that may be released under a different license. Termux is already using a lot of libraries that are not GPL and such general utils shouldn't be restrictive any ways.

Moreover, `TermuxConstants` and `TermuxPropertyConstants` should be MIT licensed as well so that other non-FOSS or non-GPLv3 apps can use them, like for `RUN_COMMAND` intent.

Any code not listed in exceptions of `LICENSE.md` files is still under GPLv3, mainly termux specific code and it will and should remain that way.

All code in files whose license is changed was authored by me as far as I can tell, but if any code in them is not that I missed, let me know, so that changes can be made since I can't and won't change the license of code authored by someone else. If some other objection is raised, let me know too.

Future contributors should check the `LICENSE.md` files and see if they are okay with contributing code as MIT and if they are not, then they should create separate file/package in termux-shared.
---
 termux-shared/LICENSE.md | 65 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)
 create mode 100644 termux-shared/LICENSE.md

diff --git a/termux-shared/LICENSE.md b/termux-shared/LICENSE.md
new file mode 100644
index 0000000000..9475dfd5ec
--- /dev/null
+++ b/termux-shared/LICENSE.md
@@ -0,0 +1,65 @@
+The `termux-shared` library is released under [GPLv3 only](https://www.gnu.org/licenses/gpl-3.0.html) license.
+
+### Exceptions
+
+#### [MIT License](https://opensource.org/licenses/MIT)
+
+- [`src/main/java/com/termux/shared/termux/TermuxConstants.java`](src/main/java/com/termux/shared/termux/TermuxConstants.java).
+- [`src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java`](src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java).
+
+- [`src/main/java/com/termux/shared/activities/ReportActivity.java`](src/main/java/com/termux/shared/activities/ReportActivity.java).
+
+- [`src/main/java/com/termux/shared/crash/CrashHandler.java`](src/main/java/com/termux/shared/crash/CrashHandler.java).
+
+- [`src/main/java/com/termux/shared/data/DataUtils.java`](src/main/java/com/termux/shared/data/DataUtils.java).
+- [`src/main/java/com/termux/shared/data/IntentUtils.java`](src/main/java/com/termux/shared/data/IntentUtils.java).
+
+- [`src/main/java/com/termux/shared/file/filesystem/FileType.java`](src/main/java/com/termux/shared/file/filesystem/FileType.java).
+- [`src/main/java/com/termux/shared/file/filesystem/FileTypes.java`](src/main/java/com/termux/shared/file/filesystem/FileTypes.java).
+- [`src/main/java/com/termux/shared/file/filesystem/NativeDispatcher.java`](src/main/java/com/termux/shared/file/filesystem/NativeDispatcher.java).
+- [`src/main/java/com/termux/shared/file/tests/FileUtilsTests.java`](src/main/java/com/termux/shared/file/tests/FileUtilsTests.java).
+- [`src/main/java/com/termux/shared/file/FileUtils.java`](src/main/java/com/termux/shared/file/FileUtils.java).
+
+- [`src/main/java/com/termux/shared/interact/ShareUtils.java`](src/main/java/com/termux/shared/interact/ShareUtils.java).
+- [`src/main/java/com/termux/shared/interact/MessageDialogUtils.java`](src/main/java/com/termux/shared/interact/MessageDialogUtils.java).
+
+- [`src/main/java/com/termux/shared/logger/Logger.java`](src/main/java/com/termux/shared/logger/Logger.java).
+
+- [`src/main/java/com/termux/shared/markdown/MarkdownUtils.java`](src/main/java/com/termux/shared/markdown/MarkdownUtils.java).
+
+- [`src/main/java/com/termux/shared/models/*`](src/main/java/com/termux/shared/models).
+
+- [`src/main/java/com/termux/shared/notification/NotificationUtils.java`](src/main/java/com/termux/shared/notification/NotificationUtils.java).
+
+- [`src/main/java/com/termux/shared/settings/preferences/SharedPreferenceUtils.java`](src/main/java/com/termux/shared/settings/preferences/SharedPreferenceUtils.java).
+
+- [`src/main/java/com/termux/shared/settings/properties/SharedPropertiesParser.java`](src/main/java/com/termux/shared/settings/properties/SharedPropertiesParser.java).
+- [`src/main/java/com/termux/shared/settings/properties/SharedProperties.java`](src/main/java/com/termux/shared/settings/properties/SharedProperties.java).
+
+- [`src/main/java/com/termux/shared/shell/ResultSender.java`](src/main/java/com/termux/shared/shell/ResultSender.java).
+- [`src/main/java/com/termux/shared/shell/ShellEnvironmentClient.java`](src/main/java/com/termux/shared/shell/ShellEnvironmentClient.java).
+- [`src/main/java/com/termux/shared/shell/ShellUtils.java`](src/main/java/com/termux/shared/shell/ShellUtils.java).
+- [`src/main/java/com/termux/shared/shell/TermuxTask.java`](src/main/java/com/termux/shared/shell/TermuxTask.java).
+
+- [`src/main/java/com/termux/shared/termux/AndroidUtils.java`](src/main/java/com/termux/shared/termux/AndroidUtils.java).
+
+- [`src/main/java/com/termux/shared/view/KeyboardUtils.java`](src/main/java/com/termux/shared/view/KeyboardUtils.java).
+- [`src/main/java/com/termux/shared/view/ViewUtils.java`](src/main/java/com/termux/shared/view/ViewUtils.java).
+
+- [`src/main/res/drawable/*`](src/main/res/drawable).
+- [`src/main/res/layout/*`](src/main/res/layout).
+- [`src/main/res/menu/*`](src/main/res/menu).
+- [`src/main/res/values/*`](src/main/res/values).
+##
+
+
+#### [GPLv2 only with "Classpath" exception](https://openjdk.java.net/legal/gplv2+ce.html)
+
+- [`src/main/java/com/termux/shared/file/filesystem/*`](src/main/java/com/termux/shared/file/filesystem) files that use code from [libcore/ojluni](https://cs.android.com/android/platform/superproject/+/android-11.0.0_r3:libcore/ojluni/).
+##
+
+
+#### [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0)
+
+- [`src/main/java/com/termux/shared/shell/StreamGobbler.java`](src/main/java/com/termux/shared/shell/StreamGobbler.java) uses code from [libsuperuser ](https://github.com/Chainfire/libsuperuser).
+##

From 49265160f8ace7dec58ae9c25154242dd1cb352d Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 30 Jun 2021 05:34:21 +0500
Subject: [PATCH 445/912] Update LICENSE.md

---
 LICENSE.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/LICENSE.md b/LICENSE.md
index b9aa696f7e..36cd48f871 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -2,6 +2,5 @@ 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) 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.
+- [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.

From dfd32435afd45289a80543a91eec97cd21cdd8fc Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 30 Jun 2021 06:17:26 +0500
Subject: [PATCH 446/912] Bump gradle dependencies versions

---
 app/build.gradle           | 2 +-
 terminal-view/build.gradle | 2 +-
 termux-shared/build.gradle | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index c63e735e12..2114d81b86 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@ android {
 
     dependencies {
         implementation "androidx.annotation:annotation:1.2.0"
-        implementation "androidx.core:core:1.5.0-rc01"
+        implementation "androidx.core:core:1.6.0-rc01"
         implementation "androidx.drawerlayout:drawerlayout:1.1.1"
         implementation "androidx.preference:preference:1.1.1"
         implementation "androidx.viewpager:viewpager:1.0.0"
diff --git a/terminal-view/build.gradle b/terminal-view/build.gradle
index 87270cc716..0ce7f31428 100644
--- a/terminal-view/build.gradle
+++ b/terminal-view/build.gradle
@@ -5,7 +5,7 @@ android {
     compileSdkVersion project.properties.compileSdkVersion.toInteger()
 
     dependencies {
-        implementation "androidx.annotation:annotation:1.1.0"
+        implementation "androidx.annotation:annotation:1.2.0"
         api project(":terminal-emulator")
     }
 
diff --git a/termux-shared/build.gradle b/termux-shared/build.gradle
index ddfb04af78..5b6914521d 100644
--- a/termux-shared/build.gradle
+++ b/termux-shared/build.gradle
@@ -5,9 +5,9 @@ android {
     compileSdkVersion project.properties.compileSdkVersion.toInteger()
 
     dependencies {
-        implementation 'androidx.appcompat:appcompat:1.2.0'
+        implementation 'androidx.appcompat:appcompat:1.3.0'
         implementation "androidx.annotation:annotation:1.2.0"
-        implementation "androidx.core:core:1.5.0-rc01"
+        implementation "androidx.core:core:1.6.0-rc01"
         implementation "androidx.window:window:1.0.0-alpha08"
         implementation "com.google.guava:guava:24.1-jre"
         implementation "io.noties.markwon:core:$markwonVersion"

From 5670128236a4af323b62778b65d285c99628abf7 Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Wed, 30 Jun 2021 12:20:57 +0300
Subject: [PATCH 447/912] update bootstrap archives

---
 app/build.gradle | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 2114d81b86..9cc6ba1434 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -155,11 +155,11 @@ clean {
 
 task downloadBootstraps() {
     doLast {
-        def version = "2021.06.04-r1"
-        downloadBootstrap("aarch64", "115409ec8abe096080f9e6d9b2765e009c818b3e5aff0133792182009388b81e", version)
-        downloadBootstrap("arm",     "c289688d4f9aabd86240a4d3e25bd89c1a96641e0d085d9ee5a471e9f019e16f", version)
-        downloadBootstrap("i686",    "63cfb8e39cac20cecbe9e9890f49a30d7454d4c4dfa2b22b5d0cc6de1dc59726", version)
-        downloadBootstrap("x86_64",  "db47007825e65f8ed15fc46d6b8e3119b01ca4a9856d7c7e5604cf804e753ba2", version)
+        def version = "2021.06.30-r1"
+        downloadBootstrap("aarch64", "ce56ce9a4e8845bd1d35cc2695bbdd636c72625ee10ce21c9b98ab38ebbee5ab", version)
+        downloadBootstrap("arm",     "537e81951c7d3d3f3def9ce6778e1032457488e21edb2c037a1e0e680c39e747", version)
+        downloadBootstrap("i686",    "3c2ca858c0225671c00c44ac182e31819ffa93ec624e95e02824e7d6d30ca1b4", version)
+        downloadBootstrap("x86_64",  "93c50d36b45bca42bb014395e8e184e5b540adcad5d4e215f7e64ebf0d655d2b", version)
     }
 }
 

From 93a7525d9b8fe61c7f7373443e25c063a98d2b25 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 1 Jul 2021 00:29:26 +0500
Subject: [PATCH 448/912] Add comment about mkshrc validity when loading
 /system/bin/sh for failsafe session

---
 .../main/java/com/termux/shared/shell/TermuxSession.java  | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/shell/TermuxSession.java b/termux-shared/src/main/java/com/termux/shared/shell/TermuxSession.java
index b1a071d84c..5d46733062 100644
--- a/termux-shared/src/main/java/com/termux/shared/shell/TermuxSession.java
+++ b/termux-shared/src/main/java/com/termux/shared/shell/TermuxSession.java
@@ -91,7 +91,13 @@ public static TermuxSession execute(@NonNull final Context context, @NonNull Exe
 
             if (executionCommand.executable == null) {
                 // Fall back to system shell as last resort:
-                // Do not start a login shell since $HOME/.profile, etc may cause startup failure if they are not valid
+                // Do not start a login shell since ~/.profile may cause startup failure if its invalid.
+                // /system/bin/sh is provided by mksh (not toybox) and does load .mkshrc but for android its set
+                // to /system/etc/mkshrc even though its default is ~/.mkshrc.
+                // So /system/etc/mkshrc must still be valid for failsafe session to start properly.
+                // https://cs.android.com/android/platform/superproject/+/android-11.0.0_r3:external/mksh/src/main.c;l=663
+                // https://cs.android.com/android/platform/superproject/+/android-11.0.0_r3:external/mksh/src/main.c;l=41
+                // https://cs.android.com/android/platform/superproject/+/android-11.0.0_r3:external/mksh/Android.bp;l=114
                 executionCommand.executable = "/system/bin/sh";
             } else {
                 isLoginShell = true;

From 23a900c433b55d5376dbbe4dd0221140b05947c5 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 1 Jul 2021 04:21:02 +0500
Subject: [PATCH 449/912] Move Termux app specific logic out of CrashHandler

Create the TermuxCrashUtils class that provides the default path and app for termux instead of hardcoding it in CrashHandler. TermuxCrashUtils can be used by termux plugins as well for their own usage or they can implement the CrashHandler.CrashHandlerClient if they want to log to different files or want custom logic.
---
 .../com/termux/app/TermuxApplication.java     |  4 +-
 .../com/termux/shared/crash/CrashHandler.java | 53 ++++++++++++++-----
 .../termux/shared/crash/TermuxCrashUtils.java | 31 +++++++++++
 3 files changed, 72 insertions(+), 16 deletions(-)
 create mode 100644 termux-shared/src/main/java/com/termux/shared/crash/TermuxCrashUtils.java

diff --git a/app/src/main/java/com/termux/app/TermuxApplication.java b/app/src/main/java/com/termux/app/TermuxApplication.java
index beb666343c..b7f2898003 100644
--- a/app/src/main/java/com/termux/app/TermuxApplication.java
+++ b/app/src/main/java/com/termux/app/TermuxApplication.java
@@ -2,7 +2,7 @@
 
 import android.app.Application;
 
-import com.termux.shared.crash.CrashHandler;
+import com.termux.shared.crash.TermuxCrashUtils;
 import com.termux.shared.settings.preferences.TermuxAppSharedPreferences;
 import com.termux.shared.logger.Logger;
 
@@ -12,7 +12,7 @@ public void onCreate() {
         super.onCreate();
 
         // Set crash handler for the app
-        CrashHandler.setCrashHandler(this);
+        TermuxCrashUtils.setCrashHandler(this);
 
         // Set log level for the app
         setLogLevel();
diff --git a/termux-shared/src/main/java/com/termux/shared/crash/CrashHandler.java b/termux-shared/src/main/java/com/termux/shared/crash/CrashHandler.java
index 8f5e028ed0..f7da618a2a 100644
--- a/termux-shared/src/main/java/com/termux/shared/crash/CrashHandler.java
+++ b/termux-shared/src/main/java/com/termux/shared/crash/CrashHandler.java
@@ -9,8 +9,6 @@
 import com.termux.shared.markdown.MarkdownUtils;
 import com.termux.shared.models.errors.Error;
 import com.termux.shared.termux.AndroidUtils;
-import com.termux.shared.termux.TermuxConstants;
-import com.termux.shared.termux.TermuxUtils;
 
 import java.nio.charset.Charset;
 
@@ -19,40 +17,41 @@
  */
 public class CrashHandler implements Thread.UncaughtExceptionHandler {
 
-    private final Context context;
+    private final Context mContext;
+    private final CrashHandlerClient mCrashHandlerClient;
     private final Thread.UncaughtExceptionHandler defaultUEH;
 
     private static final String LOG_TAG = "CrashUtils";
 
-    private CrashHandler(final Context context) {
-        this.context = context;
+    private CrashHandler(@NonNull final Context context, @NonNull final CrashHandlerClient crashHandlerClient) {
+        this.mContext = context;
+        this.mCrashHandlerClient = crashHandlerClient;
         this.defaultUEH = Thread.getDefaultUncaughtExceptionHandler();
     }
 
     public void uncaughtException(@NonNull Thread thread, @NonNull Throwable throwable) {
-        logCrash(context,thread, throwable);
+        logCrash(mContext, mCrashHandlerClient, thread, throwable);
         defaultUEH.uncaughtException(thread, throwable);
     }
 
     /**
      * Set default uncaught crash handler of current thread to {@link CrashHandler}.
      */
-    public static void setCrashHandler(final Context context) {
+    public static void setCrashHandler(@NonNull final Context context, @NonNull final CrashHandlerClient crashHandlerClient) {
         if (!(Thread.getDefaultUncaughtExceptionHandler() instanceof CrashHandler)) {
-            Thread.setDefaultUncaughtExceptionHandler(new CrashHandler(context));
+            Thread.setDefaultUncaughtExceptionHandler(new CrashHandler(context, crashHandlerClient));
         }
     }
 
     /**
-     * Log a crash in the crash log file at
-     * {@link TermuxConstants#TERMUX_CRASH_LOG_FILE_PATH}.
+     * Log a crash in the crash log file at {@code crashlogFilePath}.
      *
      * @param context The {@link Context} for operations.
+     * @param crashHandlerClient The {@link CrashHandlerClient} implementation.
      * @param thread The {@link Thread} in which the crash happened.
      * @param throwable The {@link Throwable} thrown for the crash.
      */
-    public static void logCrash(final Context context, final Thread thread, final Throwable throwable) {
-
+    public static void logCrash(@NonNull final Context context, @NonNull final CrashHandlerClient crashHandlerClient, final Thread thread, final Throwable throwable) {
         StringBuilder reportString = new StringBuilder();
 
         reportString.append("## Crash Details\n");
@@ -60,17 +59,43 @@ public static void logCrash(final Context context, final Thread thread, final Th
         reportString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Crash Timestamp", AndroidUtils.getCurrentTimeStamp(), "-"));
 
         reportString.append("\n\n").append(Logger.getStackTracesMarkdownString("Stacktrace", Logger.getStackTracesStringArray(throwable)));
-        reportString.append("\n\n").append(TermuxUtils.getAppInfoMarkdownString(context, true));
+
+        String appInfoMarkdownString = crashHandlerClient.getAppInfoMarkdownString(context);
+        if (appInfoMarkdownString != null && !appInfoMarkdownString.isEmpty())
+            reportString.append("\n\n").append(appInfoMarkdownString);
+
         reportString.append("\n\n").append(AndroidUtils.getDeviceInfoMarkdownString(context));
 
         // Log report string to logcat
         Logger.logError(reportString.toString());
 
         // Write report string to crash log file
-        Error error = FileUtils.writeStringToFile("crash log", TermuxConstants.TERMUX_CRASH_LOG_FILE_PATH, Charset.defaultCharset(), reportString.toString(), false);
+        Error error = FileUtils.writeStringToFile("crash log", crashHandlerClient.getCrashLogFilePath(context),
+                        Charset.defaultCharset(), reportString.toString(), false);
         if (error != null) {
             Logger.logErrorExtended(LOG_TAG, error.toString());
         }
     }
 
+    public interface CrashHandlerClient {
+
+        /**
+         * Get crash log file path.
+         *
+         * @param context The {@link Context} passed to {@link CrashHandler#CrashHandler(Context, CrashHandlerClient)}.
+         * @return Should return the crash log file path.
+         */
+        @NonNull
+        String getCrashLogFilePath(Context context);
+
+        /**
+         * Get app info markdown string to add to crash log.
+         *
+         * @param context The {@link Context} passed to {@link CrashHandler#CrashHandler(Context, CrashHandlerClient)}.
+         * @return Should return app info markdown string.
+         */
+        String getAppInfoMarkdownString(Context context);
+
+    }
+
 }
diff --git a/termux-shared/src/main/java/com/termux/shared/crash/TermuxCrashUtils.java b/termux-shared/src/main/java/com/termux/shared/crash/TermuxCrashUtils.java
new file mode 100644
index 0000000000..d8b877fe63
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/crash/TermuxCrashUtils.java
@@ -0,0 +1,31 @@
+package com.termux.shared.crash;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+
+import com.termux.shared.termux.TermuxConstants;
+import com.termux.shared.termux.TermuxUtils;
+
+public class TermuxCrashUtils implements CrashHandler.CrashHandlerClient {
+
+    /**
+     * Set default uncaught crash handler of current thread to {@link CrashHandler} for Termux app
+     * and its plugin to log crashes at {@link TermuxConstants#TERMUX_CRASH_LOG_FILE_PATH}.
+     */
+    public static void setCrashHandler(@NonNull final Context context) {
+        CrashHandler.setCrashHandler(context, new TermuxCrashUtils());
+    }
+
+    @NonNull
+    @Override
+    public String getCrashLogFilePath(Context context) {
+        return TermuxConstants.TERMUX_CRASH_LOG_FILE_PATH;
+    }
+
+    @Override
+    public String getAppInfoMarkdownString(Context context) {
+        return TermuxUtils.getAppInfoMarkdownString(context, true);
+    }
+
+}

From 2034121798823c5283277473d595f61368746312 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 1 Jul 2021 04:21:36 +0500
Subject: [PATCH 450/912] Fx issues where crash throwable message wasn't been
 added to crash log

---
 .../src/main/java/com/termux/shared/crash/CrashHandler.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/crash/CrashHandler.java b/termux-shared/src/main/java/com/termux/shared/crash/CrashHandler.java
index f7da618a2a..f8d7f60e01 100644
--- a/termux-shared/src/main/java/com/termux/shared/crash/CrashHandler.java
+++ b/termux-shared/src/main/java/com/termux/shared/crash/CrashHandler.java
@@ -57,7 +57,7 @@ public static void logCrash(@NonNull final Context context, @NonNull final Crash
         reportString.append("## Crash Details\n");
         reportString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Crash Thread", thread.toString(), "-"));
         reportString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Crash Timestamp", AndroidUtils.getCurrentTimeStamp(), "-"));
-
+        reportString.append("\n\n").append(MarkdownUtils.getMultiLineMarkdownStringEntry("Crash Message", throwable.getMessage(), "-"));
         reportString.append("\n\n").append(Logger.getStackTracesMarkdownString("Stacktrace", Logger.getStackTracesStringArray(throwable)));
 
         String appInfoMarkdownString = crashHandlerClient.getAppInfoMarkdownString(context);

From dea8c9879eec393f3d78042d7e6dcbbebeeb89f3 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 1 Jul 2021 05:15:34 +0500
Subject: [PATCH 451/912] Bump to v0.115

---
 app/build.gradle               | 4 ++--
 terminal-emulator/build.gradle | 2 +-
 terminal-view/build.gradle     | 2 +-
 termux-shared/build.gradle     | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 9cc6ba1434..8d99051299 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -26,8 +26,8 @@ android {
         applicationId "com.termux"
         minSdkVersion project.properties.minSdkVersion.toInteger()
         targetSdkVersion project.properties.targetSdkVersion.toInteger()
-        versionCode 114
-        versionName "0.114"
+        versionCode 115
+        versionName "0.115"
 
         manifestPlaceholders.TERMUX_PACKAGE_NAME = "com.termux"
         manifestPlaceholders.TERMUX_APP_NAME = "Termux"
diff --git a/terminal-emulator/build.gradle b/terminal-emulator/build.gradle
index c60d4ad0af..4d5300c72e 100644
--- a/terminal-emulator/build.gradle
+++ b/terminal-emulator/build.gradle
@@ -66,7 +66,7 @@ afterEvaluate {
                 from components.release
                 groupId = 'com.termux'
                 artifactId = 'terminal-emulator'
-                version = '0.114'
+                version = '0.115'
                 artifact(sourceJar)
             }
         }
diff --git a/terminal-view/build.gradle b/terminal-view/build.gradle
index 0ce7f31428..56b94dabe1 100644
--- a/terminal-view/build.gradle
+++ b/terminal-view/build.gradle
@@ -45,7 +45,7 @@ afterEvaluate {
                 from components.release
                 groupId = 'com.termux'
                 artifactId = 'terminal-view'
-                version = '0.114'
+                version = '0.115'
                 artifact(sourceJar)
             }
         }
diff --git a/termux-shared/build.gradle b/termux-shared/build.gradle
index 5b6914521d..7a80ce11d4 100644
--- a/termux-shared/build.gradle
+++ b/termux-shared/build.gradle
@@ -61,7 +61,7 @@ afterEvaluate {
                 from components.release
                 groupId = 'com.termux'
                 artifactId = 'termux-shared'
-                version = '0.114'
+                version = '0.115'
                 artifact(sourceJar)
             }
         }

From 5c50964b1fe3f9d41b84e346ac865102c3de7122 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 1 Jul 2021 06:31:22 +0500
Subject: [PATCH 452/912] Revert "Bump to v0.115"

This reverts commit dea8c987
---
 app/build.gradle               | 4 ++--
 terminal-emulator/build.gradle | 2 +-
 terminal-view/build.gradle     | 2 +-
 termux-shared/build.gradle     | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 8d99051299..9cc6ba1434 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -26,8 +26,8 @@ android {
         applicationId "com.termux"
         minSdkVersion project.properties.minSdkVersion.toInteger()
         targetSdkVersion project.properties.targetSdkVersion.toInteger()
-        versionCode 115
-        versionName "0.115"
+        versionCode 114
+        versionName "0.114"
 
         manifestPlaceholders.TERMUX_PACKAGE_NAME = "com.termux"
         manifestPlaceholders.TERMUX_APP_NAME = "Termux"
diff --git a/terminal-emulator/build.gradle b/terminal-emulator/build.gradle
index 4d5300c72e..c60d4ad0af 100644
--- a/terminal-emulator/build.gradle
+++ b/terminal-emulator/build.gradle
@@ -66,7 +66,7 @@ afterEvaluate {
                 from components.release
                 groupId = 'com.termux'
                 artifactId = 'terminal-emulator'
-                version = '0.115'
+                version = '0.114'
                 artifact(sourceJar)
             }
         }
diff --git a/terminal-view/build.gradle b/terminal-view/build.gradle
index 56b94dabe1..0ce7f31428 100644
--- a/terminal-view/build.gradle
+++ b/terminal-view/build.gradle
@@ -45,7 +45,7 @@ afterEvaluate {
                 from components.release
                 groupId = 'com.termux'
                 artifactId = 'terminal-view'
-                version = '0.115'
+                version = '0.114'
                 artifact(sourceJar)
             }
         }
diff --git a/termux-shared/build.gradle b/termux-shared/build.gradle
index 7a80ce11d4..5b6914521d 100644
--- a/termux-shared/build.gradle
+++ b/termux-shared/build.gradle
@@ -61,7 +61,7 @@ afterEvaluate {
                 from components.release
                 groupId = 'com.termux'
                 artifactId = 'termux-shared'
-                version = '0.115'
+                version = '0.114'
                 artifact(sourceJar)
             }
         }

From 5a511a2ba394c78c9bcf771ac45a16dc0498efbb Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 1 Jul 2021 07:12:48 +0500
Subject: [PATCH 453/912] Revert some unneeded changes to Logger done in
 679e0de0

Logger was updated to get suppressed exceptions by calling `Throwable[] getSuppressed()` but `printStackTrace()` would already log them, even though shortened stacktrace with `... n more` notation, but this should be enough for debugging since main throwable stacktrace should have enough class line info. Manually logging full suppressed stacktraces would likely trigger `LOGGER_ENTRY_MAX_PAYLOAD` and split the message into multiple log entries and also duplicate the suppressed stacktraces, so best revert this unless ever necessary.
---
 .../java/com/termux/shared/logger/Logger.java | 87 +++----------------
 1 file changed, 13 insertions(+), 74 deletions(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/logger/Logger.java b/termux-shared/src/main/java/com/termux/shared/logger/Logger.java
index 0794c61cd5..2202a7bcde 100644
--- a/termux-shared/src/main/java/com/termux/shared/logger/Logger.java
+++ b/termux-shared/src/main/java/com/termux/shared/logger/Logger.java
@@ -219,105 +219,54 @@ public static void logDebugAndShowToast(Context context, String message) {
 
 
 
-    public static void logStackTraceWithMessage(String tag, String message, Throwable throwable, boolean getSuppressed) {
-        Logger.logErrorExtended(tag, getMessageAndStackTraceString(message, throwable, getSuppressed));
-    }
-
     public static void logStackTraceWithMessage(String tag, String message, Throwable throwable) {
-        logStackTraceWithMessage(tag, message, throwable, true);
-    }
-
-    public static void logStackTraceWithMessage(String message, Throwable throwable, boolean getSuppressed) {
-        logStackTraceWithMessage(DEFAULT_LOG_TAG, message, throwable, getSuppressed);
+        Logger.logErrorExtended(tag, getMessageAndStackTraceString(message, throwable));
     }
 
     public static void logStackTraceWithMessage(String message, Throwable throwable) {
-        logStackTraceWithMessage(DEFAULT_LOG_TAG, message, throwable, true);
-    }
-
-
-    public static void logStackTrace(String tag, Throwable throwable, boolean getSuppressed) {
-        logStackTraceWithMessage(tag, null, throwable, getSuppressed);
+        logStackTraceWithMessage(DEFAULT_LOG_TAG, message, throwable);
     }
 
     public static void logStackTrace(String tag, Throwable throwable) {
-        logStackTraceWithMessage(tag, null, throwable, true);
-    }
-
-
-    public static void logStackTrace(Throwable throwable, boolean getSuppressed) {
-        logStackTraceWithMessage(DEFAULT_LOG_TAG, null, throwable, getSuppressed);
+        logStackTraceWithMessage(tag, null, throwable);
     }
 
     public static void logStackTrace(Throwable throwable) {
-        logStackTraceWithMessage(DEFAULT_LOG_TAG, null, throwable, true);
+        logStackTraceWithMessage(DEFAULT_LOG_TAG, null, throwable);
     }
 
 
 
-    public static void logStackTracesWithMessage(String tag, String message, List<Throwable> throwablesList, boolean getSuppressed) {
-        Logger.logErrorExtended(tag, getMessageAndStackTracesString(message, throwablesList, getSuppressed));
-    }
-
     public static void logStackTracesWithMessage(String tag, String message, List<Throwable> throwablesList) {
-        Logger.logErrorExtended(tag, getMessageAndStackTracesString(message, throwablesList, true));
+        Logger.logErrorExtended(tag, getMessageAndStackTracesString(message, throwablesList));
     }
 
 
 
     public static String getMessageAndStackTraceString(String message, Throwable throwable) {
-        return getMessageAndStackTraceString(message, throwable, true);
-    }
-
-    public static String getMessageAndStackTraceString(String message, Throwable throwable, boolean getSuppressed) {
         if (message == null && throwable == null)
             return null;
         else if (message != null && throwable != null)
-            return message + ":\n" + getStackTraceString(throwable, getSuppressed);
+            return message + ":\n" + getStackTraceString(throwable);
         else if (throwable == null)
             return message;
         else
-            return getStackTraceString(throwable, getSuppressed);
+            return getStackTraceString(throwable);
     }
 
-
-
     public static String getMessageAndStackTracesString(String message, List<Throwable> throwablesList) {
-        return getMessageAndStackTracesString(message, throwablesList, true);
-    }
-
-    public static String getMessageAndStackTracesString(String message, List<Throwable> throwablesList, boolean getSuppressed) {
         if (message == null && (throwablesList == null || throwablesList.size() == 0))
             return null;
         else if (message != null && (throwablesList != null && throwablesList.size() != 0))
-            return message + ":\n" + getStackTracesString(null, getStackTracesStringArray(throwablesList, getSuppressed));
+            return message + ":\n" + getStackTracesString(null, getStackTracesStringArray(throwablesList));
         else if (throwablesList == null || throwablesList.size() == 0)
             return message;
         else
-            return getStackTracesString(null, getStackTracesStringArray(throwablesList, getSuppressed));
+            return getStackTracesString(null, getStackTracesStringArray(throwablesList));
     }
 
 
 
-    public static String getStackTraceString(Throwable throwable, boolean getSuppressed) {
-        if (throwable == null) return null;
-
-        StringBuilder stackTraceString = new StringBuilder();
-        stackTraceString.append(getStackTraceString(throwable));
-
-        if (getSuppressed) {
-            Throwable[] suppressedThrowablesArray = throwable.getSuppressed();
-            if (suppressedThrowablesArray != null && suppressedThrowablesArray.length > 0) {
-                for (Throwable suppressedThrowable : suppressedThrowablesArray) {
-                    if (suppressedThrowable == null) continue;
-                    stackTraceString.append("\n\n").append(getStackTraceString(suppressedThrowable));
-                }
-            }
-        }
-
-        return stackTraceString.toString();
-    }
-
     public static String getStackTraceString(Throwable throwable) {
         if (throwable == null) return null;
 
@@ -339,25 +288,15 @@ public static String getStackTraceString(Throwable throwable) {
 
 
 
-    public static String[] getStackTracesStringArray(Throwable throwable, boolean getSuppressed) {
-        return getStackTracesStringArray(Collections.singletonList(throwable), getSuppressed);
-    }
-
     public static String[] getStackTracesStringArray(Throwable throwable) {
-        return getStackTracesStringArray(Collections.singletonList(throwable), true);
+        return getStackTracesStringArray(Collections.singletonList(throwable));
     }
 
     public static String[] getStackTracesStringArray(List<Throwable> throwablesList) {
-        return getStackTracesStringArray(throwablesList, true);
-
-    }
-
-    public static String[] getStackTracesStringArray(List<Throwable> throwablesList, boolean getSuppressed) {
         if (throwablesList == null) return null;
-
         final String[] stackTraceStringArray = new String[throwablesList.size()];
         for (int i = 0; i < throwablesList.size(); i++) {
-            stackTraceStringArray[i] = getStackTraceString(throwablesList.get(i), getSuppressed);
+            stackTraceStringArray[i] = getStackTraceString(throwablesList.get(i));
         }
         return stackTraceStringArray;
     }
@@ -415,7 +354,7 @@ public static String getMultiLineLogStringEntry(String label, Object object, Str
         else
             return  label + ": "  +  def;
     }
-    
+
 
 
     public static void showToast(final Context context, final String toastText, boolean longDuration) {
@@ -444,7 +383,7 @@ public static CharSequence[] getLogLevelLabelsArray(Context context, CharSequenc
             logLevelLabels[i] = getLogLevelLabel(context, Integer.parseInt(logLevels[i].toString()), addDefaultTag);
         }
 
-       return logLevelLabels;
+        return logLevelLabels;
     }
 
     public static String getLogLevelLabel(final Context context, final int logLevel, final boolean addDefaultTag) {

From bde9d01f766d70007f82d34a68122fc34aa1afe5 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 1 Jul 2021 07:13:03 +0500
Subject: [PATCH 454/912] Bump to v0.115

---
 app/build.gradle               | 4 ++--
 terminal-emulator/build.gradle | 2 +-
 terminal-view/build.gradle     | 2 +-
 termux-shared/build.gradle     | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 9cc6ba1434..8d99051299 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -26,8 +26,8 @@ android {
         applicationId "com.termux"
         minSdkVersion project.properties.minSdkVersion.toInteger()
         targetSdkVersion project.properties.targetSdkVersion.toInteger()
-        versionCode 114
-        versionName "0.114"
+        versionCode 115
+        versionName "0.115"
 
         manifestPlaceholders.TERMUX_PACKAGE_NAME = "com.termux"
         manifestPlaceholders.TERMUX_APP_NAME = "Termux"
diff --git a/terminal-emulator/build.gradle b/terminal-emulator/build.gradle
index c60d4ad0af..4d5300c72e 100644
--- a/terminal-emulator/build.gradle
+++ b/terminal-emulator/build.gradle
@@ -66,7 +66,7 @@ afterEvaluate {
                 from components.release
                 groupId = 'com.termux'
                 artifactId = 'terminal-emulator'
-                version = '0.114'
+                version = '0.115'
                 artifact(sourceJar)
             }
         }
diff --git a/terminal-view/build.gradle b/terminal-view/build.gradle
index 0ce7f31428..56b94dabe1 100644
--- a/terminal-view/build.gradle
+++ b/terminal-view/build.gradle
@@ -45,7 +45,7 @@ afterEvaluate {
                 from components.release
                 groupId = 'com.termux'
                 artifactId = 'terminal-view'
-                version = '0.114'
+                version = '0.115'
                 artifact(sourceJar)
             }
         }
diff --git a/termux-shared/build.gradle b/termux-shared/build.gradle
index 5b6914521d..7a80ce11d4 100644
--- a/termux-shared/build.gradle
+++ b/termux-shared/build.gradle
@@ -61,7 +61,7 @@ afterEvaluate {
                 from components.release
                 groupId = 'com.termux'
                 artifactId = 'termux-shared'
-                version = '0.114'
+                version = '0.115'
                 artifact(sourceJar)
             }
         }

From 8e4da6cbcdde46599f449cf3b2b8492fedb06a48 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 1 Jul 2021 08:29:19 +0500
Subject: [PATCH 455/912] Revert "Bump to v0.115"

This reverts commit bde9d01f
---
 app/build.gradle               | 4 ++--
 terminal-emulator/build.gradle | 2 +-
 terminal-view/build.gradle     | 2 +-
 termux-shared/build.gradle     | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 8d99051299..9cc6ba1434 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -26,8 +26,8 @@ android {
         applicationId "com.termux"
         minSdkVersion project.properties.minSdkVersion.toInteger()
         targetSdkVersion project.properties.targetSdkVersion.toInteger()
-        versionCode 115
-        versionName "0.115"
+        versionCode 114
+        versionName "0.114"
 
         manifestPlaceholders.TERMUX_PACKAGE_NAME = "com.termux"
         manifestPlaceholders.TERMUX_APP_NAME = "Termux"
diff --git a/terminal-emulator/build.gradle b/terminal-emulator/build.gradle
index 4d5300c72e..c60d4ad0af 100644
--- a/terminal-emulator/build.gradle
+++ b/terminal-emulator/build.gradle
@@ -66,7 +66,7 @@ afterEvaluate {
                 from components.release
                 groupId = 'com.termux'
                 artifactId = 'terminal-emulator'
-                version = '0.115'
+                version = '0.114'
                 artifact(sourceJar)
             }
         }
diff --git a/terminal-view/build.gradle b/terminal-view/build.gradle
index 56b94dabe1..0ce7f31428 100644
--- a/terminal-view/build.gradle
+++ b/terminal-view/build.gradle
@@ -45,7 +45,7 @@ afterEvaluate {
                 from components.release
                 groupId = 'com.termux'
                 artifactId = 'terminal-view'
-                version = '0.115'
+                version = '0.114'
                 artifact(sourceJar)
             }
         }
diff --git a/termux-shared/build.gradle b/termux-shared/build.gradle
index 7a80ce11d4..5b6914521d 100644
--- a/termux-shared/build.gradle
+++ b/termux-shared/build.gradle
@@ -61,7 +61,7 @@ afterEvaluate {
                 from components.release
                 groupId = 'com.termux'
                 artifactId = 'termux-shared'
-                version = '0.115'
+                version = '0.114'
                 artifact(sourceJar)
             }
         }

From 886e52dcff1e156f28ae1a462059758e51ef8fb0 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 1 Jul 2021 08:34:00 +0500
Subject: [PATCH 456/912] Export JITPACK_NDK_VERSION for jitpack

Jitpack build is failing with the following error

```
> Configure project :
Gradle version Gradle 7.1

FAILURE: Build failed with an exception.

* What went wrong:
A problem occurred configuring project ':app'.
> com.android.builder.errors.EvalIssueException: NDK from ndk.dir at /opt/android-sdk-linux/ndk-bundle had version [21.1.6352462] which disagrees with android.ndkVersion [22.1.7171670]
```

So attempting to manually export an env variable for jitpack which uses ndk 21.1.6352462 instead of the termux default 22.1.7171670 and which is also used by F-Droid

https://jitpack.io/com/github/termux/termux-app/0.115/build.log

https://github.com/jitpack/jitpack.io/blob/master/BUILDING.md#custom-commands

https://gitlab.com/fdroid/fdroiddata/-/blob/master/metadata/com.termux.yml#L726
---
 app/build.gradle               | 2 +-
 jitpack.yml                    | 2 ++
 terminal-emulator/build.gradle | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 jitpack.yml

diff --git a/app/build.gradle b/app/build.gradle
index 9cc6ba1434..3ec30d10e6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -4,7 +4,7 @@ plugins {
 
 android {
     compileSdkVersion project.properties.compileSdkVersion.toInteger()
-    ndkVersion project.properties.ndkVersion
+    ndkVersion = System.getenv("JITPACK_NDK_VERSION") ?: project.properties.ndkVersion
 
     dependencies {
         implementation "androidx.annotation:annotation:1.2.0"
diff --git a/jitpack.yml b/jitpack.yml
new file mode 100644
index 0000000000..6a9b67d8bf
--- /dev/null
+++ b/jitpack.yml
@@ -0,0 +1,2 @@
+env:
+  JITPACK_NDK_VERSION: "21.1.6352462"
diff --git a/terminal-emulator/build.gradle b/terminal-emulator/build.gradle
index c60d4ad0af..e03403f9f8 100644
--- a/terminal-emulator/build.gradle
+++ b/terminal-emulator/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'maven-publish'
 
 android {
     compileSdkVersion project.properties.compileSdkVersion.toInteger()
-    ndkVersion project.properties.ndkVersion
+    ndkVersion = System.getenv("JITPACK_NDK_VERSION") ?: project.properties.ndkVersion
 
     defaultConfig {
         minSdkVersion project.properties.minSdkVersion.toInteger()

From c621c358276a8863690a0cd023b11c528cd9ff1b Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 1 Jul 2021 08:36:03 +0500
Subject: [PATCH 457/912] Bump to v0.115

---
 app/build.gradle               | 4 ++--
 terminal-emulator/build.gradle | 2 +-
 terminal-view/build.gradle     | 2 +-
 termux-shared/build.gradle     | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 3ec30d10e6..335617d8de 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -26,8 +26,8 @@ android {
         applicationId "com.termux"
         minSdkVersion project.properties.minSdkVersion.toInteger()
         targetSdkVersion project.properties.targetSdkVersion.toInteger()
-        versionCode 114
-        versionName "0.114"
+        versionCode 115
+        versionName "0.115"
 
         manifestPlaceholders.TERMUX_PACKAGE_NAME = "com.termux"
         manifestPlaceholders.TERMUX_APP_NAME = "Termux"
diff --git a/terminal-emulator/build.gradle b/terminal-emulator/build.gradle
index e03403f9f8..cb01ea4fa2 100644
--- a/terminal-emulator/build.gradle
+++ b/terminal-emulator/build.gradle
@@ -66,7 +66,7 @@ afterEvaluate {
                 from components.release
                 groupId = 'com.termux'
                 artifactId = 'terminal-emulator'
-                version = '0.114'
+                version = '0.115'
                 artifact(sourceJar)
             }
         }
diff --git a/terminal-view/build.gradle b/terminal-view/build.gradle
index 0ce7f31428..56b94dabe1 100644
--- a/terminal-view/build.gradle
+++ b/terminal-view/build.gradle
@@ -45,7 +45,7 @@ afterEvaluate {
                 from components.release
                 groupId = 'com.termux'
                 artifactId = 'terminal-view'
-                version = '0.114'
+                version = '0.115'
                 artifact(sourceJar)
             }
         }
diff --git a/termux-shared/build.gradle b/termux-shared/build.gradle
index 5b6914521d..7a80ce11d4 100644
--- a/termux-shared/build.gradle
+++ b/termux-shared/build.gradle
@@ -61,7 +61,7 @@ afterEvaluate {
                 from components.release
                 groupId = 'com.termux'
                 artifactId = 'termux-shared'
-                version = '0.114'
+                version = '0.115'
                 artifact(sourceJar)
             }
         }

From e547c154819572c80de0736b00d4fd04b65a2987 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 1 Jul 2021 10:52:51 +0500
Subject: [PATCH 458/912] Bump to v0.116

---
 app/build.gradle               | 4 ++--
 terminal-emulator/build.gradle | 2 +-
 terminal-view/build.gradle     | 2 +-
 termux-shared/build.gradle     | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 335617d8de..ecee202c38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -26,8 +26,8 @@ android {
         applicationId "com.termux"
         minSdkVersion project.properties.minSdkVersion.toInteger()
         targetSdkVersion project.properties.targetSdkVersion.toInteger()
-        versionCode 115
-        versionName "0.115"
+        versionCode 116
+        versionName "0.116"
 
         manifestPlaceholders.TERMUX_PACKAGE_NAME = "com.termux"
         manifestPlaceholders.TERMUX_APP_NAME = "Termux"
diff --git a/terminal-emulator/build.gradle b/terminal-emulator/build.gradle
index cb01ea4fa2..014e3350e9 100644
--- a/terminal-emulator/build.gradle
+++ b/terminal-emulator/build.gradle
@@ -66,7 +66,7 @@ afterEvaluate {
                 from components.release
                 groupId = 'com.termux'
                 artifactId = 'terminal-emulator'
-                version = '0.115'
+                version = '0.116'
                 artifact(sourceJar)
             }
         }
diff --git a/terminal-view/build.gradle b/terminal-view/build.gradle
index 56b94dabe1..5c97f2cb0a 100644
--- a/terminal-view/build.gradle
+++ b/terminal-view/build.gradle
@@ -45,7 +45,7 @@ afterEvaluate {
                 from components.release
                 groupId = 'com.termux'
                 artifactId = 'terminal-view'
-                version = '0.115'
+                version = '0.116'
                 artifact(sourceJar)
             }
         }
diff --git a/termux-shared/build.gradle b/termux-shared/build.gradle
index 7a80ce11d4..430762943e 100644
--- a/termux-shared/build.gradle
+++ b/termux-shared/build.gradle
@@ -61,7 +61,7 @@ afterEvaluate {
                 from components.release
                 groupId = 'com.termux'
                 artifactId = 'termux-shared'
-                version = '0.115'
+                version = '0.116'
                 artifact(sourceJar)
             }
         }

From 78be0e793eba633f5a3278f20681983877341f7a Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 1 Jul 2021 11:17:47 +0500
Subject: [PATCH 459/912] Update README.md

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index f27125f79e..77f4c83657 100644
--- a/README.md
+++ b/README.md
@@ -3,6 +3,8 @@
 [![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)
+[![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.
 

From dccd155ba689e58bfa5e4ba7c89cbe81f629f4bd Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Fri, 2 Jul 2021 06:14:38 +0500
Subject: [PATCH 460/912] Enable split apks for debug builds

APKs for each architecture and a universal APK that is compatible for all architectures will now be available from Github Actions page from the workflow runs labeled `Build`. The APKs will be available as zips under the Artifact section named `termux-app-*`.

Architecture specific APKs can be used by users with low disk space since F-Droid releases are universal (since it doesn't support split APKs #1904) and their install+bootstrap installation size is ~180MB instead of ~120MB if an architecture specific APK is used.

This should also reduce bandwidth usage and download time for debug builds users if they download an architecture specific zip instead of the universal one.

Related #2153
---
 .github/workflows/debug_build.yml | 36 ++++++++++++++++++++++++++++---
 app/build.gradle                  | 10 ++++++---
 2 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/debug_build.yml b/.github/workflows/debug_build.yml
index 0439523ebf..097bfddbd6 100644
--- a/.github/workflows/debug_build.yml
+++ b/.github/workflows/debug_build.yml
@@ -19,8 +19,38 @@ jobs:
     - name: Build
       run: |
         ./gradlew assembleDebug
-    - name: Store generated APK file
+    - name: Store generated universal APK file
       uses: actions/upload-artifact@v2
       with:
-        name: termux-app
-        path: ./app/build/outputs/apk/debug
+        name: termux-app-universal
+        path: |
+            ./app/build/outputs/apk/debug/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/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/app-armeabi-v7a-debug
+          ./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/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/app-x86-debug.apk
+          ./app/build/outputs/apk/debug/output-metadata.json
diff --git a/app/build.gradle b/app/build.gradle
index ecee202c38..540419b17e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -44,10 +44,14 @@ android {
             }
         }
 
-        ndk {
-            abiFilters 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a'
+        splits {
+            abi {
+                enable gradle.startParameter.taskNames.any { it.contains("Debug") }
+                reset ()
+                include 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a'
+                universalApk true
+            }
         }
-
     }
 
     signingConfigs {

From b90d59479a036a4b8bd4175b139e590436b9669b Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Fri, 2 Jul 2021 06:29:05 +0500
Subject: [PATCH 461/912] Fix typo in dccd155

---
 .github/workflows/debug_build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/debug_build.yml b/.github/workflows/debug_build.yml
index 097bfddbd6..e1ea5e58f6 100644
--- a/.github/workflows/debug_build.yml
+++ b/.github/workflows/debug_build.yml
@@ -38,7 +38,7 @@ jobs:
       with:
         name: termux-app-armeabi-v7a
         path: |
-          ./app/build/outputs/apk/debug/app-armeabi-v7a-debug
+          ./app/build/outputs/apk/debug/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

From eabbda8efd4da210748df2a6c98650cb2c5ba494 Mon Sep 17 00:00:00 2001
From: Arib Muhtasim <aribmuhtasim22@gmail.com>
Date: Wed, 7 Jul 2021 16:31:33 +0600
Subject: [PATCH 462/912] Fixed grammar in the README.md file...

Went through the README.md file and fixed a lot of grammatical mistakes.
I know this is useless but I was bored...
---
 README.md | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 77f4c83657..6a17b939a4 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,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 current one (@fornwall) is inactive.**
+**@termux is looking for Termux Application maintainers for implementing new features, fixing bugs and reviewing pull requests since the current one (@fornwall) is inactive.**
 
 Issue https://github.com/termux/termux-app/issues/1072 needs extra attention.
 
@@ -48,36 +48,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. 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.
+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 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 uninstallation.
+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.
 
 ### F-Droid
 
-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.
+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 the building and publishing of the 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.
 
 ### Debug Builds
 
-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.
+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 labelled `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.
 
 ### Google Playstore **(Deprecated)**
 
 **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.
+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 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.
 
 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 its 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 it’s available on your device and search `termux` in the applications list.
 
-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.
+Even if you think you have not installed any of the plugins, it’s strongly suggesting to go through the application list in Android settings and double-check.
 ##
 
 
@@ -142,6 +142,7 @@ The main ones are the following.
 
 ## 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 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 [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. 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.
+

From a53cc886883cff93f16e44060f2f810fd210e40c Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 8 Jul 2021 08:14:42 +0500
Subject: [PATCH 463/912] Bump gradle dependencies versions

---
 termux-shared/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/termux-shared/build.gradle b/termux-shared/build.gradle
index 430762943e..bb0c19d13a 100644
--- a/termux-shared/build.gradle
+++ b/termux-shared/build.gradle
@@ -8,7 +8,7 @@ android {
         implementation 'androidx.appcompat:appcompat:1.3.0'
         implementation "androidx.annotation:annotation:1.2.0"
         implementation "androidx.core:core:1.6.0-rc01"
-        implementation "androidx.window:window:1.0.0-alpha08"
+        implementation "androidx.window:window:1.0.0-alpha09"
         implementation "com.google.guava:guava:24.1-jre"
         implementation "io.noties.markwon:core:$markwonVersion"
         implementation "io.noties.markwon:ext-strikethrough:$markwonVersion"

From 4361c5e0c5a385e9070049d08842f6b3180c1f8e Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 8 Jul 2021 08:27:44 +0500
Subject: [PATCH 464/912] Fix java.lang.AbstractMethodError:
 androidx.window.sidecar.SidecarInterface$SidecarCallback.onDeviceStateChanged

The crash was reported for `Microsoft Surface Duo`, which would affect some samsung and other devices as well, mainly dual screens/foldables. It was caused by androidx:window library that has been used by termux-shared since v0.115 having a typo in its proguard rules which didn't stop the removal of the required method for release builds (not debug) by proguard.

The library has been patched and fix should be available on next version but doing an emergency patch now for termux as well.

For people who are getting the crash should set `disable-terminal-margin-adjustment=true` in `termux.properties` created as per instructions in the link below and then start termux again and see if it fixes the issue. If you had termux installed before updating, you should be able to directly access the `~/.termux/termux.properties` file with SAF.

https://github.com/termux/termux-app/issues/1896#issuecomment-766188879

------

**Crash Message**:
```
abstract method "void androidx.window.sidecar.SidecarInterface$SidecarCallback.onDeviceStateChanged(androidx.window.sidecar.SidecarDeviceState)"
```

### Stacktrace

```
java.lang.AbstractMethodError: abstract method "void androidx.window.sidecar.SidecarInterface$SidecarCallback.onDeviceStateChanged(androidx.window.sidecar.SidecarDeviceState)"
at androidx.window.sidecar.MicrosoftSurfaceSidecar.updateDeviceState(MicrosoftSurfaceSidecar.java:159)
at androidx.window.sidecar.MicrosoftSurfaceSidecar$1.deviceStateChanged(MicrosoftSurfaceSidecar.java:192)
at android.vendor.screenlayout.service.IWindowExtensionCallbackInterface$Stub.onTransact(IWindowExtensionCallbackInterface.java:94)
at android.os.Binder.execTransactInternal(Binder.java:1021)
at android.os.Binder.execTransact(Binder.java:994)

```

https://issuetracker.google.com/issues/189001730
https://android-review.googlesource.com/c/platform/frameworks/support/+/1757630
---
 app/proguard-rules.pro | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 7365abb1dc..a01c038960 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -10,3 +10,8 @@
 -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.** { *; }

From 2cf21c8409bebf4944c63d7e5e1ba5c47686e7c2 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 8 Jul 2021 08:28:31 +0500
Subject: [PATCH 465/912] Update .gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 5f7ee3c3dc..cb4634f567 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@
 
 # Built application files
 build/
+release/
 *.apk
 *.so
 .externalNativeBuild

From 56c382668011e95e09522b740bce93fe5dc10c6f Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 8 Jul 2021 08:49:32 +0500
Subject: [PATCH 466/912] Add app and device info too for crash notification
 shown when bootstrap installation or setup storage fails

---
 .../java/com/termux/app/TermuxInstaller.java   |  6 +++---
 .../java/com/termux/app/utils/CrashUtils.java  | 18 ++++++++++++++----
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxInstaller.java b/app/src/main/java/com/termux/app/TermuxInstaller.java
index 19ade92079..60c5dc00de 100644
--- a/app/src/main/java/com/termux/app/TermuxInstaller.java
+++ b/app/src/main/java/com/termux/app/TermuxInstaller.java
@@ -196,7 +196,7 @@ public static void showBootstrapErrorDialog(Activity activity, String PREFIX_FIL
         Logger.logErrorExtended(LOG_TAG, "Bootstrap Error:\n" + message);
 
         // Send a notification with the exception so that the user knows why bootstrap setup failed
-        CrashUtils.sendCrashReportNotification(activity, LOG_TAG, "## Bootstrap Error\n\n" + message, true);
+        CrashUtils.sendCrashReportNotification(activity, LOG_TAG, "## Bootstrap Error\n\n" + message, true, true);
 
         activity.runOnUiThread(() -> {
             try {
@@ -231,7 +231,7 @@ public void run() {
                     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);
+                        CrashUtils.sendCrashReportNotification(context, LOG_TAG, "## Setup Storage Error\n\n" + Error.getErrorMarkdownString(error), true, true);
                         return;
                     }
 
@@ -270,7 +270,7 @@ public void run() {
                 } 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);
+                    CrashUtils.sendCrashReportNotification(context, LOG_TAG, "## Setup Storage Error\n\n" + Logger.getStackTracesMarkdownString(null, Logger.getStackTracesStringArray(e)), true, true);
                 }
             }
         }.start();
diff --git a/app/src/main/java/com/termux/app/utils/CrashUtils.java b/app/src/main/java/com/termux/app/utils/CrashUtils.java
index 1437e234ca..f9ebe779b3 100644
--- a/app/src/main/java/com/termux/app/utils/CrashUtils.java
+++ b/app/src/main/java/com/termux/app/utils/CrashUtils.java
@@ -20,6 +20,7 @@
 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;
@@ -86,7 +87,7 @@ public void run() {
 
                 Logger.logDebug(logTag, "A crash log file found at \"" + TermuxConstants.TERMUX_CRASH_LOG_FILE_PATH +  "\".");
 
-                sendCrashReportNotification(context, logTag, reportString, false);
+                sendCrashReportNotification(context, logTag, reportString, false, false);
             }
         }.start();
     }
@@ -97,13 +98,15 @@ public void run() {
      *
      * @param context The {@link Context} for operations.
      * @param logTag The log tag to use for logging.
-     * @param reportString The text for the crash report.
+     * @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 reportString, boolean forceNotification) {
+    public static void sendCrashReportNotification(final Context context, String logTag, String message, boolean forceNotification, boolean addAppAndDeviceInfo) {
         if (context == null) return;
 
         TermuxAppSharedPreferences preferences = TermuxAppSharedPreferences.build(context);
@@ -121,7 +124,14 @@ public static void sendCrashReportNotification(final Context context, String log
 
         Logger.logDebug(logTag, "Sending \"" + title + "\" notification.");
 
-        Intent notificationIntent = ReportActivity.newInstance(context, new ReportInfo(UserAction.CRASH_REPORT.getName(), logTag, title, null, reportString, "\n\n" + TermuxUtils.getReportIssueMarkdownString(context), true));
+        StringBuilder reportString = new StringBuilder(message);
+
+        if (addAppAndDeviceInfo) {
+            reportString.append("\n\n").append(TermuxUtils.getAppInfoMarkdownString(context, true));
+            reportString.append("\n\n").append(AndroidUtils.getDeviceInfoMarkdownString(context));
+        }
+
+        Intent notificationIntent = ReportActivity.newInstance(context, new ReportInfo(UserAction.CRASH_REPORT.getName(), logTag, title, null, reportString.toString(), "\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

From cce6dfed22801cf063213ed3090bc76394c08618 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 8 Jul 2021 09:20:25 +0500
Subject: [PATCH 467/912] Fix issue where RUN_COMMAND intent was failing for
 coreutils/busybox applets

---
 .../java/com/termux/app/RunCommandService.java   | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/termux/app/RunCommandService.java b/app/src/main/java/com/termux/app/RunCommandService.java
index 9817d78500..8c3fae2bcf 100644
--- a/app/src/main/java/com/termux/app/RunCommandService.java
+++ b/app/src/main/java/com/termux/app/RunCommandService.java
@@ -13,6 +13,7 @@
 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;
@@ -75,8 +76,7 @@ public int onStartCommand(Intent intent, int flags, int startId) {
             return Service.START_NOT_STICKY;
         }
 
-        executionCommand.executable = IntentUtils.getStringExtraIfSet(intent, RUN_COMMAND_SERVICE.EXTRA_COMMAND_PATH, null);
-
+        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);
 
         /*
@@ -176,9 +176,17 @@ public int onStartCommand(Intent intent, int flags, int startId) {
             }
         }
 
+        // 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(TermuxFileUtils.getExpandedTermuxPath(executionCommand.executable)).build();
+        executionCommand.executableUri = new Uri.Builder().scheme(TERMUX_SERVICE.URI_SCHEME_SERVICE_EXECUTE).path(executionCommand.executable).build();
 
         Logger.logVerbose(LOG_TAG, executionCommand.toString());
 

From c6b4114f8632e1f74048c946e3156e77cd9a9f0a Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 8 Jul 2021 10:01:47 +0500
Subject: [PATCH 468/912] Fix issue where a colour tint/highlight would be
 added to the terminal

This would happen when soft keyboard was to be disabled or hidden at startup and a hardware keyboard was attached and user started typing on hardware keyboard without tapping on the terminal first.
---
 .../terminal/TermuxTerminalViewClient.java    | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
index 7b3592fb94..0853a80f26 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
@@ -484,7 +484,13 @@ public void onToggleSoftKeyboardRequest() {
     }
 
     public void setSoftKeyboardState(boolean isStartup, boolean isReloadTermuxProperties) {
-        boolean noRequestFocus = false;
+        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,
@@ -492,7 +498,8 @@ public void setSoftKeyboardState(boolean isStartup, boolean isReloadTermuxProper
             mActivity.getPreferences().isSoftKeyboardEnabledOnlyIfNoHardware())) {
             Logger.logVerbose(LOG_TAG, "Maintaining disabled soft keyboard");
             KeyboardUtils.disableSoftKeyboard(mActivity, mActivity.getTerminalView());
-            noRequestFocus = true;
+            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
@@ -508,10 +515,12 @@ public void setSoftKeyboardState(boolean isStartup, boolean isReloadTermuxProper
             // 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);
-                noRequestFocus = true;
+
+                KeyboardUtils.hideSoftKeyboard(mActivity, mActivity.getTerminalView());
+                mActivity.getTerminalView().requestFocus();
+                noShowKeyboard = true;
                 // Required to keep keyboard hidden on app startup
                 mShowSoftKeyboardIgnoreOnce = true;
             }
@@ -541,7 +550,7 @@ public void onFocusChange(View view, boolean hasFocus) {
 
         // 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 && !noRequestFocus) {
+        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

From dc8bdfe675befe048df482663fa3a1b25ee5929b Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 8 Jul 2021 10:50:30 +0500
Subject: [PATCH 469/912] Attempt to fix bootstrap installation failure that
 may be caused by invalid mkdirs return value

---
 .../src/main/java/com/termux/shared/file/FileUtils.java    | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/file/FileUtils.java b/termux-shared/src/main/java/com/termux/shared/file/FileUtils.java
index 4bc81933b9..07179f272a 100644
--- a/termux-shared/src/main/java/com/termux/shared/file/FileUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/file/FileUtils.java
@@ -326,9 +326,10 @@ public static Error validateDirectoryFileExistenceAndPermissions(String label, f
                     if (createDirectoryIfMissing && fileType == FileType.NO_EXIST) {
                         Logger.logVerbose(LOG_TAG, "Creating " + label + "directory file at path \"" + filePath + "\"");
                         // Create directory and update fileType if successful, otherwise return with error
-                        if (file.mkdirs())
-                            fileType = getFileType(filePath, false);
-                        else
+                        // It "might" be possible that mkdirs returns false even though directory was created
+                        boolean result = file.mkdirs();
+                        fileType = getFileType(filePath, false);
+                        if (!result && fileType != FileType.DIRECTORY)
                             return FileUtilsErrno.ERRNO_CREATING_FILE_FAILED.getError(label + "directory file", filePath);
                     }
 

From 7aefd9436900806ce3c64f67afd5907aa81f4ffc Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 8 Jul 2021 11:24:29 +0500
Subject: [PATCH 470/912] Revert "Allow users to disable terminal margin
 adjustment"

This reverts commit 32135025
---
 app/src/main/java/com/termux/app/TermuxActivity.java     | 3 +--
 .../settings/properties/TermuxPropertyConstants.java     | 9 ---------
 .../settings/properties/TermuxSharedProperties.java      | 4 ----
 3 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index 4da810f76c..36b96a9748 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -259,8 +259,7 @@ public void onStart() {
         if (mTermuxTerminalViewClient != null)
             mTermuxTerminalViewClient.onStart();
 
-        if (!mProperties.isTerminalMarginAdjustmentDisabled())
-            addTermuxActivityRootViewGlobalLayoutListener();
+        addTermuxActivityRootViewGlobalLayoutListener();
 
         registerTermuxActivityBroadcastReceiver();
     }
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java b/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java
index cb3b352bea..fbc7c070ad 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java
@@ -72,13 +72,6 @@ public final class TermuxPropertyConstants {
 
     /* boolean */
 
-    /** Defines the key for whether terminal view margin adjustment that is done to prevent soft
-     * keyboard from covering bottom part of terminal view on some devices is disabled or not.
-     * Margin adjustment may cause screen flickering on some devices and so should be disabled. */
-    public static final String KEY_DISABLE_TERMINAL_MARGIN_ADJUSTMENT =  "disable-terminal-margin-adjustment"; // Default: "disable-terminal-margin-adjustment"
-
-
-
     /** Defines the key for whether a toast will be shown when user changes the terminal session */
     public static final String KEY_DISABLE_TERMINAL_SESSION_CHANGE_TOAST =  "disable-terminal-session-change-toast"; // Default: "disable-terminal-session-change-toast"
 
@@ -302,7 +295,6 @@ public final class TermuxPropertyConstants {
      * */
     public static final Set<String> TERMUX_PROPERTIES_LIST = new HashSet<>(Arrays.asList(
         /* boolean */
-        KEY_DISABLE_TERMINAL_MARGIN_ADJUSTMENT,
         KEY_DISABLE_TERMINAL_SESSION_CHANGE_TOAST,
         KEY_ENFORCE_CHAR_BASED_INPUT,
         KEY_HIDE_SOFT_KEYBOARD_ON_STARTUP,
@@ -343,7 +335,6 @@ public final class TermuxPropertyConstants {
      * default: false
      * */
     public static final Set<String> TERMUX_DEFAULT_BOOLEAN_BEHAVIOUR_PROPERTIES_LIST = new HashSet<>(Arrays.asList(
-        KEY_DISABLE_TERMINAL_MARGIN_ADJUSTMENT,
         KEY_DISABLE_TERMINAL_SESSION_CHANGE_TOAST,
         KEY_ENFORCE_CHAR_BASED_INPUT,
         KEY_HIDE_SOFT_KEYBOARD_ON_STARTUP,
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxSharedProperties.java b/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxSharedProperties.java
index 992c6f2e23..e3031764aa 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxSharedProperties.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxSharedProperties.java
@@ -460,10 +460,6 @@ public static String getVolumeKeysBehaviourInternalPropertyValueFromValue(String
 
 
 
-    public boolean isTerminalMarginAdjustmentDisabled() {
-        return (boolean) getInternalPropertyValue(TermuxPropertyConstants.KEY_DISABLE_TERMINAL_MARGIN_ADJUSTMENT, true);
-    }
-
     public boolean areTerminalSessionChangeToastsDisabled() {
         return (boolean) getInternalPropertyValue(TermuxPropertyConstants.KEY_DISABLE_TERMINAL_SESSION_CHANGE_TOAST, true);
     }

From e0ad9ff57391963c28f702e45cc156d243a43acb Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 8 Jul 2021 12:17:49 +0500
Subject: [PATCH 471/912] Allow users to disable terminal margin adjustment
 from termux settings

Previously in (32135025) support was added with `disable-terminal-margin-adjustment` `termux.properties` property to disable terminal margin adjustment in case in causes screen flickering or other issues on some devices. It has now been removed in (7aefd943) and moved to Termux Settings since if it causes issues at startup and users can't access `termux.properties` file from the terminal, they will have to use SAF or root to access it, which will require an external app.

Users can set the value from the `Termux Settings` -> `Termux` -> `Terminal View` -> `Terminal Margin Adjustment` toggle. The `Termux Settings` can be accessed from left drawer in termux and from the android launcher shortcut for Termux Settings, usually accessible by long holding on Termux icon.
---
 .../java/com/termux/app/TermuxActivity.java   |  3 +-
 .../TerminalViewPreferencesFragment.java      | 77 +++++++++++++++++++
 app/src/main/res/values/strings.xml           | 14 ++++
 app/src/main/res/xml/termux_preferences.xml   |  5 ++
 .../xml/termux_terminal_view_preferences.xml  | 15 ++++
 .../TermuxAppSharedPreferences.java           | 10 +++
 .../TermuxPreferenceConstants.java            | 15 +++-
 7 files changed, 137 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/java/com/termux/app/fragments/settings/termux/TerminalViewPreferencesFragment.java
 create mode 100644 app/src/main/res/xml/termux_terminal_view_preferences.xml

diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index 36b96a9748..729a636ae2 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -259,7 +259,8 @@ public void onStart() {
         if (mTermuxTerminalViewClient != null)
             mTermuxTerminalViewClient.onStart();
 
-        addTermuxActivityRootViewGlobalLayoutListener();
+        if (mPreferences.isTerminalMarginAdjustmentEnabled())
+            addTermuxActivityRootViewGlobalLayoutListener();
 
         registerTermuxActivityBroadcastReceiver();
     }
diff --git a/app/src/main/java/com/termux/app/fragments/settings/termux/TerminalViewPreferencesFragment.java b/app/src/main/java/com/termux/app/fragments/settings/termux/TerminalViewPreferencesFragment.java
new file mode 100644
index 0000000000..ed10d18a5a
--- /dev/null
+++ b/app/src/main/java/com/termux/app/fragments/settings/termux/TerminalViewPreferencesFragment.java
@@ -0,0 +1,77 @@
+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;
+        }
+    }
+
+}
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5f396302d8..c5133bb2e0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -168,6 +168,20 @@
                 <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 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>
diff --git a/app/src/main/res/xml/termux_preferences.xml b/app/src/main/res/xml/termux_preferences.xml
index f28c775dc5..90353c51e1 100644
--- a/app/src/main/res/xml/termux_preferences.xml
+++ b/app/src/main/res/xml/termux_preferences.xml
@@ -10,4 +10,9 @@
         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>
diff --git a/app/src/main/res/xml/termux_terminal_view_preferences.xml b/app/src/main/res/xml/termux_terminal_view_preferences.xml
new file mode 100644
index 0000000000..3f66863336
--- /dev/null
+++ b/app/src/main/res/xml/termux_terminal_view_preferences.xml
@@ -0,0 +1,15 @@
+<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>
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxAppSharedPreferences.java b/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxAppSharedPreferences.java
index c2979ee08c..7bcf408a15 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxAppSharedPreferences.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxAppSharedPreferences.java
@@ -91,6 +91,16 @@ public boolean toogleShowTerminalToolbar() {
 
 
 
+    public boolean isTerminalMarginAdjustmentEnabled() {
+        return SharedPreferenceUtils.getBoolean(mSharedPreferences, TERMUX_APP.KEY_TERMINAL_MARGIN_ADJUSTMENT, TERMUX_APP.DEFAULT_TERMINAL_MARGIN_ADJUSTMENT);
+    }
+
+    public void setTerminalMarginAdjustment(boolean value) {
+        SharedPreferenceUtils.setBoolean(mSharedPreferences, TERMUX_APP.KEY_TERMINAL_MARGIN_ADJUSTMENT, value, false);
+    }
+
+
+
     public boolean isSoftKeyboardEnabled() {
         return SharedPreferenceUtils.getBoolean(mSharedPreferences, TERMUX_APP.KEY_SOFT_KEYBOARD_ENABLED, TERMUX_APP.DEFAULT_VALUE_KEY_SOFT_KEYBOARD_ENABLED);
     }
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxPreferenceConstants.java b/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxPreferenceConstants.java
index efec9d9863..074aa60232 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxPreferenceConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxPreferenceConstants.java
@@ -1,7 +1,7 @@
 package com.termux.shared.settings.preferences;
 
 /*
- * Version: v0.10.0
+ * Version: v0.11.0
  *
  * Changelog
  *
@@ -44,6 +44,10 @@
  * - 0.10.0 (2021-05-12)
  *      - Added following to `TERMUX_APP`:
  *          `KEY_SOFT_KEYBOARD_ENABLED_ONLY_IF_NO_HARDWARE` and `DEFAULT_VALUE_KEY_SOFT_KEYBOARD_ENABLED_ONLY_IF_NO_HARDWARE`.
+ *
+ * - 0.11.0 (2021-07-08)
+ *      - Added following to `TERMUX_APP`:
+ *          `KEY_DISABLE_TERMINAL_MARGIN_ADJUSTMENT`.
  */
 
 /**
@@ -60,6 +64,15 @@ public final class TermuxPreferenceConstants {
      */
     public static final class TERMUX_APP {
 
+        /**
+         * Defines the key for whether terminal view margin adjustment that is done to prevent soft
+         * keyboard from covering bottom part of terminal view on some devices is enabled or not.
+         * Margin adjustment may cause screen flickering on some devices and so should be disabled.
+         */
+        public static final String KEY_TERMINAL_MARGIN_ADJUSTMENT =  "terminal_margin_adjustment";
+        public static final boolean DEFAULT_TERMINAL_MARGIN_ADJUSTMENT = true;
+
+
         /**
          * Defines the key for whether to show terminal toolbar containing extra keys and text input field.
          */

From d49fd6b00c93be57d058c896255cf3bac13c8066 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 8 Jul 2021 13:10:50 +0500
Subject: [PATCH 472/912] Trigger termux library builds on jitpack on releases

---
 .../trigger_library_builds_on_jitpack.yml     | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 .github/workflows/trigger_library_builds_on_jitpack.yml

diff --git a/.github/workflows/trigger_library_builds_on_jitpack.yml b/.github/workflows/trigger_library_builds_on_jitpack.yml
new file mode 100644
index 0000000000..1cffbbf82d
--- /dev/null
+++ b/.github/workflows/trigger_library_builds_on_jitpack.yml
@@ -0,0 +1,22 @@
+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: Trigger termux library builds on jitpack
+        env:
+          RELEASE_VERSION: ${{ steps.vars.outputs.tag }}
+        run: |
+          echo "Triggering termux library builds on jitpack for $RELEASE_VERSION"
+          curl --max-time 600 https://jitpack.io/com/termux/termux-app/terminal-emulator/$RELEASE_VERSION/terminal-emulator-$RELEASE_VERSION.pom
+          curl --max-time 600 https://jitpack.io/com/termux/termux-app/terminal-view/$RELEASE_VERSION/terminal-view-$RELEASE_VERSION.pom
+          curl --max-time 600 https://jitpack.io/com/termux/termux-app/termux-shared/$RELEASE_VERSION/termux-shared-$RELEASE_VERSION.pom

From 9272a757affc0dae4aa044248800f3987e06c52b Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 8 Jul 2021 13:12:31 +0500
Subject: [PATCH 473/912] Bump to v0.117

---
 app/build.gradle               | 4 ++--
 terminal-emulator/build.gradle | 2 +-
 terminal-view/build.gradle     | 2 +-
 termux-shared/build.gradle     | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 540419b17e..60c0514d03 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -26,8 +26,8 @@ android {
         applicationId "com.termux"
         minSdkVersion project.properties.minSdkVersion.toInteger()
         targetSdkVersion project.properties.targetSdkVersion.toInteger()
-        versionCode 116
-        versionName "0.116"
+        versionCode 117
+        versionName "0.117"
 
         manifestPlaceholders.TERMUX_PACKAGE_NAME = "com.termux"
         manifestPlaceholders.TERMUX_APP_NAME = "Termux"
diff --git a/terminal-emulator/build.gradle b/terminal-emulator/build.gradle
index 014e3350e9..97f9ed7ea7 100644
--- a/terminal-emulator/build.gradle
+++ b/terminal-emulator/build.gradle
@@ -66,7 +66,7 @@ afterEvaluate {
                 from components.release
                 groupId = 'com.termux'
                 artifactId = 'terminal-emulator'
-                version = '0.116'
+                version = '0.117'
                 artifact(sourceJar)
             }
         }
diff --git a/terminal-view/build.gradle b/terminal-view/build.gradle
index 5c97f2cb0a..5bf11e100a 100644
--- a/terminal-view/build.gradle
+++ b/terminal-view/build.gradle
@@ -45,7 +45,7 @@ afterEvaluate {
                 from components.release
                 groupId = 'com.termux'
                 artifactId = 'terminal-view'
-                version = '0.116'
+                version = '0.117'
                 artifact(sourceJar)
             }
         }
diff --git a/termux-shared/build.gradle b/termux-shared/build.gradle
index bb0c19d13a..34d2e7678c 100644
--- a/termux-shared/build.gradle
+++ b/termux-shared/build.gradle
@@ -61,7 +61,7 @@ afterEvaluate {
                 from components.release
                 groupId = 'com.termux'
                 artifactId = 'termux-shared'
-                version = '0.116'
+                version = '0.117'
                 artifact(sourceJar)
             }
         }

From b2a071aad967485b201d162f6f0b488d31801f13 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <31106828+agnostic-apollo@users.noreply.github.com>
Date: Fri, 9 Jul 2021 11:14:11 +0500
Subject: [PATCH 474/912] Update trigger_library_builds_on_jitpack.yml

---
 .../workflows/trigger_library_builds_on_jitpack.yml    | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/trigger_library_builds_on_jitpack.yml b/.github/workflows/trigger_library_builds_on_jitpack.yml
index 1cffbbf82d..19c1a81eb5 100644
--- a/.github/workflows/trigger_library_builds_on_jitpack.yml
+++ b/.github/workflows/trigger_library_builds_on_jitpack.yml
@@ -12,11 +12,13 @@ jobs:
       - 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: |
-          echo "Triggering termux library builds on jitpack for $RELEASE_VERSION"
-          curl --max-time 600 https://jitpack.io/com/termux/termux-app/terminal-emulator/$RELEASE_VERSION/terminal-emulator-$RELEASE_VERSION.pom
-          curl --max-time 600 https://jitpack.io/com/termux/termux-app/terminal-view/$RELEASE_VERSION/terminal-view-$RELEASE_VERSION.pom
-          curl --max-time 600 https://jitpack.io/com/termux/termux-app/termux-shared/$RELEASE_VERSION/termux-shared-$RELEASE_VERSION.pom
+          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

From 6fa4b9b7cd256a7dec78fcb8ec274bca727e4c1b Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 10 Jul 2021 15:56:52 +0500
Subject: [PATCH 475/912] Ensure termux files directory is accessible before
 bootstrap installation and provide better info when running as secondary
 user/profile

Termux will check if termux files directory `/data/data/com.termux/files` has rwx permission access before installing bootstrap or starting terminal. Missing permission will automatically be set if possible. The `/data/data/com.termux` directory will also be created if it did not already exist, like if android did not already create it.

Users will now also be shown a crash notification if they attempt to start termux as a secondary user or in a work profile with info of the "alternate" termux files directory `/data/user/<id>/com.termux` set by android and the profile owner app if running under work profile (not secondary user). A notification will also be shown if the termux files directory (not "alternate") is not accessible.

Related #2168
---
 .../java/com/termux/app/TermuxInstaller.java  | 29 ++++++++--
 app/src/main/res/values/strings.xml           |  2 +-
 .../termux/shared/file/TermuxFileUtils.java   | 41 ++++++++++++++
 .../termux/shared/packages/PackageUtils.java  | 55 ++++++++++++++++++-
 .../termux/shared/termux/AndroidUtils.java    | 19 +++++--
 .../com/termux/shared/termux/TermuxUtils.java |  9 +++
 6 files changed, 144 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxInstaller.java b/app/src/main/java/com/termux/app/TermuxInstaller.java
index 60c5dc00de..2789fbf43b 100644
--- a/app/src/main/java/com/termux/app/TermuxInstaller.java
+++ b/app/src/main/java/com/termux/app/TermuxInstaller.java
@@ -5,7 +5,6 @@
 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;
@@ -13,9 +12,12 @@
 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 java.io.BufferedReader;
@@ -53,13 +55,30 @@ 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_INTERNAL_PRIVATE_APP_DATA_DIR_PATH
+        // is created if it does not already exist, like if it was not already created by android
+        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:
-        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);
+        if (!PackageUtils.isCurrentUserThePrimaryUser(activity)) {
+            bootstrapErrorMessage = activity.getString(R.string.bootstrap_error_not_primary_user_message, MarkdownUtils.getMarkdownCodeForString(TermuxConstants.TERMUX_PREFIX_DIR_PATH, false));
+            Logger.logError(LOG_TAG, bootstrapErrorMessage);
+            CrashUtils.sendCrashReportNotification(activity, LOG_TAG, "## Bootstrap Error\n\n" + bootstrapErrorMessage, true, true);
+            MessageDialogUtils.exitAppWithErrorMessage(activity,
+                activity.getString(R.string.bootstrap_error_title),
+                bootstrapErrorMessage);
+            return;
+        }
+
+        if (!isFilesDirectoryAccessible) {
+            bootstrapErrorMessage = Error.getMinimalErrorString(filesDirectoryAccessibleError) + "\nTERMUX_FILES_DIR: " + MarkdownUtils.getMarkdownCodeForString(TermuxConstants.TERMUX_FILES_DIR_PATH, false);
             Logger.logError(LOG_TAG, bootstrapErrorMessage);
+            CrashUtils.sendCrashReportNotification(activity, LOG_TAG, "## Bootstrap Error\n\n" + bootstrapErrorMessage, true, true);
             MessageDialogUtils.exitAppWithErrorMessage(activity,
                 activity.getString(R.string.bootstrap_error_title),
                 bootstrapErrorMessage);
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c5133bb2e0..2ec1304fa1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -31,7 +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>
 
 
 
diff --git a/termux-shared/src/main/java/com/termux/shared/file/TermuxFileUtils.java b/termux-shared/src/main/java/com/termux/shared/file/TermuxFileUtils.java
index 7748a6bc86..f2ac1dce76 100644
--- a/termux-shared/src/main/java/com/termux/shared/file/TermuxFileUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/file/TermuxFileUtils.java
@@ -1,7 +1,10 @@
 package com.termux.shared.file;
 
+import android.content.Context;
 import android.os.Environment;
 
+import androidx.annotation.NonNull;
+
 import com.termux.shared.models.errors.Error;
 import com.termux.shared.termux.TermuxConstants;
 
@@ -9,6 +12,7 @@
 import java.util.regex.Pattern;
 
 public class TermuxFileUtils {
+
     /**
      * Replace "$PREFIX/" or "~/" prefix with termux absolute paths.
      *
@@ -120,4 +124,41 @@ public static Error validateDirectoryFileExistenceAndPermissions(String label, f
             ignoreErrorsIfPathIsInParentDirPath, ignoreIfNotExecutable);
     }
 
+    /**
+     * Validate the existence and permissions of {@link TermuxConstants#TERMUX_FILES_DIR_PATH}.
+     *
+     * The directory will not be created manually but by calling {@link Context#getFilesDir()}
+     * so that android itself creates it. The `/data/data/[package_name]` directory cannot be
+     * created by an app itself. Note that the path returned by {@link Context#getFilesDir()} will
+     * be under `/data/user/[id]/[package_name]` instead of `/data/data/[package_name]`
+     * defined by default by {@link TermuxConstants#TERMUX_FILES_DIR_PATH}, where id will be 0 for
+     * primary user and a higher number for other users/profiles. If app is running under work profile
+     * or secondary user, then {@link TermuxConstants#TERMUX_FILES_DIR_PATH} will not be accessible
+     * and will not be automatically created, unless there is a bind mount from `/data/user/[id]`
+     * to `/data/data`, ideally in the right namespace.
+     *
+     * The permissions set to directory will be {@link FileUtils#APP_WORKING_DIRECTORY_PERMISSIONS}.
+     *
+     * https://source.android.com/devices/tech/admin/multi-user
+     *
+     * @param context The {@link Context} for operations.
+     * @param createDirectoryIfMissing The {@code boolean} that decides if directory file
+     *                                 should be created if its missing.
+     * @param setMissingPermissions The {@code boolean} that decides if permissions are to be
+     *                              automatically set.
+     * @return Returns the {@code error} if path is not a directory file, failed to create it,
+     * or validating permissions failed, otherwise {@code null}.
+     */
+    public static Error isTermuxFilesDirectoryAccessible(@NonNull final Context context, boolean createDirectoryIfMissing, boolean setMissingPermissions) {
+        if (createDirectoryIfMissing)
+            context.getFilesDir();
+
+        if (setMissingPermissions)
+            FileUtils.setMissingFilePermissions("Termux files directory", TermuxConstants.TERMUX_FILES_DIR_PATH,
+                FileUtils.APP_WORKING_DIRECTORY_PERMISSIONS);
+
+        return FileUtils.checkMissingFilePermissions("Termux files directory", TermuxConstants.TERMUX_FILES_DIR_PATH,
+            FileUtils.APP_WORKING_DIRECTORY_PERMISSIONS, false);
+    }
+
 }
diff --git a/termux-shared/src/main/java/com/termux/shared/packages/PackageUtils.java b/termux-shared/src/main/java/com/termux/shared/packages/PackageUtils.java
index 0ef2666409..dbd27155c7 100644
--- a/termux-shared/src/main/java/com/termux/shared/packages/PackageUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/packages/PackageUtils.java
@@ -1,9 +1,12 @@
 package com.termux.shared.packages;
 
+import android.app.admin.DevicePolicyManager;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
+import android.os.UserManager;
 
 import androidx.annotation.NonNull;
 
@@ -14,6 +17,7 @@
 import com.termux.shared.termux.TermuxConstants;
 
 import java.security.MessageDigest;
+import java.util.List;
 
 import javax.annotation.Nullable;
 
@@ -163,7 +167,7 @@ public static String getVersionNameForPackage(@NonNull final Context context) {
      * Get the {@code SHA-256 digest} of signing certificate for the package associated with the {@code context}.
      *
      * @param context The {@link Context} for the package.
-     * @return Returns the{@code SHA-256 digest}. This will be {@code null} if an exception is raised.
+     * @return Returns the {@code SHA-256 digest}. This will be {@code null} if an exception is raised.
      */
     @Nullable
     public static String getSigningCertificateSHA256DigestForPackage(@NonNull final Context context) {
@@ -184,4 +188,53 @@ public static String getSigningCertificateSHA256DigestForPackage(@NonNull final
         }
     }
 
+
+
+    /**
+     * Get the serial number for the current user.
+     *
+     * @param context The {@link Context} for operations.
+     * @return Returns the serial number. This will be {@code null} if failed to get it.
+     */
+    @Nullable
+    public static Long getSerialNumberForCurrentUser(@NonNull Context context) {
+        UserManager userManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
+        if (userManager == null) return null;
+        return userManager.getSerialNumberForUser(android.os.Process.myUserHandle());
+    }
+
+    /**
+     * Check if the current user is the primary user. This is done by checking if the the serial
+     * number for the current user equals 0.
+     *
+     * @param context The {@link Context} for operations.
+     * @return Returns {@code true} if the current user is the primary user, otherwise [@code false}.
+     */
+    public static boolean isCurrentUserThePrimaryUser(@NonNull Context context) {
+        Long userId = getSerialNumberForCurrentUser(context);
+        return userId != null && userId == 0;
+    }
+
+    /**
+     * Get the profile owner package name for the current user.
+     *
+     * @param context The {@link Context} for operations.
+     * @return Returns the profile owner package name. This will be {@code null} if failed to get it
+     * or no profile owner for the current user.
+     */
+    @Nullable
+    public static String getProfileOwnerPackageNameForUser(@NonNull Context context) {
+        DevicePolicyManager devicePolicyManager = (DevicePolicyManager) context.getSystemService(Context.DEVICE_POLICY_SERVICE);
+        if (devicePolicyManager == null) return null;
+        List<ComponentName> activeAdmins = devicePolicyManager.getActiveAdmins();
+        if (activeAdmins != null){
+            for (ComponentName admin:activeAdmins){
+                String packageName = admin.getPackageName();
+                if(devicePolicyManager.isProfileOwnerApp(packageName))
+                    return packageName;
+            }
+        }
+        return null;
+    }
+
 }
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/AndroidUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/AndroidUtils.java
index 698d2c2867..418f7d85aa 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/AndroidUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/AndroidUtils.java
@@ -40,6 +40,17 @@ public static String getAppInfoMarkdownString(@NonNull final Context context) {
         AndroidUtils.appendPropertyToMarkdown(markdownString,"TARGET_SDK", PackageUtils.getTargetSDKForPackage(context));
         AndroidUtils.appendPropertyToMarkdown(markdownString,"IS_DEBUG_BUILD", PackageUtils.isAppForPackageADebugBuild(context));
 
+        String filesDir = context.getFilesDir().getAbsolutePath();
+        if (!filesDir.equals("/data/user/0/" + context.getPackageName() + "/files") &&
+            !filesDir.equals("/data/data/" + context.getPackageName() + "/files"))
+        AndroidUtils.appendPropertyToMarkdown(markdownString,"FILES_DIR", filesDir);
+
+        Long userId = PackageUtils.getSerialNumberForCurrentUser(context);
+        if (userId == null || userId != 0)
+            AndroidUtils.appendPropertyToMarkdown(markdownString,"USER_ID", userId);
+
+        AndroidUtils.appendPropertyToMarkdownIfSet(markdownString,"PROFILE_OWNER", PackageUtils.getProfileOwnerPackageNameForUser(context));
+
         return markdownString.toString();
     }
 
@@ -139,7 +150,7 @@ public static Properties getSystemProperties() {
         return systemProperties;
     }
 
-    private static String getSystemPropertyWithAndroidAPI(@NonNull String property) {
+    public static String getSystemPropertyWithAndroidAPI(@NonNull String property) {
         try {
             return System.getProperty(property);
         } catch (Exception e) {
@@ -148,17 +159,17 @@ private static String getSystemPropertyWithAndroidAPI(@NonNull String property)
         }
     }
 
-    private static void appendPropertyToMarkdownIfSet(StringBuilder markdownString, String label, Object value) {
+    public static void appendPropertyToMarkdownIfSet(StringBuilder markdownString, String label, Object value) {
         if (value == null) return;
         if (value instanceof String && (((String) value).isEmpty()) || "REL".equals(value)) return;
         markdownString.append("\n").append(getPropertyMarkdown(label, value));
     }
 
-    static void appendPropertyToMarkdown(StringBuilder markdownString, String label, Object value) {
+    public static void appendPropertyToMarkdown(StringBuilder markdownString, String label, Object value) {
         markdownString.append("\n").append(getPropertyMarkdown(label, value));
     }
 
-    private static String getPropertyMarkdown(String label, Object value) {
+    public static String getPropertyMarkdown(String label, Object value) {
         return MarkdownUtils.getSingleLineMarkdownStringEntry(label, value, "-");
     }
 
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
index 3eeb584eca..ba623bc279 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
@@ -8,9 +8,11 @@
 import androidx.annotation.NonNull;
 
 import com.termux.shared.R;
+import com.termux.shared.file.TermuxFileUtils;
 import com.termux.shared.logger.Logger;
 import com.termux.shared.markdown.MarkdownUtils;
 import com.termux.shared.models.ExecutionCommand;
+import com.termux.shared.models.errors.Error;
 import com.termux.shared.packages.PackageUtils;
 import com.termux.shared.shell.TermuxShellEnvironmentClient;
 import com.termux.shared.shell.TermuxTask;
@@ -210,6 +212,13 @@ public static String getAppInfoMarkdownStringInner(@NonNull final Context contex
 
         markdownString.append((AndroidUtils.getAppInfoMarkdownString(context)));
 
+        Error error;
+        error = TermuxFileUtils.isTermuxFilesDirectoryAccessible(context, true, true);
+        if (error != null) {
+            AndroidUtils.appendPropertyToMarkdown(markdownString, "TERMUX_FILES_DIR", TermuxConstants.TERMUX_FILES_DIR_PATH);
+            AndroidUtils.appendPropertyToMarkdown(markdownString, "IS_TERMUX_FILES_DIR_ACCESSIBLE", "false - " + Error.getMinimalErrorString(error));
+        }
+
         String signingCertificateSHA256Digest = PackageUtils.getSigningCertificateSHA256DigestForPackage(context);
         if (signingCertificateSHA256Digest != null) {
             AndroidUtils.appendPropertyToMarkdown(markdownString,"APK_RELEASE", getAPKRelease(signingCertificateSHA256Digest));

From 1b62f7c9a9831a7e6d96dac9565c9d0c4767a5b6 Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Sat, 10 Jul 2021 18:25:50 +0300
Subject: [PATCH 476/912] installer: fix permissions for lib/apt/apt-helper

It should have executable bit set, otherwise it won't be possible to use tools such as 'apt-file' without reinstalling 'apt'.
---
 app/src/main/java/com/termux/app/TermuxInstaller.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/termux/app/TermuxInstaller.java b/app/src/main/java/com/termux/app/TermuxInstaller.java
index 2789fbf43b..032c06ddc8 100644
--- a/app/src/main/java/com/termux/app/TermuxInstaller.java
+++ b/app/src/main/java/com/termux/app/TermuxInstaller.java
@@ -171,7 +171,8 @@ public void run() {
                                         while ((readBytes = zipInput.read(buffer)) != -1)
                                             outStream.write(buffer, 0, readBytes);
                                     }
-                                    if (zipEntryName.startsWith("bin/") || zipEntryName.startsWith("libexec") || zipEntryName.startsWith("lib/apt/methods")) {
+                                    if (zipEntryName.startsWith("bin/") || zipEntryName.startsWith("libexec") ||
+                                        zipEntryName.startsWith("lib/apt/apt-helper") || zipEntryName.startsWith("lib/apt/methods")) {
                                         //noinspection OctalInteger
                                         Os.chmod(targetFile.getAbsolutePath(), 0700);
                                     }

From 0308d6a6ca747c5f87ca700982b1faa215234619 Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Sun, 11 Jul 2021 18:13:32 +0300
Subject: [PATCH 477/912] extra keys: avoid scheduled executor leak

Under certain cases scheduled executor may leak causing repeatable input to
stuck.

Issue: https://github.com/termux/termux-app/issues/2156
---
 .../com/termux/app/terminal/io/extrakeys/ExtraKeysView.java   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/src/main/java/com/termux/app/terminal/io/extrakeys/ExtraKeysView.java b/app/src/main/java/com/termux/app/terminal/io/extrakeys/ExtraKeysView.java
index 31afa07fed..66f3008b97 100644
--- a/app/src/main/java/com/termux/app/terminal/io/extrakeys/ExtraKeysView.java
+++ b/app/src/main/java/com/termux/app/terminal/io/extrakeys/ExtraKeysView.java
@@ -302,6 +302,10 @@ public void reload(ExtraKeysInfo infos) {
                         case MotionEvent.ACTION_DOWN:
                             longPressCount = 0;
                             v.setBackgroundColor(BUTTON_PRESSED_COLOR);
+                            if (scheduledExecutor != null) {
+                                scheduledExecutor.shutdownNow();
+                                scheduledExecutor = null;
+                            }
                             if (Arrays.asList("UP", "DOWN", "LEFT", "RIGHT", "BKSP", "DEL").contains(buttonInfo.getKey())) {
                                 // autorepeat
                                 scheduledExecutor = Executors.newSingleThreadScheduledExecutor();

From a189f63604f922c25711dbf2a9dbef26069ba774 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 14 Jul 2021 13:37:25 +0500
Subject: [PATCH 478/912] Ensure failsafe session can still be opened if files
 directory is not accessible and fix comment

The `/data/data/com.termux` directory will not be created if it did not already exist and android did not already create it instead of as mentioned in 6fa4b9b7. Check https://github.com/termux/termux-app/issues/2168#issuecomment-879705552
---
 app/src/main/java/com/termux/app/TermuxInstaller.java    | 8 ++++----
 .../java/com/termux/shared/file/TermuxFileUtils.java     | 9 +++++++--
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxInstaller.java b/app/src/main/java/com/termux/app/TermuxInstaller.java
index 032c06ddc8..7bc9a95764 100644
--- a/app/src/main/java/com/termux/app/TermuxInstaller.java
+++ b/app/src/main/java/com/termux/app/TermuxInstaller.java
@@ -58,8 +58,8 @@ static void setupBootstrapIfNeeded(final Activity activity, final Runnable whenD
         String bootstrapErrorMessage;
         Error filesDirectoryAccessibleError;
 
-        // This will also call Context.getFilesDir(), which should ensure that TERMUX_INTERNAL_PRIVATE_APP_DATA_DIR_PATH
-        // is created if it does not already exist, like if it was not already created by android
+        // This will also call Context.getFilesDir(), which should ensure that TERMUX_FILES_DIR_PATH
+        // is created if it does not already exist
         filesDirectoryAccessibleError = TermuxFileUtils.isTermuxFilesDirectoryAccessible(activity, true, true);
         boolean isFilesDirectoryAccessible = filesDirectoryAccessibleError == null;
 
@@ -79,9 +79,9 @@ static void setupBootstrapIfNeeded(final Activity activity, final Runnable whenD
             bootstrapErrorMessage = Error.getMinimalErrorString(filesDirectoryAccessibleError) + "\nTERMUX_FILES_DIR: " + MarkdownUtils.getMarkdownCodeForString(TermuxConstants.TERMUX_FILES_DIR_PATH, false);
             Logger.logError(LOG_TAG, bootstrapErrorMessage);
             CrashUtils.sendCrashReportNotification(activity, LOG_TAG, "## Bootstrap Error\n\n" + bootstrapErrorMessage, true, true);
-            MessageDialogUtils.exitAppWithErrorMessage(activity,
+            MessageDialogUtils.showMessage(activity,
                 activity.getString(R.string.bootstrap_error_title),
-                bootstrapErrorMessage);
+                bootstrapErrorMessage, null);
             return;
         }
 
diff --git a/termux-shared/src/main/java/com/termux/shared/file/TermuxFileUtils.java b/termux-shared/src/main/java/com/termux/shared/file/TermuxFileUtils.java
index f2ac1dce76..5b06725e33 100644
--- a/termux-shared/src/main/java/com/termux/shared/file/TermuxFileUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/file/TermuxFileUtils.java
@@ -128,8 +128,13 @@ public static Error validateDirectoryFileExistenceAndPermissions(String label, f
      * Validate the existence and permissions of {@link TermuxConstants#TERMUX_FILES_DIR_PATH}.
      *
      * The directory will not be created manually but by calling {@link Context#getFilesDir()}
-     * so that android itself creates it. The `/data/data/[package_name]` directory cannot be
-     * created by an app itself. Note that the path returned by {@link Context#getFilesDir()} will
+     * so that android itself creates it. However, the call will not create its parent package
+     * data directory `/data/user/0/[package_name]` if it does not already exist and a `logcat`
+     * error will be logged by android.
+     * {@code Failed to ensure /data/user/0/<package_name>/files: mkdir failed: ENOENT (No such file or directory)}
+     * An android app likely can't create the package data directory since its parent `/data/user/0`
+     * is owned by `system` user and is normally create at app install or update time and not at app startup.
+     * Note that the path returned by {@link Context#getFilesDir()} will
      * be under `/data/user/[id]/[package_name]` instead of `/data/data/[package_name]`
      * defined by default by {@link TermuxConstants#TERMUX_FILES_DIR_PATH}, where id will be 0 for
      * primary user and a higher number for other users/profiles. If app is running under work profile

From f4e70678b1835a4c183a88569146ae76ee8af318 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 14 Jul 2021 17:39:05 +0500
Subject: [PATCH 479/912] Ensure that markdown code formatting is not broken
 for ResultSender if data itself contains any backticks

---
 .../com/termux/shared/shell/ResultSender.java | 19 ++++++++++++++----
 .../termux/shared/termux/TermuxConstants.java | 20 +++++++++++++------
 2 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/shell/ResultSender.java b/termux-shared/src/main/java/com/termux/shared/shell/ResultSender.java
index 6e19958af9..bac25bd683 100644
--- a/termux-shared/src/main/java/com/termux/shared/shell/ResultSender.java
+++ b/termux-shared/src/main/java/com/termux/shared/shell/ResultSender.java
@@ -8,6 +8,7 @@
 
 import com.termux.shared.R;
 import com.termux.shared.data.DataUtils;
+import com.termux.shared.markdown.MarkdownUtils;
 import com.termux.shared.models.errors.Error;
 import com.termux.shared.file.FileUtils;
 import com.termux.shared.logger.Logger;
@@ -206,7 +207,11 @@ public static Error sendCommandResultDataToDirectory(Context context, String log
                 try {
                     if (DataUtils.isNullOrEmpty(resultConfig.resultFileErrorFormat)) {
                         error_or_output = String.format(RESULT_SENDER.FORMAT_FAILED_ERR__ERRMSG__STDOUT__STDERR__EXIT_CODE,
-                            resultData.getErrCode(), resultDataErrmsg, resultDataStdout, resultDataStderr, resultDataExitCode);
+                            MarkdownUtils.getMarkdownCodeForString(String.valueOf(resultData.getErrCode()), false),
+                            MarkdownUtils.getMarkdownCodeForString(resultDataErrmsg, true),
+                            MarkdownUtils.getMarkdownCodeForString(resultDataStdout, true),
+                            MarkdownUtils.getMarkdownCodeForString(resultDataStderr, true),
+                            MarkdownUtils.getMarkdownCodeForString(resultDataExitCode, false));
                     } else {
                         error_or_output = String.format(resultConfig.resultFileErrorFormat,
                             resultData.getErrCode(), resultDataErrmsg, resultDataStdout, resultDataStderr, resultDataExitCode);
@@ -221,11 +226,17 @@ public static Error sendCommandResultDataToDirectory(Context context, String log
                         if (resultDataStderr.isEmpty() && resultDataExitCode.equals("0"))
                             error_or_output = String.format(RESULT_SENDER.FORMAT_SUCCESS_STDOUT, resultDataStdout);
                         else if (resultDataStderr.isEmpty())
-                            error_or_output = String.format(RESULT_SENDER.FORMAT_SUCCESS_STDOUT__EXIT_CODE, resultDataStdout, resultDataExitCode);
+                            error_or_output = String.format(RESULT_SENDER.FORMAT_SUCCESS_STDOUT__EXIT_CODE,
+                                resultDataStdout,
+                                MarkdownUtils.getMarkdownCodeForString(resultDataExitCode, false));
                         else
-                            error_or_output = String.format(RESULT_SENDER.FORMAT_SUCCESS_STDOUT__STDERR__EXIT_CODE, resultDataStdout, resultDataStderr, resultDataExitCode);
+                            error_or_output = String.format(RESULT_SENDER.FORMAT_SUCCESS_STDOUT__STDERR__EXIT_CODE,
+                                MarkdownUtils.getMarkdownCodeForString(resultDataStdout, true),
+                                MarkdownUtils.getMarkdownCodeForString(resultDataStderr, true),
+                                MarkdownUtils.getMarkdownCodeForString(resultDataExitCode, false));
                     } else {
-                        error_or_output = String.format(resultConfig.resultFileOutputFormat, resultDataStdout, resultDataStderr, resultDataExitCode);
+                        error_or_output = String.format(resultConfig.resultFileOutputFormat,
+                            resultDataStdout, resultDataStderr, resultDataExitCode);
                     }
                 } catch (Exception e) {
                     error = ResultSenderErrno.ERROR_FORMAT_RESULT_OUTPUT_FAILED_WITH_EXCEPTION.getError(e.getMessage());
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
index e7985a1484..fe531a86a3 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
@@ -996,14 +996,18 @@ public static final class RESULT_SENDER {
         /** The {@link Formatter} format string for success if `stdout` and `exit_code` need to be written to
          * {@link ResultConfig#resultFileBasename} where `stdout` maps to `%1$s` and `exit_code` to `%2$s`.
          * This is used when `err` equals {@link Errno#ERRNO_SUCCESS} (-1) and `stderr` is empty
-         * and `exit_code` does not equal `0` and {@link ResultConfig#resultFileOutputFormat} is not passed. */
-        public static final String FORMAT_SUCCESS_STDOUT__EXIT_CODE = "%1$s%n%n%n%nexit_code=`%2$s`%n";
+         * and `exit_code` does not equal `0` and {@link ResultConfig#resultFileOutputFormat} is not passed.
+         * The exit code will be placed in a markdown inline code. */
+        public static final String FORMAT_SUCCESS_STDOUT__EXIT_CODE = "%1$s%n%n%n%nexit_code=%2$s%n";
         /** The {@link Formatter} format string for success if `stdout`, `stderr` and `exit_code` need to be
          * written to {@link ResultConfig#resultFileBasename} where `stdout` maps to `%1$s`, `stderr`
          * maps to `%2$s` and `exit_code` to `%3$s`.
          * This is used when `err` equals {@link Errno#ERRNO_SUCCESS} (-1) and `stderr` is not empty
-         * and {@link ResultConfig#resultFileOutputFormat} is not passed. */
-        public static final String FORMAT_SUCCESS_STDOUT__STDERR__EXIT_CODE = "stdout=%n```%n%1$s%n```%n%n%n%nstderr=%n```%n%2$s%n```%n%n%n%nexit_code=`%3$s`%n";
+         * and {@link ResultConfig#resultFileOutputFormat} is not passed.
+         * The stdout and stderr will be placed in a markdown code block. The exit code will be placed
+         * in a markdown inline code. The surrounding backticks will be 3 more than the consecutive
+         * backticks in any parameter itself for code blocks. */
+        public static final String FORMAT_SUCCESS_STDOUT__STDERR__EXIT_CODE = "stdout=%n%1$s%n%n%n%nstderr=%n%2$s%n%n%n%nexit_code=%3$s%n";
         /** The {@link Formatter} format string for failure if `err`, `errmsg`(`error`), `stdout`,
          * `stderr` and `exit_code` need to be written to {@link ResultConfig#resultFileBasename} where
          * `err` maps to `%1$s`, `errmsg` maps to `%2$s`, `stdout` maps
@@ -1011,8 +1015,12 @@ public static final class RESULT_SENDER {
          * Do not define an argument greater than `5`, like `%6$s` if you change this value since it will
          * raise {@link IllegalFormatException}.
          * This is used when `err` does not equal {@link Errno#ERRNO_SUCCESS} (-1) and
-         * {@link ResultConfig#resultFileErrorFormat} is not passed. */
-        public static final String FORMAT_FAILED_ERR__ERRMSG__STDOUT__STDERR__EXIT_CODE = "err=`%1$s`%n%n%n%nerrmsg=%n```%n%2$s%n```%n%n%n%nstdout=%n```%n%3$s%n```%n%n%n%nstderr=%n```%n%4$s%n```%n%n%n%nexit_code=`%5$s`%n";
+         * {@link ResultConfig#resultFileErrorFormat} is not passed.
+         * The errmsg, stdout and stderr will be placed in a markdown code block. The err and exit code
+         * will be placed in a markdown inline code. The surrounding backticks will be 3 more than
+         * the consecutive backticks in any parameter itself for code blocks. The stdout, stderr
+         * and exit code may be empty without any surrounding backticks if not set. */
+        public static final String FORMAT_FAILED_ERR__ERRMSG__STDOUT__STDERR__EXIT_CODE = "err=%1$s%n%n%n%nerrmsg=%n%2$s%n%n%n%nstdout=%n%3$s%n%n%n%nstderr=%n%4$s%n%n%n%nexit_code=%5$s%n";
 
 
 

From f837ddef23e4f8ecb802586165566ced977b4339 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Fri, 16 Jul 2021 14:40:22 +0500
Subject: [PATCH 480/912] Bump gradle to 4.2.2

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index e49d003ac8..aa0981015d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.1'
+        classpath 'com.android.tools.build:gradle:4.2.2'
     }
 }
 

From f10de462d288a52c93a4938e5eaf0cf70ed3922d Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Fri, 16 Jul 2021 14:42:15 +0500
Subject: [PATCH 481/912] Fix app packaging warning

PackagingOptions.jniLibs.useLegacyPackaging should be set to true because android:extractNativeLibs is set to "true" in AndroidManifest.xml.

https://monitor.f-droid.org/builds/log/com.termux/117
---
 app/build.gradle | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/build.gradle b/app/build.gradle
index 60c0514d03..a7121ee5cc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -95,6 +95,13 @@ android {
             includeAndroidResources = true
         }
     }
+
+    packagingOptions {
+        jniLibs {
+            useLegacyPackaging true
+        }
+    }
+
 }
 
 dependencies {

From 00d80b9e026fab217b602b0d9a79a306f4a752d4 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Fri, 16 Jul 2021 17:08:26 +0500
Subject: [PATCH 482/912] Automatically attach debug APKs when a release is
 created

---
 .../attach_debug_apks_to_release.yml          | 36 +++++++++++++++++++
 .github/workflows/debug_build.yml             | 10 +++---
 app/build.gradle                              | 24 +++++++++----
 3 files changed, 58 insertions(+), 12 deletions(-)
 create mode 100644 .github/workflows/attach_debug_apks_to_release.yml

diff --git a/.github/workflows/attach_debug_apks_to_release.yml b/.github/workflows/attach_debug_apks_to_release.yml
new file mode 100644
index 0000000000..358808181a
--- /dev/null
+++ b/.github/workflows/attach_debug_apks_to_release.yml
@@ -0,0 +1,36 @@
+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
diff --git a/.github/workflows/debug_build.yml b/.github/workflows/debug_build.yml
index e1ea5e58f6..cc3051f0fc 100644
--- a/.github/workflows/debug_build.yml
+++ b/.github/workflows/debug_build.yml
@@ -24,33 +24,33 @@ jobs:
       with:
         name: termux-app-universal
         path: |
-            ./app/build/outputs/apk/debug/app-universal-debug.apk
+            ./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/app-arm64-v8a-debug.apk
+          ./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/app-armeabi-v7a-debug.apk
+          ./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/app-x86_64-debug.apk
+          ./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/app-x86-debug.apk
+          ./app/build/outputs/apk/debug/termux-app-x86-debug.apk
           ./app/build/outputs/apk/debug/output-metadata.json
diff --git a/app/build.gradle b/app/build.gradle
index a7121ee5cc..651e1a27f1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "com.android.application"
+    id "com.android.application"
 }
 
 android {
@@ -102,6 +102,16 @@ android {
         }
     }
 
+    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 {
@@ -110,9 +120,9 @@ dependencies {
 }
 
 task versionName {
-  doLast {
-    print android.defaultConfig.versionName
-  }
+    doLast {
+        print android.defaultConfig.versionName
+    }
 }
 
 def downloadBootstrap(String arch, String expectedChecksum, String version) {
@@ -175,7 +185,7 @@ task downloadBootstraps() {
 }
 
 afterEvaluate {
-  android.applicationVariants.all { variant ->
-    variant.javaCompileProvider.get().dependsOn(downloadBootstraps)
-  }
+    android.applicationVariants.all { variant ->
+        variant.javaCompileProvider.get().dependsOn(downloadBootstraps)
+    }
 }

From 7d76e8b18565c124cab7dffb8d01be2329e99d89 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Mon, 19 Jul 2021 17:52:11 +0500
Subject: [PATCH 483/912] Add `PASTE` extra key for pasting text from clipboard

---
 .../app/terminal/TermuxTerminalSessionClient.java  | 14 +++++++++++++-
 .../app/terminal/io/TerminalToolbarViewPager.java  |  1 +
 .../app/terminal/io/extrakeys/ExtraKeysInfo.java   |  2 ++
 .../app/terminal/io/extrakeys/ExtraKeysView.java   |  9 +++++++++
 .../java/com/termux/terminal/TerminalEmulator.java |  2 +-
 .../java/com/termux/terminal/TerminalOutput.java   |  7 +++++--
 .../java/com/termux/terminal/TerminalSession.java  |  9 +++++++--
 .../com/termux/terminal/TerminalSessionClient.java |  4 +++-
 .../java/com/termux/terminal/TerminalTestCase.java |  6 +++++-
 .../TextSelectionCursorController.java             |  9 ++-------
 .../terminal/TermuxTerminalSessionClientBase.java  |  6 +++++-
 11 files changed, 53 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java
index e80290d559..f023dd7356 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java
@@ -162,13 +162,25 @@ public void onSessionFinished(final TerminalSession finishedSession) {
     }
 
     @Override
-    public void onClipboardText(TerminalSession session, String text) {
+    public void onCopyTextToClipboard(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;
diff --git a/app/src/main/java/com/termux/app/terminal/io/TerminalToolbarViewPager.java b/app/src/main/java/com/termux/app/terminal/io/TerminalToolbarViewPager.java
index 5e7adfb891..dc306852b2 100644
--- a/app/src/main/java/com/termux/app/terminal/io/TerminalToolbarViewPager.java
+++ b/app/src/main/java/com/termux/app/terminal/io/TerminalToolbarViewPager.java
@@ -45,6 +45,7 @@ public Object instantiateItem(@NonNull ViewGroup collection, int position) {
                 layout = inflater.inflate(R.layout.view_terminal_toolbar_extra_keys, collection, false);
                 ExtraKeysView extraKeysView = (ExtraKeysView) layout;
                 extraKeysView.setTermuxTerminalViewClient(mActivity.getTermuxTerminalViewClient());
+                extraKeysView.setTermuxTerminalSessionClient(mActivity.getTermuxTerminalSessionClient());
                 mActivity.setExtraKeysView(extraKeysView);
                 extraKeysView.reload(mActivity.getProperties().getExtraKeysInfo());
 
diff --git a/app/src/main/java/com/termux/app/terminal/io/extrakeys/ExtraKeysInfo.java b/app/src/main/java/com/termux/app/terminal/io/extrakeys/ExtraKeysInfo.java
index 98cc6afc4e..61f56b2969 100644
--- a/app/src/main/java/com/termux/app/terminal/io/extrakeys/ExtraKeysInfo.java
+++ b/app/src/main/java/com/termux/app/terminal/io/extrakeys/ExtraKeysInfo.java
@@ -116,6 +116,8 @@ static class CharDisplayMap extends CleverMap<String, String> {}
         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
+        //put("PASTE", "📋"); // U+2328 ⌨ KEYBOARD not well known but easy to understand
+        put("PASTE", "⎘"); // U+2328 ⌨ KEYBOARD not well known but easy to understand
     }};
 
     static final CharDisplayMap lessKnownCharactersDisplay = new CharDisplayMap() {{
diff --git a/app/src/main/java/com/termux/app/terminal/io/extrakeys/ExtraKeysView.java b/app/src/main/java/com/termux/app/terminal/io/extrakeys/ExtraKeysView.java
index 66f3008b97..79aceaa17d 100644
--- a/app/src/main/java/com/termux/app/terminal/io/extrakeys/ExtraKeysView.java
+++ b/app/src/main/java/com/termux/app/terminal/io/extrakeys/ExtraKeysView.java
@@ -28,6 +28,7 @@
 import android.widget.PopupWindow;
 
 import com.termux.R;
+import com.termux.app.terminal.TermuxTerminalSessionClient;
 import com.termux.app.terminal.TermuxTerminalViewClient;
 import com.termux.view.TerminalView;
 
@@ -45,6 +46,7 @@ public final class ExtraKeysView extends GridLayout {
     private static final int BUTTON_PRESSED_COLOR = 0xFF7F7F7F;
 
     TermuxTerminalViewClient mTermuxTerminalViewClient;
+    TermuxTerminalSessionClient mTermuxTerminalSessionClient;
 
     public ExtraKeysView(Context context, AttributeSet attrs) {
         super(context, attrs);
@@ -89,6 +91,9 @@ private void sendKey(View view, String keyName, boolean forceCtrlDown, boolean f
         } else if ("DRAWER".equals(keyName)) {
             DrawerLayout drawer = view.findViewById(R.id.drawer_layout);
             drawer.openDrawer(Gravity.LEFT);
+        } else if ("PASTE".equals(keyName)) {
+            if(mTermuxTerminalSessionClient != null)
+                mTermuxTerminalSessionClient.onPasteTextFromClipboard(null);
         } else if (keyCodesForString.containsKey(keyName)) {
             Integer keyCode = keyCodesForString.get(keyName);
             if (keyCode == null) return;
@@ -389,4 +394,8 @@ public void setTermuxTerminalViewClient(TermuxTerminalViewClient termuxTerminalV
         this.mTermuxTerminalViewClient = termuxTerminalViewClient;
     }
 
+    public void setTermuxTerminalSessionClient(TermuxTerminalSessionClient termuxTerminalSessionClient) {
+        this.mTermuxTerminalSessionClient = termuxTerminalSessionClient;
+    }
+
 }
diff --git a/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java b/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
index 1bd5adc536..bf95aafd6f 100644
--- a/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
+++ b/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
@@ -1980,7 +1980,7 @@ private void doOscSetTextParameters(String bellOrStringTerminator) {
                 int startIndex = textParameter.indexOf(";") + 1;
                 try {
                     String clipboardText = new String(Base64.decode(textParameter.substring(startIndex), 0), StandardCharsets.UTF_8);
-                    mSession.clipboardText(clipboardText);
+                    mSession.onCopyTextToClipboard(clipboardText);
                 } catch (Exception e) {
                     mClient.logError(LOG_TAG, "OSC Manipulate selection, invalid string '" + textParameter + "");
                 }
diff --git a/terminal-emulator/src/main/java/com/termux/terminal/TerminalOutput.java b/terminal-emulator/src/main/java/com/termux/terminal/TerminalOutput.java
index cec0282b7c..305082a52d 100644
--- a/terminal-emulator/src/main/java/com/termux/terminal/TerminalOutput.java
+++ b/terminal-emulator/src/main/java/com/termux/terminal/TerminalOutput.java
@@ -18,8 +18,11 @@ public final void write(String data) {
     /** Notify the terminal client that the terminal title has changed. */
     public abstract void titleChanged(String oldTitle, String newTitle);
 
-    /** Notify the terminal client that the terminal title has changed. */
-    public abstract void clipboardText(String text);
+    /** 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 a bell character (ASCII 7, bell, BEL, \a, ^G)) has been received. */
     public abstract void onBell();
diff --git a/terminal-emulator/src/main/java/com/termux/terminal/TerminalSession.java b/terminal-emulator/src/main/java/com/termux/terminal/TerminalSession.java
index 3770827987..47ea853309 100644
--- a/terminal-emulator/src/main/java/com/termux/terminal/TerminalSession.java
+++ b/terminal-emulator/src/main/java/com/termux/terminal/TerminalSession.java
@@ -269,8 +269,13 @@ public synchronized int getExitStatus() {
     }
 
     @Override
-    public void clipboardText(String text) {
-        mClient.onClipboardText(this, text);
+    public void onCopyTextToClipboard(String text) {
+        mClient.onCopyTextToClipboard(this, text);
+    }
+
+    @Override
+    public void onPasteTextFromClipboard() {
+        mClient.onPasteTextFromClipboard(this);
     }
 
     @Override
diff --git a/terminal-emulator/src/main/java/com/termux/terminal/TerminalSessionClient.java b/terminal-emulator/src/main/java/com/termux/terminal/TerminalSessionClient.java
index f8d83d061e..0ffe8e431e 100644
--- a/terminal-emulator/src/main/java/com/termux/terminal/TerminalSessionClient.java
+++ b/terminal-emulator/src/main/java/com/termux/terminal/TerminalSessionClient.java
@@ -13,7 +13,9 @@ public interface TerminalSessionClient {
 
     void onSessionFinished(TerminalSession finishedSession);
 
-    void onClipboardText(TerminalSession session, String text);
+    void onCopyTextToClipboard(TerminalSession session, String text);
+
+    void onPasteTextFromClipboard(TerminalSession session);
 
     void onBell(TerminalSession session);
 
diff --git a/terminal-emulator/src/test/java/com/termux/terminal/TerminalTestCase.java b/terminal-emulator/src/test/java/com/termux/terminal/TerminalTestCase.java
index 9fc1685795..eb1da8c094 100644
--- a/terminal-emulator/src/test/java/com/termux/terminal/TerminalTestCase.java
+++ b/terminal-emulator/src/test/java/com/termux/terminal/TerminalTestCase.java
@@ -37,10 +37,14 @@ public void titleChanged(String oldTitle, String newTitle) {
 		}
 
 		@Override
-		public void clipboardText(String text) {
+		public void onCopyTextToClipboard(String text) {
 			clipboardPuts.add(text);
 		}
 
+        @Override
+        public void onPasteTextFromClipboard() {
+        }
+
 		@Override
 		public void onBell() {
 			bellsRung++;
diff --git a/terminal-view/src/main/java/com/termux/view/textselection/TextSelectionCursorController.java b/terminal-view/src/main/java/com/termux/view/textselection/TextSelectionCursorController.java
index 8ff36b7fe8..954bf84c14 100644
--- a/terminal-view/src/main/java/com/termux/view/textselection/TextSelectionCursorController.java
+++ b/terminal-view/src/main/java/com/termux/view/textselection/TextSelectionCursorController.java
@@ -138,17 +138,12 @@ public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
                 switch (item.getItemId()) {
                     case ACTION_COPY:
                         String selectedText = terminalView.mEmulator.getSelectedText(mSelX1, mSelY1, mSelX2, mSelY2).trim();
-                        terminalView.mTermSession.clipboardText(selectedText);
+                        terminalView.mTermSession.onCopyTextToClipboard(selectedText);
                         terminalView.stopTextSelectionMode();
                         break;
                     case ACTION_PASTE:
                         terminalView.stopTextSelectionMode();
-                        ClipboardManager clipboard = (ClipboardManager) terminalView.getContext().getSystemService(Context.CLIPBOARD_SERVICE);
-                        ClipData clipData = clipboard.getPrimaryClip();
-                        if (clipData != null) {
-                            CharSequence paste = clipData.getItemAt(0).coerceToText(terminalView.getContext());
-                            if (!TextUtils.isEmpty(paste)) terminalView.mEmulator.paste(paste.toString());
-                        }
+                        terminalView.mTermSession.onPasteTextFromClipboard();
                         break;
                     case ACTION_MORE:
                         terminalView.stopTextSelectionMode(); //we stop text selection first, otherwise handles will show above popup
diff --git a/termux-shared/src/main/java/com/termux/shared/terminal/TermuxTerminalSessionClientBase.java b/termux-shared/src/main/java/com/termux/shared/terminal/TermuxTerminalSessionClientBase.java
index 6df69a723f..df6eb5fe00 100644
--- a/termux-shared/src/main/java/com/termux/shared/terminal/TermuxTerminalSessionClientBase.java
+++ b/termux-shared/src/main/java/com/termux/shared/terminal/TermuxTerminalSessionClientBase.java
@@ -22,7 +22,11 @@ public void onSessionFinished(final TerminalSession finishedSession) {
     }
 
     @Override
-    public void onClipboardText(TerminalSession session, String text) {
+    public void onCopyTextToClipboard(TerminalSession session, String text) {
+    }
+
+    @Override
+    public void onPasteTextFromClipboard(TerminalSession session) {
     }
 
     @Override

From 9febca95679c57f4bba62aa7c20551ca2a7b035c Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Mon, 19 Jul 2021 18:12:57 +0500
Subject: [PATCH 484/912] Fix comment

---
 .../com/termux/app/terminal/io/extrakeys/ExtraKeysInfo.java    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/src/main/java/com/termux/app/terminal/io/extrakeys/ExtraKeysInfo.java b/app/src/main/java/com/termux/app/terminal/io/extrakeys/ExtraKeysInfo.java
index 61f56b2969..ceaad78739 100644
--- a/app/src/main/java/com/termux/app/terminal/io/extrakeys/ExtraKeysInfo.java
+++ b/app/src/main/java/com/termux/app/terminal/io/extrakeys/ExtraKeysInfo.java
@@ -116,8 +116,7 @@ static class CharDisplayMap extends CleverMap<String, String> {}
         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
-        //put("PASTE", "📋"); // U+2328 ⌨ KEYBOARD not well known but easy to understand
-        put("PASTE", "⎘"); // U+2328 ⌨ KEYBOARD not well known but easy to understand
+        put("PASTE", "⎘"); // U+2398
     }};
 
     static final CharDisplayMap lessKnownCharactersDisplay = new CharDisplayMap() {{

From 9a306ca1c5341c3c388996bf0924d3e1c452e4d8 Mon Sep 17 00:00:00 2001
From: TotalCaesar659 <14265316+TotalCaesar659@users.noreply.github.com>
Date: Tue, 27 Jul 2021 01:44:28 +0300
Subject: [PATCH 485/912] readme: update urls to https (#2190)

---
 README.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 6a17b939a4..ac385b11fa 100644
--- a/README.md
+++ b/README.md
@@ -92,7 +92,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](http://twitter.com/termux/)
+- [Termux Twitter](https://twitter.com/termux/)
 - [Termux Reports Email](mailto:termuxreports@groups.io)
 
 ### Wikis
@@ -117,21 +117,21 @@ The main ones are the following.
 
 ### Terminal resources
 
-- [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)
+- [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)
 
 ### 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](http://www.iterm2.com/documentation.html) (which includes [iTerm2 proprietary escape codes](http://www.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](https://iterm2.com/documentation.html) (which includes [iTerm2 proprietary escape codes](https://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](http://invisible-island.net/datafiles/release/xterm.tar.gz).
+- xterm: The grandfather of terminal emulators. [Source](https://invisible-island.net/datafiles/release/xterm.tar.gz).
 
 - Connectbot: Android SSH client. [Source](https://github.com/connectbot/connectbot)
 

From 2b386efc3cbc30a4bc987165924c791bdeb52477 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <31106828+agnostic-apollo@users.noreply.github.com>
Date: Tue, 27 Jul 2021 21:20:47 +0500
Subject: [PATCH 486/912] Update strings.xml

---
 app/src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2ec1304fa1..e81fb7049d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -99,7 +99,7 @@
     <!-- 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_allow_external_apps_ungranted">RunCommandService requires `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>
 
 

From 2b7aa5e8030d731c9237a5168965f405ba239023 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Fri, 30 Jul 2021 00:32:46 +0500
Subject: [PATCH 487/912] Fix issue where wrong IME inputType would be set if
 termux was returned to from another app with text input view mode selected

---
 .../java/com/termux/app/TermuxActivity.java   | 23 +++++++++---
 .../terminal/TermuxTerminalViewClient.java    |  5 +++
 .../java/com/termux/view/TerminalView.java    | 35 ++++++++++++-------
 .../com/termux/view/TerminalViewClient.java   |  2 ++
 .../TermuxTerminalViewClientBase.java         |  5 +++
 5 files changed, 53 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index 729a636ae2..5981778441 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -452,7 +452,7 @@ private void setTermuxSessionsListView() {
 
 
     private void setTerminalToolbarView(Bundle savedInstanceState) {
-        final ViewPager terminalToolbarViewPager = findViewById(R.id.terminal_toolbar_view_pager);
+        final ViewPager terminalToolbarViewPager = getTerminalToolbarViewPager();
         if (mPreferences.shouldShowTerminalToolbar()) terminalToolbarViewPager.setVisibility(View.VISIBLE);
 
         ViewGroup.LayoutParams layoutParams = terminalToolbarViewPager.getLayoutParams();
@@ -469,8 +469,9 @@ private void setTerminalToolbarView(Bundle savedInstanceState) {
     }
 
     private void setTerminalToolbarHeight() {
-        final ViewPager terminalToolbarViewPager = findViewById(R.id.terminal_toolbar_view_pager);
+        final ViewPager terminalToolbarViewPager = getTerminalToolbarViewPager();
         if (terminalToolbarViewPager == null) return;
+
         ViewGroup.LayoutParams layoutParams = terminalToolbarViewPager.getLayoutParams();
         layoutParams.height = (int) Math.round(mTerminalToolbarDefaultHeight *
             (mProperties.getExtraKeysInfo() == null ? 0 : mProperties.getExtraKeysInfo().getMatrix().length) *
@@ -479,13 +480,13 @@ private void setTerminalToolbarHeight() {
     }
 
     public void toggleTerminalToolbar() {
-        final ViewPager terminalToolbarViewPager = findViewById(R.id.terminal_toolbar_view_pager);
+        final ViewPager terminalToolbarViewPager = getTerminalToolbarViewPager();
         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 && terminalToolbarViewPager.getCurrentItem() == 1) {
+        if (showNow && isTerminalToolbarTextInputViewSelected()) {
             // Focus the text input view if just revealed.
             findViewById(R.id.terminal_toolbar_text_input).requestFocus();
         }
@@ -744,6 +745,20 @@ public DrawerLayout getDrawer() {
         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();
     }
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
index 0853a80f26..705838acaf 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
@@ -186,6 +186,11 @@ public boolean shouldUseCtrlSpaceWorkaround() {
         return mActivity.getProperties().isUsingCtrlSpaceWorkaround();
     }
 
+    @Override
+    public boolean isTerminalViewSelected() {
+        return mActivity.getTerminalToolbarViewPager() == null || mActivity.isTerminalViewSelected();
+    }
+
 
 
     @Override
diff --git a/terminal-view/src/main/java/com/termux/view/TerminalView.java b/terminal-view/src/main/java/com/termux/view/TerminalView.java
index 432fea80e3..ef67b1c1e2 100644
--- a/terminal-view/src/main/java/com/termux/view/TerminalView.java
+++ b/terminal-view/src/main/java/com/termux/view/TerminalView.java
@@ -262,20 +262,29 @@ public boolean attachSession(TerminalSession session) {
 
     @Override
     public InputConnection onCreateInputConnection(EditorInfo outAttrs) {
-        if (mClient.shouldEnforceCharBasedInput()) {
-            // Some keyboards seems do not reset the internal state on TYPE_NULL.
-            // Affects mostly Samsung stock keyboards.
-            // https://github.com/termux/termux-app/issues/686
-            outAttrs.inputType = InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD | InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS;
+        // Ensure that inputType is only set if TerminalView is selected view with the keyboard and
+        // an alternate view is not selected, like an EditText. This is necessary if an activity is
+        // initially started with the alternate view or if activity is returned to from another app
+        // and the alternate view was the one selected the last time.
+        if (mClient.isTerminalViewSelected()) {
+            if (mClient.shouldEnforceCharBasedInput()) {
+                // Some keyboards seems do not reset the internal state on TYPE_NULL.
+                // Affects mostly Samsung stock keyboards.
+                // https://github.com/termux/termux-app/issues/686
+                outAttrs.inputType = InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD | InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS;
+            } else {
+                // Using InputType.NULL is the most correct input type and avoids issues with other hacks.
+                //
+                // Previous keyboard issues:
+                // https://github.com/termux/termux-packages/issues/25
+                // https://github.com/termux/termux-app/issues/87.
+                // https://github.com/termux/termux-app/issues/126.
+                // https://github.com/termux/termux-app/issues/137 (japanese chars and TYPE_NULL).
+                outAttrs.inputType = InputType.TYPE_NULL;
+            }
         } else {
-            // Using InputType.NULL is the most correct input type and avoids issues with other hacks.
-            //
-            // Previous keyboard issues:
-            // https://github.com/termux/termux-packages/issues/25
-            // https://github.com/termux/termux-app/issues/87.
-            // https://github.com/termux/termux-app/issues/126.
-            // https://github.com/termux/termux-app/issues/137 (japanese chars and TYPE_NULL).
-            outAttrs.inputType = InputType.TYPE_NULL;
+            // Corresponds to android:inputType="text"
+            outAttrs.inputType =  InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_NORMAL;
         }
 
         // Note that IME_ACTION_NONE cannot be used as that makes it impossible to input newlines using the on-screen
diff --git a/terminal-view/src/main/java/com/termux/view/TerminalViewClient.java b/terminal-view/src/main/java/com/termux/view/TerminalViewClient.java
index c1f9f94a86..bd60d2d3f6 100644
--- a/terminal-view/src/main/java/com/termux/view/TerminalViewClient.java
+++ b/terminal-view/src/main/java/com/termux/view/TerminalViewClient.java
@@ -34,6 +34,8 @@ public interface TerminalViewClient {
 
     boolean shouldUseCtrlSpaceWorkaround();
 
+    boolean isTerminalViewSelected();
+
 
 
     void copyModeChanged(boolean copyMode);
diff --git a/termux-shared/src/main/java/com/termux/shared/terminal/TermuxTerminalViewClientBase.java b/termux-shared/src/main/java/com/termux/shared/terminal/TermuxTerminalViewClientBase.java
index 7f0648d8df..a51ca31b1e 100644
--- a/termux-shared/src/main/java/com/termux/shared/terminal/TermuxTerminalViewClientBase.java
+++ b/termux-shared/src/main/java/com/termux/shared/terminal/TermuxTerminalViewClientBase.java
@@ -33,6 +33,11 @@ public boolean shouldUseCtrlSpaceWorkaround() {
         return false;
     }
 
+    @Override
+    public boolean isTerminalViewSelected() {
+        return true;
+    }
+
     @Override
     public void copyModeChanged(boolean copyMode) {
     }

From a7596e7d0399e0651b74e30c47c7de61552d28af Mon Sep 17 00:00:00 2001
From: marcusz <65075766+WMCB-Tech@users.noreply.github.com>
Date: Sun, 1 Aug 2021 17:17:26 +0800
Subject: [PATCH 488/912] add "join the discord" badge

discord may be the popular platform and bridged through gitter/irc. so i guess why not
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index ac385b11fa..91319b1f04 100644
--- a/README.md
+++ b/README.md
@@ -3,6 +3,7 @@
 [![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/591914197219016707.svg?label=&logo=discord&logoColor=ffffff&color=7389D8&labelColor=6A7EC2)](https://discord.gg/HXpF69X)
 [![Termux library releases at Jitpack](https://jitpack.io/v/termux/termux-app.svg)](https://jitpack.io/#termux/termux-app)
 
 

From d5d87639ce8adba8aa2f25f2a7ce2f4df067e9bf Mon Sep 17 00:00:00 2001
From: marcusz <65075766+WMCB-Tech@users.noreply.github.com>
Date: Sun, 1 Aug 2021 20:27:49 +0800
Subject: [PATCH 489/912] update the discord badge link to updated one

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 91319b1f04..0ca3dc0623 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 [![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/591914197219016707.svg?label=&logo=discord&logoColor=ffffff&color=7389D8&labelColor=6A7EC2)](https://discord.gg/HXpF69X)
+[![Join the Termux discord server](https://img.shields.io/discord/591914197219016707.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)
 
 

From e30812af226a7da224dcf266a87fc474f621657f Mon Sep 17 00:00:00 2001
From: blank X <theblankx@protonmail.com>
Date: Wed, 11 Aug 2021 17:21:33 +0000
Subject: [PATCH 490/912] Add Gemini to the list of protocols

---
 termux-shared/src/main/java/com/termux/shared/data/UrlUtils.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/termux-shared/src/main/java/com/termux/shared/data/UrlUtils.java b/termux-shared/src/main/java/com/termux/shared/data/UrlUtils.java
index 8b1b093915..29f3a8c054 100644
--- a/termux-shared/src/main/java/com/termux/shared/data/UrlUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/data/UrlUtils.java
@@ -22,6 +22,7 @@ public static Pattern getUrlMatchRegex() {
         regex_sb.append("finger|");                 // The Finger proto.
         regex_sb.append("ftp(?:s?)|");              // The FTP proto.
         regex_sb.append("git|");                    // The Git proto.
+        regex_sb.append("gemini|");                 // The Gemini proto.
         regex_sb.append("gopher|");                 // The Gopher proto.
         regex_sb.append("http(?:s?)|");             // The HTTP proto.
         regex_sb.append("imap(?:s?)|");             // The IMAP proto.

From 23d2c1f0e9c7898dcbfd6e63298876f5437ba297 Mon Sep 17 00:00:00 2001
From: Henrik Grimler <henrik@grimler.se>
Date: Tue, 17 Aug 2021 09:48:43 +0200
Subject: [PATCH 491/912] github: convert issue templates to forms

---
 .github/ISSUE_TEMPLATE/01-bug-report.yml      | 40 +++++++++++++++++++
 .github/ISSUE_TEMPLATE/02-feature-request.yml | 19 +++++++++
 .github/ISSUE_TEMPLATE/bug_report.md          | 35 ----------------
 .github/ISSUE_TEMPLATE/config.yml             |  5 +++
 .github/ISSUE_TEMPLATE/feature_request.md     | 22 ----------
 5 files changed, 64 insertions(+), 57 deletions(-)
 create mode 100644 .github/ISSUE_TEMPLATE/01-bug-report.yml
 create mode 100644 .github/ISSUE_TEMPLATE/02-feature-request.yml
 delete mode 100644 .github/ISSUE_TEMPLATE/bug_report.md
 create mode 100644 .github/ISSUE_TEMPLATE/config.yml
 delete mode 100644 .github/ISSUE_TEMPLATE/feature_request.md

diff --git a/.github/ISSUE_TEMPLATE/01-bug-report.yml b/.github/ISSUE_TEMPLATE/01-bug-report.yml
new file mode 100644
index 0000000000..172f3692ee
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/01-bug-report.yml
@@ -0,0 +1,40 @@
+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. 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
diff --git a/.github/ISSUE_TEMPLATE/02-feature-request.yml b/.github/ISSUE_TEMPLATE/02-feature-request.yml
new file mode 100644
index 0000000000..d09d97f81b
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/02-feature-request.yml
@@ -0,0 +1,19 @@
+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
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index 440cc3fe4f..0000000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,35 +0,0 @@
----
-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:
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 0000000000..29c4cebe4c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,5 @@
+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
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index c1e99f1048..0000000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,22 +0,0 @@
----
-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.

From e13773fd83ffab46d54eaf3464aa17ee402a69d8 Mon Sep 17 00:00:00 2001
From: Henrik Grimler <henrik@grimler.se>
Date: Tue, 17 Aug 2021 09:51:34 +0200
Subject: [PATCH 492/912] bug-report template: format text a bit

---
 .github/ISSUE_TEMPLATE/01-bug-report.yml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/01-bug-report.yml b/.github/ISSUE_TEMPLATE/01-bug-report.yml
index 172f3692ee..01104998a7 100644
--- a/.github/ISSUE_TEMPLATE/01-bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/01-bug-report.yml
@@ -6,7 +6,9 @@ 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.
+        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.
 
@@ -22,7 +24,9 @@ body:
       required: true
   - type: textarea
     attributes:
-      label: Steps to reproduce the behavior. Please post all necessary commands that are needed to reproduce the issue.
+      label: Steps to reproduce the behavior.
+      description: |
+        Please post all necessary commands that are needed to reproduce the issue.
     validations:
       required: true
   - type: textarea

From 501d13a0cb397f8e0ff9f18d0884d68e25b41b90 Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Wed, 18 Aug 2021 00:10:40 +0300
Subject: [PATCH 493/912] update bootstrap archives

---
 app/build.gradle | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 651e1a27f1..017b974b5f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -176,11 +176,11 @@ clean {
 
 task downloadBootstraps() {
     doLast {
-        def version = "2021.06.30-r1"
-        downloadBootstrap("aarch64", "ce56ce9a4e8845bd1d35cc2695bbdd636c72625ee10ce21c9b98ab38ebbee5ab", version)
-        downloadBootstrap("arm",     "537e81951c7d3d3f3def9ce6778e1032457488e21edb2c037a1e0e680c39e747", version)
-        downloadBootstrap("i686",    "3c2ca858c0225671c00c44ac182e31819ffa93ec624e95e02824e7d6d30ca1b4", version)
-        downloadBootstrap("x86_64",  "93c50d36b45bca42bb014395e8e184e5b540adcad5d4e215f7e64ebf0d655d2b", version)
+        def version = "2021.08.18-r1"
+        downloadBootstrap("aarch64", "7136344e7d19de5ca82ab9e2c616c41233a8b42b67f03c49c966c7aef7889b30", version)
+        downloadBootstrap("arm",     "f0587456e2a3d6e0710475bd6fc39c089b3a8c0b26965a67cf470898caea4fdc", version)
+        downloadBootstrap("i686",    "9be0b2251ea56b885615f748e53b0b9c56f3b071e62cb183d5aa34b37d8a8150", version)
+        downloadBootstrap("x86_64",  "54dcd7cb52e3041651275191019158c7f0e3d043cf061411f7fb9715300cbccf", version)
     }
 }
 

From 19c6134c712e3bd3c7b9cce67e29dad902d14d2d Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Thu, 19 Aug 2021 16:29:12 +0300
Subject: [PATCH 494/912] terminal: invert text color under block cursor

Issue: https://github.com/termux/termux-app/issues/219
---
 .../main/java/com/termux/view/TerminalRenderer.java  | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/terminal-view/src/main/java/com/termux/view/TerminalRenderer.java b/terminal-view/src/main/java/com/termux/view/TerminalRenderer.java
index f9c5b53aab..307e422694 100644
--- a/terminal-view/src/main/java/com/termux/view/TerminalRenderer.java
+++ b/terminal-view/src/main/java/com/termux/view/TerminalRenderer.java
@@ -118,9 +118,13 @@ public final void render(TerminalEmulator mEmulator, Canvas canvas, int topRow,
                         final int columnWidthSinceLastRun = column - lastRunStartColumn;
                         final int charsSinceLastRun = currentCharIndex - lastRunStartIndex;
                         int cursorColor = lastRunInsideCursor ? mEmulator.mColors.mCurrentColors[TextStyle.COLOR_INDEX_CURSOR] : 0;
+                        boolean invertCursorTextColor = false;
+                        if (lastRunInsideCursor && cursorShape == TerminalEmulator.TERMINAL_CURSOR_STYLE_BLOCK) {
+                            invertCursorTextColor = true;
+                        }
                         drawTextRun(canvas, line, palette, heightOffset, lastRunStartColumn, columnWidthSinceLastRun,
                             lastRunStartIndex, charsSinceLastRun, measuredWidthForRun,
-                            cursorColor, cursorShape, lastRunStyle, reverseVideo || lastRunInsideSelection);
+                            cursorColor, cursorShape, lastRunStyle, reverseVideo || invertCursorTextColor || lastRunInsideSelection);
                     }
                     measuredWidthForRun = 0.f;
                     lastRunStyle = style;
@@ -143,8 +147,12 @@ public final void render(TerminalEmulator mEmulator, Canvas canvas, int topRow,
             final int columnWidthSinceLastRun = columns - lastRunStartColumn;
             final int charsSinceLastRun = currentCharIndex - lastRunStartIndex;
             int cursorColor = lastRunInsideCursor ? mEmulator.mColors.mCurrentColors[TextStyle.COLOR_INDEX_CURSOR] : 0;
+            boolean invertCursorTextColor = false;
+            if (lastRunInsideCursor && cursorShape == TerminalEmulator.TERMINAL_CURSOR_STYLE_BLOCK) {
+                invertCursorTextColor = true;
+            }
             drawTextRun(canvas, line, palette, heightOffset, lastRunStartColumn, columnWidthSinceLastRun, lastRunStartIndex, charsSinceLastRun,
-                measuredWidthForRun, cursorColor, cursorShape, lastRunStyle, reverseVideo || lastRunInsideSelection);
+                measuredWidthForRun, cursorColor, cursorShape, lastRunStyle, reverseVideo || invertCursorTextColor || lastRunInsideSelection);
         }
     }
 

From 4a74618f17a65bcafba67b7bf85273390dfa64cb Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Thu, 19 Aug 2021 16:44:28 +0300
Subject: [PATCH 495/912] terminal: set default cursor color to white

---
 .../src/main/java/com/termux/terminal/TerminalColorScheme.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/terminal-emulator/src/main/java/com/termux/terminal/TerminalColorScheme.java b/terminal-emulator/src/main/java/com/termux/terminal/TerminalColorScheme.java
index 4fbb56df94..e4fd4e9c77 100644
--- a/terminal-emulator/src/main/java/com/termux/terminal/TerminalColorScheme.java
+++ b/terminal-emulator/src/main/java/com/termux/terminal/TerminalColorScheme.java
@@ -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, 0xffA9AAA9};
+        0xffffffff, 0xff000000, 0xffffffff};
 
     public final int[] mDefaultColors = new int[TextStyle.NUM_INDEXED_COLORS];
 

From 8ee0c5a6ec67f10365d3f0c8a8ca677320c6c8aa Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Mon, 16 Aug 2021 06:00:00 +0500
Subject: [PATCH 496/912] Fixed: Fix markdown link generation

The `]` characters in label and `)` characters in url must be escaped.
---
 .../main/java/com/termux/shared/markdown/MarkdownUtils.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/markdown/MarkdownUtils.java b/termux-shared/src/main/java/com/termux/shared/markdown/MarkdownUtils.java
index 28e1fc6a69..c541ba686a 100644
--- a/termux-shared/src/main/java/com/termux/shared/markdown/MarkdownUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/markdown/MarkdownUtils.java
@@ -119,9 +119,9 @@ public static String getMultiLineMarkdownStringEntry(String label, Object object
             return "**" + label + "**: " + def + "\n";
     }
 
-    public static String getLinkMarkdownString(String label, Object object) {
-        if (object != null)
-            return "[" + label + "](" + object +  ")";
+    public static String getLinkMarkdownString(String label, String url) {
+        if (url != null)
+            return "[" + label.replaceAll("]", "\\\\]") + "](" + url.replaceAll("\\)", "\\\\)") +  ")";
         else
             return label;
     }

From 98edf1fbc777ef7d41a70cf5655feb64c4fa2378 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 19 Aug 2021 18:26:52 +0500
Subject: [PATCH 497/912] Changed: Use millisecond timestamps for reports

---
 .../main/java/com/termux/shared/crash/CrashHandler.java    | 2 +-
 .../src/main/java/com/termux/shared/models/ReportInfo.java | 2 +-
 .../main/java/com/termux/shared/termux/AndroidUtils.java   | 7 +++++++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/crash/CrashHandler.java b/termux-shared/src/main/java/com/termux/shared/crash/CrashHandler.java
index f8d7f60e01..7b920f7568 100644
--- a/termux-shared/src/main/java/com/termux/shared/crash/CrashHandler.java
+++ b/termux-shared/src/main/java/com/termux/shared/crash/CrashHandler.java
@@ -56,7 +56,7 @@ public static void logCrash(@NonNull final Context context, @NonNull final Crash
 
         reportString.append("## Crash Details\n");
         reportString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Crash Thread", thread.toString(), "-"));
-        reportString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Crash Timestamp", AndroidUtils.getCurrentTimeStamp(), "-"));
+        reportString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Crash Timestamp", AndroidUtils.getCurrentMilliSecondUTCTimeStamp(), "-"));
         reportString.append("\n\n").append(MarkdownUtils.getMultiLineMarkdownStringEntry("Crash Message", throwable.getMessage(), "-"));
         reportString.append("\n\n").append(Logger.getStackTracesMarkdownString("Stacktrace", Logger.getStackTracesStringArray(throwable)));
 
diff --git a/termux-shared/src/main/java/com/termux/shared/models/ReportInfo.java b/termux-shared/src/main/java/com/termux/shared/models/ReportInfo.java
index fdb648b239..ebecdd5af5 100644
--- a/termux-shared/src/main/java/com/termux/shared/models/ReportInfo.java
+++ b/termux-shared/src/main/java/com/termux/shared/models/ReportInfo.java
@@ -34,7 +34,7 @@ public ReportInfo(String userAction, String sender, String reportTitle, String r
         this.reportString = reportString;
         this.reportStringSuffix = reportStringSuffix;
         this.addReportInfoToMarkdown = addReportInfoToMarkdown;
-        this.reportTimestamp = AndroidUtils.getCurrentTimeStamp();
+        this.reportTimestamp = AndroidUtils.getCurrentMilliSecondUTCTimeStamp();
     }
 
     /**
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/AndroidUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/AndroidUtils.java
index 418f7d85aa..d433402a2b 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/AndroidUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/AndroidUtils.java
@@ -182,6 +182,13 @@ public static String getCurrentTimeStamp() {
         return df.format(new Date());
     }
 
+    public static String getCurrentMilliSecondUTCTimeStamp() {
+        @SuppressLint("SimpleDateFormat")
+        final SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS z");
+        df.setTimeZone(TimeZone.getTimeZone("UTC"));
+        return df.format(new Date());
+    }
+
     public static String getCurrentMilliSecondLocalTimeStamp() {
         @SuppressLint("SimpleDateFormat")
         final SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd_HH.mm.ss.SSS");

From fabcc4fa35e635d8b339170b16e55449fe56238e Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 19 Aug 2021 18:31:37 +0500
Subject: [PATCH 498/912] Fixed: RunCommandService notification was not being
 cleared if an error was raised

---
 .../java/com/termux/app/RunCommandService.java    | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/termux/app/RunCommandService.java b/app/src/main/java/com/termux/app/RunCommandService.java
index 8c3fae2bcf..c5c79f939d 100644
--- a/app/src/main/java/com/termux/app/RunCommandService.java
+++ b/app/src/main/java/com/termux/app/RunCommandService.java
@@ -73,7 +73,7 @@ public int onStartCommand(Intent intent, int flags, int startId) {
             errmsg = this.getString(R.string.error_run_command_service_invalid_intent_action, intent.getAction());
             executionCommand.setStateFailed(Errno.ERRNO_FAILED.getCode(), errmsg);
             PluginUtils.processPluginExecutionCommandError(this, LOG_TAG, executionCommand, false);
-            return Service.START_NOT_STICKY;
+            return stopService();
         }
 
         String executableExtra = executionCommand.executable = IntentUtils.getStringExtraIfSet(intent, RUN_COMMAND_SERVICE.EXTRA_COMMAND_PATH, null);
@@ -125,7 +125,7 @@ public int onStartCommand(Intent intent, int flags, int startId) {
         if (errmsg != null) {
             executionCommand.setStateFailed(Errno.ERRNO_FAILED.getCode(), errmsg);
             PluginUtils.processPluginExecutionCommandError(this, LOG_TAG, executionCommand, true);
-            return Service.START_NOT_STICKY;
+            return stopService();
         }
 
 
@@ -135,7 +135,7 @@ public int onStartCommand(Intent intent, int flags, int startId) {
             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);
             PluginUtils.processPluginExecutionCommandError(this, LOG_TAG, executionCommand, false);
-            return Service.START_NOT_STICKY;
+            return stopService();
         }
 
         // Get canonical path of executable
@@ -150,7 +150,7 @@ public int onStartCommand(Intent intent, int flags, int startId) {
             error.appendMessage("\n" + this.getString(R.string.msg_executable_absolute_path, executionCommand.executable));
             executionCommand.setStateFailed(error);
             PluginUtils.processPluginExecutionCommandError(this, LOG_TAG, executionCommand, false);
-            return Service.START_NOT_STICKY;
+            return stopService();
         }
 
 
@@ -172,7 +172,7 @@ public int onStartCommand(Intent intent, int flags, int startId) {
                 error.appendMessage("\n" + this.getString(R.string.msg_working_directory_absolute_path, executionCommand.workingDirectory));
                 executionCommand.setStateFailed(error);
                 PluginUtils.processPluginExecutionCommandError(this, LOG_TAG, executionCommand, false);
-                return Service.START_NOT_STICKY;
+                return stopService();
             }
         }
 
@@ -219,8 +219,11 @@ public int onStartCommand(Intent intent, int flags, int startId) {
             this.startService(execIntent);
         }
 
-        runStopForeground();
+        return stopService();
+    }
 
+    private int stopService() {
+        runStopForeground();
         return Service.START_NOT_STICKY;
     }
 

From 60f37bde8dd415f71acc8d4e6feb08dff78e2fb3 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Fri, 20 Aug 2021 01:15:01 +0500
Subject: [PATCH 499/912] Changed!: StreamGobbler needs to be passed log level
 parameter

When `Logger.CURRENT_LOG_LEVEL` set by user is `Logger.LOG_VERBOSE`, then background (not foreground sessions) command output was being logged to logcat, however, if command outputted too much data to logcat, then logcat clients like in Android Studio would crash. Also if a logcat dump is being taken inside termux, then duplicate lines would occur, first one due to of original entry, and second one due to StreamGobbler logging output at verbose level for logcat command.

This would be a concern for plugins as well like `RUN_COMMAND` intent or Termux:Tasker, etc if they ran commands with lot of data and user had set log level to verbose.

For plugins, TermuxService now supports `com.termux.execute.background_custom_log_level` `String` extra for custom log level. Termux:Tasker, etc will have to be updated with support. For `RUN_COMMAND` intent, the `com.termux.RUN_COMMAND_BACKGROUND_CUSTOM_LOG_LEVEL` `String` extra is now provided to set custom log level for only the command output. Check `TermuxConstants`.

So one can pass a custom log level that is `>=` to the log level set it termux settings where (OFF=0, NORMAL=1, DEBUG=2, VERBOSE=3). If you pass `0`, it will completely disable logging. If you pass `1`, logging will only be enabled if log level in termux settings is `NORMAL` or higher. If custom log level is not passed, then old behaviour will remain and log level in termux settings must be `VERBOSE` or higher for logging to be enabled. Note that the log entries will still be logged with priority `Log.VERBOSE` regardless of log level, i.e `logcat` will have `V/`.

The entries logcat component has now changed from `StreamGobbler` to `TermuxCommand`. For output at `stdout`, the entry format is `[<pid>-stdout] ...` and for the output at `stderr`, the entry format is `[<pid>-stderr] ...`. The `<pid>` will be process id as an integer that was started by termux. For example: `V/TermuxCommand: [66666-stdout] ...`.

While doing this I realize that instead of using `am` command to send messages back to tasker, you can use tasker `Logcat Entry` profile event to listen to messages from termux at both `stdout` and `stderr`. This might be faster than `am` command intent systems or at least possibly more convenient in some use cases.

So setup a profile with the `Component` value set to `TermuxCommand` and `Filter` value set to `-E 'TermuxCommand: \[[0-9]+-((stdout)|(stderr))\] message_tag: .*'` and enable the `Grep Filter` toggle so that entry matching is done in native code. Check https://github.com/joaomgcd/TaskerDocumentation/blob/master/en/help/logcat%20info.md for details. Also enable `Enforce Task Order` in profile settings and set collision handling to `Run Both Together` so that if two or more entries are sent quickly, entry task is run for all. Tasker currently (v5.13.16) is not maintaining order of entry tasks despite the setting.

Then you can send an intent from tasker via `Run Shell` action with `root` (since `am` command won't work without it on android >=8) or normally in termux from a script, you should be able to receive the entries as `@lc_text` in entry task of tasker `Logcat Entry` profile. The following just passes two `echo` commands to `bash` as a script via `stdin`. If you don't have root, then you can call a wrapper script with `TermuxCommand` function in `Tasker Function` action that sends another `RUN_COMMAND` intent with termux provide `am` command which will work without root.

```
am startservice --user 0 -n com.termux/com.termux.app.RunCommandService -a com.termux.RUN_COMMAND --es com.termux.RUN_COMMAND_PATH '/data/data/com.termux/files/usr/bin/bash' --es com.termux.RUN_COMMAND_STDIN 'echo "message_tag: Sending message from tasker to termux"' --ez com.termux.RUN_COMMAND_BACKGROUND true --es com.termux.RUN_COMMAND_BACKGROUND_CUSTOM_LOG_LEVEL '1'
```
---
 .../com/termux/app/RunCommandService.java     |  2 +
 .../java/com/termux/app/TermuxService.java    |  1 +
 .../com/termux/shared/data/DataUtils.java     | 15 ++++--
 .../com/termux/shared/data/IntentUtils.java   | 23 ++++++++++
 .../java/com/termux/shared/logger/Logger.java | 16 ++++---
 .../shared/models/ExecutionCommand.java       | 17 +++++++
 .../termux/shared/shell/StreamGobbler.java    | 46 +++++++++++++++----
 .../com/termux/shared/shell/TermuxTask.java   |  4 +-
 .../termux/shared/termux/TermuxConstants.java | 12 ++++-
 .../com/termux/shared/termux/TermuxUtils.java |  1 +
 10 files changed, 115 insertions(+), 22 deletions(-)

diff --git a/app/src/main/java/com/termux/app/RunCommandService.java b/app/src/main/java/com/termux/app/RunCommandService.java
index c5c79f939d..2d1d3fe22c 100644
--- a/app/src/main/java/com/termux/app/RunCommandService.java
+++ b/app/src/main/java/com/termux/app/RunCommandService.java
@@ -101,6 +101,7 @@ public int onStartCommand(Intent intent, int flags, int startId) {
         executionCommand.stdin = IntentUtils.getStringExtraIfSet(intent, RUN_COMMAND_SERVICE.EXTRA_STDIN, null);
         executionCommand.workingDirectory = IntentUtils.getStringExtraIfSet(intent, RUN_COMMAND_SERVICE.EXTRA_WORKDIR, null);
         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);
@@ -197,6 +198,7 @@ public int onStartCommand(Intent intent, int flags, int startId) {
         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);
diff --git a/app/src/main/java/com/termux/app/TermuxService.java b/app/src/main/java/com/termux/app/TermuxService.java
index fe0b9a5b61..06a25754df 100644
--- a/app/src/main/java/com/termux/app/TermuxService.java
+++ b/app/src/main/java/com/termux/app/TermuxService.java
@@ -364,6 +364,7 @@ private void actionServiceExecute(Intent intent) {
             executionCommand.arguments = IntentUtils.getStringArrayExtraIfSet(intent, TERMUX_SERVICE.EXTRA_ARGUMENTS, null);
             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.workingDirectory = IntentUtils.getStringExtraIfSet(intent, TERMUX_SERVICE.EXTRA_WORKDIR, null);
diff --git a/termux-shared/src/main/java/com/termux/shared/data/DataUtils.java b/termux-shared/src/main/java/com/termux/shared/data/DataUtils.java
index 60bb9fca96..9196910360 100644
--- a/termux-shared/src/main/java/com/termux/shared/data/DataUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/data/DataUtils.java
@@ -4,10 +4,6 @@
 
 import androidx.annotation.Nullable;
 
-import java.util.LinkedHashSet;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
 public class DataUtils {
 
     public static final int TRANSACTION_SIZE_LIMIT_IN_BYTES = 100 * 1024; // 100KB
@@ -97,6 +93,17 @@ public static int getIntFromString(String value, int def) {
         }
     }
 
+    /**
+     * Get the {@code String} from an {@link Integer}.
+     *
+     * @param value The {@link Integer} value.
+     * @param def The default {@link String} value.
+     * @return Returns {@code value} if it is not {@code null}, otherwise returns {@code def}.
+     */
+    public static String getStringFromInteger(Integer value, String def) {
+        return (value == null) ? def : String.valueOf((int) value);
+    }
+
     /**
      * Get the {@code hex string} from a {@link byte[]}.
      *
diff --git a/termux-shared/src/main/java/com/termux/shared/data/IntentUtils.java b/termux-shared/src/main/java/com/termux/shared/data/IntentUtils.java
index 885eb4232f..0c692fc352 100644
--- a/termux-shared/src/main/java/com/termux/shared/data/IntentUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/data/IntentUtils.java
@@ -49,6 +49,29 @@ public static String getStringExtraIfSet(@NonNull Intent intent, String key, Str
         return value;
     }
 
+    /**
+     * Get an {@link Integer} from an {@link Intent} stored as a {@link String} extra if its not
+     * {@code null} or empty.
+     *
+     * @param intent The {@link Intent} to get the extra from.
+     * @param key The {@link String} key name.
+     * @param def The default value if extra is not set.
+     * @return Returns the {@link Integer} extra if set, otherwise {@code null}.
+     */
+    public static Integer getIntegerExtraIfSet(@NonNull Intent intent, String key, Integer def) {
+        try {
+            String value = intent.getStringExtra(key);
+            if (value == null || value.isEmpty()) {
+                return def;
+            }
+
+            return Integer.parseInt(value);
+        }
+        catch (Exception e) {
+            return def;
+        }
+    }
+
 
 
     /**
diff --git a/termux-shared/src/main/java/com/termux/shared/logger/Logger.java b/termux-shared/src/main/java/com/termux/shared/logger/Logger.java
index 2202a7bcde..10e777f848 100644
--- a/termux-shared/src/main/java/com/termux/shared/logger/Logger.java
+++ b/termux-shared/src/main/java/com/termux/shared/logger/Logger.java
@@ -50,16 +50,16 @@ public class Logger {
 
 
 
-    public static void logMessage(int logLevel, String tag, String message) {
-        if (logLevel == Log.ERROR && CURRENT_LOG_LEVEL >= LOG_LEVEL_NORMAL)
+    public static void logMessage(int logPriority, String tag, String message) {
+        if (logPriority == Log.ERROR && CURRENT_LOG_LEVEL >= LOG_LEVEL_NORMAL)
             Log.e(getFullTag(tag), message);
-        else if (logLevel == Log.WARN && CURRENT_LOG_LEVEL >= LOG_LEVEL_NORMAL)
+        else if (logPriority == Log.WARN && CURRENT_LOG_LEVEL >= LOG_LEVEL_NORMAL)
             Log.w(getFullTag(tag), message);
-        else if (logLevel == Log.INFO && CURRENT_LOG_LEVEL >= LOG_LEVEL_NORMAL)
+        else if (logPriority == Log.INFO && CURRENT_LOG_LEVEL >= LOG_LEVEL_NORMAL)
             Log.i(getFullTag(tag), message);
-        else if (logLevel == Log.DEBUG && CURRENT_LOG_LEVEL >= LOG_LEVEL_DEBUG)
+        else if (logPriority == Log.DEBUG && CURRENT_LOG_LEVEL >= LOG_LEVEL_DEBUG)
             Log.d(getFullTag(tag), message);
-        else if (logLevel == Log.VERBOSE && CURRENT_LOG_LEVEL >= LOG_LEVEL_VERBOSE)
+        else if (logPriority == Log.VERBOSE && CURRENT_LOG_LEVEL >= LOG_LEVEL_VERBOSE)
             Log.v(getFullTag(tag), message);
     }
 
@@ -187,6 +187,10 @@ public static void logVerboseExtended(String message) {
         logExtendedMessage(Log.VERBOSE, DEFAULT_LOG_TAG, message);
     }
 
+    public static void logVerboseForce(String tag, String message) {
+        Log.v(tag, message);
+    }
+
 
 
     public static void logErrorAndShowToast(Context context, String tag, String message) {
diff --git a/termux-shared/src/main/java/com/termux/shared/models/ExecutionCommand.java b/termux-shared/src/main/java/com/termux/shared/models/ExecutionCommand.java
index 77f7716078..d3611a5364 100644
--- a/termux-shared/src/main/java/com/termux/shared/models/ExecutionCommand.java
+++ b/termux-shared/src/main/java/com/termux/shared/models/ExecutionCommand.java
@@ -83,6 +83,12 @@ public int getValue() {
     /** If the {@link ExecutionCommand} is meant to start a failsafe terminal session. */
     public boolean isFailsafe;
 
+    /**
+     * The {@link ExecutionCommand} custom log level for background {@link com.termux.shared.shell.TermuxTask}
+     * commands. By default, @link com.termux.shared.shell.StreamGobbler} only logs if {@link Logger}
+     * `CURRENT_LOG_LEVEL` is >= {@link Logger#LOG_LEVEL_VERBOSE}.
+     */
+    public Integer backgroundCustomLogLevel;
 
     /** The session action of foreground commands. */
     public String sessionAction;
@@ -264,6 +270,9 @@ public static String getExecutionInputLogString(final ExecutionCommand execution
         logString.append("\n").append(executionCommand.getInBackgroundLogString());
         logString.append("\n").append(executionCommand.getIsFailsafeLogString());
 
+        if (executionCommand.inBackground && (!ignoreNull || executionCommand.backgroundCustomLogLevel != null))
+            logString.append("\n").append(executionCommand.getBackgroundCustomLogLevelLogString());
+
         if (!ignoreNull || executionCommand.sessionAction != null)
             logString.append("\n").append(executionCommand.getSessionActionLogString());
 
@@ -346,6 +355,10 @@ public static String getExecutionCommandMarkdownString(final ExecutionCommand ex
         markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Working Directory", executionCommand.workingDirectory, "-"));
         markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("inBackground", executionCommand.inBackground, "-"));
         markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("isFailsafe", executionCommand.isFailsafe, "-"));
+
+        if (executionCommand.inBackground && executionCommand.backgroundCustomLogLevel != null)
+            markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Background Custom Log Level", executionCommand.backgroundCustomLogLevel, "-"));
+
         markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Session Action", executionCommand.sessionAction, "-"));
 
 
@@ -418,6 +431,10 @@ public String getIsFailsafeLogString() {
         return "isFailsafe: `" + isFailsafe + "`";
     }
 
+    public String getBackgroundCustomLogLevelLogString() {
+        return "Background Custom Log Level: `" + backgroundCustomLogLevel + "`";
+    }
+
     public String getSessionActionLogString() {
         return Logger.getSingleLineLogStringEntry("Session Action", sessionAction, "-");
     }
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/StreamGobbler.java b/termux-shared/src/main/java/com/termux/shared/shell/StreamGobbler.java
index d14ce7ab27..a8e1ca9136 100644
--- a/termux-shared/src/main/java/com/termux/shared/shell/StreamGobbler.java
+++ b/termux-shared/src/main/java/com/termux/shared/shell/StreamGobbler.java
@@ -87,6 +87,8 @@ public interface OnStreamClosedListener {
     private final OnLineListener lineListener;
     @Nullable
     private final OnStreamClosedListener streamClosedListener;
+    @Nullable
+    private final Integer mLlogLevel;
     private volatile boolean active = true;
     private volatile boolean calledOnClose = false;
 
@@ -102,9 +104,13 @@ public interface OnStreamClosedListener {
      * @param shell Name of the shell
      * @param inputStream InputStream to read from
      * @param outputList {@literal List<String>} to write to, or null
+     * @param logLevel The custom log level to use for logging by command output. If set to
+     *                 {@code null}, then {@link Logger#LOG_LEVEL_VERBOSE} will be used.
      */
     @AnyThread
-    public StreamGobbler(@NonNull String shell, @NonNull InputStream inputStream, @Nullable List<String> outputList) {
+    public StreamGobbler(@NonNull String shell, @NonNull InputStream inputStream,
+                         @Nullable List<String> outputList,
+                         @Nullable Integer logLevel) {
         super("Gobbler#" + incThreadCounter());
         this.shell = shell;
         this.inputStream = inputStream;
@@ -114,6 +120,8 @@ public StreamGobbler(@NonNull String shell, @NonNull InputStream inputStream, @N
         listWriter = outputList;
         stringWriter = null;
         lineListener = null;
+
+        mLlogLevel = logLevel;
     }
 
     /**
@@ -128,9 +136,13 @@ public StreamGobbler(@NonNull String shell, @NonNull InputStream inputStream, @N
      * @param shell Name of the shell
      * @param inputStream InputStream to read from
      * @param outputString {@literal List<String>} to write to, or null
+     * @param logLevel The custom log level to use for logging by command output. If set to
+     *                 {@code null}, then {@link Logger#LOG_LEVEL_VERBOSE} will be used.
      */
     @AnyThread
-    public StreamGobbler(@NonNull String shell, @NonNull InputStream inputStream, @Nullable StringBuilder outputString) {
+    public StreamGobbler(@NonNull String shell, @NonNull InputStream inputStream,
+                         @Nullable StringBuilder outputString,
+                         @Nullable Integer logLevel) {
         super("Gobbler#" + incThreadCounter());
         this.shell = shell;
         this.inputStream = inputStream;
@@ -140,6 +152,8 @@ public StreamGobbler(@NonNull String shell, @NonNull InputStream inputStream, @N
         listWriter = null;
         stringWriter = outputString;
         lineListener = null;
+
+        mLlogLevel = logLevel;
     }
 
     /**
@@ -153,9 +167,14 @@ public StreamGobbler(@NonNull String shell, @NonNull InputStream inputStream, @N
      * @param inputStream InputStream to read from
      * @param onLineListener OnLineListener callback
      * @param onStreamClosedListener OnStreamClosedListener callback
+     * @param logLevel The custom log level to use for logging by command output. If set to
+     *                 {@code null}, then {@link Logger#LOG_LEVEL_VERBOSE} will be used.
      */
     @AnyThread
-    public StreamGobbler(@NonNull String shell, @NonNull InputStream inputStream, @Nullable OnLineListener onLineListener, @Nullable OnStreamClosedListener onStreamClosedListener) {
+    public StreamGobbler(@NonNull String shell, @NonNull InputStream inputStream,
+                         @Nullable OnLineListener onLineListener,
+                         @Nullable OnStreamClosedListener onStreamClosedListener,
+                         @Nullable Integer logLevel) {
         super("Gobbler#" + incThreadCounter());
         this.shell = shell;
         this.inputStream = inputStream;
@@ -165,21 +184,30 @@ public StreamGobbler(@NonNull String shell, @NonNull InputStream inputStream, @N
         listWriter = null;
         stringWriter = null;
         lineListener = onLineListener;
+
+        mLlogLevel = logLevel;
     }
 
     @Override
     public void run() {
-        // keep reading the InputStream until it ends (or an error occurs)
-        // optionally pausing when a command is executed that consumes the InputStream itself
+        String defaultLogTag = Logger.DEFAULT_LOG_TAG;
         int currentLogLevel = Logger.getLogLevel();
-        int logLevelVerbose = Logger.LOG_LEVEL_VERBOSE;
 
+        int customLogLevel;
+        if (mLlogLevel != null && mLlogLevel >= Logger.LOG_LEVEL_OFF) {
+            customLogLevel = mLlogLevel;
+            Logger.logVerbose(LOG_TAG, "Using custom log level: " + customLogLevel + ", current log level: " + currentLogLevel);
+        } else {
+            customLogLevel = Logger.LOG_LEVEL_VERBOSE;
+        }
+
+        // keep reading the InputStream until it ends (or an error occurs)
+        // optionally pausing when a command is executed that consumes the InputStream itself
         try {
             String line;
             while ((line = reader.readLine()) != null) {
-
-                if (currentLogLevel >= logLevelVerbose)
-                    Logger.logVerbose(LOG_TAG, String.format(Locale.ENGLISH, "[%s] %s", shell, line)); // This will get truncated by LOGGER_ENTRY_MAX_LEN, likely 4KB
+                if (customLogLevel >= currentLogLevel)
+                    Logger.logVerboseForce(defaultLogTag + "Command", String.format(Locale.ENGLISH, "[%s] %s", shell, line)); // This will get truncated by LOGGER_ENTRY_MAX_LEN, likely 4KB
 
                 if (stringWriter != null) stringWriter.append(line).append("\n");
                 if (listWriter != null) listWriter.add(line);
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/TermuxTask.java b/termux-shared/src/main/java/com/termux/shared/shell/TermuxTask.java
index 4b2801eaeb..4d0658e558 100644
--- a/termux-shared/src/main/java/com/termux/shared/shell/TermuxTask.java
+++ b/termux-shared/src/main/java/com/termux/shared/shell/TermuxTask.java
@@ -139,8 +139,8 @@ private void executeInner(@NonNull final Context context) throws IllegalThreadSt
 
         // setup stdin, and stdout and stderr gobblers
         DataOutputStream STDIN = new DataOutputStream(mProcess.getOutputStream());
-        StreamGobbler STDOUT = new StreamGobbler(pid + "-stdout", mProcess.getInputStream(), mExecutionCommand.resultData.stdout);
-        StreamGobbler STDERR = new StreamGobbler(pid + "-stderr", mProcess.getErrorStream(), mExecutionCommand.resultData.stderr);
+        StreamGobbler STDOUT = new StreamGobbler(pid + "-stdout", mProcess.getInputStream(), mExecutionCommand.resultData.stdout, mExecutionCommand.backgroundCustomLogLevel);
+        StreamGobbler STDERR = new StreamGobbler(pid + "-stderr", mProcess.getErrorStream(), mExecutionCommand.resultData.stderr, mExecutionCommand.backgroundCustomLogLevel);
 
         // start gobbling
         STDOUT.start();
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
index fe531a86a3..a71337a408 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
@@ -12,7 +12,7 @@
 import java.util.List;
 
 /*
- * Version: v0.24.0
+ * Version: v0.25.0
  *
  * Changelog
  *
@@ -172,6 +172,12 @@
  *           `FORMAT_FAILED_ERR__ERRMSG__STDOUT__STDERR__EXIT_CODE`,
  *           `RESULT_FILE_ERR_PREFIX`, `RESULT_FILE_ERRMSG_PREFIX` `RESULT_FILE_STDOUT_PREFIX`,
  *           `RESULT_FILE_STDERR_PREFIX`, `RESULT_FILE_EXIT_CODE_PREFIX`.
+ *
+ * - 0.25.0 (2021-08-19)
+ *      - Added following to `TERMUX_APP.TERMUX_SERVICE`:
+ *          `EXTRA_BACKGROUND_CUSTOM_LOG_LEVEL`.
+ *      - Added following to `TERMUX_APP.RUN_COMMAND_SERVICE`:
+ *          `EXTRA_BACKGROUND_CUSTOM_LOG_LEVEL`.
  */
 
 /**
@@ -816,6 +822,8 @@ public static final class TERMUX_SERVICE {
             public static final String EXTRA_WORKDIR = TERMUX_PACKAGE_NAME + ".execute.cwd"; // Default: "com.termux.execute.cwd"
             /** Intent {@code boolean} extra for command background mode for the TERMUX_SERVICE.ACTION_SERVICE_EXECUTE intent */
             public static final String EXTRA_BACKGROUND = TERMUX_PACKAGE_NAME + ".execute.background"; // Default: "com.termux.execute.background"
+            /** Intent {@code String} extra for custom log level for background commands defined by {@link com.termux.shared.logger.Logger} for the TERMUX_SERVICE.ACTION_SERVICE_EXECUTE intent */
+            public static final String EXTRA_BACKGROUND_CUSTOM_LOG_LEVEL = TERMUX_PACKAGE_NAME + ".execute.background_custom_log_level"; // Default: "com.termux.execute.background_custom_log_level"
             /** Intent {@code String} extra for session action for foreground commands for the TERMUX_SERVICE.ACTION_SERVICE_EXECUTE intent */
             public static final String EXTRA_SESSION_ACTION = TERMUX_PACKAGE_NAME + ".execute.session_action"; // Default: "com.termux.execute.session_action"
             /** Intent {@code String} extra for label of the command for the TERMUX_SERVICE.ACTION_SERVICE_EXECUTE intent */
@@ -939,6 +947,8 @@ public static final class RUN_COMMAND_SERVICE {
             public static final String EXTRA_WORKDIR = TERMUX_PACKAGE_NAME + ".RUN_COMMAND_WORKDIR"; // Default: "com.termux.RUN_COMMAND_WORKDIR"
             /** Intent {@code boolean} extra for whether to run command in background or foreground terminal session for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent */
             public static final String EXTRA_BACKGROUND = TERMUX_PACKAGE_NAME + ".RUN_COMMAND_BACKGROUND"; // Default: "com.termux.RUN_COMMAND_BACKGROUND"
+            /** Intent {@code String} extra for custom log level for background commands defined by {@link com.termux.shared.logger.Logger} for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent */
+            public static final String EXTRA_BACKGROUND_CUSTOM_LOG_LEVEL = TERMUX_PACKAGE_NAME + ".RUN_COMMAND_BACKGROUND_CUSTOM_LOG_LEVEL"; // Default: "com.termux.RUN_COMMAND_BACKGROUND_CUSTOM_LOG_LEVEL"
             /** Intent {@code String} extra for session action of foreground commands for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent */
             public static final String EXTRA_SESSION_ACTION = TERMUX_PACKAGE_NAME + ".RUN_COMMAND_SESSION_ACTION"; // Default: "com.termux.RUN_COMMAND_SESSION_ACTION"
             /** Intent {@code String} extra for label of the command for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent */
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
index ba623bc279..4981b206b4 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
@@ -341,6 +341,7 @@ public static String geAPTInfoMarkdownString(@NonNull final Context context) {
         aptInfoScript = aptInfoScript.replaceAll(Pattern.quote("@TERMUX_PREFIX@"), TermuxConstants.TERMUX_PREFIX_DIR_PATH);
 
         ExecutionCommand executionCommand = new ExecutionCommand(1, TermuxConstants.TERMUX_BIN_PREFIX_DIR_PATH + "/bash", null, aptInfoScript, null, true, false);
+        executionCommand.backgroundCustomLogLevel = Logger.LOG_LEVEL_OFF;
         TermuxTask termuxTask = TermuxTask.execute(context, executionCommand, null, new TermuxShellEnvironmentClient(), true);
         if (termuxTask == null || !executionCommand.isSuccessful() || executionCommand.resultData.exitCode != 0) {
             Logger.logError(LOG_TAG, executionCommand.toString());

From 5e09a501c96f2a297d53e5c82b9d9c8e443c48ea Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Fri, 20 Aug 2021 01:26:17 +0500
Subject: [PATCH 500/912] Added: Support for MessageDialogUtils.showMessage()
 to receive positive and negative button OnClickListeners

---
 .../shared/interact/MessageDialogUtils.java   | 35 +++++++++++++++++--
 1 file changed, 33 insertions(+), 2 deletions(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/interact/MessageDialogUtils.java b/termux-shared/src/main/java/com/termux/shared/interact/MessageDialogUtils.java
index ef713d5847..abea1763d1 100644
--- a/termux-shared/src/main/java/com/termux/shared/interact/MessageDialogUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/interact/MessageDialogUtils.java
@@ -22,9 +22,33 @@ public class MessageDialogUtils {
      * @param onDismiss The {@link DialogInterface.OnDismissListener} to run when dialog is dismissed.
      */
     public static void showMessage(Context context, String titleText, String messageText, final DialogInterface.OnDismissListener onDismiss) {
+        showMessage(context, titleText, messageText, null, null, null, null, onDismiss);
+    }
 
-        AlertDialog.Builder builder = new AlertDialog.Builder(context, R.style.Theme_AppCompat_Light_Dialog)
-            .setPositiveButton(android.R.string.ok, null);
+    /**
+     * Show a message in a dialog
+     *
+     * @param context The {@link Context} to use to start the dialog. An {@link Activity} {@link Context}
+     *                must be passed, otherwise exceptions will be thrown.
+     * @param titleText The title text of the dialog.
+     * @param messageText The message text of the dialog.
+     * @param positiveText The positive button text of the dialog.
+     * @param onPositiveButton The {@link DialogInterface.OnClickListener} to run when positive button
+     *                         is pressed.
+     * @param negativeText The negative button text of the dialog. If this is {@code null}, then
+     *                         negative button will not be shown.
+     * @param onNegativeButton The {@link DialogInterface.OnClickListener} to run when negative button
+     *                         is pressed.
+     * @param onDismiss The {@link DialogInterface.OnDismissListener} to run when dialog is dismissed.
+     */
+    public static void showMessage(Context context, String titleText, String messageText,
+                                   String positiveText,
+                                   final DialogInterface.OnClickListener onPositiveButton,
+                                   String negativeText,
+                                   final DialogInterface.OnClickListener onNegativeButton,
+                                   final DialogInterface.OnDismissListener onDismiss) {
+
+        AlertDialog.Builder builder = new AlertDialog.Builder(context, R.style.Theme_AppCompat_Light_Dialog);
 
         LayoutInflater inflater = (LayoutInflater) context.getSystemService( Context.LAYOUT_INFLATER_SERVICE );
         View view = inflater.inflate(R.layout.dialog_show_message, null);
@@ -40,6 +64,13 @@ public static void showMessage(Context context, String titleText, String message
                 messageView.setText(messageText);
         }
 
+        if (positiveText == null)
+            positiveText = context.getString(android.R.string.ok);
+        builder.setPositiveButton(positiveText, onPositiveButton);
+
+        if (negativeText != null)
+            builder.setNegativeButton(negativeText, onNegativeButton);
+
         if (onDismiss != null)
             builder.setOnDismissListener(onDismiss);
 

From 7de061361774a2a42fe48f15a29730d541c249c1 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Fri, 20 Aug 2021 01:27:07 +0500
Subject: [PATCH 501/912] Fixed: Catch exception when requesting permissions,
 like if request code is negative

---
 .../java/com/termux/shared/packages/PermissionUtils.java    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/packages/PermissionUtils.java b/termux-shared/src/main/java/com/termux/shared/packages/PermissionUtils.java
index 6311ed2419..8752a0a9c6 100644
--- a/termux-shared/src/main/java/com/termux/shared/packages/PermissionUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/packages/PermissionUtils.java
@@ -63,7 +63,11 @@ public static void requestPermissions(Activity activity, String[] permissions, i
             result = ContextCompat.checkSelfPermission(activity, permission);
             if (result != PackageManager.PERMISSION_GRANTED) {
                 Logger.logDebug(LOG_TAG, "Requesting Permissions: " + Arrays.toString(permissions));
-                activity.requestPermissions(new String[]{permission}, requestCode);
+                try {
+                    activity.requestPermissions(new String[]{permission}, requestCode);
+                } catch (Exception e) {
+                    Logger.logStackTraceWithMessage(LOG_TAG, "Failed to request permissions with request code " + requestCode + ": " + Arrays.toString(permissions), e);
+                }
             }
         }
     }

From 35ea19dd75a326691e57b69bde4f0dfbeb3354f4 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Fri, 20 Aug 2021 06:36:01 +0500
Subject: [PATCH 502/912] Added: Support for reading and writing serialized
 objects to files and deleting files older than x days in FileUtils

---
 .../com/termux/shared/data/DataUtils.java     |  21 ++
 .../com/termux/shared/file/FileUtils.java     | 276 ++++++++++++++++--
 .../shared/models/errors/FileUtilsErrno.java  |   3 +
 .../shared/models/errors/FunctionErrno.java   |   1 +
 4 files changed, 278 insertions(+), 23 deletions(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/data/DataUtils.java b/termux-shared/src/main/java/com/termux/shared/data/DataUtils.java
index 9196910360..7c101c73e7 100644
--- a/termux-shared/src/main/java/com/termux/shared/data/DataUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/data/DataUtils.java
@@ -4,6 +4,10 @@
 
 import androidx.annotation.Nullable;
 
+import java.io.ByteArrayOutputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+
 public class DataUtils {
 
     public static final int TRANSACTION_SIZE_LIMIT_IN_BYTES = 100 * 1024; // 100KB
@@ -172,4 +176,21 @@ public static boolean isNullOrEmpty(String string) {
         return string == null || string.isEmpty();
     }
 
+
+
+    /** Get size of a serializable object. */
+    public static long getSerializedSize(Serializable object) {
+        if (object == null) return 0;
+        try {
+            ByteArrayOutputStream byteOutputStream = new ByteArrayOutputStream();
+            ObjectOutputStream objectOutputStream = new ObjectOutputStream(byteOutputStream);
+            objectOutputStream.writeObject(object);
+            objectOutputStream.flush();
+            objectOutputStream.close();
+            return byteOutputStream.toByteArray().length;
+        } catch (Exception e) {
+            return -1;
+        }
+    }
+
 }
diff --git a/termux-shared/src/main/java/com/termux/shared/file/FileUtils.java b/termux-shared/src/main/java/com/termux/shared/file/FileUtils.java
index 07179f272a..dd057e4c11 100644
--- a/termux-shared/src/main/java/com/termux/shared/file/FileUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/file/FileUtils.java
@@ -14,6 +14,9 @@
 import com.termux.shared.models.errors.FileUtilsErrno;
 import com.termux.shared.models.errors.FunctionErrno;
 
+import org.apache.commons.io.filefilter.AgeFileFilter;
+import org.apache.commons.io.filefilter.IOFileFilter;
+
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.Closeable;
@@ -22,10 +25,15 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
 import java.io.OutputStreamWriter;
+import java.io.Serializable;
 import java.nio.charset.Charset;
 import java.nio.file.LinkOption;
 import java.nio.file.StandardCopyOption;
+import java.util.Calendar;
+import java.util.Iterator;
 import java.util.regex.Pattern;
 
 public class FileUtils {
@@ -100,6 +108,29 @@ public static String normalizePath(String path) {
         return path;
     }
 
+    /**
+     * Convert special characters `\/:*?"<>|` to underscore.
+     *
+     * @param fileName The name to sanitize.
+     * @param sanitizeWhitespaces If set to {@code true}, then white space characters ` \t\n` will be
+     *                            converted.
+     * @param sanitizeWhitespaces If set to {@code true}, then file name will be converted to lowe case.
+     * @return Returns the {@code sanitized name}.
+     */
+    public static String sanitizeFileName(String fileName, boolean sanitizeWhitespaces, boolean toLower) {
+        if (fileName == null) return null;
+
+        if (sanitizeWhitespaces)
+            fileName = fileName.replaceAll("[\\\\/:*?\"<>| \t\n]", "_");
+        else
+            fileName = fileName.replaceAll("[\\\\/:*?\"<>|]", "_");
+
+        if (toLower)
+            return fileName.toLowerCase();
+        else
+            return fileName;
+    }
+
     /**
      * Determines whether path is in {@code dirPath}. The {@code dirPath} is not canonicalized and
      * only normalized.
@@ -996,7 +1027,7 @@ public static Error copyOrMoveFile(String label, final String srcFilePath, final
     /**
      * Delete regular file at path.
      *
-     * This function is a wrapper for {@link #deleteFile(String, String, boolean, int)}.
+     * This function is a wrapper for {@link #deleteFile(String, String, boolean, boolean, int)}.
      *
      * @param label The optional label for file to delete. This can optionally be {@code null}.
      * @param filePath The {@code path} for file to delete.
@@ -1005,13 +1036,13 @@ public static Error copyOrMoveFile(String label, final String srcFilePath, final
      * @return Returns the {@code error} if deletion was not successful, otherwise {@code null}.
      */
     public static Error deleteRegularFile(String label, final String filePath, final boolean ignoreNonExistentFile) {
-        return deleteFile(label, filePath, ignoreNonExistentFile, FileType.REGULAR.getValue());
+        return deleteFile(label, filePath, ignoreNonExistentFile, false, FileType.REGULAR.getValue());
     }
 
     /**
      * Delete directory file at path.
      *
-     * This function is a wrapper for {@link #deleteFile(String, String, boolean, int)}.
+     * This function is a wrapper for {@link #deleteFile(String, String, boolean, boolean, int)}.
      *
      * @param label The optional label for file to delete. This can optionally be {@code null}.
      * @param filePath The {@code path} for file to delete.
@@ -1020,13 +1051,13 @@ public static Error deleteRegularFile(String label, final String filePath, final
      * @return Returns the {@code error} if deletion was not successful, otherwise {@code null}.
      */
     public static Error deleteDirectoryFile(String label, final String filePath, final boolean ignoreNonExistentFile) {
-        return deleteFile(label, filePath, ignoreNonExistentFile, FileType.DIRECTORY.getValue());
+        return deleteFile(label, filePath, ignoreNonExistentFile, false, FileType.DIRECTORY.getValue());
     }
 
     /**
      * Delete symlink file at path.
      *
-     * This function is a wrapper for {@link #deleteFile(String, String, boolean, int)}.
+     * This function is a wrapper for {@link #deleteFile(String, String, boolean, boolean, int)}.
      *
      * @param label The optional label for file to delete. This can optionally be {@code null}.
      * @param filePath The {@code path} for file to delete.
@@ -1035,13 +1066,13 @@ public static Error deleteDirectoryFile(String label, final String filePath, fin
      * @return Returns the {@code error} if deletion was not successful, otherwise {@code null}.
      */
     public static Error deleteSymlinkFile(String label, final String filePath, final boolean ignoreNonExistentFile) {
-        return deleteFile(label, filePath, ignoreNonExistentFile, FileType.SYMLINK.getValue());
+        return deleteFile(label, filePath, ignoreNonExistentFile, false, FileType.SYMLINK.getValue());
     }
 
     /**
      * Delete regular, directory or symlink file at path.
      *
-     * This function is a wrapper for {@link #deleteFile(String, String, boolean, int)}.
+     * This function is a wrapper for {@link #deleteFile(String, String, boolean, boolean, int)}.
      *
      * @param label The optional label for file to delete. This can optionally be {@code null}.
      * @param filePath The {@code path} for file to delete.
@@ -1050,7 +1081,7 @@ public static Error deleteSymlinkFile(String label, final String filePath, final
      * @return Returns the {@code error} if deletion was not successful, otherwise {@code null}.
      */
     public static Error deleteFile(String label, final String filePath, final boolean ignoreNonExistentFile) {
-        return deleteFile(label, filePath, ignoreNonExistentFile, FileTypes.FILE_TYPE_NORMAL_FLAGS);
+        return deleteFile(label, filePath, ignoreNonExistentFile, false, FileTypes.FILE_TYPE_NORMAL_FLAGS);
     }
 
     /**
@@ -1065,6 +1096,8 @@ public static Error deleteFile(String label, final String filePath, final boolea
      * @param filePath The {@code path} for file to delete.
      * @param ignoreNonExistentFile The {@code boolean} that decides if it should be considered an
      *                              error if file to deleted doesn't exist.
+     * @param ignoreWrongFileType The {@code boolean} that decides if it should be considered an
+     *                              error if file type is not one from {@code allowedFileTypeFlags}.
      * @param allowedFileTypeFlags The flags that are matched against the file's {@link FileType} to
      *                             see if it should be deleted or not. This is a safety measure to
      *                             prevent accidental deletion of the wrong type of file, like a
@@ -1072,29 +1105,39 @@ public static Error deleteFile(String label, final String filePath, final boolea
      *                             {@link FileTypes#FILE_TYPE_ANY_FLAGS} to allow deletion of any file type.
      * @return Returns the {@code error} if deletion was not successful, otherwise {@code null}.
      */
-    public static Error deleteFile(String label, final String filePath, final boolean ignoreNonExistentFile, int allowedFileTypeFlags) {
+    public static Error deleteFile(String label, final String filePath, final boolean ignoreNonExistentFile, final boolean ignoreWrongFileType, int allowedFileTypeFlags) {
         label = (label == null ? "" : label + " ");
         if (filePath == null || filePath.isEmpty()) return FunctionErrno.ERRNO_NULL_OR_EMPTY_PARAMETER.getError(label + "file path", "deleteFile");
 
         try {
-            Logger.logVerbose(LOG_TAG, "Deleting " + label + "file at path \"" + filePath + "\"");
-
             File file = new File(filePath);
             FileType fileType = getFileType(filePath, false);
 
+            Logger.logVerbose(LOG_TAG, "Processing delete of " + label + "file at path \"" + filePath + "\" of type \"" + fileType.getName() + "\"");
+
             // If file does not exist
             if (fileType == FileType.NO_EXIST) {
                 // If delete is to be ignored if file does not exist
                 if (ignoreNonExistentFile)
                     return null;
-                    // Else return with error
+                // Else return with error
                 else
                     return FileUtilsErrno.ERRNO_FILE_NOT_FOUND_AT_PATH.getError(label + "file meant to be deleted", filePath);
             }
 
-            // If the file type of the file does not exist in the allowedFileTypeFlags, then return with error
-            if ((allowedFileTypeFlags & fileType.getValue()) <= 0)
+            // If the file type of the file does not exist in the allowedFileTypeFlags
+            if ((allowedFileTypeFlags & fileType.getValue()) <= 0) {
+                // If wrong file type is to be ignored
+                if (ignoreWrongFileType) {
+                    Logger.logVerbose(LOG_TAG, "Ignoring deletion of " + label + "file at path \"" + filePath + "\" not matching allowed file types: " + FileTypes.convertFileTypeFlagsToNamesString(allowedFileTypeFlags));
+                    return null;
+                }
+
+                // Else return with error
                 return FileUtilsErrno.ERRNO_FILE_NOT_AN_ALLOWED_FILE_TYPE.getError(label + "file meant to be deleted", filePath, FileTypes.convertFileTypeFlagsToNamesString(allowedFileTypeFlags));
+            }
+
+            Logger.logVerbose(LOG_TAG, "Deleting " + label + "file at path \"" + filePath + "\"");
 
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                 /*
@@ -1209,6 +1252,77 @@ public static Error clearDirectory(String label, final String filePath) {
         return null;
     }
 
+    /**
+     * Delete files under a directory older than x days.
+     *
+     * The {@code filePath} must be the canonical path to a directory since symlinks will not be followed.
+     * Any symlink files found under the directory will be deleted, but not their targets.
+     *
+     * @param label The optional label for directory to clear. This can optionally be {@code null}.
+     * @param filePath The {@code path} for directory to clear.
+     * @param dirFilter  The optional filter to apply when finding subdirectories.
+     *                   If this parameter is {@code null}, subdirectories will not be included in the
+     *                   search. Use TrueFileFilter.INSTANCE to match all directories.
+     * @param days The x amount of days before which files should be deleted. This must be `>=0`.
+     * @param ignoreNonExistentFile The {@code boolean} that decides if it should be considered an
+     *                              error if file to deleted doesn't exist.
+     * @param allowedFileTypeFlags The flags that are matched against the file's {@link FileType} to
+     *                             see if it should be deleted or not. This is a safety measure to
+     *                             prevent accidental deletion of the wrong type of file, like a
+     *                             directory instead of a regular file. You can pass
+     *                             {@link FileTypes#FILE_TYPE_ANY_FLAGS} to allow deletion of any file type.
+     * @return Returns the {@code error} if deleting was not successful, otherwise {@code null}.
+     */
+    public static Error deleteFilesOlderThanXDays(String label, final String filePath, final IOFileFilter dirFilter, int days, final boolean ignoreNonExistentFile, int allowedFileTypeFlags) {
+        label = (label == null ? "" : label + " ");
+        if (filePath == null || filePath.isEmpty()) return FunctionErrno.ERRNO_NULL_OR_EMPTY_PARAMETER.getError(label + "file path", "deleteFilesOlderThanXDays");
+        if (days < 0) return FunctionErrno.ERRNO_INVALID_PARAMETER.getError(label + "days", "deleteFilesOlderThanXDays", " It must be >= 0.");
+
+        Error error;
+
+        try {
+            Logger.logVerbose(LOG_TAG, "Deleting files under " + label + "directory at path \"" + filePath + "\" older than " + days + " days");
+
+            File file = new File(filePath);
+            FileType fileType = getFileType(filePath, false);
+
+            // If file exists but not a directory file
+            if (fileType != FileType.NO_EXIST && fileType != FileType.DIRECTORY) {
+                return FileUtilsErrno.ERRNO_NON_DIRECTORY_FILE_FOUND.getError(label + "directory");
+            }
+
+            // If file does not exist
+            if (fileType == FileType.NO_EXIST) {
+                // If delete is to be ignored if file does not exist
+                if (ignoreNonExistentFile)
+                    return null;
+                    // Else return with error
+                else
+                    return FileUtilsErrno.ERRNO_FILE_NOT_FOUND_AT_PATH.getError(label + "directory under which files had to be deleted", filePath);
+            }
+
+            // If directory exists, delete its contents
+            Calendar calendar = Calendar.getInstance();
+            calendar.add(Calendar.DATE, -(days));
+            // AgeFileFilter seems to apply to symlink destination timestamp instead of symlink file itself
+            Iterator<File> filesToDelete =
+                org.apache.commons.io.FileUtils.iterateFiles(file, new AgeFileFilter(calendar.getTime()), dirFilter);
+            while (filesToDelete.hasNext()) {
+                File subFile = filesToDelete.next();
+                error = deleteFile(label + " directory sub", subFile.getAbsolutePath(), true, true, allowedFileTypeFlags);
+                if (error != null)
+                    return error;
+            }
+        } catch (Exception e) {
+            return FileUtilsErrno.ERRNO_DELETING_FILES_OLDER_THAN_X_DAYS_FAILED_WITH_EXCEPTION.getError(e, label + "directory", filePath, days, e.getMessage());
+        }
+
+        return null;
+
+    }
+
+
+
 
 
     /**
@@ -1281,6 +1395,72 @@ public static Error readStringFromFile(String label, final String filePath, Char
         return null;
     }
 
+    public static class ReadSerializableObjectResult {
+        public Error error;
+        public Serializable serializableObject;
+
+        ReadSerializableObjectResult(Error error, Serializable serializableObject) {
+            this.error = error;
+            this.serializableObject = serializableObject;
+        }
+    }
+
+    /**
+     * Read a {@link Serializable} object from file at path.
+     *
+     * @param label The optional label for file to read. This can optionally be {@code null}.
+     * @param filePath The {@code path} for file to read.
+     * @param readObjectType The {@link Class} of the object.
+     * @param ignoreNonExistentFile The {@code boolean} that decides if it should be considered an
+     *                              error if file to read doesn't exist.
+     * @return Returns the {@code error} if reading was not successful, otherwise {@code null}.
+     */
+    @NonNull
+    public static <T extends Serializable> ReadSerializableObjectResult readSerializableObjectFromFile(String label, final String filePath, Class<T> readObjectType, final boolean ignoreNonExistentFile) {
+        label = (label == null ? "" : label + " ");
+        if (filePath == null || filePath.isEmpty()) return new ReadSerializableObjectResult(FunctionErrno.ERRNO_NULL_OR_EMPTY_PARAMETER.getError(label + "file path", "readSerializableObjectFromFile"), null);
+
+        Logger.logVerbose(LOG_TAG, "Reading serializable object from " + label + "file at path \"" + filePath + "\"");
+
+        T serializableObject;
+
+        FileType fileType = getFileType(filePath, false);
+
+        // If file exists but not a regular file
+        if (fileType != FileType.NO_EXIST && fileType != FileType.REGULAR) {
+            return new ReadSerializableObjectResult(FileUtilsErrno.ERRNO_NON_REGULAR_FILE_FOUND.getError(label + "file"), null);
+        }
+
+        // If file does not exist
+        if (fileType == FileType.NO_EXIST) {
+            // If reading is to be ignored if file does not exist
+            if (ignoreNonExistentFile)
+                return new ReadSerializableObjectResult(null, null);
+                // Else return with error
+            else
+                return new ReadSerializableObjectResult(FileUtilsErrno.ERRNO_FILE_NOT_FOUND_AT_PATH.getError(label + "file meant to be read", filePath), null);
+        }
+
+        FileInputStream fileInputStream = null;
+        ObjectInputStream objectInputStream = null;
+        try {
+            // Read string from file
+            fileInputStream = new FileInputStream(filePath);
+            objectInputStream = new ObjectInputStream(fileInputStream);
+            //serializableObject = (T) objectInputStream.readObject();
+            serializableObject = readObjectType.cast(objectInputStream.readObject());
+
+            //Logger.logVerbose(LOG_TAG, Logger.getMultiLineLogStringEntry("String", DataUtils.getTruncatedCommandOutput(dataStringBuilder.toString(), Logger.LOGGER_ENTRY_MAX_SAFE_PAYLOAD, true, false, true), "-"));
+        } catch (Exception e) {
+            return new ReadSerializableObjectResult(FileUtilsErrno.ERRNO_READING_SERIALIZABLE_OBJECT_TO_FILE_FAILED_WITH_EXCEPTION.getError(e, label + "file", filePath, e.getMessage()), null);
+        } finally {
+            closeCloseable(fileInputStream);
+            closeCloseable(objectInputStream);
+        }
+
+        return new ReadSerializableObjectResult(null, serializableObject);
+    }
+
     /**
      * Write the {@link String} {@code dataString} with a specific {@link Charset} to file at path.
      *
@@ -1288,6 +1468,7 @@ public static Error readStringFromFile(String label, final String filePath, Char
      * @param filePath The {@code path} for file to write.
      * @param charset The {@link Charset} of the {@code dataString}. If this is {@code null},
      *                then default {@link Charset} will be used.
+     * @param dataString The data to write to file.
      * @param append The {@code boolean} that decides if file should be appended to or not.
      * @return Returns the {@code error} if writing was not successful, otherwise {@code null}.
      */
@@ -1299,15 +1480,7 @@ public static Error writeStringToFile(String label, final String filePath, Chars
 
         Error error;
 
-        FileType fileType = getFileType(filePath, false);
-
-        // If file exists but not a regular file
-        if (fileType != FileType.NO_EXIST && fileType != FileType.REGULAR) {
-            return FileUtilsErrno.ERRNO_NON_REGULAR_FILE_FOUND.getError(label + "file");
-        }
-
-        // Create the file parent directory
-        error = createParentDirectoryFile(label + "file parent", filePath);
+        error = preWriteToFile(label, filePath);
         if (error != null)
             return error;
 
@@ -1337,6 +1510,63 @@ public static Error writeStringToFile(String label, final String filePath, Chars
         return null;
     }
 
+    /**
+     * Write the {@link Serializable} {@code serializableObject} to file at path.
+     *
+     * @param label The optional label for file to write. This can optionally be {@code null}.
+     * @param filePath The {@code path} for file to write.
+     * @param serializableObject The object to write to file.
+     * @return Returns the {@code error} if writing was not successful, otherwise {@code null}.
+     */
+    public static <T extends Serializable> Error writeSerializableObjectToFile(String label, final String filePath, final T serializableObject) {
+        label = (label == null ? "" : label + " ");
+        if (filePath == null || filePath.isEmpty()) return FunctionErrno.ERRNO_NULL_OR_EMPTY_PARAMETER.getError(label + "file path", "writeSerializableObjectToFile");
+
+        Logger.logVerbose(LOG_TAG, "Writing serializable object to " + label + "file at path \"" + filePath + "\"");
+
+        Error error;
+
+        error = preWriteToFile(label, filePath);
+        if (error != null)
+            return error;
+
+        FileOutputStream fileOutputStream = null;
+        ObjectOutputStream objectOutputStream = null;
+        try {
+            // Write object to file
+            fileOutputStream = new FileOutputStream(filePath);
+            objectOutputStream = new ObjectOutputStream(fileOutputStream);
+
+            objectOutputStream.writeObject(serializableObject);
+            objectOutputStream.flush();
+        } catch (Exception e) {
+            return FileUtilsErrno.ERRNO_WRITING_SERIALIZABLE_OBJECT_TO_FILE_FAILED_WITH_EXCEPTION.getError(e, label + "file", filePath, e.getMessage());
+        } finally {
+            closeCloseable(fileOutputStream);
+            closeCloseable(objectOutputStream);
+        }
+
+        return null;
+    }
+
+    private static Error preWriteToFile(String label, String filePath) {
+        Error error;
+
+        FileType fileType = getFileType(filePath, false);
+
+        // If file exists but not a regular file
+        if (fileType != FileType.NO_EXIST && fileType != FileType.REGULAR) {
+            return FileUtilsErrno.ERRNO_NON_REGULAR_FILE_FOUND.getError(label + "file");
+        }
+
+        // Create the file parent directory
+        error = createParentDirectoryFile(label + "file parent", filePath);
+        if (error != null)
+            return error;
+
+        return null;
+    }
+
 
 
     /**
diff --git a/termux-shared/src/main/java/com/termux/shared/models/errors/FileUtilsErrno.java b/termux-shared/src/main/java/com/termux/shared/models/errors/FileUtilsErrno.java
index 2935d7a4cb..48b4b09662 100644
--- a/termux-shared/src/main/java/com/termux/shared/models/errors/FileUtilsErrno.java
+++ b/termux-shared/src/main/java/com/termux/shared/models/errors/FileUtilsErrno.java
@@ -56,6 +56,7 @@ public class FileUtilsErrno extends Errno {
     public static final Errno ERRNO_DELETING_FILE_FAILED_WITH_EXCEPTION = new Errno(TYPE, 301, "Deleting %1$s at path \"%2$s\" failed.\nException: %3$s");
     public static final Errno ERRNO_CLEARING_DIRECTORY_FAILED_WITH_EXCEPTION = new Errno(TYPE, 302, "Clearing %1$s at path \"%2$s\" failed.\nException: %3$s");
     public static final Errno ERRNO_FILE_STILL_EXISTS_AFTER_DELETING = new Errno(TYPE, 303, "The %1$s still exists after deleting it from \"%2$s\".");
+    public static final Errno ERRNO_DELETING_FILES_OLDER_THAN_X_DAYS_FAILED_WITH_EXCEPTION = new Errno(TYPE, 304, "Deleting %1$s under directory at path \"%2$s\" old than %3$s days failed.\nException: %4$s");
 
 
 
@@ -64,6 +65,8 @@ public class FileUtilsErrno extends Errno {
     public static final Errno ERRNO_WRITING_STRING_TO_FILE_FAILED_WITH_EXCEPTION = new Errno(TYPE, 351, "Writing string to %1$s at path \"%2$s\" failed.\nException: %3$s");
     public static final Errno ERRNO_UNSUPPORTED_CHARSET = new Errno(TYPE, 352, "Unsupported charset \"%1$s\"");
     public static final Errno ERRNO_CHECKING_IF_CHARSET_SUPPORTED_FAILED = new Errno(TYPE, 353, "Checking if charset \"%1$s\" is supported failed.\nException: %2$s");
+    public static final Errno ERRNO_READING_SERIALIZABLE_OBJECT_TO_FILE_FAILED_WITH_EXCEPTION = new Errno(TYPE, 354, "Reading serializable object from %1$s at path \"%2$s\" failed.\nException: %3$s");
+    public static final Errno ERRNO_WRITING_SERIALIZABLE_OBJECT_TO_FILE_FAILED_WITH_EXCEPTION = new Errno(TYPE, 355, "Writing serializable object to %1$s at path \"%2$s\" failed.\nException: %3$s");
 
 
 
diff --git a/termux-shared/src/main/java/com/termux/shared/models/errors/FunctionErrno.java b/termux-shared/src/main/java/com/termux/shared/models/errors/FunctionErrno.java
index 8d099b3496..bade0e1d85 100644
--- a/termux-shared/src/main/java/com/termux/shared/models/errors/FunctionErrno.java
+++ b/termux-shared/src/main/java/com/termux/shared/models/errors/FunctionErrno.java
@@ -11,6 +11,7 @@ public class FunctionErrno extends Errno {
     public static final Errno ERRNO_NULL_OR_EMPTY_PARAMETERS = new Errno(TYPE, 101, "The %1$s parameters passed to \"%2$s\" are null or empty.");
     public static final Errno ERRNO_UNSET_PARAMETER = new Errno(TYPE, 102, "The %1$s parameter passed to \"%2$s\" must be set.");
     public static final Errno ERRNO_UNSET_PARAMETERS = new Errno(TYPE, 103, "The %1$s parameters passed to \"%2$s\" must be set.");
+    public static final Errno ERRNO_INVALID_PARAMETER = new Errno(TYPE, 104, "The %1$s parameter passed to \"%2$s\" is invalid.\"%3$s\"");
 
 
     FunctionErrno(final String type, final int code, final String message) {

From baacabdfbf89be1275acf9a090bf75f841550cf9 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Fri, 20 Aug 2021 22:12:01 +0500
Subject: [PATCH 503/912] Added!: Support for delete intent for
 Notification.Builder in NotificationUtils

---
 .../java/com/termux/app/RunCommandService.java    |  2 +-
 .../main/java/com/termux/app/TermuxService.java   |  4 ++--
 .../java/com/termux/app/utils/CrashUtils.java     | 13 ++++++++-----
 .../java/com/termux/app/utils/PluginUtils.java    | 15 ++++++++++-----
 .../shared/notification/NotificationUtils.java    | 11 ++++++++---
 5 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/com/termux/app/RunCommandService.java b/app/src/main/java/com/termux/app/RunCommandService.java
index 2d1d3fe22c..0c8903ba92 100644
--- a/app/src/main/java/com/termux/app/RunCommandService.java
+++ b/app/src/main/java/com/termux/app/RunCommandService.java
@@ -247,7 +247,7 @@ private Notification buildNotification() {
         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, NotificationUtils.NOTIFICATION_MODE_SILENT);
+            null, null, NotificationUtils.NOTIFICATION_MODE_SILENT);
         if (builder == null)  return null;
 
         // No need to show a timestamp:
diff --git a/app/src/main/java/com/termux/app/TermuxService.java b/app/src/main/java/com/termux/app/TermuxService.java
index 06a25754df..bb3f38c80d 100644
--- a/app/src/main/java/com/termux/app/TermuxService.java
+++ b/app/src/main/java/com/termux/app/TermuxService.java
@@ -708,7 +708,7 @@ private Notification buildNotification() {
 
         // Set pending intent to be launched when notification is clicked
         Intent notificationIntent = TermuxActivity.newInstance(this);
-        PendingIntent pendingIntent = PendingIntent.getActivity(this, 0, notificationIntent, 0);
+        PendingIntent contentIntent = PendingIntent.getActivity(this, 0, notificationIntent, 0);
 
 
         // Set notification text
@@ -733,7 +733,7 @@ private Notification buildNotification() {
         Notification.Builder builder =  NotificationUtils.geNotificationBuilder(this,
             TermuxConstants.TERMUX_APP_NOTIFICATION_CHANNEL_ID, priority,
             getText(R.string.application_name), notificationText, null,
-            pendingIntent, NotificationUtils.NOTIFICATION_MODE_SILENT);
+            contentIntent, null, NotificationUtils.NOTIFICATION_MODE_SILENT);
         if (builder == null)  return null;
 
         // No need to show a timestamp:
diff --git a/app/src/main/java/com/termux/app/utils/CrashUtils.java b/app/src/main/java/com/termux/app/utils/CrashUtils.java
index f9ebe779b3..6cc66ebe4e 100644
--- a/app/src/main/java/com/termux/app/utils/CrashUtils.java
+++ b/app/src/main/java/com/termux/app/utils/CrashUtils.java
@@ -132,13 +132,15 @@ public static void sendCrashReportNotification(final Context context, String log
         }
 
         Intent notificationIntent = ReportActivity.newInstance(context, new ReportInfo(UserAction.CRASH_REPORT.getName(), logTag, title, null, reportString.toString(), "\n\n" + TermuxUtils.getReportIssueMarkdownString(context), true));
-        PendingIntent pendingIntent = PendingIntent.getActivity(context, 0, notificationIntent, PendingIntent.FLAG_UPDATE_CURRENT);
+        PendingIntent contentIntent = PendingIntent.getActivity(context, 0, notificationIntent, PendingIntent.FLAG_UPDATE_CURRENT);
+        PendingIntent deleteIntent = null;
 
         // 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);
+        Notification.Builder builder = getCrashReportsNotificationBuilder(context, title, null,
+            null, contentIntent, deleteIntent, NotificationUtils.NOTIFICATION_MODE_VIBRATE);
         if (builder == null) return;
 
         // Send the notification
@@ -156,16 +158,17 @@ public static void sendCrashReportNotification(final Context context, String log
      * @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 pendingIntent The {@link PendingIntent} which should be sent when notification is clicked.
+     * @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 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 pendingIntent, final int notificationMode) {
+    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) {
 
         Notification.Builder builder =  NotificationUtils.geNotificationBuilder(context,
             TermuxConstants.TERMUX_CRASH_REPORTS_NOTIFICATION_CHANNEL_ID, Notification.PRIORITY_HIGH,
-            title, notificationText, notificationBigText, pendingIntent, notificationMode);
+            title, notificationText, notificationBigText, contentIntent, deleteIntent, notificationMode);
 
         if (builder == null)  return null;
 
diff --git a/app/src/main/java/com/termux/app/utils/PluginUtils.java b/app/src/main/java/com/termux/app/utils/PluginUtils.java
index 3b445339e3..3691508ace 100644
--- a/app/src/main/java/com/termux/app/utils/PluginUtils.java
+++ b/app/src/main/java/com/termux/app/utils/PluginUtils.java
@@ -220,7 +220,8 @@ public static void sendPluginCommandErrorNotification(Context context, String lo
         reportString.append("\n\n").append(AndroidUtils.getDeviceInfoMarkdownString(context));
 
         Intent notificationIntent = ReportActivity.newInstance(context, new ReportInfo(UserAction.PLUGIN_EXECUTION_COMMAND.getName(), logTag, title, null, reportString.toString(), null,true));
-        PendingIntent pendingIntent = PendingIntent.getActivity(context, 0, notificationIntent, PendingIntent.FLAG_UPDATE_CURRENT);
+        PendingIntent contentIntent = PendingIntent.getActivity(context, 0, notificationIntent, PendingIntent.FLAG_UPDATE_CURRENT);
+        PendingIntent deleteIntent = null;
 
         // Setup the notification channel if not already set up
         setupPluginCommandErrorsNotificationChannel(context);
@@ -230,7 +231,8 @@ public static void sendPluginCommandErrorNotification(Context context, String lo
         //CharSequence notificationTextCharSequence = notificationTextString;
 
         // Build the notification
-        Notification.Builder builder = getPluginCommandErrorsNotificationBuilder(context, title, notificationTextCharSequence, notificationTextCharSequence, pendingIntent, NotificationUtils.NOTIFICATION_MODE_VIBRATE);
+        Notification.Builder builder = getPluginCommandErrorsNotificationBuilder(context, title,
+            notificationTextCharSequence, notificationTextCharSequence, contentIntent, deleteIntent, NotificationUtils.NOTIFICATION_MODE_VIBRATE);
         if (builder == null) return;
 
         // Send the notification
@@ -248,16 +250,19 @@ public static void sendPluginCommandErrorNotification(Context context, String lo
      * @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 pendingIntent The {@link PendingIntent} which should be sent when notification is clicked.
+     * @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 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 pendingIntent, final int notificationMode) {
+    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) {
 
         Notification.Builder builder =  NotificationUtils.geNotificationBuilder(context,
             TermuxConstants.TERMUX_PLUGIN_COMMAND_ERRORS_NOTIFICATION_CHANNEL_ID, Notification.PRIORITY_HIGH,
-            title, notificationText, notificationBigText, pendingIntent, notificationMode);
+            title, notificationText, notificationBigText, contentIntent, deleteIntent, notificationMode);
 
         if (builder == null)  return null;
 
diff --git a/termux-shared/src/main/java/com/termux/shared/notification/NotificationUtils.java b/termux-shared/src/main/java/com/termux/shared/notification/NotificationUtils.java
index c4250cedf4..25597a2037 100644
--- a/termux-shared/src/main/java/com/termux/shared/notification/NotificationUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/notification/NotificationUtils.java
@@ -53,20 +53,25 @@ public static NotificationManager getNotificationManager(final Context context)
      * @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 pendingIntent The {@link PendingIntent} which should be sent when notification is clicked.
+     * @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 notificationMode The notification mode. It must be one of {@code NotificationUtils.NOTIFICATION_MODE_*}.
      *                         The builder returned will be {@code null} if {@link #NOTIFICATION_MODE_NONE}
      *                         is passed. That case should ideally be handled before calling this function.
      * @return Returns the {@link Notification.Builder}.
      */
     @Nullable
-    public static Notification.Builder geNotificationBuilder(final Context context, final String channelId, final int priority, final CharSequence title, final CharSequence notificationText, final CharSequence notificationBigText, final PendingIntent pendingIntent, final int notificationMode) {
+    public static Notification.Builder geNotificationBuilder(
+        final Context context, final String channelId, final int priority, final CharSequence title,
+        final CharSequence notificationText, final CharSequence notificationBigText,
+        final PendingIntent contentIntent, final PendingIntent deleteIntent, final int notificationMode) {
         if (context == null) return null;
         Notification.Builder builder = new Notification.Builder(context);
         builder.setContentTitle(title);
         builder.setContentText(notificationText);
         builder.setStyle(new Notification.BigTextStyle().bigText(notificationBigText));
-        builder.setContentIntent(pendingIntent);
+        builder.setContentIntent(contentIntent);
+        builder.setDeleteIntent(deleteIntent);
 
         builder.setPriority(priority);
 

From e7fc60af728b6b932bceb621ca6664ed90415720 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Fri, 20 Aug 2021 22:20:18 +0500
Subject: [PATCH 504/912] Fixed: New plugin error or crash notifications
 overriding content of old ones

---
 app/src/main/java/com/termux/app/utils/CrashUtils.java  | 6 ++++--
 app/src/main/java/com/termux/app/utils/PluginUtils.java | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/termux/app/utils/CrashUtils.java b/app/src/main/java/com/termux/app/utils/CrashUtils.java
index 6cc66ebe4e..b2189be529 100644
--- a/app/src/main/java/com/termux/app/utils/CrashUtils.java
+++ b/app/src/main/java/com/termux/app/utils/CrashUtils.java
@@ -132,7 +132,10 @@ public static void sendCrashReportNotification(final Context context, String log
         }
 
         Intent notificationIntent = ReportActivity.newInstance(context, new ReportInfo(UserAction.CRASH_REPORT.getName(), logTag, title, null, reportString.toString(), "\n\n" + TermuxUtils.getReportIssueMarkdownString(context), true));
-        PendingIntent contentIntent = PendingIntent.getActivity(context, 0, notificationIntent, PendingIntent.FLAG_UPDATE_CURRENT);
+
+        // 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, notificationIntent, PendingIntent.FLAG_UPDATE_CURRENT);
         PendingIntent deleteIntent = null;
 
         // Setup the notification channel if not already set up
@@ -144,7 +147,6 @@ public static void sendCrashReportNotification(final Context context, String log
         if (builder == null) return;
 
         // Send the notification
-        int nextNotificationId = TermuxNotificationUtils.getNextNotificationId(context);
         NotificationManager notificationManager = NotificationUtils.getNotificationManager(context);
         if (notificationManager != null)
             notificationManager.notify(nextNotificationId, builder.build());
diff --git a/app/src/main/java/com/termux/app/utils/PluginUtils.java b/app/src/main/java/com/termux/app/utils/PluginUtils.java
index 3691508ace..41e11c573a 100644
--- a/app/src/main/java/com/termux/app/utils/PluginUtils.java
+++ b/app/src/main/java/com/termux/app/utils/PluginUtils.java
@@ -220,7 +220,10 @@ public static void sendPluginCommandErrorNotification(Context context, String lo
         reportString.append("\n\n").append(AndroidUtils.getDeviceInfoMarkdownString(context));
 
         Intent notificationIntent = ReportActivity.newInstance(context, new ReportInfo(UserAction.PLUGIN_EXECUTION_COMMAND.getName(), logTag, title, null, reportString.toString(), null,true));
-        PendingIntent contentIntent = PendingIntent.getActivity(context, 0, notificationIntent, PendingIntent.FLAG_UPDATE_CURRENT);
+
+        // 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, notificationIntent, PendingIntent.FLAG_UPDATE_CURRENT);
         PendingIntent deleteIntent = null;
 
         // Setup the notification channel if not already set up
@@ -236,7 +239,6 @@ public static void sendPluginCommandErrorNotification(Context context, String lo
         if (builder == null) return;
 
         // Send the notification
-        int nextNotificationId = TermuxNotificationUtils.getNextNotificationId(context);
         NotificationManager notificationManager = NotificationUtils.getNotificationManager(context);
         if (notificationManager != null)
             notificationManager.notify(nextNotificationId, builder.build());

From 351934a6198ce198d9b9337261f1825fe8b71034 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Fri, 20 Aug 2021 23:31:01 +0500
Subject: [PATCH 505/912] Added|Fixed!: Added support to save reports to files
 and fixed large reports generating TransactionTooLargeException

If `ReportActivity` was started with a large report, i.e a few hundred `KB`, like for terminal transcript or other command output, the activity start would fail. To solve the issue, if the serialized size of the ReportInfo info object is above `DataUtils.TRANSACTION_SIZE_LIMIT_IN_BYTES` (`100KB`), it will be saved to a file in a cache directory `/data/data/com.termux/cache/report_activity` as a serialized object and loaded when activity is started. The file will be automatically deleted when activity is destroyed (`Activity.onDetroy()`) or when notification that would have started the activity is deleted (`Notification.deleteIntent`). In case, these two didn't happen, then on `TermuxActivity` startup, a thread will be started to delete files older than `14` days so that unneeded left over files are deleted. If user tries to open plugin error or crash report notifications after 14 days, they will get `ReportInfo` file not found errors, assuming `TermuxActivity` was started to run the cleanup routine.

Now these large reports can't be copied or shared with other apps since that would again result in `TransactionTooLargeException` exceptions and `ShareUtils` automatically truncates the data (now from end) to `100KB` length so that the exception doesn't occur. So now a `Save To File` option has been added in context menu (3 dots on top right) of `ReportActivity` so that large or small reports can be saved to a file if needed. They will be save in root of `/storage/emulated/0` or whatever is the default public external storage directory. The filename would depend on type of report. The storage permissions will be asked if missing. On android `11`, if you get permission denied errors even after granting permission, disable permission and grant it again. To solve privacy issues of report being saved to public storage since it may contain private info, an option for custom path will be added in future. The default directory is public storage instead of termux home since its easily accessible via all file managers or from pc. Instructing amateur users to get files via `SAF` from termux home is not something I wanna take on.

Another issue is that `ReportActivity` itself may not be able to show the entire report since Android may throw `OutOfMemoryError` exceptions if device memory is low. To solve this issue, `ReportActivity` will truncate the report to `1MB` from end that's shown to the user. It will add a header showing that report was truncated. To view the full report, the user will have to use the `Save To File` option and view the file in an external app or on pc that supports opening large files. The `QuickEdit` app on Android has been a reliable one in my experience that supports large files, although it has max row/column limits too at a few hundred thousand, depending on android version.

Despite all this, `OutOfMemoryError` exceptions could still be thrown if you try to view too large a report, like a few MB, since original report + the truncated report is still held in memory by the app and will consume `2-3` times memory when saving. It's fun coding for android, right?

The terminal transcript will not be truncated anymore that's generated via `Report Issue` option in terminal.

The `ShareUtils.copyTextToClipboard()` will truncate data now automatically, apparently all phones don't do it automatically and exception is raised.

The `ShareUtils.saveTextToFile()` has been added that will automatically ask for storage permissions if missing.

The `ReportInfo` now expects a `reportSaveFileLabel` and `reportSaveFilePath` arguments so that `ReportActivity` can use them to know where to save the file if users selects `Save To File` option.

The `ReportActivityBroadcastReceiver` must now be registered in `AndroidManifest.xml` if you are using `ReportActivity` in your app. Check `ReportActivity` javadoc for details. Moreover, an incremental call to `ReportActivity.deleteReportInfoFilesOlderThanXDays()` must also be made.
---
 app/src/main/AndroidManifest.xml              |   2 +
 .../java/com/termux/app/TermuxActivity.java   |   4 +
 .../app/activities/SettingsActivity.java      |  10 +-
 .../terminal/TermuxTerminalViewClient.java    |  18 +-
 .../java/com/termux/app/utils/CrashUtils.java |  17 +-
 .../com/termux/app/utils/PluginUtils.java     |  18 +-
 app/src/main/res/values/strings.xml           |   1 +
 .../shared/activities/ReportActivity.java     | 364 ++++++++++++++++--
 .../termux/shared/interact/ShareUtils.java    |  63 ++-
 .../com/termux/shared/models/ReportInfo.java  |  23 +-
 .../src/main/res/menu/menu_report.xml         |   5 +
 termux-shared/src/main/res/values/strings.xml |   4 +
 12 files changed, 470 insertions(+), 59 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d2357492cf..c6ce0ea623 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -168,6 +168,8 @@
 
         <receiver android:name=".app.TermuxOpenReceiver" />
 
+        <receiver android:name=".shared.activities.ReportActivity$ReportActivityBroadcastReceiver"  android:exported="false" />
+
         <provider
             android:name=".app.TermuxOpenReceiver$ContentProvider"
             android:authorities="${TERMUX_PACKAGE_NAME}.files"
diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index 5981778441..257ec38993 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -33,6 +33,7 @@
 
 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;
@@ -182,6 +183,9 @@ public void onCreate(Bundle savedInstanceState) {
         // notification with the crash details if it did
         CrashUtils.notifyAppCrashOnLastRun(this, LOG_TAG);
 
+        // Delete ReportInfo serialized object files from cache older than 14 days
+        ReportActivity.deleteReportInfoFilesOlderThanXDays(this, 14, false);
+
         // Load termux shared properties
         mProperties = new TermuxAppSharedProperties(this);
 
diff --git a/app/src/main/java/com/termux/app/activities/SettingsActivity.java b/app/src/main/java/com/termux/app/activities/SettingsActivity.java
index 1ae903a6ec..b4f046b8a4 100644
--- a/app/src/main/java/com/termux/app/activities/SettingsActivity.java
+++ b/app/src/main/java/com/termux/app/activities/SettingsActivity.java
@@ -2,6 +2,7 @@
 
 import android.content.Context;
 import android.os.Bundle;
+import android.os.Environment;
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.ActionBar;
@@ -11,6 +12,7 @@
 
 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;
@@ -86,7 +88,13 @@ public void run() {
                             aboutString.append("\n\n").append(AndroidUtils.getDeviceInfoMarkdownString(context));
                             aboutString.append("\n\n").append(TermuxUtils.getImportantLinksMarkdownString(context));
 
-                            ReportActivity.startReportActivity(context, new ReportInfo(UserAction.ABOUT.getName(), TermuxConstants.TERMUX_APP.TERMUX_SETTINGS_ACTIVITY_NAME, title, null, aboutString.toString(), null, false));
+                            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();
 
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
index 705838acaf..05f5408931 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
@@ -9,6 +9,7 @@
 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;
@@ -22,6 +23,7 @@
 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.shell.ShellUtils;
 import com.termux.shared.terminal.TermuxTerminalViewClientBase;
 import com.termux.shared.termux.AndroidUtils;
@@ -668,15 +670,13 @@ public void reportIssueFromTranscript() {
         new Thread() {
             @Override
             public void run() {
-
-                String transcriptTextTruncated = DataUtils.getTruncatedCommandOutput(transcriptText, DataUtils.TRANSACTION_SIZE_LIMIT_IN_BYTES, false, true, false).trim();
-
                 StringBuilder reportString = new StringBuilder();
 
                 String title = TermuxConstants.TERMUX_APP_NAME + " Report Issue";
 
                 reportString.append("## Transcript\n");
-                reportString.append("\n").append(MarkdownUtils.getMarkdownCodeForString(transcriptTextTruncated, true));
+                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(AndroidUtils.getDeviceInfoMarkdownString(mActivity));
@@ -685,7 +685,15 @@ public void run() {
                 if (termuxAptInfo != null)
                     reportString.append("\n\n").append(termuxAptInfo);
 
-                ReportActivity.startReportActivity(mActivity, new ReportInfo(UserAction.REPORT_ISSUE_FROM_TRANSCRIPT.getName(), TermuxConstants.TERMUX_APP.TERMUX_ACTIVITY_NAME, title, null, reportString.toString(), "\n\n" + TermuxUtils.getReportIssueMarkdownString(mActivity), false));
+                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();
     }
diff --git a/app/src/main/java/com/termux/app/utils/CrashUtils.java b/app/src/main/java/com/termux/app/utils/CrashUtils.java
index b2189be529..73e7d676f2 100644
--- a/app/src/main/java/com/termux/app/utils/CrashUtils.java
+++ b/app/src/main/java/com/termux/app/utils/CrashUtils.java
@@ -4,7 +4,7 @@
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.content.Context;
-import android.content.Intent;
+import android.os.Environment;
 
 import androidx.annotation.Nullable;
 
@@ -131,12 +131,23 @@ public static void sendCrashReportNotification(final Context context, String log
             reportString.append("\n\n").append(AndroidUtils.getDeviceInfoMarkdownString(context));
         }
 
-        Intent notificationIntent = ReportActivity.newInstance(context, new ReportInfo(UserAction.CRASH_REPORT.getName(), logTag, title, null, reportString.toString(), "\n\n" + TermuxUtils.getReportIssueMarkdownString(context), true));
+        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, notificationIntent, PendingIntent.FLAG_UPDATE_CURRENT);
+
+        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);
diff --git a/app/src/main/java/com/termux/app/utils/PluginUtils.java b/app/src/main/java/com/termux/app/utils/PluginUtils.java
index 41e11c573a..3fbd40ebd7 100644
--- a/app/src/main/java/com/termux/app/utils/PluginUtils.java
+++ b/app/src/main/java/com/termux/app/utils/PluginUtils.java
@@ -4,12 +4,13 @@
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.content.Context;
-import android.content.Intent;
+import android.os.Environment;
 
 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;
@@ -219,12 +220,23 @@ public static void sendPluginCommandErrorNotification(Context context, String lo
         reportString.append("\n\n").append(TermuxUtils.getAppInfoMarkdownString(context, true));
         reportString.append("\n\n").append(AndroidUtils.getDeviceInfoMarkdownString(context));
 
-        Intent notificationIntent = ReportActivity.newInstance(context, new ReportInfo(UserAction.PLUGIN_EXECUTION_COMMAND.getName(), logTag, title, null, reportString.toString(), null,true));
+        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, notificationIntent, PendingIntent.FLAG_UPDATE_CURRENT);
+
+        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
         setupPluginCommandErrorsNotificationChannel(context);
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e81fb7049d..353da4536f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -78,6 +78,7 @@
 
     <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>
diff --git a/termux-shared/src/main/java/com/termux/shared/activities/ReportActivity.java b/termux-shared/src/main/java/com/termux/shared/activities/ReportActivity.java
index e960ff050f..b42a5867aa 100644
--- a/termux-shared/src/main/java/com/termux/shared/activities/ReportActivity.java
+++ b/termux-shared/src/main/java/com/termux/shared/activities/ReportActivity.java
@@ -7,36 +7,71 @@
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
+import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 
 import com.termux.shared.R;
+import com.termux.shared.data.DataUtils;
+import com.termux.shared.file.FileUtils;
+import com.termux.shared.file.filesystem.FileType;
+import com.termux.shared.logger.Logger;
+import com.termux.shared.models.errors.Error;
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.markdown.MarkdownUtils;
 import com.termux.shared.interact.ShareUtils;
 import com.termux.shared.models.ReportInfo;
 
 import org.commonmark.node.FencedCodeBlock;
+import org.jetbrains.annotations.NotNull;
 
 import io.noties.markwon.Markwon;
 import io.noties.markwon.recycler.MarkwonAdapter;
 import io.noties.markwon.recycler.SimpleEntry;
 
+/**
+ * An activity to show reports in markdown format as per CommonMark spec.
+ * Add Following to `AndroidManifest.xml` to use in an app:
+ * {@code `<activity android:name="com.termux.shared.activities.ReportActivity" android:theme="@style/Theme.AppCompat.TermuxReportActivity" android:documentLaunchMode="intoExisting" />` }
+ * and
+ * {@code `<receiver android:name="com.termux.shared.activities.ReportActivity$ReportActivityBroadcastReceiver"  android:exported="false" />` }
+ * Receiver **must not** be `exported="true"`!!!
+ *
+ * Also make an incremental call to {@link #deleteReportInfoFilesOlderThanXDays(Context, int, boolean)}
+ * in the app to cleanup cached files.
+ */
 public class ReportActivity extends AppCompatActivity {
 
-    private static final String EXTRA_REPORT_INFO = "report_info";
+    private static final String CLASS_NAME = ReportActivity.class.getCanonicalName();
+    private static final String ACTION_DELETE_REPORT_INFO_OBJECT_FILE = CLASS_NAME + ".ACTION_DELETE_REPORT_INFO_OBJECT_FILE";
+
+    private static final String EXTRA_REPORT_INFO_OBJECT = CLASS_NAME + ".EXTRA_REPORT_INFO_OBJECT";
+    private static final String EXTRA_REPORT_INFO_OBJECT_FILE_PATH = CLASS_NAME + ".EXTRA_REPORT_INFO_OBJECT_FILE_PATH";
+
+    private static final String CACHE_DIR_BASENAME = "report_activity";
+    private static final String CACHE_FILE_BASENAME_PREFIX = "report_info_";
+
+    public static final int REQUEST_GRANT_STORAGE_PERMISSION_FOR_SAVE_FILE = 1000;
+
+    public static final int ACTIVITY_TEXT_SIZE_LIMIT_IN_BYTES = 1000 * 1024; // 1MB
 
     ReportInfo mReportInfo;
-    String mReportMarkdownString;
+    String mReportInfoFilePath;
     String mReportActivityMarkdownString;
+    Bundle mBundle;
+
+    private static final String LOG_TAG = "ReportActivity";
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        Logger.logVerbose(LOG_TAG, "onCreate");
+
         setContentView(R.layout.activity_report);
 
         Toolbar toolbar = findViewById(R.id.toolbar);
@@ -44,38 +79,65 @@ protected void onCreate(Bundle savedInstanceState) {
             setSupportActionBar(toolbar);
         }
 
-        Bundle bundle = null;
+        mBundle = null;
         Intent intent = getIntent();
         if (intent != null)
-            bundle = intent.getExtras();
+            mBundle = intent.getExtras();
         else if (savedInstanceState != null)
-            bundle = savedInstanceState;
+            mBundle = savedInstanceState;
 
-        updateUI(bundle);
+        updateUI();
 
     }
 
     @Override
     protected void onNewIntent(Intent intent) {
         super.onNewIntent(intent);
+        Logger.logVerbose(LOG_TAG, "onNewIntent");
+
         setIntent(intent);
 
-        if (intent != null)
-            updateUI(intent.getExtras());
+        if (intent != null) {
+            deleteReportInfoFile(this, mReportInfoFilePath);
+            mBundle = intent.getExtras();
+            updateUI();
+        }
     }
 
-    private void updateUI(Bundle bundle) {
+    private void updateUI() {
 
-        if (bundle == null) {
-            finish();
-            return;
+        if (mBundle == null) {
+            finish(); return;
         }
 
-        mReportInfo = (ReportInfo) bundle.getSerializable(EXTRA_REPORT_INFO);
+        mReportInfo = null;
+        mReportInfoFilePath =null;
+
+        if (mBundle.containsKey(EXTRA_REPORT_INFO_OBJECT_FILE_PATH)) {
+            mReportInfoFilePath = mBundle.getString(EXTRA_REPORT_INFO_OBJECT_FILE_PATH);
+            Logger.logVerbose(LOG_TAG, ReportInfo.class.getSimpleName() + " serialized object will be read from file at path \"" + mReportInfoFilePath + "\"");
+            if (mReportInfoFilePath != null) {
+                try {
+                    FileUtils.ReadSerializableObjectResult result = FileUtils.readSerializableObjectFromFile(ReportInfo.class.getSimpleName(), mReportInfoFilePath, ReportInfo.class, false);
+                    if (result.error != null) {
+                        Logger.logErrorExtended(LOG_TAG, result.error.toString());
+                        Logger.showToast(this, Error.getMinimalErrorString(result.error), true);
+                        finish(); return;
+                    } else {
+                        if (result.serializableObject != null)
+                            mReportInfo = (ReportInfo) result.serializableObject;
+                    }
+                } catch (Exception e) {
+                    Logger.logErrorAndShowToast(this, LOG_TAG, e.getMessage());
+                    Logger.logStackTraceWithMessage(LOG_TAG, "Failure while getting " + ReportInfo.class.getSimpleName() + " serialized object from file at path \"" + mReportInfoFilePath + "\"", e);
+                }
+            }
+        } else {
+            mReportInfo = (ReportInfo) mBundle.getSerializable(EXTRA_REPORT_INFO_OBJECT);
+        }
 
         if (mReportInfo == null) {
-            finish();
-            return;
+            finish(); return;
         }
 
 
@@ -99,25 +161,41 @@ private void updateUI(Bundle bundle) {
         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);
+        if (mBundle.containsKey(EXTRA_REPORT_INFO_OBJECT_FILE_PATH)) {
+            outState.putString(EXTRA_REPORT_INFO_OBJECT_FILE_PATH, mReportInfoFilePath);
+        } else {
+            outState.putSerializable(EXTRA_REPORT_INFO_OBJECT, mReportInfo);
+        }
+    }
 
-        outState.putSerializable(EXTRA_REPORT_INFO, mReportInfo);
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        Logger.logVerbose(LOG_TAG, "onDestroy");
+
+        deleteReportInfoFile(this, mReportInfoFilePath);
     }
 
     @Override
     public boolean onCreateOptionsMenu(final Menu menu) {
         final MenuInflater inflater = getMenuInflater();
         inflater.inflate(R.menu.menu_report, menu);
+
+        if (mReportInfo.reportSaveFilePath == null) {
+            MenuItem item = menu.findItem(R.id.menu_item_save_report_to_file);
+            if (item != null)
+                item.setEnabled(false);
+        }
+
         return true;
     }
 
@@ -131,50 +209,264 @@ public void onBackPressed() {
     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);
+            ShareUtils.shareText(this, getString(R.string.title_report_text), ReportInfo.getReportInfoMarkdownString(mReportInfo));
         } else if (id == R.id.menu_item_copy_report) {
-            if (mReportMarkdownString != null)
-                ShareUtils.copyTextToClipboard(this, mReportMarkdownString, null);
+            ShareUtils.copyTextToClipboard(this, ReportInfo.getReportInfoMarkdownString(mReportInfo), null);
+        } else if (id == R.id.menu_item_save_report_to_file) {
+            ShareUtils.saveTextToFile(this, mReportInfo.reportSaveFileLabel,
+                mReportInfo.reportSaveFilePath, ReportInfo.getReportInfoMarkdownString(mReportInfo),
+                true, REQUEST_GRANT_STORAGE_PERMISSION_FOR_SAVE_FILE);
         }
 
         return false;
     }
 
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+        if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+            Logger.logInfo(LOG_TAG, "Storage permission granted by user on request.");
+            if (requestCode == REQUEST_GRANT_STORAGE_PERMISSION_FOR_SAVE_FILE) {
+                ShareUtils.saveTextToFile(this, mReportInfo.reportSaveFileLabel,
+                    mReportInfo.reportSaveFilePath, ReportInfo.getReportInfoMarkdownString(mReportInfo),
+                    true, -1);
+            }
+        } else {
+            Logger.logInfo(LOG_TAG, "Storage permission denied by user on request.");
+        }
+    }
+
     /**
      * Generate the markdown {@link String} to be shown in {@link ReportActivity}.
      */
     private void generateReportActivityMarkdownString() {
-        mReportMarkdownString = ReportInfo.getReportInfoMarkdownString(mReportInfo);
+        // We need to reduce chances of OutOfMemoryError happening so reduce new allocations and
+        // do not keep output of getReportInfoMarkdownString in memory
+        StringBuilder reportString = new StringBuilder();
 
-        mReportActivityMarkdownString = "";
         if (mReportInfo.reportStringPrefix != null)
-            mReportActivityMarkdownString += mReportInfo.reportStringPrefix;
+            reportString.append(mReportInfo.reportStringPrefix);
+
+        String reportMarkdownString = ReportInfo.getReportInfoMarkdownString(mReportInfo);
+        int reportMarkdownStringSize = reportMarkdownString.getBytes().length;
+        boolean truncated = false;
+        if (reportMarkdownStringSize > ACTIVITY_TEXT_SIZE_LIMIT_IN_BYTES) {
+            Logger.logVerbose(LOG_TAG, mReportInfo.reportTitle + " report string size " + reportMarkdownStringSize + " is greater than " + ACTIVITY_TEXT_SIZE_LIMIT_IN_BYTES + " and will be truncated");
+            reportString.append(DataUtils.getTruncatedCommandOutput(reportMarkdownString, ACTIVITY_TEXT_SIZE_LIMIT_IN_BYTES, true, false, true));
+            truncated = true;
+        } else {
+            reportString.append(reportMarkdownString);
+        }
 
-        mReportActivityMarkdownString += mReportMarkdownString;
+        // Free reference
+        reportMarkdownString = null;
 
         if (mReportInfo.reportStringSuffix != null)
-            mReportActivityMarkdownString += mReportInfo.reportStringSuffix;
+            reportString.append(mReportInfo.reportStringSuffix);
+
+        int reportStringSize = reportString.length();
+        if (reportStringSize > ACTIVITY_TEXT_SIZE_LIMIT_IN_BYTES) {
+            // This may break markdown formatting
+            Logger.logVerbose(LOG_TAG, mReportInfo.reportTitle + " report string total size " + reportStringSize + " is greater than " + ACTIVITY_TEXT_SIZE_LIMIT_IN_BYTES + " and will be truncated");
+            mReportActivityMarkdownString = this.getString(R.string.msg_report_truncated) +
+                DataUtils.getTruncatedCommandOutput(reportString.toString(), ACTIVITY_TEXT_SIZE_LIMIT_IN_BYTES, true, false, false);
+        } else if (truncated) {
+            mReportActivityMarkdownString = this.getString(R.string.msg_report_truncated) + reportString.toString();
+        } else {
+            mReportActivityMarkdownString = reportString.toString();
+        }
+
     }
 
 
 
-    public static void startReportActivity(@NonNull final Context context, @NonNull final ReportInfo reportInfo) {
-        context.startActivity(newInstance(context, reportInfo));
+
+
+    public static class NewInstanceResult {
+        /** An intent that can be used to start the {@link ReportActivity}. */
+        public Intent contentIntent;
+        /** An intent that can should be adding as the {@link android.app.Notification#deleteIntent}
+         * by a call to {@link android.app.PendingIntent#getBroadcast(Context, int, Intent, int)}
+         * so that {@link ReportActivityBroadcastReceiver} can do cleanup of {@link #EXTRA_REPORT_INFO_OBJECT_FILE_PATH}. */
+        public Intent deleteIntent;
+
+        NewInstanceResult(Intent contentIntent, Intent deleteIntent) {
+            this.contentIntent = contentIntent;
+            this.deleteIntent = deleteIntent;
+        }
     }
 
-    public static Intent newInstance(@NonNull final Context context, @NonNull final ReportInfo reportInfo) {
+    /**
+     * Start the {@link ReportActivity}.
+     *
+     * @param context The {@link Context} for operations.
+     * @param reportInfo The {@link ReportInfo} contain info that needs to be displayed.
+     */
+    public static void startReportActivity(@NonNull final Context context, @NonNull ReportInfo reportInfo) {
+        NewInstanceResult result = newInstance(context, reportInfo);
+        if (result.contentIntent == null) return;
+        context.startActivity(result.contentIntent);
+    }
+
+    /**
+     * Get content and delete intents for the {@link ReportActivity} that can be used to start it
+     * and do cleanup.
+     *
+     * If {@link ReportInfo} size is too large, then a TransactionTooLargeException will be thrown
+     * so its object may be saved to a file in the {@link Context#getCacheDir()}. Then when activity
+     * starts, its read back and the file is deleted in {@link #onDestroy()}.
+     * Note that files may still be left if {@link #onDestroy()} is not called or doesn't finish.
+     * A separate cleanup routine is implemented from that case by
+     * {@link #deleteReportInfoFilesOlderThanXDays(Context, int, boolean)} which should be called
+     * incrementally or at app startup.
+     *
+     * @param context The {@link Context} for operations.
+     * @param reportInfo The {@link ReportInfo} contain info that needs to be displayed.
+     * @return Returns {@link NewInstanceResult}.
+     */
+    @NonNull
+    public static NewInstanceResult newInstance(@NonNull final Context context, @NonNull final ReportInfo reportInfo) {
+
+        long size = DataUtils.getSerializedSize(reportInfo);
+        if (size > DataUtils.TRANSACTION_SIZE_LIMIT_IN_BYTES) {
+            String reportInfoDirectoryPath = getReportInfoDirectoryPath(context);
+            String reportInfoFilePath = reportInfoDirectoryPath + "/" + CACHE_FILE_BASENAME_PREFIX + reportInfo.reportTimestamp;
+            Logger.logVerbose(LOG_TAG, reportInfo.reportTitle + " " + ReportInfo.class.getSimpleName() + " serialized object size " + size + " is greater than " + DataUtils.TRANSACTION_SIZE_LIMIT_IN_BYTES + " and it will be written to file at path \"" + reportInfoFilePath + "\"");
+            Error error = FileUtils.writeSerializableObjectToFile(ReportInfo.class.getSimpleName(), reportInfoFilePath, reportInfo);
+            if (error != null) {
+                Logger.logErrorExtended(LOG_TAG, error.toString());
+                Logger.showToast(context, Error.getMinimalErrorString(error), true);
+                return new NewInstanceResult(null, null);
+            }
+
+            return new NewInstanceResult(createContentIntent(context, null, reportInfoFilePath),
+                createDeleteIntent(context, reportInfoFilePath));
+        } else {
+            return new NewInstanceResult(createContentIntent(context, reportInfo, null),
+                null);
+        }
+    }
+
+    private static Intent createContentIntent(@NonNull final Context context, final ReportInfo reportInfo, final String reportInfoFilePath) {
         Intent intent = new Intent(context, ReportActivity.class);
         Bundle bundle = new Bundle();
-        bundle.putSerializable(EXTRA_REPORT_INFO, reportInfo);
+
+        if (reportInfoFilePath != null) {
+            bundle.putString(EXTRA_REPORT_INFO_OBJECT_FILE_PATH, reportInfoFilePath);
+        } else {
+            bundle.putSerializable(EXTRA_REPORT_INFO_OBJECT, reportInfo);
+        }
+
+        intent.putExtras(bundle);
+
+        // Note that ReportActivity should have `documentLaunchMode="intoExisting"` set in `AndroidManifest.xml`
+        // which has equivalent behaviour to FLAG_ACTIVITY_NEW_DOCUMENT.
+        // FLAG_ACTIVITY_SINGLE_TOP must also be passed for onNewIntent to be called.
+        intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP | Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
+        return intent;
+    }
+
+
+    private static Intent createDeleteIntent(@NonNull final Context context, final String reportInfoFilePath) {
+        if (reportInfoFilePath == null) return null;
+
+        Intent intent = new Intent(context, ReportActivityBroadcastReceiver.class);
+        intent.setAction(ACTION_DELETE_REPORT_INFO_OBJECT_FILE);
+
+        Bundle bundle = new Bundle();
+        bundle.putString(EXTRA_REPORT_INFO_OBJECT_FILE_PATH, reportInfoFilePath);
         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;
     }
 
+
+
+
+
+    @NotNull
+    private static String getReportInfoDirectoryPath(Context context) {
+        // Canonicalize to solve /data/data and /data/user/0 issues when comparing with reportInfoFilePath
+        return FileUtils.getCanonicalPath(context.getCacheDir().getAbsolutePath(), null) + "/" + CACHE_DIR_BASENAME;
+    }
+
+    private static void deleteReportInfoFile(Context context, String reportInfoFilePath) {
+        if (context == null || reportInfoFilePath == null) return;
+
+        // Extra protection for mainly if someone set `exported="true"` for ReportActivityBroadcastReceiver
+        String reportInfoDirectoryPath = getReportInfoDirectoryPath(context);
+        reportInfoFilePath = FileUtils.getCanonicalPath(reportInfoFilePath, null);
+        if(!reportInfoFilePath.equals(reportInfoDirectoryPath) && reportInfoFilePath.startsWith(reportInfoDirectoryPath + "/")) {
+            Logger.logVerbose(LOG_TAG, "Deleting " + ReportInfo.class.getSimpleName() + " serialized object file at path \"" + reportInfoFilePath + "\"");
+            Error error = FileUtils.deleteRegularFile(ReportInfo.class.getSimpleName(), reportInfoFilePath, true);
+            if (error != null) {
+                Logger.logErrorExtended(LOG_TAG, error.toString());
+            }
+        } else {
+            Logger.logError(LOG_TAG, "Not deleting " + ReportInfo.class.getSimpleName() + " serialized object file at path \"" + reportInfoFilePath + "\" since its not under \"" + reportInfoDirectoryPath + "\"");
+        }
+    }
+
+    /**
+     * Delete {@link ReportInfo} serialized object files from cache older than x days. If a notification
+     * has still not been opened after x days that's using a PendingIntent to ReportActivity, then
+     * opening the notification will throw a file not found error, so choose days value appropriately
+     * or check if a notification is still active if tracking notification ids.
+     * The {@link Context} object passed must be of the same package with which {@link #newInstance(Context, ReportInfo)}
+     * was called since a call to {@link Context#getCacheDir()} is made.
+     *
+     * @param context The {@link Context} for operations.
+     * @param days The x amount of days before which files should be deleted. This must be `>=0`.
+     * @param isSynchronous If set to {@code true}, then the command will be executed in the
+     *                      caller thread and results returned synchronously.
+     *                      If set to {@code false}, then a new thread is started run the commands
+     *                      asynchronously in the background and control is returned to the caller thread.
+     * @return Returns the {@code error} if deleting was not successful, otherwise {@code null}.
+     */
+    public static Error deleteReportInfoFilesOlderThanXDays(@NonNull final Context context, int days, final boolean isSynchronous) {
+        if (isSynchronous) {
+            return deleteReportInfoFilesOlderThanXDaysInner(context, days);
+        } else {
+            new Thread() { public void run() {
+                Error error = deleteReportInfoFilesOlderThanXDaysInner(context, days);
+                if (error != null) {
+                    Logger.logErrorExtended(LOG_TAG, error.toString());
+                }
+            }}.start();
+            return null;
+        }
+    }
+
+    private static Error deleteReportInfoFilesOlderThanXDaysInner(@NonNull final Context context, int days) {
+        // Only regular files are deleted and subdirectories are not checked
+        String reportInfoDirectoryPath = getReportInfoDirectoryPath(context);
+        Logger.logVerbose(LOG_TAG, "Deleting " + ReportInfo.class.getSimpleName() + " serialized object files under directory path \"" + reportInfoDirectoryPath + "\" older than " + days + " days");
+        return FileUtils.deleteFilesOlderThanXDays(ReportInfo.class.getSimpleName(), reportInfoDirectoryPath, null, days, true, FileType.REGULAR.getValue());
+    }
+
+
+    /**
+     * The {@link BroadcastReceiver} for {@link ReportActivity} that currently does cleanup when
+     * {@link android.app.Notification#deleteIntent} is called. It must be registered in `AndroidManifest.xml`.
+     */
+    public static class ReportActivityBroadcastReceiver extends BroadcastReceiver {
+        private static final String LOG_TAG = "ReportActivityBroadcastReceiver";
+
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            if (intent == null) return;
+
+            String action = intent.getAction();
+            Logger.logVerbose(LOG_TAG, "onReceive: \"" + action + "\" action");
+
+            if (ACTION_DELETE_REPORT_INFO_OBJECT_FILE.equals(action)) {
+                Bundle bundle = intent.getExtras();
+                if (bundle == null) return;
+                if (bundle.containsKey(EXTRA_REPORT_INFO_OBJECT_FILE_PATH)) {
+                    deleteReportInfoFile(context, bundle.getString(EXTRA_REPORT_INFO_OBJECT_FILE_PATH));
+                }
+            }
+        }
+    }
+
 }
diff --git a/termux-shared/src/main/java/com/termux/shared/interact/ShareUtils.java b/termux-shared/src/main/java/com/termux/shared/interact/ShareUtils.java
index 2f38a3a929..c16149551d 100644
--- a/termux-shared/src/main/java/com/termux/shared/interact/ShareUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/interact/ShareUtils.java
@@ -1,16 +1,25 @@
 package com.termux.shared.interact;
 
+import android.Manifest;
+import android.app.Activity;
 import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
+import android.os.Environment;
 
+import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.content.ContextCompat;
 
 import com.termux.shared.R;
 import com.termux.shared.data.DataUtils;
+import com.termux.shared.file.FileUtils;
 import com.termux.shared.logger.Logger;
+import com.termux.shared.models.errors.Error;
+import com.termux.shared.packages.PermissionUtils;
+
+import java.nio.charset.Charset;
 
 public class ShareUtils {
 
@@ -41,12 +50,12 @@ private static void openSystemAppChooser(final Context context, final Intent int
      * @param text The text to share.
      */
     public static void shareText(final Context context, final String subject, final String text) {
-        if (context == null) return;
+        if (context == null || text == null) return;
 
         final Intent shareTextIntent = new Intent(Intent.ACTION_SEND);
         shareTextIntent.setType("text/plain");
         shareTextIntent.putExtra(Intent.EXTRA_SUBJECT, subject);
-        shareTextIntent.putExtra(Intent.EXTRA_TEXT, DataUtils.getTruncatedCommandOutput(text, DataUtils.TRANSACTION_SIZE_LIMIT_IN_BYTES, false, false, false));
+        shareTextIntent.putExtra(Intent.EXTRA_TEXT, DataUtils.getTruncatedCommandOutput(text, DataUtils.TRANSACTION_SIZE_LIMIT_IN_BYTES, true, false, false));
 
         openSystemAppChooser(context, shareTextIntent, context.getString(R.string.title_share_with));
     }
@@ -60,12 +69,12 @@ public static void shareText(final Context context, final String subject, final
      *                    clipboard is successful.
      */
     public static void copyTextToClipboard(final Context context, final String text, final String toastString) {
-        if (context == null) return;
+        if (context == null || text == null) return;
 
         final ClipboardManager clipboardManager = ContextCompat.getSystemService(context, ClipboardManager.class);
 
         if (clipboardManager != null) {
-            clipboardManager.setPrimaryClip(ClipData.newPlainText(null, text));
+            clipboardManager.setPrimaryClip(ClipData.newPlainText(null, DataUtils.getTruncatedCommandOutput(text, DataUtils.TRANSACTION_SIZE_LIMIT_IN_BYTES, true, false, false)));
             if (toastString != null && !toastString.isEmpty())
                 Logger.showToast(context, toastString, true);
         }
@@ -88,4 +97,50 @@ public static void openURL(final Context context, final String url) {
         }
     }
 
+    /**
+     * Save a file at the path.
+     *
+     * If if path is under {@link Environment#getExternalStorageDirectory()}
+     * or `/sdcard` and storage permission is missing, it will be requested if {@code context} is an
+     * instance of {@link Activity} or {@link AppCompatActivity} and {@code storagePermissionRequestCode}
+     * is `>=0` and the function will automatically return. The caller should call this function again
+     * if user granted the permission.
+     *
+     * @param context The context for operations.
+     * @param label The label for file.
+     * @param filePath The path to save the file.
+     * @param text The text to write to file.
+     * @param showToast If set to {@code true}, then a toast is shown if saving to file is successful.
+     * @param storagePermissionRequestCode The request code to use while asking for permission.
+     */
+    public static void saveTextToFile(final Context context, final String label, final String filePath, final String text, final boolean showToast, final int storagePermissionRequestCode) {
+        if (context == null || filePath == null || filePath.isEmpty() || text == null) return;
+
+        // If path is under primary external storage directory, then check for missing permissions.
+        if ((FileUtils.isPathInDirPath(filePath, Environment.getExternalStorageDirectory().getAbsolutePath(), true) ||
+            FileUtils.isPathInDirPath(filePath, "/sdcard", true)) &&
+            !PermissionUtils.checkPermission(context, Manifest.permission.WRITE_EXTERNAL_STORAGE)) {
+            Logger.logErrorAndShowToast(context, LOG_TAG, context.getString(R.string.msg_storage_permission_not_granted));
+
+            if (storagePermissionRequestCode >= 0) {
+                if (context instanceof AppCompatActivity)
+                    PermissionUtils.requestPermission(((AppCompatActivity) context), Manifest.permission.WRITE_EXTERNAL_STORAGE, storagePermissionRequestCode);
+                else if (context instanceof Activity)
+                    PermissionUtils.requestPermission(((Activity) context), Manifest.permission.WRITE_EXTERNAL_STORAGE, storagePermissionRequestCode);
+            }
+
+            return;
+        }
+
+        Error error = FileUtils.writeStringToFile(label, filePath,
+            Charset.defaultCharset(), text, false);
+        if (error != null) {
+            Logger.logErrorExtended(LOG_TAG, error.toString());
+            Logger.showToast(context, Error.getMinimalErrorString(error), true);
+        } else {
+            if (showToast)
+                Logger.showToast(context, context.getString(R.string.msg_file_saved_successfully, label, filePath), true);
+        }
+    }
+
 }
diff --git a/termux-shared/src/main/java/com/termux/shared/models/ReportInfo.java b/termux-shared/src/main/java/com/termux/shared/models/ReportInfo.java
index ebecdd5af5..93f103237d 100644
--- a/termux-shared/src/main/java/com/termux/shared/models/ReportInfo.java
+++ b/termux-shared/src/main/java/com/termux/shared/models/ReportInfo.java
@@ -14,26 +14,35 @@ public class ReportInfo implements Serializable {
     /** The report title. */
     public final String reportTitle;
     /** The markdown report text prefix. Will not be part of copy and share operations, etc. */
-    public final String reportStringPrefix;
+    public String reportStringPrefix;
     /** The markdown report text. */
-    public final String reportString;
+    public String reportString;
     /** The markdown report text suffix. Will not be part of copy and share operations, etc. */
-    public final String reportStringSuffix;
+    public 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 addReportInfoToMarkdown;
+    public final boolean addReportInfoHeaderToMarkdown;
     /** The timestamp for the report. */
     public final String reportTimestamp;
 
-    public ReportInfo(String userAction, String sender, String reportTitle, String reportStringPrefix, String reportString, String reportStringSuffix, boolean addReportInfoToMarkdown) {
+    /** 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) {
         this.userAction = userAction;
         this.sender = sender;
         this.reportTitle = reportTitle;
         this.reportStringPrefix = reportStringPrefix;
         this.reportString = reportString;
         this.reportStringSuffix = reportStringSuffix;
-        this.addReportInfoToMarkdown = addReportInfoToMarkdown;
+        this.addReportInfoHeaderToMarkdown = addReportInfoHeaderToMarkdown;
+        this.reportSaveFileLabel = reportSaveFileLabel;
+        this.reportSaveFilePath = reportSaveFilePath;
         this.reportTimestamp = AndroidUtils.getCurrentMilliSecondUTCTimeStamp();
     }
 
@@ -48,7 +57,7 @@ public static String getReportInfoMarkdownString(final ReportInfo reportInfo) {
 
         StringBuilder markdownString = new StringBuilder();
 
-        if (reportInfo.addReportInfoToMarkdown) {
+        if (reportInfo.addReportInfoHeaderToMarkdown) {
             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, "-"));
diff --git a/termux-shared/src/main/res/menu/menu_report.xml b/termux-shared/src/main/res/menu/menu_report.xml
index cb851713eb..f1faa1df72 100644
--- a/termux-shared/src/main/res/menu/menu_report.xml
+++ b/termux-shared/src/main/res/menu/menu_report.xml
@@ -12,4 +12,9 @@
         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>
diff --git a/termux-shared/src/main/res/values/strings.xml b/termux-shared/src/main/res/values/strings.xml
index b6efd5c502..5a9e7ce0c0 100644
--- a/termux-shared/src/main/res/values/strings.xml
+++ b/termux-shared/src/main/res/values/strings.xml
@@ -31,12 +31,16 @@
     <!-- ReportActivity -->
     <string name="action_copy">Copy</string>
     <string name="action_share">Share</string>
+    <string name="action_save_to_file">Save To File</string>
     <string name="title_report_text">Report Text</string>
+    <string name="msg_report_truncated">**Report Truncated**\n\nReport is too large to view here. Use `Save To File` option from options menu (3-dots on top right) and view it in an external text editor app.\n\n##\n\n</string>
 
 
 
     <!-- ShareUtils -->
     <string name="title_share_with">Share With</string>
+    <string name="msg_storage_permission_not_granted">The storage permission not granted."</string>
+    <string name="msg_file_saved_successfully">The %1$s file saved successfully at \"%2$s\""</string>
 
 
 

From 24ea83d6c093c1816757f43aedf4ced61b801472 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 21 Aug 2021 02:35:08 +0500
Subject: [PATCH 506/912] Added: Bootstrap error and report issue (optionally)
 will contain primary termux files stat info and logcat dump

Users have been reporting issues with bootstrap installation (and `login` file access) failure on email and github but "most" have been useless since they don't follow instructions to debug the issue and report back. The real reason may depend on device. One could be that `/data/data/com.termux` does not exist on the device in which case termux won't work on the device, at least without root. Other reasons could be wrong ownership or selinux context, selinux denials or attempting to install on external sd card (as reported by a user) where likely files dir was different from `/data/data/com.termux/files`.

This commit will save dev and possibly user time and automatically generate the required info to debug such issues. The `ls` command will generate `stat` info for all the major termux directories and files so that existence or ownership issues can be shown. It will also run `logcat` command to take a dump (last `3000` lines) in case other failures are being logged, like selinux denials as per `avc` entries. It will also show if app is installed on external sd card. This info will automatically be shown on bootstrap install failure report.

Moreover, users can generate termux files `stat` info and `logcat` dump manually too with terminal's long hold options menu `More` -> `Report Issue` option and selecting `YES` in the prompt shown to add debug info. This can be helpful for reporting and debugging other issues. If the report generated is too large, then `Save To File` option in context menu (3 dots on top right) of `ReportActivity` can be used and the file viewed/shared instead.

Users must post complete report (optionally without sensitive info) when reporting issues, instead of (partial) screenshots which won't be accepted anymore.

There has been some design changes in android 11 for `/data/data` and `/data/user/0` directory. You can check javadoc for `isTermuxFilesDirectoryAccessible()` function in [`TermuxFileUtils`](termux-shared/src/main/java/com/termux/shared/file/TermuxFileUtils.java) for details.
---
 .../java/com/termux/app/TermuxInstaller.java  |  17 ++-
 .../terminal/TermuxTerminalViewClient.java    |  15 ++
 .../termux/shared/file/TermuxFileUtils.java   | 143 ++++++++++++++++--
 .../termux/shared/packages/PackageUtils.java  |  14 +-
 .../termux/shared/termux/AndroidUtils.java    |   4 +
 .../com/termux/shared/termux/TermuxUtils.java |  69 +++++++++
 termux-shared/src/main/res/values/strings.xml |   6 +
 7 files changed, 254 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxInstaller.java b/app/src/main/java/com/termux/app/TermuxInstaller.java
index 7bc9a95764..b8f6def583 100644
--- a/app/src/main/java/com/termux/app/TermuxInstaller.java
+++ b/app/src/main/java/com/termux/app/TermuxInstaller.java
@@ -19,6 +19,7 @@
 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;
@@ -58,7 +59,7 @@ static void setupBootstrapIfNeeded(final Activity activity, final Runnable whenD
         String bootstrapErrorMessage;
         Error filesDirectoryAccessibleError;
 
-        // This will also call Context.getFilesDir(), which should ensure that TERMUX_FILES_DIR_PATH
+        // 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;
@@ -67,8 +68,9 @@ static void setupBootstrapIfNeeded(final Activity activity, final Runnable whenD
         // 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(TermuxConstants.TERMUX_PREFIX_DIR_PATH, false));
+            Logger.logError(LOG_TAG, "isFilesDirectoryAccessible: " + isFilesDirectoryAccessible);
             Logger.logError(LOG_TAG, bootstrapErrorMessage);
-            CrashUtils.sendCrashReportNotification(activity, LOG_TAG, "## Bootstrap Error\n\n" + bootstrapErrorMessage, true, true);
+            sendBootstrapCrashReportNotification(activity, bootstrapErrorMessage);
             MessageDialogUtils.exitAppWithErrorMessage(activity,
                 activity.getString(R.string.bootstrap_error_title),
                 bootstrapErrorMessage);
@@ -78,7 +80,7 @@ static void setupBootstrapIfNeeded(final Activity activity, final Runnable whenD
         if (!isFilesDirectoryAccessible) {
             bootstrapErrorMessage = Error.getMinimalErrorString(filesDirectoryAccessibleError) + "\nTERMUX_FILES_DIR: " + MarkdownUtils.getMarkdownCodeForString(TermuxConstants.TERMUX_FILES_DIR_PATH, false);
             Logger.logError(LOG_TAG, bootstrapErrorMessage);
-            CrashUtils.sendCrashReportNotification(activity, LOG_TAG, "## Bootstrap Error\n\n" + bootstrapErrorMessage, true, true);
+            sendBootstrapCrashReportNotification(activity, bootstrapErrorMessage);
             MessageDialogUtils.showMessage(activity,
                 activity.getString(R.string.bootstrap_error_title),
                 bootstrapErrorMessage, null);
@@ -216,7 +218,7 @@ public static void showBootstrapErrorDialog(Activity activity, String PREFIX_FIL
         Logger.logErrorExtended(LOG_TAG, "Bootstrap Error:\n" + message);
 
         // Send a notification with the exception so that the user knows why bootstrap setup failed
-        CrashUtils.sendCrashReportNotification(activity, LOG_TAG, "## Bootstrap Error\n\n" + message, true, true);
+        sendBootstrapCrashReportNotification(activity, message);
 
         activity.runOnUiThread(() -> {
             try {
@@ -236,6 +238,13 @@ public static void showBootstrapErrorDialog(Activity activity, String PREFIX_FIL
         });
     }
 
+    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";
 
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
index 05f5408931..7e68d3ecf3 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
@@ -24,6 +24,7 @@
 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.shell.ShellUtils;
 import com.termux.shared.terminal.TermuxTerminalViewClientBase;
 import com.termux.shared.termux.AndroidUtils;
@@ -665,6 +666,14 @@ public void reportIssueFromTranscript() {
         final 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);
+    }
+
+    private void reportIssueFromTranscript(String transcriptText, boolean addTermuxDebugInfo) {
         Logger.showToast(mActivity, mActivity.getString(R.string.msg_generating_report), true);
 
         new Thread() {
@@ -685,6 +694,12 @@ public void run() {
                 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,
diff --git a/termux-shared/src/main/java/com/termux/shared/file/TermuxFileUtils.java b/termux-shared/src/main/java/com/termux/shared/file/TermuxFileUtils.java
index 5b06725e33..bdd77e81bd 100644
--- a/termux-shared/src/main/java/com/termux/shared/file/TermuxFileUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/file/TermuxFileUtils.java
@@ -5,14 +5,23 @@
 
 import androidx.annotation.NonNull;
 
+import com.termux.shared.logger.Logger;
+import com.termux.shared.markdown.MarkdownUtils;
+import com.termux.shared.models.ExecutionCommand;
 import com.termux.shared.models.errors.Error;
+import com.termux.shared.shell.TermuxShellEnvironmentClient;
+import com.termux.shared.shell.TermuxTask;
+import com.termux.shared.termux.AndroidUtils;
 import com.termux.shared.termux.TermuxConstants;
+import com.termux.shared.termux.TermuxUtils;
 
 import java.io.File;
 import java.util.regex.Pattern;
 
 public class TermuxFileUtils {
 
+    private static final String LOG_TAG = "TermuxFileUtils";
+
     /**
      * Replace "$PREFIX/" or "~/" prefix with termux absolute paths.
      *
@@ -126,25 +135,74 @@ public static Error validateDirectoryFileExistenceAndPermissions(String label, f
 
     /**
      * Validate the existence and permissions of {@link TermuxConstants#TERMUX_FILES_DIR_PATH}.
+     * This is required because binaries compiled for termux are hard coded with
+     * {@link TermuxConstants#TERMUX_PREFIX_DIR_PATH} and the path must be accessible.
+     *
+     * The permissions set to directory will be {@link FileUtils#APP_WORKING_DIRECTORY_PERMISSIONS}.
      *
-     * The directory will not be created manually but by calling {@link Context#getFilesDir()}
+     * This function does not create the directory manually but by calling {@link Context#getFilesDir()}
      * so that android itself creates it. However, the call will not create its parent package
      * data directory `/data/user/0/[package_name]` if it does not already exist and a `logcat`
      * error will be logged by android.
      * {@code Failed to ensure /data/user/0/<package_name>/files: mkdir failed: ENOENT (No such file or directory)}
-     * An android app likely can't create the package data directory since its parent `/data/user/0`
-     * is owned by `system` user and is normally create at app install or update time and not at app startup.
-     * Note that the path returned by {@link Context#getFilesDir()} will
+     * An android app normally can't create the package data directory since its parent `/data/user/0`
+     * is owned by `system` user and is normally created at app install or update time and not at app startup.
+     *
+     * Note that the path returned by {@link Context#getFilesDir()} may
      * be under `/data/user/[id]/[package_name]` instead of `/data/data/[package_name]`
-     * defined by default by {@link TermuxConstants#TERMUX_FILES_DIR_PATH}, where id will be 0 for
+     * defined by default by {@link TermuxConstants#TERMUX_FILES_DIR_PATH} where id will be 0 for
      * primary user and a higher number for other users/profiles. If app is running under work profile
      * or secondary user, then {@link TermuxConstants#TERMUX_FILES_DIR_PATH} will not be accessible
-     * and will not be automatically created, unless there is a bind mount from `/data/user/[id]`
-     * to `/data/data`, ideally in the right namespace.
+     * and will not be automatically created, unless there is a bind mount from `/data/data` to
+     * `/data/user/[id]`, ideally in the right namespace.
+     * https://source.android.com/devices/tech/admin/multi-user
      *
-     * The permissions set to directory will be {@link FileUtils#APP_WORKING_DIRECTORY_PERMISSIONS}.
      *
-     * https://source.android.com/devices/tech/admin/multi-user
+     * On Android version `<=10`, the `/data/user/0` is a symlink to `/data/data` directory.
+     * https://cs.android.com/android/platform/superproject/+/android-10.0.0_r47:system/core/rootdir/init.rc;l=589
+     * {@code
+     * symlink /data/data /data/user/0
+     * }
+     *
+     * {@code
+     * /system/bin/ls -lhd /data/data /data/user/0
+     * drwxrwx--x 179 system system 8.0K 2021-xx-xx xx:xx /data/data
+     * lrwxrwxrwx   1 root   root     10 2021-xx-xx xx:xx /data/user/0 -> /data/data
+     * }
+     *
+     * On Android version `>=11`, the `/data/data` directory is bind mounted at `/data/user/0`.
+     * https://cs.android.com/android/platform/superproject/+/android-11.0.0_r40:system/core/rootdir/init.rc;l=705
+     * https://cs.android.com/android/_/android/platform/system/core/+/3cca270e95ca8d8bc8b800e2b5d7da1825fd7100
+     * {@code
+     * # Unlink /data/user/0 if we previously symlink it to /data/data
+     * rm /data/user/0
+     *
+     * # Bind mount /data/user/0 to /data/data
+     * mkdir /data/user/0 0700 system system encryption=None
+     * mount none /data/data /data/user/0 bind rec
+     * }
+     *
+     * {@code
+     * /system/bin/grep -E '( /data )|( /data/data )|( /data/user/[0-9]+ )' /proc/self/mountinfo 2>&1 | /system/bin/grep -v '/data_mirror' 2>&1
+     * 87 32 253:5 / /data rw,nosuid,nodev,noatime shared:27 - ext4 /dev/block/dm-5 rw,seclabel,resgid=1065,errors=panic
+     * 91 87 253:5 /data /data/user/0 rw,nosuid,nodev,noatime shared:27 - ext4 /dev/block/dm-5 rw,seclabel,resgid=1065,errors=panic
+     * }
+     *
+     * The column 4 defines the root of the mount within the filesystem.
+     * Basically, `/dev/block/dm-5/` is mounted at `/data` and `/dev/block/dm-5/data` is mounted at
+     * `/data/user/0`.
+     * https://www.kernel.org/doc/Documentation/filesystems/proc.txt (section 3.5)
+     * https://www.kernel.org/doc/Documentation/filesystems/sharedsubtree.txt
+     * https://unix.stackexchange.com/a/571959
+     *
+     *
+     * Also note that running `/system/bin/ls -lhd /data/user/0/com.termux` as secondary user will result
+     * in `ls: /data/user/0/com.termux: Permission denied` where `0` is primary user id but running
+     * `/system/bin/ls -lhd /data/user/10/com.termux` will result in
+     * `drwx------ 6 u10_a149 u10_a149 4.0K 2021-xx-xx xx:xx /data/user/10/com.termux` where `10` is
+     * secondary user id. So can't stat directory (not contents) of primary user from secondary user
+     * but can the other way around. However, this is happening on android 10 avd, but not on android
+     * 11 avd.
      *
      * @param context The {@link Context} for operations.
      * @param createDirectoryIfMissing The {@code boolean} that decides if directory file
@@ -166,4 +224,71 @@ public static Error isTermuxFilesDirectoryAccessible(@NonNull final Context cont
             FileUtils.APP_WORKING_DIRECTORY_PERMISSIONS, false);
     }
 
+    /**
+     * Get a markdown {@link String} for stat output for various Termux app files paths.
+     *
+     * @param context The context for operations.
+     * @return Returns the markdown {@link String}.
+     */
+    public static String getTermuxFilesDirStatMarkdownString(@NonNull final Context context) {
+        Context termuxPackageContext = TermuxUtils.getTermuxPackageContext(context);
+        if (termuxPackageContext == null) return null;
+
+        // Also ensures that termux files directory is created if it does not already exist
+        String filesDir = termuxPackageContext.getFilesDir().getAbsolutePath();
+
+        // Build script
+        StringBuilder statScript = new StringBuilder();
+        statScript
+            .append("echo 'ls info:'\n")
+            .append("/system/bin/ls -lhd")
+            .append(" '/data/data'")
+            .append(" '/data/user/0'")
+            .append(" '" + TermuxConstants.TERMUX_INTERNAL_PRIVATE_APP_DATA_DIR_PATH + "'")
+            .append(" '/data/user/0/" + TermuxConstants.TERMUX_PACKAGE_NAME + "'")
+            .append(" '" + TermuxConstants.TERMUX_FILES_DIR_PATH + "'")
+            .append(" '" + filesDir + "'")
+            .append(" '/data/user/0/" + TermuxConstants.TERMUX_PACKAGE_NAME + "/files'")
+            .append(" '/data/user/" + TermuxConstants.TERMUX_PACKAGE_NAME + "/files'")
+            .append(" '" + TermuxConstants.TERMUX_STAGING_PREFIX_DIR_PATH + "'")
+            .append(" '" + TermuxConstants.TERMUX_PREFIX_DIR_PATH + "'")
+            .append(" '" + TermuxConstants.TERMUX_HOME_DIR_PATH + "'")
+            .append(" '" + TermuxConstants.TERMUX_BIN_PREFIX_DIR_PATH + "/login'")
+            .append(" 2>&1")
+            .append("\necho; echo 'mount info:'\n")
+            .append("/system/bin/grep -E '( /data )|( /data/data )|( /data/user/[0-9]+ )' /proc/self/mountinfo 2>&1 | /system/bin/grep -v '/data_mirror' 2>&1");
+
+        // Run script
+        ExecutionCommand executionCommand = new ExecutionCommand(1, "/system/bin/sh", null, statScript.toString() + "\n", "/", true, true);
+        executionCommand.backgroundCustomLogLevel = Logger.LOG_LEVEL_OFF;
+        TermuxTask termuxTask = TermuxTask.execute(context, executionCommand, null, new TermuxShellEnvironmentClient(), true);
+        if (termuxTask == null || !executionCommand.isSuccessful()) {
+            Logger.logError(LOG_TAG, executionCommand.toString());
+            return null;
+        }
+
+        // Build script output
+        StringBuilder statOutput = new StringBuilder();
+        statOutput.append("$ ").append(statScript.toString());
+        statOutput.append("\n\n").append(executionCommand.resultData.stdout.toString());
+
+        boolean stderrSet = !executionCommand.resultData.stderr.toString().isEmpty();
+        if (executionCommand.resultData.exitCode != 0 || stderrSet) {
+            Logger.logError(LOG_TAG, executionCommand.toString());
+            if (stderrSet)
+                statOutput.append("\n").append(executionCommand.resultData.stderr.toString());
+            statOutput.append("\n").append("exit code: ").append(executionCommand.resultData.exitCode.toString());
+        }
+
+        // Build markdown output
+        StringBuilder markdownString = new StringBuilder();
+        markdownString.append("## ").append(TermuxConstants.TERMUX_APP_NAME).append(" Files Info\n\n");
+        AndroidUtils.appendPropertyToMarkdown(markdownString,"TERMUX_REQUIRED_FILES_DIR_PATH ($PREFIX)", TermuxConstants.TERMUX_FILES_DIR_PATH);
+        AndroidUtils.appendPropertyToMarkdown(markdownString,"ANDROID_ASSIGNED_FILES_DIR_PATH", filesDir);
+        markdownString.append("\n\n").append(MarkdownUtils.getMarkdownCodeForString(statOutput.toString(), true));
+        markdownString.append("\n##\n");
+
+        return markdownString.toString();
+    }
+
 }
diff --git a/termux-shared/src/main/java/com/termux/shared/packages/PackageUtils.java b/termux-shared/src/main/java/com/termux/shared/packages/PackageUtils.java
index dbd27155c7..b6e8d98a07 100644
--- a/termux-shared/src/main/java/com/termux/shared/packages/PackageUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/packages/PackageUtils.java
@@ -124,7 +124,8 @@ public static int getTargetSDKForPackage(@NonNull final Context context) {
     }
 
     /**
-     * Get the {@code versionName} for the package associated with the {@code context}.
+     * Check if the app associated with the {@code context} has {@link ApplicationInfo#FLAG_DEBUGGABLE}
+     * set.
      *
      * @param context The {@link Context} for the package.
      * @return Returns the {@code versionName}. This will be {@code null} if an exception is raised.
@@ -133,6 +134,17 @@ public static Boolean isAppForPackageADebugBuild(@NonNull final Context context)
         return ( 0 != ( context.getApplicationInfo().flags & ApplicationInfo.FLAG_DEBUGGABLE ) );
     }
 
+    /**
+     * Check if the app associated with the {@code context} has {@link ApplicationInfo#FLAG_EXTERNAL_STORAGE}
+     * set.
+     *
+     * @param context The {@link Context} for the package.
+     * @return Returns the {@code versionName}. This will be {@code null} if an exception is raised.
+     */
+    public static Boolean isAppInstalledOnExternalStorage(@NonNull final Context context) {
+        return ( 0 != ( context.getApplicationInfo().flags & ApplicationInfo.FLAG_EXTERNAL_STORAGE ) );
+    }
+
     /**
      * Get the {@code versionCode} for the package associated with the {@code context}.
      *
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/AndroidUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/AndroidUtils.java
index d433402a2b..9306d77ac4 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/AndroidUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/AndroidUtils.java
@@ -40,6 +40,10 @@ public static String getAppInfoMarkdownString(@NonNull final Context context) {
         AndroidUtils.appendPropertyToMarkdown(markdownString,"TARGET_SDK", PackageUtils.getTargetSDKForPackage(context));
         AndroidUtils.appendPropertyToMarkdown(markdownString,"IS_DEBUG_BUILD", PackageUtils.isAppForPackageADebugBuild(context));
 
+        if (PackageUtils.isAppInstalledOnExternalStorage(context)) {
+            AndroidUtils.appendPropertyToMarkdown(markdownString,"IS_INSTALLED_ON_EXTERNAL_STORAGE", true);
+        }
+
         String filesDir = context.getFilesDir().getAbsolutePath();
         if (!filesDir.equals("/data/user/0/" + context.getPackageName() + "/files") &&
             !filesDir.equals("/data/data/" + context.getPackageName() + "/files"))
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
index 4981b206b4..85d7b41741 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
@@ -355,11 +355,80 @@ public static String geAPTInfoMarkdownString(@NonNull final Context context) {
 
         markdownString.append("## ").append(TermuxConstants.TERMUX_APP_NAME).append(" APT Info\n\n");
         markdownString.append(executionCommand.resultData.stdout.toString());
+        markdownString.append("\n##\n");
+
+        return markdownString.toString();
+    }
+
+    /**
+     * Get a markdown {@link String} for info for termux debugging.
+     *
+     * @param context The context for operations.
+     * @return Returns the markdown {@link String}.
+     */
+    public static String getTermuxDebugMarkdownString(@NonNull final Context context) {
+        String statInfo = TermuxFileUtils.getTermuxFilesDirStatMarkdownString(context);
+        String logcatInfo = getLogcatDumpMarkdownString(context);
+
+        if (statInfo != null && logcatInfo != null)
+            return statInfo + "\n\n" + logcatInfo;
+        else if (statInfo != null)
+            return statInfo;
+        else
+            return logcatInfo;
+
+    }
+
+    /**
+     * Get a markdown {@link String} for logcat command dump.
+     *
+     * @param context The context for operations.
+     * @return Returns the markdown {@link String}.
+     */
+    public static String getLogcatDumpMarkdownString(@NonNull final Context context) {
+        // Build script
+        // We need to prevent OutOfMemoryError since StreamGobbler StringBuilder + StringBuilder.toString()
+        // may require lot of memory if dump is too large.
+        // Putting a limit at 3000 lines. Assuming average 160 chars/line will result in 500KB usage
+        // per object.
+        // That many lines should be enough for debugging for recent issues anyways assuming termux
+        // has not been granted READ_LOGS permission s.
+        String logcatScript = "/system/bin/logcat -d -t 3000 2>&1";
+
+        // Run script
+        // Logging must be disabled for output of logcat command itself in StreamGobbler
+        ExecutionCommand executionCommand = new ExecutionCommand(1, "/system/bin/sh", null, logcatScript + "\n", "/", true, true);
+        executionCommand.backgroundCustomLogLevel = Logger.LOG_LEVEL_OFF;
+        TermuxTask termuxTask = TermuxTask.execute(context, executionCommand, null, new TermuxShellEnvironmentClient(), true);
+        if (termuxTask == null || !executionCommand.isSuccessful()) {
+            Logger.logError(LOG_TAG, executionCommand.toString());
+            return null;
+        }
+
+        // Build script output
+        StringBuilder logcatOutput = new StringBuilder();
+        logcatOutput.append("$ ").append(logcatScript);
+        logcatOutput.append("\n").append(executionCommand.resultData.stdout.toString());
+
+        boolean stderrSet = !executionCommand.resultData.stderr.toString().isEmpty();
+        if (executionCommand.resultData.exitCode != 0 || stderrSet) {
+            Logger.logError(LOG_TAG, executionCommand.toString());
+            if (stderrSet)
+                logcatOutput.append("\n").append(executionCommand.resultData.stderr.toString());
+            logcatOutput.append("\n").append("exit code: ").append(executionCommand.resultData.exitCode.toString());
+        }
+
+        // Build markdown output
+        StringBuilder markdownString = new StringBuilder();
+        markdownString.append("## Logcat Dump\n\n");
+        markdownString.append("\n\n").append(MarkdownUtils.getMarkdownCodeForString(logcatOutput.toString(), true));
+        markdownString.append("\n##\n");
 
         return markdownString.toString();
     }
 
 
+
     public static String getAPKRelease(String signingCertificateSHA256Digest) {
         if (signingCertificateSHA256Digest == null) return "null";
 
diff --git a/termux-shared/src/main/res/values/strings.xml b/termux-shared/src/main/res/values/strings.xml
index 5a9e7ce0c0..f42f2a409c 100644
--- a/termux-shared/src/main/res/values/strings.xml
+++ b/termux-shared/src/main/res/values/strings.xml
@@ -59,6 +59,12 @@
 
 
 
+    <!-- Miscellaneous -->
+    <string name="action_yes">Yes</string>
+    <string name="action_no">No</string>
+
+
+
     <!-- Log Level -->
     <string name="log_level_title">Log Level</string>
     <string name="log_level_off">"Off"</string>

From 7047bbefbb67ec5a236fb33c3322905b5f09cd39 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 21 Aug 2021 02:47:13 +0500
Subject: [PATCH 507/912] Added: Add warning reports with (partial) screenshots
 of error reports instead of text will likely be automatically closed/deleted

---
 termux-shared/src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/termux-shared/src/main/res/values/strings.xml b/termux-shared/src/main/res/values/strings.xml
index f42f2a409c..5660259c0f 100644
--- a/termux-shared/src/main/res/values/strings.xml
+++ b/termux-shared/src/main/res/values/strings.xml
@@ -55,7 +55,7 @@
 
 
     <!-- TermuxUtils -->
-    <string name="msg_report_issue">If you want to report this issue, then copy its text from the options menu (3-dots on top right) and post an issue on one of the following links.\n\nIf you are posting a Termux app crash report, then please provide details on what you were doing that caused the crash and how to reproduce it, if possible.\n\nIf you are posting an issue on Github, then post it in the repository at which the report belongs at. You may optionally remove any device specific info that you consider private or don\'t want to share or that is not relevant to the issue.</string>
+    <string name="msg_report_issue">If you want to report this issue, then copy its text from the options menu (3-dots on top right) and post an issue on one of the following links.\n\nIf you are posting a Termux app crash report, then please provide details on what you were doing that caused the crash and how to reproduce it, if possible.\n\nIf you are posting an issue on Github, then post it in the repository at which the report belongs at. Issues opened or emails sent with **(partial) screenshots** instead of copied text or a file of this report **will likely be automatically closed/deleted**. You may optionally remove any device specific info that you consider private or don\'t want to share or that is not relevant to the issue.</string>
 
 
 

From 6409019a400f28502a27280e1da6bc02f5bba8cf Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 21 Aug 2021 02:55:13 +0500
Subject: [PATCH 508/912] Added: Add warning that hax support is not provided
 and asking questions will likely result in issue automatically closed or even
 ban

---
 .../src/main/java/com/termux/shared/termux/TermuxUtils.java     | 2 +-
 termux-shared/src/main/res/values/strings.xml                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
index 85d7b41741..c04e0aa1ac 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
@@ -241,7 +241,7 @@ public static String getReportIssueMarkdownString(@NonNull final Context context
 
         markdownString.append("## Where To Report An Issue");
 
-        markdownString.append("\n\n").append(context.getString(R.string.msg_report_issue)).append("\n");
+        markdownString.append("\n\n").append(context.getString(R.string.msg_report_issue, TermuxConstants.TERMUX_WIKI_URL)).append("\n");
 
         markdownString.append("\n\n### Email\n");
         markdownString.append("\n").append(MarkdownUtils.getLinkMarkdownString(TermuxConstants.TERMUX_SUPPORT_EMAIL_URL, TermuxConstants.TERMUX_SUPPORT_EMAIL_MAILTO_URL)).append("  ");
diff --git a/termux-shared/src/main/res/values/strings.xml b/termux-shared/src/main/res/values/strings.xml
index 5660259c0f..39e876cfcc 100644
--- a/termux-shared/src/main/res/values/strings.xml
+++ b/termux-shared/src/main/res/values/strings.xml
@@ -55,7 +55,7 @@
 
 
     <!-- TermuxUtils -->
-    <string name="msg_report_issue">If you want to report this issue, then copy its text from the options menu (3-dots on top right) and post an issue on one of the following links.\n\nIf you are posting a Termux app crash report, then please provide details on what you were doing that caused the crash and how to reproduce it, if possible.\n\nIf you are posting an issue on Github, then post it in the repository at which the report belongs at. Issues opened or emails sent with **(partial) screenshots** instead of copied text or a file of this report **will likely be automatically closed/deleted**. You may optionally remove any device specific info that you consider private or don\'t want to share or that is not relevant to the issue.</string>
+    <string name="msg_report_issue">If you want to report this issue, then copy its text from the options menu (3-dots on top right) and post an issue on one of the following links.\n\nIf you are posting a Termux app crash report, then please provide details on what you were doing that caused the crash and how to reproduce it, if possible.\n\nIf you are posting an issue on Github, then post it in the repository at which the report belongs at. Issues opened or emails sent with **(partial) screenshots** instead of copied text or a file of this report **will likely be automatically closed/deleted**. You may optionally remove any device specific info that you consider private or don\'t want to share or that is not relevant to the issue.\n\nWe do not provide support for any hacking related tools/scripts. Any questions asked about them over email, on github or other official termux community forums **will likely be automatically closed/deleted** and may even result in **temporary or permanent** ban. Check %1$s/wiki/Hacking for details.</string>
 
 
 

From 486faf7fad4d1053189ef1d3a8d904d01dea86f3 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 21 Aug 2021 03:40:31 +0500
Subject: [PATCH 509/912] Fixed: Stdin not being logged for background
 execution commands

---
 .../java/com/termux/shared/logger/Logger.java |  7 ++++-
 .../shared/models/ExecutionCommand.java       | 31 ++++++++++++++-----
 .../termux/shared/shell/StreamGobbler.java    |  2 +-
 .../com/termux/shared/shell/TermuxTask.java   |  7 +++--
 4 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/logger/Logger.java b/termux-shared/src/main/java/com/termux/shared/logger/Logger.java
index 10e777f848..fe41838712 100644
--- a/termux-shared/src/main/java/com/termux/shared/logger/Logger.java
+++ b/termux-shared/src/main/java/com/termux/shared/logger/Logger.java
@@ -26,6 +26,7 @@ public class Logger {
     public static final int LOG_LEVEL_VERBOSE = 3; // start logging verbose messages
 
     public static final int DEFAULT_LOG_LEVEL = LOG_LEVEL_NORMAL;
+    public static final int MAX_LOG_LEVEL = LOG_LEVEL_VERBOSE;
     private static int CURRENT_LOG_LEVEL = DEFAULT_LOG_LEVEL;
 
     /**
@@ -413,7 +414,7 @@ public static int getLogLevel() {
     }
 
     public static int setLogLevel(Context context, int logLevel) {
-        if (logLevel >= LOG_LEVEL_OFF && logLevel <= LOG_LEVEL_VERBOSE)
+        if (isLogLevelValid(logLevel))
             CURRENT_LOG_LEVEL = logLevel;
         else
             CURRENT_LOG_LEVEL = DEFAULT_LOG_LEVEL;
@@ -431,4 +432,8 @@ public static String getFullTag(String tag) {
             return DEFAULT_LOG_TAG + ":" + tag;
     }
 
+    public static boolean isLogLevelValid(Integer logLevel) {
+        return (logLevel != null && logLevel >= LOG_LEVEL_OFF && logLevel <= MAX_LOG_LEVEL);
+    }
+
 }
diff --git a/termux-shared/src/main/java/com/termux/shared/models/ExecutionCommand.java b/termux-shared/src/main/java/com/termux/shared/models/ExecutionCommand.java
index d3611a5364..84ac21db32 100644
--- a/termux-shared/src/main/java/com/termux/shared/models/ExecutionCommand.java
+++ b/termux-shared/src/main/java/com/termux/shared/models/ExecutionCommand.java
@@ -240,7 +240,7 @@ public synchronized boolean isStateFailed() {
     @Override
     public String toString() {
         if (!hasExecuted())
-            return getExecutionInputLogString(this, true);
+            return getExecutionInputLogString(this, true, true);
         else {
             return getExecutionOutputLogString(this, true, true);
         }
@@ -251,9 +251,10 @@ public String toString() {
      *
      * @param executionCommand The {@link ExecutionCommand} to convert.
      * @param ignoreNull Set to {@code true} if non-critical {@code null} values are to be ignored.
+     * @param logStdin Set to {@code true} if {@link #stdin} should be logged.
      * @return Returns the log friendly {@link String}.
      */
-    public static String getExecutionInputLogString(final ExecutionCommand executionCommand, boolean ignoreNull) {
+    public static String getExecutionInputLogString(final ExecutionCommand executionCommand, boolean ignoreNull, boolean logStdin) {
         if (executionCommand == null) return "null";
 
         StringBuilder logString = new StringBuilder();
@@ -270,8 +271,13 @@ public static String getExecutionInputLogString(final ExecutionCommand execution
         logString.append("\n").append(executionCommand.getInBackgroundLogString());
         logString.append("\n").append(executionCommand.getIsFailsafeLogString());
 
-        if (executionCommand.inBackground && (!ignoreNull || executionCommand.backgroundCustomLogLevel != null))
-            logString.append("\n").append(executionCommand.getBackgroundCustomLogLevelLogString());
+        if (executionCommand.inBackground) {
+            if (logStdin && (!ignoreNull || !DataUtils.isNullOrEmpty(executionCommand.stdin)))
+                logString.append("\n").append(executionCommand.getStdinLogString());
+
+            if (!ignoreNull || executionCommand.backgroundCustomLogLevel != null)
+                logString.append("\n").append(executionCommand.getBackgroundCustomLogLevelLogString());
+        }
 
         if (!ignoreNull || executionCommand.sessionAction != null)
             logString.append("\n").append(executionCommand.getSessionActionLogString());
@@ -321,7 +327,7 @@ public static String getDetailedLogString(final ExecutionCommand executionComman
 
         StringBuilder logString = new StringBuilder();
 
-        logString.append(getExecutionInputLogString(executionCommand, false));
+        logString.append(getExecutionInputLogString(executionCommand, false, true));
         logString.append(getExecutionOutputLogString(executionCommand, false, true));
 
         logString.append("\n").append(executionCommand.getCommandDescriptionLogString());
@@ -356,8 +362,12 @@ public static String getExecutionCommandMarkdownString(final ExecutionCommand ex
         markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("inBackground", executionCommand.inBackground, "-"));
         markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("isFailsafe", executionCommand.isFailsafe, "-"));
 
-        if (executionCommand.inBackground && executionCommand.backgroundCustomLogLevel != null)
-            markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Background Custom Log Level", executionCommand.backgroundCustomLogLevel, "-"));
+        if (executionCommand.inBackground) {
+            if (!DataUtils.isNullOrEmpty(executionCommand.stdin))
+                markdownString.append("\n").append(MarkdownUtils.getMultiLineMarkdownStringEntry("Stdin", executionCommand.stdin, "-"));
+            if (executionCommand.backgroundCustomLogLevel != null)
+                markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Background Custom Log Level", executionCommand.backgroundCustomLogLevel, "-"));
+        }
 
         markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Session Action", executionCommand.sessionAction, "-"));
 
@@ -431,6 +441,13 @@ public String getIsFailsafeLogString() {
         return "isFailsafe: `" + isFailsafe + "`";
     }
 
+    public String getStdinLogString() {
+        if (DataUtils.isNullOrEmpty(stdin))
+            return "Stdin: -";
+        else
+            return Logger.getMultiLineLogStringEntry("Stdin", stdin, "-");
+    }
+
     public String getBackgroundCustomLogLevelLogString() {
         return "Background Custom Log Level: `" + backgroundCustomLogLevel + "`";
     }
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/StreamGobbler.java b/termux-shared/src/main/java/com/termux/shared/shell/StreamGobbler.java
index a8e1ca9136..e17ecefb23 100644
--- a/termux-shared/src/main/java/com/termux/shared/shell/StreamGobbler.java
+++ b/termux-shared/src/main/java/com/termux/shared/shell/StreamGobbler.java
@@ -194,7 +194,7 @@ public void run() {
         int currentLogLevel = Logger.getLogLevel();
 
         int customLogLevel;
-        if (mLlogLevel != null && mLlogLevel >= Logger.LOG_LEVEL_OFF) {
+        if (Logger.isLogLevelValid(mLlogLevel)) {
             customLogLevel = mLlogLevel;
             Logger.logVerbose(LOG_TAG, "Using custom log level: " + customLogLevel + ", current log level: " + currentLogLevel);
         } else {
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/TermuxTask.java b/termux-shared/src/main/java/com/termux/shared/shell/TermuxTask.java
index 4d0658e558..8b75be41a3 100644
--- a/termux-shared/src/main/java/com/termux/shared/shell/TermuxTask.java
+++ b/termux-shared/src/main/java/com/termux/shared/shell/TermuxTask.java
@@ -8,6 +8,7 @@
 import androidx.annotation.NonNull;
 
 import com.termux.shared.R;
+import com.termux.shared.data.DataUtils;
 import com.termux.shared.models.ExecutionCommand;
 import com.termux.shared.models.ResultData;
 import com.termux.shared.models.errors.Errno;
@@ -80,7 +81,9 @@ public static TermuxTask execute(@NonNull final Context context, @NonNull Execut
             return null;
         }
 
-        Logger.logDebug(LOG_TAG, executionCommand.toString());
+        // No need to log stdin if logging is disabled, like for app internal scripts
+        int customLogLevel = Logger.isLogLevelValid(executionCommand.backgroundCustomLogLevel) ? executionCommand.backgroundCustomLogLevel: Logger.LOG_LEVEL_VERBOSE;
+        Logger.logDebug(LOG_TAG, ExecutionCommand.getExecutionInputLogString(executionCommand, true, customLogLevel >= Logger.getLogLevel()));
 
         String taskName = ShellUtils.getExecutableBasename(executionCommand.executable);
 
@@ -146,7 +149,7 @@ private void executeInner(@NonNull final Context context) throws IllegalThreadSt
         STDOUT.start();
         STDERR.start();
 
-        if (mExecutionCommand.stdin != null && !mExecutionCommand.stdin.isEmpty()) {
+        if (!DataUtils.isNullOrEmpty(mExecutionCommand.stdin)) {
             try {
                 STDIN.write((mExecutionCommand.stdin + "\n").getBytes(StandardCharsets.UTF_8));
                 STDIN.flush();

From 19f40840990863fd1f071399704c5a28672c3c72 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 21 Aug 2021 03:41:29 +0500
Subject: [PATCH 510/912] Added: Add labels for ExecutionCommand for termux
 internal commands

---
 .../src/main/java/com/termux/shared/file/TermuxFileUtils.java   | 1 +
 .../src/main/java/com/termux/shared/termux/TermuxUtils.java     | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/termux-shared/src/main/java/com/termux/shared/file/TermuxFileUtils.java b/termux-shared/src/main/java/com/termux/shared/file/TermuxFileUtils.java
index bdd77e81bd..41c76b875d 100644
--- a/termux-shared/src/main/java/com/termux/shared/file/TermuxFileUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/file/TermuxFileUtils.java
@@ -260,6 +260,7 @@ public static String getTermuxFilesDirStatMarkdownString(@NonNull final Context
 
         // Run script
         ExecutionCommand executionCommand = new ExecutionCommand(1, "/system/bin/sh", null, statScript.toString() + "\n", "/", true, true);
+        executionCommand.commandLabel = TermuxConstants.TERMUX_APP_NAME + " Files Stat Command";
         executionCommand.backgroundCustomLogLevel = Logger.LOG_LEVEL_OFF;
         TermuxTask termuxTask = TermuxTask.execute(context, executionCommand, null, new TermuxShellEnvironmentClient(), true);
         if (termuxTask == null || !executionCommand.isSuccessful()) {
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
index c04e0aa1ac..5f836ce746 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
@@ -341,6 +341,7 @@ public static String geAPTInfoMarkdownString(@NonNull final Context context) {
         aptInfoScript = aptInfoScript.replaceAll(Pattern.quote("@TERMUX_PREFIX@"), TermuxConstants.TERMUX_PREFIX_DIR_PATH);
 
         ExecutionCommand executionCommand = new ExecutionCommand(1, TermuxConstants.TERMUX_BIN_PREFIX_DIR_PATH + "/bash", null, aptInfoScript, null, true, false);
+        executionCommand.commandLabel = "APT Info Command";
         executionCommand.backgroundCustomLogLevel = Logger.LOG_LEVEL_OFF;
         TermuxTask termuxTask = TermuxTask.execute(context, executionCommand, null, new TermuxShellEnvironmentClient(), true);
         if (termuxTask == null || !executionCommand.isSuccessful() || executionCommand.resultData.exitCode != 0) {
@@ -398,6 +399,7 @@ public static String getLogcatDumpMarkdownString(@NonNull final Context context)
         // Run script
         // Logging must be disabled for output of logcat command itself in StreamGobbler
         ExecutionCommand executionCommand = new ExecutionCommand(1, "/system/bin/sh", null, logcatScript + "\n", "/", true, true);
+        executionCommand.commandLabel = "Logcat dump command";
         executionCommand.backgroundCustomLogLevel = Logger.LOG_LEVEL_OFF;
         TermuxTask termuxTask = TermuxTask.execute(context, executionCommand, null, new TermuxShellEnvironmentClient(), true);
         if (termuxTask == null || !executionCommand.isSuccessful()) {

From 10704b1dad42a3d2f06bc6244db89a12a7058d51 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 21 Aug 2021 03:48:32 +0500
Subject: [PATCH 511/912] Changed: Use extended version of Logger functions for
 logging execution commands

---
 app/src/main/java/com/termux/app/RunCommandService.java   | 2 +-
 app/src/main/java/com/termux/app/TermuxService.java       | 4 ++--
 .../main/java/com/termux/shared/file/TermuxFileUtils.java | 4 ++--
 .../main/java/com/termux/shared/shell/TermuxSession.java  | 2 +-
 .../src/main/java/com/termux/shared/shell/TermuxTask.java | 2 +-
 .../main/java/com/termux/shared/termux/TermuxUtils.java   | 8 ++++----
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/com/termux/app/RunCommandService.java b/app/src/main/java/com/termux/app/RunCommandService.java
index 0c8903ba92..bc4d64512a 100644
--- a/app/src/main/java/com/termux/app/RunCommandService.java
+++ b/app/src/main/java/com/termux/app/RunCommandService.java
@@ -189,7 +189,7 @@ public int onStartCommand(Intent intent, int flags, int startId) {
 
         executionCommand.executableUri = new Uri.Builder().scheme(TERMUX_SERVICE.URI_SCHEME_SERVICE_EXECUTE).path(executionCommand.executable).build();
 
-        Logger.logVerbose(LOG_TAG, executionCommand.toString());
+        Logger.logVerboseExtended(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);
diff --git a/app/src/main/java/com/termux/app/TermuxService.java b/app/src/main/java/com/termux/app/TermuxService.java
index bb3f38c80d..52cba673ad 100644
--- a/app/src/main/java/com/termux/app/TermuxService.java
+++ b/app/src/main/java/com/termux/app/TermuxService.java
@@ -427,7 +427,7 @@ public synchronized TermuxTask createTermuxTask(ExecutionCommand executionComman
         }
 
         if (Logger.getLogLevel() >= Logger.LOG_LEVEL_VERBOSE)
-            Logger.logVerbose(LOG_TAG, executionCommand.toString());
+            Logger.logVerboseExtended(LOG_TAG, executionCommand.toString());
 
         TermuxTask newTermuxTask = TermuxTask.execute(this, executionCommand, this, new TermuxShellEnvironmentClient(), false);
         if (newTermuxTask == null) {
@@ -519,7 +519,7 @@ public synchronized TermuxSession createTermuxSession(ExecutionCommand execution
         }
 
         if (Logger.getLogLevel() >= Logger.LOG_LEVEL_VERBOSE)
-            Logger.logVerbose(LOG_TAG, executionCommand.toString());
+            Logger.logVerboseExtended(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,
diff --git a/termux-shared/src/main/java/com/termux/shared/file/TermuxFileUtils.java b/termux-shared/src/main/java/com/termux/shared/file/TermuxFileUtils.java
index 41c76b875d..f7df0b9d19 100644
--- a/termux-shared/src/main/java/com/termux/shared/file/TermuxFileUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/file/TermuxFileUtils.java
@@ -264,7 +264,7 @@ public static String getTermuxFilesDirStatMarkdownString(@NonNull final Context
         executionCommand.backgroundCustomLogLevel = Logger.LOG_LEVEL_OFF;
         TermuxTask termuxTask = TermuxTask.execute(context, executionCommand, null, new TermuxShellEnvironmentClient(), true);
         if (termuxTask == null || !executionCommand.isSuccessful()) {
-            Logger.logError(LOG_TAG, executionCommand.toString());
+            Logger.logErrorExtended(LOG_TAG, executionCommand.toString());
             return null;
         }
 
@@ -275,7 +275,7 @@ public static String getTermuxFilesDirStatMarkdownString(@NonNull final Context
 
         boolean stderrSet = !executionCommand.resultData.stderr.toString().isEmpty();
         if (executionCommand.resultData.exitCode != 0 || stderrSet) {
-            Logger.logError(LOG_TAG, executionCommand.toString());
+            Logger.logErrorExtended(LOG_TAG, executionCommand.toString());
             if (stderrSet)
                 statOutput.append("\n").append(executionCommand.resultData.stderr.toString());
             statOutput.append("\n").append("exit code: ").append(executionCommand.resultData.exitCode.toString());
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/TermuxSession.java b/termux-shared/src/main/java/com/termux/shared/shell/TermuxSession.java
index 5d46733062..b69e36daeb 100644
--- a/termux-shared/src/main/java/com/termux/shared/shell/TermuxSession.java
+++ b/termux-shared/src/main/java/com/termux/shared/shell/TermuxSession.java
@@ -125,7 +125,7 @@ public static TermuxSession execute(@NonNull final Context context, @NonNull Exe
             return null;
         }
 
-        Logger.logDebug(LOG_TAG, executionCommand.toString());
+        Logger.logDebugExtended(LOG_TAG, executionCommand.toString());
 
         Logger.logDebug(LOG_TAG, "Running \"" + executionCommand.getCommandIdAndLabelLogString() + "\" TermuxSession");
         TerminalSession terminalSession = new TerminalSession(executionCommand.executable, executionCommand.workingDirectory, executionCommand.arguments, environment, executionCommand.terminalTranscriptRows, terminalSessionClient);
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/TermuxTask.java b/termux-shared/src/main/java/com/termux/shared/shell/TermuxTask.java
index 8b75be41a3..8f8974ac5d 100644
--- a/termux-shared/src/main/java/com/termux/shared/shell/TermuxTask.java
+++ b/termux-shared/src/main/java/com/termux/shared/shell/TermuxTask.java
@@ -83,7 +83,7 @@ public static TermuxTask execute(@NonNull final Context context, @NonNull Execut
 
         // No need to log stdin if logging is disabled, like for app internal scripts
         int customLogLevel = Logger.isLogLevelValid(executionCommand.backgroundCustomLogLevel) ? executionCommand.backgroundCustomLogLevel: Logger.LOG_LEVEL_VERBOSE;
-        Logger.logDebug(LOG_TAG, ExecutionCommand.getExecutionInputLogString(executionCommand, true, customLogLevel >= Logger.getLogLevel()));
+        Logger.logDebugExtended(LOG_TAG, ExecutionCommand.getExecutionInputLogString(executionCommand, true, customLogLevel >= Logger.getLogLevel()));
 
         String taskName = ShellUtils.getExecutableBasename(executionCommand.executable);
 
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
index 5f836ce746..d401061ad5 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
@@ -345,12 +345,12 @@ public static String geAPTInfoMarkdownString(@NonNull final Context context) {
         executionCommand.backgroundCustomLogLevel = Logger.LOG_LEVEL_OFF;
         TermuxTask termuxTask = TermuxTask.execute(context, executionCommand, null, new TermuxShellEnvironmentClient(), true);
         if (termuxTask == null || !executionCommand.isSuccessful() || executionCommand.resultData.exitCode != 0) {
-            Logger.logError(LOG_TAG, executionCommand.toString());
+            Logger.logErrorExtended(LOG_TAG, executionCommand.toString());
             return null;
         }
 
         if (!executionCommand.resultData.stderr.toString().isEmpty())
-            Logger.logError(LOG_TAG, executionCommand.toString());
+            Logger.logErrorExtended(LOG_TAG, executionCommand.toString());
 
         StringBuilder markdownString = new StringBuilder();
 
@@ -403,7 +403,7 @@ public static String getLogcatDumpMarkdownString(@NonNull final Context context)
         executionCommand.backgroundCustomLogLevel = Logger.LOG_LEVEL_OFF;
         TermuxTask termuxTask = TermuxTask.execute(context, executionCommand, null, new TermuxShellEnvironmentClient(), true);
         if (termuxTask == null || !executionCommand.isSuccessful()) {
-            Logger.logError(LOG_TAG, executionCommand.toString());
+            Logger.logErrorExtended(LOG_TAG, executionCommand.toString());
             return null;
         }
 
@@ -414,7 +414,7 @@ public static String getLogcatDumpMarkdownString(@NonNull final Context context)
 
         boolean stderrSet = !executionCommand.resultData.stderr.toString().isEmpty();
         if (executionCommand.resultData.exitCode != 0 || stderrSet) {
-            Logger.logError(LOG_TAG, executionCommand.toString());
+            Logger.logErrorExtended(LOG_TAG, executionCommand.toString());
             if (stderrSet)
                 logcatOutput.append("\n").append(executionCommand.resultData.stderr.toString());
             logcatOutput.append("\n").append("exit code: ").append(executionCommand.resultData.exitCode.toString());

From 956e20e53dfead797f8e279f300579484dbf985a Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 21 Aug 2021 04:22:43 +0500
Subject: [PATCH 512/912] Fixed: Fix NullPointerException when running
 bell/vibrate on Samsung devices on android 8 and handled deprecated code

Apparently occurs on only Samsung android 8 devices and there is no fix for vibrator except catching the exception so that app doesn't crash.

https://gitlab.com/juanitobananas/wave-up/-/issues/131
https://github.com/overbound/SonicTimeTwisted/issues/131
https://web.archive.org/web/20201114040257/https://www.badlogicgames.com/forum/viewtopic.php?t=28507

```
java.lang.NullPointerException: Attempt to read from field 'android.os.VibrationEffect com.android.server.VibratorService$Vibration.mEffect' on a null object reference
at android.os.Parcel.readException(Parcel.java:2035)
at android.os.Parcel.readException(Parcel.java:1975)
at android.os.IVibratorService$Stub$Proxy.vibrate(IVibratorService.java:292)
at android.os.SystemVibrator.vibrate(SystemVibrator.java:81)
at android.os.Vibrator.vibrate(Vibrator.java:191)
at android.os.Vibrator.vibrate(Vibrator.java:110)
at android.os.Vibrator.vibrate(Vibrator.java:89)
at com.termux.app.terminal.io.BellHandler$1.run(BellHandler.java:37)
at com.termux.app.terminal.io.BellHandler.doBell(BellHandler.java:55)
at com.termux.app.terminal.TermuxTerminalSessionClient.onBell(TermuxTerminalSessionClient.java:178)
at com.termux.terminal.TerminalSession.onBell(TerminalSession.java:278)
```
---
 .../termux/app/terminal/io/BellHandler.java    | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/termux/app/terminal/io/BellHandler.java b/app/src/main/java/com/termux/app/terminal/io/BellHandler.java
index 728e12e60d..76f592c7d4 100644
--- a/app/src/main/java/com/termux/app/terminal/io/BellHandler.java
+++ b/app/src/main/java/com/termux/app/terminal/io/BellHandler.java
@@ -1,15 +1,21 @@
 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) {
@@ -34,7 +40,17 @@ private BellHandler(final Vibrator vibrator) {
             @Override
             public void run() {
                 if (vibrator != null) {
-                    vibrator.vibrate(DURATION);
+                    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);
+                    }
                 }
             }
         };

From e889d84dc44d08e324cf89cb3186be81ccfcf478 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 21 Aug 2021 05:26:22 +0500
Subject: [PATCH 513/912] Changed!: Changes introduced to disable/change
 logging in 60f37bde now also apply to stdin and plugin command results

---
 .../com/termux/app/utils/PluginUtils.java     | 23 +++++++++------
 .../java/com/termux/shared/logger/Logger.java |  7 +++++
 .../shared/models/ExecutionCommand.java       | 15 ++++++----
 .../com/termux/shared/models/ResultData.java  | 10 ++++---
 .../com/termux/shared/shell/ResultSender.java | 20 ++++++++-----
 .../termux/shared/shell/StreamGobbler.java    | 28 ++++++++-----------
 .../com/termux/shared/shell/TermuxTask.java   |  4 +--
 7 files changed, 63 insertions(+), 44 deletions(-)

diff --git a/app/src/main/java/com/termux/app/utils/PluginUtils.java b/app/src/main/java/com/termux/app/utils/PluginUtils.java
index 3fbd40ebd7..17fbbdb728 100644
--- a/app/src/main/java/com/termux/app/utils/PluginUtils.java
+++ b/app/src/main/java/com/termux/app/utils/PluginUtils.java
@@ -65,9 +65,12 @@ public static void processPluginExecutionCommandResult(final Context context, St
         }
 
         boolean isPluginExecutionCommandWithPendingResult = executionCommand.isPluginExecutionCommandWithPendingResult();
+        boolean isExecutionCommandLoggingEnabled = Logger.shouldEnableLoggingForCustomLogLevel(executionCommand.backgroundCustomLogLevel);
 
         // Log the output. ResultData should not be logged if pending result since ResultSender will do it
-        Logger.logDebugExtended(logTag, ExecutionCommand.getExecutionOutputLogString(executionCommand, true, !isPluginExecutionCommandWithPendingResult));
+        // or if logging is disabled
+        Logger.logDebugExtended(logTag, ExecutionCommand.getExecutionOutputLogString(executionCommand, true,
+            !isPluginExecutionCommandWithPendingResult, isExecutionCommandLoggingEnabled));
 
         // If execution command was started by a plugin which expects the result back
         if (isPluginExecutionCommandWithPendingResult) {
@@ -78,11 +81,12 @@ public static void processPluginExecutionCommandResult(final Context context, St
                 setPluginResultDirectoryVariables(executionCommand);
 
             // Send result to caller
-            error = ResultSender.sendCommandResultData(context, logTag, executionCommand.getCommandIdAndLabelLogString(), executionCommand.resultConfig, executionCommand.resultData);
+            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));
+                Logger.logDebugExtended(logTag, ExecutionCommand.getExecutionOutputLogString(executionCommand, true, true, isExecutionCommandLoggingEnabled));
 
                 // Flash and send notification for the error
                 Logger.showToast(context, ResultData.getErrorsListMinimalString(resultData), true);
@@ -133,9 +137,11 @@ public static void processPluginExecutionCommandError(final Context context, Str
         }
 
         boolean isPluginExecutionCommandWithPendingResult = executionCommand.isPluginExecutionCommandWithPendingResult();
+        boolean isExecutionCommandLoggingEnabled = Logger.shouldEnableLoggingForCustomLogLevel(executionCommand.backgroundCustomLogLevel);
 
         // 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));
+        Logger.logErrorExtended(logTag, ExecutionCommand.getExecutionOutputLogString(executionCommand, true,
+            !isPluginExecutionCommandWithPendingResult, isExecutionCommandLoggingEnabled));
 
         // If execution command was started by a plugin which expects the result back
         if (isPluginExecutionCommandWithPendingResult) {
@@ -146,11 +152,12 @@ public static void processPluginExecutionCommandError(final Context context, Str
                 setPluginResultDirectoryVariables(executionCommand);
 
             // Send result to caller
-            error = ResultSender.sendCommandResultData(context, logTag, executionCommand.getCommandIdAndLabelLogString(), executionCommand.resultConfig, executionCommand.resultData);
+            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));
+                Logger.logErrorExtended(logTag, ExecutionCommand.getExecutionOutputLogString(executionCommand, true, true, isExecutionCommandLoggingEnabled));
                 forceNotification = true;
             }
 
@@ -171,7 +178,7 @@ public static void processPluginExecutionCommandError(final Context context, Str
 
     }
 
-    /** Set variables which will be used by {@link ResultSender#sendCommandResultData(Context, String, String, ResultConfig, ResultData)}
+    /** 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;
@@ -186,7 +193,7 @@ public static void setPluginResultPendingIntentVariables(ExecutionCommand execut
         resultConfig.resultErrmsgKey = TERMUX_SERVICE.EXTRA_PLUGIN_RESULT_BUNDLE_ERRMSG;
     }
 
-    /** Set variables which will be used by {@link ResultSender#sendCommandResultData(Context, String, String, ResultConfig, ResultData)}
+    /** 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;
diff --git a/termux-shared/src/main/java/com/termux/shared/logger/Logger.java b/termux-shared/src/main/java/com/termux/shared/logger/Logger.java
index fe41838712..176ba56fc6 100644
--- a/termux-shared/src/main/java/com/termux/shared/logger/Logger.java
+++ b/termux-shared/src/main/java/com/termux/shared/logger/Logger.java
@@ -436,4 +436,11 @@ public static boolean isLogLevelValid(Integer logLevel) {
         return (logLevel != null && logLevel >= LOG_LEVEL_OFF && logLevel <= MAX_LOG_LEVEL);
     }
 
+    /** Check if custom log level is valid and >= {@link #CURRENT_LOG_LEVEL}. If custom log level is
+     * not valid then {@link #LOG_LEVEL_VERBOSE} must be >= {@link #CURRENT_LOG_LEVEL}. */
+    public static boolean shouldEnableLoggingForCustomLogLevel(Integer customLogLevel) {
+        customLogLevel = Logger.isLogLevelValid(customLogLevel) ? customLogLevel: Logger.LOG_LEVEL_VERBOSE;
+        return (customLogLevel >= CURRENT_LOG_LEVEL);
+    }
+
 }
diff --git a/termux-shared/src/main/java/com/termux/shared/models/ExecutionCommand.java b/termux-shared/src/main/java/com/termux/shared/models/ExecutionCommand.java
index 84ac21db32..b908e1d07f 100644
--- a/termux-shared/src/main/java/com/termux/shared/models/ExecutionCommand.java
+++ b/termux-shared/src/main/java/com/termux/shared/models/ExecutionCommand.java
@@ -85,8 +85,10 @@ public int getValue() {
 
     /**
      * The {@link ExecutionCommand} custom log level for background {@link com.termux.shared.shell.TermuxTask}
-     * commands. By default, @link com.termux.shared.shell.StreamGobbler} only logs if {@link Logger}
-     * `CURRENT_LOG_LEVEL` is >= {@link Logger#LOG_LEVEL_VERBOSE}.
+     * commands. By default, @link com.termux.shared.shell.StreamGobbler} only logs stdout and
+     * stderr if {@link Logger} `CURRENT_LOG_LEVEL` is >= {@link Logger#LOG_LEVEL_VERBOSE} and
+     * {@link com.termux.shared.shell.TermuxTask} only logs stdin if `CURRENT_LOG_LEVEL` is >=
+     * {@link Logger#LOG_LEVEL_DEBUG}.
      */
     public Integer backgroundCustomLogLevel;
 
@@ -242,7 +244,7 @@ public String toString() {
         if (!hasExecuted())
             return getExecutionInputLogString(this, true, true);
         else {
-            return getExecutionOutputLogString(this, true, true);
+            return getExecutionOutputLogString(this, true, true, true);
         }
     }
 
@@ -298,9 +300,10 @@ public static String getExecutionInputLogString(final ExecutionCommand execution
      * @param executionCommand The {@link ExecutionCommand} to convert.
      * @param ignoreNull Set to {@code true} if non-critical {@code null} values are to be ignored.
      * @param logResultData Set to {@code true} if {@link #resultData} should be logged.
+     * @param logStdoutAndStderr Set to {@code true} if {@link ResultData#stdout} and {@link ResultData#stderr} should be logged.
      * @return Returns the log friendly {@link String}.
      */
-    public static String getExecutionOutputLogString(final ExecutionCommand executionCommand, boolean ignoreNull, boolean logResultData) {
+    public static String getExecutionOutputLogString(final ExecutionCommand executionCommand, boolean ignoreNull, boolean logResultData, boolean logStdoutAndStderr) {
         if (executionCommand == null) return "null";
 
         StringBuilder logString = new StringBuilder();
@@ -311,7 +314,7 @@ public static String getExecutionOutputLogString(final ExecutionCommand executio
         logString.append("\n").append(executionCommand.getCurrentStateLogString());
 
         if (logResultData)
-            logString.append("\n").append(ResultData.getResultDataLogString(executionCommand.resultData, ignoreNull));
+            logString.append("\n").append(ResultData.getResultDataLogString(executionCommand.resultData, logStdoutAndStderr));
 
         return logString.toString();
     }
@@ -328,7 +331,7 @@ public static String getDetailedLogString(final ExecutionCommand executionComman
         StringBuilder logString = new StringBuilder();
 
         logString.append(getExecutionInputLogString(executionCommand, false, true));
-        logString.append(getExecutionOutputLogString(executionCommand, false, true));
+        logString.append(getExecutionOutputLogString(executionCommand, false, true, true));
 
         logString.append("\n").append(executionCommand.getCommandDescriptionLogString());
         logString.append("\n").append(executionCommand.getCommandHelpLogString());
diff --git a/termux-shared/src/main/java/com/termux/shared/models/ResultData.java b/termux-shared/src/main/java/com/termux/shared/models/ResultData.java
index 85e1b06b07..2501653edb 100644
--- a/termux-shared/src/main/java/com/termux/shared/models/ResultData.java
+++ b/termux-shared/src/main/java/com/termux/shared/models/ResultData.java
@@ -133,16 +133,18 @@ public String toString() {
      * Get a log friendly {@link String} for {@link ResultData} parameters.
      *
      * @param resultData The {@link ResultData} to convert.
-     * @param ignoreNull Set to {@code true} if non-critical {@code null} values are to be ignored.
+     * @param logStdoutAndStderr Set to {@code true} if {@link #stdout} and {@link #stderr} should be logged.
      * @return Returns the log friendly {@link String}.
      */
-    public static String getResultDataLogString(final ResultData resultData, boolean ignoreNull) {
+    public static String getResultDataLogString(final ResultData resultData, boolean logStdoutAndStderr) {
         if (resultData == null) return "null";
 
         StringBuilder logString = new StringBuilder();
 
-        logString.append("\n").append(resultData.getStdoutLogString());
-        logString.append("\n").append(resultData.getStderrLogString());
+        if (logStdoutAndStderr) {
+            logString.append("\n").append(resultData.getStdoutLogString());
+            logString.append("\n").append(resultData.getStderrLogString());
+        }
         logString.append("\n").append(resultData.getExitCodeLogString());
 
         logString.append("\n\n").append(getErrorsListLogString(resultData));
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/ResultSender.java b/termux-shared/src/main/java/com/termux/shared/shell/ResultSender.java
index bac25bd683..20b384e333 100644
--- a/termux-shared/src/main/java/com/termux/shared/shell/ResultSender.java
+++ b/termux-shared/src/main/java/com/termux/shared/shell/ResultSender.java
@@ -34,22 +34,24 @@ public class ResultSender {
      * @param label The label for the command.
      * @param resultConfig The {@link ResultConfig} object containing information on how to send the result.
      * @param resultData The {@link ResultData} object containing result data.
+     * @param logStdoutAndStderr Set to {@code true} if {@link ResultData#stdout} and {@link ResultData#stderr}
+     *                           should be logged.
      * @return Returns the {@link Error} if failed to send the result, otherwise {@code null}.
      */
-    public static Error sendCommandResultData(Context context, String logTag, String label, ResultConfig resultConfig, ResultData resultData) {
+    public static Error sendCommandResultData(Context context, String logTag, String label, ResultConfig resultConfig, ResultData resultData, boolean logStdoutAndStderr) {
         if (context == null || resultConfig == null || resultData == null)
             return FunctionErrno.ERRNO_NULL_OR_EMPTY_PARAMETERS.getError("context, resultConfig or resultData", "sendCommandResultData");
 
         Error error;
 
         if (resultConfig.resultPendingIntent != null) {
-            error = sendCommandResultDataWithPendingIntent(context, logTag, label, resultConfig, resultData);
+            error = sendCommandResultDataWithPendingIntent(context, logTag, label, resultConfig, resultData, logStdoutAndStderr);
             if (error != null || resultConfig.resultDirectoryPath == null)
                 return error;
         }
 
         if (resultConfig.resultDirectoryPath != null) {
-            return sendCommandResultDataToDirectory(context, logTag, label, resultConfig, resultData);
+            return sendCommandResultDataToDirectory(context, logTag, label, resultConfig, resultData, logStdoutAndStderr);
         } else {
             return FunctionErrno.ERRNO_UNSET_PARAMETERS.getError("resultConfig.resultPendingIntent or resultConfig.resultDirectoryPath", "sendCommandResultData");
         }
@@ -63,15 +65,17 @@ public static Error sendCommandResultData(Context context, String logTag, String
      * @param label The label for the command.
      * @param resultConfig The {@link ResultConfig} object containing information on how to send the result.
      * @param resultData The {@link ResultData} object containing result data.
+     * @param logStdoutAndStderr Set to {@code true} if {@link ResultData#stdout} and {@link ResultData#stderr}
+     *                           should be logged.
      * @return Returns the {@link Error} if failed to send the result, otherwise {@code null}.
      */
-    public static Error sendCommandResultDataWithPendingIntent(Context context, String logTag, String label, ResultConfig resultConfig, ResultData resultData) {
+    public static Error sendCommandResultDataWithPendingIntent(Context context, String logTag, String label, ResultConfig resultConfig, ResultData resultData, boolean logStdoutAndStderr) {
         if (context == null || resultConfig == null || resultData == null || resultConfig.resultPendingIntent == null || resultConfig.resultBundleKey == null)
             return FunctionErrno.ERRNO_NULL_OR_EMPTY_PARAMETER.getError("context, resultConfig, resultData, resultConfig.resultPendingIntent or resultConfig.resultBundleKey", "sendCommandResultDataWithPendingIntent");
 
         logTag = DataUtils.getDefaultIfNull(logTag, LOG_TAG);
 
-        Logger.logDebugExtended(logTag, "Sending result for command \"" + label + "\":\n" + resultConfig.toString() + "\n" + resultData.toString());
+        Logger.logDebugExtended(logTag, "Sending result for command \"" + label + "\":\n" + resultConfig.toString() + "\n" + ResultData.getResultDataLogString(resultData, logStdoutAndStderr));
 
         String resultDataStdout = resultData.stdout.toString();
         String resultDataStderr = resultData.stderr.toString();
@@ -152,9 +156,11 @@ public static Error sendCommandResultDataWithPendingIntent(Context context, Stri
      * @param label The label for the command.
      * @param resultConfig The {@link ResultConfig} object containing information on how to send the result.
      * @param resultData The {@link ResultData} object containing result data.
+     * @param logStdoutAndStderr Set to {@code true} if {@link ResultData#stdout} and {@link ResultData#stderr}
+     *                           should be logged.
      * @return Returns the {@link Error} if failed to send the result, otherwise {@code null}.
      */
-    public static Error sendCommandResultDataToDirectory(Context context, String logTag, String label, ResultConfig resultConfig, ResultData resultData) {
+    public static Error sendCommandResultDataToDirectory(Context context, String logTag, String label, ResultConfig resultConfig, ResultData resultData, boolean logStdoutAndStderr) {
         if (context == null || resultConfig == null || resultData == null || DataUtils.isNullOrEmpty(resultConfig.resultDirectoryPath))
             return FunctionErrno.ERRNO_NULL_OR_EMPTY_PARAMETER.getError("context, resultConfig, resultData or resultConfig.resultDirectoryPath", "sendCommandResultDataToDirectory");
 
@@ -177,7 +183,7 @@ public static Error sendCommandResultDataToDirectory(Context context, String log
 
         resultConfig.resultDirectoryPath = FileUtils.getCanonicalPath(resultConfig.resultDirectoryPath, null);
 
-        Logger.logDebugExtended(logTag, "Writing result for command \"" + label + "\":\n" + resultConfig.toString() + "\n" + resultData.toString());
+        Logger.logDebugExtended(logTag, "Writing result for command \"" + label + "\":\n" + resultConfig.toString() + "\n" + ResultData.getResultDataLogString(resultData, logStdoutAndStderr));
 
         // If resultDirectoryPath 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
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/StreamGobbler.java b/termux-shared/src/main/java/com/termux/shared/shell/StreamGobbler.java
index e17ecefb23..aae4186549 100644
--- a/termux-shared/src/main/java/com/termux/shared/shell/StreamGobbler.java
+++ b/termux-shared/src/main/java/com/termux/shared/shell/StreamGobbler.java
@@ -88,7 +88,7 @@ public interface OnStreamClosedListener {
     @Nullable
     private final OnStreamClosedListener streamClosedListener;
     @Nullable
-    private final Integer mLlogLevel;
+    private final Integer mLogLevel;
     private volatile boolean active = true;
     private volatile boolean calledOnClose = false;
 
@@ -104,7 +104,7 @@ public interface OnStreamClosedListener {
      * @param shell Name of the shell
      * @param inputStream InputStream to read from
      * @param outputList {@literal List<String>} to write to, or null
-     * @param logLevel The custom log level to use for logging by command output. If set to
+     * @param logLevel The custom log level to use for logging the command output. If set to
      *                 {@code null}, then {@link Logger#LOG_LEVEL_VERBOSE} will be used.
      */
     @AnyThread
@@ -121,7 +121,7 @@ public StreamGobbler(@NonNull String shell, @NonNull InputStream inputStream,
         stringWriter = null;
         lineListener = null;
 
-        mLlogLevel = logLevel;
+        mLogLevel = logLevel;
     }
 
     /**
@@ -136,7 +136,7 @@ public StreamGobbler(@NonNull String shell, @NonNull InputStream inputStream,
      * @param shell Name of the shell
      * @param inputStream InputStream to read from
      * @param outputString {@literal List<String>} to write to, or null
-     * @param logLevel The custom log level to use for logging by command output. If set to
+     * @param logLevel The custom log level to use for logging the command output. If set to
      *                 {@code null}, then {@link Logger#LOG_LEVEL_VERBOSE} will be used.
      */
     @AnyThread
@@ -153,7 +153,7 @@ public StreamGobbler(@NonNull String shell, @NonNull InputStream inputStream,
         stringWriter = outputString;
         lineListener = null;
 
-        mLlogLevel = logLevel;
+        mLogLevel = logLevel;
     }
 
     /**
@@ -167,7 +167,7 @@ public StreamGobbler(@NonNull String shell, @NonNull InputStream inputStream,
      * @param inputStream InputStream to read from
      * @param onLineListener OnLineListener callback
      * @param onStreamClosedListener OnStreamClosedListener callback
-     * @param logLevel The custom log level to use for logging by command output. If set to
+     * @param logLevel The custom log level to use for logging the command output. If set to
      *                 {@code null}, then {@link Logger#LOG_LEVEL_VERBOSE} will be used.
      */
     @AnyThread
@@ -185,28 +185,22 @@ public StreamGobbler(@NonNull String shell, @NonNull InputStream inputStream,
         stringWriter = null;
         lineListener = onLineListener;
 
-        mLlogLevel = logLevel;
+        mLogLevel = logLevel;
     }
 
     @Override
     public void run() {
         String defaultLogTag = Logger.DEFAULT_LOG_TAG;
-        int currentLogLevel = Logger.getLogLevel();
-
-        int customLogLevel;
-        if (Logger.isLogLevelValid(mLlogLevel)) {
-            customLogLevel = mLlogLevel;
-            Logger.logVerbose(LOG_TAG, "Using custom log level: " + customLogLevel + ", current log level: " + currentLogLevel);
-        } else {
-            customLogLevel = Logger.LOG_LEVEL_VERBOSE;
-        }
+        boolean loggingEnabled = Logger.shouldEnableLoggingForCustomLogLevel(mLogLevel);
+        if (loggingEnabled)
+            Logger.logVerbose(LOG_TAG, "Using custom log level: " + mLogLevel + ", current log level: " + Logger.getLogLevel());
 
         // keep reading the InputStream until it ends (or an error occurs)
         // optionally pausing when a command is executed that consumes the InputStream itself
         try {
             String line;
             while ((line = reader.readLine()) != null) {
-                if (customLogLevel >= currentLogLevel)
+                if (loggingEnabled)
                     Logger.logVerboseForce(defaultLogTag + "Command", String.format(Locale.ENGLISH, "[%s] %s", shell, line)); // This will get truncated by LOGGER_ENTRY_MAX_LEN, likely 4KB
 
                 if (stringWriter != null) stringWriter.append(line).append("\n");
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/TermuxTask.java b/termux-shared/src/main/java/com/termux/shared/shell/TermuxTask.java
index 8f8974ac5d..da27e99666 100644
--- a/termux-shared/src/main/java/com/termux/shared/shell/TermuxTask.java
+++ b/termux-shared/src/main/java/com/termux/shared/shell/TermuxTask.java
@@ -82,8 +82,8 @@ public static TermuxTask execute(@NonNull final Context context, @NonNull Execut
         }
 
         // No need to log stdin if logging is disabled, like for app internal scripts
-        int customLogLevel = Logger.isLogLevelValid(executionCommand.backgroundCustomLogLevel) ? executionCommand.backgroundCustomLogLevel: Logger.LOG_LEVEL_VERBOSE;
-        Logger.logDebugExtended(LOG_TAG, ExecutionCommand.getExecutionInputLogString(executionCommand, true, customLogLevel >= Logger.getLogLevel()));
+        Logger.logDebugExtended(LOG_TAG, ExecutionCommand.getExecutionInputLogString(executionCommand,
+            true, Logger.shouldEnableLoggingForCustomLogLevel(executionCommand.backgroundCustomLogLevel)));
 
         String taskName = ShellUtils.getExecutableBasename(executionCommand.executable);
 

From 1c01f4df081d594df96107316bb308392f4154e0 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 21 Aug 2021 05:33:00 +0500
Subject: [PATCH 514/912] Changed: Bump gradle library dependency versions

---
 termux-shared/build.gradle | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/termux-shared/build.gradle b/termux-shared/build.gradle
index 34d2e7678c..2d778d9355 100644
--- a/termux-shared/build.gradle
+++ b/termux-shared/build.gradle
@@ -5,7 +5,7 @@ android {
     compileSdkVersion project.properties.compileSdkVersion.toInteger()
 
     dependencies {
-        implementation 'androidx.appcompat:appcompat:1.3.0'
+        implementation 'androidx.appcompat:appcompat:1.3.1'
         implementation "androidx.annotation:annotation:1.2.0"
         implementation "androidx.core:core:1.6.0-rc01"
         implementation "androidx.window:window:1.0.0-alpha09"
@@ -44,8 +44,8 @@ android {
 
 dependencies {
     testImplementation "junit:junit:4.13.2"
-    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 }
 
 task sourceJar(type: Jar) {

From 296ee60dc8e7e7db788974e931a402c2faa4fa36 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 21 Aug 2021 05:48:00 +0500
Subject: [PATCH 515/912] Changed: Bump compileSdkVersion to 31

Needed since gradle library dependencies have minCompileSdk set to 31
---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index c8f9ae0514..9c109eb1e9 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -18,7 +18,7 @@ android.useAndroidX=true
 minSdkVersion=24
 targetSdkVersion=28
 ndkVersion=22.1.7171670
-compileSdkVersion=30
+compileSdkVersion=31
 
 markwonVersion=4.6.2
 

From f0553057904fd6868392eeefcb63317347444ae8 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 21 Aug 2021 06:01:58 +0500
Subject: [PATCH 516/912] Changed: Bump gradle to 7.2

---
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 1acc777d74..a0f7639f7d 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From 2a74d43ca55932045d7f481c35fdffbf4bcc4b69 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Mon, 23 Aug 2021 08:22:14 +0500
Subject: [PATCH 517/912] Added!: Convert extra-keys to agnosticism

The termux `extra-keys` have been moved to `termux-shared` library so that they can be imported and used by other apps for their own needs as long as they comply with GPLv3 license.

Almost everything is customizable and has no dependency on termux specific logic. Check the javadocs of files of `com.termux.shared.terminal.io.extrakeys` package for more info, specially, `ExtraKeysView`, `ExtraKeysInfo`, `ExtraKeyButton`, `TerminalExtraKeys` and  `TermuxTerminalExtraKeys`.

Moreover, you can now long hold on `CTRL`, `ALT`, `SHIFT` and `FN` to lock those control keys. They will not be released when you press another key and will only be released by pressing the respective control key again.

Closes #2049, Closes #1861
---
 .../java/com/termux/app/TermuxActivity.java   |   2 +-
 .../properties/TermuxAppSharedProperties.java |  15 +-
 .../terminal/TermuxTerminalViewClient.java    |  16 +-
 .../terminal/io/TerminalToolbarViewPager.java |   6 +-
 .../terminal/io/TermuxTerminalExtraKeys.java  |  47 ++
 .../terminal/io/extrakeys/ExtraKeyButton.java |  92 ---
 .../terminal/io/extrakeys/ExtraKeysInfo.java  | 260 -------
 .../terminal/io/extrakeys/ExtraKeysView.java  | 401 -----------
 .../view_terminal_toolbar_extra_keys.xml      |   2 +-
 .../shared/terminal/io/TerminalExtraKeys.java |  77 +++
 .../terminal/io/extrakeys/ExtraKeyButton.java | 151 ++++
 .../io/extrakeys/ExtraKeysConstants.java      | 207 ++++++
 .../terminal/io/extrakeys/ExtraKeysInfo.java  | 211 ++++++
 .../terminal/io/extrakeys/ExtraKeysView.java  | 646 ++++++++++++++++++
 .../terminal/io/extrakeys/SpecialButton.java  |  52 ++
 .../io/extrakeys/SpecialButtonState.java      |  49 ++
 16 files changed, 1470 insertions(+), 764 deletions(-)
 create mode 100644 app/src/main/java/com/termux/app/terminal/io/TermuxTerminalExtraKeys.java
 delete mode 100644 app/src/main/java/com/termux/app/terminal/io/extrakeys/ExtraKeyButton.java
 delete mode 100644 app/src/main/java/com/termux/app/terminal/io/extrakeys/ExtraKeysInfo.java
 delete mode 100644 app/src/main/java/com/termux/app/terminal/io/extrakeys/ExtraKeysView.java
 create mode 100644 termux-shared/src/main/java/com/termux/shared/terminal/io/TerminalExtraKeys.java
 create mode 100644 termux-shared/src/main/java/com/termux/shared/terminal/io/extrakeys/ExtraKeyButton.java
 create mode 100644 termux-shared/src/main/java/com/termux/shared/terminal/io/extrakeys/ExtraKeysConstants.java
 create mode 100644 termux-shared/src/main/java/com/termux/shared/terminal/io/extrakeys/ExtraKeysInfo.java
 create mode 100644 termux-shared/src/main/java/com/termux/shared/terminal/io/extrakeys/ExtraKeysView.java
 create mode 100644 termux-shared/src/main/java/com/termux/shared/terminal/io/extrakeys/SpecialButton.java
 create mode 100644 termux-shared/src/main/java/com/termux/shared/terminal/io/extrakeys/SpecialButtonState.java

diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index 257ec38993..254b3bc50f 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -44,7 +44,7 @@
 import com.termux.app.terminal.io.TerminalToolbarViewPager;
 import com.termux.app.terminal.TermuxTerminalSessionClient;
 import com.termux.app.terminal.TermuxTerminalViewClient;
-import com.termux.app.terminal.io.extrakeys.ExtraKeysView;
+import com.termux.shared.terminal.io.extrakeys.ExtraKeysView;
 import com.termux.app.settings.properties.TermuxAppSharedProperties;
 import com.termux.shared.interact.TextInputDialogUtils;
 import com.termux.shared.logger.Logger;
diff --git a/app/src/main/java/com/termux/app/settings/properties/TermuxAppSharedProperties.java b/app/src/main/java/com/termux/app/settings/properties/TermuxAppSharedProperties.java
index 6c2e03713a..fabe683a3c 100644
--- a/app/src/main/java/com/termux/app/settings/properties/TermuxAppSharedProperties.java
+++ b/app/src/main/java/com/termux/app/settings/properties/TermuxAppSharedProperties.java
@@ -3,7 +3,9 @@
 import android.content.Context;
 
 import com.termux.app.terminal.io.KeyboardShortcut;
-import com.termux.app.terminal.io.extrakeys.ExtraKeysInfo;
+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.shared.logger.Logger;
 import com.termux.shared.settings.properties.TermuxPropertyConstants;
 import com.termux.shared.settings.properties.TermuxSharedProperties;
@@ -50,13 +52,20 @@ private void setExtraKeys() {
             // {@link #getExtraKeysStyleInternalPropertyValueFromValue(String)}
             String extrakeys = (String) getInternalPropertyValue(TermuxPropertyConstants.KEY_EXTRA_KEYS, true);
             String extraKeysStyle = (String) getInternalPropertyValue(TermuxPropertyConstants.KEY_EXTRA_KEYS_STYLE, true);
-            mExtraKeysInfo = new ExtraKeysInfo(extrakeys, extraKeysStyle);
+
+            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);
         } 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);
+                mExtraKeysInfo = new ExtraKeysInfo(TermuxPropertyConstants.DEFAULT_IVALUE_EXTRA_KEYS, TermuxPropertyConstants.DEFAULT_IVALUE_EXTRA_KEYS_STYLE, ExtraKeysConstants.CONTROL_CHARS_ALIASES);
             } catch (JSONException e2) {
                 Logger.showToast(mContext, "Can't create default extra keys",true);
                 Logger.logStackTraceWithMessage(LOG_TAG, "Could create default extra keys: ", e);
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
index 7e68d3ecf3..8e720444bc 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
@@ -27,13 +27,13 @@
 import com.termux.shared.interact.MessageDialogUtils;
 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.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;
@@ -289,12 +289,22 @@ private boolean handleVirtualKeys(int keyCode, KeyEvent event, boolean down) {
 
     @Override
     public boolean readControlKey() {
-        return (mActivity.getExtraKeysView() != null && mActivity.getExtraKeysView().readSpecialButton(ExtraKeysView.SpecialButton.CTRL)) || mVirtualControlKeyDown;
+        return readExtraKeysSpecialButton(SpecialButton.CTRL) || mVirtualControlKeyDown;
     }
 
     @Override
     public boolean readAltKey() {
-        return (mActivity.getExtraKeysView() != null && mActivity.getExtraKeysView().readSpecialButton(ExtraKeysView.SpecialButton.ALT));
+        return readExtraKeysSpecialButton(SpecialButton.ALT);
+    }
+
+    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;
     }
 
     @Override
diff --git a/app/src/main/java/com/termux/app/terminal/io/TerminalToolbarViewPager.java b/app/src/main/java/com/termux/app/terminal/io/TerminalToolbarViewPager.java
index dc306852b2..56f28fc0c2 100644
--- a/app/src/main/java/com/termux/app/terminal/io/TerminalToolbarViewPager.java
+++ b/app/src/main/java/com/termux/app/terminal/io/TerminalToolbarViewPager.java
@@ -11,7 +11,7 @@
 
 import com.termux.R;
 import com.termux.app.TermuxActivity;
-import com.termux.app.terminal.io.extrakeys.ExtraKeysView;
+import com.termux.shared.terminal.io.extrakeys.ExtraKeysView;
 import com.termux.terminal.TerminalSession;
 
 public class TerminalToolbarViewPager {
@@ -44,8 +44,8 @@ public Object instantiateItem(@NonNull ViewGroup collection, int position) {
             if (position == 0) {
                 layout = inflater.inflate(R.layout.view_terminal_toolbar_extra_keys, collection, false);
                 ExtraKeysView extraKeysView = (ExtraKeysView) layout;
-                extraKeysView.setTermuxTerminalViewClient(mActivity.getTermuxTerminalViewClient());
-                extraKeysView.setTermuxTerminalSessionClient(mActivity.getTermuxTerminalSessionClient());
+                extraKeysView.setExtraKeysViewClient(new TermuxTerminalExtraKeys(mActivity.getTerminalView(),
+                    mActivity.getTermuxTerminalViewClient(), mActivity.getTermuxTerminalSessionClient()));
                 mActivity.setExtraKeysView(extraKeysView);
                 extraKeysView.reload(mActivity.getProperties().getExtraKeysInfo());
 
diff --git a/app/src/main/java/com/termux/app/terminal/io/TermuxTerminalExtraKeys.java b/app/src/main/java/com/termux/app/terminal/io/TermuxTerminalExtraKeys.java
new file mode 100644
index 0000000000..483e6c0f2e
--- /dev/null
+++ b/app/src/main/java/com/termux/app/terminal/io/TermuxTerminalExtraKeys.java
@@ -0,0 +1,47 @@
+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.R;
+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 drawer = view.findViewById(R.id.drawer_layout);
+            drawer.openDrawer(Gravity.LEFT);
+        } else if ("PASTE".equals(key)) {
+            if(mTermuxTerminalSessionClient != null)
+                mTermuxTerminalSessionClient.onPasteTextFromClipboard(null);
+        } else {
+            super.onTerminalExtraKeyButtonClick(view, key, ctrlDown, altDown, shiftDown, fnDown);
+        }
+    }
+
+}
diff --git a/app/src/main/java/com/termux/app/terminal/io/extrakeys/ExtraKeyButton.java b/app/src/main/java/com/termux/app/terminal/io/extrakeys/ExtraKeyButton.java
deleted file mode 100644
index 9454081970..0000000000
--- a/app/src/main/java/com/termux/app/terminal/io/extrakeys/ExtraKeyButton.java
+++ /dev/null
@@ -1,92 +0,0 @@
-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;
-    }
-}
diff --git a/app/src/main/java/com/termux/app/terminal/io/extrakeys/ExtraKeysInfo.java b/app/src/main/java/com/termux/app/terminal/io/extrakeys/ExtraKeysInfo.java
deleted file mode 100644
index ceaad78739..0000000000
--- a/app/src/main/java/com/termux/app/terminal/io/extrakeys/ExtraKeysInfo.java
+++ /dev/null
@@ -1,260 +0,0 @@
-package com.termux.app.terminal.io.extrakeys;
-
-import com.termux.shared.logger.Logger;
-import com.termux.shared.settings.properties.TermuxPropertyConstants;
-import com.termux.shared.settings.properties.TermuxSharedProperties;
-
-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
-        put("PASTE", "⎘"); // U+2398
-    }};
-
-    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:
-                if (!TermuxPropertyConstants.DEFAULT_IVALUE_EXTRA_KEYS_STYLE.equals(style))
-                    Logger.logError(TermuxSharedProperties.LOG_TAG, "The style \"" + style + "\" for the key \"" + TermuxPropertyConstants.KEY_EXTRA_KEYS_STYLE + "\" is invalid. Using default style instead.");
-                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);
-    }
-}
-
diff --git a/app/src/main/java/com/termux/app/terminal/io/extrakeys/ExtraKeysView.java b/app/src/main/java/com/termux/app/terminal/io/extrakeys/ExtraKeysView.java
deleted file mode 100644
index 79aceaa17d..0000000000
--- a/app/src/main/java/com/termux/app/terminal/io/extrakeys/ExtraKeysView.java
+++ /dev/null
@@ -1,401 +0,0 @@
-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.TermuxTerminalSessionClient;
-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;
-    TermuxTerminalSessionClient mTermuxTerminalSessionClient;
-
-    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 ("PASTE".equals(keyName)) {
-            if(mTermuxTerminalSessionClient != null)
-                mTermuxTerminalSessionClient.onPasteTextFromClipboard(null);
-        } 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 (scheduledExecutor != null) {
-                                scheduledExecutor.shutdownNow();
-                                scheduledExecutor = null;
-                            }
-                            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;
-    }
-
-    public void setTermuxTerminalSessionClient(TermuxTerminalSessionClient termuxTerminalSessionClient) {
-        this.mTermuxTerminalSessionClient = termuxTerminalSessionClient;
-    }
-
-}
diff --git a/app/src/main/res/layout/view_terminal_toolbar_extra_keys.xml b/app/src/main/res/layout/view_terminal_toolbar_extra_keys.xml
index fbefe1ec6e..21a25c8100 100644
--- a/app/src/main/res/layout/view_terminal_toolbar_extra_keys.xml
+++ b/app/src/main/res/layout/view_terminal_toolbar_extra_keys.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.termux.app.terminal.io.extrakeys.ExtraKeysView xmlns:android="http://schemas.android.com/apk/res/android"
+<com.termux.shared.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"
diff --git a/termux-shared/src/main/java/com/termux/shared/terminal/io/TerminalExtraKeys.java b/termux-shared/src/main/java/com/termux/shared/terminal/io/TerminalExtraKeys.java
new file mode 100644
index 0000000000..faac49771d
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/terminal/io/TerminalExtraKeys.java
@@ -0,0 +1,77 @@
+package com.termux.shared.terminal.io;
+
+import android.view.KeyEvent;
+import android.view.View;
+import android.widget.Button;
+
+import androidx.annotation.NonNull;
+
+import com.termux.shared.terminal.io.extrakeys.ExtraKeyButton;
+import com.termux.shared.terminal.io.extrakeys.ExtraKeysView;
+import com.termux.shared.terminal.io.extrakeys.SpecialButton;
+import com.termux.view.TerminalView;
+
+import static com.termux.shared.terminal.io.extrakeys.ExtraKeysConstants.PRIMARY_KEY_CODES_FOR_STRINGS;
+
+
+public class TerminalExtraKeys implements ExtraKeysView.IExtraKeysView {
+
+    private final TerminalView mTerminalView;
+
+    public TerminalExtraKeys(@NonNull TerminalView terminalView) {
+        mTerminalView = terminalView;
+    }
+
+    @Override
+    public void onExtraKeyButtonClick(View view, ExtraKeyButton buttonInfo, Button button) {
+        if (buttonInfo.isMacro()) {
+            String[] keys = buttonInfo.getKey().split(" ");
+            boolean ctrlDown = false;
+            boolean altDown = false;
+            boolean shiftDown = false;
+            boolean fnDown = false;
+            for (String key : keys) {
+                if (SpecialButton.CTRL.getKey().equals(key)) {
+                    ctrlDown = true;
+                } else if (SpecialButton.ALT.getKey().equals(key)) {
+                    altDown = true;
+                } else if (SpecialButton.SHIFT.getKey().equals(key)) {
+                    shiftDown = true;
+                } else if (SpecialButton.FN.getKey().equals(key)) {
+                    fnDown = true;
+                } else {
+                    onTerminalExtraKeyButtonClick(view, key, ctrlDown, altDown, shiftDown, fnDown);
+                    ctrlDown = false; altDown = false; shiftDown = false; fnDown = false;
+                }
+            }
+        } else {
+            onTerminalExtraKeyButtonClick(view, buttonInfo.getKey(), false, false, false, false);
+        }
+    }
+
+    protected void onTerminalExtraKeyButtonClick(View view, String key, boolean ctrlDown, boolean altDown, boolean shiftDown, boolean fnDown) {
+        if (PRIMARY_KEY_CODES_FOR_STRINGS.containsKey(key)) {
+            Integer keyCode = PRIMARY_KEY_CODES_FOR_STRINGS.get(key);
+            if (keyCode == null) return;
+            int metaState = 0;
+            if (ctrlDown) metaState |= KeyEvent.META_CTRL_ON | KeyEvent.META_CTRL_LEFT_ON;
+            if (altDown) metaState |= KeyEvent.META_ALT_ON | KeyEvent.META_ALT_LEFT_ON;
+            if (shiftDown) metaState |= KeyEvent.META_SHIFT_ON | KeyEvent.META_SHIFT_LEFT_ON;
+            if (fnDown) metaState |= KeyEvent.META_FUNCTION_ON;
+
+            KeyEvent keyEvent = new KeyEvent(0, 0, KeyEvent.ACTION_UP, keyCode, 0, metaState);
+            mTerminalView.onKeyDown(keyCode, keyEvent);
+        } else {
+            // not a control char
+            key.codePoints().forEach(codePoint -> {
+                mTerminalView.inputCodePoint(codePoint, ctrlDown, altDown);
+            });
+        }
+    }
+
+    @Override
+    public boolean performExtraKeyButtonHapticFeedback(View view, ExtraKeyButton buttonInfo, Button button) {
+        return false;
+    }
+
+}
diff --git a/termux-shared/src/main/java/com/termux/shared/terminal/io/extrakeys/ExtraKeyButton.java b/termux-shared/src/main/java/com/termux/shared/terminal/io/extrakeys/ExtraKeyButton.java
new file mode 100644
index 0000000000..e22879857c
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/terminal/io/extrakeys/ExtraKeyButton.java
@@ -0,0 +1,151 @@
+package com.termux.shared.terminal.io.extrakeys;
+
+import android.text.TextUtils;
+
+import androidx.annotation.NonNull;
+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 name for the name of the extra key if using a dict to define the extra key. {key: name, ...} */
+    public static final String KEY_KEY_NAME = "key";
+
+    /** The key name for the macro value of the extra key if using a dict to define the extra key. {macro: value, ...} */
+    public static final String KEY_MACRO = "macro";
+
+    /** The key name for the alternate display name of the extra key if using a dict to define the extra key. {display: name, ...} */
+    public static final String KEY_DISPLAY_NAME = "display";
+
+    /** The key name for the nested dict to define popup extra key info if using a dict to define the extra key. {popup: {key: name, ...}, ...} */
+    public static final String KEY_POPUP = "popup";
+
+
+    /**
+     * The key that will be sent to the terminal, either a control character, like defined in
+     * {@link ExtraKeysConstants#PRIMARY_KEY_CODES_FOR_STRINGS} (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 displayed on the button.
+     */
+    private final String display;
+
+    /**
+     * The {@link ExtraKeyButton} containing the information of the popup button (triggered by swipe up).
+     */
+    @Nullable
+    private final ExtraKeyButton popup;
+
+
+    /**
+     * Initialize a {@link ExtraKeyButton}.
+     *
+     * @param config The {@link JSONObject} containing the info to create the {@link ExtraKeyButton}.
+     * @param extraKeyDisplayMap The {@link ExtraKeysConstants.ExtraKeyDisplayMap} that defines the
+     *                           display text mapping for the keys if a custom value is not defined
+     *                           by {@link #KEY_DISPLAY_NAME}.
+     * @param extraKeyAliasMap The {@link ExtraKeysConstants.ExtraKeyDisplayMap} that defines the
+     *                           aliases for the actual key names.
+     */
+    public ExtraKeyButton(@NonNull JSONObject config,
+                          @NonNull ExtraKeysConstants.ExtraKeyDisplayMap extraKeyDisplayMap,
+                          @NonNull ExtraKeysConstants.ExtraKeyDisplayMap extraKeyAliasMap) throws JSONException {
+        this(config, null, extraKeyDisplayMap, extraKeyAliasMap);
+    }
+
+    /**
+     * Initialize a {@link ExtraKeyButton}.
+     *
+     * @param config The {@link JSONObject} containing the info to create the {@link ExtraKeyButton}.
+     * @param popup The {@link ExtraKeyButton} optional {@link #popup} button.
+     * @param extraKeyDisplayMap The {@link ExtraKeysConstants.ExtraKeyDisplayMap} that defines the
+     *                           display text mapping for the keys if a custom value is not defined
+     *                           by {@link #KEY_DISPLAY_NAME}.
+     * @param extraKeyAliasMap The {@link ExtraKeysConstants.ExtraKeyDisplayMap} that defines the
+     *                           aliases for the actual key names.
+     */
+    public ExtraKeyButton(@NonNull JSONObject config, @Nullable ExtraKeyButton popup,
+                          @NonNull ExtraKeysConstants.ExtraKeyDisplayMap extraKeyDisplayMap,
+                          @NonNull ExtraKeysConstants.ExtraKeyDisplayMap extraKeyAliasMap) throws JSONException {
+        String keyFromConfig = getStringFromJson(config, KEY_KEY_NAME);
+        String macroFromConfig = getStringFromJson(config, KEY_MACRO);
+        String[] keys;
+        if (keyFromConfig != null && macroFromConfig != null) {
+            throw new JSONException("Both key and macro can't be set for the same key. key: \"" + keyFromConfig + "\", macro: \"" + macroFromConfig + "\"");
+        } 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] = replaceAlias(extraKeyAliasMap, keys[i]);
+        }
+
+        this.key = TextUtils.join(" ", keys);
+
+        String displayFromConfig = getStringFromJson(config, KEY_DISPLAY_NAME);
+        if (displayFromConfig != null) {
+            this.display = displayFromConfig;
+        } else {
+            this.display = Arrays.stream(keys)
+                .map(key -> extraKeyDisplayMap.get(key, key))
+                .collect(Collectors.joining(" "));
+        }
+
+        this.popup = popup;
+    }
+
+    public String getStringFromJson(@NonNull JSONObject config, @NonNull String key) {
+        try {
+            return config.getString(key);
+        } catch (JSONException e) {
+            return null;
+        }
+    }
+
+    /** Get {@link #key}. */
+    public String getKey() {
+        return key;
+    }
+
+    /** Check whether a {@link #macro} is defined or not. */
+    public boolean isMacro() {
+        return macro;
+    }
+
+    /** Get {@link #display}. */
+    public String getDisplay() {
+        return display;
+    }
+
+    /** Get {@link #popup}. */
+    @Nullable
+    public ExtraKeyButton getPopup() {
+        return popup;
+    }
+
+    /**
+     * Replace the alias with its actual key name if found in extraKeyAliasMap.
+     */
+    public static String replaceAlias(@NonNull ExtraKeysConstants.ExtraKeyDisplayMap extraKeyAliasMap, String key) {
+        return extraKeyAliasMap.get(key, key);
+    }
+
+}
diff --git a/termux-shared/src/main/java/com/termux/shared/terminal/io/extrakeys/ExtraKeysConstants.java b/termux-shared/src/main/java/com/termux/shared/terminal/io/extrakeys/ExtraKeysConstants.java
new file mode 100644
index 0000000000..ae678a71cb
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/terminal/io/extrakeys/ExtraKeysConstants.java
@@ -0,0 +1,207 @@
+package com.termux.shared.terminal.io.extrakeys;
+
+import android.view.KeyEvent;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class ExtraKeysConstants {
+
+    /** Defines the repetitive keys that can be passed to {@link ExtraKeysView#setRepetitiveKeys(List)}. */
+    public static List<String> PRIMARY_REPETITIVE_KEYS = Arrays.asList("UP", "DOWN", "LEFT", "RIGHT", "BKSP", "DEL");
+
+
+
+    /** Defines the {@link KeyEvent} for common keys. */
+    public static Map<String, Integer> PRIMARY_KEY_CODES_FOR_STRINGS = 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);
+    }};
+
+
+
+    /**
+     * 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;
+        }
+    }
+
+    public static class ExtraKeyDisplayMap extends CleverMap<String, String> {}
+
+
+
+    /*
+     * Multiple maps are available to quickly change
+     * the style of the keys.
+     */
+
+    public static class EXTRA_KEY_DISPLAY_MAPS {
+        /**
+         * Keys are displayed in a natural looking way, like "→" for "RIGHT"
+         */
+        public static final ExtraKeyDisplayMap CLASSIC_ARROWS_DISPLAY = new ExtraKeyDisplayMap() {{
+            // 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
+        }};
+
+        public static final ExtraKeyDisplayMap WELL_KNOWN_CHARACTERS_DISPLAY = new ExtraKeyDisplayMap() {{
+            // 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
+            put("PASTE", "⎘"); // U+2398
+        }};
+
+        public static final ExtraKeyDisplayMap LESS_KNOWN_CHARACTERS_DISPLAY = new ExtraKeyDisplayMap() {{
+            // 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
+        }};
+
+        public static final ExtraKeyDisplayMap ARROW_TRIANGLE_VARIATION_DISPLAY = new ExtraKeyDisplayMap() {{
+            // 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
+        }};
+
+        public static final ExtraKeyDisplayMap NOT_KNOWN_ISO_CHARACTERS = new ExtraKeyDisplayMap() {{
+            // 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
+        }};
+
+        public static final ExtraKeyDisplayMap NICER_LOOKING_DISPLAY = new ExtraKeyDisplayMap() {{
+            // nicer looking for most cases
+            put("-", "―"); // U+2015 ― HORIZONTAL BAR
+        }};
+
+        /**
+         * Full Iso
+         */
+        public static final ExtraKeyDisplayMap FULL_ISO_CHAR_DISPLAY = new ExtraKeyDisplayMap() {{
+            putAll(CLASSIC_ARROWS_DISPLAY);
+            putAll(WELL_KNOWN_CHARACTERS_DISPLAY);
+            putAll(LESS_KNOWN_CHARACTERS_DISPLAY); // NEW
+            putAll(NICER_LOOKING_DISPLAY);
+            putAll(NOT_KNOWN_ISO_CHARACTERS); // NEW
+        }};
+
+        /**
+         * Only arrows
+         */
+        public static final ExtraKeyDisplayMap ARROWS_ONLY_CHAR_DISPLAY = new ExtraKeyDisplayMap() {{
+            putAll(CLASSIC_ARROWS_DISPLAY);
+            // putAll(wellKnownCharactersDisplay); // REMOVED
+            // putAll(lessKnownCharactersDisplay); // REMOVED
+            putAll(NICER_LOOKING_DISPLAY);
+        }};
+
+        /**
+         * Classic symbols and less known symbols
+         */
+        public static final ExtraKeyDisplayMap LOTS_OF_ARROWS_CHAR_DISPLAY = new ExtraKeyDisplayMap() {{
+            putAll(CLASSIC_ARROWS_DISPLAY);
+            putAll(WELL_KNOWN_CHARACTERS_DISPLAY);
+            putAll(LESS_KNOWN_CHARACTERS_DISPLAY); // NEW
+            putAll(NICER_LOOKING_DISPLAY);
+        }};
+
+        /**
+         * Some classic symbols everybody knows
+         */
+        public static final ExtraKeyDisplayMap DEFAULT_CHAR_DISPLAY = new ExtraKeyDisplayMap() {{
+            putAll(CLASSIC_ARROWS_DISPLAY);
+            putAll(WELL_KNOWN_CHARACTERS_DISPLAY);
+            putAll(NICER_LOOKING_DISPLAY);
+            // all other characters are displayed as themselves
+        }};
+
+    }
+
+
+
+    /**
+     * Aliases for the keys
+     */
+    public static final ExtraKeyDisplayMap CONTROL_CHARS_ALIASES = new ExtraKeyDisplayMap() {{
+        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", "'");
+    }};
+
+}
diff --git a/termux-shared/src/main/java/com/termux/shared/terminal/io/extrakeys/ExtraKeysInfo.java b/termux-shared/src/main/java/com/termux/shared/terminal/io/extrakeys/ExtraKeysInfo.java
new file mode 100644
index 0000000000..7bf47d7d40
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/terminal/io/extrakeys/ExtraKeysInfo.java
@@ -0,0 +1,211 @@
+package com.termux.shared.terminal.io.extrakeys;
+
+import android.view.View;
+import android.widget.Button;
+
+import androidx.annotation.NonNull;
+
+import com.termux.shared.terminal.io.extrakeys.ExtraKeysConstants.EXTRA_KEY_DISPLAY_MAPS;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+/**
+ * A {@link Class} that defines the info needed by {@link ExtraKeysView} to display the extra key
+ * views.
+ *
+ * The {@code propertiesInfo} passed to the constructors of this class must be json array of arrays.
+ * Each array element of the json array will be considered a separate row of keys.
+ * Each key can either be simple string that defines the name of the key or a json dict that defines
+ * advance info for the key. The syntax can be `'KEY'` or `{key: 'KEY'}`.
+ * For example `HOME` or `{key: 'HOME', ...}.
+ *
+ * In advance json dict mode, the key can also be a sequence of space separated keys instead of one
+ * key. This can be done by replacing `key` key/value pair of the dict with a `macro` key/value pair.
+ * The syntax is `{macro: 'KEY COMBINATION'}`. For example {macro: 'HOME RIGHT', ...}.
+ *
+ * In advance json dict mode, you can define a nested json dict with the `popup` key which will be
+ * used as the popup key and will be triggered on swipe up. The syntax can be
+ * `{key: 'KEY', popup: 'POPUP_KEY'}` or `{key: 'KEY', popup: {macro: 'KEY COMBINATION', display: 'Key combo'}}`.
+ * For example `{key: 'HOME', popup: {KEY: 'END', ...}, ...}`.
+ *
+ * In advance json dict mode, the key can also have a custom display name that can be used as the
+ * text to display on the button by defining the `display` key. The syntax is `{display: 'DISPLAY'}`.
+ * For example {display: 'Custom name', ...}.
+ *
+ * Examples:
+ * {@code
+ * # Empty:
+ * []
+ *
+ * # Single row:
+ * [[ESC, TAB, CTRL, ALT, {key: '-', popup: '|'}, DOWN, UP]]
+ *
+ * # 2 row:
+ * [['ESC','/',{key: '-', popup: '|'},'HOME','UP','END','PGUP'],
+ * ['TAB','CTRL','ALT','LEFT','DOWN','RIGHT','PGDN']]
+ *
+ * # Advance:
+ * [[
+ *   {key: ESC, popup: {macro: "CTRL f d", display: "tmux exit"}},
+ *   {key: CTRL, popup: {macro: "CTRL f BKSP", display: "tmux ←"}},
+ *   {key: ALT, popup: {macro: "CTRL f TAB", display: "tmux →"}},
+ *   {key: TAB, popup: {macro: "ALT a", display: A-a}},
+ *   {key: LEFT, popup: HOME},
+ *   {key: DOWN, popup: PGDN},
+ *   {key: UP, popup: PGUP},
+ *   {key: RIGHT, popup: END},
+ *   {macro: "ALT j", display: A-j, popup: {macro: "ALT g", display: A-g}},
+ *   {key: KEYBOARD, popup: {macro: "CTRL d", display: exit}}
+ * ]]
+ *
+ * }
+ *
+ * Aliases are also allowed for the keys that you can pass as {@code extraKeyAliasMap}. Check
+ * {@link ExtraKeysConstants#CONTROL_CHARS_ALIASES}.
+ *
+ * Its up to the {@link ExtraKeysView.IExtraKeysView} client on how to handle individual key values
+ * of an {@link ExtraKeyButton}. They are sent as is via
+ * {@link ExtraKeysView.IExtraKeysView#onExtraKeyButtonClick(View, ExtraKeyButton, Button)}. The
+ * {@link com.termux.shared.terminal.io.TerminalExtraKeys} which is an implementation of the interface,
+ * checks if the key is one of {@link ExtraKeysConstants#PRIMARY_KEY_CODES_FOR_STRINGS} and generates
+ * a {@link android.view.KeyEvent} for it, and if its not, then converts the key to code points by
+ * calling {@link CharSequence#codePoints()} and passes them to the terminal as literal strings.
+ *
+ * Examples:
+ * {@code
+ * "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 "-_-"
+ * }
+ *
+ * For more info, check https://wiki.termux.com/wiki/Touch_Keyboard.
+ */
+public class ExtraKeysInfo {
+
+    /**
+     * Matrix of buttons to be displayed in {@link ExtraKeysView}.
+     */
+    private final ExtraKeyButton[][] mButtons;
+
+    /**
+     * Initialize {@link ExtraKeysInfo}.
+     *
+     * @param propertiesInfo The {@link String} containing the info to create the {@link ExtraKeysInfo}.
+     *                       Check the class javadoc for details.
+     * @param style The style to pass to {@link #getCharDisplayMapForStyle(String)} to get the
+     *              {@link ExtraKeysConstants.ExtraKeyDisplayMap} that defines the display text
+     *              mapping for the keys if a custom value is not defined by
+     *              {@link ExtraKeyButton#KEY_DISPLAY_NAME} for a key.
+     * @param extraKeyAliasMap The {@link ExtraKeysConstants.ExtraKeyDisplayMap} that defines the
+     *                           aliases for the actual key names. You can create your own or
+     *                           optionally pass {@link ExtraKeysConstants#CONTROL_CHARS_ALIASES}.
+     */
+    public ExtraKeysInfo(@NonNull String propertiesInfo, String style,
+                         @NonNull ExtraKeysConstants.ExtraKeyDisplayMap extraKeyAliasMap) throws JSONException {
+        mButtons = initExtraKeysInfo(propertiesInfo, getCharDisplayMapForStyle(style), extraKeyAliasMap);
+    }
+
+    /**
+     * Initialize {@link ExtraKeysInfo}.
+     *
+     * @param propertiesInfo The {@link String} containing the info to create the {@link ExtraKeysInfo}.
+     *                       Check the class javadoc for details.
+     * @param extraKeyDisplayMap The {@link ExtraKeysConstants.ExtraKeyDisplayMap} that defines the
+     *                           display text mapping for the keys if a custom value is not defined
+     *                           by {@link ExtraKeyButton#KEY_DISPLAY_NAME} for a key. You can create
+     *                           your own or optionally pass one of the values defined in
+     *                           {@link #getCharDisplayMapForStyle(String)}.
+     * @param extraKeyAliasMap The {@link ExtraKeysConstants.ExtraKeyDisplayMap} that defines the
+     *                           aliases for the actual key names. You can create your own or
+     *                           optionally pass {@link ExtraKeysConstants#CONTROL_CHARS_ALIASES}.
+     */
+    public ExtraKeysInfo(@NonNull String propertiesInfo,
+                         @NonNull ExtraKeysConstants.ExtraKeyDisplayMap extraKeyDisplayMap,
+                         @NonNull ExtraKeysConstants.ExtraKeyDisplayMap extraKeyAliasMap) throws JSONException {
+        mButtons = initExtraKeysInfo(propertiesInfo, extraKeyDisplayMap, extraKeyAliasMap);
+    }
+
+    private ExtraKeyButton[][] initExtraKeysInfo(@NonNull String propertiesInfo,
+                                                 @NonNull ExtraKeysConstants.ExtraKeyDisplayMap extraKeyDisplayMap,
+                                                 @NonNull ExtraKeysConstants.ExtraKeyDisplayMap extraKeyAliasMap) throws JSONException {
+        // 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
+        ExtraKeyButton[][] buttons = new ExtraKeyButton[matrix.length][];
+        for (int i = 0; i < matrix.length; i++) {
+            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(ExtraKeyButton.KEY_POPUP)) {
+                    // no popup
+                    button = new ExtraKeyButton(jobject, extraKeyDisplayMap, extraKeyAliasMap);
+                } else {
+                    // a popup
+                    JSONObject popupJobject = normalizeKeyConfig(jobject.get(ExtraKeyButton.KEY_POPUP));
+                    ExtraKeyButton popup = new ExtraKeyButton(popupJobject, extraKeyDisplayMap, extraKeyAliasMap);
+                    button = new ExtraKeyButton(jobject, popup, extraKeyDisplayMap, extraKeyAliasMap);
+                }
+
+                buttons[i][j] = button;
+            }
+        }
+
+        return buttons;
+    }
+
+    /**
+     * Convert "value" -> {"key": "value"}. Required by
+     * {@link ExtraKeyButton#ExtraKeyButton(JSONObject, ExtraKeyButton, ExtraKeysConstants.ExtraKeyDisplayMap, ExtraKeysConstants.ExtraKeyDisplayMap)}.
+     */
+    private static JSONObject normalizeKeyConfig(Object key) throws JSONException {
+        JSONObject jobject;
+        if (key instanceof String) {
+            jobject = new JSONObject();
+            jobject.put(ExtraKeyButton.KEY_KEY_NAME, 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 mButtons;
+    }
+
+    @NonNull
+    public static ExtraKeysConstants.ExtraKeyDisplayMap getCharDisplayMapForStyle(String style) {
+        switch (style) {
+            case "arrows-only":
+                return EXTRA_KEY_DISPLAY_MAPS.ARROWS_ONLY_CHAR_DISPLAY;
+            case "arrows-all":
+                return EXTRA_KEY_DISPLAY_MAPS.LOTS_OF_ARROWS_CHAR_DISPLAY;
+            case "all":
+                return EXTRA_KEY_DISPLAY_MAPS.FULL_ISO_CHAR_DISPLAY;
+            case "none":
+                return new ExtraKeysConstants.ExtraKeyDisplayMap();
+            default:
+                return EXTRA_KEY_DISPLAY_MAPS.DEFAULT_CHAR_DISPLAY;
+        }
+    }
+
+}
diff --git a/termux-shared/src/main/java/com/termux/shared/terminal/io/extrakeys/ExtraKeysView.java b/termux-shared/src/main/java/com/termux/shared/terminal/io/extrakeys/ExtraKeysView.java
new file mode 100644
index 0000000000..2749787ff0
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/terminal/io/extrakeys/ExtraKeysView.java
@@ -0,0 +1,646 @@
+package com.termux.shared.terminal.io.extrakeys;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.os.Build;
+import android.os.Handler;
+import android.os.Looper;
+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.stream.Collectors;
+
+import android.view.HapticFeedbackConstants;
+import android.view.LayoutInflater;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewConfiguration;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.GridLayout;
+import android.widget.PopupWindow;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+/**
+ * A {@link View} showing extra keys (such as Escape, Ctrl, Alt) not normally available on an Android soft
+ * keyboards.
+ *
+ * To use it, add following to a layout file and import it in your activity layout file or inflate
+ * it with a {@link androidx.viewpager.widget.ViewPager}.:
+ * {@code
+ * <?xml version="1.0" encoding="utf-8"?>
+ * <com.termux.shared.terminal.io.extrakeys.ExtraKeysView xmlns:android="http://schemas.android.com/apk/res/android"
+ *     android:id="@+id/extra_keys"
+ *     style="?android:attr/buttonBarStyle"
+ *     android:layout_width="match_parent"
+ *     android:layout_height="match_parent"
+ *     android:layout_alignParentBottom="true"
+ *     android:orientation="horizontal" />
+ * }
+ *
+ * Then in your activity, get its reference by a call to {@link android.app.Activity#findViewById(int)}
+ * or {@link LayoutInflater#inflate(int, ViewGroup)} if using {@link androidx.viewpager.widget.ViewPager}.
+ * Then call {@link #setExtraKeysViewClient(IExtraKeysView)} and pass it the implementation of
+ * {@link IExtraKeysView} so that you can receive callbacks. You can also override other values set
+ * in {@link ExtraKeysView#ExtraKeysView(Context, AttributeSet)} by calling the respective functions.
+ * If you extend {@link ExtraKeysView}, you can also set them in the constructor, but do call super().
+ *
+ * After this you will have to make a call to {@link ExtraKeysView#reload(ExtraKeysInfo) and pass
+ * it the {@link ExtraKeysInfo} to load and display the extra keys. Read its class javadocs for more
+ * info on how to create it.
+ *
+ * Termux app defines the view in res/layout/view_terminal_toolbar_extra_keys and
+ * inflates it in TerminalToolbarViewPager.instantiateItem() and sets the {@link ExtraKeysView} client
+ * and calls {@link ExtraKeysView#reload(ExtraKeysInfo).
+ * The {@link ExtraKeysInfo} is created by TermuxAppSharedProperties.setExtraKeys().
+ * Then its got and the view height is adjusted in TermuxActivity.setTerminalToolbarHeight().
+ * The client used is TermuxTerminalExtraKeys, which extends
+ * {@link com.termux.shared.terminal.io.TerminalExtraKeys} to handle Termux app specific logic and
+ * leave the rest to the super class.
+ */
+public final class ExtraKeysView extends GridLayout {
+
+    /** The client for the {@link ExtraKeysView}. */
+    public interface IExtraKeysView {
+
+        /**
+         * This is called by {@link ExtraKeysView} when a button is clicked. This is also called
+         * for {@link #mRepetitiveKeys} and {@link ExtraKeyButton} that have a popup set.
+         * However, this is not called for {@link #mSpecialButtons}, whose state can instead be read
+         * via a call to {@link #readSpecialButton(SpecialButton, boolean)}.
+         *
+         * @param view The view that was clicked.
+         * @param buttonInfo The {@link ExtraKeyButton} for the button that was clicked.
+         *                   The button may be a {@link ExtraKeyButton#KEY_MACRO} set which can be
+         *                   checked with a call to {@link ExtraKeyButton#isMacro()}.
+         * @param button The {@link Button} that was clicked.
+         */
+        void onExtraKeyButtonClick(View view, ExtraKeyButton buttonInfo, Button button);
+
+        /**
+         * This is called by {@link ExtraKeysView} when a button is clicked so that the client
+         * can perform any hepatic feedback. This is only called in the {@link Button.OnClickListener}
+         * and not for every repeat. Its also called for {@link #mSpecialButtons}.
+         *
+         * @param view The view that was clicked.
+         * @param buttonInfo The {@link ExtraKeyButton} for the button that was clicked.
+         * @param button The {@link Button} that was clicked.
+         * @return Return {@code true} if the client handled the feedback, otherwise {@code false}
+         * so that {@link ExtraKeysView#performExtraKeyButtonHapticFeedback(View, ExtraKeyButton, Button)}
+         * can handle it depending on system settings.
+         */
+        boolean performExtraKeyButtonHapticFeedback(View view, ExtraKeyButton buttonInfo, Button button);
+
+    }
+
+
+    /** Defines the default value for {@link #mButtonTextColor}. */
+    public static final int DEFAULT_BUTTON_TEXT_COLOR = 0xFFFFFFFF;
+    /** Defines the default value for {@link #mButtonActiveTextColor}. */
+    public static final int DEFAULT_BUTTON_ACTIVE_TEXT_COLOR = 0xFF80DEEA;
+    /** Defines the default value for {@link #mButtonBackgroundColor}. */
+    public static final int DEFAULT_BUTTON_BACKGROUND_COLOR = 0x00000000;
+    /** Defines the default value for {@link #mButtonActiveBackgroundColor}. */
+    public static final int DEFAULT_BUTTON_ACTIVE_BACKGROUND_COLOR = 0xFF7F7F7F;
+
+
+    /** Defines the minimum allowed duration in milliseconds for {@link #mLongPressTimeout}. */
+    public static final int MIN_LONG_PRESS_DURATION = 200;
+    /** Defines the maximum allowed duration in milliseconds for {@link #mLongPressTimeout}. */
+    public static final int MAX_LONG_PRESS_DURATION = 3000;
+    /** Defines the fallback duration in milliseconds for {@link #mLongPressTimeout}. */
+    public static final int FALLBACK_LONG_PRESS_DURATION = 400;
+
+    /** Defines the minimum allowed duration in milliseconds for {@link #mLongPressRepeatDelay}. */
+    public static final int MIN_LONG_PRESS__REPEAT_DELAY = 5;
+    /** Defines the maximum allowed duration in milliseconds for {@link #mLongPressRepeatDelay}. */
+    public static final int MAX_LONG_PRESS__REPEAT_DELAY = 2000;
+    /** Defines the default duration in milliseconds for {@link #mLongPressRepeatDelay}. */
+    public static final int DEFAULT_LONG_PRESS_REPEAT_DELAY = 80;
+
+
+
+    /** The implementation of the {@link IExtraKeysView} that acts as a client for the {@link ExtraKeysView}. */
+    private IExtraKeysView mExtraKeysViewClient;
+
+    /** The map for the {@link SpecialButton} and their {@link SpecialButtonState}. Defaults to
+     * the one returned by {@link #getDefaultSpecialButtons(ExtraKeysView)}. */
+    private Map<SpecialButton, SpecialButtonState> mSpecialButtons;
+
+    /** The keys for the {@link SpecialButton} added to {@link #mSpecialButtons}. This is automatically
+     * set when the call to {@link #setSpecialButtons(Map)} is made. */
+    private Set<String> mSpecialButtonsKeys;
+
+
+    /**
+     * The list of keys for which auto repeat of key should be triggered if its extra keys button
+     * is long pressed. This is done by calling {@link IExtraKeysView#onExtraKeyButtonClick(View, ExtraKeyButton, Button)}
+     * every {@link #mLongPressRepeatDelay} seconds after {@link #mLongPressTimeout} has passed.
+     * The default keys are defined by {@link ExtraKeysConstants#PRIMARY_REPETITIVE_KEYS}.
+     */
+    private List<String> mRepetitiveKeys;
+
+
+    /** The text color for the extra keys button. Defaults to {@link #DEFAULT_BUTTON_TEXT_COLOR}. */
+    private int mButtonTextColor;
+    /** The text color for the extra keys button when its active.
+     * Defaults to {@link #DEFAULT_BUTTON_ACTIVE_TEXT_COLOR}. */
+    private int mButtonActiveTextColor;
+    /** The background color for the extra keys button. Defaults to {@link #DEFAULT_BUTTON_BACKGROUND_COLOR}. */
+    private int mButtonBackgroundColor;
+    /** The background color for the extra keys button when its active. Defaults to
+     * {@link #DEFAULT_BUTTON_ACTIVE_BACKGROUND_COLOR}. */
+    private int mButtonActiveBackgroundColor;
+
+
+    /**
+     * Defines the duration in milliseconds before a press turns into a long press. The default
+     * duration used is the one returned by a call to {@link ViewConfiguration#getLongPressTimeout()}
+     * which will return the system defined duration which can be changed in accessibility settings.
+     * The duration must be in between {@link #MIN_LONG_PRESS_DURATION} and {@link #MAX_LONG_PRESS_DURATION},
+     * otherwise {@link #FALLBACK_LONG_PRESS_DURATION} is used.
+     */
+    private int mLongPressTimeout;
+
+    /**
+     * Defines the duration in milliseconds for the delay between trigger of each repeat of
+     * {@link #mRepetitiveKeys}. The default value is defined by {@link #DEFAULT_LONG_PRESS_REPEAT_DELAY}.
+     * The duration must be in between {@link #MIN_LONG_PRESS__REPEAT_DELAY} and
+     * {@link #MAX_LONG_PRESS__REPEAT_DELAY}, otherwise {@link #DEFAULT_LONG_PRESS_REPEAT_DELAY} is used.
+     */
+    private int mLongPressRepeatDelay;
+
+
+    /** The popup window shown if {@link ExtraKeyButton#getPopup()} returns a {@code non-null} value
+     * and a swipe up action is done on an extra key. */
+    private PopupWindow mPopupWindow;
+
+    private ScheduledExecutorService mScheduledExecutor;
+    private Handler mHandler;
+    private SpecialButtonsLongHoldRunnable mSpecialButtonsLongHoldRunnable;
+    private int mLongPressCount;
+
+
+    public ExtraKeysView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+
+        setRepetitiveKeys(ExtraKeysConstants.PRIMARY_REPETITIVE_KEYS);
+        setSpecialButtons(getDefaultSpecialButtons(this));
+        setButtonColors(DEFAULT_BUTTON_TEXT_COLOR, DEFAULT_BUTTON_ACTIVE_TEXT_COLOR,
+                    DEFAULT_BUTTON_BACKGROUND_COLOR, DEFAULT_BUTTON_ACTIVE_BACKGROUND_COLOR);
+        setLongPressTimeout(ViewConfiguration.getLongPressTimeout());
+        setLongPressRepeatDelay(DEFAULT_LONG_PRESS_REPEAT_DELAY);
+    }
+
+
+    /** Get {@link #mExtraKeysViewClient}. */
+    public IExtraKeysView getExtraKeysViewClient() {
+        return mExtraKeysViewClient;
+    }
+
+    /** Set {@link #mExtraKeysViewClient}. */
+    public void setExtraKeysViewClient(IExtraKeysView extraKeysViewClient) {
+        mExtraKeysViewClient = extraKeysViewClient;
+    }
+
+
+    /** Get {@link #mRepetitiveKeys}. */
+    public List<String> getRepetitiveKeys() {
+        if (mRepetitiveKeys == null) return null;
+        return mRepetitiveKeys.stream().map(String::new).collect(Collectors.toList());
+    }
+
+    /** Set {@link #mRepetitiveKeys}. Must not be {@code null}. */
+    public void setRepetitiveKeys(@NonNull List<String> repetitiveKeys) {
+        mRepetitiveKeys = repetitiveKeys;
+    }
+
+
+    /** Get {@link #mSpecialButtons}. */
+    public Map<SpecialButton, SpecialButtonState> getSpecialButtons() {
+        if (mSpecialButtons == null) return null;
+        return mSpecialButtons.entrySet().stream().collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+    }
+
+    /** Get {@link #mSpecialButtonsKeys}. */
+    public Set<String> getSpecialButtonsKeys() {
+        if (mSpecialButtonsKeys == null) return null;
+        return mSpecialButtonsKeys.stream().map(String::new).collect(Collectors.toSet());
+    }
+
+    /** Set {@link #mSpecialButtonsKeys}. Must not be {@code null}. */
+    public void setSpecialButtons(@NonNull Map<SpecialButton, SpecialButtonState> specialButtons) {
+        mSpecialButtons = specialButtons;
+        mSpecialButtonsKeys = this.mSpecialButtons.keySet().stream().map(SpecialButton::getKey).collect(Collectors.toSet());
+    }
+
+
+    /**
+     * Set the {@link ExtraKeysView} button colors.
+     *
+     * @param buttonTextColor The value for {@link #mButtonTextColor}.
+     * @param buttonActiveTextColor The value for {@link #mButtonActiveTextColor}.
+     * @param buttonBackgroundColor The value for {@link #mButtonBackgroundColor}.
+     * @param buttonActiveBackgroundColor The value for {@link #mButtonActiveBackgroundColor}.
+     */
+    public void setButtonColors(int buttonTextColor, int buttonActiveTextColor, int buttonBackgroundColor, int buttonActiveBackgroundColor) {
+        mButtonTextColor = buttonTextColor;
+        mButtonActiveTextColor = buttonActiveTextColor;
+        mButtonBackgroundColor = buttonBackgroundColor;
+        mButtonActiveBackgroundColor = buttonActiveBackgroundColor;
+    }
+
+
+    /** Get {@link #mButtonTextColor}. */
+    public int getButtonTextColor() {
+        return mButtonTextColor;
+    }
+
+    /** Set {@link #mButtonTextColor}. */
+    public void setButtonTextColor(int buttonTextColor) {
+        mButtonTextColor = buttonTextColor;
+    }
+
+
+    /** Get {@link #mButtonActiveTextColor}. */
+    public int getButtonActiveTextColor() {
+        return mButtonActiveTextColor;
+    }
+
+    /** Set {@link #mButtonActiveTextColor}. */
+    public void setButtonActiveTextColor(int buttonActiveTextColor) {
+        mButtonActiveTextColor = buttonActiveTextColor;
+    }
+
+
+    /** Get {@link #mButtonBackgroundColor}. */
+    public int getButtonBackgroundColor() {
+        return mButtonBackgroundColor;
+    }
+
+    /** Set {@link #mButtonBackgroundColor}. */
+    public void setButtonBackgroundColor(int buttonBackgroundColor) {
+        mButtonBackgroundColor = buttonBackgroundColor;
+    }
+
+
+    /** Get {@link #mButtonActiveBackgroundColor}. */
+    public int getButtonActiveBackgroundColor() {
+        return mButtonActiveBackgroundColor;
+    }
+
+    /** Set {@link #mButtonActiveBackgroundColor}. */
+    public void setButtonActiveBackgroundColor(int buttonActiveBackgroundColor) {
+        mButtonActiveBackgroundColor = buttonActiveBackgroundColor;
+    }
+
+
+    /** Get {@link #mLongPressTimeout}. */
+    public int getLongPressTimeout() {
+        return mLongPressTimeout;
+    }
+
+    /** Set {@link #mLongPressTimeout}. */
+    public void setLongPressTimeout(int longPressDuration) {
+        if (longPressDuration >= MIN_LONG_PRESS_DURATION && longPressDuration <= MAX_LONG_PRESS_DURATION) {
+            mLongPressTimeout = longPressDuration;
+        } else {
+                mLongPressTimeout = FALLBACK_LONG_PRESS_DURATION;
+        }
+    }
+
+    /** Get {@link #mLongPressRepeatDelay}. */
+    public int getLongPressRepeatDelay() {
+        return mLongPressRepeatDelay;
+    }
+
+    /** Set {@link #mLongPressRepeatDelay}. */
+    public void setLongPressRepeatDelay(int longPressRepeatDelay) {
+        if (mLongPressRepeatDelay >= MIN_LONG_PRESS__REPEAT_DELAY && mLongPressRepeatDelay <= MAX_LONG_PRESS__REPEAT_DELAY) {
+            mLongPressRepeatDelay = longPressRepeatDelay;
+        } else {
+            mLongPressRepeatDelay = DEFAULT_LONG_PRESS_REPEAT_DELAY;
+        }
+    }
+
+
+    /** Get the default map that can be used for {@link #mSpecialButtons}. */
+    @NonNull
+    public Map<SpecialButton, SpecialButtonState> getDefaultSpecialButtons(ExtraKeysView extraKeysView) {
+        return new HashMap<SpecialButton, SpecialButtonState>() {{
+            put(SpecialButton.CTRL, new SpecialButtonState(extraKeysView));
+            put(SpecialButton.ALT, new SpecialButtonState(extraKeysView));
+            put(SpecialButton.SHIFT, new SpecialButtonState(extraKeysView));
+            put(SpecialButton.FN, new SpecialButtonState(extraKeysView));
+        }};
+    }
+
+
+
+    /**
+     * Reload this instance of {@link ExtraKeysView} with the info passed in {@code extraKeysInfo}.
+     *
+     * @param extraKeysInfo The {@link ExtraKeysInfo} that defines the necessary info for the extra keys.
+     */
+    @SuppressLint("ClickableViewAccessibility")
+    public void reload(ExtraKeysInfo extraKeysInfo) {
+        if (extraKeysInfo == null)
+            return;
+
+        for(SpecialButtonState state : mSpecialButtons.values())
+            state.buttons = new ArrayList<>();
+
+        removeAllViews();
+
+        ExtraKeyButton[][] buttons = extraKeysInfo.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(mButtonTextColor);
+                button.setPadding(0, 0, 0, 0);
+
+                button.setOnClickListener(view -> {
+                    performExtraKeyButtonHapticFeedback(view, buttonInfo, button);
+                    onAnyExtraKeyButtonClick(view, buttonInfo, button);
+                });
+
+                button.setOnTouchListener((view, event) -> {
+                    switch (event.getAction()) {
+                        case MotionEvent.ACTION_DOWN:
+                            view.setBackgroundColor(mButtonActiveBackgroundColor);
+                            // Start long press scheduled executors which will be stopped in next MotionEvent
+                            startScheduledExecutors(view, buttonInfo, button);
+                            return true;
+
+                        case MotionEvent.ACTION_MOVE:
+                            if (buttonInfo.getPopup() != null) {
+                                // Show popup on swipe up
+                                if (mPopupWindow == null && event.getY() < 0) {
+                                    stopScheduledExecutors();
+                                    view.setBackgroundColor(mButtonBackgroundColor);
+                                    showPopup(view, buttonInfo.getPopup());
+                                }
+                                if (mPopupWindow != null && event.getY() > 0) {
+                                    view.setBackgroundColor(mButtonActiveBackgroundColor);
+                                    dismissPopup();
+                                }
+                            }
+                            return true;
+
+                        case MotionEvent.ACTION_CANCEL:
+                            view.setBackgroundColor(mButtonBackgroundColor);
+                            stopScheduledExecutors();
+                            return true;
+
+                        case MotionEvent.ACTION_UP:
+                            view.setBackgroundColor(mButtonBackgroundColor);
+                            stopScheduledExecutors();
+                            // If ACTION_UP up was not from a repetitive key or was with a key with a popup button
+                            if (mLongPressCount == 0 || mPopupWindow != null) {
+                                // Trigger popup button click if swipe up complete
+                                if (mPopupWindow != null) {
+                                    dismissPopup();
+                                    if (buttonInfo.getPopup() != null) {
+                                        onAnyExtraKeyButtonClick(view, buttonInfo.getPopup(), button);
+                                    }
+                                } else {
+                                    view.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);
+            }
+        }
+    }
+
+
+
+    private void onExtraKeyButtonClick(View view, ExtraKeyButton buttonInfo, Button button) {
+        if (mExtraKeysViewClient != null)
+            mExtraKeysViewClient.onExtraKeyButtonClick(view, buttonInfo, button);
+    }
+
+    private void performExtraKeyButtonHapticFeedback(View view, ExtraKeyButton buttonInfo, Button button) {
+        if (mExtraKeysViewClient != null) {
+            // If client handled the feedback, then just return
+            if (mExtraKeysViewClient.performExtraKeyButtonHapticFeedback(view, buttonInfo, button))
+                return;
+        }
+
+        if (Settings.System.getInt(getContext().getContentResolver(),
+            Settings.System.HAPTIC_FEEDBACK_ENABLED, 0) != 0) {
+
+            if (Build.VERSION.SDK_INT >= 28) {
+                button.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) {
+                    button.performHapticFeedback(HapticFeedbackConstants.KEYBOARD_TAP);
+                }
+            }
+        }
+    }
+
+
+
+    private void onAnyExtraKeyButtonClick(View view, @NonNull ExtraKeyButton buttonInfo, Button button) {
+        if (isSpecialButton(buttonInfo)) {
+            if (mLongPressCount > 0) return;
+            SpecialButtonState state = mSpecialButtons.get(SpecialButton.valueOf(buttonInfo.getKey()));
+            if (state == null) return;
+
+            // Toggle active state and disable lock state if new state is not active
+            state.setIsActive(!state.isActive);
+            if (!state.isActive)
+                state.setIsLocked(false);
+        } else {
+            onExtraKeyButtonClick(view, buttonInfo, button);
+        }
+    }
+
+
+    private void startScheduledExecutors(View view, ExtraKeyButton buttonInfo, Button button) {
+        stopScheduledExecutors();
+        mLongPressCount = 0;
+        if (mRepetitiveKeys.contains(buttonInfo.getKey())) {
+            // Auto repeat key if long pressed until ACTION_UP stops it by calling stopScheduledExecutors.
+            // Currently, only one (last) repeat key can run at a time. Old ones are stopped.
+            mScheduledExecutor = Executors.newSingleThreadScheduledExecutor();
+            mScheduledExecutor.scheduleWithFixedDelay(() -> {
+                mLongPressCount++;
+                onExtraKeyButtonClick(view, buttonInfo, button);
+            }, mLongPressTimeout, mLongPressRepeatDelay, TimeUnit.MILLISECONDS);
+        } else if (isSpecialButton(buttonInfo)) {
+            // Lock the key if long pressed by running mSpecialButtonsLongHoldRunnable after
+            // waiting for mLongPressTimeout milliseconds. If user does not long press, then the
+            // ACTION_UP triggered will cancel the runnable by calling stopScheduledExecutors before
+            // it has a chance to run.
+            SpecialButtonState state = mSpecialButtons.get(SpecialButton.valueOf(buttonInfo.getKey()));
+            if (state == null) return;
+            if (mHandler == null)
+                mHandler = new Handler(Looper.getMainLooper());
+            mSpecialButtonsLongHoldRunnable = new SpecialButtonsLongHoldRunnable(state);
+            mHandler.postDelayed(mSpecialButtonsLongHoldRunnable, mLongPressTimeout);
+        }
+    }
+
+    private void stopScheduledExecutors() {
+        if (mScheduledExecutor != null) {
+            mScheduledExecutor.shutdownNow();
+            mScheduledExecutor = null;
+        }
+
+        if (mSpecialButtonsLongHoldRunnable != null && mHandler != null) {
+            mHandler.removeCallbacks(mSpecialButtonsLongHoldRunnable);
+            mSpecialButtonsLongHoldRunnable = null;
+        }
+    }
+
+    private class SpecialButtonsLongHoldRunnable implements Runnable {
+        private final SpecialButtonState mState;
+
+        public SpecialButtonsLongHoldRunnable(SpecialButtonState state) {
+            mState = state;
+        }
+
+        public void run() {
+            // Toggle active and lock state
+            mState.setIsLocked(!mState.isActive);
+            mState.setIsActive(!mState.isActive);
+            mLongPressCount++;
+        }
+    }
+
+
+
+    void showPopup(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(mButtonTextColor);
+        }
+        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(mButtonActiveBackgroundColor);
+        mPopupWindow = new PopupWindow(this);
+        mPopupWindow.setWidth(LayoutParams.WRAP_CONTENT);
+        mPopupWindow.setHeight(LayoutParams.WRAP_CONTENT);
+        mPopupWindow.setContentView(button);
+        mPopupWindow.setOutsideTouchable(true);
+        mPopupWindow.setFocusable(false);
+        mPopupWindow.showAsDropDown(view, 0, -2 * height);
+    }
+
+    private void dismissPopup() {
+        mPopupWindow.setContentView(null);
+        mPopupWindow.dismiss();
+        mPopupWindow = null;
+    }
+
+
+
+    /** Check whether a {@link ExtraKeyButton} is a {@link SpecialButton}. */
+    public boolean isSpecialButton(ExtraKeyButton button) {
+        return mSpecialButtonsKeys.contains(button.getKey());
+    }
+
+    /**
+     * Read whether {@link SpecialButton} registered in {@link #mSpecialButtons} is active or not.
+     *
+     * @param specialButton The {@link SpecialButton} to read.
+     * @param autoSetInActive Set to {@code true} if {@link SpecialButtonState#isActive} should be
+     *                        set {@code false} if button is not locked.
+     * @return Returns {@code null} if button does not exist in {@link #mSpecialButtons}. If button
+     *         exists, then returns {@code true} if the button is created in {@link ExtraKeysView}
+     *         and is active, otherwise {@code false}.
+     */
+    @Nullable
+    public Boolean readSpecialButton(SpecialButton specialButton, boolean autoSetInActive) {
+        SpecialButtonState state = mSpecialButtons.get(specialButton);
+        if (state == null) return null;
+
+        if (!state.isCreated || !state.isActive)
+            return false;
+
+        // Disable active state only if not locked
+        if (autoSetInActive && !state.isLocked)
+            state.setIsActive(false);
+
+        return true;
+    }
+
+    private Button createSpecialButton(String buttonKey, boolean needUpdate) {
+        SpecialButtonState state = mSpecialButtons.get(SpecialButton.valueOf(buttonKey));
+        if (state == null) return null;
+        state.setIsCreated(true);
+        Button button = new Button(getContext(), null, android.R.attr.buttonBarButtonStyle);
+        button.setTextColor(state.isActive ? mButtonActiveTextColor : mButtonTextColor);
+        if (needUpdate) {
+            state.buttons.add(button);
+        }
+        return button;
+    }
+
+
+
+    /**
+     * 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;
+    }
+
+}
diff --git a/termux-shared/src/main/java/com/termux/shared/terminal/io/extrakeys/SpecialButton.java b/termux-shared/src/main/java/com/termux/shared/terminal/io/extrakeys/SpecialButton.java
new file mode 100644
index 0000000000..34dc258b99
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/terminal/io/extrakeys/SpecialButton.java
@@ -0,0 +1,52 @@
+package com.termux.shared.terminal.io.extrakeys;
+
+import androidx.annotation.NonNull;
+
+import java.util.HashMap;
+
+/** The {@link Class} that implements special buttons for {@link ExtraKeysView}. */
+public class SpecialButton {
+
+    private static final HashMap<String, SpecialButton> map = new HashMap<>();
+
+    public static final SpecialButton CTRL = new SpecialButton("CTRL");
+    public static final SpecialButton ALT = new SpecialButton("ALT");
+    public static final SpecialButton SHIFT = new SpecialButton("SHIFT");
+    public static final SpecialButton FN = new SpecialButton("FN");
+
+    /** The special button key. */
+    private final String key;
+
+    /**
+     * Initialize a {@link SpecialButton}.
+     *
+     * @param key The unique key name for the special button. The key is registered in {@link #map}
+     *            with which the {@link SpecialButton} can be retrieved via a call to
+     *            {@link #valueOf(String)}.
+     */
+    public SpecialButton(@NonNull final String key) {
+        this.key = key;
+        map.put(key, this);
+    }
+
+    /** Get {@link #key} for this {@link SpecialButton}. */
+    public String getKey() {
+        return key;
+    }
+
+    /**
+     * Get the {@link SpecialButton} for {@code key}.
+     *
+     * @param key The unique key name for the special button.
+     */
+    public static SpecialButton valueOf(String key) {
+        return map.get(key);
+    }
+
+    @NonNull
+    @Override
+    public String toString() {
+        return key;
+    }
+
+}
diff --git a/termux-shared/src/main/java/com/termux/shared/terminal/io/extrakeys/SpecialButtonState.java b/termux-shared/src/main/java/com/termux/shared/terminal/io/extrakeys/SpecialButtonState.java
new file mode 100644
index 0000000000..0af0359a9e
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/terminal/io/extrakeys/SpecialButtonState.java
@@ -0,0 +1,49 @@
+package com.termux.shared.terminal.io.extrakeys;
+
+import android.widget.Button;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/** The {@link Class} that maintains a state of a {@link SpecialButton} */
+public class SpecialButtonState {
+
+    /** If special button has been created for the {@link ExtraKeysView}. */
+    boolean isCreated = false;
+    /** If special button is active. */
+    boolean isActive = false;
+    /** If special button is locked due to long hold on it and should not be deactivated if its
+     * state is read. */
+    boolean isLocked = false;
+
+    List<Button> buttons = new ArrayList<>();
+
+    ExtraKeysView mExtraKeysView;
+
+    /**
+     * Initialize a {@link SpecialButtonState} to maintain state of a {@link SpecialButton}.
+     *
+     * @param extraKeysView The {@link ExtraKeysView} instance in which the {@link SpecialButton}
+     *                      is to be registered.
+     */
+    public SpecialButtonState(ExtraKeysView extraKeysView) {
+        mExtraKeysView = extraKeysView;
+    }
+
+    /** Set {@link #isCreated}. */
+    public void setIsCreated(boolean value) {
+        isCreated = value;
+    }
+
+    /** Set {@link #isActive}. */
+    public void setIsActive(boolean value) {
+        isActive = value;
+        buttons.forEach(button -> button.setTextColor(value ? mExtraKeysView.getButtonActiveTextColor() : mExtraKeysView.getButtonTextColor()));
+    }
+
+    /** Set {@link #isLocked}. */
+    public void setIsLocked(boolean value) {
+        isLocked = value;
+    }
+
+}

From fbb91149b5897e1807171eac0c5ce09eeb339f79 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Mon, 23 Aug 2021 08:24:19 +0500
Subject: [PATCH 518/912] Fixed: Use default values if extra-keys or
 extra-keys-style termux.properties values are empty

---
 .../shared/settings/properties/SharedProperties.java  | 11 +++++++++++
 .../settings/properties/TermuxSharedProperties.java   |  4 ++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/settings/properties/SharedProperties.java b/termux-shared/src/main/java/com/termux/shared/settings/properties/SharedProperties.java
index 30ec08a5be..cf4a673d88 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/properties/SharedProperties.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/properties/SharedProperties.java
@@ -553,6 +553,17 @@ public static <T> T getDefaultIfNull(@androidx.annotation.Nullable T object, @an
         return (object == null) ? def : object;
     }
 
+    /**
+     * Get the {@link String} object itself if it is not {@code null} or empty, otherwise default.
+     *
+     * @param object The {@link String} to check.
+     * @param def The default {@link String}.
+     * @return Returns {@code object} if it is not {@code null}, otherwise returns {@code def}.
+     */
+    public static String getDefaultIfNullOrEmpty(@androidx.annotation.Nullable String object, @androidx.annotation.Nullable String def) {
+        return (object == null || object.isEmpty()) ? def : object;
+    }
+
     /**
      * Covert the {@link String} value to lowercase.
      *
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxSharedProperties.java b/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxSharedProperties.java
index e3031764aa..15228a4ee4 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxSharedProperties.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxSharedProperties.java
@@ -423,7 +423,7 @@ public static String getDefaultWorkingDirectoryInternalPropertyValueFromValue(St
      * @return Returns the internal value for value.
      */
     public static String getExtraKeysInternalPropertyValueFromValue(String value) {
-        return SharedProperties.getDefaultIfNull(value, TermuxPropertyConstants.DEFAULT_IVALUE_EXTRA_KEYS);
+        return SharedProperties.getDefaultIfNullOrEmpty(value, TermuxPropertyConstants.DEFAULT_IVALUE_EXTRA_KEYS);
     }
 
     /**
@@ -433,7 +433,7 @@ public static String getExtraKeysInternalPropertyValueFromValue(String value) {
      * @return Returns the internal value for value.
      */
     public static String getExtraKeysStyleInternalPropertyValueFromValue(String value) {
-        return SharedProperties.getDefaultIfNull(value, TermuxPropertyConstants.DEFAULT_IVALUE_EXTRA_KEYS_STYLE);
+        return SharedProperties.getDefaultIfNullOrEmpty(value, TermuxPropertyConstants.DEFAULT_IVALUE_EXTRA_KEYS_STYLE);
     }
 
     /**

From 91172409610863ec1fb9fd28e4456c3ae42921ee Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Mon, 23 Aug 2021 08:51:30 +0500
Subject: [PATCH 519/912] Added: Add shift key support in extra keys and
 terminal with `SHIFT` or `SHFT`

Closes #1038
---
 .../com/termux/app/terminal/TermuxTerminalViewClient.java   | 5 +++++
 .../src/main/java/com/termux/view/TerminalView.java         | 5 ++++-
 .../src/main/java/com/termux/view/TerminalViewClient.java   | 3 +++
 .../shared/terminal/TermuxTerminalViewClientBase.java       | 6 ++++++
 .../shared/terminal/io/extrakeys/ExtraKeysConstants.java    | 1 +
 5 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
index 8e720444bc..329a8633bf 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
@@ -297,6 +297,11 @@ public boolean readAltKey() {
         return readExtraKeysSpecialButton(SpecialButton.ALT);
     }
 
+    @Override
+    public boolean readShiftKey() {
+        return readExtraKeysSpecialButton(SpecialButton.SHIFT);
+    }
+
     public boolean readExtraKeysSpecialButton(SpecialButton specialButton) {
         if (mActivity.getExtraKeysView() == null) return false;
         Boolean state = mActivity.getExtraKeysView().readSpecialButton(specialButton, true);
diff --git a/terminal-view/src/main/java/com/termux/view/TerminalView.java b/terminal-view/src/main/java/com/termux/view/TerminalView.java
index ef67b1c1e2..198c328bc7 100644
--- a/terminal-view/src/main/java/com/termux/view/TerminalView.java
+++ b/terminal-view/src/main/java/com/termux/view/TerminalView.java
@@ -598,12 +598,13 @@ public boolean onKeyDown(int keyCode, KeyEvent event) {
         final int metaState = event.getMetaState();
         final boolean controlDown = event.isCtrlPressed() || mClient.readControlKey();
         final boolean leftAltDown = (metaState & KeyEvent.META_ALT_LEFT_ON) != 0 || mClient.readAltKey();
+        final boolean shiftDown = event.isShiftPressed() || mClient.readShiftKey();
         final boolean rightAltDownFromEvent = (metaState & KeyEvent.META_ALT_RIGHT_ON) != 0;
 
         int keyMod = 0;
         if (controlDown) keyMod |= KeyHandler.KEYMOD_CTRL;
         if (event.isAltPressed() || leftAltDown) keyMod |= KeyHandler.KEYMOD_ALT;
-        if (event.isShiftPressed()) keyMod |= KeyHandler.KEYMOD_SHIFT;
+        if (shiftDown) keyMod |= KeyHandler.KEYMOD_SHIFT;
         if (event.isNumLockOn()) keyMod |= KeyHandler.KEYMOD_NUM_LOCK;
         if (!event.isFunctionPressed() && handleKeyCode(keyCode, keyMod)) {
             if (TERMINAL_VIEW_KEY_LOGGING_ENABLED) mClient.logInfo(LOG_TAG, "handleKeyCode() took key event");
@@ -620,6 +621,8 @@ public boolean onKeyDown(int keyCode, KeyEvent event) {
         }
         int effectiveMetaState = event.getMetaState() & ~bitsToClear;
 
+        if (shiftDown) effectiveMetaState |= KeyEvent.META_SHIFT_ON | KeyEvent.META_SHIFT_LEFT_ON;
+
         int result = event.getUnicodeChar(effectiveMetaState);
         if (TERMINAL_VIEW_KEY_LOGGING_ENABLED)
             mClient.logInfo(LOG_TAG, "KeyEvent#getUnicodeChar(" + effectiveMetaState + ") returned: " + result);
diff --git a/terminal-view/src/main/java/com/termux/view/TerminalViewClient.java b/terminal-view/src/main/java/com/termux/view/TerminalViewClient.java
index bd60d2d3f6..d68ccbca2a 100644
--- a/terminal-view/src/main/java/com/termux/view/TerminalViewClient.java
+++ b/terminal-view/src/main/java/com/termux/view/TerminalViewClient.java
@@ -54,6 +54,9 @@ public interface TerminalViewClient {
 
     boolean readAltKey();
 
+    boolean readShiftKey();
+
+
 
     boolean onCodePoint(int codePoint, boolean ctrlDown, TerminalSession session);
 
diff --git a/termux-shared/src/main/java/com/termux/shared/terminal/TermuxTerminalViewClientBase.java b/termux-shared/src/main/java/com/termux/shared/terminal/TermuxTerminalViewClientBase.java
index a51ca31b1e..cf3d940c69 100644
--- a/termux-shared/src/main/java/com/termux/shared/terminal/TermuxTerminalViewClientBase.java
+++ b/termux-shared/src/main/java/com/termux/shared/terminal/TermuxTerminalViewClientBase.java
@@ -67,6 +67,12 @@ public boolean readAltKey() {
         return false;
     }
 
+    public boolean readShiftKey() {
+        return false;
+    }
+
+
+
     @Override
     public boolean onCodePoint(int codePoint, boolean ctrlDown, TerminalSession session) {
         return false;
diff --git a/termux-shared/src/main/java/com/termux/shared/terminal/io/extrakeys/ExtraKeysConstants.java b/termux-shared/src/main/java/com/termux/shared/terminal/io/extrakeys/ExtraKeysConstants.java
index ae678a71cb..f05ea48162 100644
--- a/termux-shared/src/main/java/com/termux/shared/terminal/io/extrakeys/ExtraKeysConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/terminal/io/extrakeys/ExtraKeysConstants.java
@@ -173,6 +173,7 @@ public static class EXTRA_KEY_DISPLAY_MAPS {
     public static final ExtraKeyDisplayMap CONTROL_CHARS_ALIASES = new ExtraKeyDisplayMap() {{
         put("ESCAPE", "ESC");
         put("CONTROL", "CTRL");
+        put("SHFT", "SHIFT");
         put("RETURN", "ENTER"); // Technically different keys, but most applications won't see the difference
         put("FUNCTION", "FN");
         // no alias for ALT

From d1478fb6c3e112cb08c319254da5c898646481c6 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Mon, 23 Aug 2021 08:56:36 +0500
Subject: [PATCH 520/912] Fixed: Ensure `FN` extra key is read by the terminal

Can't find info on why it wasn't being read before
---
 .../com/termux/app/terminal/TermuxTerminalViewClient.java   | 5 +++++
 .../src/main/java/com/termux/view/TerminalView.java         | 5 ++++-
 .../src/main/java/com/termux/view/TerminalViewClient.java   | 2 ++
 .../shared/terminal/TermuxTerminalViewClientBase.java       | 6 ++++++
 4 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
index 329a8633bf..d59f5dba21 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
@@ -302,6 +302,11 @@ 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);
diff --git a/terminal-view/src/main/java/com/termux/view/TerminalView.java b/terminal-view/src/main/java/com/termux/view/TerminalView.java
index 198c328bc7..885378787f 100644
--- a/terminal-view/src/main/java/com/termux/view/TerminalView.java
+++ b/terminal-view/src/main/java/com/termux/view/TerminalView.java
@@ -599,6 +599,7 @@ public boolean onKeyDown(int keyCode, KeyEvent event) {
         final boolean controlDown = event.isCtrlPressed() || mClient.readControlKey();
         final boolean leftAltDown = (metaState & KeyEvent.META_ALT_LEFT_ON) != 0 || mClient.readAltKey();
         final boolean shiftDown = event.isShiftPressed() || mClient.readShiftKey();
+        final boolean fnDown = event.isFunctionPressed() || mClient.readFnKey();
         final boolean rightAltDownFromEvent = (metaState & KeyEvent.META_ALT_RIGHT_ON) != 0;
 
         int keyMod = 0;
@@ -606,7 +607,8 @@ public boolean onKeyDown(int keyCode, KeyEvent event) {
         if (event.isAltPressed() || leftAltDown) keyMod |= KeyHandler.KEYMOD_ALT;
         if (shiftDown) keyMod |= KeyHandler.KEYMOD_SHIFT;
         if (event.isNumLockOn()) keyMod |= KeyHandler.KEYMOD_NUM_LOCK;
-        if (!event.isFunctionPressed() && handleKeyCode(keyCode, keyMod)) {
+        // https://github.com/termux/termux-app/issues/731
+        if (!fnDown && handleKeyCode(keyCode, keyMod)) {
             if (TERMINAL_VIEW_KEY_LOGGING_ENABLED) mClient.logInfo(LOG_TAG, "handleKeyCode() took key event");
             return true;
         }
@@ -622,6 +624,7 @@ public boolean onKeyDown(int keyCode, KeyEvent event) {
         int effectiveMetaState = event.getMetaState() & ~bitsToClear;
 
         if (shiftDown) effectiveMetaState |= KeyEvent.META_SHIFT_ON | KeyEvent.META_SHIFT_LEFT_ON;
+        if (fnDown) effectiveMetaState |= KeyEvent.META_FUNCTION_ON;
 
         int result = event.getUnicodeChar(effectiveMetaState);
         if (TERMINAL_VIEW_KEY_LOGGING_ENABLED)
diff --git a/terminal-view/src/main/java/com/termux/view/TerminalViewClient.java b/terminal-view/src/main/java/com/termux/view/TerminalViewClient.java
index d68ccbca2a..d6b49b892c 100644
--- a/terminal-view/src/main/java/com/termux/view/TerminalViewClient.java
+++ b/terminal-view/src/main/java/com/termux/view/TerminalViewClient.java
@@ -56,6 +56,8 @@ public interface TerminalViewClient {
 
     boolean readShiftKey();
 
+    boolean readFnKey();
+
 
 
     boolean onCodePoint(int codePoint, boolean ctrlDown, TerminalSession session);
diff --git a/termux-shared/src/main/java/com/termux/shared/terminal/TermuxTerminalViewClientBase.java b/termux-shared/src/main/java/com/termux/shared/terminal/TermuxTerminalViewClientBase.java
index cf3d940c69..167ec6bcbb 100644
--- a/termux-shared/src/main/java/com/termux/shared/terminal/TermuxTerminalViewClientBase.java
+++ b/termux-shared/src/main/java/com/termux/shared/terminal/TermuxTerminalViewClientBase.java
@@ -67,10 +67,16 @@ public boolean readAltKey() {
         return false;
     }
 
+    @Override
     public boolean readShiftKey() {
         return false;
     }
 
+    @Override
+    public boolean readFnKey() {
+        return false;
+    }
+
 
 
     @Override

From c59835ed930b027f21ea4b600281ad14d98e1db2 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Mon, 23 Aug 2021 14:59:02 +0500
Subject: [PATCH 521/912] Revert "Changed: Bump compileSdkVersion to 31"

This reverts commit 296ee60d

We do not need to bump to compileSdkVersion 31 currently, since I have decided not to bump `androidx.window` to `1.0.0-alpha10` or higher currently, since it has changed APIs and ViewUtils will break.

https://developer.android.com/jetpack/androidx/releases/window

Moreover, bumping compileSdkVersion to 31 requires openjdk 11 in build environment, which will break Jitpack library build and possibly still F-Droid as well, unless changes are made.

https://gitlab.com/fdroid/fdroiddata/-/issues/2441

https://github.com/jitpack/jitpack.io/issues/4474

https://jitpack.io/docs/BUILDING/#java-version

Also in android studio stub files are loaded when opening class sources since android 12 sources aren't available.
---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 9c109eb1e9..c8f9ae0514 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -18,7 +18,7 @@ android.useAndroidX=true
 minSdkVersion=24
 targetSdkVersion=28
 ndkVersion=22.1.7171670
-compileSdkVersion=31
+compileSdkVersion=30
 
 markwonVersion=4.6.2
 

From f97f07df3f89aeb3c0d05a0141416d1c2ca835d7 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Mon, 23 Aug 2021 21:51:43 +0500
Subject: [PATCH 522/912] Changed: Add selinux context info to termux files
 info of debug output

---
 .../src/main/java/com/termux/shared/file/TermuxFileUtils.java | 4 ++--
 .../src/main/java/com/termux/shared/termux/TermuxUtils.java   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/file/TermuxFileUtils.java b/termux-shared/src/main/java/com/termux/shared/file/TermuxFileUtils.java
index f7df0b9d19..67d5e4e8f4 100644
--- a/termux-shared/src/main/java/com/termux/shared/file/TermuxFileUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/file/TermuxFileUtils.java
@@ -230,7 +230,7 @@ public static Error isTermuxFilesDirectoryAccessible(@NonNull final Context cont
      * @param context The context for operations.
      * @return Returns the markdown {@link String}.
      */
-    public static String getTermuxFilesDirStatMarkdownString(@NonNull final Context context) {
+    public static String getTermuxFilesStatMarkdownString(@NonNull final Context context) {
         Context termuxPackageContext = TermuxUtils.getTermuxPackageContext(context);
         if (termuxPackageContext == null) return null;
 
@@ -241,7 +241,7 @@ public static String getTermuxFilesDirStatMarkdownString(@NonNull final Context
         StringBuilder statScript = new StringBuilder();
         statScript
             .append("echo 'ls info:'\n")
-            .append("/system/bin/ls -lhd")
+            .append("/system/bin/ls -lhdZ")
             .append(" '/data/data'")
             .append(" '/data/user/0'")
             .append(" '" + TermuxConstants.TERMUX_INTERNAL_PRIVATE_APP_DATA_DIR_PATH + "'")
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
index d401061ad5..62fa7864f7 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
@@ -368,7 +368,7 @@ public static String geAPTInfoMarkdownString(@NonNull final Context context) {
      * @return Returns the markdown {@link String}.
      */
     public static String getTermuxDebugMarkdownString(@NonNull final Context context) {
-        String statInfo = TermuxFileUtils.getTermuxFilesDirStatMarkdownString(context);
+        String statInfo = TermuxFileUtils.getTermuxFilesStatMarkdownString(context);
         String logcatInfo = getLogcatDumpMarkdownString(context);
 
         if (statInfo != null && logcatInfo != null)

From b68a398fa81030a7f95394dcd9295c227d7966e8 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 25 Aug 2021 02:01:28 +0500
Subject: [PATCH 523/912] Changed: Renamed typo
 `TERMUX_ACTIVITY.ACTION_FAILSAFE_SESSION` to
 `TERMUX_ACTIVITY.EXTRA_FAILSAFE_SESSION`

---
 app/src/main/java/com/termux/app/TermuxActivity.java   |  4 ++--
 app/src/main/java/com/termux/app/TermuxService.java    |  2 +-
 .../java/com/termux/shared/termux/TermuxConstants.java | 10 +++++++---
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index 257ec38993..38e612c9b0 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -361,7 +361,7 @@ public void onServiceConnected(ComponentName componentName, IBinder service) {
                         Bundle bundle = getIntent().getExtras();
                         boolean launchFailsafe = false;
                         if (bundle != null) {
-                            launchFailsafe = bundle.getBoolean(TERMUX_ACTIVITY.ACTION_FAILSAFE_SESSION, false);
+                            launchFailsafe = bundle.getBoolean(TERMUX_ACTIVITY.EXTRA_FAILSAFE_SESSION, false);
                         }
                         mTermuxTerminalSessionClient.addNewSession(launchFailsafe, null);
                     } catch (WindowManager.BadTokenException e) {
@@ -376,7 +376,7 @@ public void onServiceConnected(ComponentName componentName, IBinder service) {
             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.ACTION_FAILSAFE_SESSION, false);
+                boolean isFailSafe = i.getBooleanExtra(TERMUX_ACTIVITY.EXTRA_FAILSAFE_SESSION, false);
                 mTermuxTerminalSessionClient.addNewSession(isFailSafe, null);
             } else {
                 mTermuxTerminalSessionClient.setCurrentSession(mTermuxTerminalSessionClient.getCurrentStoredSessionOrLast());
diff --git a/app/src/main/java/com/termux/app/TermuxService.java b/app/src/main/java/com/termux/app/TermuxService.java
index 52cba673ad..5b47d3a132 100644
--- a/app/src/main/java/com/termux/app/TermuxService.java
+++ b/app/src/main/java/com/termux/app/TermuxService.java
@@ -368,7 +368,7 @@ private void actionServiceExecute(Intent intent) {
         }
 
         executionCommand.workingDirectory = IntentUtils.getStringExtraIfSet(intent, TERMUX_SERVICE.EXTRA_WORKDIR, null);
-        executionCommand.isFailsafe = intent.getBooleanExtra(TERMUX_ACTIVITY.ACTION_FAILSAFE_SESSION, false);
+        executionCommand.isFailsafe = intent.getBooleanExtra(TERMUX_ACTIVITY.EXTRA_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);
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
index a71337a408..4d23037dc9 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
@@ -12,7 +12,7 @@
 import java.util.List;
 
 /*
- * Version: v0.25.0
+ * Version: v0.26.0
  *
  * Changelog
  *
@@ -178,6 +178,10 @@
  *          `EXTRA_BACKGROUND_CUSTOM_LOG_LEVEL`.
  *      - Added following to `TERMUX_APP.RUN_COMMAND_SERVICE`:
  *          `EXTRA_BACKGROUND_CUSTOM_LOG_LEVEL`.
+ *
+ * - 0.26.0 (2021-08-25)
+ *      - Changed `TERMUX_ACTIVITY.ACTION_FAILSAFE_SESSION` to `TERMUX_ACTIVITY.EXTRA_FAILSAFE_SESSION`.
+ *
  */
 
 /**
@@ -763,8 +767,8 @@ public static final class TERMUX_APP {
          */
         public static final class TERMUX_ACTIVITY {
 
-            /** Intent action to start termux failsafe session */
-            public static final String ACTION_FAILSAFE_SESSION = TermuxConstants.TERMUX_PACKAGE_NAME + ".app.failsafe_session"; // Default: "com.termux.app.failsafe_session"
+            /** Intent extra for if termux failsafe session needs to be started and is used by {@link TERMUX_ACTIVITY} and {@link TERMUX_SERVICE#ACTION_STOP_SERVICE} */
+            public static final String EXTRA_FAILSAFE_SESSION = TermuxConstants.TERMUX_PACKAGE_NAME + ".app.failsafe_session"; // Default: "com.termux.app.failsafe_session"
 
 
             /** Intent action to make termux request storage permissions */

From 16c56a968e88372e990ee5d78c50a26e64045542 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Mon, 23 Aug 2021 18:39:05 +0500
Subject: [PATCH 524/912] Changed|Fixed: Drawer extra-keys button will toggle
 instead of just opening

Also fixed NullPointerException due to changes in 2a74d43c
---
 .../com/termux/app/terminal/TermuxTerminalViewClient.java | 4 ++++
 .../termux/app/terminal/io/TermuxTerminalExtraKeys.java   | 8 +++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
index d59f5dba21..c6a042f576 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
@@ -75,6 +75,10 @@ public TermuxTerminalViewClient(TermuxActivity activity, TermuxTerminalSessionCl
         this.mTermuxTerminalSessionClient = termuxTerminalSessionClient;
     }
 
+    public TermuxActivity getActivity() {
+        return mActivity;
+    }
+
     /**
      * Should be called when mActivity.onCreate() is called
      */
diff --git a/app/src/main/java/com/termux/app/terminal/io/TermuxTerminalExtraKeys.java b/app/src/main/java/com/termux/app/terminal/io/TermuxTerminalExtraKeys.java
index 483e6c0f2e..8eed51797b 100644
--- a/app/src/main/java/com/termux/app/terminal/io/TermuxTerminalExtraKeys.java
+++ b/app/src/main/java/com/termux/app/terminal/io/TermuxTerminalExtraKeys.java
@@ -7,7 +7,6 @@
 import androidx.annotation.NonNull;
 import androidx.drawerlayout.widget.DrawerLayout;
 
-import com.termux.R;
 import com.termux.app.terminal.TermuxTerminalSessionClient;
 import com.termux.app.terminal.TermuxTerminalViewClient;
 import com.termux.shared.terminal.io.TerminalExtraKeys;
@@ -34,8 +33,11 @@ public void onTerminalExtraKeyButtonClick(View view, String key, boolean ctrlDow
             if(mTermuxTerminalViewClient != null)
                 mTermuxTerminalViewClient.onToggleSoftKeyboardRequest();
         } else if ("DRAWER".equals(key)) {
-            DrawerLayout drawer = view.findViewById(R.id.drawer_layout);
-            drawer.openDrawer(Gravity.LEFT);
+            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);

From 829cc398683104ed8401a013e4d99c291f569222 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Tue, 24 Aug 2021 23:08:06 +0500
Subject: [PATCH 525/912] Added: Allow users to disable hardware keyboard
 shortcuts

The user can add `disable-hardware-keyboard-shortcuts=true` entry to `termux.properties` file to disable hardware keyboard shortcuts. The default value is `false`. Running `termux-reload-settings` command will also update the behaviour instantaneously if changed. Note that for `ctrl+alt+p` to work, you need to unset `shortcut.rename-session = ctrl + n`. https://wiki.termux.com/wiki/Terminal_Settings

Closes #1825
---
 .../com/termux/app/terminal/TermuxTerminalViewClient.java   | 3 ++-
 .../shared/settings/properties/TermuxPropertyConstants.java | 6 ++++++
 .../shared/settings/properties/TermuxSharedProperties.java  | 4 ++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
index c6a042f576..73561d2bfa 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
@@ -216,7 +216,8 @@ public boolean onKeyDown(int keyCode, KeyEvent e, TerminalSession currentSession
         if (keyCode == KeyEvent.KEYCODE_ENTER && !currentSession.isRunning()) {
             mTermuxTerminalSessionClient.removeFinishedSession(currentSession);
             return true;
-        } else if (e.isCtrlPressed() && e.isAltPressed()) {
+        } else if (!mActivity.getProperties().areHardwareKeyboardShortcutsDisabled() &&
+            e.isCtrlPressed() && e.isAltPressed()) {
             // Get the unmodified code point:
             int unicodeChar = e.getUnicodeChar(0);
 
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java b/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java
index fbc7c070ad..0323da111c 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java
@@ -72,6 +72,10 @@ public final class TermuxPropertyConstants {
 
     /* boolean */
 
+    /** Defines the key for whether hardware keyboard shortcuts are enabled. */
+    public static final String KEY_DISABLE_HARDWARE_KEYBOARD_SHORTCUTS =  "disable-hardware-keyboard-shortcuts"; // Default: "disable-hardware-keyboard-shortcuts"
+
+
     /** Defines the key for whether a toast will be shown when user changes the terminal session */
     public static final String KEY_DISABLE_TERMINAL_SESSION_CHANGE_TOAST =  "disable-terminal-session-change-toast"; // Default: "disable-terminal-session-change-toast"
 
@@ -295,6 +299,7 @@ public final class TermuxPropertyConstants {
      * */
     public static final Set<String> TERMUX_PROPERTIES_LIST = new HashSet<>(Arrays.asList(
         /* boolean */
+        KEY_DISABLE_HARDWARE_KEYBOARD_SHORTCUTS,
         KEY_DISABLE_TERMINAL_SESSION_CHANGE_TOAST,
         KEY_ENFORCE_CHAR_BASED_INPUT,
         KEY_HIDE_SOFT_KEYBOARD_ON_STARTUP,
@@ -335,6 +340,7 @@ public final class TermuxPropertyConstants {
      * default: false
      * */
     public static final Set<String> TERMUX_DEFAULT_BOOLEAN_BEHAVIOUR_PROPERTIES_LIST = new HashSet<>(Arrays.asList(
+        KEY_DISABLE_HARDWARE_KEYBOARD_SHORTCUTS,
         KEY_DISABLE_TERMINAL_SESSION_CHANGE_TOAST,
         KEY_ENFORCE_CHAR_BASED_INPUT,
         KEY_HIDE_SOFT_KEYBOARD_ON_STARTUP,
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxSharedProperties.java b/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxSharedProperties.java
index 15228a4ee4..b3bf784556 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxSharedProperties.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxSharedProperties.java
@@ -460,6 +460,10 @@ public static String getVolumeKeysBehaviourInternalPropertyValueFromValue(String
 
 
 
+    public boolean areHardwareKeyboardShortcutsDisabled() {
+        return (boolean) getInternalPropertyValue(TermuxPropertyConstants.KEY_DISABLE_TERMINAL_SESSION_CHANGE_TOAST, true);
+    }
+
     public boolean areTerminalSessionChangeToastsDisabled() {
         return (boolean) getInternalPropertyValue(TermuxPropertyConstants.KEY_DISABLE_TERMINAL_SESSION_CHANGE_TOAST, true);
     }

From 63504f0adc935977b662c7257464d1fc492b6374 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 25 Aug 2021 19:39:45 +0500
Subject: [PATCH 526/912] Added: Allow users to adjust terminal horizontal and
 vertical margin

The `terminal-margin-horizontal` key can be used to adjust the terminal left/right margin and the `terminal-margin-vertical` can be used to adjust the terminal top/bottom margin. This will also affect drawer. The user can set an integer value between `0` and `100` as `dp` units. The default value is still `3` for horizontal and `0` for vertical margin. So adding an entry like `terminal-margin-horizontal=10` to `termux.properties` file will allow users to set a horizontal margin of `10dp`. After updating the value, either restart termux or run `termux-reload-settings` for changes to take effect.

This was added since for some users text on edges would not be shown on the screen or they had screen protectors/cases that covered screen edges (Of course, that would require fixing every single app and android system UI itself, so kinda stupid to use). Moreover, horizontal margin of like `10dp` may be helpful with peek-and-slide for people having gesture navigation enabled on android `10+` since they won't be to touch at exactly the edge of the screen to trigger peek (#1325).

Closes #2210
---
 .../java/com/termux/app/TermuxActivity.java   | 12 +++++
 app/src/main/res/layout/activity_termux.xml   |  5 +-
 .../properties/TermuxPropertyConstants.java   | 21 +++++++-
 .../properties/TermuxSharedProperties.java    | 48 +++++++++++++++++++
 .../com/termux/shared/view/ViewUtils.java     | 15 ++++++
 5 files changed, 98 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index 254b3bc50f..11b066f366 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -29,6 +29,7 @@
 import android.widget.EditText;
 import android.widget.ImageButton;
 import android.widget.ListView;
+import android.widget.RelativeLayout;
 import android.widget.Toast;
 
 import com.termux.R;
@@ -49,6 +50,7 @@
 import com.termux.shared.interact.TextInputDialogUtils;
 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;
@@ -204,6 +206,8 @@ public void onCreate(Bundle savedInstanceState) {
             return;
         }
 
+        setMargins();
+
         mTermuxActivityRootView = findViewById(R.id.activity_termux_root_view);
         mTermuxActivityRootView.setActivity(this);
         mTermuxActivityBottomSpaceView = findViewById(R.id.activity_termux_bottom_space_view);
@@ -416,6 +420,13 @@ private void setDrawerTheme() {
         }
     }
 
+    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() {
@@ -873,6 +884,7 @@ private void reloadActivityStyling() {
             }
         }
 
+        setMargins();
         setTerminalToolbarHeight();
 
         if (mTermuxTerminalSessionClient != null)
diff --git a/app/src/main/res/layout/activity_termux.xml b/app/src/main/res/layout/activity_termux.xml
index c659f57711..144e846c51 100644
--- a/app/src/main/res/layout/activity_termux.xml
+++ b/app/src/main/res/layout/activity_termux.xml
@@ -6,9 +6,12 @@
     android:fitsSystemWindows="true">
 
     <RelativeLayout
+        android:id="@+id/activity_termux_root_relative_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">
 
         <androidx.drawerlayout.widget.DrawerLayout
@@ -22,8 +25,6 @@
                 android:id="@+id/terminal_view"
                 android:layout_width="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"
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java b/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java
index 0323da111c..64f4c1b7c8 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java
@@ -12,7 +12,7 @@
 import java.util.Set;
 
 /*
- * Version: v0.12.0
+ * Version: v0.13.0
  *
  * Changelog
  *
@@ -55,6 +55,9 @@
  *
  * - 0.12.0 (2021-06-10)
  *      - Add `*KEY_TERMINAL_CURSOR_STYLE*`.
+ *
+ * - 0.13.0 (2021-08-25)
+ *      - Add `*KEY_TERMINAL_MARGIN_HORIZONTAL*` and `*KEY_TERMINAL_MARGIN_VERTICAL*`.
  */
 
 /**
@@ -173,6 +176,20 @@ public final class TermuxPropertyConstants {
 
 
 
+    /** Defines the key for the terminal margin on left and right in dp units */
+    public static final String KEY_TERMINAL_MARGIN_HORIZONTAL =  "terminal-margin-horizontal"; // Default: "terminal-margin-horizontal"
+    public static final int IVALUE_TERMINAL_MARGIN_HORIZONTAL_MIN = 0;
+    public static final int IVALUE_TERMINAL_MARGIN_HORIZONTAL_MAX = 100;
+    public static final int DEFAULT_IVALUE_TERMINAL_HORIZONTAL_MARGIN = 3;
+
+    /** Defines the key for the terminal margin on top and bottom in dp units */
+    public static final String KEY_TERMINAL_MARGIN_VERTICAL =  "terminal-margin-vertical"; // Default: "terminal-margin-vertical"
+    public static final int IVALUE_TERMINAL_MARGIN_VERTICAL_MIN = 0;
+    public static final int IVALUE_TERMINAL_MARGIN_VERTICAL_MAX = 100;
+    public static final int DEFAULT_IVALUE_TERMINAL_VERTICAL_MARGIN = 0;
+
+
+
     /** Defines the key for the terminal transcript rows */
     public static final String KEY_TERMINAL_TRANSCRIPT_ROWS =  "terminal-transcript-rows"; // Default: "terminal-transcript-rows"
     public static final int IVALUE_TERMINAL_TRANSCRIPT_ROWS_MIN = TerminalEmulator.TERMINAL_TRANSCRIPT_ROWS_MIN;
@@ -314,6 +331,8 @@ public final class TermuxPropertyConstants {
         KEY_BELL_BEHAVIOUR,
         KEY_TERMINAL_CURSOR_BLINK_RATE,
         KEY_TERMINAL_CURSOR_STYLE,
+        KEY_TERMINAL_MARGIN_HORIZONTAL,
+        KEY_TERMINAL_MARGIN_VERTICAL,
         KEY_TERMINAL_TRANSCRIPT_ROWS,
 
         /* float */
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxSharedProperties.java b/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxSharedProperties.java
index b3bf784556..8c86d80775 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxSharedProperties.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxSharedProperties.java
@@ -219,6 +219,10 @@ public static Object getInternalTermuxPropertyValueFromValue(Context context, St
                 return (int) getTerminalCursorBlinkRateInternalPropertyValueFromValue(value);
             case TermuxPropertyConstants.KEY_TERMINAL_CURSOR_STYLE:
                 return (int) getTerminalCursorStyleInternalPropertyValueFromValue(value);
+            case TermuxPropertyConstants.KEY_TERMINAL_MARGIN_HORIZONTAL:
+                return (int) getTerminalMarginHorizontalInternalPropertyValueFromValue(value);
+            case TermuxPropertyConstants.KEY_TERMINAL_MARGIN_VERTICAL:
+                return (int) getTerminalMarginVerticalInternalPropertyValueFromValue(value);
             case TermuxPropertyConstants.KEY_TERMINAL_TRANSCRIPT_ROWS:
                 return (int) getTerminalTranscriptRowsInternalPropertyValueFromValue(value);
 
@@ -318,6 +322,42 @@ public static int getTerminalCursorStyleInternalPropertyValueFromValue(String va
         return (int) SharedProperties.getDefaultIfNotInMap(TermuxPropertyConstants.KEY_TERMINAL_CURSOR_STYLE, TermuxPropertyConstants.MAP_TERMINAL_CURSOR_STYLE, SharedProperties.toLowerCase(value), TermuxPropertyConstants.DEFAULT_IVALUE_TERMINAL_CURSOR_STYLE, true, LOG_TAG);
     }
 
+    /**
+     * Returns the int for the value if its not null and is between
+     * {@link TermuxPropertyConstants#IVALUE_TERMINAL_MARGIN_HORIZONTAL_MIN} and
+     * {@link TermuxPropertyConstants#IVALUE_TERMINAL_MARGIN_HORIZONTAL_MAX},
+     * otherwise returns {@link TermuxPropertyConstants#DEFAULT_IVALUE_TERMINAL_HORIZONTAL_MARGIN}.
+     *
+     * @param value The {@link String} value to convert.
+     * @return Returns the internal value for value.
+     */
+    public static int getTerminalMarginHorizontalInternalPropertyValueFromValue(String value) {
+        return SharedProperties.getDefaultIfNotInRange(TermuxPropertyConstants.KEY_TERMINAL_MARGIN_HORIZONTAL,
+            DataUtils.getIntFromString(value, TermuxPropertyConstants.DEFAULT_IVALUE_TERMINAL_HORIZONTAL_MARGIN),
+            TermuxPropertyConstants.DEFAULT_IVALUE_TERMINAL_HORIZONTAL_MARGIN,
+            TermuxPropertyConstants.IVALUE_TERMINAL_MARGIN_HORIZONTAL_MIN,
+            TermuxPropertyConstants.IVALUE_TERMINAL_MARGIN_HORIZONTAL_MAX,
+            true, true, LOG_TAG);
+    }
+
+    /**
+     * Returns the int for the value if its not null and is between
+     * {@link TermuxPropertyConstants#IVALUE_TERMINAL_MARGIN_VERTICAL_MIN} and
+     * {@link TermuxPropertyConstants#IVALUE_TERMINAL_MARGIN_VERTICAL_MAX},
+     * otherwise returns {@link TermuxPropertyConstants#DEFAULT_IVALUE_TERMINAL_VERTICAL_MARGIN}.
+     *
+     * @param value The {@link String} value to convert.
+     * @return Returns the internal value for value.
+     */
+    public static int getTerminalMarginVerticalInternalPropertyValueFromValue(String value) {
+        return SharedProperties.getDefaultIfNotInRange(TermuxPropertyConstants.KEY_TERMINAL_MARGIN_VERTICAL,
+            DataUtils.getIntFromString(value, TermuxPropertyConstants.DEFAULT_IVALUE_TERMINAL_VERTICAL_MARGIN),
+            TermuxPropertyConstants.DEFAULT_IVALUE_TERMINAL_VERTICAL_MARGIN,
+            TermuxPropertyConstants.IVALUE_TERMINAL_MARGIN_VERTICAL_MIN,
+            TermuxPropertyConstants.IVALUE_TERMINAL_MARGIN_VERTICAL_MAX,
+            true, true, LOG_TAG);
+    }
+
     /**
      * Returns the int for the value if its not null and is between
      * {@link TermuxPropertyConstants#IVALUE_TERMINAL_TRANSCRIPT_ROWS_MIN} and
@@ -508,6 +548,14 @@ public int getTerminalCursorStyle() {
         return (int) getInternalPropertyValue(TermuxPropertyConstants.KEY_TERMINAL_CURSOR_STYLE, true);
     }
 
+    public int getTerminalMarginHorizontal() {
+        return (int) getInternalPropertyValue(TermuxPropertyConstants.KEY_TERMINAL_MARGIN_HORIZONTAL, true);
+    }
+
+    public int getTerminalMarginVertical() {
+        return (int) getInternalPropertyValue(TermuxPropertyConstants.KEY_TERMINAL_MARGIN_VERTICAL, true);
+    }
+
     public int getTerminalTranscriptRows() {
         return (int) getInternalPropertyValue(TermuxPropertyConstants.KEY_TERMINAL_TRANSCRIPT_ROWS, true);
     }
diff --git a/termux-shared/src/main/java/com/termux/shared/view/ViewUtils.java b/termux-shared/src/main/java/com/termux/shared/view/ViewUtils.java
index c578f62558..5c76b3869e 100644
--- a/termux-shared/src/main/java/com/termux/shared/view/ViewUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/view/ViewUtils.java
@@ -8,6 +8,7 @@
 import android.graphics.Rect;
 import android.util.TypedValue;
 import android.view.View;
+import android.view.ViewGroup;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -218,4 +219,18 @@ public static int dpToPx(Context context, int dp) {
         return (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp, context.getResources().getDisplayMetrics());
     }
 
+
+    public static void setLayoutMarginsInDp(@NonNull View view, int left, int top, int right, int bottom) {
+        Context context = view.getContext();
+        setLayoutMarginsInPixels(view, dpToPx(context, left), dpToPx(context, top), dpToPx(context, right), dpToPx(context, bottom));
+    }
+
+    public static void setLayoutMarginsInPixels(@NonNull View view, int left, int top, int right, int bottom) {
+        if (view.getLayoutParams() instanceof ViewGroup.MarginLayoutParams) {
+            ViewGroup.MarginLayoutParams params = (ViewGroup.MarginLayoutParams) view.getLayoutParams();
+            params.setMargins(left, top, right, bottom);
+            view.setLayoutParams(params);
+        }
+    }
+
 }

From 994df1c4af59f6e9823ec93a09d4a14700cbc0c6 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 26 Aug 2021 06:01:25 +0500
Subject: [PATCH 527/912] Fixed|Added: Fix extra-keys shift key not uppercasing
 for all soft keyboards and added docs for keyboard key characters mapping

---
 .../java/com/termux/view/TerminalView.java    | 109 +++++++++++++++++-
 1 file changed, 106 insertions(+), 3 deletions(-)

diff --git a/terminal-view/src/main/java/com/termux/view/TerminalView.java b/terminal-view/src/main/java/com/termux/view/TerminalView.java
index 885378787f..b80b1844df 100644
--- a/terminal-view/src/main/java/com/termux/view/TerminalView.java
+++ b/terminal-view/src/main/java/com/termux/view/TerminalView.java
@@ -271,6 +271,10 @@ public InputConnection onCreateInputConnection(EditorInfo outAttrs) {
                 // Some keyboards seems do not reset the internal state on TYPE_NULL.
                 // Affects mostly Samsung stock keyboards.
                 // https://github.com/termux/termux-app/issues/686
+                // However, this is not a valid value as per AOSP since `InputType.TYPE_CLASS_*` is
+                // not set and it logs a warning:
+                // W/InputAttributes: Unexpected input class: inputType=0x00080090 imeOptions=0x02000000
+                // https://cs.android.com/android/platform/superproject/+/android-11.0.0_r40:packages/inputmethods/LatinIME/java/src/com/android/inputmethod/latin/InputAttributes.java;l=79
                 outAttrs.inputType = InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD | InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS;
             } else {
                 // Using InputType.NULL is the most correct input type and avoids issues with other hacks.
@@ -346,6 +350,10 @@ void sendTextToTerminal(CharSequence text) {
                         codePoint = firstChar;
                     }
 
+                    // Check onKeyDown() for details.
+                    if (mClient.readShiftKey())
+                        codePoint = Character.toUpperCase(codePoint);
+
                     boolean ctrlHeld = false;
                     if (codePoint <= 31 && codePoint != 27) {
                         if (codePoint == '\n') {
@@ -576,6 +584,102 @@ public boolean onKeyPreIme(int keyCode, KeyEvent event) {
         return super.onKeyPreIme(keyCode, event);
     }
 
+    /**
+     * Key presses in software keyboards will generally NOT trigger this listener, although some
+     * may elect to do so in some situations. Do not rely on this to catch software key presses.
+     * Gboard calls this when shouldEnforceCharBasedInput() is disabled (InputType.TYPE_NULL) instead
+     * of calling commitText(), with deviceId=-1. However, Hacker's Keyboard, OpenBoard, LG Keyboard
+     * call commitText().
+     *
+     * This function may also be called directly without android calling it, like by
+     * `TerminalExtraKeys` which generates a KeyEvent manually which uses {@link KeyCharacterMap#VIRTUAL_KEYBOARD}
+     * as the device (deviceId=-1), as does Gboard. That would normally use mappings defined in
+     * `/system/usr/keychars/Virtual.kcm`. You can run `dumpsys input` to find the `KeyCharacterMapFile`
+     * used by virtual keyboard or hardware keyboard. Note that virtual keyboard device is not the
+     * same as software keyboard, like Gboard, etc. Its a fake device used for generating events and
+     * for testing.
+     *
+     * We handle shift key in `commitText()` to convert codepoint to uppercase case there with a
+     * call to {@link Character#toUpperCase(int)}, but here we instead rely on getUnicodeChar() for
+     * conversion of keyCode, for both hardware keyboard shift key (via effectiveMetaState) and
+     * `mClient.readShiftKey()`, based on value in kcm files.
+     * This may result in different behaviour depending on keyboard and android kcm files set for the
+     * InputDevice for the event passed to this function. This will likely be an issue for non-english
+     * languages since `Virtual.kcm` in english only by default or at least in AOSP. For both hardware
+     * shift key (via effectiveMetaState) and `mClient.readShiftKey()`, `getUnicodeChar()` is used
+     * for shift specific behaviour which usually is to uppercase.
+     *
+     * For fn key on hardware keyboard, android checks kcm files for hardware keyboards, which is
+     * `Generic.kcm` by default, unless a vendor specific one is defined. The event passed will have
+     * {@link KeyEvent#META_FUNCTION_ON} set. If the kcm file only defines a single character or unicode
+     * code point `\\uxxxx`, then only one event is passed with that value. However, if kcm defines
+     * a `fallback` key for fn or others, like `key DPAD_UP { ... fn: fallback PAGE_UP }`, then
+     * android will first pass an event with original key `DPAD_UP` and {@link KeyEvent#META_FUNCTION_ON}
+     * set. But this function will not consume it and android will pass another event with `PAGE_UP`
+     * and {@link KeyEvent#META_FUNCTION_ON} not set, which will be consumed.
+     *
+     * Now there are some other issues as well, firstly ctrl and alt flags are not passed to
+     * `getUnicodeChar()`, so modified key values in kcm are not used. Secondly, if the kcm file
+     * for other modifiers like shift or fn define a non-alphabet, like { fn: '\u0015' } to act as
+     * DPAD_LEFT, the `getUnicodeChar()` will correctly return `21` as the code point but action will
+     * not happen because the `handleKeyCode()` function that transforms DPAD_LEFT to `\033[D`
+     * escape sequence for the terminal to perform the left action would not be called since its
+     * called before `getUnicodeChar()` and terminal will instead get `21 0x15 Negative Acknowledgement`.
+     * The solution to such issues is calling `getUnicodeChar()` before the call to `handleKeyCode()`
+     * if user has defined a custom kcm file, like done in POC mentioned in #2237. Note that
+     * Hacker's Keyboard calls `commitText()` so don't test fn/shift with it for this function.
+     * https://github.com/termux/termux-app/pull/2237
+     * https://github.com/agnostic-apollo/termux-app/blob/terminal-code-point-custom-mapping/terminal-view/src/main/java/com/termux/view/TerminalView.java
+     *
+     * Key Character Map (kcm) and Key Layout (kl) files info:
+     * https://source.android.com/devices/input/key-character-map-files
+     * https://source.android.com/devices/input/key-layout-files
+     * https://source.android.com/devices/input/keyboard-devices
+     * AOSP kcm and kl files:
+     * https://cs.android.com/android/platform/superproject/+/android-11.0.0_r40:frameworks/base/data/keyboards
+     * https://cs.android.com/android/platform/superproject/+/android-11.0.0_r40:frameworks/base/packages/InputDevices/res/raw
+     *
+     * KeyCodes:
+     * https://cs.android.com/android/platform/superproject/+/android-11.0.0_r40:frameworks/base/core/java/android/view/KeyEvent.java
+     * https://cs.android.com/android/platform/superproject/+/master:frameworks/native/include/android/keycodes.h
+     *
+     * `dumpsys input`:
+     * https://cs.android.com/android/platform/superproject/+/android-11.0.0_r40:frameworks/native/services/inputflinger/reader/EventHub.cpp;l=1917
+     *
+     * Loading of keymap:
+     * https://cs.android.com/android/platform/superproject/+/android-11.0.0_r40:frameworks/native/services/inputflinger/reader/EventHub.cpp;l=1644
+     * https://cs.android.com/android/platform/superproject/+/android-11.0.0_r40:frameworks/native/libs/input/Keyboard.cpp;l=41
+     * https://cs.android.com/android/platform/superproject/+/android-11.0.0_r40:frameworks/native/libs/input/InputDevice.cpp
+     * OVERLAY keymaps for hardware keyboards may be combined as well:
+     * https://cs.android.com/android/platform/superproject/+/android-11.0.0_r40:frameworks/native/libs/input/KeyCharacterMap.cpp;l=165
+     * https://cs.android.com/android/platform/superproject/+/android-11.0.0_r40:frameworks/native/libs/input/KeyCharacterMap.cpp;l=831
+     *
+     * Parse kcm file:
+     * https://cs.android.com/android/platform/superproject/+/android-11.0.0_r40:frameworks/native/libs/input/KeyCharacterMap.cpp;l=727
+     * Parse key value:
+     * https://cs.android.com/android/platform/superproject/+/android-11.0.0_r40:frameworks/native/libs/input/KeyCharacterMap.cpp;l=981
+     *
+     * `KeyEvent.getUnicodeChar()`
+     * https://cs.android.com/android/platform/superproject/+/android-11.0.0_r40:frameworks/base/core/java/android/view/KeyEvent.java;l=2716
+     * https://cs.android.com/android/platform/superproject/+/master:frameworks/base/core/java/android/view/KeyCharacterMap.java;l=368
+     * https://cs.android.com/android/platform/superproject/+/android-11.0.0_r40:frameworks/base/core/jni/android_view_KeyCharacterMap.cpp;l=117
+     * https://cs.android.com/android/platform/superproject/+/android-11.0.0_r40:frameworks/native/libs/input/KeyCharacterMap.cpp;l=231
+     *
+     * Keyboard layouts advertised by applications, like for hardware keyboards via #ACTION_QUERY_KEYBOARD_LAYOUTS
+     * Config is stored in `/data/system/input-manager-state.xml`
+     * https://github.com/ris58h/custom-keyboard-layout
+     * Loading from apps:
+     * https://cs.android.com/android/platform/superproject/+/master:frameworks/base/services/core/java/com/android/server/input/InputManagerService.java;l=1221
+     * Set:
+     * https://cs.android.com/android/platform/superproject/+/android-11.0.0_r40:frameworks/base/core/java/android/hardware/input/InputManager.java;l=89
+     * https://cs.android.com/android/platform/superproject/+/android-11.0.0_r40:frameworks/base/core/java/android/hardware/input/InputManager.java;l=543
+     * https://cs.android.com/android/platform/superproject/+/android-11.0.0_r40:packages/apps/Settings/src/com/android/settings/inputmethod/KeyboardLayoutDialogFragment.java;l=167
+     * https://cs.android.com/android/platform/superproject/+/master:frameworks/base/services/core/java/com/android/server/input/InputManagerService.java;l=1385
+     * https://cs.android.com/android/platform/superproject/+/master:frameworks/base/services/core/java/com/android/server/input/PersistentDataStore.java
+     * Get overlay keyboard layout
+     * https://cs.android.com/android/platform/superproject/+/master:frameworks/base/services/core/java/com/android/server/input/InputManagerService.java;l=2158
+     * https://cs.android.com/android/platform/superproject/+/android-11.0.0_r40:frameworks/base/services/core/jni/com_android_server_input_InputManagerService.cpp;l=616
+     */
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
         if (TERMINAL_VIEW_KEY_LOGGING_ENABLED)
@@ -599,7 +703,6 @@ public boolean onKeyDown(int keyCode, KeyEvent event) {
         final boolean controlDown = event.isCtrlPressed() || mClient.readControlKey();
         final boolean leftAltDown = (metaState & KeyEvent.META_ALT_LEFT_ON) != 0 || mClient.readAltKey();
         final boolean shiftDown = event.isShiftPressed() || mClient.readShiftKey();
-        final boolean fnDown = event.isFunctionPressed() || mClient.readFnKey();
         final boolean rightAltDownFromEvent = (metaState & KeyEvent.META_ALT_RIGHT_ON) != 0;
 
         int keyMod = 0;
@@ -608,7 +711,7 @@ public boolean onKeyDown(int keyCode, KeyEvent event) {
         if (shiftDown) keyMod |= KeyHandler.KEYMOD_SHIFT;
         if (event.isNumLockOn()) keyMod |= KeyHandler.KEYMOD_NUM_LOCK;
         // https://github.com/termux/termux-app/issues/731
-        if (!fnDown && handleKeyCode(keyCode, keyMod)) {
+        if (!event.isFunctionPressed() && handleKeyCode(keyCode, keyMod)) {
             if (TERMINAL_VIEW_KEY_LOGGING_ENABLED) mClient.logInfo(LOG_TAG, "handleKeyCode() took key event");
             return true;
         }
@@ -624,7 +727,7 @@ public boolean onKeyDown(int keyCode, KeyEvent event) {
         int effectiveMetaState = event.getMetaState() & ~bitsToClear;
 
         if (shiftDown) effectiveMetaState |= KeyEvent.META_SHIFT_ON | KeyEvent.META_SHIFT_LEFT_ON;
-        if (fnDown) effectiveMetaState |= KeyEvent.META_FUNCTION_ON;
+        if (mClient.readFnKey()) effectiveMetaState |= KeyEvent.META_FUNCTION_ON;
 
         int result = event.getUnicodeChar(effectiveMetaState);
         if (TERMINAL_VIEW_KEY_LOGGING_ENABLED)

From 8387b70f64e1a5505cdfa025d328a2568f7f3f54 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 26 Aug 2021 06:03:23 +0500
Subject: [PATCH 528/912] Fixed: Fix terminal cursor blinker not stopping when
 typing a character in non-gboard keyboards

---
 terminal-view/src/main/java/com/termux/view/TerminalView.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/terminal-view/src/main/java/com/termux/view/TerminalView.java b/terminal-view/src/main/java/com/termux/view/TerminalView.java
index b80b1844df..a6ef7106ec 100644
--- a/terminal-view/src/main/java/com/termux/view/TerminalView.java
+++ b/terminal-view/src/main/java/com/termux/view/TerminalView.java
@@ -764,6 +764,10 @@ public void inputCodePoint(int codePoint, boolean controlDownFromEvent, boolean
 
         if (mTermSession == null) return;
 
+        // Ensure cursor is shown when a key is pressed down like long hold on (arrow) keys
+        if (mEmulator != null)
+            mEmulator.setCursorBlinkState(true);
+
         final boolean controlDown = controlDownFromEvent || mClient.readControlKey();
         final boolean altDown = leftAltDownFromEvent || mClient.readAltKey();
 

From 5a8c4f10eef273e93c5059bff8d97c9eb5d6befb Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Fri, 27 Aug 2021 05:39:04 +0500
Subject: [PATCH 529/912] Fixed|Changed: Fix TermuxFileReceiverActivity
 incorrect handling of intent extras

- If the `EXTRA_TEXT` value of the intent passed was empty instead of `null`, it was incorrectly assumed that text was passed, even though a valid `EXTRA_STREAM` may have been passed. Now `EXTRA_STREAM` will be checked first.
- Added empty extra and empty/`null` filename checks before trying to create a file with an empty filename and failing.
- Enable logging of intent passed at verbose log level.
- Changed to a better error dialog.

Closes #2247
---
 .../TermuxFileReceiverActivity.java           | 75 +++++++++++++------
 1 file changed, 54 insertions(+), 21 deletions(-)

diff --git a/app/src/main/java/com/termux/filepicker/TermuxFileReceiverActivity.java b/app/src/main/java/com/termux/filepicker/TermuxFileReceiverActivity.java
index ef600dc0a2..2dae743695 100644
--- a/app/src/main/java/com/termux/filepicker/TermuxFileReceiverActivity.java
+++ b/app/src/main/java/com/termux/filepicker/TermuxFileReceiverActivity.java
@@ -1,7 +1,6 @@
 package com.termux.filepicker;
 
 import android.app.Activity;
-import android.app.AlertDialog;
 import android.content.Intent;
 import android.database.Cursor;
 import android.net.Uri;
@@ -9,6 +8,9 @@
 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.termux.TermuxConstants;
 import com.termux.shared.termux.TermuxConstants.TERMUX_APP.TERMUX_SERVICE;
@@ -39,6 +41,8 @@ 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) {
@@ -55,44 +59,66 @@ protected void onResume() {
         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 (sharedText != null) {
+            if (sharedUri != null) {
+                handleContentUri(sharedUri, sharedTitle);
+            } else if (sharedText != null) {
                 if (isSharedTextAnUrl(sharedText)) {
                     handleUrlAndFinish(sharedText);
                 } else {
-                    String subject = intent.getStringExtra(Intent.EXTRA_SUBJECT);
-                    if (subject == null) subject = intent.getStringExtra(Intent.EXTRA_TITLE);
+                    String subject = IntentUtils.getStringExtraIfSet(intent, Intent.EXTRA_SUBJECT, null);
+                    if (subject == null) subject = sharedTitle;
                     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 {
-            showErrorDialogAndQuit("Unable to receive any file or URL.");
+            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.");
+            }
         }
     }
 
     void showErrorDialogAndQuit(String message) {
         mFinishOnDismissNameDialog = false;
-        new AlertDialog.Builder(this).setMessage(message).setOnDismissListener(dialog -> finish()).setPositiveButton(android.R.string.ok, (dialog, which) -> finish()).show();
+        MessageDialogUtils.showMessage(this,
+            API_TAG, message,
+            null, (dialog, which) -> finish(),
+            null, null,
+            dialog -> finish());
     }
 
     void handleContentUri(final Uri uri, String subjectFromIntent) {
@@ -157,10 +183,17 @@ void promptNameAndSave(final InputStream in, final String attachmentFileName) {
 
     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)) {
@@ -182,7 +215,7 @@ void handleUrlAndFinish(final String url) {
         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 only argument.");
+                + "Create this file as a script or a symlink - it will be called with the shared URL as the first argument.");
             return;
         }
 

From 582e56938a2cb8f1231031c4bbe735c219844909 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 28 Aug 2021 00:29:53 +0500
Subject: [PATCH 530/912] Added: Add SharedPrefernces controllers for all
 current published termux plugin app

Also added log level setting in Termux Settings for Termux:API. Others can be added when logging is implemented in the plugin apps via `Logger` class provided by `termux-shared`.
---
 .../app/activities/SettingsActivity.java      |  17 ++-
 .../TermuxAPIPreferencesFragment.java         |  49 +++++++++
 .../DebuggingPreferencesFragment.java         | 101 ++++++++++++++++++
 app/src/main/res/values/strings.xml           |   7 ++
 app/src/main/res/xml/root_preferences.xml     |   7 ++
 .../xml/termux_api_debugging_preferences.xml  |  15 +++
 .../main/res/xml/termux_api_preferences.xml   |   8 ++
 .../TermuxAPIAppSharedPreferences.java        |  79 ++++++++++++++
 .../TermuxBootAppSharedPreferences.java       |  79 ++++++++++++++
 .../TermuxFloatAppSharedPreferences.java      |  79 ++++++++++++++
 .../TermuxPreferenceConstants.java            |  83 +++++++++++++-
 .../TermuxStylingAppSharedPreferences.java    |  79 ++++++++++++++
 .../TermuxTaskerAppSharedPreferences.java     |   2 +-
 .../TermuxWidgetAppSharedPreferences.java     |  79 ++++++++++++++
 14 files changed, 677 insertions(+), 7 deletions(-)
 create mode 100644 app/src/main/java/com/termux/app/fragments/settings/TermuxAPIPreferencesFragment.java
 create mode 100644 app/src/main/java/com/termux/app/fragments/settings/termux_api/DebuggingPreferencesFragment.java
 create mode 100644 app/src/main/res/xml/termux_api_debugging_preferences.xml
 create mode 100644 app/src/main/res/xml/termux_api_preferences.xml
 create mode 100644 termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxAPIAppSharedPreferences.java
 create mode 100644 termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxBootAppSharedPreferences.java
 create mode 100644 termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxFloatAppSharedPreferences.java
 create mode 100644 termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxStylingAppSharedPreferences.java
 create mode 100644 termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxWidgetAppSharedPreferences.java

diff --git a/app/src/main/java/com/termux/app/activities/SettingsActivity.java b/app/src/main/java/com/termux/app/activities/SettingsActivity.java
index b4f046b8a4..3997eacb9d 100644
--- a/app/src/main/java/com/termux/app/activities/SettingsActivity.java
+++ b/app/src/main/java/com/termux/app/activities/SettingsActivity.java
@@ -17,6 +17,7 @@
 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.TermuxTaskerAppSharedPreferences;
 import com.termux.shared.termux.AndroidUtils;
 import com.termux.shared.termux.TermuxConstants;
@@ -55,17 +56,27 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
 
             setPreferencesFromResource(R.xml.root_preferences, rootKey);
 
+            configureTermuxAPIPreference(context);
             configureTermuxTaskerPreference(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 configureTermuxTaskerPreference(@NonNull Context context) {
-            Preference termuxTaskerPrefernce = findPreference("termux_tasker");
-            if (termuxTaskerPrefernce != null) {
+            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
-                termuxTaskerPrefernce.setVisible(preferences != null);
+                termuxTaskerPreference.setVisible(preferences != null);
             }
         }
 
diff --git a/app/src/main/java/com/termux/app/fragments/settings/TermuxAPIPreferencesFragment.java b/app/src/main/java/com/termux/app/fragments/settings/TermuxAPIPreferencesFragment.java
new file mode 100644
index 0000000000..de8508e97d
--- /dev/null
+++ b/app/src/main/java/com/termux/app/fragments/settings/TermuxAPIPreferencesFragment.java
@@ -0,0 +1,49 @@
+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;
+    }
+
+}
diff --git a/app/src/main/java/com/termux/app/fragments/settings/termux_api/DebuggingPreferencesFragment.java b/app/src/main/java/com/termux/app/fragments/settings/termux_api/DebuggingPreferencesFragment.java
new file mode 100644
index 0000000000..0a4fee3f1b
--- /dev/null
+++ b/app/src/main/java/com/termux/app/fragments/settings/termux_api/DebuggingPreferencesFragment.java
@@ -0,0 +1,101 @@
+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());
+            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());
+            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));
+                }
+                break;
+            default:
+                break;
+        }
+    }
+
+}
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 353da4536f..2fb9e5a0f8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -183,11 +183,18 @@
 
 
 
+    <!-- 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 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>
 
 
+
     <!-- About Preference -->
     <string name="about_preference_title">About</string>
 
diff --git a/app/src/main/res/xml/root_preferences.xml b/app/src/main/res/xml/root_preferences.xml
index 39c6093ed0..b625198bfa 100644
--- a/app/src/main/res/xml/root_preferences.xml
+++ b/app/src/main/res/xml/root_preferences.xml
@@ -6,6 +6,13 @@
         app:summary="@string/termux_preferences_summary"
         app:fragment="com.termux.app.fragments.settings.TermuxPreferencesFragment"/>
 
+    <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_tasker"
         app:title="@string/termux_tasker_preferences_title"
diff --git a/app/src/main/res/xml/termux_api_debugging_preferences.xml b/app/src/main/res/xml/termux_api_debugging_preferences.xml
new file mode 100644
index 0000000000..8bfd8c7738
--- /dev/null
+++ b/app/src/main/res/xml/termux_api_debugging_preferences.xml
@@ -0,0 +1,15 @@
+<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>
diff --git a/app/src/main/res/xml/termux_api_preferences.xml b/app/src/main/res/xml/termux_api_preferences.xml
new file mode 100644
index 0000000000..285ec2cbdc
--- /dev/null
+++ b/app/src/main/res/xml/termux_api_preferences.xml
@@ -0,0 +1,8 @@
+<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>
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxAPIAppSharedPreferences.java b/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxAPIAppSharedPreferences.java
new file mode 100644
index 0000000000..7b720ac739
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxAPIAppSharedPreferences.java
@@ -0,0 +1,79 @@
+package com.termux.shared.settings.preferences;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.SharedPreferences;
+
+import androidx.annotation.NonNull;
+
+import com.termux.shared.logger.Logger;
+import com.termux.shared.packages.PackageUtils;
+import com.termux.shared.settings.preferences.TermuxPreferenceConstants.TERMUX_API_APP;
+import com.termux.shared.termux.TermuxConstants;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+public class TermuxAPIAppSharedPreferences {
+
+    private final Context mContext;
+    private final SharedPreferences mSharedPreferences;
+
+
+    private static final String LOG_TAG = "TermuxAPIAppSharedPreferences";
+
+    private TermuxAPIAppSharedPreferences(@Nonnull Context context) {
+        mContext = context;
+        mSharedPreferences = getPrivateSharedPreferences(mContext);
+    }
+
+    /**
+     * Get the {@link Context} for a package name.
+     *
+     * @param context The {@link Context} to use to get the {@link Context} of the
+     *                {@link TermuxConstants#TERMUX_API_PACKAGE_NAME}.
+     * @return Returns the {@link TermuxAPIAppSharedPreferences}. This will {@code null} if an exception is raised.
+     */
+    @Nullable
+    public static TermuxAPIAppSharedPreferences build(@NonNull final Context context) {
+        Context termuxTaskerPackageContext = PackageUtils.getContextForPackage(context, TermuxConstants.TERMUX_API_PACKAGE_NAME);
+        if (termuxTaskerPackageContext == null)
+            return null;
+        else
+            return new TermuxAPIAppSharedPreferences(termuxTaskerPackageContext);
+    }
+
+    /**
+     * Get the {@link Context} for a package name.
+     *
+     * @param context The {@link Activity} to use to get the {@link Context} of the
+     *                {@link TermuxConstants#TERMUX_API_PACKAGE_NAME}.
+     * @param exitAppOnError If {@code true} and failed to get package context, then a dialog will
+     *                       be shown which when dismissed will exit the app.
+     * @return Returns the {@link TermuxAPIAppSharedPreferences}. This will {@code null} if an exception is raised.
+     */
+    public static TermuxAPIAppSharedPreferences build(@NonNull final Context context, final boolean exitAppOnError) {
+        Context termuxTaskerPackageContext = PackageUtils.getContextForPackageOrExitApp(context, TermuxConstants.TERMUX_API_PACKAGE_NAME, exitAppOnError);
+        if (termuxTaskerPackageContext == null)
+            return null;
+        else
+            return new TermuxAPIAppSharedPreferences(termuxTaskerPackageContext);
+    }
+
+    private static SharedPreferences getPrivateSharedPreferences(Context context) {
+        if (context == null) return null;
+        return SharedPreferenceUtils.getPrivateSharedPreferences(context, TermuxConstants.TERMUX_API_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION);
+    }
+
+
+
+    public int getLogLevel() {
+        return SharedPreferenceUtils.getInt(mSharedPreferences, TERMUX_API_APP.KEY_LOG_LEVEL, Logger.DEFAULT_LOG_LEVEL);
+    }
+
+    public void setLogLevel(Context context, int logLevel) {
+        logLevel = Logger.setLogLevel(context, logLevel);
+        SharedPreferenceUtils.setInt(mSharedPreferences, TERMUX_API_APP.KEY_LOG_LEVEL, logLevel, false);
+    }
+
+}
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxBootAppSharedPreferences.java b/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxBootAppSharedPreferences.java
new file mode 100644
index 0000000000..762740c9f7
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxBootAppSharedPreferences.java
@@ -0,0 +1,79 @@
+package com.termux.shared.settings.preferences;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.SharedPreferences;
+
+import androidx.annotation.NonNull;
+
+import com.termux.shared.logger.Logger;
+import com.termux.shared.packages.PackageUtils;
+import com.termux.shared.settings.preferences.TermuxPreferenceConstants.TERMUX_BOOT_APP;
+import com.termux.shared.termux.TermuxConstants;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+public class TermuxBootAppSharedPreferences {
+
+    private final Context mContext;
+    private final SharedPreferences mSharedPreferences;
+
+
+    private static final String LOG_TAG = "TermuxBootAppSharedPreferences";
+
+    private TermuxBootAppSharedPreferences(@Nonnull Context context) {
+        mContext = context;
+        mSharedPreferences = getPrivateSharedPreferences(mContext);
+    }
+
+    /**
+     * Get the {@link Context} for a package name.
+     *
+     * @param context The {@link Context} to use to get the {@link Context} of the
+     *                {@link TermuxConstants#TERMUX_BOOT_PACKAGE_NAME}.
+     * @return Returns the {@link TermuxBootAppSharedPreferences}. This will {@code null} if an exception is raised.
+     */
+    @Nullable
+    public static TermuxBootAppSharedPreferences build(@NonNull final Context context) {
+        Context termuxTaskerPackageContext = PackageUtils.getContextForPackage(context, TermuxConstants.TERMUX_BOOT_PACKAGE_NAME);
+        if (termuxTaskerPackageContext == null)
+            return null;
+        else
+            return new TermuxBootAppSharedPreferences(termuxTaskerPackageContext);
+    }
+
+    /**
+     * Get the {@link Context} for a package name.
+     *
+     * @param context The {@link Activity} to use to get the {@link Context} of the
+     *                {@link TermuxConstants#TERMUX_BOOT_PACKAGE_NAME}.
+     * @param exitAppOnError If {@code true} and failed to get package context, then a dialog will
+     *                       be shown which when dismissed will exit the app.
+     * @return Returns the {@link TermuxBootAppSharedPreferences}. This will {@code null} if an exception is raised.
+     */
+    public static TermuxBootAppSharedPreferences build(@NonNull final Context context, final boolean exitAppOnError) {
+        Context termuxTaskerPackageContext = PackageUtils.getContextForPackageOrExitApp(context, TermuxConstants.TERMUX_BOOT_PACKAGE_NAME, exitAppOnError);
+        if (termuxTaskerPackageContext == null)
+            return null;
+        else
+            return new TermuxBootAppSharedPreferences(termuxTaskerPackageContext);
+    }
+
+    private static SharedPreferences getPrivateSharedPreferences(Context context) {
+        if (context == null) return null;
+        return SharedPreferenceUtils.getPrivateSharedPreferences(context, TermuxConstants.TERMUX_BOOT_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION);
+    }
+
+
+
+    public int getLogLevel() {
+        return SharedPreferenceUtils.getInt(mSharedPreferences, TERMUX_BOOT_APP.KEY_LOG_LEVEL, Logger.DEFAULT_LOG_LEVEL);
+    }
+
+    public void setLogLevel(Context context, int logLevel) {
+        logLevel = Logger.setLogLevel(context, logLevel);
+        SharedPreferenceUtils.setInt(mSharedPreferences, TERMUX_BOOT_APP.KEY_LOG_LEVEL, logLevel, false);
+    }
+
+}
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxFloatAppSharedPreferences.java b/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxFloatAppSharedPreferences.java
new file mode 100644
index 0000000000..93bed91df0
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxFloatAppSharedPreferences.java
@@ -0,0 +1,79 @@
+package com.termux.shared.settings.preferences;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.SharedPreferences;
+
+import androidx.annotation.NonNull;
+
+import com.termux.shared.logger.Logger;
+import com.termux.shared.packages.PackageUtils;
+import com.termux.shared.settings.preferences.TermuxPreferenceConstants.TERMUX_FLOAT_APP;
+import com.termux.shared.termux.TermuxConstants;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+public class TermuxFloatAppSharedPreferences {
+
+    private final Context mContext;
+    private final SharedPreferences mSharedPreferences;
+
+
+    private static final String LOG_TAG = "TermuxFloatAppSharedPreferences";
+
+    private TermuxFloatAppSharedPreferences(@Nonnull Context context) {
+        mContext = context;
+        mSharedPreferences = getPrivateSharedPreferences(mContext);
+    }
+
+    /**
+     * Get the {@link Context} for a package name.
+     *
+     * @param context The {@link Context} to use to get the {@link Context} of the
+     *                {@link TermuxConstants#TERMUX_FLOAT_PACKAGE_NAME}.
+     * @return Returns the {@link TermuxFloatAppSharedPreferences}. This will {@code null} if an exception is raised.
+     */
+    @Nullable
+    public static TermuxFloatAppSharedPreferences build(@NonNull final Context context) {
+        Context termuxTaskerPackageContext = PackageUtils.getContextForPackage(context, TermuxConstants.TERMUX_FLOAT_PACKAGE_NAME);
+        if (termuxTaskerPackageContext == null)
+            return null;
+        else
+            return new TermuxFloatAppSharedPreferences(termuxTaskerPackageContext);
+    }
+
+    /**
+     * Get the {@link Context} for a package name.
+     *
+     * @param context The {@link Activity} to use to get the {@link Context} of the
+     *                {@link TermuxConstants#TERMUX_FLOAT_PACKAGE_NAME}.
+     * @param exitAppOnError If {@code true} and failed to get package context, then a dialog will
+     *                       be shown which when dismissed will exit the app.
+     * @return Returns the {@link TermuxFloatAppSharedPreferences}. This will {@code null} if an exception is raised.
+     */
+    public static TermuxFloatAppSharedPreferences build(@NonNull final Context context, final boolean exitAppOnError) {
+        Context termuxTaskerPackageContext = PackageUtils.getContextForPackageOrExitApp(context, TermuxConstants.TERMUX_FLOAT_PACKAGE_NAME, exitAppOnError);
+        if (termuxTaskerPackageContext == null)
+            return null;
+        else
+            return new TermuxFloatAppSharedPreferences(termuxTaskerPackageContext);
+    }
+
+    private static SharedPreferences getPrivateSharedPreferences(Context context) {
+        if (context == null) return null;
+        return SharedPreferenceUtils.getPrivateSharedPreferences(context, TermuxConstants.TERMUX_FLOAT_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION);
+    }
+
+
+
+    public int getLogLevel() {
+        return SharedPreferenceUtils.getInt(mSharedPreferences, TERMUX_FLOAT_APP.KEY_LOG_LEVEL, Logger.DEFAULT_LOG_LEVEL);
+    }
+
+    public void setLogLevel(Context context, int logLevel) {
+        logLevel = Logger.setLogLevel(context, logLevel);
+        SharedPreferenceUtils.setInt(mSharedPreferences, TERMUX_FLOAT_APP.KEY_LOG_LEVEL, logLevel, false);
+    }
+
+}
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxPreferenceConstants.java b/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxPreferenceConstants.java
index 074aa60232..952eed4005 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxPreferenceConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxPreferenceConstants.java
@@ -1,7 +1,7 @@
 package com.termux.shared.settings.preferences;
 
 /*
- * Version: v0.11.0
+ * Version: v0.12.0
  *
  * Changelog
  *
@@ -48,6 +48,11 @@
  * - 0.11.0 (2021-07-08)
  *      - Added following to `TERMUX_APP`:
  *          `KEY_DISABLE_TERMINAL_MARGIN_ADJUSTMENT`.
+ *
+ * - 0.12.0 (2021-08-27)
+ *      - Added `TERMUX_API_APP.KEY_LOG_LEVEL`, `TERMUX_BOOT_APP.KEY_LOG_LEVEL`,
+ *          `TERMUX_FLOAT_APP.KEY_LOG_LEVEL`, `TERMUX_STYLING_APP.KEY_LOG_LEVEL`,
+ *          `TERMUX_Widget_APP.KEY_LOG_LEVEL`.
  */
 
 /**
@@ -115,7 +120,7 @@ public static final class TERMUX_APP {
 
 
         /**
-         * Defines the key for current termux log level.
+         * Defines the key for current log level.
          */
         public static final String KEY_LOG_LEVEL = "log_level";
 
@@ -147,13 +152,85 @@ public static final class TERMUX_APP {
 
     }
 
+
+
+    /**
+     * Termux API app constants.
+     */
+    public static final class TERMUX_API_APP {
+
+        /**
+         * Defines the key for current log level.
+         */
+        public static final String KEY_LOG_LEVEL = "log_level";
+
+    }
+
+
+
+    /**
+     * Termux Boot app constants.
+     */
+    public static final class TERMUX_BOOT_APP {
+
+        /**
+         * Defines the key for current log level.
+         */
+        public static final String KEY_LOG_LEVEL = "log_level";
+
+    }
+
+
+
+    /**
+     * Termux Float app constants.
+     */
+    public static final class TERMUX_FLOAT_APP {
+
+        /**
+         * Defines the key for current log level.
+         */
+        public static final String KEY_LOG_LEVEL = "log_level";
+
+    }
+
+
+
+    /**
+     * Termux Styling app constants.
+     */
+    public static final class TERMUX_STYLING_APP {
+
+        /**
+         * Defines the key for current log level.
+         */
+        public static final String KEY_LOG_LEVEL = "log_level";
+
+    }
+
+
+
     /**
      * Termux Tasker app constants.
      */
     public static final class TERMUX_TASKER_APP {
 
         /**
-         * Defines the key for current termux log level.
+         * Defines the key for current log level.
+         */
+        public static final String KEY_LOG_LEVEL = "log_level";
+
+    }
+
+
+
+    /**
+     * Termux Widget app constants.
+     */
+    public static final class TERMUX_WIDGET_APP {
+
+        /**
+         * Defines the key for current log level.
          */
         public static final String KEY_LOG_LEVEL = "log_level";
 
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxStylingAppSharedPreferences.java b/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxStylingAppSharedPreferences.java
new file mode 100644
index 0000000000..df7a975837
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxStylingAppSharedPreferences.java
@@ -0,0 +1,79 @@
+package com.termux.shared.settings.preferences;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.SharedPreferences;
+
+import androidx.annotation.NonNull;
+
+import com.termux.shared.logger.Logger;
+import com.termux.shared.packages.PackageUtils;
+import com.termux.shared.settings.preferences.TermuxPreferenceConstants.TERMUX_STYLING_APP;
+import com.termux.shared.termux.TermuxConstants;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+public class TermuxStylingAppSharedPreferences {
+
+    private final Context mContext;
+    private final SharedPreferences mSharedPreferences;
+
+
+    private static final String LOG_TAG = "TermuxStylingAppSharedPreferences";
+
+    private TermuxStylingAppSharedPreferences(@Nonnull Context context) {
+        mContext = context;
+        mSharedPreferences = getPrivateSharedPreferences(mContext);
+    }
+
+    /**
+     * Get the {@link Context} for a package name.
+     *
+     * @param context The {@link Context} to use to get the {@link Context} of the
+     *                {@link TermuxConstants#TERMUX_STYLING_PACKAGE_NAME}.
+     * @return Returns the {@link TermuxStylingAppSharedPreferences}. This will {@code null} if an exception is raised.
+     */
+    @Nullable
+    public static TermuxStylingAppSharedPreferences build(@NonNull final Context context) {
+        Context termuxTaskerPackageContext = PackageUtils.getContextForPackage(context, TermuxConstants.TERMUX_STYLING_PACKAGE_NAME);
+        if (termuxTaskerPackageContext == null)
+            return null;
+        else
+            return new TermuxStylingAppSharedPreferences(termuxTaskerPackageContext);
+    }
+
+    /**
+     * Get the {@link Context} for a package name.
+     *
+     * @param context The {@link Activity} to use to get the {@link Context} of the
+     *                {@link TermuxConstants#TERMUX_STYLING_PACKAGE_NAME}.
+     * @param exitAppOnError If {@code true} and failed to get package context, then a dialog will
+     *                       be shown which when dismissed will exit the app.
+     * @return Returns the {@link TermuxStylingAppSharedPreferences}. This will {@code null} if an exception is raised.
+     */
+    public static TermuxStylingAppSharedPreferences build(@NonNull final Context context, final boolean exitAppOnError) {
+        Context termuxTaskerPackageContext = PackageUtils.getContextForPackageOrExitApp(context, TermuxConstants.TERMUX_STYLING_PACKAGE_NAME, exitAppOnError);
+        if (termuxTaskerPackageContext == null)
+            return null;
+        else
+            return new TermuxStylingAppSharedPreferences(termuxTaskerPackageContext);
+    }
+
+    private static SharedPreferences getPrivateSharedPreferences(Context context) {
+        if (context == null) return null;
+        return SharedPreferenceUtils.getPrivateSharedPreferences(context, TermuxConstants.TERMUX_STYLING_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION);
+    }
+
+
+
+    public int getLogLevel() {
+        return SharedPreferenceUtils.getInt(mSharedPreferences, TERMUX_STYLING_APP.KEY_LOG_LEVEL, Logger.DEFAULT_LOG_LEVEL);
+    }
+
+    public void setLogLevel(Context context, int logLevel) {
+        logLevel = Logger.setLogLevel(context, logLevel);
+        SharedPreferenceUtils.setInt(mSharedPreferences, TERMUX_STYLING_APP.KEY_LOG_LEVEL, logLevel, false);
+    }
+
+}
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxTaskerAppSharedPreferences.java b/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxTaskerAppSharedPreferences.java
index 412c9b2299..b8a7b69c1d 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxTaskerAppSharedPreferences.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxTaskerAppSharedPreferences.java
@@ -52,7 +52,7 @@ public static TermuxTaskerAppSharedPreferences build(@NonNull final Context cont
      *                {@link TermuxConstants#TERMUX_TASKER_PACKAGE_NAME}.
      * @param exitAppOnError If {@code true} and failed to get package context, then a dialog will
      *                       be shown which when dismissed will exit the app.
-     * @return Returns the {@link TermuxAppSharedPreferences}. This will {@code null} if an exception is raised.
+     * @return Returns the {@link TermuxTaskerAppSharedPreferences}. This will {@code null} if an exception is raised.
      */
     public static  TermuxTaskerAppSharedPreferences build(@NonNull final Context context, final boolean exitAppOnError) {
         Context termuxTaskerPackageContext = PackageUtils.getContextForPackageOrExitApp(context, TermuxConstants.TERMUX_TASKER_PACKAGE_NAME, exitAppOnError);
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxWidgetAppSharedPreferences.java b/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxWidgetAppSharedPreferences.java
new file mode 100644
index 0000000000..44447d3f2e
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxWidgetAppSharedPreferences.java
@@ -0,0 +1,79 @@
+package com.termux.shared.settings.preferences;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.SharedPreferences;
+
+import androidx.annotation.NonNull;
+
+import com.termux.shared.logger.Logger;
+import com.termux.shared.packages.PackageUtils;
+import com.termux.shared.settings.preferences.TermuxPreferenceConstants.TERMUX_WIDGET_APP;
+import com.termux.shared.termux.TermuxConstants;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+public class TermuxWidgetAppSharedPreferences {
+
+    private final Context mContext;
+    private final SharedPreferences mSharedPreferences;
+
+
+    private static final String LOG_TAG = "TermuxWidgetAppSharedPreferences";
+
+    private TermuxWidgetAppSharedPreferences(@Nonnull Context context) {
+        mContext = context;
+        mSharedPreferences = getPrivateSharedPreferences(mContext);
+    }
+
+    /**
+     * Get the {@link Context} for a package name.
+     *
+     * @param context The {@link Context} to use to get the {@link Context} of the
+     *                {@link TermuxConstants#TERMUX_WIDGET_PACKAGE_NAME}.
+     * @return Returns the {@link TermuxWidgetAppSharedPreferences}. This will {@code null} if an exception is raised.
+     */
+    @Nullable
+    public static TermuxWidgetAppSharedPreferences build(@NonNull final Context context) {
+        Context termuxTaskerPackageContext = PackageUtils.getContextForPackage(context, TermuxConstants.TERMUX_WIDGET_PACKAGE_NAME);
+        if (termuxTaskerPackageContext == null)
+            return null;
+        else
+            return new TermuxWidgetAppSharedPreferences(termuxTaskerPackageContext);
+    }
+
+    /**
+     * Get the {@link Context} for a package name.
+     *
+     * @param context The {@link Activity} to use to get the {@link Context} of the
+     *                {@link TermuxConstants#TERMUX_WIDGET_PACKAGE_NAME}.
+     * @param exitAppOnError If {@code true} and failed to get package context, then a dialog will
+     *                       be shown which when dismissed will exit the app.
+     * @return Returns the {@link TermuxWidgetAppSharedPreferences}. This will {@code null} if an exception is raised.
+     */
+    public static TermuxWidgetAppSharedPreferences build(@NonNull final Context context, final boolean exitAppOnError) {
+        Context termuxTaskerPackageContext = PackageUtils.getContextForPackageOrExitApp(context, TermuxConstants.TERMUX_WIDGET_PACKAGE_NAME, exitAppOnError);
+        if (termuxTaskerPackageContext == null)
+            return null;
+        else
+            return new TermuxWidgetAppSharedPreferences(termuxTaskerPackageContext);
+    }
+
+    private static SharedPreferences getPrivateSharedPreferences(Context context) {
+        if (context == null) return null;
+        return SharedPreferenceUtils.getPrivateSharedPreferences(context, TermuxConstants.TERMUX_WIDGET_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION);
+    }
+
+
+
+    public int getLogLevel() {
+        return SharedPreferenceUtils.getInt(mSharedPreferences, TERMUX_WIDGET_APP.KEY_LOG_LEVEL, Logger.DEFAULT_LOG_LEVEL);
+    }
+
+    public void setLogLevel(Context context, int logLevel) {
+        logLevel = Logger.setLogLevel(context, logLevel);
+        SharedPreferenceUtils.setInt(mSharedPreferences, TERMUX_WIDGET_APP.KEY_LOG_LEVEL, logLevel, false);
+    }
+
+}

From 1cf1e612e50efa7027b50fb207cf15ce7e3c68ca Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 2 Sep 2021 06:16:28 +0500
Subject: [PATCH 531/912] Added: Add constants for termux-float in
 TermuxConstants

---
 .../termux/shared/termux/TermuxConstants.java | 47 ++++++++++++++++++-
 1 file changed, 45 insertions(+), 2 deletions(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
index 4d23037dc9..e1fc41b11f 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
@@ -12,7 +12,7 @@
 import java.util.List;
 
 /*
- * Version: v0.26.0
+ * Version: v0.27.0
  *
  * Changelog
  *
@@ -182,6 +182,11 @@
  * - 0.26.0 (2021-08-25)
  *      - Changed `TERMUX_ACTIVITY.ACTION_FAILSAFE_SESSION` to `TERMUX_ACTIVITY.EXTRA_FAILSAFE_SESSION`.
  *
+ * - 0.27.0 (2021-09-02)
+ *      - Added `TERMUX_FLOAT_APP_NOTIFICATION_CHANNEL_ID`, `TERMUX_FLOAT_APP_NOTIFICATION_CHANNEL_NAME`,
+ *          `TERMUX_FLOAT_APP.TERMUX_FLOAT_SERVICE_NAME`.
+ *      - Added following to `TERMUX_FLOAT_APP.TERMUX_FLOAT_SERVICE`:
+ *          `ACTION_STOP_SERVICE`, `ACTION_SHOW`, `ACTION_HIDE`.
  */
 
 /**
@@ -719,6 +724,14 @@ public final class TermuxConstants {
     public static final String TERMUX_CRASH_REPORTS_NOTIFICATION_CHANNEL_NAME = TermuxConstants.TERMUX_APP_NAME + " Crash Reports";
 
 
+    /** Termux app notification channel id used by {@link TERMUX_FLOAT_APP.TERMUX_FLOAT_SERVICE} */
+    public static final String TERMUX_FLOAT_APP_NOTIFICATION_CHANNEL_ID = "termux_float_notification_channel";
+    /** Termux app notification channel name used by {@link TERMUX_FLOAT_APP.TERMUX_FLOAT_SERVICE} */
+    public static final String TERMUX_FLOAT_APP_NOTIFICATION_CHANNEL_NAME = TermuxConstants.TERMUX_FLOAT_APP_NAME + " App";
+    /** Termux app unique notification id used by {@link TERMUX_APP.TERMUX_SERVICE} */
+    public static final int TERMUX_FLOAT_APP_NOTIFICATION_ID = 1339;
+
+
 
 
 
@@ -1061,7 +1074,37 @@ public static final class RESULT_SENDER {
 
 
     /**
-     * Termux:Styling app constants.
+     * Termux Float app constants.
+     */
+    public static final class TERMUX_FLOAT_APP {
+
+        /** Termux Float app core service name. */
+        public static final String TERMUX_FLOAT_SERVICE_NAME = TERMUX_FLOAT_PACKAGE_NAME + ".TermuxFloatService"; // Default: "com.termux.window.TermuxFloatService"
+
+        /**
+         * Termux Float app core service.
+         */
+        public static final class TERMUX_FLOAT_SERVICE {
+
+            /** Intent action to stop TERMUX_FLOAT_SERVICE */
+            public static final String ACTION_STOP_SERVICE = TERMUX_FLOAT_PACKAGE_NAME + ".stop_service"; // Default: "com.termux.window.stop_service"
+
+            /** Intent action to show float window */
+            public static final String ACTION_SHOW = TERMUX_FLOAT_PACKAGE_NAME + ".show"; // Default: "com.termux.window.show"
+
+            /** Intent action to hide float window */
+            public static final String ACTION_HIDE = TERMUX_FLOAT_PACKAGE_NAME + ".hide"; // Default: "com.termux.window.hide"
+
+        }
+
+    }
+
+
+
+
+
+    /**
+     * Termux Styling app constants.
      */
     public static final class TERMUX_STYLING {
 

From 36557b2166ff502d375b13d7e1ed9f73819c7d3f Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 2 Sep 2021 06:20:39 +0500
Subject: [PATCH 532/912] Added: Add more SharedPrefernces for termux-float and
 use multi-process for log level

---
 .../java/com/termux/app/TermuxService.java    |   2 +-
 .../TermuxAppSharedPreferences.java           |  22 +++-
 .../TermuxFloatAppSharedPreferences.java      | 115 ++++++++++++++++--
 .../TermuxPreferenceConstants.java            |  38 +++++-
 .../TermuxTaskerAppSharedPreferences.java     |   4 +-
 .../com/termux/shared/view/ViewUtils.java     |   4 +-
 6 files changed, 164 insertions(+), 21 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxService.java b/app/src/main/java/com/termux/app/TermuxService.java
index 5b47d3a132..4a153d2474 100644
--- a/app/src/main/java/com/termux/app/TermuxService.java
+++ b/app/src/main/java/com/termux/app/TermuxService.java
@@ -732,7 +732,7 @@ private Notification buildNotification() {
         // Build the notification
         Notification.Builder builder =  NotificationUtils.geNotificationBuilder(this,
             TermuxConstants.TERMUX_APP_NOTIFICATION_CHANNEL_ID, priority,
-            getText(R.string.application_name), notificationText, null,
+            TermuxConstants.TERMUX_APP_NAME, notificationText, null,
             contentIntent, null, NotificationUtils.NOTIFICATION_MODE_SILENT);
         if (builder == null)  return null;
 
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxAppSharedPreferences.java b/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxAppSharedPreferences.java
index 7bcf408a15..0fe12b3fa8 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxAppSharedPreferences.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxAppSharedPreferences.java
@@ -21,7 +21,6 @@ public class TermuxAppSharedPreferences {
     private final Context mContext;
     private final SharedPreferences mSharedPreferences;
 
-
     private int MIN_FONTSIZE;
     private int MAX_FONTSIZE;
     private int DEFAULT_FONTSIZE;
@@ -129,21 +128,33 @@ public void setKeepScreenOn(boolean value) {
 
 
 
-    private void setFontVariables(Context context) {
+    public static int[] getDefaultFontSizes(Context context) {
         float dipInPixels = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 1, context.getResources().getDisplayMetrics());
 
+        int[] sizes = new int[3];
+
         // This is a bit arbitrary and sub-optimal. We want to give a sensible default for minimum font size
         // to prevent invisible text due to zoom be mistake:
-        MIN_FONTSIZE = (int) (4f * dipInPixels);
+        sizes[1] = (int) (4f * dipInPixels); // min
 
         // http://www.google.com/design/spec/style/typography.html#typography-line-height
         int defaultFontSize = Math.round(12 * dipInPixels);
         // Make it divisible by 2 since that is the minimal adjustment step:
         if (defaultFontSize % 2 == 1) defaultFontSize--;
 
-        DEFAULT_FONTSIZE = defaultFontSize;
+        sizes[0] = defaultFontSize; // default
 
-        MAX_FONTSIZE = 256;
+        sizes[2] = 256; // max
+
+        return sizes;
+    }
+
+    public void setFontVariables(Context context) {
+        int[] sizes = getDefaultFontSizes(context);
+
+        DEFAULT_FONTSIZE = sizes[0];
+        MIN_FONTSIZE = sizes[1];
+        MAX_FONTSIZE = sizes[2];
     }
 
     public int getFontSize() {
@@ -156,7 +167,6 @@ public void setFontSize(int value) {
     }
 
     public void changeFontSize(boolean increase) {
-
         int fontSize = getFontSize();
 
         fontSize += (increase ? 1 : -1) * 2;
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxFloatAppSharedPreferences.java b/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxFloatAppSharedPreferences.java
index 93bed91df0..63104a3bd2 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxFloatAppSharedPreferences.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxFloatAppSharedPreferences.java
@@ -6,6 +6,7 @@
 
 import androidx.annotation.NonNull;
 
+import com.termux.shared.data.DataUtils;
 import com.termux.shared.logger.Logger;
 import com.termux.shared.packages.PackageUtils;
 import com.termux.shared.settings.preferences.TermuxPreferenceConstants.TERMUX_FLOAT_APP;
@@ -18,13 +19,20 @@ public class TermuxFloatAppSharedPreferences {
 
     private final Context mContext;
     private final SharedPreferences mSharedPreferences;
+    private final SharedPreferences mMultiProcessSharedPreferences;
 
+    private int MIN_FONTSIZE;
+    private int MAX_FONTSIZE;
+    private int DEFAULT_FONTSIZE;
 
     private static final String LOG_TAG = "TermuxFloatAppSharedPreferences";
 
     private TermuxFloatAppSharedPreferences(@Nonnull Context context) {
         mContext = context;
         mSharedPreferences = getPrivateSharedPreferences(mContext);
+        mMultiProcessSharedPreferences = getPrivateAndMultiProcessSharedPreferences(mContext);
+
+        setFontVariables(context);
     }
 
     /**
@@ -36,11 +44,11 @@ private TermuxFloatAppSharedPreferences(@Nonnull Context context) {
      */
     @Nullable
     public static TermuxFloatAppSharedPreferences build(@NonNull final Context context) {
-        Context termuxTaskerPackageContext = PackageUtils.getContextForPackage(context, TermuxConstants.TERMUX_FLOAT_PACKAGE_NAME);
-        if (termuxTaskerPackageContext == null)
+        Context termuxFloatPackageContext = PackageUtils.getContextForPackage(context, TermuxConstants.TERMUX_FLOAT_PACKAGE_NAME);
+        if (termuxFloatPackageContext == null)
             return null;
         else
-            return new TermuxFloatAppSharedPreferences(termuxTaskerPackageContext);
+            return new TermuxFloatAppSharedPreferences(termuxFloatPackageContext);
     }
 
     /**
@@ -53,11 +61,11 @@ public static TermuxFloatAppSharedPreferences build(@NonNull final Context conte
      * @return Returns the {@link TermuxFloatAppSharedPreferences}. This will {@code null} if an exception is raised.
      */
     public static TermuxFloatAppSharedPreferences build(@NonNull final Context context, final boolean exitAppOnError) {
-        Context termuxTaskerPackageContext = PackageUtils.getContextForPackageOrExitApp(context, TermuxConstants.TERMUX_FLOAT_PACKAGE_NAME, exitAppOnError);
-        if (termuxTaskerPackageContext == null)
+        Context termuxFloatPackageContext = PackageUtils.getContextForPackageOrExitApp(context, TermuxConstants.TERMUX_FLOAT_PACKAGE_NAME, exitAppOnError);
+        if (termuxFloatPackageContext == null)
             return null;
         else
-            return new TermuxFloatAppSharedPreferences(termuxTaskerPackageContext);
+            return new TermuxFloatAppSharedPreferences(termuxFloatPackageContext);
     }
 
     private static SharedPreferences getPrivateSharedPreferences(Context context) {
@@ -65,15 +73,102 @@ private static SharedPreferences getPrivateSharedPreferences(Context context) {
         return SharedPreferenceUtils.getPrivateSharedPreferences(context, TermuxConstants.TERMUX_FLOAT_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION);
     }
 
+    private static SharedPreferences getPrivateAndMultiProcessSharedPreferences(Context context) {
+        if (context == null) return null;
+        return SharedPreferenceUtils.getPrivateAndMultiProcessSharedPreferences(context, TermuxConstants.TERMUX_FLOAT_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION);
+    }
+
+
+
+    public int getWindowX() {
+        return SharedPreferenceUtils.getInt(mSharedPreferences, TERMUX_FLOAT_APP.KEY_WINDOW_X, 200);
+
+    }
+
+    public void setWindowX(int value) {
+        SharedPreferenceUtils.setInt(mSharedPreferences, TERMUX_FLOAT_APP.KEY_WINDOW_X, value, false);
+    }
+
+    public int getWindowY() {
+        return SharedPreferenceUtils.getInt(mSharedPreferences, TERMUX_FLOAT_APP.KEY_WINDOW_Y, 200);
+
+    }
+
+    public void setWindowY(int value) {
+        SharedPreferenceUtils.setInt(mSharedPreferences, TERMUX_FLOAT_APP.KEY_WINDOW_Y, value, false);
+    }
+
+
+
+    public int getWindowWidth() {
+        return SharedPreferenceUtils.getInt(mSharedPreferences, TERMUX_FLOAT_APP.KEY_WINDOW_WIDTH, 500);
+
+    }
+
+    public void setWindowWidth(int value) {
+        SharedPreferenceUtils.setInt(mSharedPreferences, TERMUX_FLOAT_APP.KEY_WINDOW_WIDTH, value, false);
+    }
+
+    public int getWindowHeight() {
+        return SharedPreferenceUtils.getInt(mSharedPreferences, TERMUX_FLOAT_APP.KEY_WINDOW_HEIGHT, 500);
 
+    }
 
-    public int getLogLevel() {
-        return SharedPreferenceUtils.getInt(mSharedPreferences, TERMUX_FLOAT_APP.KEY_LOG_LEVEL, Logger.DEFAULT_LOG_LEVEL);
+    public void setWindowHeight(int value) {
+        SharedPreferenceUtils.setInt(mSharedPreferences, TERMUX_FLOAT_APP.KEY_WINDOW_HEIGHT, value, false);
     }
 
-    public void setLogLevel(Context context, int logLevel) {
+
+
+    public void setFontVariables(Context context) {
+        int[] sizes = TermuxAppSharedPreferences.getDefaultFontSizes(context);
+
+        DEFAULT_FONTSIZE = sizes[0];
+        MIN_FONTSIZE = sizes[1];
+        MAX_FONTSIZE = sizes[2];
+    }
+
+    public int getFontSize() {
+        int fontSize = SharedPreferenceUtils.getIntStoredAsString(mSharedPreferences, TERMUX_FLOAT_APP.KEY_FONTSIZE, DEFAULT_FONTSIZE);
+        return DataUtils.clamp(fontSize, MIN_FONTSIZE, MAX_FONTSIZE);
+    }
+
+    public void setFontSize(int value) {
+        SharedPreferenceUtils.setIntStoredAsString(mSharedPreferences, TERMUX_FLOAT_APP.KEY_FONTSIZE, value, false);
+    }
+
+    public void changeFontSize(boolean increase) {
+        int fontSize = getFontSize();
+
+        fontSize += (increase ? 1 : -1) * 2;
+        fontSize = Math.max(MIN_FONTSIZE, Math.min(fontSize, MAX_FONTSIZE));
+
+        setFontSize(fontSize);
+    }
+
+
+    public int getLogLevel(boolean readFromFile) {
+        if (readFromFile)
+            return SharedPreferenceUtils.getInt(mMultiProcessSharedPreferences, TERMUX_FLOAT_APP.KEY_LOG_LEVEL, Logger.DEFAULT_LOG_LEVEL);
+        else
+            return SharedPreferenceUtils.getInt(mSharedPreferences, TERMUX_FLOAT_APP.KEY_LOG_LEVEL, Logger.DEFAULT_LOG_LEVEL);
+    }
+
+    public void setLogLevel(Context context, int logLevel, boolean commitToFile) {
         logLevel = Logger.setLogLevel(context, logLevel);
-        SharedPreferenceUtils.setInt(mSharedPreferences, TERMUX_FLOAT_APP.KEY_LOG_LEVEL, logLevel, false);
+        SharedPreferenceUtils.setInt(mSharedPreferences, TERMUX_FLOAT_APP.KEY_LOG_LEVEL, logLevel, commitToFile);
+    }
+
+
+    public boolean isTerminalViewKeyLoggingEnabled(boolean readFromFile) {
+        if (readFromFile)
+            return SharedPreferenceUtils.getBoolean(mMultiProcessSharedPreferences, TERMUX_FLOAT_APP.KEY_TERMINAL_VIEW_KEY_LOGGING_ENABLED, TERMUX_FLOAT_APP.DEFAULT_VALUE_TERMINAL_VIEW_KEY_LOGGING_ENABLED);
+        else
+            return SharedPreferenceUtils.getBoolean(mSharedPreferences, TERMUX_FLOAT_APP.KEY_TERMINAL_VIEW_KEY_LOGGING_ENABLED, TERMUX_FLOAT_APP.DEFAULT_VALUE_TERMINAL_VIEW_KEY_LOGGING_ENABLED);
+    }
+
+    public void setTerminalViewKeyLoggingEnabled(boolean value, boolean commitToFile) {
+        SharedPreferenceUtils.setBoolean(mSharedPreferences, TERMUX_FLOAT_APP.KEY_TERMINAL_VIEW_KEY_LOGGING_ENABLED, value, commitToFile);
     }
 
 }
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxPreferenceConstants.java b/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxPreferenceConstants.java
index 952eed4005..5cf2ff7a4c 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxPreferenceConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxPreferenceConstants.java
@@ -1,7 +1,7 @@
 package com.termux.shared.settings.preferences;
 
 /*
- * Version: v0.12.0
+ * Version: v0.13.0
  *
  * Changelog
  *
@@ -53,6 +53,11 @@
  *      - Added `TERMUX_API_APP.KEY_LOG_LEVEL`, `TERMUX_BOOT_APP.KEY_LOG_LEVEL`,
  *          `TERMUX_FLOAT_APP.KEY_LOG_LEVEL`, `TERMUX_STYLING_APP.KEY_LOG_LEVEL`,
  *          `TERMUX_Widget_APP.KEY_LOG_LEVEL`.
+ *
+ * - 0.13.0 (2021-09-02)
+ *      - Added following to `TERMUX_FLOAT_APP`:
+ *          `KEY_WINDOW_X`, `KEY_WINDOW_Y`, `KEY_WINDOW_WIDTH`, `KEY_WINDOW_HEIGHT`, `KEY_FONTSIZE`,
+ *          `KEY_TERMINAL_VIEW_KEY_LOGGING_ENABLED`.
  */
 
 /**
@@ -187,11 +192,42 @@ public static final class TERMUX_BOOT_APP {
      */
     public static final class TERMUX_FLOAT_APP {
 
+        /**
+         * The float window x coordinate.
+         */
+        public static final String KEY_WINDOW_X = "window_x";
+
+        /**
+         * The float window y coordinate.
+         */
+        public static final String KEY_WINDOW_Y = "window_y";
+
+        /**
+         * The float window width.
+         */
+        public static final String KEY_WINDOW_WIDTH = "window_width";
+
+        /**
+         * The float window height.
+         */
+        public static final String KEY_WINDOW_HEIGHT = "window_height";
+
+        /**
+         * Defines the key for font size of termux terminal view.
+         */
+        public static final String KEY_FONTSIZE = "fontsize";
+
         /**
          * Defines the key for current log level.
          */
         public static final String KEY_LOG_LEVEL = "log_level";
 
+        /**
+         * Defines the key for whether termux terminal view key logging is enabled or not
+         */
+        public static final String KEY_TERMINAL_VIEW_KEY_LOGGING_ENABLED = "terminal_view_key_logging_enabled";
+        public static final boolean DEFAULT_VALUE_TERMINAL_VIEW_KEY_LOGGING_ENABLED = false;
+
     }
 
 
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxTaskerAppSharedPreferences.java b/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxTaskerAppSharedPreferences.java
index b8a7b69c1d..02b77b5b8c 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxTaskerAppSharedPreferences.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxTaskerAppSharedPreferences.java
@@ -74,8 +74,8 @@ private static SharedPreferences getPrivateAndMultiProcessSharedPreferences(Cont
 
 
 
-    public int getLogLevel(boolean readFromFfile) {
-        if (readFromFfile)
+    public int getLogLevel(boolean readFromFile) {
+        if (readFromFile)
             return SharedPreferenceUtils.getInt(mMultiProcessSharedPreferences, TERMUX_TASKER_APP.KEY_LOG_LEVEL, Logger.DEFAULT_LOG_LEVEL);
         else
             return SharedPreferenceUtils.getInt(mSharedPreferences, TERMUX_TASKER_APP.KEY_LOG_LEVEL, Logger.DEFAULT_LOG_LEVEL);
diff --git a/termux-shared/src/main/java/com/termux/shared/view/ViewUtils.java b/termux-shared/src/main/java/com/termux/shared/view/ViewUtils.java
index 5c76b3869e..e0d87345c4 100644
--- a/termux-shared/src/main/java/com/termux/shared/view/ViewUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/view/ViewUtils.java
@@ -173,7 +173,9 @@ public static int getDisplayOrientation(@NonNull Context context) {
     /**
      * Get device display size.
      *
-     * @param context The {@link Context} to check with.
+     * @param context The {@link Context} to check with. It must be {@link Activity} context, otherwise
+     *                android will throw:
+     *                `java.lang.IllegalArgumentException: Used non-visual Context to obtain an instance of WindowManager. Please use an Activity or a ContextWrapper around one instead.`
      * @param activitySize The set to {@link true}, then size returned will be that of the activity
      *                     and can be smaller than physical display size in multi-window mode.
      * @return Returns the display size as {@link Point}.

From d55c1001c890c5e480a655f5856c370db7efee61 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 2 Sep 2021 06:21:16 +0500
Subject: [PATCH 533/912] Added: Add termux-float log level settings in termux
 app settings

---
 .../app/activities/SettingsActivity.java      |  11 ++
 .../TermuxFloatPreferencesFragment.java       |  49 +++++++
 .../DebuggingPreferencesFragment.java         | 126 ++++++++++++++++++
 app/src/main/res/values/strings.xml           |   6 +
 app/src/main/res/xml/root_preferences.xml     |   7 +
 .../termux_float_debugging_preferences.xml    |  21 +++
 .../main/res/xml/termux_float_preferences.xml |   8 ++
 7 files changed, 228 insertions(+)
 create mode 100644 app/src/main/java/com/termux/app/fragments/settings/TermuxFloatPreferencesFragment.java
 create mode 100644 app/src/main/java/com/termux/app/fragments/settings/termux_float/DebuggingPreferencesFragment.java
 create mode 100644 app/src/main/res/xml/termux_float_debugging_preferences.xml
 create mode 100644 app/src/main/res/xml/termux_float_preferences.xml

diff --git a/app/src/main/java/com/termux/app/activities/SettingsActivity.java b/app/src/main/java/com/termux/app/activities/SettingsActivity.java
index 3997eacb9d..2e8121eb04 100644
--- a/app/src/main/java/com/termux/app/activities/SettingsActivity.java
+++ b/app/src/main/java/com/termux/app/activities/SettingsActivity.java
@@ -18,6 +18,7 @@
 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.termux.AndroidUtils;
 import com.termux.shared.termux.TermuxConstants;
@@ -57,6 +58,7 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
             setPreferencesFromResource(R.xml.root_preferences, rootKey);
 
             configureTermuxAPIPreference(context);
+            configureTermuxFloatPreference(context);
             configureTermuxTaskerPreference(context);
             configureAboutPreference(context);
             configureDonatePreference(context);
@@ -71,6 +73,15 @@ private void configureTermuxAPIPreference(@NonNull Context context) {
             }
         }
 
+        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) {
diff --git a/app/src/main/java/com/termux/app/fragments/settings/TermuxFloatPreferencesFragment.java b/app/src/main/java/com/termux/app/fragments/settings/TermuxFloatPreferencesFragment.java
new file mode 100644
index 0000000000..ee0bacb43d
--- /dev/null
+++ b/app/src/main/java/com/termux/app/fragments/settings/TermuxFloatPreferencesFragment.java
@@ -0,0 +1,49 @@
+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;
+    }
+
+}
diff --git a/app/src/main/java/com/termux/app/fragments/settings/termux_float/DebuggingPreferencesFragment.java b/app/src/main/java/com/termux/app/fragments/settings/termux_float/DebuggingPreferencesFragment.java
new file mode 100644
index 0000000000..a52f78571e
--- /dev/null
+++ b/app/src/main/java/com/termux/app/fragments/settings/termux_float/DebuggingPreferencesFragment.java
@@ -0,0 +1,126 @@
+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;
+        }
+    }
+
+}
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2fb9e5a0f8..d60cd37435 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -189,6 +189,12 @@
 
 
 
+    <!-- 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>
diff --git a/app/src/main/res/xml/root_preferences.xml b/app/src/main/res/xml/root_preferences.xml
index b625198bfa..31b657a22d 100644
--- a/app/src/main/res/xml/root_preferences.xml
+++ b/app/src/main/res/xml/root_preferences.xml
@@ -13,6 +13,13 @@
         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"
diff --git a/app/src/main/res/xml/termux_float_debugging_preferences.xml b/app/src/main/res/xml/termux_float_debugging_preferences.xml
new file mode 100644
index 0000000000..8b4847c038
--- /dev/null
+++ b/app/src/main/res/xml/termux_float_debugging_preferences.xml
@@ -0,0 +1,21 @@
+<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>
diff --git a/app/src/main/res/xml/termux_float_preferences.xml b/app/src/main/res/xml/termux_float_preferences.xml
new file mode 100644
index 0000000000..9378ae1bbe
--- /dev/null
+++ b/app/src/main/res/xml/termux_float_preferences.xml
@@ -0,0 +1,8 @@
+<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>

From 9f1203f049c7ad7283a73b57a70e468e9699aeef Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 2 Sep 2021 06:40:02 +0500
Subject: [PATCH 534/912] Changed: Use multi-process SharedPrefernces for log
 level of plugin apps

Since termux-app runs in a separate process from other apps, if a user sets log level in termux settings, then it would require exiting the `termux-app` completely since android caches `SharedPrefernces` in memory and only writes to the file on app exit. Now updated value will be instantly written to the file so that plugins can directly read at startup. If plugins are already running, they would need to be restarted since usually log levels are loaded at startup.
---
 .../DebuggingPreferencesFragment.java          |  6 +++---
 .../TermuxAPIAppSharedPreferences.java         | 18 ++++++++++++++----
 .../TermuxBootAppSharedPreferences.java        | 18 ++++++++++++++----
 .../TermuxStylingAppSharedPreferences.java     | 18 ++++++++++++++----
 .../TermuxWidgetAppSharedPreferences.java      | 18 ++++++++++++++----
 5 files changed, 59 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/com/termux/app/fragments/settings/termux_api/DebuggingPreferencesFragment.java b/app/src/main/java/com/termux/app/fragments/settings/termux_api/DebuggingPreferencesFragment.java
index 0a4fee3f1b..6d09eae13e 100644
--- a/app/src/main/java/com/termux/app/fragments/settings/termux_api/DebuggingPreferencesFragment.java
+++ b/app/src/main/java/com/termux/app/fragments/settings/termux_api/DebuggingPreferencesFragment.java
@@ -41,7 +41,7 @@ private void configureLoggingPreferences(@NonNull Context context) {
             if (preferences == null) return;
 
             com.termux.app.fragments.settings.termux.DebuggingPreferencesFragment.
-                setLogLevelListPreferenceData(logLevelListPreference, context, preferences.getLogLevel());
+                setLogLevelListPreferenceData(logLevelListPreference, context, preferences.getLogLevel(true));
             loggingCategory.addPreference(logLevelListPreference);
         }
     }
@@ -76,7 +76,7 @@ public String getString(String key, @Nullable String defValue) {
 
         switch (key) {
             case "log_level":
-                return String.valueOf(mPreferences.getLogLevel());
+                return String.valueOf(mPreferences.getLogLevel(true));
             default:
                 return null;
         }
@@ -90,7 +90,7 @@ public void putString(String key, @Nullable String value) {
         switch (key) {
             case "log_level":
                 if (value != null) {
-                    mPreferences.setLogLevel(mContext, Integer.parseInt(value));
+                    mPreferences.setLogLevel(mContext, Integer.parseInt(value), true);
                 }
                 break;
             default:
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxAPIAppSharedPreferences.java b/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxAPIAppSharedPreferences.java
index 7b720ac739..1862cce262 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxAPIAppSharedPreferences.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxAPIAppSharedPreferences.java
@@ -18,6 +18,7 @@ public class TermuxAPIAppSharedPreferences {
 
     private final Context mContext;
     private final SharedPreferences mSharedPreferences;
+    private final SharedPreferences mMultiProcessSharedPreferences;
 
 
     private static final String LOG_TAG = "TermuxAPIAppSharedPreferences";
@@ -25,6 +26,7 @@ public class TermuxAPIAppSharedPreferences {
     private TermuxAPIAppSharedPreferences(@Nonnull Context context) {
         mContext = context;
         mSharedPreferences = getPrivateSharedPreferences(mContext);
+        mMultiProcessSharedPreferences = getPrivateAndMultiProcessSharedPreferences(mContext);
     }
 
     /**
@@ -65,15 +67,23 @@ private static SharedPreferences getPrivateSharedPreferences(Context context) {
         return SharedPreferenceUtils.getPrivateSharedPreferences(context, TermuxConstants.TERMUX_API_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION);
     }
 
+    private static SharedPreferences getPrivateAndMultiProcessSharedPreferences(Context context) {
+        if (context == null) return null;
+        return SharedPreferenceUtils.getPrivateAndMultiProcessSharedPreferences(context, TermuxConstants.TERMUX_API_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION);
+    }
 
 
-    public int getLogLevel() {
-        return SharedPreferenceUtils.getInt(mSharedPreferences, TERMUX_API_APP.KEY_LOG_LEVEL, Logger.DEFAULT_LOG_LEVEL);
+
+    public int getLogLevel(boolean readFromFile) {
+        if (readFromFile)
+            return SharedPreferenceUtils.getInt(mMultiProcessSharedPreferences, TERMUX_API_APP.KEY_LOG_LEVEL, Logger.DEFAULT_LOG_LEVEL);
+        else
+            return SharedPreferenceUtils.getInt(mSharedPreferences, TERMUX_API_APP.KEY_LOG_LEVEL, Logger.DEFAULT_LOG_LEVEL);
     }
 
-    public void setLogLevel(Context context, int logLevel) {
+    public void setLogLevel(Context context, int logLevel, boolean commitToFile) {
         logLevel = Logger.setLogLevel(context, logLevel);
-        SharedPreferenceUtils.setInt(mSharedPreferences, TERMUX_API_APP.KEY_LOG_LEVEL, logLevel, false);
+        SharedPreferenceUtils.setInt(mSharedPreferences, TERMUX_API_APP.KEY_LOG_LEVEL, logLevel, commitToFile);
     }
 
 }
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxBootAppSharedPreferences.java b/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxBootAppSharedPreferences.java
index 762740c9f7..8fa1837402 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxBootAppSharedPreferences.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxBootAppSharedPreferences.java
@@ -18,6 +18,7 @@ public class TermuxBootAppSharedPreferences {
 
     private final Context mContext;
     private final SharedPreferences mSharedPreferences;
+    private final SharedPreferences mMultiProcessSharedPreferences;
 
 
     private static final String LOG_TAG = "TermuxBootAppSharedPreferences";
@@ -25,6 +26,7 @@ public class TermuxBootAppSharedPreferences {
     private TermuxBootAppSharedPreferences(@Nonnull Context context) {
         mContext = context;
         mSharedPreferences = getPrivateSharedPreferences(mContext);
+        mMultiProcessSharedPreferences = getPrivateAndMultiProcessSharedPreferences(mContext);
     }
 
     /**
@@ -65,15 +67,23 @@ private static SharedPreferences getPrivateSharedPreferences(Context context) {
         return SharedPreferenceUtils.getPrivateSharedPreferences(context, TermuxConstants.TERMUX_BOOT_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION);
     }
 
+    private static SharedPreferences getPrivateAndMultiProcessSharedPreferences(Context context) {
+        if (context == null) return null;
+        return SharedPreferenceUtils.getPrivateAndMultiProcessSharedPreferences(context, TermuxConstants.TERMUX_BOOT_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION);
+    }
 
 
-    public int getLogLevel() {
-        return SharedPreferenceUtils.getInt(mSharedPreferences, TERMUX_BOOT_APP.KEY_LOG_LEVEL, Logger.DEFAULT_LOG_LEVEL);
+
+    public int getLogLevel(boolean readFromFile) {
+        if (readFromFile)
+            return SharedPreferenceUtils.getInt(mMultiProcessSharedPreferences, TERMUX_BOOT_APP.KEY_LOG_LEVEL, Logger.DEFAULT_LOG_LEVEL);
+        else
+            return SharedPreferenceUtils.getInt(mSharedPreferences, TERMUX_BOOT_APP.KEY_LOG_LEVEL, Logger.DEFAULT_LOG_LEVEL);
     }
 
-    public void setLogLevel(Context context, int logLevel) {
+    public void setLogLevel(Context context, int logLevel, boolean commitToFile) {
         logLevel = Logger.setLogLevel(context, logLevel);
-        SharedPreferenceUtils.setInt(mSharedPreferences, TERMUX_BOOT_APP.KEY_LOG_LEVEL, logLevel, false);
+        SharedPreferenceUtils.setInt(mSharedPreferences, TERMUX_BOOT_APP.KEY_LOG_LEVEL, logLevel, commitToFile);
     }
 
 }
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxStylingAppSharedPreferences.java b/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxStylingAppSharedPreferences.java
index df7a975837..f6aa24a9a1 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxStylingAppSharedPreferences.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxStylingAppSharedPreferences.java
@@ -18,6 +18,7 @@ public class TermuxStylingAppSharedPreferences {
 
     private final Context mContext;
     private final SharedPreferences mSharedPreferences;
+    private final SharedPreferences mMultiProcessSharedPreferences;
 
 
     private static final String LOG_TAG = "TermuxStylingAppSharedPreferences";
@@ -25,6 +26,7 @@ public class TermuxStylingAppSharedPreferences {
     private TermuxStylingAppSharedPreferences(@Nonnull Context context) {
         mContext = context;
         mSharedPreferences = getPrivateSharedPreferences(mContext);
+        mMultiProcessSharedPreferences = getPrivateAndMultiProcessSharedPreferences(mContext);
     }
 
     /**
@@ -65,15 +67,23 @@ private static SharedPreferences getPrivateSharedPreferences(Context context) {
         return SharedPreferenceUtils.getPrivateSharedPreferences(context, TermuxConstants.TERMUX_STYLING_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION);
     }
 
+    private static SharedPreferences getPrivateAndMultiProcessSharedPreferences(Context context) {
+        if (context == null) return null;
+        return SharedPreferenceUtils.getPrivateAndMultiProcessSharedPreferences(context, TermuxConstants.TERMUX_STYLING_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION);
+    }
 
 
-    public int getLogLevel() {
-        return SharedPreferenceUtils.getInt(mSharedPreferences, TERMUX_STYLING_APP.KEY_LOG_LEVEL, Logger.DEFAULT_LOG_LEVEL);
+
+    public int getLogLevel(boolean readFromFile) {
+        if (readFromFile)
+            return SharedPreferenceUtils.getInt(mMultiProcessSharedPreferences, TERMUX_STYLING_APP.KEY_LOG_LEVEL, Logger.DEFAULT_LOG_LEVEL);
+        else
+            return SharedPreferenceUtils.getInt(mSharedPreferences, TERMUX_STYLING_APP.KEY_LOG_LEVEL, Logger.DEFAULT_LOG_LEVEL);
     }
 
-    public void setLogLevel(Context context, int logLevel) {
+    public void setLogLevel(Context context, int logLevel, boolean commitToFile) {
         logLevel = Logger.setLogLevel(context, logLevel);
-        SharedPreferenceUtils.setInt(mSharedPreferences, TERMUX_STYLING_APP.KEY_LOG_LEVEL, logLevel, false);
+        SharedPreferenceUtils.setInt(mSharedPreferences, TERMUX_STYLING_APP.KEY_LOG_LEVEL, logLevel, commitToFile);
     }
 
 }
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxWidgetAppSharedPreferences.java b/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxWidgetAppSharedPreferences.java
index 44447d3f2e..5356e94c3d 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxWidgetAppSharedPreferences.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxWidgetAppSharedPreferences.java
@@ -18,6 +18,7 @@ public class TermuxWidgetAppSharedPreferences {
 
     private final Context mContext;
     private final SharedPreferences mSharedPreferences;
+    private final SharedPreferences mMultiProcessSharedPreferences;
 
 
     private static final String LOG_TAG = "TermuxWidgetAppSharedPreferences";
@@ -25,6 +26,7 @@ public class TermuxWidgetAppSharedPreferences {
     private TermuxWidgetAppSharedPreferences(@Nonnull Context context) {
         mContext = context;
         mSharedPreferences = getPrivateSharedPreferences(mContext);
+        mMultiProcessSharedPreferences = getPrivateAndMultiProcessSharedPreferences(mContext);
     }
 
     /**
@@ -65,15 +67,23 @@ private static SharedPreferences getPrivateSharedPreferences(Context context) {
         return SharedPreferenceUtils.getPrivateSharedPreferences(context, TermuxConstants.TERMUX_WIDGET_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION);
     }
 
+    private static SharedPreferences getPrivateAndMultiProcessSharedPreferences(Context context) {
+        if (context == null) return null;
+        return SharedPreferenceUtils.getPrivateAndMultiProcessSharedPreferences(context, TermuxConstants.TERMUX_WIDGET_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION);
+    }
 
 
-    public int getLogLevel() {
-        return SharedPreferenceUtils.getInt(mSharedPreferences, TERMUX_WIDGET_APP.KEY_LOG_LEVEL, Logger.DEFAULT_LOG_LEVEL);
+
+    public int getLogLevel(boolean readFromFile) {
+        if (readFromFile)
+            return SharedPreferenceUtils.getInt(mMultiProcessSharedPreferences, TERMUX_WIDGET_APP.KEY_LOG_LEVEL, Logger.DEFAULT_LOG_LEVEL);
+        else
+            return SharedPreferenceUtils.getInt(mSharedPreferences, TERMUX_WIDGET_APP.KEY_LOG_LEVEL, Logger.DEFAULT_LOG_LEVEL);
     }
 
-    public void setLogLevel(Context context, int logLevel) {
+    public void setLogLevel(Context context, int logLevel, boolean commitToFile) {
         logLevel = Logger.setLogLevel(context, logLevel);
-        SharedPreferenceUtils.setInt(mSharedPreferences, TERMUX_WIDGET_APP.KEY_LOG_LEVEL, logLevel, false);
+        SharedPreferenceUtils.setInt(mSharedPreferences, TERMUX_WIDGET_APP.KEY_LOG_LEVEL, logLevel, commitToFile);
     }
 
 }

From bc779d2ffbd4bf162f397daa0cf3c94a6e177ded Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 2 Sep 2021 12:45:28 +0500
Subject: [PATCH 535/912] Added: Add support for
 ~/.termux/termux.float.properties

---
 .../properties/TermuxAppSharedProperties.java |   7 ++--
 .../terminal/TermuxTerminalSessionClient.java |   2 +-
 .../terminal/TermuxTerminalViewClient.java    |   2 +-
 .../properties/TermuxPropertyConstants.java   |  30 +++++++++++++++---
 .../properties/TermuxSharedProperties.java    |  27 ++++++++++------
 .../shared}/terminal/io/BellHandler.java      |   2 +-
 .../termux/shared/termux/TermuxConstants.java |  16 +++++++++-
 .../src/main/res/raw/bell.ogg                 | Bin
 8 files changed, 66 insertions(+), 20 deletions(-)
 rename {app/src/main/java/com/termux/app => termux-shared/src/main/java/com/termux/shared}/terminal/io/BellHandler.java (98%)
 rename {app => termux-shared}/src/main/res/raw/bell.ogg (100%)

diff --git a/app/src/main/java/com/termux/app/settings/properties/TermuxAppSharedProperties.java b/app/src/main/java/com/termux/app/settings/properties/TermuxAppSharedProperties.java
index fabe683a3c..766c443555 100644
--- a/app/src/main/java/com/termux/app/settings/properties/TermuxAppSharedProperties.java
+++ b/app/src/main/java/com/termux/app/settings/properties/TermuxAppSharedProperties.java
@@ -9,6 +9,7 @@
 import com.termux.shared.logger.Logger;
 import com.termux.shared.settings.properties.TermuxPropertyConstants;
 import com.termux.shared.settings.properties.TermuxSharedProperties;
+import com.termux.shared.termux.TermuxConstants;
 
 import org.json.JSONException;
 
@@ -26,7 +27,8 @@ public class TermuxAppSharedProperties extends TermuxSharedProperties {
     private static final String LOG_TAG = "TermuxAppSharedProperties";
 
     public TermuxAppSharedProperties(@Nonnull Context context) {
-        super(context);
+        super(context, TermuxConstants.TERMUX_APP_NAME, TermuxPropertyConstants.getTermuxPropertiesFile(),
+            TermuxPropertyConstants.TERMUX_PROPERTIES_LIST, new SharedPropertiesParserClient());
     }
 
     /**
@@ -110,7 +112,8 @@ public ExtraKeysInfo getExtraKeysInfo() {
      * 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.KEY_TERMINAL_TRANSCRIPT_ROWS);
+        return  (int) TermuxSharedProperties.getInternalPropertyValue(context, TermuxPropertyConstants.getTermuxPropertiesFile(),
+            TermuxPropertyConstants.KEY_TERMINAL_TRANSCRIPT_ROWS, new SharedPropertiesParserClient());
     }
 
 }
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java
index f023dd7356..10288bc428 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java
@@ -20,7 +20,7 @@
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.app.TermuxService;
 import com.termux.shared.settings.properties.TermuxPropertyConstants;
-import com.termux.app.terminal.io.BellHandler;
+import com.termux.shared.terminal.io.BellHandler;
 import com.termux.shared.logger.Logger;
 import com.termux.terminal.TerminalColors;
 import com.termux.terminal.TerminalSession;
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
index 73561d2bfa..62c09ed11d 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
@@ -140,7 +140,7 @@ public void onReload() {
     }
 
     /**
-     * Should be called when {@link com.termux.view.TerminalView#mEmulator}
+     * Should be called when {@link com.termux.view.TerminalView#mEmulator} is set
      */
     @Override
     public void onEmulatorSet() {
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java b/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java
index 64f4c1b7c8..42d4832195 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java
@@ -1,5 +1,7 @@
 package com.termux.shared.settings.properties;
 
+import androidx.annotation.NonNull;
+
 import com.google.common.collect.ImmutableBiMap;
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.logger.Logger;
@@ -12,7 +14,7 @@
 import java.util.Set;
 
 /*
- * Version: v0.13.0
+ * Version: v0.14.0
  *
  * Changelog
  *
@@ -58,6 +60,9 @@
  *
  * - 0.13.0 (2021-08-25)
  *      - Add `*KEY_TERMINAL_MARGIN_HORIZONTAL*` and `*KEY_TERMINAL_MARGIN_VERTICAL*`.
+ *
+ * - 0.14.0 (2021-09-02)
+ *      - Add `getTermuxFloatPropertiesFile()`.
  */
 
 /**
@@ -390,11 +395,28 @@ public final class TermuxPropertyConstants {
      * @return Returns the {@link File} object for termux properties.
      */
     public static File getTermuxPropertiesFile() {
-        String[] possiblePropertiesFileLocations = {
+        return getPropertiesFile(new String[]{
             TermuxConstants.TERMUX_PROPERTIES_PRIMARY_FILE_PATH,
             TermuxConstants.TERMUX_PROPERTIES_SECONDARY_FILE_PATH
-        };
+        });
+    }
+
+    /** Returns the first {@link File} found at
+     * {@link TermuxConstants#TERMUX_FLOAT_PROPERTIES_PRIMARY_FILE_PATH} or
+     * {@link TermuxConstants#TERMUX_FLOAT_PROPERTIES_SECONDARY_FILE_PATH}
+     * from which termux properties can be loaded.
+     * If the {@link File} found is not a regular file or is not readable then null is returned.
+     *
+     * @return Returns the {@link File} object for termux properties.
+     */
+    public static File getTermuxFloatPropertiesFile() {
+        return getPropertiesFile(new String[]{
+            TermuxConstants.TERMUX_FLOAT_PROPERTIES_PRIMARY_FILE_PATH,
+            TermuxConstants.TERMUX_FLOAT_PROPERTIES_SECONDARY_FILE_PATH
+        });
+    }
 
+    public static File getPropertiesFile(@NonNull String[] possiblePropertiesFileLocations) {
         File propertiesFile = new File(possiblePropertiesFileLocations[0]);
         int i = 0;
         while (!propertiesFile.exists() && i < possiblePropertiesFileLocations.length) {
@@ -405,7 +427,7 @@ public static File getTermuxPropertiesFile() {
         if (propertiesFile.isFile() && propertiesFile.canRead()) {
             return propertiesFile;
         } else {
-            Logger.logDebug("No readable termux.properties file found");
+            Logger.logDebug("No readable properties file found at: " + Arrays.toString(possiblePropertiesFileLocations));
             return null;
         }
     }
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxSharedProperties.java b/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxSharedProperties.java
index 8c86d80775..83ce37c2f2 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxSharedProperties.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxSharedProperties.java
@@ -3,6 +3,8 @@
 import android.content.Context;
 import android.content.res.Configuration;
 
+import androidx.annotation.NonNull;
+
 import com.termux.shared.logger.Logger;
 import com.termux.shared.data.DataUtils;
 
@@ -10,21 +12,25 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
+import java.util.Set;
 
 import javax.annotation.Nonnull;
 
-public class TermuxSharedProperties {
+public abstract class TermuxSharedProperties {
 
     protected final Context mContext;
-    protected final SharedProperties mSharedProperties;
+    protected final String mLabel;
     protected final File mPropertiesFile;
+    protected final SharedProperties mSharedProperties;
 
     public static final String LOG_TAG = "TermuxSharedProperties";
 
-    public TermuxSharedProperties(@Nonnull Context context) {
+    public TermuxSharedProperties(@Nonnull Context context, @NonNull String label, File propertiesFile,
+                                  @NonNull Set<String> propertiesList, @NonNull SharedPropertiesParser sharedPropertiesParser) {
         mContext = context;
-        mPropertiesFile = TermuxPropertyConstants.getTermuxPropertiesFile();
-        mSharedProperties = new SharedProperties(context, mPropertiesFile, TermuxPropertyConstants.TERMUX_PROPERTIES_LIST, new SharedPropertiesParserClient());
+        mLabel = label;
+        mPropertiesFile = propertiesFile;
+        mSharedProperties = new SharedProperties(context, mPropertiesFile, propertiesList, sharedPropertiesParser);
         loadTermuxPropertiesFromDisk();
     }
 
@@ -162,7 +168,7 @@ public Object getInternalPropertyValue(String key, boolean cached) {
 
     /**
      * Get the internal {@link Object} value for the key passed from the file returned by
-     * {@link TermuxPropertyConstants#getTermuxPropertiesFile()}. The {@link Properties} object is
+     * {@code propertiesFile}. The {@link Properties} object is
      * read directly from the file and internal value is returned for the property value against the key.
      *
      * @param context The context for operations.
@@ -170,8 +176,9 @@ public Object getInternalPropertyValue(String key, boolean cached) {
      * @return Returns the {@link Object} object. This will be {@code null} if key is not found or
      * the object stored against the key is {@code null}.
      */
-    public static Object getInternalPropertyValue(Context context, String key) {
-        return SharedProperties.getInternalProperty(context, TermuxPropertyConstants.getTermuxPropertiesFile(), key, new SharedPropertiesParserClient());
+    public static Object getInternalPropertyValue(Context context, File propertiesFile, String key,
+                                                  @NonNull SharedPropertiesParser sharedPropertiesParser) {
+        return SharedProperties.getInternalProperty(context, propertiesFile, key, sharedPropertiesParser);
     }
 
     /**
@@ -588,7 +595,7 @@ public void dumpPropertiesToLog() {
         Properties properties = getProperties(true);
         StringBuilder propertiesDump = new StringBuilder();
 
-        propertiesDump.append("Termux Properties:");
+        propertiesDump.append(mLabel).append(" Termux Properties:");
         if (properties != null) {
             for (String key : properties.stringPropertyNames()) {
                 propertiesDump.append("\n").append(key).append(": `").append(properties.get(key)).append("`");
@@ -604,7 +611,7 @@ public void dumpInternalPropertiesToLog() {
         HashMap<String, Object> internalProperties = (HashMap<String, Object>) getInternalProperties();
         StringBuilder internalPropertiesDump = new StringBuilder();
 
-        internalPropertiesDump.append("Termux Internal Properties:");
+        internalPropertiesDump.append(mLabel).append(" Internal Properties:");
         if (internalProperties != null) {
             for (String key : internalProperties.keySet()) {
                 internalPropertiesDump.append("\n").append(key).append(": `").append(internalProperties.get(key)).append("`");
diff --git a/app/src/main/java/com/termux/app/terminal/io/BellHandler.java b/termux-shared/src/main/java/com/termux/shared/terminal/io/BellHandler.java
similarity index 98%
rename from app/src/main/java/com/termux/app/terminal/io/BellHandler.java
rename to termux-shared/src/main/java/com/termux/shared/terminal/io/BellHandler.java
index 76f592c7d4..fbaeaba5e2 100644
--- a/app/src/main/java/com/termux/app/terminal/io/BellHandler.java
+++ b/termux-shared/src/main/java/com/termux/shared/terminal/io/BellHandler.java
@@ -1,4 +1,4 @@
-package com.termux.app.terminal.io;
+package com.termux.shared.terminal.io;
 
 import android.content.Context;
 import android.os.Build;
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
index e1fc41b11f..c0a80593c3 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
@@ -12,7 +12,7 @@
 import java.util.List;
 
 /*
- * Version: v0.27.0
+ * Version: v0.28.0
  *
  * Changelog
  *
@@ -187,6 +187,9 @@
  *          `TERMUX_FLOAT_APP.TERMUX_FLOAT_SERVICE_NAME`.
  *      - Added following to `TERMUX_FLOAT_APP.TERMUX_FLOAT_SERVICE`:
  *          `ACTION_STOP_SERVICE`, `ACTION_SHOW`, `ACTION_HIDE`.
+ *
+ * - 0.28.0 (2021-09-02)
+ *      - Added `TERMUX_FLOAT_PROPERTIES_PRIMARY_FILE*` and `TERMUX_FLOAT_PROPERTIES_SECONDARY_FILE*`.
  */
 
 /**
@@ -640,6 +643,17 @@ public final class TermuxConstants {
     public static final File TERMUX_PROPERTIES_SECONDARY_FILE = new File(TERMUX_PROPERTIES_SECONDARY_FILE_PATH);
 
 
+    /** Termux Float app termux.properties primary file path */
+    public static final String TERMUX_FLOAT_PROPERTIES_PRIMARY_FILE_PATH = TERMUX_DATA_HOME_DIR_PATH + "/termux.float.properties"; // Default: "/data/data/com.termux/files/home/.termux/termux.float.properties"
+    /** Termux Float app termux.properties primary file */
+    public static final File TERMUX_FLOAT_PROPERTIES_PRIMARY_FILE = new File(TERMUX_FLOAT_PROPERTIES_PRIMARY_FILE_PATH);
+
+    /** Termux Float app termux.properties secondary file path */
+    public static final String TERMUX_FLOAT_PROPERTIES_SECONDARY_FILE_PATH = TERMUX_CONFIG_HOME_DIR_PATH + "/termux.float.properties"; // Default: "/data/data/com.termux/files/home/.config/termux/termux.float.properties"
+    /** Termux Float app termux.properties secondary file */
+    public static final File TERMUX_FLOAT_PROPERTIES_SECONDARY_FILE = new File(TERMUX_FLOAT_PROPERTIES_SECONDARY_FILE_PATH);
+
+
     /** Termux app and Termux:Styling colors.properties file path */
     public static final String TERMUX_COLOR_PROPERTIES_FILE_PATH = TERMUX_DATA_HOME_DIR_PATH + "/colors.properties"; // Default: "/data/data/com.termux/files/home/.termux/colors.properties"
     /** Termux app and Termux:Styling colors.properties file */
diff --git a/app/src/main/res/raw/bell.ogg b/termux-shared/src/main/res/raw/bell.ogg
similarity index 100%
rename from app/src/main/res/raw/bell.ogg
rename to termux-shared/src/main/res/raw/bell.ogg

From 197979fdcc695fa06f497baf648cd8e366357a32 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 4 Sep 2021 05:28:39 +0500
Subject: [PATCH 536/912] Fixed: Ensure custom log level doesn't log if its off
 or null

---
 termux-shared/src/main/java/com/termux/shared/logger/Logger.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/termux-shared/src/main/java/com/termux/shared/logger/Logger.java b/termux-shared/src/main/java/com/termux/shared/logger/Logger.java
index 176ba56fc6..53c433a03c 100644
--- a/termux-shared/src/main/java/com/termux/shared/logger/Logger.java
+++ b/termux-shared/src/main/java/com/termux/shared/logger/Logger.java
@@ -439,6 +439,7 @@ public static boolean isLogLevelValid(Integer logLevel) {
     /** Check if custom log level is valid and >= {@link #CURRENT_LOG_LEVEL}. If custom log level is
      * not valid then {@link #LOG_LEVEL_VERBOSE} must be >= {@link #CURRENT_LOG_LEVEL}. */
     public static boolean shouldEnableLoggingForCustomLogLevel(Integer customLogLevel) {
+        if (customLogLevel == null || CURRENT_LOG_LEVEL == LOG_LEVEL_OFF) return false;
         customLogLevel = Logger.isLogLevelValid(customLogLevel) ? customLogLevel: Logger.LOG_LEVEL_VERBOSE;
         return (customLogLevel >= CURRENT_LOG_LEVEL);
     }

From 52c1ee520f1f43bb9e7c7213a5f1894419022ce7 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 4 Sep 2021 05:31:01 +0500
Subject: [PATCH 537/912] Added/Fixed: Add support to consider empty String
 values as null for SharedPreferences

---
 .../settings/preferences/SharedPreferenceUtils.java      | 9 +++++++--
 .../settings/preferences/TermuxAppSharedPreferences.java | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/settings/preferences/SharedPreferenceUtils.java b/termux-shared/src/main/java/com/termux/shared/settings/preferences/SharedPreferenceUtils.java
index ca16624b41..8f7a420ae8 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/preferences/SharedPreferenceUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/preferences/SharedPreferenceUtils.java
@@ -245,17 +245,22 @@ public static void setLong(SharedPreferences sharedPreferences, String key, long
      * @param sharedPreferences The {@link SharedPreferences} to get the value from.
      * @param key The key for the value.
      * @param def The default value if failed to read a valid value.
+     * @param defIfEmpty If set to {@code true}, then {@code def} will be returned if value is empty.
      * @return Returns the {@code String} value stored in {@link SharedPreferences}, otherwise returns
      * default if failed to read a valid value, like in case of an exception.
      */
-    public static String getString(SharedPreferences sharedPreferences, String key, String def) {
+    public static String getString(SharedPreferences sharedPreferences, String key, String def, boolean defIfEmpty) {
         if (sharedPreferences == null) {
             Logger.logError(LOG_TAG, "Error getting String value for the \"" + key + "\" key from null shared preferences. Returning default value \"" + def + "\".");
             return def;
         }
 
         try {
-            return sharedPreferences.getString(key, def);
+            String value = sharedPreferences.getString(key, def);
+            if (defIfEmpty && (value == null || value.isEmpty()))
+                return def;
+            else
+                return value;
         }
         catch (ClassCastException e) {
             Logger.logStackTraceWithMessage(LOG_TAG, "Error getting String value for the \"" + key + "\" key from shared preferences. Returning default value \"" + def + "\".", e);
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxAppSharedPreferences.java b/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxAppSharedPreferences.java
index 0fe12b3fa8..d1bb032e1a 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxAppSharedPreferences.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxAppSharedPreferences.java
@@ -178,7 +178,7 @@ public void changeFontSize(boolean increase) {
 
 
     public String getCurrentSession() {
-        return SharedPreferenceUtils.getString(mSharedPreferences, TERMUX_APP.KEY_CURRENT_SESSION, null);
+        return SharedPreferenceUtils.getString(mSharedPreferences, TERMUX_APP.KEY_CURRENT_SESSION, null, true);
     }
 
     public void setCurrentSession(String value) {

From 3373a1f41c941c4328220cb4c704a9d2a8852401 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 4 Sep 2021 06:11:28 +0500
Subject: [PATCH 538/912] Changed: Split long resource string on multiple lines

---
 app/src/main/res/values/strings.xml           | 24 +++++++++++++------
 termux-shared/src/main/res/values/strings.xml | 20 +++++++++++++---
 2 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d60cd37435..5b27549dfe 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -31,7 +31,9 @@
     <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>
 
 
 
@@ -93,14 +95,17 @@
 
 
     <!-- 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>
+    <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 requires `allow-external-apps` property to be set to `true` in `&TERMUX_PROPERTIES_PRIMARY_PATH_SHORT;` file.</string>
+    <string name="error_run_command_service_allow_external_apps_ungranted">RunCommandService requires `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>
 
 
@@ -138,7 +143,8 @@
                 <!-- 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>
+                <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>
@@ -165,8 +171,10 @@
 
                 <!-- 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>
+                <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 -->
@@ -179,7 +187,9 @@
                 <!-- 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>
+                <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>
 
 
 
diff --git a/termux-shared/src/main/res/values/strings.xml b/termux-shared/src/main/res/values/strings.xml
index 39e876cfcc..65e3667c86 100644
--- a/termux-shared/src/main/res/values/strings.xml
+++ b/termux-shared/src/main/res/values/strings.xml
@@ -19,7 +19,9 @@
 
     <!-- PackageUtils -->
     <string name="error_get_package_context_failed_title">Failed To Get Package Context</string>
-    <string name="error_get_package_context_failed_message">Failed to get package context for the \"%1$s\" package. This may be because the app package is not installed or it has different APK signature from the current app. Check install instruction at %2$s for more details.</string>
+    <string name="error_get_package_context_failed_message">Failed to get package context for the \"%1$s\" package.
+        This may be because the app package is not installed or it has different APK signature from the current app.
+        Check install instruction at %2$s for more details.</string>
 
 
 
@@ -33,7 +35,8 @@
     <string name="action_share">Share</string>
     <string name="action_save_to_file">Save To File</string>
     <string name="title_report_text">Report Text</string>
-    <string name="msg_report_truncated">**Report Truncated**\n\nReport is too large to view here. Use `Save To File` option from options menu (3-dots on top right) and view it in an external text editor app.\n\n##\n\n</string>
+    <string name="msg_report_truncated">**Report Truncated**\n\nReport is too large to view here.
+        Use `Save To File` option from options menu (3-dots on top right) and view it in an external text editor app.\n\n##\n\n</string>
 
 
 
@@ -55,7 +58,18 @@
 
 
     <!-- TermuxUtils -->
-    <string name="msg_report_issue">If you want to report this issue, then copy its text from the options menu (3-dots on top right) and post an issue on one of the following links.\n\nIf you are posting a Termux app crash report, then please provide details on what you were doing that caused the crash and how to reproduce it, if possible.\n\nIf you are posting an issue on Github, then post it in the repository at which the report belongs at. Issues opened or emails sent with **(partial) screenshots** instead of copied text or a file of this report **will likely be automatically closed/deleted**. You may optionally remove any device specific info that you consider private or don\'t want to share or that is not relevant to the issue.\n\nWe do not provide support for any hacking related tools/scripts. Any questions asked about them over email, on github or other official termux community forums **will likely be automatically closed/deleted** and may even result in **temporary or permanent** ban. Check %1$s/wiki/Hacking for details.</string>
+    <string name="msg_report_issue">
+        If you want to report this issue, then copy its text from the options menu (3-dots on top right) and post
+        an issue on one of the following links.
+        \n\nIf you are posting a Termux app crash report, then please provide details on what you were doing that
+        caused the crash and how to reproduce it, if possible.
+        \n\nIf you are posting an issue on Github, then post it in the repository at which the report belongs at.
+        Issues opened or emails sent with **(partial) screenshots** instead of copied text or a file of this report
+        **will likely be automatically closed/deleted**. You may optionally remove any device specific info that
+        you consider private or don\'t want to share or that is not relevant to the issue.
+        \n\nWe do not provide support for any hacking related tools/scripts. Any questions asked about them over email,
+        on github or other official termux community forums **will likely be automatically closed/deleted** and may
+        even result in **temporary or permanent** ban. Check %1$s/wiki/Hacking for details.</string>
 
 
 

From 4e5f2c7e014d785c877d7876e160426f0d336a39 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 4 Sep 2021 08:06:25 +0500
Subject: [PATCH 539/912] Changed/Fixed: Ensure bootstrap installation creates
 prefix and prefix staging directory before extraction

We manually create the parent directories first so that bootstrap failures are detected early on instead of some sub directory during extraction.

Also fixed issue where `TermuxFileUtils.isTermuxFilesDirectoryAccessible()` would not check if a directory file actually existed at TERMUX_FILES_DIR_PATH and may set permissions for a non-directory file at the path. The `TermuxInstaller` was testing if `TERMUX_PREFIX_DIR_PATH` existed later on so check wasn't necessary but function may be called from elsewhere too.

Also removed legacy `PREFIX_FILE*` and `STAGING_PREFIX_FILE*` local constants and use the ones provided by `TermuxConstants` directly.
---
 .../java/com/termux/app/TermuxInstaller.java  | 67 +++++++++++--------
 .../termux/shared/file/TermuxFileUtils.java   | 52 +++++++++++++-
 2 files changed, 89 insertions(+), 30 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxInstaller.java b/app/src/main/java/com/termux/app/TermuxInstaller.java
index b8f6def583..763d167091 100644
--- a/app/src/main/java/com/termux/app/TermuxInstaller.java
+++ b/app/src/main/java/com/termux/app/TermuxInstaller.java
@@ -31,6 +31,11 @@
 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/>
@@ -67,7 +72,7 @@ static void setupBootstrapIfNeeded(final Activity activity, final Runnable whenD
         // 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(TermuxConstants.TERMUX_PREFIX_DIR_PATH, false));
+            bootstrapErrorMessage = activity.getString(R.string.bootstrap_error_not_primary_user_message, MarkdownUtils.getMarkdownCodeForString(TERMUX_PREFIX_DIR_PATH, false));
             Logger.logError(LOG_TAG, "isFilesDirectoryAccessible: " + isFilesDirectoryAccessible);
             Logger.logError(LOG_TAG, bootstrapErrorMessage);
             sendBootstrapCrashReportNotification(activity, bootstrapErrorMessage);
@@ -87,21 +92,18 @@ static void setupBootstrapIfNeeded(final Activity activity, final Runnable whenD
             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(PREFIX_FILE_PATH, true)) {
-            File[] PREFIX_FILE_LIST =  PREFIX_FILE.listFiles();
+        if (FileUtils.directoryFileExists(TERMUX_PREFIX_DIR_PATH, true)) {
+            File[] PREFIX_FILE_LIST =  TERMUX_PREFIX_DIR.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 prefix directory \"" + PREFIX_FILE_PATH + "\" exists but is empty or only contains the tmp directory.");
+                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(PREFIX_FILE_PATH, false)) {
-            Logger.logInfo(LOG_TAG, "The prefix directory \"" + PREFIX_FILE_PATH + "\" does not exist but another file exists at its destination.");
+        } 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.");
         }
 
         final ProgressDialog progress = ProgressDialog.show(activity, null, activity.getString(R.string.bootstrap_installer_body), true, false);
@@ -113,24 +115,35 @@ public void run() {
 
                     Error error;
 
-                    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("prefix staging directory", STAGING_PREFIX_PATH, true);
+                    error = FileUtils.deleteFile("termux prefix staging directory", TERMUX_STAGING_PREFIX_DIR_PATH, true);
                     if (error != null) {
-                        showBootstrapErrorDialog(activity, PREFIX_FILE_PATH, whenDone, Error.getErrorMarkdownString(error));
+                        showBootstrapErrorDialog(activity, whenDone, Error.getErrorMarkdownString(error));
                         return;
                     }
 
                     // Delete prefix directory or any file at its destination
-                    error = FileUtils.deleteFile("prefix directory", PREFIX_FILE_PATH, true);
+                    error = FileUtils.deleteFile("termux prefix directory", TERMUX_PREFIX_DIR_PATH, true);
+                    if (error != null) {
+                        showBootstrapErrorDialog(activity, whenDone, Error.getErrorMarkdownString(error));
+                        return;
+                    }
+
+                    // 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, PREFIX_FILE_PATH, whenDone, Error.getErrorMarkdownString(error));
+                        showBootstrapErrorDialog(activity, whenDone, Error.getErrorMarkdownString(error));
                         return;
                     }
 
-                    Logger.logInfo(LOG_TAG, "Extracting bootstrap zip to prefix staging directory \"" + STAGING_PREFIX_PATH + "\".");
+                    Logger.logInfo(LOG_TAG, "Extracting bootstrap zip to prefix staging directory \"" + TERMUX_STAGING_PREFIX_DIR_PATH + "\".");
 
                     final byte[] buffer = new byte[8096];
                     final List<Pair<String, String>> symlinks = new ArrayList<>(50);
@@ -147,23 +160,23 @@ public void run() {
                                     if (parts.length != 2)
                                         throw new RuntimeException("Malformed symlink line: " + line);
                                     String oldPath = parts[0];
-                                    String newPath = STAGING_PREFIX_PATH + "/" + parts[1];
+                                    String newPath = TERMUX_STAGING_PREFIX_DIR_PATH + "/" + parts[1];
                                     symlinks.add(Pair.create(oldPath, newPath));
 
                                     error = ensureDirectoryExists(new File(newPath).getParentFile());
                                     if (error != null) {
-                                        showBootstrapErrorDialog(activity, PREFIX_FILE_PATH, whenDone, Error.getErrorMarkdownString(error));
+                                        showBootstrapErrorDialog(activity, whenDone, Error.getErrorMarkdownString(error));
                                         return;
                                     }
                                 }
                             } else {
                                 String zipEntryName = zipEntry.getName();
-                                File targetFile = new File(STAGING_PREFIX_PATH, zipEntryName);
+                                File targetFile = new File(TERMUX_STAGING_PREFIX_DIR_PATH, zipEntryName);
                                 boolean isDirectory = zipEntry.isDirectory();
 
                                 error = ensureDirectoryExists(isDirectory ? targetFile : targetFile.getParentFile());
                                 if (error != null) {
-                                    showBootstrapErrorDialog(activity, PREFIX_FILE_PATH, whenDone, Error.getErrorMarkdownString(error));
+                                    showBootstrapErrorDialog(activity, whenDone, Error.getErrorMarkdownString(error));
                                     return;
                                 }
 
@@ -189,17 +202,17 @@ public void run() {
                         Os.symlink(symlink.first, symlink.second);
                     }
 
-                    Logger.logInfo(LOG_TAG, "Moving prefix staging to prefix directory.");
+                    Logger.logInfo(LOG_TAG, "Moving termux prefix staging to prefix directory.");
 
-                    if (!STAGING_PREFIX_FILE.renameTo(PREFIX_FILE)) {
-                        throw new RuntimeException("Moving prefix staging to prefix directory failed");
+                    if (!TERMUX_STAGING_PREFIX_DIR.renameTo(TERMUX_PREFIX_DIR)) {
+                        throw new RuntimeException("Moving termux prefix staging to prefix directory failed");
                     }
 
                     Logger.logInfo(LOG_TAG, "Bootstrap packages installed successfully.");
                     activity.runOnUiThread(whenDone);
 
                 } catch (final Exception e) {
-                    showBootstrapErrorDialog(activity, PREFIX_FILE_PATH, whenDone, Logger.getStackTracesMarkdownString(null, Logger.getStackTracesStringArray(e)));
+                    showBootstrapErrorDialog(activity, whenDone, Logger.getStackTracesMarkdownString(null, Logger.getStackTracesStringArray(e)));
 
                 } finally {
                     activity.runOnUiThread(() -> {
@@ -214,7 +227,7 @@ public void run() {
         }.start();
     }
 
-    public static void showBootstrapErrorDialog(Activity activity, String PREFIX_FILE_PATH, Runnable whenDone, String message) {
+    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
@@ -229,7 +242,7 @@ public static void showBootstrapErrorDialog(Activity activity, String PREFIX_FIL
                     })
                     .setPositiveButton(R.string.bootstrap_error_try_again, (dialog, which) -> {
                         dialog.dismiss();
-                        FileUtils.deleteFile("prefix directory", PREFIX_FILE_PATH, true);
+                        FileUtils.deleteFile("termux prefix directory", TERMUX_PREFIX_DIR_PATH, true);
                         TermuxInstaller.setupBootstrapIfNeeded(activity, whenDone);
                     }).show();
             } catch (WindowManager.BadTokenException e1) {
diff --git a/termux-shared/src/main/java/com/termux/shared/file/TermuxFileUtils.java b/termux-shared/src/main/java/com/termux/shared/file/TermuxFileUtils.java
index 67d5e4e8f4..61e60105e4 100644
--- a/termux-shared/src/main/java/com/termux/shared/file/TermuxFileUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/file/TermuxFileUtils.java
@@ -9,6 +9,7 @@
 import com.termux.shared.markdown.MarkdownUtils;
 import com.termux.shared.models.ExecutionCommand;
 import com.termux.shared.models.errors.Error;
+import com.termux.shared.models.errors.FileUtilsErrno;
 import com.termux.shared.shell.TermuxShellEnvironmentClient;
 import com.termux.shared.shell.TermuxTask;
 import com.termux.shared.termux.AndroidUtils;
@@ -134,7 +135,9 @@ public static Error validateDirectoryFileExistenceAndPermissions(String label, f
     }
 
     /**
-     * Validate the existence and permissions of {@link TermuxConstants#TERMUX_FILES_DIR_PATH}.
+     * Validate if {@link TermuxConstants#TERMUX_FILES_DIR_PATH} exists and has
+     * {@link FileUtils#APP_WORKING_DIRECTORY_PERMISSIONS} permissions.
+     *
      * This is required because binaries compiled for termux are hard coded with
      * {@link TermuxConstants#TERMUX_PREFIX_DIR_PATH} and the path must be accessible.
      *
@@ -216,14 +219,57 @@ public static Error isTermuxFilesDirectoryAccessible(@NonNull final Context cont
         if (createDirectoryIfMissing)
             context.getFilesDir();
 
+        if (!FileUtils.directoryFileExists(TermuxConstants.TERMUX_FILES_DIR_PATH, true))
+            return FileUtilsErrno.ERRNO_FILE_NOT_FOUND_AT_PATH.getError("termux files directory", TermuxConstants.TERMUX_FILES_DIR_PATH);
+
         if (setMissingPermissions)
-            FileUtils.setMissingFilePermissions("Termux files directory", TermuxConstants.TERMUX_FILES_DIR_PATH,
+            FileUtils.setMissingFilePermissions("termux files directory", TermuxConstants.TERMUX_FILES_DIR_PATH,
                 FileUtils.APP_WORKING_DIRECTORY_PERMISSIONS);
 
-        return FileUtils.checkMissingFilePermissions("Termux files directory", TermuxConstants.TERMUX_FILES_DIR_PATH,
+        return FileUtils.checkMissingFilePermissions("termux files directory", TermuxConstants.TERMUX_FILES_DIR_PATH,
             FileUtils.APP_WORKING_DIRECTORY_PERMISSIONS, false);
     }
 
+    /**
+     * Validate if {@link TermuxConstants#TERMUX_PREFIX_DIR_PATH} exists and has
+     * {@link FileUtils#APP_WORKING_DIRECTORY_PERMISSIONS} permissions.
+     * .
+     *
+     * The {@link TermuxConstants#TERMUX_PREFIX_DIR_PATH} directory would not exist if termux has
+     * not been installed or the bootstrap setup has not been run or if it was deleted by the user.
+     *
+     * @param createDirectoryIfMissing The {@code boolean} that decides if directory file
+     *                                 should be created if its missing.
+     * @param setMissingPermissions The {@code boolean} that decides if permissions are to be
+     *                              automatically set.
+     * @return Returns the {@code error} if path is not a directory file, failed to create it,
+     * or validating permissions failed, otherwise {@code null}.
+     */
+    public static Error isTermuxPrefixDirectoryAccessible(boolean createDirectoryIfMissing, boolean setMissingPermissions) {
+           return FileUtils.validateDirectoryFileExistenceAndPermissions("termux prefix directory", TermuxConstants.TERMUX_PREFIX_DIR_PATH,
+                null, createDirectoryIfMissing,
+                FileUtils.APP_WORKING_DIRECTORY_PERMISSIONS, setMissingPermissions, true,
+                false, false);
+    }
+
+    /**
+     * Validate if {@link TermuxConstants#TERMUX_STAGING_PREFIX_DIR_PATH} exists and has
+     * {@link FileUtils#APP_WORKING_DIRECTORY_PERMISSIONS} permissions.
+     *
+     * @param createDirectoryIfMissing The {@code boolean} that decides if directory file
+     *                                 should be created if its missing.
+     * @param setMissingPermissions The {@code boolean} that decides if permissions are to be
+     *                              automatically set.
+     * @return Returns the {@code error} if path is not a directory file, failed to create it,
+     * or validating permissions failed, otherwise {@code null}.
+     */
+    public static Error isTermuxPrefixStagingDirectoryAccessible(boolean createDirectoryIfMissing, boolean setMissingPermissions) {
+        return FileUtils.validateDirectoryFileExistenceAndPermissions("termux prefix staging directory", TermuxConstants.TERMUX_STAGING_PREFIX_DIR_PATH,
+            null, createDirectoryIfMissing,
+            FileUtils.APP_WORKING_DIRECTORY_PERMISSIONS, setMissingPermissions, true,
+            false, false);
+    }
+
     /**
      * Get a markdown {@link String} for stat output for various Termux app files paths.
      *

From e5c05489429849d67f3fe6e4a37ef3d09eeb4e49 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 4 Sep 2021 08:06:54 +0500
Subject: [PATCH 540/912] Added: Add isTermuxAppInstalled() and
 isTermuxAppAccessible() functions to TermuxUtils

The `TermuxUtils.isTermuxAppInstalled()` function can be used by external apps to check if termux app is installed and enabled.

The `TermuxUtils.isTermuxAppAccessible()` function can be used by termux plugin apps to check if termux app is installed, enabled, accessible as per `sharedUserId` and `TERMUX_PREFIX_DIR_PATH` is accessible and has read, write and execute permission.
---
 .../com/termux/shared/termux/TermuxUtils.java | 87 +++++++++++++++++++
 termux-shared/src/main/res/values/strings.xml | 10 +++
 2 files changed, 97 insertions(+)

diff --git a/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
index 62fa7864f7..df45a5e9a7 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
@@ -3,11 +3,14 @@
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 
 import androidx.annotation.NonNull;
 
 import com.termux.shared.R;
+import com.termux.shared.file.FileUtils;
 import com.termux.shared.file.TermuxFileUtils;
 import com.termux.shared.logger.Logger;
 import com.termux.shared.markdown.MarkdownUtils;
@@ -101,6 +104,90 @@ public static Context getTermuxWidgetPackageContext(@NonNull Context context) {
 
 
 
+    /**
+     * Check if Termux app is installed and enabled. This can be used by external apps that don't
+     * share `sharedUserId` with the Termux app.
+     *
+     * If your third-party app is targeting sdk `30` (android `11`), then it needs to add `com.termux`
+     * package to the `queries` element or request `QUERY_ALL_PACKAGES` permission in its
+     * `AndroidManifest.xml`. Otherwise it will get `PackageSetting{...... com.termux/......} BLOCKED`
+     * errors in `logcat` and `RUN_COMMAND` won't work.
+     * Check [package-visibility](https://developer.android.com/training/basics/intents/package-visibility#package-name),
+     * `QUERY_ALL_PACKAGES` [googleplay policy](https://support.google.com/googleplay/android-developer/answer/10158779
+     * and this [article](https://medium.com/androiddevelopers/working-with-package-visibility-dc252829de2d) for more info.
+     *
+     * {@code
+     * <manifest
+     *     <queries>
+     *         <package android:name="com.termux" />
+     *    </queries>
+     * </manifest>
+     * }
+     *
+     * @param currentPackageContext The context of current package.
+     * @return Returns {@code errmsg} if termux package is not installed or disabled, otherwise {@code null}.
+     */
+    public static String isTermuxAppInstalled(@NonNull final Context currentPackageContext) {
+        String errmsg = null;
+
+        PackageManager packageManager = currentPackageContext.getPackageManager();
+
+        ApplicationInfo applicationInfo;
+        try {
+            applicationInfo = packageManager.getApplicationInfo(TermuxConstants.TERMUX_PACKAGE_NAME, 0);
+        } catch (final PackageManager.NameNotFoundException e) {
+            applicationInfo = null;
+        }
+        boolean termuxAppEnabled = (applicationInfo != null && applicationInfo.enabled);
+
+        // If Termux app is not installed or is disabled
+        if (!termuxAppEnabled)
+            errmsg = currentPackageContext.getString(R.string.error_termux_app_not_installed_or_disabled_warning);
+
+        return errmsg;
+    }
+
+    /**
+     * Check if Termux app is installed and accessible. This can only be used by apps that share
+     * `sharedUserId` with the Termux app.
+     *
+     * This is done by checking if first checking if app is installed and enabled and then if
+     * {@code currentPackageContext} can be used to get the {@link Context} of the app with
+     * {@link TermuxConstants#TERMUX_PACKAGE_NAME} and then if
+     * {@link TermuxConstants#TERMUX_PREFIX_DIR_PATH} exists and has
+     * {@link FileUtils#APP_WORKING_DIRECTORY_PERMISSIONS} permissions. The directory will not
+     * be automatically created and neither the missing permissions automatically set.
+     *
+     * @param currentPackageContext The context of current package.
+     * @return Returns {@code errmsg} if failed to get termux package {@link Context} or
+     *         {@link TermuxConstants#TERMUX_PREFIX_DIR_PATH} is accessible, otherwise {@code null}.
+     */
+    public static String isTermuxAppAccessible(@NonNull final Context currentPackageContext) {
+        String errmsg = isTermuxAppInstalled(currentPackageContext);
+        if (errmsg == null) {
+            Context termuxPackageContext = TermuxUtils.getTermuxPackageContext(currentPackageContext);
+            // If failed to get Termux app package context
+            if (termuxPackageContext == null)
+                errmsg = currentPackageContext.getString(R.string.error_termux_app_package_context_not_accessible);
+
+            if (errmsg == null) {
+                // If TermuxConstants.TERMUX_PREFIX_DIR_PATH is not a directory or does not have required permissions
+                Error error = TermuxFileUtils.isTermuxPrefixDirectoryAccessible(false, false);
+                if (error != null)
+                    errmsg = currentPackageContext.getString(R.string.error_termux_prefix_dir_path_not_accessible,
+                        PackageUtils.getAppNameForPackage(currentPackageContext));
+            }
+        }
+
+        if (errmsg != null)
+            return errmsg + " " + currentPackageContext.getString(R.string.msg_termux_app_required_by_app,
+                PackageUtils.getAppNameForPackage(currentPackageContext));
+        else
+            return null;
+    }
+
+
+
     /**
      * Send the {@link TermuxConstants#BROADCAST_TERMUX_OPENED} broadcast to notify apps that Termux
      * app has been opened.
diff --git a/termux-shared/src/main/res/values/strings.xml b/termux-shared/src/main/res/values/strings.xml
index 65e3667c86..c79d04c19a 100644
--- a/termux-shared/src/main/res/values/strings.xml
+++ b/termux-shared/src/main/res/values/strings.xml
@@ -9,6 +9,7 @@
     <!ENTITY TERMUX_STYLING_APP_NAME "Termux:Styling">
     <!ENTITY TERMUX_TASKER_APP_NAME "Termux:Tasker">
     <!ENTITY TERMUX_WIDGET_APP_NAME "Termux:Widget">
+    <!ENTITY TERMUX_PREFIX_DIR_PATH "/data/data/com.termux/files/usr">
     ]>
 
 <resources>
@@ -71,6 +72,15 @@
         on github or other official termux community forums **will likely be automatically closed/deleted** and may
         even result in **temporary or permanent** ban. Check %1$s/wiki/Hacking for details.</string>
 
+    <string name="msg_termux_app_required_by_app">The &TERMUX_APP_NAME; is required by the %1$s app to run termux commands."</string>
+    <string name="error_termux_app_not_installed_or_disabled_warning">The &TERMUX_APP_NAME; app is not installed or is disabled."</string>
+    <string name="error_termux_app_package_context_not_accessible">The &TERMUX_APP_NAME; app (package context) is not accessible."</string>
+    <string name="error_termux_prefix_dir_path_not_accessible">The &TERMUX_APP_NAME; app $PREFIX directory is not accessible by the %1$s app.
+        This may be because you have not installed or setup &TERMUX_APP_NAME; app or
+        &TERMUX_APP_NAME; app and %1$s app both have different APK signatures because you have managed to install both apps from different sources.
+        It may also be because &TERMUX_APP_NAME; $PREFIX directory \"&TERMUX_PREFIX_DIR_PATH;\" does not exist or does not have read,
+        write and execute permissions."</string>
+
 
 
     <!-- Miscellaneous -->

From d5ffb116b83d625cad9047397117a642554c74b2 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 4 Sep 2021 08:08:51 +0500
Subject: [PATCH 541/912] Added: Add constants and functions for termux-widget
 in TermuxConstants and TermuxPreferenceConstants

---
 .../TermuxPreferenceConstants.java            | 10 ++-
 .../TermuxWidgetAppSharedPreferences.java     | 19 +++++
 .../termux/shared/termux/TermuxConstants.java | 73 ++++++++++++++++---
 3 files changed, 92 insertions(+), 10 deletions(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxPreferenceConstants.java b/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxPreferenceConstants.java
index 5cf2ff7a4c..492ff61959 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxPreferenceConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxPreferenceConstants.java
@@ -1,7 +1,7 @@
 package com.termux.shared.settings.preferences;
 
 /*
- * Version: v0.13.0
+ * Version: v0.14.0
  *
  * Changelog
  *
@@ -58,6 +58,9 @@
  *      - Added following to `TERMUX_FLOAT_APP`:
  *          `KEY_WINDOW_X`, `KEY_WINDOW_Y`, `KEY_WINDOW_WIDTH`, `KEY_WINDOW_HEIGHT`, `KEY_FONTSIZE`,
  *          `KEY_TERMINAL_VIEW_KEY_LOGGING_ENABLED`.
+ *
+ * - 0.14.0 (2021-09-04)
+ *      - Added `TERMUX_WIDGET_APP.KEY_TOKEN`.
  */
 
 /**
@@ -270,6 +273,11 @@ public static final class TERMUX_WIDGET_APP {
          */
         public static final String KEY_LOG_LEVEL = "log_level";
 
+        /**
+         * Defines the key for current token for shortcuts.
+         */
+        public static final String KEY_TOKEN = "token";
+
     }
 
 }
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxWidgetAppSharedPreferences.java b/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxWidgetAppSharedPreferences.java
index 5356e94c3d..717ed135d6 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxWidgetAppSharedPreferences.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxWidgetAppSharedPreferences.java
@@ -11,6 +11,8 @@
 import com.termux.shared.settings.preferences.TermuxPreferenceConstants.TERMUX_WIDGET_APP;
 import com.termux.shared.termux.TermuxConstants;
 
+import java.util.UUID;
+
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
@@ -74,6 +76,23 @@ private static SharedPreferences getPrivateAndMultiProcessSharedPreferences(Cont
 
 
 
+    public static String getGeneratedToken(@NonNull Context context) {
+        TermuxWidgetAppSharedPreferences preferences = TermuxWidgetAppSharedPreferences.build(context, true);
+        if (preferences == null) return null;
+        return preferences.getGeneratedToken();
+    }
+
+    public String getGeneratedToken() {
+        String token =  SharedPreferenceUtils.getString(mSharedPreferences, TERMUX_WIDGET_APP.KEY_TOKEN, null, true);
+        if (token == null) {
+            token = UUID.randomUUID().toString();
+            SharedPreferenceUtils.setString(mSharedPreferences, TERMUX_WIDGET_APP.KEY_TOKEN, token, false);
+        }
+        return token;
+    }
+
+
+
     public int getLogLevel(boolean readFromFile) {
         if (readFromFile)
             return SharedPreferenceUtils.getInt(mMultiProcessSharedPreferences, TERMUX_WIDGET_APP.KEY_LOG_LEVEL, Logger.DEFAULT_LOG_LEVEL);
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
index c0a80593c3..ca7a73a6cb 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
@@ -12,7 +12,7 @@
 import java.util.List;
 
 /*
- * Version: v0.28.0
+ * Version: v0.29.0
  *
  * Changelog
  *
@@ -190,6 +190,14 @@
  *
  * - 0.28.0 (2021-09-02)
  *      - Added `TERMUX_FLOAT_PROPERTIES_PRIMARY_FILE*` and `TERMUX_FLOAT_PROPERTIES_SECONDARY_FILE*`.
+ *
+ * - 0.29.0 (2021-09-04)
+ *      - Added `TERMUX_SHORTCUT_TASKS_SCRIPTS_DIR_BASENAME`, `TERMUX_SHORTCUT_SCRIPT_ICONS_DIR_BASENAME`,
+ *          `TERMUX_SHORTCUT_SCRIPT_ICONS_DIR_PATH`, `TERMUX_SHORTCUT_SCRIPT_ICONS_DIR`.
+ *      - Added following to `TERMUX_WIDGET.TERMUX_WIDGET_PROVIDER`:
+ *          `ACTION_WIDGET_ITEM_CLICKED`, `ACTION_REFRESH_WIDGET`, `EXTRA_FILE_CLICKED`.
+ *      - Changed naming convention of `TERMUX_FLOAT_APP.TERMUX_FLOAT_SERVICE.ACTION_*`.
+ *      - Fixed wrong path set for `TERMUX_SHORTCUT_SCRIPTS_DIR_PATH`.
  */
 
 /**
@@ -687,18 +695,32 @@ public final class TermuxConstants {
 
     /** Termux app directory path to store foreground scripts that can be run by the termux launcher
      * widget provided by Termux:Widget */
-    public static final String TERMUX_SHORTCUT_SCRIPTS_DIR_PATH = TERMUX_DATA_HOME_DIR_PATH + "/shortcuts"; // Default: "/data/data/com.termux/files/home/.termux/shortcuts"
+    public static final String TERMUX_SHORTCUT_SCRIPTS_DIR_PATH = TERMUX_HOME_DIR_PATH + "/.shortcuts"; // Default: "/data/data/com.termux/files/home/.shortcuts"
     /** Termux app directory to store foreground scripts that can be run by the termux launcher widget provided by Termux:Widget */
     public static final File TERMUX_SHORTCUT_SCRIPTS_DIR = new File(TERMUX_SHORTCUT_SCRIPTS_DIR_PATH);
 
 
+    /** Termux app directory basename that stores background scripts that can be run by the termux
+     * launcher widget provided by Termux:Widget */
+    public static final String TERMUX_SHORTCUT_TASKS_SCRIPTS_DIR_BASENAME =  "tasks"; // Default: "tasks"
     /** Termux app directory path to store background scripts that can be run by the termux launcher
      * widget provided by Termux:Widget */
-    public static final String TERMUX_SHORTCUT_TASKS_SCRIPTS_DIR_PATH = TERMUX_DATA_HOME_DIR_PATH + "/shortcuts/tasks"; // Default: "/data/data/com.termux/files/home/.termux/shortcuts/tasks"
+    public static final String TERMUX_SHORTCUT_TASKS_SCRIPTS_DIR_PATH = TERMUX_SHORTCUT_SCRIPTS_DIR_PATH + "/" + TERMUX_SHORTCUT_TASKS_SCRIPTS_DIR_BASENAME; // Default: "/data/data/com.termux/files/home/.shortcuts/tasks"
     /** Termux app directory to store background scripts that can be run by the termux launcher widget provided by Termux:Widget */
     public static final File TERMUX_SHORTCUT_TASKS_SCRIPTS_DIR = new File(TERMUX_SHORTCUT_TASKS_SCRIPTS_DIR_PATH);
 
 
+    /** Termux app directory basename that stores icons for the foreground and background scripts
+     * that can be run by the termux launcher widget provided by Termux:Widget */
+    public static final String TERMUX_SHORTCUT_SCRIPT_ICONS_DIR_BASENAME =  "icons"; // Default: "icons"
+    /** Termux app directory path to store icons for the foreground and background scripts that can
+     * be run by the termux launcher widget provided by Termux:Widget */
+    public static final String TERMUX_SHORTCUT_SCRIPT_ICONS_DIR_PATH = TERMUX_SHORTCUT_SCRIPTS_DIR_PATH + "/" + TERMUX_SHORTCUT_SCRIPT_ICONS_DIR_BASENAME; // Default: "/data/data/com.termux/files/home/.shortcuts/icons"
+    /** Termux app directory to store icons for the foreground and background scripts that can be
+     * run by the termux launcher widget provided by Termux:Widget */
+    public static final File TERMUX_SHORTCUT_SCRIPT_ICONS_DIR = new File(TERMUX_SHORTCUT_SCRIPT_ICONS_DIR_PATH);
+
+
     /** Termux app directory path to store scripts to be run by 3rd party twofortyfouram locale plugin
      * host apps like Tasker app via the Termux:Tasker plugin client */
     public static final String TERMUX_TASKER_SCRIPTS_DIR_PATH = TERMUX_DATA_HOME_DIR_PATH + "/tasker"; // Default: "/data/data/com.termux/files/home/.termux/tasker"
@@ -1100,14 +1122,14 @@ public static final class TERMUX_FLOAT_APP {
          */
         public static final class TERMUX_FLOAT_SERVICE {
 
-            /** Intent action to stop TERMUX_FLOAT_SERVICE */
-            public static final String ACTION_STOP_SERVICE = TERMUX_FLOAT_PACKAGE_NAME + ".stop_service"; // Default: "com.termux.window.stop_service"
+            /** Intent action to stop TERMUX_FLOAT_SERVICE. */
+            public static final String ACTION_STOP_SERVICE = TERMUX_FLOAT_PACKAGE_NAME + ".ACTION_STOP_SERVICE"; // Default: "com.termux.float.ACTION_STOP_SERVICE"
 
-            /** Intent action to show float window */
-            public static final String ACTION_SHOW = TERMUX_FLOAT_PACKAGE_NAME + ".show"; // Default: "com.termux.window.show"
+            /** Intent action to show float window. */
+            public static final String ACTION_SHOW = TERMUX_FLOAT_PACKAGE_NAME + ".ACTION_SHOW"; // Default: "com.termux.float.ACTION_SHOW"
 
-            /** Intent action to hide float window */
-            public static final String ACTION_HIDE = TERMUX_FLOAT_PACKAGE_NAME + ".hide"; // Default: "com.termux.window.hide"
+            /** Intent action to hide float window. */
+            public static final String ACTION_HIDE = TERMUX_FLOAT_PACKAGE_NAME + ".ACTION_HIDE"; // Default: "com.termux.float.ACTION_HIDE"
 
         }
 
@@ -1127,4 +1149,37 @@ public static final class TERMUX_STYLING {
 
     }
 
+
+
+
+
+    /**
+     * Termux Widget app constants.
+     */
+    public static final class TERMUX_WIDGET {
+
+        /**  Intent {@code String} extra for the token of the Termux Widget app shortcuts. */
+        public static final String EXTRA_TOKEN_NAME = TERMUX_PACKAGE_NAME + ".shortcut.token"; // Default: "com.termux.shortcut.token"
+
+        /**
+         * Termux Widget app {@link android.appwidget.AppWidgetProvider} class.
+         */
+        public static final class TERMUX_WIDGET_PROVIDER {
+
+            /** Intent action for if an item is clicked in the widget. */
+            public static final String ACTION_WIDGET_ITEM_CLICKED = TERMUX_WIDGET_PACKAGE_NAME + ".ACTION_WIDGET_ITEM_CLICKED"; // Default: "com.termux.widget.ACTION_WIDGET_ITEM_CLICKED"
+
+
+            /** Intent action to refresh files in the widget. */
+            public static final String ACTION_REFRESH_WIDGET = TERMUX_WIDGET_PACKAGE_NAME + ".ACTION_REFRESH_WIDGET"; // Default: "com.termux.widget.ACTION_REFRESH_WIDGET"
+
+
+            /**  Intent {@code String} extra for the file clicked for the TERMUX_WIDGET_PROVIDER.ACTION_WIDGET_ITEM_CLICKED intent. */
+            public static final String EXTRA_FILE_CLICKED = TERMUX_WIDGET_PACKAGE_NAME + ".EXTRA_FILE_CLICKED"; // Default: "com.termux.widget.EXTRA_FILE_CLICKED"
+
+        }
+
+    }
+
+
 }

From 4953b1269c7e1f11d433f4bb15128474f05a7b20 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 4 Sep 2021 08:33:30 +0500
Subject: [PATCH 542/912] Added: Add log level setting in Termux Settings for
 termux-widget

---
 .../app/activities/SettingsActivity.java      |  11 ++
 .../TermuxWidgetPreferencesFragment.java      |  49 +++++++++
 .../DebuggingPreferencesFragment.java         | 101 ++++++++++++++++++
 app/src/main/res/values/strings.xml           |   6 ++
 app/src/main/res/xml/root_preferences.xml     |   7 ++
 .../termux_widget_debugging_preferences.xml   |  15 +++
 .../res/xml/termux_widget_preferences.xml     |   8 ++
 7 files changed, 197 insertions(+)
 create mode 100644 app/src/main/java/com/termux/app/fragments/settings/TermuxWidgetPreferencesFragment.java
 create mode 100644 app/src/main/java/com/termux/app/fragments/settings/termux_widget/DebuggingPreferencesFragment.java
 create mode 100644 app/src/main/res/xml/termux_widget_debugging_preferences.xml
 create mode 100644 app/src/main/res/xml/termux_widget_preferences.xml

diff --git a/app/src/main/java/com/termux/app/activities/SettingsActivity.java b/app/src/main/java/com/termux/app/activities/SettingsActivity.java
index 2e8121eb04..3ffbaad952 100644
--- a/app/src/main/java/com/termux/app/activities/SettingsActivity.java
+++ b/app/src/main/java/com/termux/app/activities/SettingsActivity.java
@@ -20,6 +20,7 @@
 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;
@@ -60,6 +61,7 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
             configureTermuxAPIPreference(context);
             configureTermuxFloatPreference(context);
             configureTermuxTaskerPreference(context);
+            configureTermuxWidgetPreference(context);
             configureAboutPreference(context);
             configureDonatePreference(context);
         }
@@ -91,6 +93,15 @@ private void configureTermuxTaskerPreference(@NonNull Context context) {
             }
         }
 
+        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) {
diff --git a/app/src/main/java/com/termux/app/fragments/settings/TermuxWidgetPreferencesFragment.java b/app/src/main/java/com/termux/app/fragments/settings/TermuxWidgetPreferencesFragment.java
new file mode 100644
index 0000000000..b87e93e5af
--- /dev/null
+++ b/app/src/main/java/com/termux/app/fragments/settings/TermuxWidgetPreferencesFragment.java
@@ -0,0 +1,49 @@
+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;
+    }
+
+}
diff --git a/app/src/main/java/com/termux/app/fragments/settings/termux_widget/DebuggingPreferencesFragment.java b/app/src/main/java/com/termux/app/fragments/settings/termux_widget/DebuggingPreferencesFragment.java
new file mode 100644
index 0000000000..919f159e55
--- /dev/null
+++ b/app/src/main/java/com/termux/app/fragments/settings/termux_widget/DebuggingPreferencesFragment.java
@@ -0,0 +1,101 @@
+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;
+        }
+    }
+
+}
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5b27549dfe..204e3bcf94 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -211,6 +211,12 @@
 
 
 
+    <!-- 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>
 
diff --git a/app/src/main/res/xml/root_preferences.xml b/app/src/main/res/xml/root_preferences.xml
index 31b657a22d..0ec8b14d2a 100644
--- a/app/src/main/res/xml/root_preferences.xml
+++ b/app/src/main/res/xml/root_preferences.xml
@@ -27,6 +27,13 @@
         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"
diff --git a/app/src/main/res/xml/termux_widget_debugging_preferences.xml b/app/src/main/res/xml/termux_widget_debugging_preferences.xml
new file mode 100644
index 0000000000..8bfd8c7738
--- /dev/null
+++ b/app/src/main/res/xml/termux_widget_debugging_preferences.xml
@@ -0,0 +1,15 @@
+<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>
diff --git a/app/src/main/res/xml/termux_widget_preferences.xml b/app/src/main/res/xml/termux_widget_preferences.xml
new file mode 100644
index 0000000000..aaf0195360
--- /dev/null
+++ b/app/src/main/res/xml/termux_widget_preferences.xml
@@ -0,0 +1,8 @@
+<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>

From 23b707a81995ae8a47c8e0f35066130577bb9403 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 4 Sep 2021 08:34:32 +0500
Subject: [PATCH 543/912] Changed: Disable shrinkResources for testing
 reproducible builds

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 017b974b5f..7aec369fe8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -66,7 +66,7 @@ android {
     buildTypes {
         release {
             minifyEnabled true
-            shrinkResources true
+            shrinkResources false // Reproducible builds
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
 

From b62645cd03acbd9eaff1874b7c1b021a5bc061c7 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sun, 5 Sep 2021 03:37:07 +0500
Subject: [PATCH 544/912] Fixed: Fix typos and refactor

---
 app/src/main/AndroidManifest.xml              |  39 ++++---
 .../com/termux/app/TermuxOpenReceiver.java    |   9 +-
 .../java/com/termux/app/TermuxService.java    |   4 +-
 .../properties/TermuxAppSharedProperties.java |   6 +-
 app/src/main/res/values/strings.xml           |  11 +-
 .../termux/shared/packages/PackageUtils.java  |   3 +-
 .../TermuxAPIAppSharedPreferences.java        |   6 +-
 .../TermuxAppSharedPreferences.java           |   6 +-
 .../TermuxBootAppSharedPreferences.java       |   6 +-
 .../TermuxFloatAppSharedPreferences.java      |   6 +-
 .../TermuxPreferenceConstants.java            |  12 +-
 .../TermuxStylingAppSharedPreferences.java    |   6 +-
 .../TermuxTaskerAppSharedPreferences.java     |   6 +-
 .../TermuxWidgetAppSharedPreferences.java     |   6 +-
 .../settings/properties/SharedProperties.java |  16 +--
 .../properties/TermuxSharedProperties.java    |   4 +-
 .../termux/shared/termux/TermuxConstants.java | 109 +++++++++---------
 17 files changed, 124 insertions(+), 131 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c6ce0ea623..28219d2722 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -44,14 +44,6 @@
         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"
@@ -143,6 +135,7 @@
             </intent-filter>
         </activity>
 
+
         <provider
             android:name=".filepicker.TermuxDocumentsProvider"
             android:authorities="${TERMUX_PACKAGE_NAME}.documents"
@@ -154,9 +147,23 @@
             </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"
@@ -166,23 +173,19 @@
             </intent-filter>
         </service>
 
-        <receiver android:name=".app.TermuxOpenReceiver" />
-
-        <receiver android:name=".shared.activities.ReportActivity$ReportActivityBroadcastReceiver"  android:exported="false" />
-
-        <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>
diff --git a/app/src/main/java/com/termux/app/TermuxOpenReceiver.java b/app/src/main/java/com/termux/app/TermuxOpenReceiver.java
index c3609dbc2f..c85885dc30 100644
--- a/app/src/main/java/com/termux/app/TermuxOpenReceiver.java
+++ b/app/src/main/java/com/termux/app/TermuxOpenReceiver.java
@@ -13,6 +13,7 @@
 import android.provider.MediaStore;
 import android.webkit.MimeTypeMap;
 
+import com.termux.shared.data.IntentUtils;
 import com.termux.shared.logger.Logger;
 import com.termux.shared.termux.TermuxConstants;
 
@@ -34,6 +35,8 @@ public void onReceive(Context context, Intent intent) {
             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);
@@ -111,6 +114,8 @@ public void onReceive(Context context, Intent intent) {
 
     public static class ContentProvider extends android.content.ContentProvider {
 
+        private static final String LOG_TAG = "TermuxContentProvider";
+
         @Override
         public boolean onCreate() {
             return true;
@@ -178,6 +183,7 @@ public ParcelFileDescriptor openFile(@NonNull Uri uri, @NonNull String mode) thr
             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))) {
@@ -186,7 +192,8 @@ public ParcelFileDescriptor openFile(@NonNull Uri uri, @NonNull String mode) thr
             } catch (IOException e) {
                 throw new IllegalArgumentException(e);
             }
-            return ParcelFileDescriptor.open(file, ParcelFileDescriptor.MODE_READ_ONLY);
+
+            return ParcelFileDescriptor.open(file, ParcelFileDescriptor.parseMode(mode));
         }
     }
 
diff --git a/app/src/main/java/com/termux/app/TermuxService.java b/app/src/main/java/com/termux/app/TermuxService.java
index 4a153d2474..f7034e2883 100644
--- a/app/src/main/java/com/termux/app/TermuxService.java
+++ b/app/src/main/java/com/termux/app/TermuxService.java
@@ -19,6 +19,8 @@
 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;
@@ -47,8 +49,6 @@
 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.
diff --git a/app/src/main/java/com/termux/app/settings/properties/TermuxAppSharedProperties.java b/app/src/main/java/com/termux/app/settings/properties/TermuxAppSharedProperties.java
index 766c443555..7dbf2e1cb9 100644
--- a/app/src/main/java/com/termux/app/settings/properties/TermuxAppSharedProperties.java
+++ b/app/src/main/java/com/termux/app/settings/properties/TermuxAppSharedProperties.java
@@ -2,6 +2,8 @@
 
 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;
@@ -17,8 +19,6 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.annotation.Nonnull;
-
 public class TermuxAppSharedProperties extends TermuxSharedProperties {
 
     private ExtraKeysInfo mExtraKeysInfo;
@@ -26,7 +26,7 @@ public class TermuxAppSharedProperties extends TermuxSharedProperties {
 
     private static final String LOG_TAG = "TermuxAppSharedProperties";
 
-    public TermuxAppSharedProperties(@Nonnull Context context) {
+    public TermuxAppSharedProperties(@NonNull Context context) {
         super(context, TermuxConstants.TERMUX_APP_NAME, TermuxPropertyConstants.getTermuxPropertiesFile(),
             TermuxPropertyConstants.TERMUX_PROPERTIES_LIST, new SharedPropertiesParserClient());
     }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 204e3bcf94..6b37c06b81 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -13,6 +13,7 @@
     ]>
 
 <resources>
+
     <string name="application_name">&TERMUX_APP_NAME;</string>
     <string name="shared_user_label">&TERMUX_APP_NAME; user</string>
 
@@ -21,7 +22,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</string>
+        environment and access files</string>
 
 
 
@@ -193,25 +194,25 @@
 
 
 
-    <!-- Termux API App Preferences -->
+    <!-- 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 -->
+    <!-- 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 -->
+    <!-- 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 -->
+    <!-- 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>
 
diff --git a/termux-shared/src/main/java/com/termux/shared/packages/PackageUtils.java b/termux-shared/src/main/java/com/termux/shared/packages/PackageUtils.java
index b6e8d98a07..2698c92fe8 100644
--- a/termux-shared/src/main/java/com/termux/shared/packages/PackageUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/packages/PackageUtils.java
@@ -9,6 +9,7 @@
 import android.os.UserManager;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.termux.shared.R;
 import com.termux.shared.data.DataUtils;
@@ -19,8 +20,6 @@
 import java.security.MessageDigest;
 import java.util.List;
 
-import javax.annotation.Nullable;
-
 public class PackageUtils {
 
     private static final String LOG_TAG = "PackageUtils";
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxAPIAppSharedPreferences.java b/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxAPIAppSharedPreferences.java
index 1862cce262..7ed02e09a7 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxAPIAppSharedPreferences.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxAPIAppSharedPreferences.java
@@ -5,15 +5,13 @@
 import android.content.SharedPreferences;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.termux.shared.logger.Logger;
 import com.termux.shared.packages.PackageUtils;
 import com.termux.shared.settings.preferences.TermuxPreferenceConstants.TERMUX_API_APP;
 import com.termux.shared.termux.TermuxConstants;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 public class TermuxAPIAppSharedPreferences {
 
     private final Context mContext;
@@ -23,7 +21,7 @@ public class TermuxAPIAppSharedPreferences {
 
     private static final String LOG_TAG = "TermuxAPIAppSharedPreferences";
 
-    private TermuxAPIAppSharedPreferences(@Nonnull Context context) {
+    private TermuxAPIAppSharedPreferences(@NonNull Context context) {
         mContext = context;
         mSharedPreferences = getPrivateSharedPreferences(mContext);
         mMultiProcessSharedPreferences = getPrivateAndMultiProcessSharedPreferences(mContext);
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxAppSharedPreferences.java b/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxAppSharedPreferences.java
index d1bb032e1a..934ed02121 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxAppSharedPreferences.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxAppSharedPreferences.java
@@ -6,6 +6,7 @@
 import android.util.TypedValue;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.termux.shared.packages.PackageUtils;
 import com.termux.shared.termux.TermuxConstants;
@@ -13,9 +14,6 @@
 import com.termux.shared.data.DataUtils;
 import com.termux.shared.settings.preferences.TermuxPreferenceConstants.TERMUX_APP;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 public class TermuxAppSharedPreferences {
 
     private final Context mContext;
@@ -27,7 +25,7 @@ public class TermuxAppSharedPreferences {
 
     private static final String LOG_TAG = "TermuxAppSharedPreferences";
 
-    private TermuxAppSharedPreferences(@Nonnull Context context) {
+    private TermuxAppSharedPreferences(@NonNull Context context) {
         mContext = context;
         mSharedPreferences = getPrivateSharedPreferences(mContext);
 
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxBootAppSharedPreferences.java b/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxBootAppSharedPreferences.java
index 8fa1837402..b8a5aa1ac1 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxBootAppSharedPreferences.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxBootAppSharedPreferences.java
@@ -5,15 +5,13 @@
 import android.content.SharedPreferences;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.termux.shared.logger.Logger;
 import com.termux.shared.packages.PackageUtils;
 import com.termux.shared.settings.preferences.TermuxPreferenceConstants.TERMUX_BOOT_APP;
 import com.termux.shared.termux.TermuxConstants;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 public class TermuxBootAppSharedPreferences {
 
     private final Context mContext;
@@ -23,7 +21,7 @@ public class TermuxBootAppSharedPreferences {
 
     private static final String LOG_TAG = "TermuxBootAppSharedPreferences";
 
-    private TermuxBootAppSharedPreferences(@Nonnull Context context) {
+    private TermuxBootAppSharedPreferences(@NonNull Context context) {
         mContext = context;
         mSharedPreferences = getPrivateSharedPreferences(mContext);
         mMultiProcessSharedPreferences = getPrivateAndMultiProcessSharedPreferences(mContext);
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxFloatAppSharedPreferences.java b/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxFloatAppSharedPreferences.java
index 63104a3bd2..42f21f2cba 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxFloatAppSharedPreferences.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxFloatAppSharedPreferences.java
@@ -5,6 +5,7 @@
 import android.content.SharedPreferences;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.termux.shared.data.DataUtils;
 import com.termux.shared.logger.Logger;
@@ -12,9 +13,6 @@
 import com.termux.shared.settings.preferences.TermuxPreferenceConstants.TERMUX_FLOAT_APP;
 import com.termux.shared.termux.TermuxConstants;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 public class TermuxFloatAppSharedPreferences {
 
     private final Context mContext;
@@ -27,7 +25,7 @@ public class TermuxFloatAppSharedPreferences {
 
     private static final String LOG_TAG = "TermuxFloatAppSharedPreferences";
 
-    private TermuxFloatAppSharedPreferences(@Nonnull Context context) {
+    private TermuxFloatAppSharedPreferences(@NonNull Context context) {
         mContext = context;
         mSharedPreferences = getPrivateSharedPreferences(mContext);
         mMultiProcessSharedPreferences = getPrivateAndMultiProcessSharedPreferences(mContext);
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxPreferenceConstants.java b/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxPreferenceConstants.java
index 492ff61959..2f6c1aa510 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxPreferenceConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxPreferenceConstants.java
@@ -163,7 +163,7 @@ public static final class TERMUX_APP {
 
 
     /**
-     * Termux API app constants.
+     * Termux:API app constants.
      */
     public static final class TERMUX_API_APP {
 
@@ -177,7 +177,7 @@ public static final class TERMUX_API_APP {
 
 
     /**
-     * Termux Boot app constants.
+     * Termux:Boot app constants.
      */
     public static final class TERMUX_BOOT_APP {
 
@@ -191,7 +191,7 @@ public static final class TERMUX_BOOT_APP {
 
 
     /**
-     * Termux Float app constants.
+     * Termux:Float app constants.
      */
     public static final class TERMUX_FLOAT_APP {
 
@@ -236,7 +236,7 @@ public static final class TERMUX_FLOAT_APP {
 
 
     /**
-     * Termux Styling app constants.
+     * Termux:Styling app constants.
      */
     public static final class TERMUX_STYLING_APP {
 
@@ -250,7 +250,7 @@ public static final class TERMUX_STYLING_APP {
 
 
     /**
-     * Termux Tasker app constants.
+     * Termux:Tasker app constants.
      */
     public static final class TERMUX_TASKER_APP {
 
@@ -264,7 +264,7 @@ public static final class TERMUX_TASKER_APP {
 
 
     /**
-     * Termux Widget app constants.
+     * Termux:Widget app constants.
      */
     public static final class TERMUX_WIDGET_APP {
 
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxStylingAppSharedPreferences.java b/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxStylingAppSharedPreferences.java
index f6aa24a9a1..85432c7db5 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxStylingAppSharedPreferences.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxStylingAppSharedPreferences.java
@@ -5,15 +5,13 @@
 import android.content.SharedPreferences;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.termux.shared.logger.Logger;
 import com.termux.shared.packages.PackageUtils;
 import com.termux.shared.settings.preferences.TermuxPreferenceConstants.TERMUX_STYLING_APP;
 import com.termux.shared.termux.TermuxConstants;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 public class TermuxStylingAppSharedPreferences {
 
     private final Context mContext;
@@ -23,7 +21,7 @@ public class TermuxStylingAppSharedPreferences {
 
     private static final String LOG_TAG = "TermuxStylingAppSharedPreferences";
 
-    private TermuxStylingAppSharedPreferences(@Nonnull Context context) {
+    private TermuxStylingAppSharedPreferences(@NonNull Context context) {
         mContext = context;
         mSharedPreferences = getPrivateSharedPreferences(mContext);
         mMultiProcessSharedPreferences = getPrivateAndMultiProcessSharedPreferences(mContext);
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxTaskerAppSharedPreferences.java b/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxTaskerAppSharedPreferences.java
index 02b77b5b8c..61c814def7 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxTaskerAppSharedPreferences.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxTaskerAppSharedPreferences.java
@@ -5,15 +5,13 @@
 import android.content.SharedPreferences;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.termux.shared.packages.PackageUtils;
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.settings.preferences.TermuxPreferenceConstants.TERMUX_TASKER_APP;
 import com.termux.shared.logger.Logger;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 public class TermuxTaskerAppSharedPreferences {
 
     private final Context mContext;
@@ -23,7 +21,7 @@ public class TermuxTaskerAppSharedPreferences {
 
     private static final String LOG_TAG = "TermuxTaskerAppSharedPreferences";
 
-    private  TermuxTaskerAppSharedPreferences(@Nonnull Context context) {
+    private  TermuxTaskerAppSharedPreferences(@NonNull Context context) {
         mContext = context;
         mSharedPreferences = getPrivateSharedPreferences(mContext);
         mMultiProcessSharedPreferences = getPrivateAndMultiProcessSharedPreferences(mContext);
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxWidgetAppSharedPreferences.java b/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxWidgetAppSharedPreferences.java
index 717ed135d6..2b9022c6c9 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxWidgetAppSharedPreferences.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxWidgetAppSharedPreferences.java
@@ -5,6 +5,7 @@
 import android.content.SharedPreferences;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.termux.shared.logger.Logger;
 import com.termux.shared.packages.PackageUtils;
@@ -13,9 +14,6 @@
 
 import java.util.UUID;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 public class TermuxWidgetAppSharedPreferences {
 
     private final Context mContext;
@@ -25,7 +23,7 @@ public class TermuxWidgetAppSharedPreferences {
 
     private static final String LOG_TAG = "TermuxWidgetAppSharedPreferences";
 
-    private TermuxWidgetAppSharedPreferences(@Nonnull Context context) {
+    private TermuxWidgetAppSharedPreferences(@NonNull Context context) {
         mContext = context;
         mSharedPreferences = getPrivateSharedPreferences(mContext);
         mMultiProcessSharedPreferences = getPrivateAndMultiProcessSharedPreferences(mContext);
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/properties/SharedProperties.java b/termux-shared/src/main/java/com/termux/shared/settings/properties/SharedProperties.java
index cf4a673d88..91cf699f7f 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/properties/SharedProperties.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/properties/SharedProperties.java
@@ -3,6 +3,9 @@
 import android.content.Context;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import com.google.common.collect.BiMap;
 import com.google.common.collect.ImmutableBiMap;
 import com.google.common.primitives.Primitives;
@@ -17,9 +20,6 @@
 import java.util.Properties;
 import java.util.Set;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 /**
  * An implementation similar to android's {@link android.content.SharedPreferences} interface for
  * reading and writing to and from ".properties" files which also maintains an in-memory cache for
@@ -90,7 +90,7 @@ public class SharedProperties {
      *                       {@code propertiesFile} will be read by {@link #loadPropertiesFromDisk()}
      * @param sharedPropertiesParser The implementation of the {@link SharedPropertiesParser} interface.
      */
-    public SharedProperties(@Nonnull Context context, @Nullable File propertiesFile, Set<String> propertiesList, @Nonnull SharedPropertiesParser sharedPropertiesParser) {
+    public SharedProperties(@NonNull Context context, @Nullable File propertiesFile, Set<String> propertiesList, @NonNull SharedPropertiesParser sharedPropertiesParser) {
         mContext = context;
         mPropertiesFile = propertiesFile;
         mPropertiesList = propertiesList;
@@ -275,7 +275,7 @@ public static String getProperty(Context context, File propertiesFile, String ke
      * @return Returns the {@link String} Object returned by the call to
      * {@link SharedPropertiesParser#getInternalPropertyValueFromValue(Context,String,String)}.
      */
-    public static Object getInternalProperty(Context context, File propertiesFile, String key, @Nonnull SharedPropertiesParser sharedPropertiesParser) {
+    public static Object getInternalProperty(Context context, File propertiesFile, String key, @NonNull SharedPropertiesParser sharedPropertiesParser) {
         String value = (String) getDefaultIfNull(getPropertiesFromFile(context, propertiesFile), new Properties()).get(key);
 
         // Call the {@link SharedPropertiesParser#getInternalPropertyValueFromValue(Context,String,String)}
@@ -464,7 +464,7 @@ public static boolean getInvertedBooleanValueForStringValue(String key, String v
      * @return Returns the value for the {@code inputValue} key from the map if it exists. Otherwise
      * returns default value.
      */
-    public static Object getDefaultIfNotInMap(String key, @Nonnull BiMap<?, ?> map, Object inputValue, Object defaultOutputValue, boolean logErrorOnInvalidValue, String logTag) {
+    public static Object getDefaultIfNotInMap(String key, @NonNull BiMap<?, ?> map, Object inputValue, Object defaultOutputValue, boolean logErrorOnInvalidValue, String logTag) {
         Object outputValue = map.get(inputValue);
         if (outputValue == null) {
             Object defaultInputValue = map.inverse().get(defaultOutputValue);
@@ -549,7 +549,7 @@ public static float getDefaultIfNotInRange(String key, float value, float def, f
      * @param def The default {@link Object}.
      * @return Returns {@code object} if it is not {@code null}, otherwise returns {@code def}.
      */
-    public static <T> T getDefaultIfNull(@androidx.annotation.Nullable T object, @androidx.annotation.Nullable T def) {
+    public static <T> T getDefaultIfNull(@Nullable T object, @Nullable T def) {
         return (object == null) ? def : object;
     }
 
@@ -560,7 +560,7 @@ public static <T> T getDefaultIfNull(@androidx.annotation.Nullable T object, @an
      * @param def The default {@link String}.
      * @return Returns {@code object} if it is not {@code null}, otherwise returns {@code def}.
      */
-    public static String getDefaultIfNullOrEmpty(@androidx.annotation.Nullable String object, @androidx.annotation.Nullable String def) {
+    public static String getDefaultIfNullOrEmpty(@Nullable String object, @Nullable String def) {
         return (object == null || object.isEmpty()) ? def : object;
     }
 
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxSharedProperties.java b/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxSharedProperties.java
index 83ce37c2f2..23a3faac73 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxSharedProperties.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxSharedProperties.java
@@ -14,8 +14,6 @@
 import java.util.Properties;
 import java.util.Set;
 
-import javax.annotation.Nonnull;
-
 public abstract class TermuxSharedProperties {
 
     protected final Context mContext;
@@ -25,7 +23,7 @@ public abstract class TermuxSharedProperties {
 
     public static final String LOG_TAG = "TermuxSharedProperties";
 
-    public TermuxSharedProperties(@Nonnull Context context, @NonNull String label, File propertiesFile,
+    public TermuxSharedProperties(@NonNull Context context, @NonNull String label, File propertiesFile,
                                   @NonNull Set<String> propertiesList, @NonNull SharedPropertiesParser sharedPropertiesParser) {
         mContext = context;
         mLabel = label;
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
index ca7a73a6cb..ecd8a79994 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
@@ -49,7 +49,7 @@
  *          `TERMUX_WIDGET_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION`.
  *
  * - 0.5.0 (2021-03-16)
- *      - Renamed "Termux Plugin app" labels to "Termux Tasker app".
+ *      - Renamed "Termux Plugin app" labels to "Termux:Tasker app".
  *
  * - 0.6.0 (2021-03-16)
  *      - Added `TERMUX_FILE_SHARE_URI_AUTHORITY`.
@@ -276,87 +276,87 @@ public final class TermuxConstants {
     public static final String TERMUX_FDROID_PACKAGE_URL = FDROID_PACKAGES_BASE_URL + "/" + TERMUX_PACKAGE_NAME; // Default: "https://f-droid.org/en/packages/com.termux"
 
 
-    /** Termux API app name */
+    /** Termux:API app name */
     public static final String TERMUX_API_APP_NAME = "Termux:API"; // Default: "Termux:API"
-    /** Termux API app package name */
+    /** Termux:API app package name */
     public static final String TERMUX_API_PACKAGE_NAME = TERMUX_PACKAGE_NAME + ".api"; // Default: "com.termux.api"
-    /** Termux API Github repo name */
+    /** Termux:API Github repo name */
     public static final String TERMUX_API_GITHUB_REPO_NAME = "termux-api"; // Default: "termux-api"
-    /** Termux API Github repo url */
+    /** Termux:API Github repo url */
     public static final String TERMUX_API_GITHUB_REPO_URL = TERMUX_GITHUB_ORGANIZATION_URL + "/" + TERMUX_API_GITHUB_REPO_NAME; // Default: "https://github.com/termux/termux-api"
-    /** Termux API Github issues repo url */
+    /** Termux:API Github issues repo url */
     public static final String TERMUX_API_GITHUB_ISSUES_REPO_URL = TERMUX_API_GITHUB_REPO_URL + "/issues"; // Default: "https://github.com/termux/termux-api/issues"
-    /** Termux API F-Droid package url */
+    /** Termux:API F-Droid package url */
     public static final String TERMUX_API_FDROID_PACKAGE_URL = FDROID_PACKAGES_BASE_URL + "/" + TERMUX_API_PACKAGE_NAME; // Default: "https://f-droid.org/en/packages/com.termux.api"
 
 
-    /** Termux Boot app name */
+    /** Termux:Boot app name */
     public static final String TERMUX_BOOT_APP_NAME = "Termux:Boot"; // Default: "Termux:Boot"
-    /** Termux Boot app package name */
+    /** Termux:Boot app package name */
     public static final String TERMUX_BOOT_PACKAGE_NAME = TERMUX_PACKAGE_NAME + ".boot"; // Default: "com.termux.boot"
-    /** Termux Boot Github repo name */
+    /** Termux:Boot Github repo name */
     public static final String TERMUX_BOOT_GITHUB_REPO_NAME = "termux-boot"; // Default: "termux-boot"
-    /** Termux Boot Github repo url */
+    /** Termux:Boot Github repo url */
     public static final String TERMUX_BOOT_GITHUB_REPO_URL = TERMUX_GITHUB_ORGANIZATION_URL + "/" + TERMUX_BOOT_GITHUB_REPO_NAME; // Default: "https://github.com/termux/termux-boot"
-    /** Termux Boot Github issues repo url */
+    /** Termux:Boot Github issues repo url */
     public static final String TERMUX_BOOT_GITHUB_ISSUES_REPO_URL = TERMUX_BOOT_GITHUB_REPO_URL + "/issues"; // Default: "https://github.com/termux/termux-boot/issues"
-    /** Termux Boot F-Droid package url */
+    /** Termux:Boot F-Droid package url */
     public static final String TERMUX_BOOT_FDROID_PACKAGE_URL = FDROID_PACKAGES_BASE_URL + "/" + TERMUX_BOOT_PACKAGE_NAME; // Default: "https://f-droid.org/en/packages/com.termux.boot"
 
 
-    /** Termux Float app name */
+    /** Termux:Float app name */
     public static final String TERMUX_FLOAT_APP_NAME = "Termux:Float"; // Default: "Termux:Float"
-    /** Termux Float app package name */
+    /** Termux:Float app package name */
     public static final String TERMUX_FLOAT_PACKAGE_NAME = TERMUX_PACKAGE_NAME + ".window"; // Default: "com.termux.window"
-    /** Termux Float Github repo name */
+    /** Termux:Float Github repo name */
     public static final String TERMUX_FLOAT_GITHUB_REPO_NAME = "termux-float"; // Default: "termux-float"
-    /** Termux Float Github repo url */
+    /** Termux:Float Github repo url */
     public static final String TERMUX_FLOAT_GITHUB_REPO_URL = TERMUX_GITHUB_ORGANIZATION_URL + "/" + TERMUX_FLOAT_GITHUB_REPO_NAME; // Default: "https://github.com/termux/termux-float"
-    /** Termux Float Github issues repo url */
+    /** Termux:Float Github issues repo url */
     public static final String TERMUX_FLOAT_GITHUB_ISSUES_REPO_URL = TERMUX_FLOAT_GITHUB_REPO_URL + "/issues"; // Default: "https://github.com/termux/termux-float/issues"
-    /** Termux Float F-Droid package url */
+    /** Termux:Float F-Droid package url */
     public static final String TERMUX_FLOAT_FDROID_PACKAGE_URL = FDROID_PACKAGES_BASE_URL + "/" + TERMUX_FLOAT_PACKAGE_NAME; // Default: "https://f-droid.org/en/packages/com.termux.window"
 
 
-    /** Termux Styling app name */
+    /** Termux:Styling app name */
     public static final String TERMUX_STYLING_APP_NAME = "Termux:Styling"; // Default: "Termux:Styling"
-    /** Termux Styling app package name */
+    /** Termux:Styling app package name */
     public static final String TERMUX_STYLING_PACKAGE_NAME = TERMUX_PACKAGE_NAME + ".styling"; // Default: "com.termux.styling"
-    /** Termux Styling Github repo name */
+    /** Termux:Styling Github repo name */
     public static final String TERMUX_STYLING_GITHUB_REPO_NAME = "termux-styling"; // Default: "termux-styling"
-    /** Termux Styling Github repo url */
+    /** Termux:Styling Github repo url */
     public static final String TERMUX_STYLING_GITHUB_REPO_URL = TERMUX_GITHUB_ORGANIZATION_URL + "/" + TERMUX_STYLING_GITHUB_REPO_NAME; // Default: "https://github.com/termux/termux-styling"
-    /** Termux Styling Github issues repo url */
+    /** Termux:Styling Github issues repo url */
     public static final String TERMUX_STYLING_GITHUB_ISSUES_REPO_URL = TERMUX_STYLING_GITHUB_REPO_URL + "/issues"; // Default: "https://github.com/termux/termux-styling/issues"
-    /** Termux Styling F-Droid package url */
+    /** Termux:Styling F-Droid package url */
     public static final String TERMUX_STYLING_FDROID_PACKAGE_URL = FDROID_PACKAGES_BASE_URL + "/" + TERMUX_STYLING_PACKAGE_NAME; // Default: "https://f-droid.org/en/packages/com.termux.styling"
 
 
-    /** Termux Tasker app name */
+    /** Termux:Tasker app name */
     public static final String TERMUX_TASKER_APP_NAME = "Termux:Tasker"; // Default: "Termux:Tasker"
-    /** Termux Tasker app package name */
+    /** Termux:Tasker app package name */
     public static final String TERMUX_TASKER_PACKAGE_NAME = TERMUX_PACKAGE_NAME + ".tasker"; // Default: "com.termux.tasker"
-    /** Termux Tasker Github repo name */
+    /** Termux:Tasker Github repo name */
     public static final String TERMUX_TASKER_GITHUB_REPO_NAME = "termux-tasker"; // Default: "termux-tasker"
-    /** Termux Tasker Github repo url */
+    /** Termux:Tasker Github repo url */
     public static final String TERMUX_TASKER_GITHUB_REPO_URL = TERMUX_GITHUB_ORGANIZATION_URL + "/" + TERMUX_TASKER_GITHUB_REPO_NAME; // Default: "https://github.com/termux/termux-tasker"
-    /** Termux Tasker Github issues repo url */
+    /** Termux:Tasker Github issues repo url */
     public static final String TERMUX_TASKER_GITHUB_ISSUES_REPO_URL = TERMUX_TASKER_GITHUB_REPO_URL + "/issues"; // Default: "https://github.com/termux/termux-tasker/issues"
-    /** Termux Tasker F-Droid package url */
+    /** Termux:Tasker F-Droid package url */
     public static final String TERMUX_TASKER_FDROID_PACKAGE_URL = FDROID_PACKAGES_BASE_URL + "/" + TERMUX_TASKER_PACKAGE_NAME; // Default: "https://f-droid.org/en/packages/com.termux.tasker"
 
 
-    /** Termux Widget app name */
+    /** Termux:Widget app name */
     public static final String TERMUX_WIDGET_APP_NAME = "Termux:Widget"; // Default: "Termux:Widget"
-    /** Termux Widget app package name */
+    /** Termux:Widget app package name */
     public static final String TERMUX_WIDGET_PACKAGE_NAME = TERMUX_PACKAGE_NAME + ".widget"; // Default: "com.termux.widget"
-    /** Termux Widget Github repo name */
+    /** Termux:Widget Github repo name */
     public static final String TERMUX_WIDGET_GITHUB_REPO_NAME = "termux-widget"; // Default: "termux-widget"
-    /** Termux Widget Github repo url */
+    /** Termux:Widget Github repo url */
     public static final String TERMUX_WIDGET_GITHUB_REPO_URL = TERMUX_GITHUB_ORGANIZATION_URL + "/" + TERMUX_WIDGET_GITHUB_REPO_NAME; // Default: "https://github.com/termux/termux-widget"
-    /** Termux Widget Github issues repo url */
+    /** Termux:Widget Github issues repo url */
     public static final String TERMUX_WIDGET_GITHUB_ISSUES_REPO_URL = TERMUX_WIDGET_GITHUB_REPO_URL + "/issues"; // Default: "https://github.com/termux/termux-widget/issues"
-    /** Termux Widget F-Droid package url */
+    /** Termux:Widget F-Droid package url */
     public static final String TERMUX_WIDGET_FDROID_PACKAGE_URL = FDROID_PACKAGES_BASE_URL + "/" + TERMUX_WIDGET_PACKAGE_NAME; // Default: "https://f-droid.org/en/packages/com.termux.widget"
 
 
@@ -621,22 +621,22 @@ public final class TermuxConstants {
     /** Termux app default SharedPreferences file basename without extension */
     public static final String TERMUX_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION = TERMUX_PACKAGE_NAME + "_preferences"; // Default: "com.termux_preferences"
 
-    /** Termux API app default SharedPreferences file basename without extension */
+    /** Termux:API app default SharedPreferences file basename without extension */
     public static final String TERMUX_API_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION = TERMUX_API_PACKAGE_NAME + "_preferences"; // Default: "com.termux.api_preferences"
 
-    /** Termux Boot app default SharedPreferences file basename without extension */
+    /** Termux:Boot app default SharedPreferences file basename without extension */
     public static final String TERMUX_BOOT_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION = TERMUX_BOOT_PACKAGE_NAME + "_preferences"; // Default: "com.termux.boot_preferences"
 
-    /** Termux Float app default SharedPreferences file basename without extension */
+    /** Termux:Float app default SharedPreferences file basename without extension */
     public static final String TERMUX_FLOAT_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION = TERMUX_FLOAT_PACKAGE_NAME + "_preferences"; // Default: "com.termux.window_preferences"
 
-    /** Termux Styling app default SharedPreferences file basename without extension */
+    /** Termux:Styling app default SharedPreferences file basename without extension */
     public static final String TERMUX_STYLING_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION = TERMUX_STYLING_PACKAGE_NAME + "_preferences"; // Default: "com.termux.styling_preferences"
 
-    /** Termux Tasker app default SharedPreferences file basename without extension */
+    /** Termux:Tasker app default SharedPreferences file basename without extension */
     public static final String TERMUX_TASKER_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION = TERMUX_TASKER_PACKAGE_NAME + "_preferences"; // Default: "com.termux.tasker_preferences"
 
-    /** Termux Widget app default SharedPreferences file basename without extension */
+    /** Termux:Widget app default SharedPreferences file basename without extension */
     public static final String TERMUX_WIDGET_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION = TERMUX_WIDGET_PACKAGE_NAME + "_preferences"; // Default: "com.termux.widget_preferences"
 
 
@@ -651,14 +651,14 @@ public final class TermuxConstants {
     public static final File TERMUX_PROPERTIES_SECONDARY_FILE = new File(TERMUX_PROPERTIES_SECONDARY_FILE_PATH);
 
 
-    /** Termux Float app termux.properties primary file path */
+    /** Termux:Float app termux.properties primary file path */
     public static final String TERMUX_FLOAT_PROPERTIES_PRIMARY_FILE_PATH = TERMUX_DATA_HOME_DIR_PATH + "/termux.float.properties"; // Default: "/data/data/com.termux/files/home/.termux/termux.float.properties"
-    /** Termux Float app termux.properties primary file */
+    /** Termux:Float app termux.properties primary file */
     public static final File TERMUX_FLOAT_PROPERTIES_PRIMARY_FILE = new File(TERMUX_FLOAT_PROPERTIES_PRIMARY_FILE_PATH);
 
-    /** Termux Float app termux.properties secondary file path */
+    /** Termux:Float app termux.properties secondary file path */
     public static final String TERMUX_FLOAT_PROPERTIES_SECONDARY_FILE_PATH = TERMUX_CONFIG_HOME_DIR_PATH + "/termux.float.properties"; // Default: "/data/data/com.termux/files/home/.config/termux/termux.float.properties"
-    /** Termux Float app termux.properties secondary file */
+    /** Termux:Float app termux.properties secondary file */
     public static final File TERMUX_FLOAT_PROPERTIES_SECONDARY_FILE = new File(TERMUX_FLOAT_PROPERTIES_SECONDARY_FILE_PATH);
 
 
@@ -1110,15 +1110,15 @@ public static final class RESULT_SENDER {
 
 
     /**
-     * Termux Float app constants.
+     * Termux:Float app constants.
      */
     public static final class TERMUX_FLOAT_APP {
 
-        /** Termux Float app core service name. */
+        /** Termux:Float app core service name. */
         public static final String TERMUX_FLOAT_SERVICE_NAME = TERMUX_FLOAT_PACKAGE_NAME + ".TermuxFloatService"; // Default: "com.termux.window.TermuxFloatService"
 
         /**
-         * Termux Float app core service.
+         * Termux:Float app core service.
          */
         public static final class TERMUX_FLOAT_SERVICE {
 
@@ -1140,7 +1140,7 @@ public static final class TERMUX_FLOAT_SERVICE {
 
 
     /**
-     * Termux Styling app constants.
+     * Termux:Styling app constants.
      */
     public static final class TERMUX_STYLING {
 
@@ -1154,15 +1154,15 @@ public static final class TERMUX_STYLING {
 
 
     /**
-     * Termux Widget app constants.
+     * Termux:Widget app constants.
      */
     public static final class TERMUX_WIDGET {
 
-        /**  Intent {@code String} extra for the token of the Termux Widget app shortcuts. */
+        /**  Intent {@code String} extra for the token of the Termux:Widget app shortcuts. */
         public static final String EXTRA_TOKEN_NAME = TERMUX_PACKAGE_NAME + ".shortcut.token"; // Default: "com.termux.shortcut.token"
 
         /**
-         * Termux Widget app {@link android.appwidget.AppWidgetProvider} class.
+         * Termux:Widget app {@link android.appwidget.AppWidgetProvider} class.
          */
         public static final class TERMUX_WIDGET_PROVIDER {
 
@@ -1181,5 +1181,4 @@ public static final class TERMUX_WIDGET_PROVIDER {
 
     }
 
-
 }

From 5c72c3ca1bd19efb1ecfcfaede0d507277af8580 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sun, 5 Sep 2021 04:24:00 +0500
Subject: [PATCH 545/912] Added: Allow users to disable auto capitalization of
 extra keys text

The user can add `extra-keys-text-all-cap=false` entry to `termux.properties` file to disable auto capitalization of extra keys text for both normal and popup buttons. The default value is `true`. Running `termux-reload-settings` command will also update the behaviour instantaneously if changed.
---
 .../java/com/termux/app/TermuxActivity.java   |  1 +
 .../terminal/io/TerminalToolbarViewPager.java |  1 +
 .../properties/TermuxPropertyConstants.java   | 41 +++++++++++++++----
 .../properties/TermuxSharedProperties.java    | 20 ++++++---
 .../terminal/io/extrakeys/ExtraKeysView.java  | 10 +++++
 5 files changed, 61 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index ee27624844..7a55489223 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -880,6 +880,7 @@ private void reloadActivityStyling() {
             mProperties.loadTermuxPropertiesFromDisk();
 
             if (mExtraKeysView != null) {
+                mExtraKeysView.setButtonTextAllCaps(mProperties.shouldExtraKeysTextBeAllCaps());
                 mExtraKeysView.reload(mProperties.getExtraKeysInfo());
             }
         }
diff --git a/app/src/main/java/com/termux/app/terminal/io/TerminalToolbarViewPager.java b/app/src/main/java/com/termux/app/terminal/io/TerminalToolbarViewPager.java
index 56f28fc0c2..de49b3cd0d 100644
--- a/app/src/main/java/com/termux/app/terminal/io/TerminalToolbarViewPager.java
+++ b/app/src/main/java/com/termux/app/terminal/io/TerminalToolbarViewPager.java
@@ -46,6 +46,7 @@ public Object instantiateItem(@NonNull ViewGroup collection, int position) {
                 ExtraKeysView extraKeysView = (ExtraKeysView) layout;
                 extraKeysView.setExtraKeysViewClient(new TermuxTerminalExtraKeys(mActivity.getTerminalView(),
                     mActivity.getTermuxTerminalViewClient(), mActivity.getTermuxTerminalSessionClient()));
+                extraKeysView.setButtonTextAllCaps(mActivity.getProperties().shouldExtraKeysTextBeAllCaps());
                 mActivity.setExtraKeysView(extraKeysView);
                 extraKeysView.reload(mActivity.getProperties().getExtraKeysInfo());
 
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java b/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java
index 42d4832195..c868450b62 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java
@@ -14,7 +14,7 @@
 import java.util.Set;
 
 /*
- * Version: v0.14.0
+ * Version: v0.15.0
  *
  * Changelog
  *
@@ -63,6 +63,9 @@
  *
  * - 0.14.0 (2021-09-02)
  *      - Add `getTermuxFloatPropertiesFile()`.
+ *
+ * - 0.15.0 (2021-09-05)
+ *      - Add `KEY_EXTRA_KEYS_TEXT_ALL_CAPS`.
  */
 
 /**
@@ -94,6 +97,11 @@ public final class TermuxPropertyConstants {
 
 
 
+    /** Defines the key for whether text for the extra keys buttons should be all capitalized automatically */
+    public static final String KEY_EXTRA_KEYS_TEXT_ALL_CAPS =  "extra-keys-text-all-caps"; // Default: "extra-keys-text-all-caps"
+
+
+
     /** Defines the key for whether to hide soft keyboard when termux app is started */
     public static final String KEY_HIDE_SOFT_KEYBOARD_ON_STARTUP =  "hide-soft-keyboard-on-startup"; // Default: "hide-soft-keyboard-on-startup"
 
@@ -324,6 +332,7 @@ public final class TermuxPropertyConstants {
         KEY_DISABLE_HARDWARE_KEYBOARD_SHORTCUTS,
         KEY_DISABLE_TERMINAL_SESSION_CHANGE_TOAST,
         KEY_ENFORCE_CHAR_BASED_INPUT,
+        KEY_EXTRA_KEYS_TEXT_ALL_CAPS,
         KEY_HIDE_SOFT_KEYBOARD_ON_STARTUP,
         KEY_TERMINAL_ONCLICK_URL_OPEN,
         KEY_USE_BLACK_UI,
@@ -358,12 +367,12 @@ public final class TermuxPropertyConstants {
         KEY_VOLUME_KEYS_BEHAVIOUR
         ));
 
-    /** Defines the set for keys loaded by termux that have default boolean behaviour
+    /** Defines the set for keys loaded by termux that have default boolean behaviour with false as default.
      * "true" -> true
      * "false" -> false
      * default: false
-     * */
-    public static final Set<String> TERMUX_DEFAULT_BOOLEAN_BEHAVIOUR_PROPERTIES_LIST = new HashSet<>(Arrays.asList(
+     */
+    public static final Set<String> TERMUX_DEFAULT_FALSE_BOOLEAN_BEHAVIOUR_PROPERTIES_LIST = new HashSet<>(Arrays.asList(
         KEY_DISABLE_HARDWARE_KEYBOARD_SHORTCUTS,
         KEY_DISABLE_TERMINAL_SESSION_CHANGE_TOAST,
         KEY_ENFORCE_CHAR_BASED_INPUT,
@@ -375,17 +384,35 @@ public final class TermuxPropertyConstants {
         TermuxConstants.PROP_ALLOW_EXTERNAL_APPS
     ));
 
-    /** Defines the set for keys loaded by termux that have default inverted boolean behaviour
+    /** Defines the set for keys loaded by termux that have default boolean behaviour with true as default.
+     * "true" -> true
+     * "false" -> false
+     * default: true
+     */
+    public static final Set<String> TERMUX_DEFAULT_TRUE_BOOLEAN_BEHAVIOUR_PROPERTIES_LIST = new HashSet<>(Arrays.asList(
+        KEY_EXTRA_KEYS_TEXT_ALL_CAPS
+    ));
+
+    /** Defines the set for keys loaded by termux that have default inverted boolean behaviour with false as default.
+     * "false" -> true
+     * "true" -> false
+     * default: false
+     */
+    public static final Set<String> TERMUX_DEFAULT_INVERETED_FALSE_BOOLEAN_BEHAVIOUR_PROPERTIES_LIST = new HashSet<>(Arrays.asList(
+    ));
+
+    /** Defines the set for keys loaded by termux that have default inverted boolean behaviour with true as default.
      * "false" -> true
      * "true" -> false
      * default: true
-     * */
-    public static final Set<String> TERMUX_DEFAULT_INVERETED_BOOLEAN_BEHAVIOUR_PROPERTIES_LIST = new HashSet<>(Arrays.asList(
+     */
+    public static final Set<String> TERMUX_DEFAULT_INVERETED_TRUE_BOOLEAN_BEHAVIOUR_PROPERTIES_LIST = new HashSet<>(Arrays.asList(
     ));
 
 
 
 
+
     /** Returns the first {@link File} found at
      * {@link TermuxConstants#TERMUX_PROPERTIES_PRIMARY_FILE_PATH} or
      * {@link TermuxConstants#TERMUX_PROPERTIES_SECONDARY_FILE_PATH}
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxSharedProperties.java b/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxSharedProperties.java
index 23a3faac73..9ea06acc2b 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxSharedProperties.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxSharedProperties.java
@@ -257,12 +257,18 @@ public static Object getInternalTermuxPropertyValueFromValue(Context context, St
                 return (String) getVolumeKeysBehaviourInternalPropertyValueFromValue(value);
 
             default:
-                // default boolean behaviour
-                if (TermuxPropertyConstants.TERMUX_DEFAULT_BOOLEAN_BEHAVIOUR_PROPERTIES_LIST.contains(key))
+                // default false boolean behaviour
+                if (TermuxPropertyConstants.TERMUX_DEFAULT_FALSE_BOOLEAN_BEHAVIOUR_PROPERTIES_LIST.contains(key))
                     return (boolean) SharedProperties.getBooleanValueForStringValue(key, value, false, true, LOG_TAG);
-                // default inverted boolean behaviour
-                else if (TermuxPropertyConstants.TERMUX_DEFAULT_INVERETED_BOOLEAN_BEHAVIOUR_PROPERTIES_LIST.contains(key))
-                    return (boolean) SharedProperties.getInvertedBooleanValueForStringValue(key, value, true, true, LOG_TAG);
+                // default true boolean behaviour
+                if (TermuxPropertyConstants.TERMUX_DEFAULT_TRUE_BOOLEAN_BEHAVIOUR_PROPERTIES_LIST.contains(key))
+                    return (boolean) SharedProperties.getBooleanValueForStringValue(key, value, true, true, LOG_TAG);
+                // default inverted false boolean behaviour
+                //else if (TermuxPropertyConstants.TERMUX_DEFAULT_INVERETED_FALSE_BOOLEAN_BEHAVIOUR_PROPERTIES_LIST.contains(key))
+                //    return (boolean) SharedProperties.getInvertedBooleanValueForStringValue(key, value, false, true, LOG_TAG);
+                // default inverted true boolean behaviour
+                // else if (TermuxPropertyConstants.TERMUX_DEFAULT_INVERETED_TRUE_BOOLEAN_BEHAVIOUR_PROPERTIES_LIST.contains(key))
+                //    return (boolean) SharedProperties.getInvertedBooleanValueForStringValue(key, value, true, true, LOG_TAG);
                 // just use String object as is (may be null)
                 else
                     return value;
@@ -517,6 +523,10 @@ public boolean isEnforcingCharBasedInput() {
         return (boolean) getInternalPropertyValue(TermuxPropertyConstants.KEY_ENFORCE_CHAR_BASED_INPUT, true);
     }
 
+    public boolean shouldExtraKeysTextBeAllCaps() {
+        return (boolean) getInternalPropertyValue(TermuxPropertyConstants.KEY_EXTRA_KEYS_TEXT_ALL_CAPS, true);
+    }
+
     public boolean shouldSoftKeyboardBeHiddenOnStartup() {
         return (boolean) getInternalPropertyValue(TermuxPropertyConstants.KEY_HIDE_SOFT_KEYBOARD_ON_STARTUP, true);
     }
diff --git a/termux-shared/src/main/java/com/termux/shared/terminal/io/extrakeys/ExtraKeysView.java b/termux-shared/src/main/java/com/termux/shared/terminal/io/extrakeys/ExtraKeysView.java
index 2749787ff0..e149e36dcc 100644
--- a/termux-shared/src/main/java/com/termux/shared/terminal/io/extrakeys/ExtraKeysView.java
+++ b/termux-shared/src/main/java/com/termux/shared/terminal/io/extrakeys/ExtraKeysView.java
@@ -163,6 +163,9 @@ public interface IExtraKeysView {
      * {@link #DEFAULT_BUTTON_ACTIVE_BACKGROUND_COLOR}. */
     private int mButtonActiveBackgroundColor;
 
+    /** Defines whether text for the extra keys button should be all capitalized automatically. */
+    private boolean mButtonTextAllCaps = true;
+
 
     /**
      * Defines the duration in milliseconds before a press turns into a long press. The default
@@ -305,6 +308,11 @@ public void setButtonActiveBackgroundColor(int buttonActiveBackgroundColor) {
         mButtonActiveBackgroundColor = buttonActiveBackgroundColor;
     }
 
+    /** Set {@link #mButtonTextAllCaps}. */
+    public void setButtonTextAllCaps(boolean buttonTextAllCaps) {
+        mButtonTextAllCaps = buttonTextAllCaps;
+    }
+
 
     /** Get {@link #mLongPressTimeout}. */
     public int getLongPressTimeout() {
@@ -382,6 +390,7 @@ public void reload(ExtraKeysInfo extraKeysInfo) {
 
                 button.setText(buttonInfo.getDisplay());
                 button.setTextColor(mButtonTextColor);
+                button.setAllCaps(mButtonTextAllCaps);
                 button.setPadding(0, 0, 0, 0);
 
                 button.setOnClickListener(view -> {
@@ -564,6 +573,7 @@ void showPopup(View view, ExtraKeyButton extraButton) {
             button.setTextColor(mButtonTextColor);
         }
         button.setText(extraButton.getDisplay());
+        button.setAllCaps(mButtonTextAllCaps);
         button.setPadding(0, 0, 0, 0);
         button.setMinHeight(0);
         button.setMinWidth(0);

From f00738fe3a38e2d49be34fb9b7913d029e681ef0 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sun, 5 Sep 2021 10:09:18 +0500
Subject: [PATCH 546/912] Changed: Make sure full path is included in
 FileUtilsErrnos

Previously, `FileUtilsErrno` had some errors that didn't include the full path passed to the `FileUtils` functions and caller had to manually append the path to the error. This was done due to `termux-tasker` plugin config activity was using these errors in the executable and working directory text fields and we had to keep the error short as possible to reduce clutter. Now by default, the path will be included so that its not missing for other cases and the `FileUtils.getShortFileUtilsError()` function is provided to get a shorter version from the original error if its possible to do so if caller like `termux-tasker` requires it.
---
 .../com/termux/app/RunCommandService.java     |  2 -
 app/src/main/res/values/strings.xml           |  6 --
 .../com/termux/shared/file/FileUtils.java     | 88 +++++++++++++------
 .../termux/shared/models/errors/Errno.java    | 25 +++++-
 .../termux/shared/models/errors/Error.java    | 15 +++-
 .../shared/models/errors/FileUtilsErrno.java  | 48 +++++++---
 6 files changed, 135 insertions(+), 49 deletions(-)

diff --git a/app/src/main/java/com/termux/app/RunCommandService.java b/app/src/main/java/com/termux/app/RunCommandService.java
index bc4d64512a..f54f169361 100644
--- a/app/src/main/java/com/termux/app/RunCommandService.java
+++ b/app/src/main/java/com/termux/app/RunCommandService.java
@@ -148,7 +148,6 @@ public int onStartCommand(Intent intent, int flags, int startId) {
             FileUtils.APP_EXECUTABLE_FILE_PERMISSIONS, true, true,
             false);
         if (error != null) {
-            error.appendMessage("\n" + this.getString(R.string.msg_executable_absolute_path, executionCommand.executable));
             executionCommand.setStateFailed(error);
             PluginUtils.processPluginExecutionCommandError(this, LOG_TAG, executionCommand, false);
             return stopService();
@@ -170,7 +169,6 @@ public int onStartCommand(Intent intent, int flags, int startId) {
                 true, true, true,
                 false, true);
             if (error != null) {
-                error.appendMessage("\n" + this.getString(R.string.msg_working_directory_absolute_path, executionCommand.workingDirectory));
                 executionCommand.setStateFailed(error);
                 PluginUtils.processPluginExecutionCommandError(this, LOG_TAG, executionCommand, false);
                 return stopService();
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6b37c06b81..192eddd5b1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -111,12 +111,6 @@
 
 
 
-    <!-- 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 File Receiver -->
     <string name="title_file_received">Save file in ~/downloads/</string>
     <string name="action_file_received_edit">Edit</string>
diff --git a/termux-shared/src/main/java/com/termux/shared/file/FileUtils.java b/termux-shared/src/main/java/com/termux/shared/file/FileUtils.java
index dd057e4c11..c1b5b6fd12 100644
--- a/termux-shared/src/main/java/com/termux/shared/file/FileUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/file/FileUtils.java
@@ -10,6 +10,7 @@
 import com.termux.shared.file.filesystem.FileTypes;
 import com.termux.shared.data.DataUtils;
 import com.termux.shared.logger.Logger;
+import com.termux.shared.models.errors.Errno;
 import com.termux.shared.models.errors.Error;
 import com.termux.shared.models.errors.FileUtilsErrno;
 import com.termux.shared.models.errors.FunctionErrno;
@@ -34,6 +35,7 @@
 import java.nio.file.StandardCopyOption;
 import java.util.Calendar;
 import java.util.Iterator;
+import java.util.List;
 import java.util.regex.Pattern;
 
 public class FileUtils {
@@ -260,7 +262,7 @@ public static Error validateRegularFileExistenceAndPermissions(String label, fin
 
             // If file exists but not a regular file
             if (fileType != FileType.NO_EXIST && fileType != FileType.REGULAR) {
-                return FileUtilsErrno.ERRNO_NON_REGULAR_FILE_FOUND.getError(label + "file");
+                return FileUtilsErrno.ERRNO_NON_REGULAR_FILE_FOUND.getError(label + "file", filePath).setLabel(label + "file");
             }
 
             boolean isPathUnderParentDirPath = false;
@@ -283,7 +285,8 @@ public static Error validateRegularFileExistenceAndPermissions(String label, fin
             // If path is not a regular file
             // Regular files cannot be automatically created so we do not ignore if missing
             if (fileType != FileType.REGULAR) {
-                return FileUtilsErrno.ERRNO_NO_REGULAR_FILE_FOUND.getError(label + "file");
+                label += "regular file";
+                return FileUtilsErrno.ERRNO_FILE_NOT_FOUND_AT_PATH.getError(label, filePath).setLabel(label);
             }
 
             // If there is not parentDirPath restriction or path is not under parentDirPath or
@@ -341,7 +344,7 @@ public static Error validateDirectoryFileExistenceAndPermissions(String label, f
 
             // If file exists but not a directory file
             if (fileType != FileType.NO_EXIST && fileType != FileType.DIRECTORY) {
-                return FileUtilsErrno.ERRNO_NON_DIRECTORY_FILE_FOUND.getError(label + "directory");
+                return FileUtilsErrno.ERRNO_NON_DIRECTORY_FILE_FOUND.getError(label + "directory", filePath).setLabel(label + "directory");
             }
 
             boolean isPathInParentDirPath = false;
@@ -380,7 +383,8 @@ public static Error validateDirectoryFileExistenceAndPermissions(String label, f
                 // If path is not a directory
                 // Directories can be automatically created so we can ignore if missing with above check
                 if (fileType != FileType.DIRECTORY) {
-                    return FileUtilsErrno.ERRNO_FILE_NOT_FOUND_AT_PATH.getError(label + "directory", filePath);
+                    label += "directory";
+                    return FileUtilsErrno.ERRNO_FILE_NOT_FOUND_AT_PATH.getError(label, filePath).setLabel(label);
                 }
 
                 if (permissionsToCheck != null) {
@@ -455,7 +459,7 @@ public static Error createRegularFile(String label, final String filePath,
 
         // If file exists but not a regular file
         if (fileType != FileType.NO_EXIST && fileType != FileType.REGULAR) {
-            return FileUtilsErrno.ERRNO_NON_REGULAR_FILE_FOUND.getError(label + "file");
+            return FileUtilsErrno.ERRNO_NON_REGULAR_FILE_FOUND.getError(label + "file", filePath).setLabel(label + "file");
         }
 
         // If regular file already exists
@@ -645,8 +649,10 @@ public static Error createSymlinkFile(String label, final String targetFilePath,
             // If target file does not exist
             if (targetFileType == FileType.NO_EXIST) {
                 // If dangling symlink should not be allowed, then return with error
-                if (!allowDangling)
-                    return FileUtilsErrno.ERRNO_FILE_NOT_FOUND_AT_PATH.getError(label + "symlink target file", targetFileAbsolutePath);
+                if (!allowDangling) {
+                    label += "symlink target file";
+                    return FileUtilsErrno.ERRNO_FILE_NOT_FOUND_AT_PATH.getError(label, targetFileAbsolutePath).setLabel(label);
+                }
             }
 
             // If destination exists
@@ -920,8 +926,10 @@ public static Error copyOrMoveFile(String label, final String srcFilePath, final
                 if (ignoreNonExistentSrcFile)
                     return null;
                     // Else return with error
-                else
-                    return FileUtilsErrno.ERRNO_FILE_NOT_FOUND_AT_PATH.getError(label + "source file", srcFilePath);
+                else {
+                    label += "source file";
+                    return FileUtilsErrno.ERRNO_FILE_NOT_FOUND_AT_PATH.getError(label, srcFilePath).setLabel(label);
+                }
             }
 
             // If the file type of the source file does not exist in the allowedFileTypeFlags, then return with error
@@ -1121,8 +1129,10 @@ public static Error deleteFile(String label, final String filePath, final boolea
                 if (ignoreNonExistentFile)
                     return null;
                 // Else return with error
-                else
-                    return FileUtilsErrno.ERRNO_FILE_NOT_FOUND_AT_PATH.getError(label + "file meant to be deleted", filePath);
+                else {
+                    label += "file meant to be deleted";
+                    return FileUtilsErrno.ERRNO_FILE_NOT_FOUND_AT_PATH.getError(label, filePath).setLabel(label);
+                }
             }
 
             // If the file type of the file does not exist in the allowedFileTypeFlags
@@ -1224,7 +1234,7 @@ public static Error clearDirectory(String label, final String filePath) {
 
             // If file exists but not a directory file
             if (fileType != FileType.NO_EXIST && fileType != FileType.DIRECTORY) {
-                return FileUtilsErrno.ERRNO_NON_DIRECTORY_FILE_FOUND.getError(label + "directory");
+                return FileUtilsErrno.ERRNO_NON_DIRECTORY_FILE_FOUND.getError(label + "directory", filePath).setLabel(label + "directory");
             }
 
             // If directory exists, clear its contents
@@ -1288,7 +1298,7 @@ public static Error deleteFilesOlderThanXDays(String label, final String filePat
 
             // If file exists but not a directory file
             if (fileType != FileType.NO_EXIST && fileType != FileType.DIRECTORY) {
-                return FileUtilsErrno.ERRNO_NON_DIRECTORY_FILE_FOUND.getError(label + "directory");
+                return FileUtilsErrno.ERRNO_NON_DIRECTORY_FILE_FOUND.getError(label + "directory", filePath).setLabel(label + "directory");
             }
 
             // If file does not exist
@@ -1297,8 +1307,10 @@ public static Error deleteFilesOlderThanXDays(String label, final String filePat
                 if (ignoreNonExistentFile)
                     return null;
                     // Else return with error
-                else
-                    return FileUtilsErrno.ERRNO_FILE_NOT_FOUND_AT_PATH.getError(label + "directory under which files had to be deleted", filePath);
+                else {
+                    label += "directory under which files had to be deleted";
+                    return FileUtilsErrno.ERRNO_FILE_NOT_FOUND_AT_PATH.getError(label, filePath).setLabel(label);
+                }
             }
 
             // If directory exists, delete its contents
@@ -1349,7 +1361,7 @@ public static Error readStringFromFile(String label, final String filePath, Char
 
         // If file exists but not a regular file
         if (fileType != FileType.NO_EXIST && fileType != FileType.REGULAR) {
-            return FileUtilsErrno.ERRNO_NON_REGULAR_FILE_FOUND.getError(label + "file");
+            return FileUtilsErrno.ERRNO_NON_REGULAR_FILE_FOUND.getError(label + "file", filePath).setLabel(label + "file");
         }
 
         // If file does not exist
@@ -1358,8 +1370,10 @@ public static Error readStringFromFile(String label, final String filePath, Char
             if (ignoreNonExistentFile)
                 return null;
                 // Else return with error
-            else
-                return FileUtilsErrno.ERRNO_FILE_NOT_FOUND_AT_PATH.getError(label + "file meant to be read", filePath);
+            else {
+                label += "file meant to be read";
+                return FileUtilsErrno.ERRNO_FILE_NOT_FOUND_AT_PATH.getError(label, filePath).setLabel(label);
+            }
         }
 
         if (charset == null) charset = Charset.defaultCharset();
@@ -1428,7 +1442,7 @@ public static <T extends Serializable> ReadSerializableObjectResult readSerializ
 
         // If file exists but not a regular file
         if (fileType != FileType.NO_EXIST && fileType != FileType.REGULAR) {
-            return new ReadSerializableObjectResult(FileUtilsErrno.ERRNO_NON_REGULAR_FILE_FOUND.getError(label + "file"), null);
+            return new ReadSerializableObjectResult(FileUtilsErrno.ERRNO_NON_REGULAR_FILE_FOUND.getError(label + "file", filePath).setLabel(label + "file"), null);
         }
 
         // If file does not exist
@@ -1437,8 +1451,10 @@ public static <T extends Serializable> ReadSerializableObjectResult readSerializ
             if (ignoreNonExistentFile)
                 return new ReadSerializableObjectResult(null, null);
                 // Else return with error
-            else
-                return new ReadSerializableObjectResult(FileUtilsErrno.ERRNO_FILE_NOT_FOUND_AT_PATH.getError(label + "file meant to be read", filePath), null);
+            else {
+                label += "file meant to be read";
+                return new ReadSerializableObjectResult(FileUtilsErrno.ERRNO_FILE_NOT_FOUND_AT_PATH.getError(label, filePath).setLabel(label), null);
+            }
         }
 
         FileInputStream fileInputStream = null;
@@ -1556,7 +1572,7 @@ private static Error preWriteToFile(String label, String filePath) {
 
         // If file exists but not a regular file
         if (fileType != FileType.NO_EXIST && fileType != FileType.REGULAR) {
-            return FileUtilsErrno.ERRNO_NON_REGULAR_FILE_FOUND.getError(label + "file");
+            return FileUtilsErrno.ERRNO_NON_REGULAR_FILE_FOUND.getError(label + "file", filePath).setLabel(label + "file");
         }
 
         // Create the file parent directory
@@ -1764,17 +1780,17 @@ public static Error checkMissingFilePermissions(String label, final String fileP
 
         // If file is not readable
         if (permissionsToCheck.contains("r") && !file.canRead()) {
-            return FileUtilsErrno.ERRNO_FILE_NOT_READABLE.getError(label + "file");
+            return FileUtilsErrno.ERRNO_FILE_NOT_READABLE.getError(label + "file", filePath).setLabel(label + "file");
         }
 
         // If file is not writable
         if (permissionsToCheck.contains("w") && !file.canWrite()) {
-            return FileUtilsErrno.ERRNO_FILE_NOT_WRITABLE.getError(label + "file");
+            return FileUtilsErrno.ERRNO_FILE_NOT_WRITABLE.getError(label + "file", filePath).setLabel(label + "file");
         }
         // If file is not executable
         // This canExecute() will give "avc: granted { execute }" warnings for target sdk 29
         else if (permissionsToCheck.contains("x") && !file.canExecute() && !ignoreIfNotExecutable) {
-            return FileUtilsErrno.ERRNO_FILE_NOT_EXECUTABLE.getError(label + "file");
+            return FileUtilsErrno.ERRNO_FILE_NOT_EXECUTABLE.getError(label + "file", filePath).setLabel(label + "file");
         }
 
         return null;
@@ -1794,4 +1810,26 @@ public static boolean isValidPermissionString(final String string) {
         return Pattern.compile("^([r-])[w-][x-]$", 0).matcher(string).matches();
     }
 
+
+
+    /**
+     * Get a {@link Error} that contains a shorter version of {@link Errno} message.
+     *
+     * @param error The original {@link Error} returned by one of the {@link FileUtils} functions.
+     * @return Returns the shorter {@link Error} if one exists, otherwise original {@code error}.
+     */
+    public static Error getShortFileUtilsError(final Error error) {
+        String type = error.getType();
+        if (!FileUtilsErrno.TYPE.equals(type)) return error;
+
+        Errno shortErrno = FileUtilsErrno.ERRNO_SHORT_MAPPING.get(Errno.valueOf(type, error.getCode()));
+        if (shortErrno == null) return error;
+
+        List<Throwable> throwables = error.getThrowablesList();
+        if (throwables.isEmpty())
+            return shortErrno.getError(DataUtils.getDefaultIfNull(error.getLabel(), "file"));
+        else
+            return shortErrno.getError(throwables, error.getLabel(), "file");
+    }
+
 }
diff --git a/termux-shared/src/main/java/com/termux/shared/models/errors/Errno.java b/termux-shared/src/main/java/com/termux/shared/models/errors/Errno.java
index ce4c702d84..d330787c91 100644
--- a/termux-shared/src/main/java/com/termux/shared/models/errors/Errno.java
+++ b/termux-shared/src/main/java/com/termux/shared/models/errors/Errno.java
@@ -8,11 +8,14 @@
 
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
 
 /** The {@link Class} that defines error messages and codes. */
 public class Errno {
 
+    private static final HashMap<String, Errno> map = new HashMap<>();
+
     public static final String TYPE = "Error";
 
 
@@ -35,6 +38,7 @@ public Errno(final String type, final int code, final String message) {
         this.type = type;
         this.code = code;
         this.message = message;
+        map.put(type + ":" + code, this);
     }
 
     @NonNull
@@ -56,6 +60,17 @@ public int getCode() {
         return code;
     }
 
+    /**
+     * Get the {@link Errno} of a specific type and code.
+     *
+     * @param type The unique type of the {@link Errno}.
+     * @param code The unique code of the {@link Errno}.
+     */
+    public static Errno valueOf(String type, Integer code) {
+        if (type == null || type.isEmpty() || code == null) return null;
+        return map.get(type + ":" + code);
+    }
+
 
 
     public Error getError() {
@@ -73,12 +88,18 @@ public Error getError(Object... args) {
     }
 
     public Error getError(Throwable throwable, Object... args) {
-        return getError(Collections.singletonList(throwable), args);
+        if (throwable == null)
+            return getError(args);
+        else
+            return getError(Collections.singletonList(throwable), args);
     }
 
     public Error getError(List<Throwable> throwablesList, Object... args) {
         try {
-            return new Error(getType(), getCode(), String.format(getMessage(), args), throwablesList);
+            if (throwablesList == null)
+                return new Error(getType(), getCode(), String.format(getMessage(), args));
+            else
+                return new Error(getType(), getCode(), String.format(getMessage(), args), throwablesList);
         } catch (Exception e) {
             Logger.logWarn(LOG_TAG, "Exception raised while calling String.format() for error message of errno " + this + " with args" + Arrays.toString(args) + "\n" + e.getMessage());
             // Return unformatted message as a backup
diff --git a/termux-shared/src/main/java/com/termux/shared/models/errors/Error.java b/termux-shared/src/main/java/com/termux/shared/models/errors/Error.java
index b9dba33f28..f74f44850b 100644
--- a/termux-shared/src/main/java/com/termux/shared/models/errors/Error.java
+++ b/termux-shared/src/main/java/com/termux/shared/models/errors/Error.java
@@ -12,6 +12,8 @@
 
 public class Error implements Serializable {
 
+    /** The optional error label. */
+    private String label;
     /** The error type. */
     private String type;
     /** The error code. */
@@ -76,7 +78,18 @@ private void InitError(String type, Integer code, String message, List<Throwable
             this.code = Errno.ERRNO_SUCCESS.getCode();
 
         this.message = message;
-        this.throwablesList = throwablesList;
+
+        if (throwablesList != null)
+            this.throwablesList = throwablesList;
+    }
+
+    public Error setLabel(String label) {
+        this.label = label;
+        return this;
+    }
+
+    public String getLabel() {
+        return label;
     }
 
 
diff --git a/termux-shared/src/main/java/com/termux/shared/models/errors/FileUtilsErrno.java b/termux-shared/src/main/java/com/termux/shared/models/errors/FileUtilsErrno.java
index 48b4b09662..f8c701d862 100644
--- a/termux-shared/src/main/java/com/termux/shared/models/errors/FileUtilsErrno.java
+++ b/termux-shared/src/main/java/com/termux/shared/models/errors/FileUtilsErrno.java
@@ -1,5 +1,8 @@
 package com.termux.shared.models.errors;
 
+import java.util.HashMap;
+import java.util.Map;
+
 /** The {@link Class} that defines FileUtils error messages and codes. */
 public class FileUtilsErrno extends Errno {
 
@@ -18,19 +21,20 @@ public class FileUtilsErrno extends Errno {
 
 
     /* Errors for invalid or not found files at path (150-200) */
-    public static final Errno ERRNO_FILE_NOT_FOUND_AT_PATH = new Errno(TYPE, 150, "The %1$s is not found at path \"%2$s\".");
-
-    public static final Errno ERRNO_NO_REGULAR_FILE_FOUND = new Errno(TYPE, 151, "Regular file not found at %1$s path.");
-    public static final Errno ERRNO_NOT_A_REGULAR_FILE = new Errno(TYPE, 152, "The %1$s at path \"%2$s\" is not a regular file.");
+    public static final Errno ERRNO_FILE_NOT_FOUND_AT_PATH = new Errno(TYPE, 150, "The %1$s not found at path \"%2$s\".");
+    public static final Errno ERRNO_FILE_NOT_FOUND_AT_PATH_SHORT = new Errno(TYPE, 151, "The %1$s not found at path.");
 
-    public static final Errno ERRNO_NON_REGULAR_FILE_FOUND = new Errno(TYPE, 153, "Non-regular file found at %1$s path.");
-    public static final Errno ERRNO_NON_DIRECTORY_FILE_FOUND = new Errno(TYPE, 154, "Non-directory file found at %1$s path.");
-    public static final Errno ERRNO_NON_SYMLINK_FILE_FOUND = new Errno(TYPE, 155, "Non-symlink file found at %1$s path.");
+    public static final Errno ERRNO_NON_REGULAR_FILE_FOUND = new Errno(TYPE, 152, "Non-regular file found at %1$s path \"%2$s\".");
+    public static final Errno ERRNO_NON_REGULAR_FILE_FOUND_SHORT = new Errno(TYPE, 153, "Non-regular file found at %1$s path.");
+    public static final Errno ERRNO_NON_DIRECTORY_FILE_FOUND = new Errno(TYPE, 154, "Non-directory file found at %1$s path \"%2$s\".");
+    public static final Errno ERRNO_NON_DIRECTORY_FILE_FOUND_SHORT = new Errno(TYPE, 155, "Non-directory file found at %1$s path.");
+    public static final Errno ERRNO_NON_SYMLINK_FILE_FOUND = new Errno(TYPE, 156, "Non-symlink file found at %1$s path \"%2$s\".");
+    public static final Errno ERRNO_NON_SYMLINK_FILE_FOUND_SHORT = new Errno(TYPE, 157, "Non-symlink file found at %1$s path.");
 
-    public static final Errno ERRNO_FILE_NOT_AN_ALLOWED_FILE_TYPE = new Errno(TYPE, 156, "The %1$s found at path \"%2$s\" is not one of allowed file types \"%3$s\".");
+    public static final Errno ERRNO_FILE_NOT_AN_ALLOWED_FILE_TYPE = new Errno(TYPE, 158, "The %1$s found at path \"%2$s\" is not one of allowed file types \"%3$s\".");
 
-    public static final Errno ERRNO_VALIDATE_FILE_EXISTENCE_AND_PERMISSIONS_FAILED_WITH_EXCEPTION = new Errno(TYPE, 157, "Validating file existence and permissions of %1$s at path \"%2$s\" failed.\nException: %3$s");
-    public static final Errno ERRNO_VALIDATE_DIRECTORY_EXISTENCE_AND_PERMISSIONS_FAILED_WITH_EXCEPTION = new Errno(TYPE, 158, "Validating directory existence and permissions of %1$s at path \"%2$s\" failed.\nException: %3$s");
+    public static final Errno ERRNO_VALIDATE_FILE_EXISTENCE_AND_PERMISSIONS_FAILED_WITH_EXCEPTION = new Errno(TYPE, 159, "Validating file existence and permissions of %1$s at path \"%2$s\" failed.\nException: %3$s");
+    public static final Errno ERRNO_VALIDATE_DIRECTORY_EXISTENCE_AND_PERMISSIONS_FAILED_WITH_EXCEPTION = new Errno(TYPE, 160, "Validating directory existence and permissions of %1$s at path \"%2$s\" failed.\nException: %3$s");
 
 
 
@@ -72,13 +76,31 @@ public class FileUtilsErrno extends Errno {
 
     /* Errors for invalid file permissions (400-450) */
     public static final Errno ERRNO_INVALID_FILE_PERMISSIONS_STRING_TO_CHECK = new Errno(TYPE, 400, "The file permission string to check is invalid.");
-    public static final Errno ERRNO_FILE_NOT_READABLE = new Errno(TYPE, 401, "The %1$s at path is not readable. Permission Denied.");
-    public static final Errno ERRNO_FILE_NOT_WRITABLE = new Errno(TYPE, 402, "The %1$s at path is not writable. Permission Denied.");
-    public static final Errno ERRNO_FILE_NOT_EXECUTABLE = new Errno(TYPE, 403, "The %1$s at path is not executable. Permission Denied.");
+    public static final Errno ERRNO_FILE_NOT_READABLE = new Errno(TYPE, 401, "The %1$s at path \"%2$s\" is not readable. Permission Denied.");
+    public static final Errno ERRNO_FILE_NOT_READABLE_SHORT = new Errno(TYPE, 402, "The %1$s at path is not readable. Permission Denied.");
+    public static final Errno ERRNO_FILE_NOT_WRITABLE = new Errno(TYPE, 403, "The %1$s at path \"%2$s\" is not writable. Permission Denied.");
+    public static final Errno ERRNO_FILE_NOT_WRITABLE_SHORT = new Errno(TYPE, 404, "The %1$s at path is not writable. Permission Denied.");
+    public static final Errno ERRNO_FILE_NOT_EXECUTABLE = new Errno(TYPE, 405, "The %1$s at path \"%2$s\" is not executable. Permission Denied.");
+    public static final Errno ERRNO_FILE_NOT_EXECUTABLE_SHORT = new Errno(TYPE, 406, "The %1$s at path is not executable. Permission Denied.");
 
 
     FileUtilsErrno(final String type, final int code, final String message) {
         super(type, code, message);
     }
 
+
+
+    /** Defines the {@link Errno} mapping to get a shorter version of {@link FileUtilsErrno}. */
+    public static Map<Errno, Errno> ERRNO_SHORT_MAPPING = new HashMap<Errno, Errno>() {{
+        put(ERRNO_FILE_NOT_FOUND_AT_PATH, ERRNO_FILE_NOT_FOUND_AT_PATH_SHORT);
+
+        put(ERRNO_NON_REGULAR_FILE_FOUND, ERRNO_NON_REGULAR_FILE_FOUND_SHORT);
+        put(ERRNO_NON_DIRECTORY_FILE_FOUND, ERRNO_NON_DIRECTORY_FILE_FOUND_SHORT);
+        put(ERRNO_NON_SYMLINK_FILE_FOUND, ERRNO_NON_SYMLINK_FILE_FOUND_SHORT);
+
+        put(ERRNO_FILE_NOT_READABLE, ERRNO_FILE_NOT_READABLE_SHORT);
+        put(ERRNO_FILE_NOT_WRITABLE, ERRNO_FILE_NOT_WRITABLE_SHORT);
+        put(ERRNO_FILE_NOT_EXECUTABLE, ERRNO_FILE_NOT_EXECUTABLE_SHORT);
+    }};
+
 }

From ac32fbc53d8e91a5b7e53d08c06b936699d53ca2 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sun, 5 Sep 2021 14:52:53 +0500
Subject: [PATCH 547/912] Added: Add SharedPreferences
 KEY_LAST_PENDING_INTENT_REQUEST_CODE for termux-tasker

---
 .../preferences/TermuxPreferenceConstants.java      | 13 ++++++++++++-
 .../TermuxTaskerAppSharedPreferences.java           | 10 ++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxPreferenceConstants.java b/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxPreferenceConstants.java
index 2f6c1aa510..5d3d06e183 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxPreferenceConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxPreferenceConstants.java
@@ -1,7 +1,7 @@
 package com.termux.shared.settings.preferences;
 
 /*
- * Version: v0.14.0
+ * Version: v0.15.0
  *
  * Changelog
  *
@@ -61,6 +61,10 @@
  *
  * - 0.14.0 (2021-09-04)
  *      - Added `TERMUX_WIDGET_APP.KEY_TOKEN`.
+ *
+ * - 0.15.0 (2021-09-05)
+ *      - Added following to `TERMUX_TASKER_APP`:
+ *          `KEY_LAST_PENDING_INTENT_REQUEST_CODE` and `DEFAULT_VALUE_KEY_LAST_PENDING_INTENT_REQUEST_CODE`.
  */
 
 /**
@@ -259,6 +263,13 @@ public static final class TERMUX_TASKER_APP {
          */
         public static final String KEY_LOG_LEVEL = "log_level";
 
+
+        /**
+         * Defines the key for last used PendingIntent request code.
+         */
+        public static final String KEY_LAST_PENDING_INTENT_REQUEST_CODE = "last_pending_intent_request_code";
+        public static final int DEFAULT_VALUE_KEY_LAST_PENDING_INTENT_REQUEST_CODE = 0;
+
     }
 
 
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxTaskerAppSharedPreferences.java b/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxTaskerAppSharedPreferences.java
index 61c814def7..87205f43d9 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxTaskerAppSharedPreferences.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxTaskerAppSharedPreferences.java
@@ -84,4 +84,14 @@ public void setLogLevel(Context context, int logLevel, boolean commitToFile) {
         SharedPreferenceUtils.setInt(mSharedPreferences, TERMUX_TASKER_APP.KEY_LOG_LEVEL, logLevel, commitToFile);
     }
 
+
+
+    public int getLastPendingIntentRequestCode() {
+        return SharedPreferenceUtils.getInt(mSharedPreferences, TERMUX_TASKER_APP.KEY_LAST_PENDING_INTENT_REQUEST_CODE, TERMUX_TASKER_APP.DEFAULT_VALUE_KEY_LAST_PENDING_INTENT_REQUEST_CODE);
+    }
+
+    public void setLastPendingIntentRequestCode(int lastPendingIntentRequestCode) {
+        SharedPreferenceUtils.setInt(mSharedPreferences, TERMUX_TASKER_APP.KEY_LAST_PENDING_INTENT_REQUEST_CODE, lastPendingIntentRequestCode, false);
+    }
+
 }

From 1259a212aa15c753fb229c83360121ed375f8eef Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Mon, 6 Sep 2021 01:24:22 +0500
Subject: [PATCH 548/912] Changed: Make allowed custom log level added in
 60f37bde to be more restrictive

---
 .../src/main/java/com/termux/shared/logger/Logger.java          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/logger/Logger.java b/termux-shared/src/main/java/com/termux/shared/logger/Logger.java
index 53c433a03c..33956363ae 100644
--- a/termux-shared/src/main/java/com/termux/shared/logger/Logger.java
+++ b/termux-shared/src/main/java/com/termux/shared/logger/Logger.java
@@ -439,7 +439,7 @@ public static boolean isLogLevelValid(Integer logLevel) {
     /** Check if custom log level is valid and >= {@link #CURRENT_LOG_LEVEL}. If custom log level is
      * not valid then {@link #LOG_LEVEL_VERBOSE} must be >= {@link #CURRENT_LOG_LEVEL}. */
     public static boolean shouldEnableLoggingForCustomLogLevel(Integer customLogLevel) {
-        if (customLogLevel == null || CURRENT_LOG_LEVEL == LOG_LEVEL_OFF) return false;
+        if (customLogLevel == null || CURRENT_LOG_LEVEL <= LOG_LEVEL_OFF || customLogLevel <= LOG_LEVEL_OFF) return false;
         customLogLevel = Logger.isLogLevelValid(customLogLevel) ? customLogLevel: Logger.LOG_LEVEL_VERBOSE;
         return (customLogLevel >= CURRENT_LOG_LEVEL);
     }

From da07826a0c7bd5e9a41537dc181a0fb892607e16 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Mon, 6 Sep 2021 03:54:16 +0500
Subject: [PATCH 549/912] Added: Add TERMUX_IS_DEBUG_BUILD, TERMUX_APK_RELEASE
 and TERMUX_APP_PID to termux shell environment

The `TERMUX_IS_DEBUG_BUILD` env variable will be set to `1` if termux APK is a debuggable APK and `0` otherwise. Note that the `dev_keystore.jks` shipped with termux app and plugin source code can also be used to create a release APK even though its mainly used for Github Debug Builds, in which case value will be `0`.

The `TERMUX_APK_RELEASE` will be set to `GITHUB_DEBUG_BUILD`, `F_DROID` or `GOOGLE_PLAY_STORE` depending on release type. It will be set to `UNKNOWN` if signed with a custom key.

The `TERMUX_APP_PID` will be set to the process of the main app process of the termux app package (`com.termux`), assuming its running when shell is started, like for `termux-float`. This variable is included since `pidof com.termux` does not return anything for release builds. It does work for debug builds and over adb/root. However, you still won't be able to get additional process info with `ps`, like that of threads, even with the pid and will need to use adb/root. However, `kill $TERMUX_APP_PID` will work from `termux-app` and `termux-float`.

These variables can be used by termux devs and users for custom logic in future depending on release type.
---
 .../termux/shared/packages/PackageUtils.java  | 27 +++++++++++++
 .../termux/shared/shell/TermuxShellUtils.java | 39 +++++++++++++++----
 .../com/termux/shared/termux/TermuxUtils.java | 12 ++++++
 3 files changed, 71 insertions(+), 7 deletions(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/packages/PackageUtils.java b/termux-shared/src/main/java/com/termux/shared/packages/PackageUtils.java
index 2698c92fe8..4dc282fb42 100644
--- a/termux-shared/src/main/java/com/termux/shared/packages/PackageUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/packages/PackageUtils.java
@@ -1,5 +1,6 @@
 package com.termux.shared.packages;
 
+import android.app.ActivityManager;
 import android.app.admin.DevicePolicyManager;
 import android.content.ComponentName;
 import android.content.Context;
@@ -248,4 +249,30 @@ public static String getProfileOwnerPackageNameForUser(@NonNull Context context)
         return null;
     }
 
+    /**
+     * Get the process id of the main app process of a package. This will work for sharedUserId. Note
+     * that some apps have multiple processes for the app like with `android:process=":background"`
+     * attribute in AndroidManifest.xml.
+     *
+     * @param context The {@link Context} for operations.
+     * @param packageName The package name of the process.
+     * @return Returns the process if found and running, otherwise {@code null}.
+     */
+    @Nullable
+    public static String getPackagePID(final Context context, String packageName) {
+        ActivityManager activityManager = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
+        if (activityManager != null) {
+            List<ActivityManager.RunningAppProcessInfo> processInfos = activityManager.getRunningAppProcesses();
+            if (processInfos != null) {
+                ActivityManager.RunningAppProcessInfo processInfo;
+                for (int i = 0; i < processInfos.size(); i++) {
+                    processInfo = processInfos.get(i);
+                    if (processInfo.processName.equals(packageName))
+                        return String.valueOf(processInfo.pid);
+                }
+            }
+        }
+        return null;
+    }
+
 }
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/TermuxShellUtils.java b/termux-shared/src/main/java/com/termux/shared/shell/TermuxShellUtils.java
index fade41db30..cd1175dfad 100644
--- a/termux-shared/src/main/java/com/termux/shared/shell/TermuxShellUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/shell/TermuxShellUtils.java
@@ -20,6 +20,11 @@
 
 public class TermuxShellUtils {
 
+    public static String TERMUX_VERSION_NAME;
+    public static String TERMUX_IS_DEBUG_BUILD;
+    public static String TERMUX_APK_RELEASE;
+    public static String TERMUX_APP_PID;
+
     public static String getDefaultWorkingDirectoryPath() {
         return TermuxConstants.TERMUX_HOME_DIR_PATH;
     }
@@ -36,13 +41,16 @@ public static String[] buildEnvironment(Context currentPackageContext, boolean i
 
         List<String> environment = new ArrayList<>();
 
-        // This function may be called by a different package like a plugin, so we get version for Termux package via its context
-        Context termuxPackageContext = TermuxUtils.getTermuxPackageContext(currentPackageContext);
-        if (termuxPackageContext != null) {
-            String termuxVersionName = PackageUtils.getVersionNameForPackage(termuxPackageContext);
-            if (termuxVersionName != null)
-                environment.add("TERMUX_VERSION=" + termuxVersionName);
-        }
+        loadTermuxEnvVariables(currentPackageContext);
+
+        if (TERMUX_VERSION_NAME != null)
+            environment.add("TERMUX_VERSION=" + TERMUX_VERSION_NAME);
+        if (TERMUX_IS_DEBUG_BUILD != null)
+            environment.add("TERMUX_IS_DEBUG_BUILD=" + TERMUX_IS_DEBUG_BUILD);
+        if (TERMUX_APK_RELEASE != null)
+            environment.add("TERMUX_APK_RELEASE=" + TERMUX_APK_RELEASE);
+        if (TERMUX_APP_PID != null)
+            environment.add("TERMUX_APP_PID=" + TERMUX_APP_PID);
 
         environment.add("TERM=xterm-256color");
         environment.add("COLORTERM=truecolor");
@@ -147,4 +155,21 @@ public static void clearTermuxTMPDIR(boolean onlyIfExists) {
         }
     }
 
+    public static void loadTermuxEnvVariables(Context currentPackageContext) {
+        TERMUX_VERSION_NAME = TERMUX_IS_DEBUG_BUILD = TERMUX_APK_RELEASE = TERMUX_APP_PID = null;
+
+        // This function may be called by a different package like a plugin, so we get version for Termux package via its context
+        Context termuxPackageContext = TermuxUtils.getTermuxPackageContext(currentPackageContext);
+        if (termuxPackageContext != null) {
+            TERMUX_VERSION_NAME = PackageUtils.getVersionNameForPackage(termuxPackageContext);
+            TERMUX_IS_DEBUG_BUILD = PackageUtils.isAppForPackageADebugBuild(termuxPackageContext) ? "1" : "0";
+
+            String signingCertificateSHA256Digest = PackageUtils.getSigningCertificateSHA256DigestForPackage(termuxPackageContext);
+            if (signingCertificateSHA256Digest != null)
+                TERMUX_APK_RELEASE = TermuxUtils.getAPKRelease(signingCertificateSHA256Digest).replaceAll("[^a-zA-Z]", "_").toUpperCase();
+
+            TERMUX_APP_PID = TermuxUtils.getTermuxAppPID(currentPackageContext);
+        }
+    }
+
 }
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
index df45a5e9a7..f2b6391ddf 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
@@ -533,4 +533,16 @@ public static String getAPKRelease(String signingCertificateSHA256Digest) {
         }
     }
 
+
+    /**
+     * Get a process id of the main app process of the {@link TermuxConstants#TERMUX_PACKAGE_NAME}
+     * package.
+     *
+     * @param context The context for operations.
+     * @return Returns the process if found and running, otherwise {@code null}.
+     */
+    public static String getTermuxAppPID(final Context context) {
+        return PackageUtils.getPackagePID(context, TermuxConstants.TERMUX_PACKAGE_NAME);
+    }
+
 }

From dd952a90ade33e77b30959abf9d71c80b9702ba7 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Mon, 6 Sep 2021 04:40:49 +0500
Subject: [PATCH 550/912] Changed: Show system chooser if failed to find
 activity to handle url

---
 .../com/termux/shared/interact/ShareUtils.java     | 14 ++++++++++----
 termux-shared/src/main/res/values/strings.xml      |  1 +
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/interact/ShareUtils.java b/termux-shared/src/main/java/com/termux/shared/interact/ShareUtils.java
index c16149551d..cb5aa11d6d 100644
--- a/termux-shared/src/main/java/com/termux/shared/interact/ShareUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/interact/ShareUtils.java
@@ -14,6 +14,7 @@
 
 import com.termux.shared.R;
 import com.termux.shared.data.DataUtils;
+import com.termux.shared.data.IntentUtils;
 import com.termux.shared.file.FileUtils;
 import com.termux.shared.logger.Logger;
 import com.termux.shared.models.errors.Error;
@@ -39,7 +40,11 @@ private static void openSystemAppChooser(final Context context, final Intent int
         chooserIntent.putExtra(Intent.EXTRA_INTENT, intent);
         chooserIntent.putExtra(Intent.EXTRA_TITLE, title);
         chooserIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        context.startActivity(chooserIntent);
+        try {
+            context.startActivity(chooserIntent);
+        } catch (Exception e) {
+            Logger.logStackTraceWithMessage(LOG_TAG, "Failed to open system chooser for:\n" + IntentUtils.getIntentString(chooserIntent), e);
+        }
     }
 
     /**
@@ -88,12 +93,13 @@ public static void copyTextToClipboard(final Context context, final String text,
      */
     public static void openURL(final Context context, final String url) {
         if (context == null || url == null || url.isEmpty()) return;
+        Uri uri = Uri.parse(url);
+        Intent intent = new Intent(Intent.ACTION_VIEW, uri);
         try {
-            Uri uri = Uri.parse(url);
-            Intent intent = new Intent(Intent.ACTION_VIEW, uri);
             context.startActivity(intent);
         } catch (Exception e) {
-            Logger.logStackTraceWithMessage(LOG_TAG, "Failed to open the url \"" + url + "\"", e);
+            // If no activity found to handle intent, show system chooser
+            openSystemAppChooser(context, intent, context.getString(R.string.title_open_url_with));
         }
     }
 
diff --git a/termux-shared/src/main/res/values/strings.xml b/termux-shared/src/main/res/values/strings.xml
index c79d04c19a..3f586c7677 100644
--- a/termux-shared/src/main/res/values/strings.xml
+++ b/termux-shared/src/main/res/values/strings.xml
@@ -43,6 +43,7 @@
 
     <!-- ShareUtils -->
     <string name="title_share_with">Share With</string>
+    <string name="title_open_url_with">Open URL With</string>
     <string name="msg_storage_permission_not_granted">The storage permission not granted."</string>
     <string name="msg_file_saved_successfully">The %1$s file saved successfully at \"%2$s\""</string>
 

From e36c5294dbffa5d4be7c59e573a9c35f7402a9f0 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 8 Sep 2021 08:46:29 +0500
Subject: [PATCH 551/912] Changed: Only show system chooser if
 ActivityNotFoundException is thrown when opening url

---
 .../src/main/java/com/termux/shared/interact/ShareUtils.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/interact/ShareUtils.java b/termux-shared/src/main/java/com/termux/shared/interact/ShareUtils.java
index cb5aa11d6d..030ce47dba 100644
--- a/termux-shared/src/main/java/com/termux/shared/interact/ShareUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/interact/ShareUtils.java
@@ -2,6 +2,7 @@
 
 import android.Manifest;
 import android.app.Activity;
+import android.content.ActivityNotFoundException;
 import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
@@ -97,9 +98,11 @@ public static void openURL(final Context context, final String url) {
         Intent intent = new Intent(Intent.ACTION_VIEW, uri);
         try {
             context.startActivity(intent);
-        } catch (Exception e) {
+        } catch (ActivityNotFoundException e) {
             // If no activity found to handle intent, show system chooser
             openSystemAppChooser(context, intent, context.getString(R.string.title_open_url_with));
+        } catch (Exception e) {
+            Logger.logStackTraceWithMessage(LOG_TAG, "Failed to open url \"" + url + "\"", e);
         }
     }
 

From 7b10a35f24774fd13516c7f92ff36ae22117f741 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 8 Sep 2021 10:59:56 +0500
Subject: [PATCH 552/912] Changed!: Change TERMUX_IS_DEBUG_BUILD env variable
 name to TERMUX_IS_DEBUGGABLE_BUILD and change GITHUB_DEBUG_BUILD release type
 to just GITHUB

This is being done since github release artifacts may be converted to non-debuggable if felt appropriate in future or at least is a more appropriate name. Signing keys can stay same as per commit/push builds. Currently, no changes are planned, just future proofing. The `TERMUX_IS_DEBUGGABLE_BUILD` env variable could be used to differentiate if needed.

Will also check if Termux app is installed and not disabled and will calculate APK signature only when needed since its a slightly expensive operation.

This commit breaks da07826a.
---
 .../termux/shared/packages/PackageUtils.java  | 45 ++++++++++++++++-
 .../termux/shared/shell/TermuxShellUtils.java | 48 +++++++++++--------
 .../termux/shared/termux/AndroidUtils.java    |  2 +-
 .../termux/shared/termux/TermuxConstants.java | 15 ++++--
 .../com/termux/shared/termux/TermuxUtils.java | 29 +++--------
 termux-shared/src/main/res/values/strings.xml |  2 +-
 6 files changed, 92 insertions(+), 49 deletions(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/packages/PackageUtils.java b/termux-shared/src/main/java/com/termux/shared/packages/PackageUtils.java
index 4dc282fb42..cb6bc401a6 100644
--- a/termux-shared/src/main/java/com/termux/shared/packages/PackageUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/packages/PackageUtils.java
@@ -130,7 +130,7 @@ public static int getTargetSDKForPackage(@NonNull final Context context) {
      * @param context The {@link Context} for the package.
      * @return Returns the {@code versionName}. This will be {@code null} if an exception is raised.
      */
-    public static Boolean isAppForPackageADebugBuild(@NonNull final Context context) {
+    public static Boolean isAppForPackageADebuggableBuild(@NonNull final Context context) {
         return ( 0 != ( context.getApplicationInfo().flags & ApplicationInfo.FLAG_DEBUGGABLE ) );
     }
 
@@ -275,4 +275,47 @@ public static String getPackagePID(final Context context, String packageName) {
         return null;
     }
 
+    /**
+     * Check if app is installed and enabled. This can be used by external apps that don't
+     * share `sharedUserId` with the an app.
+     *
+     * If your third-party app is targeting sdk `30` (android `11`), then it needs to add package
+     * name to the `queries` element or request `QUERY_ALL_PACKAGES` permission in its
+     * `AndroidManifest.xml`. Otherwise it will get `PackageSetting{...... package_name/......} BLOCKED`
+     * errors in `logcat` and `RUN_COMMAND` won't work.
+     * Check [package-visibility](https://developer.android.com/training/basics/intents/package-visibility#package-name),
+     * `QUERY_ALL_PACKAGES` [googleplay policy](https://support.google.com/googleplay/android-developer/answer/10158779
+     * and this [article](https://medium.com/androiddevelopers/working-with-package-visibility-dc252829de2d) for more info.
+     *
+     * {@code
+     * <manifest
+     *     <queries>
+     *         <package android:name="package_name" />
+     *    </queries>
+     * </manifest>
+     * }
+     *
+     * @param context The context for operations.
+     * @return Returns {@code errmsg} if {@code packageName} is not installed or disabled, otherwise {@code null}.
+     */
+    public static String isAppInstalled(@NonNull final Context context, String appName, String packageName) {
+        String errmsg = null;
+
+        PackageManager packageManager = context.getPackageManager();
+
+        ApplicationInfo applicationInfo;
+        try {
+            applicationInfo = packageManager.getApplicationInfo(packageName, 0);
+        } catch (final PackageManager.NameNotFoundException e) {
+            applicationInfo = null;
+        }
+        boolean isAppEnabled = (applicationInfo != null && applicationInfo.enabled);
+
+        // If app is not installed or is disabled
+        if (!isAppEnabled)
+            errmsg = context.getString(R.string.error_app_not_installed_or_disabled_warning, appName, packageName);
+
+        return errmsg;
+    }
+
 }
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/TermuxShellUtils.java b/termux-shared/src/main/java/com/termux/shared/shell/TermuxShellUtils.java
index cd1175dfad..aa9ba9e94a 100644
--- a/termux-shared/src/main/java/com/termux/shared/shell/TermuxShellUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/shell/TermuxShellUtils.java
@@ -21,9 +21,9 @@
 public class TermuxShellUtils {
 
     public static String TERMUX_VERSION_NAME;
-    public static String TERMUX_IS_DEBUG_BUILD;
-    public static String TERMUX_APK_RELEASE;
+    public static String TERMUX_IS_DEBUGGABLE_BUILD;
     public static String TERMUX_APP_PID;
+    public static String TERMUX_APK_RELEASE;
 
     public static String getDefaultWorkingDirectoryPath() {
         return TermuxConstants.TERMUX_HOME_DIR_PATH;
@@ -45,12 +45,12 @@ public static String[] buildEnvironment(Context currentPackageContext, boolean i
 
         if (TERMUX_VERSION_NAME != null)
             environment.add("TERMUX_VERSION=" + TERMUX_VERSION_NAME);
-        if (TERMUX_IS_DEBUG_BUILD != null)
-            environment.add("TERMUX_IS_DEBUG_BUILD=" + TERMUX_IS_DEBUG_BUILD);
-        if (TERMUX_APK_RELEASE != null)
-            environment.add("TERMUX_APK_RELEASE=" + TERMUX_APK_RELEASE);
+        if (TERMUX_IS_DEBUGGABLE_BUILD != null)
+            environment.add("TERMUX_IS_DEBUGGABLE_BUILD=" + TERMUX_IS_DEBUGGABLE_BUILD);
         if (TERMUX_APP_PID != null)
             environment.add("TERMUX_APP_PID=" + TERMUX_APP_PID);
+        if (TERMUX_APK_RELEASE != null)
+            environment.add("TERMUX_APK_RELEASE=" + TERMUX_APK_RELEASE);
 
         environment.add("TERM=xterm-256color");
         environment.add("COLORTERM=truecolor");
@@ -156,20 +156,30 @@ public static void clearTermuxTMPDIR(boolean onlyIfExists) {
     }
 
     public static void loadTermuxEnvVariables(Context currentPackageContext) {
-        TERMUX_VERSION_NAME = TERMUX_IS_DEBUG_BUILD = TERMUX_APK_RELEASE = TERMUX_APP_PID = null;
-
-        // This function may be called by a different package like a plugin, so we get version for Termux package via its context
-        Context termuxPackageContext = TermuxUtils.getTermuxPackageContext(currentPackageContext);
-        if (termuxPackageContext != null) {
-            TERMUX_VERSION_NAME = PackageUtils.getVersionNameForPackage(termuxPackageContext);
-            TERMUX_IS_DEBUG_BUILD = PackageUtils.isAppForPackageADebugBuild(termuxPackageContext) ? "1" : "0";
-
-            String signingCertificateSHA256Digest = PackageUtils.getSigningCertificateSHA256DigestForPackage(termuxPackageContext);
-            if (signingCertificateSHA256Digest != null)
-                TERMUX_APK_RELEASE = TermuxUtils.getAPKRelease(signingCertificateSHA256Digest).replaceAll("[^a-zA-Z]", "_").toUpperCase();
-
-            TERMUX_APP_PID = TermuxUtils.getTermuxAppPID(currentPackageContext);
+        String termuxAPKReleaseOld = TERMUX_APK_RELEASE;
+        TERMUX_VERSION_NAME = TERMUX_IS_DEBUGGABLE_BUILD = TERMUX_APP_PID = TERMUX_APK_RELEASE = null;
+
+        // Check if Termux app is installed and not disabled
+        if (TermuxUtils.isTermuxAppInstalled(currentPackageContext) == null) {
+            // This function may be called by a different package like a plugin, so we get version for Termux package via its context
+            Context termuxPackageContext = TermuxUtils.getTermuxPackageContext(currentPackageContext);
+            if (termuxPackageContext != null) {
+                TERMUX_VERSION_NAME = PackageUtils.getVersionNameForPackage(termuxPackageContext);
+                TERMUX_IS_DEBUGGABLE_BUILD = PackageUtils.isAppForPackageADebuggableBuild(termuxPackageContext) ? "1" : "0";
+
+                TERMUX_APP_PID = TermuxUtils.getTermuxAppPID(currentPackageContext);
+
+                // Getting APK signature is a slightly expensive operation, so do it only when needed
+                if (termuxAPKReleaseOld == null) {
+                    String signingCertificateSHA256Digest = PackageUtils.getSigningCertificateSHA256DigestForPackage(termuxPackageContext);
+                    if (signingCertificateSHA256Digest != null)
+                        TERMUX_APK_RELEASE = TermuxUtils.getAPKRelease(signingCertificateSHA256Digest).replaceAll("[^a-zA-Z]", "_").toUpperCase();
+                } else {
+                    TERMUX_APK_RELEASE = termuxAPKReleaseOld;
+                }
+            }
         }
+
     }
 
 }
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/AndroidUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/AndroidUtils.java
index 9306d77ac4..2b1ac94296 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/AndroidUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/AndroidUtils.java
@@ -38,7 +38,7 @@ public static String getAppInfoMarkdownString(@NonNull final Context context) {
         AndroidUtils.appendPropertyToMarkdown(markdownString,"VERSION_NAME", PackageUtils.getVersionNameForPackage(context));
         AndroidUtils.appendPropertyToMarkdown(markdownString,"VERSION_CODE", PackageUtils.getVersionCodeForPackage(context));
         AndroidUtils.appendPropertyToMarkdown(markdownString,"TARGET_SDK", PackageUtils.getTargetSDKForPackage(context));
-        AndroidUtils.appendPropertyToMarkdown(markdownString,"IS_DEBUG_BUILD", PackageUtils.isAppForPackageADebugBuild(context));
+        AndroidUtils.appendPropertyToMarkdown(markdownString,"IS_DEBUGGABLE_BUILD", PackageUtils.isAppForPackageADebuggableBuild(context));
 
         if (PackageUtils.isAppInstalledOnExternalStorage(context)) {
             AndroidUtils.appendPropertyToMarkdown(markdownString,"IS_INSTALLED_ON_EXTERNAL_STORAGE", true);
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
index ecd8a79994..78be2adf38 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
@@ -12,7 +12,7 @@
 import java.util.List;
 
 /*
- * Version: v0.29.0
+ * Version: v0.30.0
  *
  * Changelog
  *
@@ -198,6 +198,11 @@
  *          `ACTION_WIDGET_ITEM_CLICKED`, `ACTION_REFRESH_WIDGET`, `EXTRA_FILE_CLICKED`.
  *      - Changed naming convention of `TERMUX_FLOAT_APP.TERMUX_FLOAT_SERVICE.ACTION_*`.
  *      - Fixed wrong path set for `TERMUX_SHORTCUT_SCRIPTS_DIR_PATH`.
+ *
+ * - 0.30.0 (2021-09-08)
+ *      - Changed `APK_RELEASE_GITHUB_DEBUG_BUILD`to `APK_RELEASE_GITHUB` and
+ *          `APK_RELEASE_GITHUB_DEBUG_BUILD_SIGNING_CERTIFICATE_SHA256_DIGEST` to
+ *          `APK_RELEASE_GITHUB_SIGNING_CERTIFICATE_SHA256_DIGEST`.
  */
 
 /**
@@ -397,11 +402,11 @@ public final class TermuxConstants {
     /** F-Droid APK release signing certificate SHA-256 digest */
     public static final String APK_RELEASE_FDROID_SIGNING_CERTIFICATE_SHA256_DIGEST = "228FB2CFE90831C1499EC3CCAF61E96E8E1CE70766B9474672CE427334D41C42"; // Default: "228FB2CFE90831C1499EC3CCAF61E96E8E1CE70766B9474672CE427334D41C42"
 
-    /** Github Debug Build APK release */
-    public static final String APK_RELEASE_GITHUB_DEBUG_BUILD = "Github Debug Build"; // Default: "Github Debug Build"
+    /** Github APK release */
+    public static final String APK_RELEASE_GITHUB = "Github"; // Default: "Github"
 
-    /** Github Debug Build APK release signing certificate SHA-256 digest */
-    public static final String APK_RELEASE_GITHUB_DEBUG_BUILD_SIGNING_CERTIFICATE_SHA256_DIGEST = "B6DA01480EEFD5FBF2CD3771B8D1021EC791304BDD6C4BF41D3FAABAD48EE5E1"; // Default: "B6DA01480EEFD5FBF2CD3771B8D1021EC791304BDD6C4BF41D3FAABAD48EE5E1"
+    /** Github APK release signing certificate SHA-256 digest */
+    public static final String APK_RELEASE_GITHUB_SIGNING_CERTIFICATE_SHA256_DIGEST = "B6DA01480EEFD5FBF2CD3771B8D1021EC791304BDD6C4BF41D3FAABAD48EE5E1"; // Default: "B6DA01480EEFD5FBF2CD3771B8D1021EC791304BDD6C4BF41D3FAABAD48EE5E1"
 
     /** Google Play Store APK release */
     public static final String APK_RELEASE_GOOGLE_PLAYSTORE = "Google Play Store"; // Default: "Google Play Store"
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
index f2b6391ddf..414f22bc35 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
@@ -124,27 +124,12 @@ public static Context getTermuxWidgetPackageContext(@NonNull Context context) {
      * </manifest>
      * }
      *
-     * @param currentPackageContext The context of current package.
-     * @return Returns {@code errmsg} if termux package is not installed or disabled, otherwise {@code null}.
+     * @param context The context for operations.
+     * @return Returns {@code errmsg} if {@link TermuxConstants#TERMUX_PACKAGE_NAME} is not installed
+     * or disabled, otherwise {@code null}.
      */
-    public static String isTermuxAppInstalled(@NonNull final Context currentPackageContext) {
-        String errmsg = null;
-
-        PackageManager packageManager = currentPackageContext.getPackageManager();
-
-        ApplicationInfo applicationInfo;
-        try {
-            applicationInfo = packageManager.getApplicationInfo(TermuxConstants.TERMUX_PACKAGE_NAME, 0);
-        } catch (final PackageManager.NameNotFoundException e) {
-            applicationInfo = null;
-        }
-        boolean termuxAppEnabled = (applicationInfo != null && applicationInfo.enabled);
-
-        // If Termux app is not installed or is disabled
-        if (!termuxAppEnabled)
-            errmsg = currentPackageContext.getString(R.string.error_termux_app_not_installed_or_disabled_warning);
-
-        return errmsg;
+    public static String isTermuxAppInstalled(@NonNull final Context context) {
+        return PackageUtils.isAppInstalled(context, TermuxConstants.TERMUX_APP_NAME, TermuxConstants.TERMUX_PACKAGE_NAME);
     }
 
     /**
@@ -524,8 +509,8 @@ public static String getAPKRelease(String signingCertificateSHA256Digest) {
         switch (signingCertificateSHA256Digest.toUpperCase()) {
             case TermuxConstants.APK_RELEASE_FDROID_SIGNING_CERTIFICATE_SHA256_DIGEST:
                 return TermuxConstants.APK_RELEASE_FDROID;
-            case TermuxConstants.APK_RELEASE_GITHUB_DEBUG_BUILD_SIGNING_CERTIFICATE_SHA256_DIGEST:
-                return TermuxConstants.APK_RELEASE_GITHUB_DEBUG_BUILD;
+            case TermuxConstants.APK_RELEASE_GITHUB_SIGNING_CERTIFICATE_SHA256_DIGEST:
+                return TermuxConstants.APK_RELEASE_GITHUB;
             case TermuxConstants.APK_RELEASE_GOOGLE_PLAYSTORE_SIGNING_CERTIFICATE_SHA256_DIGEST:
                 return TermuxConstants.APK_RELEASE_GOOGLE_PLAYSTORE;
             default:
diff --git a/termux-shared/src/main/res/values/strings.xml b/termux-shared/src/main/res/values/strings.xml
index 3f586c7677..eda0a4173c 100644
--- a/termux-shared/src/main/res/values/strings.xml
+++ b/termux-shared/src/main/res/values/strings.xml
@@ -19,6 +19,7 @@
 
 
     <!-- PackageUtils -->
+    <string name="error_app_not_installed_or_disabled_warning">The %1$s (%2$s) app is not installed or is disabled."</string>
     <string name="error_get_package_context_failed_title">Failed To Get Package Context</string>
     <string name="error_get_package_context_failed_message">Failed to get package context for the \"%1$s\" package.
         This may be because the app package is not installed or it has different APK signature from the current app.
@@ -74,7 +75,6 @@
         even result in **temporary or permanent** ban. Check %1$s/wiki/Hacking for details.</string>
 
     <string name="msg_termux_app_required_by_app">The &TERMUX_APP_NAME; is required by the %1$s app to run termux commands."</string>
-    <string name="error_termux_app_not_installed_or_disabled_warning">The &TERMUX_APP_NAME; app is not installed or is disabled."</string>
     <string name="error_termux_app_package_context_not_accessible">The &TERMUX_APP_NAME; app (package context) is not accessible."</string>
     <string name="error_termux_prefix_dir_path_not_accessible">The &TERMUX_APP_NAME; app $PREFIX directory is not accessible by the %1$s app.
         This may be because you have not installed or setup &TERMUX_APP_NAME; app or

From 0cf3cef7def14f0bbac7a347bc7e9f51b6b1878c Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 8 Sep 2021 11:24:11 +0500
Subject: [PATCH 553/912] Added: Add TERMUX_API_VERSION to termux shell
 environment

This can be used to check if `Termux:API` is installed and enabled for cases where users try to run `termux-api` commands and it hangs. The check can be added to start of each `termux-api` script during build time by replacing a placeholder with `sed`.

```
if dpkg --compare-versions "$TERMUX_VERSION" ge 0.118 && [ -z "$TERMUX_API_VERSION" ]; then
echo "The Termux:API app is not installed or enabled which is required by termux-api commands to work." 1>&2
exit 1
fi

current_user="$(id -un)"
termux_user="$(stat -c "%U" "/data/data/com.termux/files/usr")"
if [ "$current_user" != "$termux_user" ]; then
echo "The termux-api commands must be run as the termux user \"$termux_user\" instead of as \"$current_user\"." 1>&2
echo "Trying to run with \"su $termux_user -c termux-api-command\" will fail as well." 1>&2
exit 1
fi
```
---
 .../com/termux/shared/shell/TermuxShellUtils.java | 15 +++++++++++++++
 .../com/termux/shared/termux/TermuxUtils.java     | 12 ++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/termux-shared/src/main/java/com/termux/shared/shell/TermuxShellUtils.java b/termux-shared/src/main/java/com/termux/shared/shell/TermuxShellUtils.java
index aa9ba9e94a..c41ca55c46 100644
--- a/termux-shared/src/main/java/com/termux/shared/shell/TermuxShellUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/shell/TermuxShellUtils.java
@@ -25,6 +25,8 @@ public class TermuxShellUtils {
     public static String TERMUX_APP_PID;
     public static String TERMUX_APK_RELEASE;
 
+    public static String TERMUX_API_VERSION_NAME;
+
     public static String getDefaultWorkingDirectoryPath() {
         return TermuxConstants.TERMUX_HOME_DIR_PATH;
     }
@@ -52,6 +54,9 @@ public static String[] buildEnvironment(Context currentPackageContext, boolean i
         if (TERMUX_APK_RELEASE != null)
             environment.add("TERMUX_APK_RELEASE=" + TERMUX_APK_RELEASE);
 
+        if (TERMUX_API_VERSION_NAME != null)
+            environment.add("TERMUX_API_VERSION=" + TERMUX_API_VERSION_NAME);
+
         environment.add("TERM=xterm-256color");
         environment.add("COLORTERM=truecolor");
         environment.add("HOME=" + TermuxConstants.TERMUX_HOME_DIR_PATH);
@@ -180,6 +185,16 @@ public static void loadTermuxEnvVariables(Context currentPackageContext) {
             }
         }
 
+
+        TERMUX_API_VERSION_NAME = null;
+
+        // Check if Termux:API app is installed and not disabled
+        if (TermuxUtils.isTermuxAPIAppInstalled(currentPackageContext) == null) {
+            // This function may be called by a different package like a plugin, so we get version for Termux:API package via its context
+            Context termuxAPIPackageContext = TermuxUtils.getTermuxAPIPackageContext(currentPackageContext);
+            if (termuxAPIPackageContext != null)
+                TERMUX_API_VERSION_NAME = PackageUtils.getVersionNameForPackage(termuxAPIPackageContext);
+        }
     }
 
 }
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
index 414f22bc35..0b5fbf82e4 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
@@ -132,6 +132,18 @@ public static String isTermuxAppInstalled(@NonNull final Context context) {
         return PackageUtils.isAppInstalled(context, TermuxConstants.TERMUX_APP_NAME, TermuxConstants.TERMUX_PACKAGE_NAME);
     }
 
+    /**
+     * Check if Termux:API app is installed and enabled. This can be used by external apps that don't
+     * share `sharedUserId` with the Termux:API app.
+     *
+     * @param context The context for operations.
+     * @return Returns {@code errmsg} if {@link TermuxConstants#TERMUX_API_PACKAGE_NAME} is not installed
+     * or disabled, otherwise {@code null}.
+     */
+    public static String isTermuxAPIAppInstalled(@NonNull final Context context) {
+        return PackageUtils.isAppInstalled(context, TermuxConstants.TERMUX_API_APP_NAME, TermuxConstants.TERMUX_API_PACKAGE_NAME);
+    }
+
     /**
      * Check if Termux app is installed and accessible. This can only be used by apps that share
      * `sharedUserId` with the Termux app.

From 94e01d68d6c915740f6d2a1f7ea1bcdb6bf1f0d5 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 8 Sep 2021 17:53:23 +0500
Subject: [PATCH 554/912] Update README.md

---
 README.md | 75 +++++++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 65 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 0ca3dc0623..ece9cd3b7f 100644
--- a/README.md
+++ b/README.md
@@ -27,6 +27,7 @@ Issue https://github.com/termux/termux-app/issues/1072 needs extra attention.
 - [Uninstallation](#Uninstallation)
 - [Important Links](#Important-Links)
 - [For Devs and Contributors](#For-Devs-and-Contributors)
+- [Forking](#Forking)
 ##
 
 
@@ -49,23 +50,60 @@ 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. 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 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.
 
-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.
+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).
 
 ### F-Droid
 
-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 the building and publishing of the 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.
+Termux application can be obtained from `F-Droid` from [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`. 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.
+
+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.
+
+### 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 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.
 
-### Debug Builds
+If you plan on staying on Play Store sources in future as well, they 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.
 
-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 labelled `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.
+#### Why Disable?
 
-### Google Playstore **(Deprecated)**
+<details>
+<summary></summary>
 
-**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.
+- 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>
 
-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.
 ##
 
 
@@ -78,7 +116,7 @@ To uninstall Termux completely, you must uninstall **any and all existing Termux
 
 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.
 
-Even if you think you have not installed any of the plugins, it’s strongly suggesting to go through the application list in Android settings and double-check.
+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.
 ##
 
 
@@ -114,8 +152,15 @@ 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)
@@ -137,13 +182,23 @@ The main ones are the following.
 - 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 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. 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 [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 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.
 
+
+
+## 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.
+

From 9ffcd21ce11d74455b8a3b8869a1892205cfb207 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 9 Sep 2021 04:34:24 +0500
Subject: [PATCH 555/912] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ece9cd3b7f..a02ba71217 100644
--- a/README.md
+++ b/README.md
@@ -84,7 +84,7 @@ You can backup all your data under `$HOME/` and `$PREFIX/` before changing insta
 
 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, they 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.
+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?
 

From c19e01fc1b9b7a1957737db396f1ff5653486508 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 9 Sep 2021 07:25:22 +0500
Subject: [PATCH 556/912] Changed!: Do not wait for the user to press enter for
 failed terminal session commands if plugin expects the result back

---
 .../terminal/TermuxTerminalSessionClient.java | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java
index 10288bc428..78d25fe3b4 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java
@@ -138,24 +138,36 @@ public void onSessionFinished(final TerminalSession finishedSession) {
             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 (indexOfSession >= 0)
+            if (index >= 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) {
+            if (service.getTermuxSessionsSize() > 1 || isPluginExecutionCommandWithPendingResult) {
                 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) {
+            if (finishedSession.getExitStatus() == 0 || finishedSession.getExitStatus() == 130 || isPluginExecutionCommandWithPendingResult) {
                 removeFinishedSession(finishedSession);
             }
         }

From 783a840e3af8b02d259c545bb80d4b8e6dbb4a88 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 9 Sep 2021 08:19:51 +0500
Subject: [PATCH 557/912] Added: Add MIN_VALUE_EXTRA_SESSION_ACTION and
 MAX_VALUE_EXTRA_SESSION_ACTION to TermuxConstants

---
 .../com/termux/shared/termux/TermuxConstants.java     | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
index 78be2adf38..34237d37f2 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
@@ -12,7 +12,7 @@
 import java.util.List;
 
 /*
- * Version: v0.30.0
+ * Version: v0.31.0
  *
  * Changelog
  *
@@ -203,6 +203,10 @@
  *      - Changed `APK_RELEASE_GITHUB_DEBUG_BUILD`to `APK_RELEASE_GITHUB` and
  *          `APK_RELEASE_GITHUB_DEBUG_BUILD_SIGNING_CERTIFICATE_SHA256_DIGEST` to
  *          `APK_RELEASE_GITHUB_SIGNING_CERTIFICATE_SHA256_DIGEST`.
+ *
+ * - 0.31.0 (2021-09-09)
+ *      - Added following to `TERMUX_APP.TERMUX_SERVICE`:
+ *          `MIN_VALUE_EXTRA_SESSION_ACTION` and `MAX_VALUE_EXTRA_SESSION_ACTION`.
  */
 
 /**
@@ -948,6 +952,11 @@ public static final class TERMUX_SERVICE {
              */
             public static final int VALUE_EXTRA_SESSION_ACTION_KEEP_CURRENT_SESSION_AND_DONT_OPEN_ACTIVITY = 3;
 
+            /** The minimum allowed value for {@link #EXTRA_SESSION_ACTION}. */
+            public static final int MIN_VALUE_EXTRA_SESSION_ACTION = VALUE_EXTRA_SESSION_ACTION_SWITCH_TO_NEW_SESSION_AND_OPEN_ACTIVITY;
+
+            /** The maximum allowed value for {@link #EXTRA_SESSION_ACTION}. */
+            public static final int MAX_VALUE_EXTRA_SESSION_ACTION = VALUE_EXTRA_SESSION_ACTION_KEEP_CURRENT_SESSION_AND_DONT_OPEN_ACTIVITY;
 
 
             /** Intent {@code Bundle} extra to store result of execute command that is sent back for the

From 0b47b20a9cc6c720c904c5488e617f1f7cf41d8a Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 11 Sep 2021 13:48:30 +0500
Subject: [PATCH 558/912] Changed: Minor refactor and comment updates of
 ReportActivity and ReportInfo

---
 .../termux/shared/activities/ReportActivity.java | 16 ++++++++--------
 .../com/termux/shared/models/ReportInfo.java     |  3 +++
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/activities/ReportActivity.java b/termux-shared/src/main/java/com/termux/shared/activities/ReportActivity.java
index b42a5867aa..95f5b338cb 100644
--- a/termux-shared/src/main/java/com/termux/shared/activities/ReportActivity.java
+++ b/termux-shared/src/main/java/com/termux/shared/activities/ReportActivity.java
@@ -35,7 +35,7 @@
 import io.noties.markwon.recycler.SimpleEntry;
 
 /**
- * An activity to show reports in markdown format as per CommonMark spec.
+ * An activity to show reports in markdown format as per CommonMark spec based on config passed as {@link ReportInfo}.
  * Add Following to `AndroidManifest.xml` to use in an app:
  * {@code `<activity android:name="com.termux.shared.activities.ReportActivity" android:theme="@style/Theme.AppCompat.TermuxReportActivity" android:documentLaunchMode="intoExisting" />` }
  * and
@@ -60,10 +60,10 @@ public class ReportActivity extends AppCompatActivity {
 
     public static final int ACTIVITY_TEXT_SIZE_LIMIT_IN_BYTES = 1000 * 1024; // 1MB
 
-    ReportInfo mReportInfo;
-    String mReportInfoFilePath;
-    String mReportActivityMarkdownString;
-    Bundle mBundle;
+    private ReportInfo mReportInfo;
+    private String mReportInfoFilePath;
+    private String mReportActivityMarkdownString;
+    private Bundle mBundle;
 
     private static final String LOG_TAG = "ReportActivity";
 
@@ -111,7 +111,7 @@ private void updateUI() {
         }
 
         mReportInfo = null;
-        mReportInfoFilePath =null;
+        mReportInfoFilePath = null;
 
         if (mBundle.containsKey(EXTRA_REPORT_INFO_OBJECT_FILE_PATH)) {
             mReportInfoFilePath = mBundle.getString(EXTRA_REPORT_INFO_OBJECT_FILE_PATH);
@@ -300,7 +300,7 @@ public static class NewInstanceResult {
      * Start the {@link ReportActivity}.
      *
      * @param context The {@link Context} for operations.
-     * @param reportInfo The {@link ReportInfo} contain info that needs to be displayed.
+     * @param reportInfo The {@link ReportInfo} containing info that needs to be displayed.
      */
     public static void startReportActivity(@NonNull final Context context, @NonNull ReportInfo reportInfo) {
         NewInstanceResult result = newInstance(context, reportInfo);
@@ -321,7 +321,7 @@ public static void startReportActivity(@NonNull final Context context, @NonNull
      * incrementally or at app startup.
      *
      * @param context The {@link Context} for operations.
-     * @param reportInfo The {@link ReportInfo} contain info that needs to be displayed.
+     * @param reportInfo The {@link ReportInfo} containing info that needs to be displayed.
      * @return Returns {@link NewInstanceResult}.
      */
     @NonNull
diff --git a/termux-shared/src/main/java/com/termux/shared/models/ReportInfo.java b/termux-shared/src/main/java/com/termux/shared/models/ReportInfo.java
index 93f103237d..253d9d37a1 100644
--- a/termux-shared/src/main/java/com/termux/shared/models/ReportInfo.java
+++ b/termux-shared/src/main/java/com/termux/shared/models/ReportInfo.java
@@ -5,6 +5,9 @@
 
 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. */

From 5f3b1ccf9012f03cfa5360de43408cb13fe0936c Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 11 Sep 2021 13:50:11 +0500
Subject: [PATCH 559/912] Added: Add getDefaultIfUnset() to DataUtils and
 update comment

---
 .../main/java/com/termux/shared/data/DataUtils.java | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/termux-shared/src/main/java/com/termux/shared/data/DataUtils.java b/termux-shared/src/main/java/com/termux/shared/data/DataUtils.java
index 7c101c73e7..50f0e7ba23 100644
--- a/termux-shared/src/main/java/com/termux/shared/data/DataUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/data/DataUtils.java
@@ -10,6 +10,8 @@
 
 public class DataUtils {
 
+    /** Max safe limit of data size to prevent TransactionTooLargeException when transferring data
+     * inside or to other apps via transactions. */
     public static final int TRANSACTION_SIZE_LIMIT_IN_BYTES = 100 * 1024; // 100KB
 
     private static final char[] HEX_ARRAY = "0123456789ABCDEF".toCharArray();
@@ -171,6 +173,17 @@ public static <T> T getDefaultIfNull(@Nullable T object, @Nullable T def) {
         return (object == null) ? def : object;
     }
 
+    /**
+     * Get the {@link String} itself if it is not {@code null} or empty, otherwise default.
+     *
+     * @param value The {@link String} to check.
+     * @param def The default {@link String}.
+     * @return Returns {@code value} if it is not {@code null} or empty, otherwise returns {@code def}.
+     */
+    public static String getDefaultIfUnset(@Nullable String value, String def) {
+        return (value == null || value.isEmpty()) ? def : value;
+    }
+
     /** Check if a string is null or empty. */
     public static boolean isNullOrEmpty(String string) {
         return string == null || string.isEmpty();

From c3280a94f0b9c7d7c64d5a538fbb50132831acc4 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 11 Sep 2021 13:54:32 +0500
Subject: [PATCH 560/912] Added: Add TextIOActivity and TextIOInfo

The `TextIOActivity` can be used to edit or view text based on various config options defined by `TextIOInfo`
and supports `monospace` font and horizontal scrolling for editing scripts, etc.

Current max text limit is `95KB`, which can be increased in future.
---
 termux-shared/build.gradle                    |   1 +
 .../shared/activities/TextIOActivity.java     | 278 ++++++++++++++++++
 .../com/termux/shared/models/TextIOInfo.java  | 234 +++++++++++++++
 .../src/main/res/layout/activity_text_io.xml  |  93 ++++++
 .../src/main/res/menu/menu_text_io.xml        |  20 ++
 termux-shared/src/main/res/values/strings.xml |   7 +-
 termux-shared/src/main/res/values/styles.xml  |   4 +
 7 files changed, 634 insertions(+), 3 deletions(-)
 create mode 100644 termux-shared/src/main/java/com/termux/shared/activities/TextIOActivity.java
 create mode 100644 termux-shared/src/main/java/com/termux/shared/models/TextIOInfo.java
 create mode 100644 termux-shared/src/main/res/layout/activity_text_io.xml
 create mode 100644 termux-shared/src/main/res/menu/menu_text_io.xml

diff --git a/termux-shared/build.gradle b/termux-shared/build.gradle
index 2d778d9355..a4891703c7 100644
--- a/termux-shared/build.gradle
+++ b/termux-shared/build.gradle
@@ -9,6 +9,7 @@ android {
         implementation "androidx.annotation:annotation:1.2.0"
         implementation "androidx.core:core:1.6.0-rc01"
         implementation "androidx.window:window:1.0.0-alpha09"
+        implementation 'com.google.android.material:material:1.4.0'
         implementation "com.google.guava:guava:24.1-jre"
         implementation "io.noties.markwon:core:$markwonVersion"
         implementation "io.noties.markwon:ext-strikethrough:$markwonVersion"
diff --git a/termux-shared/src/main/java/com/termux/shared/activities/TextIOActivity.java b/termux-shared/src/main/java/com/termux/shared/activities/TextIOActivity.java
new file mode 100644
index 0000000000..7cdf6ab0e2
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/activities/TextIOActivity.java
@@ -0,0 +1,278 @@
+package com.termux.shared.activities;
+
+import android.annotation.SuppressLint;
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.Typeface;
+import android.os.Bundle;
+import android.text.Editable;
+import android.text.InputFilter;
+import android.text.TextWatcher;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.EditText;
+import android.widget.HorizontalScrollView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+
+import com.termux.shared.interact.ShareUtils;
+import com.termux.shared.logger.Logger;
+import com.termux.shared.R;
+import com.termux.shared.models.TextIOInfo;
+import com.termux.shared.view.KeyboardUtils;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Locale;
+
+/**
+ * An activity to edit or view text based on config passed as {@link TextIOInfo}.
+ *
+ * Add Following to `AndroidManifest.xml` to use in an app:
+ *
+ * {@code ` <activity android:name="com.termux.shared.activities.TextIOActivity" android:theme="@style/Theme.AppCompat.TermuxTextIOActivity" />` }
+ */
+public class TextIOActivity extends AppCompatActivity {
+
+    private static final String CLASS_NAME = ReportActivity.class.getCanonicalName();
+    public static final String EXTRA_TEXT_IO_INFO_OBJECT = CLASS_NAME + ".EXTRA_TEXT_IO_INFO_OBJECT";
+
+    private TextView mTextIOLabel;
+    private View mTextIOLabelSeparator;
+    private EditText mTextIOText;
+    private HorizontalScrollView mTextIOHorizontalScrollView;
+    private LinearLayout mTextIOTextLinearLayout;
+    private TextView mTextIOTextCharacterUsage;
+
+    private TextIOInfo mTextIOInfo;
+    private Bundle mBundle;
+
+    private static final String LOG_TAG = "TextIOActivity";
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        Logger.logVerbose(LOG_TAG, "onCreate");
+
+        setContentView(R.layout.activity_text_io);
+
+        mTextIOLabel = findViewById(R.id.text_io_label);
+        mTextIOLabelSeparator = findViewById(R.id.text_io_label_separator);
+        mTextIOText = findViewById(R.id.text_io_text);
+        mTextIOHorizontalScrollView = findViewById(R.id.text_io_horizontal_scroll_view);
+        mTextIOTextLinearLayout = findViewById(R.id.text_io_text_linear_layout);
+        mTextIOTextCharacterUsage = findViewById(R.id.text_io_text_character_usage);
+
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        if (toolbar != null) {
+            setSupportActionBar(toolbar);
+        }
+
+        mBundle = null;
+        Intent intent = getIntent();
+        if (intent != null)
+            mBundle = intent.getExtras();
+        else if (savedInstanceState != null)
+            mBundle = savedInstanceState;
+
+        updateUI();
+    }
+
+    @Override
+    protected void onNewIntent(Intent intent) {
+        super.onNewIntent(intent);
+        Logger.logVerbose(LOG_TAG, "onNewIntent");
+
+        // Views must be re-created since different configs for isEditingTextDisabled() and
+        // isHorizontallyScrollable() will not work or at least reliably
+        finish();
+        startActivity(intent);
+    }
+
+    @SuppressLint("ClickableViewAccessibility")
+    private void updateUI() {
+        if (mBundle == null) {
+            finish(); return;
+        }
+
+        mTextIOInfo = (TextIOInfo) mBundle.getSerializable(EXTRA_TEXT_IO_INFO_OBJECT);
+        if (mTextIOInfo == null) {
+            finish(); return;
+        }
+
+        final ActionBar actionBar = getSupportActionBar();
+        if (actionBar != null) {
+            if (mTextIOInfo.getTitle() != null)
+                actionBar.setTitle(mTextIOInfo.getTitle());
+            else
+                actionBar.setTitle("Text Input");
+
+            if (mTextIOInfo.shouldShowBackButtonInActionBar()) {
+                actionBar.setDisplayHomeAsUpEnabled(true);
+                actionBar.setDisplayShowHomeEnabled(true);
+            }
+        }
+
+        mTextIOLabel.setVisibility(View.GONE);
+        mTextIOLabelSeparator.setVisibility(View.GONE);
+        if (mTextIOInfo.isLabelEnabled()) {
+            mTextIOLabel.setVisibility(View.VISIBLE);
+            mTextIOLabelSeparator.setVisibility(View.VISIBLE);
+            mTextIOLabel.setText(mTextIOInfo.getLabel());
+            mTextIOLabel.setFilters(new InputFilter[] { new InputFilter.LengthFilter(TextIOInfo.LABEL_SIZE_LIMIT_IN_BYTES) });
+            mTextIOLabel.setTextSize(mTextIOInfo.getLabelSize());
+            mTextIOLabel.setTextColor(mTextIOInfo.getLabelColor());
+            mTextIOLabel.setTypeface(Typeface.create(mTextIOInfo.getLabelTypeFaceFamily(), mTextIOInfo.getLabelTypeFaceStyle()));
+        }
+
+
+        if (mTextIOInfo.isHorizontallyScrollable()) {
+            mTextIOHorizontalScrollView.setEnabled(true);
+            mTextIOText.setHorizontallyScrolling(true);
+        } else {
+            // Remove mTextIOHorizontalScrollView and add mTextIOText in its place
+            ViewGroup parent = (ViewGroup) mTextIOHorizontalScrollView.getParent();
+            if (parent != null && parent.indexOfChild(mTextIOText) < 0) {
+                ViewGroup.LayoutParams params = mTextIOHorizontalScrollView.getLayoutParams();
+                int index = parent.indexOfChild(mTextIOHorizontalScrollView);
+                mTextIOTextLinearLayout.removeAllViews();
+                mTextIOHorizontalScrollView.removeAllViews();
+                parent.removeView(mTextIOHorizontalScrollView);
+                parent.addView(mTextIOText, index, params);
+                mTextIOText.setHorizontallyScrolling(false);
+            }
+        }
+
+        mTextIOText.setText(mTextIOInfo.getText());
+        mTextIOText.setFilters(new InputFilter[] { new InputFilter.LengthFilter(mTextIOInfo.getTextLengthLimit()) });
+        mTextIOText.setTextSize(mTextIOInfo.getTextSize());
+        mTextIOText.setTextColor(mTextIOInfo.getTextColor());
+        mTextIOText.setTypeface(Typeface.create(mTextIOInfo.getTextTypeFaceFamily(), mTextIOInfo.getTextTypeFaceStyle()));
+
+        // setTextIsSelectable must be called after changing KeyListener to regain focusability and selectivity
+        if (mTextIOInfo.isEditingTextDisabled()) {
+            mTextIOText.setCursorVisible(false);
+            mTextIOText.setKeyListener(null);
+            mTextIOText.setTextIsSelectable(true);
+        }
+
+        if (mTextIOInfo.shouldShowTextCharacterUsage()) {
+            mTextIOTextCharacterUsage.setVisibility(View.VISIBLE);
+            updateTextIOTextCharacterUsage(mTextIOInfo.getText());
+
+            mTextIOText.addTextChangedListener(new TextWatcher() {
+                @Override
+                public void beforeTextChanged(CharSequence s, int start, int count, int after) {}
+                @Override
+                public void onTextChanged(CharSequence s, int start, int before, int count) {}
+                @Override
+                public void afterTextChanged(Editable editable) {
+                    if (editable != null)
+                        updateTextIOTextCharacterUsage(editable.toString());
+                }
+            });
+        } else {
+            mTextIOTextCharacterUsage.setVisibility(View.GONE);
+            mTextIOText.addTextChangedListener(null);
+        }
+    }
+
+    private void updateTextIOInfoText() {
+        if (mTextIOText != null)
+            mTextIOInfo.setText(mTextIOText.getText().toString());
+    }
+
+    private void updateTextIOTextCharacterUsage(String text) {
+        if (text == null) text = "";
+        if (mTextIOTextCharacterUsage != null)
+            mTextIOTextCharacterUsage.setText(String.format(Locale.getDefault(), "%1$d/%2$d", text.length(), mTextIOInfo.getTextLengthLimit()));
+    }
+
+    @Override
+    public void onSaveInstanceState(@NonNull Bundle outState) {
+        super.onSaveInstanceState(outState);
+
+        updateTextIOInfoText();
+        outState.putSerializable(EXTRA_TEXT_IO_INFO_OBJECT, mTextIOInfo);
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(final Menu menu) {
+        final MenuInflater inflater = getMenuInflater();
+        inflater.inflate(R.menu.menu_text_io, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(final MenuItem item) {
+        String text = "";
+        if (mTextIOText != null)
+            text = mTextIOText.getText().toString();
+
+        int id = item.getItemId();
+        if (id == android.R.id.home) {
+            confirm();
+        } if (id == R.id.menu_item_cancel) {
+            cancel();
+        } else if (id == R.id.menu_item_share_text) {
+            ShareUtils.shareText(this, mTextIOInfo.getTitle(), text);
+        } else if (id == R.id.menu_item_copy_text) {
+            ShareUtils.copyTextToClipboard(this, text, null);
+        }
+
+        return false;
+    }
+
+    @Override
+    public void onBackPressed() {
+        confirm();
+    }
+
+    /** Confirm current text and send it back to calling {@link Activity}. */
+    private void confirm() {
+        updateTextIOInfoText();
+        KeyboardUtils.hideSoftKeyboard(this, mTextIOText);
+        setResult(Activity.RESULT_OK, getResultIntent());
+        finish();
+    }
+
+    /** Cancel current text and notify calling {@link Activity}. */
+    private void cancel() {
+        KeyboardUtils.hideSoftKeyboard(this, mTextIOText);
+        setResult(Activity.RESULT_CANCELED, getResultIntent());
+        finish();
+    }
+
+    @NotNull
+    private Intent getResultIntent() {
+        Intent intent = new Intent();
+        Bundle bundle = new Bundle();
+        bundle.putSerializable(EXTRA_TEXT_IO_INFO_OBJECT, mTextIOInfo);
+        intent.putExtras(bundle);
+        return intent;
+    }
+
+    /**
+     * Get the {@link Intent} that can be used to start the {@link TextIOActivity}.
+     *
+     * @param context The {@link Context} for operations.
+     * @param textIOInfo The {@link TextIOInfo} containing info for the edit text.
+     */
+    public static Intent newInstance(@NonNull final Context context, @NonNull final TextIOInfo textIOInfo) {
+        Intent intent = new Intent(context, TextIOActivity.class);
+        Bundle bundle = new Bundle();
+        bundle.putSerializable(EXTRA_TEXT_IO_INFO_OBJECT, textIOInfo);
+        intent.putExtras(bundle);
+        return intent;
+    }
+
+}
diff --git a/termux-shared/src/main/java/com/termux/shared/models/TextIOInfo.java b/termux-shared/src/main/java/com/termux/shared/models/TextIOInfo.java
new file mode 100644
index 0000000000..df9993afcb
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/models/TextIOInfo.java
@@ -0,0 +1,234 @@
+package com.termux.shared.models;
+
+import android.graphics.Color;
+import android.graphics.Typeface;
+
+import androidx.annotation.NonNull;
+
+import com.termux.shared.activities.TextIOActivity;
+import com.termux.shared.data.DataUtils;
+
+import java.io.Serializable;
+
+/**
+ * An object that stored info for {@link TextIOActivity}.
+ * Max text limit is 95KB to prevent TransactionTooLargeException as per
+ * {@link DataUtils#TRANSACTION_SIZE_LIMIT_IN_BYTES}. Larger size can be supported for in-app
+ * transactions by storing {@link TextIOInfo} as a serialized object in a file like
+ * {@link com.termux.shared.activities.ReportActivity} does.
+ */
+public class TextIOInfo implements Serializable {
+
+    public static final int GENERAL_DATA_SIZE_LIMIT_IN_BYTES = 1000;
+    public static final int LABEL_SIZE_LIMIT_IN_BYTES = 4000;
+    public static final int TEXT_SIZE_LIMIT_IN_BYTES = 100000 - GENERAL_DATA_SIZE_LIMIT_IN_BYTES - LABEL_SIZE_LIMIT_IN_BYTES; // < 100KB
+
+    /** The action for which {@link TextIOActivity} will be started. */
+    private final String mAction;
+    /** The internal app component that is will start the {@link TextIOActivity}. */
+    private final String mSender;
+
+    /** The activity title. */
+    private String mTitle;
+
+    /** If back button should be shown in {@link android.app.ActionBar}. */
+    private boolean mShowBackButtonInActionBar = false;
+
+
+    /** If label is enabled. */
+    private boolean mLabelEnabled = false;
+    /**
+     * The label of text input set in {@link android.widget.TextView} that can be updated by user.
+     * Max allowed length is {@link #LABEL_SIZE_LIMIT_IN_BYTES}.
+     */
+    private String mLabel;
+    /** The text size of label. Defaults to 14sp. */
+    private int mLabelSize = 14;
+    /** The text color of label. Defaults to {@link Color#BLACK}. */
+    private int mLabelColor = Color.BLACK;
+    /** The {@link Typeface} family  of label. Defaults to "sans-serif". */
+    private String mLabelTypeFaceFamily = "sans-serif";
+    /** The {@link Typeface} style  of label. Defaults to {@link Typeface#BOLD}. */
+    private int mLabelTypeFaceStyle = Typeface.BOLD;
+
+
+    /**
+     * The text of text input set in {@link android.widget.EditText} that can be updated by user.
+     * Max allowed length is {@link #TEXT_SIZE_LIMIT_IN_BYTES}.
+     */
+    private String mText;
+    /** The text size for text. Defaults to 12sp. */
+    private int mTextSize = 12;
+    /** The text size for text. Defaults to {@link #TEXT_SIZE_LIMIT_IN_BYTES}. */
+    private int mTextLengthLimit = TEXT_SIZE_LIMIT_IN_BYTES;
+    /** The text color of text. Defaults to {@link Color#BLACK}. */
+    private int mTextColor = Color.BLACK;
+    /** The {@link Typeface} family for text. Defaults to "sans-serif". */
+    private String mTextTypeFaceFamily = "sans-serif";
+    /** The {@link Typeface} style for text. Defaults to {@link Typeface#NORMAL}. */
+    private int mTextTypeFaceStyle = Typeface.NORMAL;
+    /** If horizontal scrolling should be enabled for text. */
+    private boolean mTextHorizontallyScrolling = false;
+    /** If character usage should be enabled for text. */
+    private boolean mShowTextCharacterUsage = false;
+    /** If editing text should be disabled so that text acts like its in a {@link android.widget.TextView}. */
+    private boolean mEditingTextDisabled = false;
+
+
+    public TextIOInfo(@NonNull String action, @NonNull String sender) {
+        mAction = action;
+        mSender = sender;
+    }
+
+
+    public String getAction() {
+        return mAction;
+    }
+
+    public String getSender() {
+        return mSender;
+    }
+
+
+    public String getTitle() {
+        return mTitle;
+    }
+
+    public void setTitle(String title) {
+        mTitle = title;
+    }
+
+    public boolean shouldShowBackButtonInActionBar() {
+        return mShowBackButtonInActionBar;
+    }
+
+    public void setShowBackButtonInActionBar(boolean showBackButtonInActionBar) {
+        mShowBackButtonInActionBar = showBackButtonInActionBar;
+    }
+
+
+    public boolean isLabelEnabled() {
+        return mLabelEnabled;
+    }
+
+    public void setLabelEnabled(boolean labelEnabled) {
+        mLabelEnabled = labelEnabled;
+    }
+
+    public String getLabel() {
+        return mLabel;
+    }
+
+    public void setLabel(String label) {
+        mLabel = DataUtils.getTruncatedCommandOutput(label, LABEL_SIZE_LIMIT_IN_BYTES, true, false, false);
+    }
+
+    public int getLabelSize() {
+        return mLabelSize;
+    }
+
+    public void setLabelSize(int labelSize) {
+        if (labelSize > 0)
+            mLabelSize = labelSize;
+    }
+
+    public int getLabelColor() {
+        return mLabelColor;
+    }
+
+    public void setLabelColor(int labelColor) {
+        mLabelColor = labelColor;
+    }
+
+    public String getLabelTypeFaceFamily() {
+        return mLabelTypeFaceFamily;
+    }
+
+    public void setLabelTypeFaceFamily(String labelTypeFaceFamily) {
+        mLabelTypeFaceFamily = labelTypeFaceFamily;
+    }
+
+    public int getLabelTypeFaceStyle() {
+        return mLabelTypeFaceStyle;
+    }
+
+    public void setLabelTypeFaceStyle(int labelTypeFaceStyle) {
+        mLabelTypeFaceStyle = labelTypeFaceStyle;
+    }
+
+
+    public String getText() {
+        return mText;
+    }
+
+    public void setText(String text) {
+        mText = DataUtils.getTruncatedCommandOutput(text, TEXT_SIZE_LIMIT_IN_BYTES, true, false, false);
+    }
+
+    public int getTextSize() {
+        return mTextSize;
+    }
+
+    public void setTextSize(int textSize) {
+        if (textSize > 0)
+            mTextSize = textSize;
+    }
+
+    public int getTextLengthLimit() {
+        return mTextLengthLimit;
+    }
+
+    public void setTextLengthLimit(int textLengthLimit) {
+        if (textLengthLimit < TEXT_SIZE_LIMIT_IN_BYTES)
+            mTextLengthLimit = textLengthLimit;
+    }
+
+    public int getTextColor() {
+        return mTextColor;
+    }
+
+    public void setTextColor(int textColor) {
+        mTextColor = textColor;
+    }
+
+    public String getTextTypeFaceFamily() {
+        return mTextTypeFaceFamily;
+    }
+
+    public void setTextTypeFaceFamily(String textTypeFaceFamily) {
+        mTextTypeFaceFamily = textTypeFaceFamily;
+    }
+
+    public int getTextTypeFaceStyle() {
+        return mTextTypeFaceStyle;
+    }
+
+    public void setTextTypeFaceStyle(int textTypeFaceStyle) {
+        mTextTypeFaceStyle = textTypeFaceStyle;
+    }
+
+    public boolean isHorizontallyScrollable() {
+        return mTextHorizontallyScrolling;
+    }
+
+    public void setTextHorizontallyScrolling(boolean textHorizontallyScrolling) {
+        mTextHorizontallyScrolling = textHorizontallyScrolling;
+    }
+
+    public boolean shouldShowTextCharacterUsage() {
+        return mShowTextCharacterUsage;
+    }
+
+    public void setShowTextCharacterUsage(boolean showTextCharacterUsage) {
+        mShowTextCharacterUsage = showTextCharacterUsage;
+    }
+
+    public boolean isEditingTextDisabled() {
+        return mEditingTextDisabled;
+    }
+
+    public void setEditingTextDisabled(boolean editingTextDisabled) {
+        mEditingTextDisabled = editingTextDisabled;
+    }
+
+}
diff --git a/termux-shared/src/main/res/layout/activity_text_io.xml b/termux-shared/src/main/res/layout/activity_text_io.xml
new file mode 100644
index 0000000000..3754b9f5c3
--- /dev/null
+++ b/termux-shared/src/main/res/layout/activity_text_io.xml
@@ -0,0 +1,93 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <include
+        layout="@layout/partial_toolbar"
+        android:id="@+id/partial_toolbar"/>
+
+    <TextView
+        android:id="@+id/text_io_label"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="@dimen/content_padding"
+        android:gravity="start|center_vertical"
+        android:textSize="14sp"
+        android:textStyle="bold"
+        android:textColor="@android:color/black"
+        android:visibility="invisible" />
+
+    <View
+        android:id="@+id/text_io_label_separator"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_marginHorizontal="@dimen/content_padding"
+        android:background="@android:color/darker_gray"
+        android:visibility="invisible" />
+
+
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <!-- id must be assigned to scroll views to restore scroll position automatically on activity resume -->
+        <androidx.core.widget.NestedScrollView
+            android:id="@+id/text_io_nested_scroll_view"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:padding="@dimen/content_padding_half"
+            android:fillViewport="true"
+            app:layout_constraintBottom_toTopOf="@+id/text_io_text_character_usage"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical">
+
+                <HorizontalScrollView
+                    android:id="@+id/text_io_horizontal_scroll_view"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:fillViewport="true">
+
+                    <LinearLayout
+                        android:id="@+id/text_io_text_linear_layout"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:orientation="vertical">
+
+                        <EditText
+                            android:id="@+id/text_io_text"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:gravity="start|top"
+                            android:inputType="textMultiLine"
+                            android:importantForAutofill="no"
+                            tools:ignore="LabelFor" />
+                    </LinearLayout>
+
+                </HorizontalScrollView>
+            </LinearLayout>
+        </androidx.core.widget.NestedScrollView>
+
+        <TextView
+            android:id="@+id/text_io_text_character_usage"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingEnd="@dimen/content_padding_half"
+            app:layout_constraintBottom_toBottomOf="parent"
+            android:gravity="end|center_vertical"
+            android:textSize="12sp"
+            android:textColor="@android:color/black"
+            android:visibility="invisible" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</LinearLayout>
diff --git a/termux-shared/src/main/res/menu/menu_text_io.xml b/termux-shared/src/main/res/menu/menu_text_io.xml
new file mode 100644
index 0000000000..192ddad0f7
--- /dev/null
+++ b/termux-shared/src/main/res/menu/menu_text_io.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/menu_item_cancel"
+        android:title="@string/action_cancel"
+        app:showAsAction="never" />
+    <item
+        android:id="@+id/menu_item_share_text"
+        android:icon="@drawable/ic_share"
+        android:title="@string/action_share"
+        app:showAsAction="never" />
+    <item
+        android:id="@+id/menu_item_copy_text"
+        android:icon="@drawable/ic_copy"
+        android:title="@string/action_copy"
+        app:showAsAction="never" />
+
+</menu>
diff --git a/termux-shared/src/main/res/values/strings.xml b/termux-shared/src/main/res/values/strings.xml
index eda0a4173c..070b187074 100644
--- a/termux-shared/src/main/res/values/strings.xml
+++ b/termux-shared/src/main/res/values/strings.xml
@@ -33,9 +33,6 @@
 
 
     <!-- ReportActivity -->
-    <string name="action_copy">Copy</string>
-    <string name="action_share">Share</string>
-    <string name="action_save_to_file">Save To File</string>
     <string name="title_report_text">Report Text</string>
     <string name="msg_report_truncated">**Report Truncated**\n\nReport is too large to view here.
         Use `Save To File` option from options menu (3-dots on top right) and view it in an external text editor app.\n\n##\n\n</string>
@@ -87,6 +84,10 @@
     <!-- Miscellaneous -->
     <string name="action_yes">Yes</string>
     <string name="action_no">No</string>
+    <string name="action_copy">Copy</string>
+    <string name="action_share">Share</string>
+    <string name="action_cancel">Cancel</string>
+    <string name="action_save_to_file">Save To File</string>
 
 
 
diff --git a/termux-shared/src/main/res/values/styles.xml b/termux-shared/src/main/res/values/styles.xml
index 1541ea3945..b6c7a87a0d 100644
--- a/termux-shared/src/main/res/values/styles.xml
+++ b/termux-shared/src/main/res/values/styles.xml
@@ -4,6 +4,10 @@
         <item name="colorPrimaryDark">#FF0000</item>
     </style>
 
+    <style name="Theme.AppCompat.TermuxTextIOActivity" 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>

From 819571a03ae9e4d9c99788f9ef89f352a608eb75 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 11 Sep 2021 19:07:59 +0500
Subject: [PATCH 561/912]  Update README.md

---
 README.md | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index a02ba71217..541214b0e0 100644
--- a/README.md
+++ b/README.md
@@ -58,7 +58,11 @@ In the following paragraphs, *"bootstrap"* refers to the minimal packages that a
 
 ### F-Droid
 
-Termux application can be obtained from `F-Droid` from [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`. 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.
+Termux application can be obtained from `F-Droid` from [here](https://f-droid.org/en/packages/com.termux/).
+
+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.
+
+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.
 
 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.
 
@@ -70,7 +74,7 @@ The APKs for `Github Releases` will be listed under `Assets` drop-down of a rele
 
 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.
+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.
 
@@ -80,6 +84,8 @@ Both universal and architecture specific APKs are released. The APK and bootstra
 
 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.

From 22811167ac4869d3326a20f31890812e1822cf7c Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sun, 12 Sep 2021 10:06:01 +0500
Subject: [PATCH 562/912]  Update README.md

---
 README.md | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 541214b0e0..7af6cd034d 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@ Issue https://github.com/termux/termux-app/issues/1072 needs extra attention.
 - [Installation](#Installation)
 - [Uninstallation](#Uninstallation)
 - [Important Links](#Important-Links)
-- [For Devs and Contributors](#For-Devs-and-Contributors)
+- [For Maintainers and Contributors](#For-Maintainers-and-Contributors)
 - [Forking](#Forking)
 ##
 
@@ -194,17 +194,28 @@ The main ones are the following.
 
 
 
-## For Devs and Contributors
+## For Maintainers 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 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.

From 865f29d49ac8a00a2c98e25b9aa8aea70ba4db69 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sun, 12 Sep 2021 15:50:52 +0500
Subject: [PATCH 563/912] Added: Request android.permission.PACKAGE_USAGE_STATS
 permission

The permission can be granted from `Android Settings` -> `System` -> `Usage Access`.

Closes #2269
---
 app/src/main/AndroidManifest.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 28219d2722..d43f17c302 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -32,6 +32,7 @@
     <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"

From 1a5a66d0ee6726889c2f6c1e92eca67ff519d9a3 Mon Sep 17 00:00:00 2001
From: Trygve Aaberge <trygveaa@gmail.com>
Date: Mon, 7 Jun 2021 17:48:36 +0200
Subject: [PATCH 564/912] Support clicking directly on a URL to open it

This allows you to click/press directly on a URL in the terminal view to
open it. It takes priority over opening the keyboard, so if you click on
a URL it is opened, and if you click anywhere else the keyboard opens
like before.

Currently, if the application in the terminal is tracking the mouse and
you click on a URL, both actions happen. The mouse event is sent to the
application, and the URL is also opened.

To enable support for this, you have to set
`terminal-onclick-url-open=true` in `termux.properties`.
---
 .../terminal/TermuxTerminalViewClient.java    | 34 ++++++++++------
 .../com/termux/terminal/TerminalBuffer.java   | 39 +++++++++++++++++++
 .../com/termux/terminal/ScreenBufferTest.java | 17 ++++++++
 .../java/com/termux/view/TerminalView.java    | 14 ++-----
 .../TextSelectionCursorController.java        | 10 +++--
 5 files changed, 90 insertions(+), 24 deletions(-)

diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
index 62c09ed11d..eb62901f20 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
@@ -25,6 +25,7 @@
 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;
@@ -42,6 +43,7 @@
 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;
 
@@ -172,10 +174,26 @@ public float onScale(float scale) {
 
     @Override
     public void onSingleTapUp(MotionEvent e) {
-        if (!KeyboardUtils.areDisableSoftKeyboardFlagsSet(mActivity))
-            KeyboardUtils.showSoftKeyboard(mActivity, mActivity.getTerminalView());
-        else
-            Logger.logVerbose(LOG_TAG, "Not showing soft keyboard onSingleTapUp since its disabled");
+        TerminalEmulator term = mActivity.getCurrentSession().getEmulator();
+
+        if (mActivity.getProperties().shouldOpenTerminalTranscriptURLOnClick()) {
+            int[] xAndY = mActivity.getTerminalView().getTextSelectionCursorController().getXAndYFromEvent(e);
+            String wordAtTap = term.getScreen().getWordAtLocation(xAndY[0], xAndY[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");
+        }
     }
 
     @Override
@@ -670,13 +688,7 @@ public void showUrlSelection() {
             lv.setOnItemLongClickListener((parent, view, position, id) -> {
                 dialog.dismiss();
                 String url = (String) urls[position];
-                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));
-                }
+                ShareUtils.openURL(mActivity, url);
                 return true;
             });
         });
diff --git a/terminal-emulator/src/main/java/com/termux/terminal/TerminalBuffer.java b/terminal-emulator/src/main/java/com/termux/terminal/TerminalBuffer.java
index 1e3af9dee5..8b898434ff 100644
--- a/terminal-emulator/src/main/java/com/termux/terminal/TerminalBuffer.java
+++ b/terminal-emulator/src/main/java/com/termux/terminal/TerminalBuffer.java
@@ -102,6 +102,45 @@ public String getSelectedText(int selX1, int selY1, int selX2, int selY2, boolea
         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;
     }
diff --git a/terminal-emulator/src/test/java/com/termux/terminal/ScreenBufferTest.java b/terminal-emulator/src/test/java/com/termux/terminal/ScreenBufferTest.java
index 23942bf517..9a8f115ef2 100644
--- a/terminal-emulator/src/test/java/com/termux/terminal/ScreenBufferTest.java
+++ b/terminal-emulator/src/test/java/com/termux/terminal/ScreenBufferTest.java
@@ -45,4 +45,21 @@ public void testGetSelectedTextJoinFullLines() {
 		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));
+	}
 }
diff --git a/terminal-view/src/main/java/com/termux/view/TerminalView.java b/terminal-view/src/main/java/com/termux/view/TerminalView.java
index a6ef7106ec..25773840b7 100644
--- a/terminal-view/src/main/java/com/termux/view/TerminalView.java
+++ b/terminal-view/src/main/java/com/termux/view/TerminalView.java
@@ -94,7 +94,7 @@ public TerminalView(Context context, AttributeSet attributes) { // NO_UCD (unuse
             @Override
             public boolean onUp(MotionEvent event) {
                 mScrollRemainder = 0.0f;
-                if (mEmulator != null && mEmulator.isMouseTrackingActive() && !isSelectingText() && !scrolledWithFinger) {
+                if (mEmulator != null && mEmulator.isMouseTrackingActive() && !event.isFromSource(InputDevice.SOURCE_MOUSE) && !isSelectingText() && !scrolledWithFinger) {
                     // Quick event processing when mouse tracking is active - do not wait for check of double tapping
                     // for zooming.
                     sendMouseEventCode(event, TerminalEmulator.MOUSE_LEFT_BUTTON, true);
@@ -114,13 +114,8 @@ public boolean onSingleTapUp(MotionEvent event) {
                     return true;
                 }
                 requestFocus();
-                if (!mEmulator.isMouseTrackingActive()) {
-                    if (!event.isFromSource(InputDevice.SOURCE_MOUSE)) {
-                        mClient.onSingleTapUp(event);
-                        return true;
-                    }
-                }
-                return false;
+                mClient.onSingleTapUp(event);
+                return true;
             }
 
             @Override
@@ -550,7 +545,6 @@ public boolean onTouchEvent(MotionEvent event) {
                         sendMouseEventCode(event, TerminalEmulator.MOUSE_LEFT_BUTTON_MOVED, true);
                         break;
                 }
-                return true;
             }
         }
 
@@ -1135,7 +1129,7 @@ public void run() {
     /**
      * Define functions required for text selection and its handles.
      */
-    TextSelectionCursorController getTextSelectionCursorController() {
+    public TextSelectionCursorController getTextSelectionCursorController() {
         if (mTextSelectionCursorController == null) {
             mTextSelectionCursorController = new TextSelectionCursorController(this);
 
diff --git a/terminal-view/src/main/java/com/termux/view/textselection/TextSelectionCursorController.java b/terminal-view/src/main/java/com/termux/view/textselection/TextSelectionCursorController.java
index 954bf84c14..fe137a181b 100644
--- a/terminal-view/src/main/java/com/termux/view/textselection/TextSelectionCursorController.java
+++ b/terminal-view/src/main/java/com/termux/view/textselection/TextSelectionCursorController.java
@@ -88,15 +88,19 @@ public void render() {
         }
     }
 
-    public void setInitialTextSelectionPosition(MotionEvent event) {
+    public int[] getXAndYFromEvent(MotionEvent event) {
         int cx = (int) (event.getX() / terminalView.mRenderer.getFontWidth());
         final boolean eventFromMouse = event.isFromSource(InputDevice.SOURCE_MOUSE);
         // Offset for finger:
         final int SELECT_TEXT_OFFSET_Y = eventFromMouse ? 0 : -40;
         int cy = (int) ((event.getY() + SELECT_TEXT_OFFSET_Y) / terminalView.mRenderer.getFontLineSpacing()) + terminalView.getTopRow();
+        return new int[] { cx, cy };
+    }
 
-        mSelX1 = mSelX2 = cx;
-        mSelY1 = mSelY2 = cy;
+    public void setInitialTextSelectionPosition(MotionEvent event) {
+        int[] xAndY = getXAndYFromEvent(event);
+        mSelX1 = mSelX2 = xAndY[0];
+        mSelY1 = mSelY2 = xAndY[1];
 
         TerminalBuffer screen = terminalView.mEmulator.getScreen();
         if (!" ".equals(screen.getSelectedText(mSelX1, mSelY1, mSelX1, mSelY1))) {

From 54bb83de41385b839138ac8d8b6edd75e1b75cab Mon Sep 17 00:00:00 2001
From: Trygve Aaberge <trygveaa@gmail.com>
Date: Tue, 14 Sep 2021 21:06:16 +0200
Subject: [PATCH 565/912] Fix calculation of row number for selection and URL
 clicking

When calculating the row that is clicked, for mouse tracking
mFontLineSpacingAndAscent was taken into account, but for selection and
URL clicking it wasn't. This adds a common function for calculating the
column and row which does take it into account and use that for all
three.

I'm not quite sure why it's necessary to subtract
mFontLineSpacingAndAscent, but with this calculation the click location
matches the line that is acted on for me with both touch and mouse and
on different font sizes.

It also removes the offset for finger the selection/url used because I
don't think it's common for apps on Android to have such an offset, and
because the mouse tracking did not use such an offset.
---
 .../terminal/TermuxTerminalViewClient.java    |  4 +--
 .../java/com/termux/view/TerminalView.java    | 27 ++++++++++++++++---
 .../TextSelectionCursorController.java        | 15 +++--------
 3 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
index eb62901f20..0a565a9aec 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
@@ -177,8 +177,8 @@ public void onSingleTapUp(MotionEvent e) {
         TerminalEmulator term = mActivity.getCurrentSession().getEmulator();
 
         if (mActivity.getProperties().shouldOpenTerminalTranscriptURLOnClick()) {
-            int[] xAndY = mActivity.getTerminalView().getTextSelectionCursorController().getXAndYFromEvent(e);
-            String wordAtTap = term.getScreen().getWordAtLocation(xAndY[0], xAndY[1]);
+            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()) {
diff --git a/terminal-view/src/main/java/com/termux/view/TerminalView.java b/terminal-view/src/main/java/com/termux/view/TerminalView.java
index 25773840b7..2b56d66ea6 100644
--- a/terminal-view/src/main/java/com/termux/view/TerminalView.java
+++ b/terminal-view/src/main/java/com/termux/view/TerminalView.java
@@ -466,10 +466,31 @@ public boolean isOpaque() {
         return true;
     }
 
+    /**
+     * Get the zero indexed column and row of the terminal view for the
+     * position of the event.
+     *
+     * @param event The event with the position to get the column and row for.
+     * @param relativeToScroll If true the column number will take the scroll
+     * position into account. E.g. if scrolled 3 lines up and the event
+     * position is in the top left, column will be -3 if relativeToScroll is
+     * true and 0 if relativeToScroll is false.
+     * @return Array with the column and row.
+     */
+    public int[] getColumnAndRow(MotionEvent event, boolean relativeToScroll) {
+        int column = (int) (event.getX() / mRenderer.mFontWidth);
+        int row = (int) ((event.getY() - mRenderer.mFontLineSpacingAndAscent) / mRenderer.mFontLineSpacing);
+        if (relativeToScroll) {
+            row += mTopRow;
+        }
+        return new int[] { column, row };
+    }
+
     /** Send a single mouse event code to the terminal. */
     void sendMouseEventCode(MotionEvent e, int button, boolean pressed) {
-        int x = (int) (e.getX() / mRenderer.mFontWidth) + 1;
-        int y = (int) ((e.getY() - mRenderer.mFontLineSpacingAndAscent) / mRenderer.mFontLineSpacing) + 1;
+        int[] columnAndRow = getColumnAndRow(e, false);
+        int x = columnAndRow[0] + 1;
+        int y = columnAndRow[1] + 1;
         if (pressed && (button == TerminalEmulator.MOUSE_WHEELDOWN_BUTTON || button == TerminalEmulator.MOUSE_WHEELUP_BUTTON)) {
             if (mMouseStartDownTime == e.getDownTime()) {
                 x = mMouseScrollStartX;
@@ -1129,7 +1150,7 @@ public void run() {
     /**
      * Define functions required for text selection and its handles.
      */
-    public TextSelectionCursorController getTextSelectionCursorController() {
+    TextSelectionCursorController getTextSelectionCursorController() {
         if (mTextSelectionCursorController == null) {
             mTextSelectionCursorController = new TextSelectionCursorController(this);
 
diff --git a/terminal-view/src/main/java/com/termux/view/textselection/TextSelectionCursorController.java b/terminal-view/src/main/java/com/termux/view/textselection/TextSelectionCursorController.java
index fe137a181b..253e8deae6 100644
--- a/terminal-view/src/main/java/com/termux/view/textselection/TextSelectionCursorController.java
+++ b/terminal-view/src/main/java/com/termux/view/textselection/TextSelectionCursorController.java
@@ -88,19 +88,10 @@ public void render() {
         }
     }
 
-    public int[] getXAndYFromEvent(MotionEvent event) {
-        int cx = (int) (event.getX() / terminalView.mRenderer.getFontWidth());
-        final boolean eventFromMouse = event.isFromSource(InputDevice.SOURCE_MOUSE);
-        // Offset for finger:
-        final int SELECT_TEXT_OFFSET_Y = eventFromMouse ? 0 : -40;
-        int cy = (int) ((event.getY() + SELECT_TEXT_OFFSET_Y) / terminalView.mRenderer.getFontLineSpacing()) + terminalView.getTopRow();
-        return new int[] { cx, cy };
-    }
-
     public void setInitialTextSelectionPosition(MotionEvent event) {
-        int[] xAndY = getXAndYFromEvent(event);
-        mSelX1 = mSelX2 = xAndY[0];
-        mSelY1 = mSelY2 = xAndY[1];
+        int[] columnAndRow = terminalView.getColumnAndRow(event, true);
+        mSelX1 = mSelX2 = columnAndRow[0];
+        mSelY1 = mSelY2 = columnAndRow[1];
 
         TerminalBuffer screen = terminalView.mEmulator.getScreen();
         if (!" ".equals(screen.getSelectedText(mSelX1, mSelY1, mSelX1, mSelY1))) {

From fefbf2ec03dd0cfa4b79686f1f9f24c80e9ad17b Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 22 Sep 2021 14:19:19 +0500
Subject: [PATCH 566/912] Update LICENSE.md

---
 termux-shared/LICENSE.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/termux-shared/LICENSE.md b/termux-shared/LICENSE.md
index 9475dfd5ec..64e552771a 100644
--- a/termux-shared/LICENSE.md
+++ b/termux-shared/LICENSE.md
@@ -7,7 +7,7 @@ The `termux-shared` library is released under [GPLv3 only](https://www.gnu.org/l
 - [`src/main/java/com/termux/shared/termux/TermuxConstants.java`](src/main/java/com/termux/shared/termux/TermuxConstants.java).
 - [`src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java`](src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java).
 
-- [`src/main/java/com/termux/shared/activities/ReportActivity.java`](src/main/java/com/termux/shared/activities/ReportActivity.java).
+- [`src/main/java/com/termux/shared/activities/*`](src/main/java/com/termux/shared/activities).
 
 - [`src/main/java/com/termux/shared/crash/CrashHandler.java`](src/main/java/com/termux/shared/crash/CrashHandler.java).
 

From 4f66786b987d1846d42cb1dba542bbfe821b4a37 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 23 Sep 2021 04:58:14 +0500
Subject: [PATCH 567/912] Changed: Store termux-widget token synchronously to
 the SharedPreferences file on creation

Attempt to solve termux/termux-widget#16
---
 .../settings/preferences/TermuxWidgetAppSharedPreferences.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxWidgetAppSharedPreferences.java b/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxWidgetAppSharedPreferences.java
index 2b9022c6c9..df667e3d28 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxWidgetAppSharedPreferences.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxWidgetAppSharedPreferences.java
@@ -84,7 +84,7 @@ public String getGeneratedToken() {
         String token =  SharedPreferenceUtils.getString(mSharedPreferences, TERMUX_WIDGET_APP.KEY_TOKEN, null, true);
         if (token == null) {
             token = UUID.randomUUID().toString();
-            SharedPreferenceUtils.setString(mSharedPreferences, TERMUX_WIDGET_APP.KEY_TOKEN, token, false);
+            SharedPreferenceUtils.setString(mSharedPreferences, TERMUX_WIDGET_APP.KEY_TOKEN, token, true);
         }
         return token;
     }

From 0bf4b1eca47f1e5bdb23761c505fdca7e8b1a0f3 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 23 Sep 2021 16:44:38 +0500
Subject: [PATCH 568/912] Added: Add
 Theme.MaterialComponents.DayNight.TermuxPrimaryActivity theme can be used by
 activities for day and night mode

---
 .../main/res/layout/dialog_show_message.xml   |  2 +-
 .../src/main/res/values-night/themes.xml      | 19 +++++++++
 termux-shared/src/main/res/values/colors.xml  | 14 ++++++-
 termux-shared/src/main/res/values/styles.xml  | 14 -------
 termux-shared/src/main/res/values/themes.xml  | 42 +++++++++++++++++++
 5 files changed, 75 insertions(+), 16 deletions(-)
 create mode 100755 termux-shared/src/main/res/values-night/themes.xml
 delete mode 100644 termux-shared/src/main/res/values/styles.xml
 create mode 100644 termux-shared/src/main/res/values/themes.xml

diff --git a/termux-shared/src/main/res/layout/dialog_show_message.xml b/termux-shared/src/main/res/layout/dialog_show_message.xml
index f5dd82f13c..f1c137c70f 100644
--- a/termux-shared/src/main/res/layout/dialog_show_message.xml
+++ b/termux-shared/src/main/res/layout/dialog_show_message.xml
@@ -7,7 +7,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/dark_red"
+        android:background="@color/red_400"
         android:paddingStart="24dp"
         android:paddingTop="16dp"
         android:paddingEnd="24dp"
diff --git a/termux-shared/src/main/res/values-night/themes.xml b/termux-shared/src/main/res/values-night/themes.xml
new file mode 100755
index 0000000000..53e78c09ba
--- /dev/null
+++ b/termux-shared/src/main/res/values-night/themes.xml
@@ -0,0 +1,19 @@
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <style name="Theme.MaterialComponents.DayNight.TermuxPrimaryActivity" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+        <!-- Primary brand color. -->
+        <item name="colorPrimary">@color/red_400</item>
+        <item name="colorPrimaryVariant">@color/red_800</item>
+        <item name="colorOnPrimary">@color/black</item>
+
+        <!-- Secondary brand color. -->
+        <item name="colorSecondary">@color/grey_900</item>
+        <item name="colorSecondaryVariant">@color/black</item>
+        <item name="colorOnSecondary">@color/white</item>
+
+        <!-- Status bar color. -->
+        <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
+
+        <!-- Text color. -->
+        <item name="android:textColorLink">@color/grey_200</item>
+    </style>
+</resources>
diff --git a/termux-shared/src/main/res/values/colors.xml b/termux-shared/src/main/res/values/colors.xml
index 1b54c29535..4a013f7bc7 100644
--- a/termux-shared/src/main/res/values/colors.xml
+++ b/termux-shared/src/main/res/values/colors.xml
@@ -2,5 +2,17 @@
 <resources>
     <color name="background_markdown_code_inline">#1F000000</color>
     <color name="background_markdown_code_block">#0F000000</color>
-    <color name="dark_red">#FF0000</color>
+
+    <color name="black">#FF000000</color>
+    <color name="white">#FFFFFFFF</color>
+
+    <color name="red_400">#FF0000</color>
+    <color name="red_800">#C4001D</color>
+
+    <color name="grey_200">#EEEEEE</color>
+    <color name="grey_800">#424242</color>
+    <color name="grey_900">#212121</color>
+
+    <color name="red_error">#DC143C</color>
+    <color name="red_error_link">#FC143C</color>
 </resources>
diff --git a/termux-shared/src/main/res/values/styles.xml b/termux-shared/src/main/res/values/styles.xml
deleted file mode 100644
index b6c7a87a0d..0000000000
--- a/termux-shared/src/main/res/values/styles.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-    <style name="Theme.AppCompat.TermuxReportActivity" parent="Theme.AppCompat.Light.NoActionBar">
-        <item name="colorPrimaryDark">#FF0000</item>
-    </style>
-
-    <style name="Theme.AppCompat.TermuxTextIOActivity" 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>
-</resources>
diff --git a/termux-shared/src/main/res/values/themes.xml b/termux-shared/src/main/res/values/themes.xml
new file mode 100644
index 0000000000..41129c9287
--- /dev/null
+++ b/termux-shared/src/main/res/values/themes.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <style name="Theme.MaterialComponents.DayNight.TermuxPrimaryActivity" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+        <!-- Primary brand color. -->
+        <item name="colorPrimary">@color/red_400</item>
+        <item name="colorPrimaryVariant">@color/red_800</item>
+        <item name="colorOnPrimary">@color/white</item>
+
+        <!-- Secondary brand color. -->
+        <item name="colorSecondary">@color/grey_900</item>
+        <item name="colorSecondaryVariant">@color/black</item>
+        <item name="colorOnSecondary">@color/white</item>
+
+        <!-- Status bar color. -->
+        <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
+
+        <!-- Text color. -->
+        <item name="android:textColorPrimary">@color/black</item>
+        <item name="android:textColorLink">@color/grey_800</item>
+        <item name="android:textColorSecondary">@color/white</item>
+    </style>
+
+    <style name="Theme.AppCompat.TermuxReportActivity" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="colorPrimaryDark">#FF0000</item>
+    </style>
+
+    <style name="Theme.AppCompat.TermuxTextIOActivity" 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="ViewDivider">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">1dp</item>
+        <item name="android:layout_marginTop">@dimen/activity_vertical_margin</item>
+        <item name="android:layout_marginBottom">@dimen/activity_vertical_margin</item>
+        <item name="android:background">?android:attr/listDivider</item>
+    </style>
+</resources>

From 075a080f00e7ec637e69cc714c49239718bfda3d Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 23 Sep 2021 16:46:59 +0500
Subject: [PATCH 569/912] Added: Add functions to PackageUtils to check/modify
 app Component states

These can be used by Termux app and its plugin to disable launcher icons/activities if they are enabled at install time
---
 .../termux/shared/packages/PackageUtils.java  | 98 +++++++++++++++++++
 termux-shared/src/main/res/values/strings.xml | 15 +++
 2 files changed, 113 insertions(+)

diff --git a/termux-shared/src/main/java/com/termux/shared/packages/PackageUtils.java b/termux-shared/src/main/java/com/termux/shared/packages/PackageUtils.java
index cb6bc401a6..60997b2730 100644
--- a/termux-shared/src/main/java/com/termux/shared/packages/PackageUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/packages/PackageUtils.java
@@ -4,6 +4,7 @@
 import android.app.admin.DevicePolicyManager;
 import android.content.ComponentName;
 import android.content.Context;
+import android.content.Intent;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
@@ -249,6 +250,8 @@ public static String getProfileOwnerPackageNameForUser(@NonNull Context context)
         return null;
     }
 
+
+
     /**
      * Get the process id of the main app process of a package. This will work for sharedUserId. Note
      * that some apps have multiple processes for the app like with `android:process=":background"`
@@ -275,6 +278,8 @@ public static String getPackagePID(final Context context, String packageName) {
         return null;
     }
 
+
+
     /**
      * Check if app is installed and enabled. This can be used by external apps that don't
      * share `sharedUserId` with the an app.
@@ -318,4 +323,97 @@ public static String isAppInstalled(@NonNull final Context context, String appNa
         return errmsg;
     }
 
+
+
+    /**
+     * Enable or disable a {@link ComponentName} with a call to
+     * {@link PackageManager#setComponentEnabledSetting(ComponentName, int, int)}.
+     *
+     * @param context The {@link Context} for operations.
+     * @param packageName The package name of the component.
+     * @param className The {@link Class} name of the component.
+     * @param state If component should be enabled or disabled.
+     * @param toastString If this is not {@code null} or empty, then a toast before setting state.
+     * @param showErrorMessage If an error message toast should be shown.
+     * @return Returns the errmsg if failed to set state, otherwise {@code null}.
+     */
+    @Nullable
+    public static String setComponentState(@NonNull final Context context, @NonNull String packageName,
+                                         @NonNull String className, boolean state, String toastString,
+                                         boolean showErrorMessage) {
+        try {
+            PackageManager packageManager = context.getPackageManager();
+            if (packageManager != null) {
+                ComponentName componentName = new ComponentName(packageName, className);
+                if (toastString != null) Logger.showToast(context, toastString, true);
+                packageManager.setComponentEnabledSetting(componentName,
+                    state ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED : PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
+                    PackageManager.DONT_KILL_APP);
+            }
+            return null;
+        } catch (final Exception e) {
+            String errmsg = context.getString(
+                state ? R.string.error_enable_component_failed : R.string.error_disable_component_failed,
+                packageName, className) + ": " + e.getMessage();
+            if (showErrorMessage)
+                Logger.showToast(context, errmsg, true);
+            return errmsg;
+        }
+    }
+
+    /**
+     * Check if state of a {@link ComponentName} is {@link PackageManager#COMPONENT_ENABLED_STATE_DISABLED}
+     * with a call to {@link PackageManager#getComponentEnabledSetting(ComponentName)}.
+     *
+     * @param context The {@link Context} for operations.
+     * @param packageName The package name of the component.
+     * @param className The {@link Class} name of the component.
+     * @param logErrorMessage If an error message should be logged.
+     * @return Returns {@code true} if disabled, {@code false} if not and {@code null} if failed to
+     * get the state.
+     */
+    public static Boolean isComponentDisabled(@NonNull final Context context, @NonNull String packageName,
+                                           @NonNull String className, boolean logErrorMessage) {
+        try {
+            PackageManager packageManager = context.getPackageManager();
+            if (packageManager != null) {
+                ComponentName componentName = new ComponentName(packageName, className);
+                // Will throw IllegalArgumentException: Unknown component: ComponentInfo{} if app
+                // for context is not installed or component does not exist.
+                return packageManager.getComponentEnabledSetting(componentName) == PackageManager.COMPONENT_ENABLED_STATE_DISABLED;
+            }
+        } catch (final Exception e) {
+            if (logErrorMessage)
+                Logger.logStackTraceWithMessage(LOG_TAG, context.getString(R.string.error_get_component_state_failed, packageName, className), e);
+        }
+
+        return null;
+    }
+
+    /**
+     * Check if an {@link android.app.Activity} {@link ComponentName} can be called by calling
+     * {@link PackageManager#queryIntentActivities(Intent, int)}.
+     *
+     * @param context The {@link Context} for operations.
+     * @param packageName The package name of the component.
+     * @param className The {@link Class} name of the component.
+     * @param flags The flags to filter results.
+     * @return Returns {@code true} if it exists, otherwise {@code false}.
+     */
+    public static boolean doesActivityComponentExist(@NonNull final Context context, @NonNull String packageName,
+                                              @NonNull String className, int flags) {
+        try {
+            PackageManager packageManager = context.getPackageManager();
+            if (packageManager != null) {
+                Intent intent = new Intent();
+                intent.setClassName(packageName, className);
+                return packageManager.queryIntentActivities(intent, flags).size() > 0;
+            }
+        } catch (final Exception e) {
+            // ignore
+        }
+
+        return false;
+    }
+
 }
diff --git a/termux-shared/src/main/res/values/strings.xml b/termux-shared/src/main/res/values/strings.xml
index 070b187074..06433ecb24 100644
--- a/termux-shared/src/main/res/values/strings.xml
+++ b/termux-shared/src/main/res/values/strings.xml
@@ -24,6 +24,10 @@
     <string name="error_get_package_context_failed_message">Failed to get package context for the \"%1$s\" package.
         This may be because the app package is not installed or it has different APK signature from the current app.
         Check install instruction at %2$s for more details.</string>
+    <string name="error_get_component_state_failed">Failed to get %1$s/%2$s component state"</string>
+    <string name="error_enable_component_failed">Failed to enable %1$s/%2$s component"</string>
+    <string name="error_disable_component_failed">Failed to enable %1$s/%2$s component"</string>
+
 
 
 
@@ -91,6 +95,17 @@
 
 
 
+    <!-- Launcher Icons -->
+    <string name="action_enable_launcher_icon">Enable Launcher Icon</string>
+    <string name="action_disable_launcher_icon">Disable Launcher Icon</string>
+    <string name="msg_enabling_launcher_icon">Enabling %1$s app launcher icon"</string>
+    <string name="msg_disabling_launcher_icon">Disabling %1$s app launcher icon"</string>
+    <string name="setting_launcher_icon_title">Launcher Icon Enabled</string>
+    <string name="setting_launcher_icon_enabled_off">Launcher Icon will be disabled.</string>
+    <string name="setting_launcher_icon_enabled_on">Launcher Icon will be enabled. (Default)</string>
+
+
+
     <!-- Log Level -->
     <string name="log_level_title">Log Level</string>
     <string name="log_level_off">"Off"</string>

From 5e2bec0f4c23d15033eaa043653a63d11e1170a2 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 23 Sep 2021 16:51:08 +0500
Subject: [PATCH 570/912] Added: Add constants for launcher activities of
 termux plugins

---
 .../termux/shared/termux/TermuxConstants.java | 38 ++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
index 34237d37f2..57b619fc6d 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
@@ -12,7 +12,7 @@
 import java.util.List;
 
 /*
- * Version: v0.31.0
+ * Version: v0.32.0
  *
  * Changelog
  *
@@ -207,6 +207,10 @@
  * - 0.31.0 (2021-09-09)
  *      - Added following to `TERMUX_APP.TERMUX_SERVICE`:
  *          `MIN_VALUE_EXTRA_SESSION_ACTION` and `MAX_VALUE_EXTRA_SESSION_ACTION`.
+ *
+ * - 0.32.0 (2021-09-23)
+ *      - Added `TERMUX_API.TERMUX_API_ACTIVITY_NAME`, `TERMUX_TASKER.TERMUX_TASKER_ACTIVITY_NAME`
+ *          and `TERMUX_WIDGET.TERMUX_WIDGET_ACTIVITY_NAME`.
  */
 
 /**
@@ -1123,6 +1127,20 @@ public static final class RESULT_SENDER {
 
 
 
+    /**
+     * Termux:API app constants.
+     */
+    public static final class TERMUX_API {
+
+        /** Termux:API app core activity name. */
+        public static final String TERMUX_API_ACTIVITY_NAME = TERMUX_API_PACKAGE_NAME + ".activities.TermuxAPIActivity"; // Default: "com.termux.tasker.activities.TermuxAPIActivity"
+
+    }
+
+
+
+
+
     /**
      * Termux:Float app constants.
      */
@@ -1167,11 +1185,29 @@ public static final class TERMUX_STYLING {
 
 
 
+    /**
+     * Termux:Tasker app constants.
+     */
+    public static final class TERMUX_TASKER {
+
+        /** Termux:Tasker app core activity name. */
+        public static final String TERMUX_TASKER_ACTIVITY_NAME = TERMUX_TASKER_PACKAGE_NAME + ".activities.TermuxTaskerActivity"; // Default: "com.termux.tasker.activities.TermuxTaskerActivity"
+
+    }
+
+
+
+
+
     /**
      * Termux:Widget app constants.
      */
     public static final class TERMUX_WIDGET {
 
+        /** Termux:Widget app core activity name. */
+        public static final String TERMUX_WIDGET_ACTIVITY_NAME = TERMUX_WIDGET_PACKAGE_NAME + ".activities.TermuxWidgetActivity"; // Default: "com.termux.widget.activities.TermuxWidgetActivity"
+
+
         /**  Intent {@code String} extra for the token of the Termux:Widget app shortcuts. */
         public static final String EXTRA_TOKEN_NAME = TERMUX_PACKAGE_NAME + ".shortcut.token"; // Default: "com.termux.shortcut.token"
 

From 1f0f80b0c95973eaf9b1248176519901c4e98329 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 23 Sep 2021 21:39:51 +0500
Subject: [PATCH 571/912] Added: Add FileUtils.isPathInDirPaths()

---
 .../com/termux/shared/file/FileUtils.java     | 35 +++++++++++++++----
 1 file changed, 29 insertions(+), 6 deletions(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/file/FileUtils.java b/termux-shared/src/main/java/com/termux/shared/file/FileUtils.java
index c1b5b6fd12..6a24dae1ec 100644
--- a/termux-shared/src/main/java/com/termux/shared/file/FileUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/file/FileUtils.java
@@ -34,6 +34,7 @@
 import java.nio.file.LinkOption;
 import java.nio.file.StandardCopyOption;
 import java.util.Calendar;
+import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 import java.util.regex.Pattern;
@@ -144,7 +145,21 @@ public static String sanitizeFileName(String fileName, boolean sanitizeWhitespac
      * @return Returns {@code true} if path in {@code dirPath}, otherwise returns {@code false}.
      */
     public static boolean isPathInDirPath(String path, final String dirPath, final boolean ensureUnder) {
-        if (path == null || dirPath == null) return false;
+       return isPathInDirPaths(path, Collections.singletonList(dirPath), ensureUnder);
+    }
+
+    /**
+     * Determines whether path is in one of the {@code dirPaths}. The {@code dirPaths} are not
+     * canonicalized and only normalized.
+     *
+     * @param path The {@code path} to check.
+     * @param dirPaths The {@code directory paths} to check in.
+     * @param ensureUnder If set to {@code true}, then it will be ensured that {@code path} is
+     *                    under the directories and does not equal it.
+     * @return Returns {@code true} if path in {@code dirPaths}, otherwise returns {@code false}.
+     */
+    public static boolean isPathInDirPaths(String path, final List<String> dirPaths, final boolean ensureUnder) {
+        if (path == null || path.isEmpty() || dirPaths == null || dirPaths.size() < 1) return false;
 
         try {
             path = new File(path).getCanonicalPath();
@@ -152,12 +167,20 @@ public static boolean isPathInDirPath(String path, final String dirPath, final b
             return false;
         }
 
-        String normalizedDirPath = normalizePath(dirPath);
+        boolean isPathInDirPaths;
 
-        if (ensureUnder)
-            return !path.equals(normalizedDirPath) && path.startsWith(normalizedDirPath + "/");
-        else
-            return path.startsWith(normalizedDirPath + "/");
+        for (String dirPath : dirPaths) {
+            String normalizedDirPath = normalizePath(dirPath);
+
+            if (ensureUnder)
+                isPathInDirPaths = !path.equals(normalizedDirPath) && path.startsWith(normalizedDirPath + "/");
+            else
+                isPathInDirPaths = path.startsWith(normalizedDirPath + "/");
+
+            if (isPathInDirPaths) return true;
+        }
+
+        return false;
     }
 
 

From f3ffc36bfd8362700de4ea16b5c60f25a8217d16 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 23 Sep 2021 21:40:37 +0500
Subject: [PATCH 572/912] Added: Add TermuxFileUtils.getExpandedTermuxPaths()
 and TermuxFileUtils.getUnExpandedTermuxPaths()

---
 .../termux/shared/file/TermuxFileUtils.java   | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/termux-shared/src/main/java/com/termux/shared/file/TermuxFileUtils.java b/termux-shared/src/main/java/com/termux/shared/file/TermuxFileUtils.java
index 61e60105e4..5bb1252eec 100644
--- a/termux-shared/src/main/java/com/termux/shared/file/TermuxFileUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/file/TermuxFileUtils.java
@@ -17,12 +17,31 @@
 import com.termux.shared.termux.TermuxUtils;
 
 import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.regex.Pattern;
 
 public class TermuxFileUtils {
 
     private static final String LOG_TAG = "TermuxFileUtils";
 
+    /**
+     * Replace "$PREFIX/" or "~/" prefix with termux absolute paths.
+     *
+     * @param paths The {@code paths} to expand.
+     * @return Returns the {@code expand paths}.
+     */
+    public static List<String> getExpandedTermuxPaths(List<String> paths) {
+        if (paths == null) return null;
+        List<String> expandedPaths = new ArrayList<>();
+
+        for (int i = 0; i < paths.size(); i++) {
+            expandedPaths.add(getExpandedTermuxPath(paths.get(i)));
+        }
+
+        return expandedPaths;
+    }
+
     /**
      * Replace "$PREFIX/" or "~/" prefix with termux absolute paths.
      *
@@ -40,6 +59,23 @@ public static String getExpandedTermuxPath(String path) {
         return path;
     }
 
+    /**
+     * Replace termux absolute paths with "$PREFIX/" or "~/" prefix.
+     *
+     * @param paths The {@code paths} to unexpand.
+     * @return Returns the {@code unexpand paths}.
+     */
+    public static List<String> getUnExpandedTermuxPaths(List<String> paths) {
+        if (paths == null) return null;
+        List<String> unExpandedPaths = new ArrayList<>();
+
+        for (int i = 0; i < paths.size(); i++) {
+            unExpandedPaths.add(getUnExpandedTermuxPath(paths.get(i)));
+        }
+
+        return unExpandedPaths;
+    }
+
     /**
      * Replace termux absolute paths with "$PREFIX/" or "~/" prefix.
      *

From e302a14cd0a9b331ec6a44cbe53023fb8d607a9a Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Fri, 24 Sep 2021 00:29:06 +0500
Subject: [PATCH 573/912] Fixed: Do not allow external apps to modify termux
 properties files with ContentProvider

---
 .../main/java/com/termux/app/TermuxOpenReceiver.java   | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/app/src/main/java/com/termux/app/TermuxOpenReceiver.java b/app/src/main/java/com/termux/app/TermuxOpenReceiver.java
index c85885dc30..a4f7e5bdb8 100644
--- a/app/src/main/java/com/termux/app/TermuxOpenReceiver.java
+++ b/app/src/main/java/com/termux/app/TermuxOpenReceiver.java
@@ -189,6 +189,16 @@ public ParcelFileDescriptor openFile(@NonNull Uri uri, @NonNull String mode) thr
                 if (!(path.startsWith(TermuxConstants.TERMUX_FILES_DIR_PATH) || path.startsWith(storagePath))) {
                     throw new IllegalArgumentException("Invalid path: " + path);
                 }
+
+                // 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);
             }

From dcedf394343f97284359f33a52e264089a335751 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Fri, 24 Sep 2021 00:47:38 +0500
Subject: [PATCH 574/912] Changed: Only allow ContentProvider access if
 allow-external-apps is set to true

---
 app/src/main/java/com/termux/app/RunCommandService.java  | 2 +-
 app/src/main/java/com/termux/app/TermuxOpenReceiver.java | 7 +++++++
 app/src/main/java/com/termux/app/utils/PluginUtils.java  | 8 +++++---
 app/src/main/res/values/strings.xml                      | 9 ++++++---
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/termux/app/RunCommandService.java b/app/src/main/java/com/termux/app/RunCommandService.java
index f54f169361..7939d9c537 100644
--- a/app/src/main/java/com/termux/app/RunCommandService.java
+++ b/app/src/main/java/com/termux/app/RunCommandService.java
@@ -122,7 +122,7 @@ public int onStartCommand(Intent intent, int flags, int startId) {
         // 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.checkIfRunCommandServiceAllowExternalAppsPolicyIsViolated(this);
+        errmsg = PluginUtils.checkIfAllowExternalAppsPolicyIsViolated(this, LOG_TAG);
         if (errmsg != null) {
             executionCommand.setStateFailed(Errno.ERRNO_FAILED.getCode(), errmsg);
             PluginUtils.processPluginExecutionCommandError(this, LOG_TAG, executionCommand, true);
diff --git a/app/src/main/java/com/termux/app/TermuxOpenReceiver.java b/app/src/main/java/com/termux/app/TermuxOpenReceiver.java
index a4f7e5bdb8..b5cb358ec3 100644
--- a/app/src/main/java/com/termux/app/TermuxOpenReceiver.java
+++ b/app/src/main/java/com/termux/app/TermuxOpenReceiver.java
@@ -13,6 +13,7 @@
 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;
@@ -190,6 +191,12 @@ public ParcelFileDescriptor openFile(@NonNull Uri uri, @NonNull String mode) thr
                     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) ||
diff --git a/app/src/main/java/com/termux/app/utils/PluginUtils.java b/app/src/main/java/com/termux/app/utils/PluginUtils.java
index 17fbbdb728..adc165a2b2 100644
--- a/app/src/main/java/com/termux/app/utils/PluginUtils.java
+++ b/app/src/main/java/com/termux/app/utils/PluginUtils.java
@@ -321,10 +321,12 @@ public static void setupPluginCommandErrorsNotificationChannel(final Context con
      * @param context The {@link Context} to get error string.
      * @return Returns the {@code error} if policy is violated, otherwise {@code null}.
      */
-    public static String checkIfRunCommandServiceAllowExternalAppsPolicyIsViolated(final Context context) {
+    public static String checkIfAllowExternalAppsPolicyIsViolated(final Context context, String apiName) {
         String errmsg = null;
-        if (!SharedProperties.isPropertyValueTrue(context, TermuxPropertyConstants.getTermuxPropertiesFile(), TermuxConstants.PROP_ALLOW_EXTERNAL_APPS, true)) {
-            errmsg = context.getString(R.string.error_run_command_service_allow_external_apps_ungranted);
+        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));
         }
 
         return errmsg;
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 192eddd5b1..d5335bf0cb 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -9,7 +9,6 @@
     <!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>
@@ -105,8 +104,6 @@
     <!-- 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 requires `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>
 
 
@@ -118,6 +115,12 @@
 
 
 
+    <!-- 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>
 

From da6174e4c49f2af7fd811149aeb07f437f64083f Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Thu, 7 Oct 2021 20:27:03 +0300
Subject: [PATCH 575/912] bootstrap archives: update to 2021.10.03-r1

---
 app/build.gradle | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 7aec369fe8..6631f3b18c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -176,11 +176,11 @@ clean {
 
 task downloadBootstraps() {
     doLast {
-        def version = "2021.08.18-r1"
-        downloadBootstrap("aarch64", "7136344e7d19de5ca82ab9e2c616c41233a8b42b67f03c49c966c7aef7889b30", version)
-        downloadBootstrap("arm",     "f0587456e2a3d6e0710475bd6fc39c089b3a8c0b26965a67cf470898caea4fdc", version)
-        downloadBootstrap("i686",    "9be0b2251ea56b885615f748e53b0b9c56f3b071e62cb183d5aa34b37d8a8150", version)
-        downloadBootstrap("x86_64",  "54dcd7cb52e3041651275191019158c7f0e3d043cf061411f7fb9715300cbccf", version)
+        def version = "2021.10.03-r1"
+        downloadBootstrap("aarch64", "abba0bab1155ca081b96556f5ac69c7f85f332f67665503fc488a82338a739de", version)
+        downloadBootstrap("arm",     "3ab34567d69be26183f1bd30b2a9a20fb8d95c4217c55fbe4ea0dda92f9ebc35", version)
+        downloadBootstrap("i686",    "fda0463b7a448362d91f56448518eae9985f3d069e24608e17c2c66097993037", version)
+        downloadBootstrap("x86_64",  "de38b87a74760b268eb5f6ae289edd3fc5b3c86e02cb32f5f4a863161f4de354", version)
     }
 }
 

From edf3b622e4097de2b16349855481b1234f246194 Mon Sep 17 00:00:00 2001
From: YAKSH BARIYA <yakshbari4@gmail.com>
Date: Fri, 5 Nov 2021 11:36:14 +0530
Subject: [PATCH 576/912] chore: Fix Discord server ID in shields.io badge

Based on https://github.com/termux/termux-x11/pull/60/commits/dd59986a8cb1610b590e62a1ee48e7b3e3fed599
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 7af6cd034d..29dc5b0388 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 [![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/591914197219016707.svg?label=&logo=discord&logoColor=ffffff&color=5865F2)](https://discord.gg/HXpF69X)
+[![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)
 
 

From 6c24e6ac3b3554c90894fa893a9b7a15b7e0bc28 Mon Sep 17 00:00:00 2001
From: Henrik Grimler <henrik@grimler.se>
Date: Sat, 20 Nov 2021 21:50:13 +0100
Subject: [PATCH 577/912] termux-shared: add android.permission.VIBRATE to
 manifest

./gradlew lint complains about vibrations being used in
termux-shared/src/main/java/com/termux/shared/terminal/io/BellHandler.java
without the permission being declared.
---
 termux-shared/src/main/AndroidManifest.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/termux-shared/src/main/AndroidManifest.xml b/termux-shared/src/main/AndroidManifest.xml
index 5759b36774..81789f3904 100644
--- a/termux-shared/src/main/AndroidManifest.xml
+++ b/termux-shared/src/main/AndroidManifest.xml
@@ -1,3 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.termux.shared">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.termux.shared">
+    <uses-permission android:name="android.permission.VIBRATE" />
 </manifest>

From 6d60bc669b721c973a7e31d5f1c7c790ae976ba2 Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Thu, 2 Dec 2021 11:52:11 +0200
Subject: [PATCH 578/912] bootstrap archives: update to 2021.12.02-r1

---
 app/build.gradle | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 6631f3b18c..b3b936d0fc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -176,11 +176,11 @@ clean {
 
 task downloadBootstraps() {
     doLast {
-        def version = "2021.10.03-r1"
-        downloadBootstrap("aarch64", "abba0bab1155ca081b96556f5ac69c7f85f332f67665503fc488a82338a739de", version)
-        downloadBootstrap("arm",     "3ab34567d69be26183f1bd30b2a9a20fb8d95c4217c55fbe4ea0dda92f9ebc35", version)
-        downloadBootstrap("i686",    "fda0463b7a448362d91f56448518eae9985f3d069e24608e17c2c66097993037", version)
-        downloadBootstrap("x86_64",  "de38b87a74760b268eb5f6ae289edd3fc5b3c86e02cb32f5f4a863161f4de354", version)
+        def version = "2021.12.02-r1"
+        downloadBootstrap("aarch64", "69fcd0e30703d9612956cece26f24458aef4f479f00a775237ecaf65eb8ca5e6", version)
+        downloadBootstrap("arm",     "db7f46e8af32b60d585865592f59c0043ba3cf445c7a6bf67a08255ab4219526", version)
+        downloadBootstrap("i686",    "1c60ce2c68e2a47328686e492b8bc0b3a2a0e0536c6f2894cb4c48ecf1fd3e9e", version)
+        downloadBootstrap("x86_64",  "1d80e2613fd35b14d5a0fb8da5b41b38208a1a40fb727bbdb9a8996793bd973e", version)
     }
 }
 

From 6e6da752bdcd01aa219fe7eee7a79e41ef25c022 Mon Sep 17 00:00:00 2001
From: Henrik Grimler <henrik@grimler.se>
Date: Thu, 30 Dec 2021 21:56:09 +0100
Subject: [PATCH 579/912] Fixed: Fix copy&paste error in
 areHardwareKeyboardShortcutsDisabled

Fixes 829cc3986831 ("Allow users to disable hardware keyboard
shortcuts").

Reported-by: @amogusissofunnyhahalmaogenzhumorbelike
---
 .../shared/settings/properties/TermuxSharedProperties.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxSharedProperties.java b/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxSharedProperties.java
index 9ea06acc2b..d883884e68 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxSharedProperties.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxSharedProperties.java
@@ -512,7 +512,7 @@ public static String getVolumeKeysBehaviourInternalPropertyValueFromValue(String
 
 
     public boolean areHardwareKeyboardShortcutsDisabled() {
-        return (boolean) getInternalPropertyValue(TermuxPropertyConstants.KEY_DISABLE_TERMINAL_SESSION_CHANGE_TOAST, true);
+        return (boolean) getInternalPropertyValue(TermuxPropertyConstants.KEY_DISABLE_HARDWARE_KEYBOARD_SHORTCUTS, true);
     }
 
     public boolean areTerminalSessionChangeToastsDisabled() {

From cd5962c696f805c7c1babfe4cce16811bf66bf72 Mon Sep 17 00:00:00 2001
From: Henrik Grimler <henrik@grimler.se>
Date: Wed, 5 Jan 2022 10:15:58 +0100
Subject: [PATCH 580/912] bootstrap archives: update to 2022.01.02-r1

---
 app/build.gradle | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index b3b936d0fc..ca3fdf72cc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -176,11 +176,11 @@ clean {
 
 task downloadBootstraps() {
     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 = "2022.01.02-r1"
+        downloadBootstrap("aarch64", "748510c29e99b6c871ea527518839d72ac66b758f67da697c90c39194addd997", version)
+        downloadBootstrap("arm",     "4f95946ab1f014e3ba94087568285f02d7f065413230165d2f557b945a6af969", version)
+        downloadBootstrap("i686",    "f51e9cf70ff2ebeaa09aa08d27120def462777e01b2262cac6966d814ca055c5", version)
+        downloadBootstrap("x86_64",  "2d1e84702680d22eef41844bef62f32143462a90b1a8a957c190adc8c6e7b741", version)
     }
 }
 

From 897d911a5253b3b56b38ce9f4e95b9dec16e6df1 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Fri, 7 Jan 2022 22:31:06 +0500
Subject: [PATCH 581/912] Changed: Move to semantic versioning for app and
 library versions and add commit hash and `github` to APK file names

The `versionName` will now follow semantic version `2.0.0` spec in the format `major.minor.patch(-prerelease)(+buildmetadata)`. This will make versioning the prerelease and github debug builds versions easier and follow a spec. The @termux devs should make sure that when bumping `versionName` in `build.gradle` files and when creating a tag for new releases on github that they include the patch number as well, like `v0.1.0` instead of just `v0.1`. The `build.gradle` files and `attach_debug_apks_to_release` workflow will now validate the version as well and the build/attachment will fail if `versionName` does not follow the spec. https://semver.org/spec/v2.0.0.html

APKs released on github for debug build workflows and releases are now referred as `Github` releases as per 7b10a35f and 94e01d68, so APK filenames have been modified to include `github` in the filename. The APKs are still debuggable, so that tag remains too.

For github workflows the apk filename format will be `termux-app_<current_version>+<last_commit_hash>-github-debug_<arch>.apk`, like `termux-app_v0.1.0+xxxxxxxx-github-debug_arm64-v8a.apk` and for github releases it will be `termux-app_<release_version>+github-debug_<arch>.apk`, like `termux-app_v0.1+github-debug_arm64-v8a.apk`. The `last_commit_hash` will be the first `8` characters of the commit hash. The `<last_commit_hash>-github-debug` will act as `buildmetadata` and will not affect versioning precedence.

For github workflows triggered by `push` and `pull_request` triggers, `<current_version>+<last_commit_hash>` will be used as new `versionName`, like `v0.1.0+xxxxxxxx`. This will make tracking which build a user is using easier and help in resolving issues as well.

Note that users using github releases and termux devs using `$TERMUX_VERSION` environment variables in scripts should take commit hash into consideration and possibly use something like `dpkg --compare-versions "$TERMUX_VERSION" ge 0.1` where appropriate instead of mathematical comparisons.

The `app/build.gradle` now also supports following `TERMUX_` scoped environmental variables and `RELEASE_TAG` variable will not be used anymore since it may conflict with possibly other variables used by users. They will also allow enabling split APKs for both debug and release builds.

- `TERMUX_APP_VERSION_NAME` will be used as `versionName` if its set.
- `TERMUX_APK_VERSION_TAG` will be used as `termux-app_<TERMUX_APK_VERSION_TAG>_<arch>.apk` if its set. The `_<arch>` will only exist for split APKs.
- `TERMUX_SPLIT_APKS_FOR_DEBUG_BUILDS` will define whether split APKs should be enabled for debug builds. Default value is `1`.
- `TERMUX_SPLIT_APKS_FOR_RELEASE_BUILDS` will define whether split APKs should be enabled for release builds. Default value is `0` since F-Droid does not support split APKs, check #1904.

So based on above, if in future github releases are to be converted to `release` builds instead of `debug` builds, something like following can be done and even a workflow can be created for it. Users can also build split APKs release builds for themselves if they want.

```
export TERMUX_SPLIT_APKS_FOR_RELEASE_BUILDS=1
./gradlew assembleRelease -Pandroid.injected.signing.store.file="$(pwd)/app/dev_keystore.jks" -Pandroid.injected.signing.store.password=xrj45yWGLbsO7W0v -Pandroid.injected.signing.key.alias=alias -Pandroid.injected.signing.key.password=xrj45yWGLbsO7W0v
```

The APK will be found at `./app/build/outputs/apk/release/termux-app_<version>_<arch>.apk`

The `TERMUX_SPLIT_APKS_FOR_DEBUG_BUILDS` can be set to `0` to disable building split APKs which may be helpful for users building termux on device considering they will extra space and build time. Instructions for building are at https://github.com/termux/termux-packages/pull/7227#issuecomment-893022283.

```
export TERMUX_SPLIT_APKS_FOR_DEBUG_BUILDS=0
./gradlew assembleDebug
```

The APK will be found at `./app/build/outputs/apk/debug/termux-app_debug_universal.apk`

Note that F-Droid uses algorithm at https://gitlab.com/fdroid/fdroidserver/-/blob/2.1a0/fdroidserver/build.py#L746 to automatically detect built APKs, so ensure any modifications to location or file name are compliant. Current updates should be.

Auto updates are detected by checkupdates bot at https://gitlab.com/fdroid/fdroidserver/-/blob/master/fdroidserver/checkupdates.py
---
 .../attach_debug_apks_to_release.yml          |  80 +++++++---
 .github/workflows/debug_build.yml             | 141 ++++++++++++------
 .../trigger_library_builds_on_jitpack.yml     |  19 +--
 app/build.gradle                              |  25 +++-
 4 files changed, 188 insertions(+), 77 deletions(-)

diff --git a/.github/workflows/attach_debug_apks_to_release.yml b/.github/workflows/attach_debug_apks_to_release.yml
index 358808181a..c27cbf23e9 100644
--- a/.github/workflows/attach_debug_apks_to_release.yml
+++ b/.github/workflows/attach_debug_apks_to_release.yml
@@ -6,31 +6,71 @@ on:
       - published
 
 jobs:
-  build:
+  attach-apks:
     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
+
+      - name: Build and attach APKs to release
+        shell: bash {0}
+        run: |
+          exit_on_error() {
+              echo "$1"
+              echo "Deleting '$RELEASE_VERSION_NAME' release and '$GITHUB_REF' tag"
+              hub release delete "$RELEASE_VERSION_NAME"
+              git push --delete origin "$GITHUB_REF"
+              exit 1
+          }
+
+          echo "Setting vars"
+          RELEASE_VERSION_NAME="${GITHUB_REF/refs\/tags\//}"
+          if ! printf "%s" "${RELEASE_VERSION_NAME/v/}" | grep -qP '^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$'; then
+           exit_on_error "The versionName '${RELEASE_VERSION_NAME/v/}' is not a valid version as per semantic version '2.0.0' spec in the format 'major.minor.patch(-prerelease)(+buildmetadata)'. https://semver.org/spec/v2.0.0.html."
+          fi
+
+          APK_DIR_PATH="./app/build/outputs/apk/debug"
+          APK_VERSION_TAG="$RELEASE_VERSION_NAME+github-debug"
+          APK_BASENAME_PREFIX="termux-app_$APK_VERSION_TAG"
+
+          echo "Building APKs for '$RELEASE_VERSION_NAME' release"
+          export TERMUX_APK_VERSION_TAG="$APK_VERSION_TAG" # Used by app/build.gradle
+          if ! ./gradlew assembleDebug; then
+            exit_on_error "Build failed for '$RELEASE_VERSION_NAME' release."
+          fi
+
+          echo "Validating APKs"
+          for abi in universal arm64-v8a armeabi-v7a x86_64 x86; do
+            if ! test -f "$APK_DIR_PATH/${APK_BASENAME_PREFIX}_$abi.apk"; then
+              files_found="$(ls "$APK_DIR_PATH")"
+              exit_on_error "Failed to find built APK at '$APK_DIR_PATH/${APK_BASENAME_PREFIX}_$abi.apk'. Files found: "$'\n'"$files_found"
+            fi
+          done
+
+          echo "Generating sha25sums file"
+          if ! (cd "$APK_DIR_PATH"; sha256sum \
+            "${APK_BASENAME_PREFIX}_universal.apk" \
+            "${APK_BASENAME_PREFIX}_arm64-v8a.apk" \
+            "${APK_BASENAME_PREFIX}_armeabi-v7a.apk" \
+            "${APK_BASENAME_PREFIX}_x86_64.apk" \
+            "${APK_BASENAME_PREFIX}_x86.apk" \
+            > sha256sums); then
+            exit_on_error "Generate sha25sums failed for '$RELEASE_VERSION_NAME' release."
+          fi
+
+          echo "Attaching APKs to github release"
+          if ! hub release edit \
+          -m "" \
+          -a "$APK_DIR_PATH/${APK_BASENAME_PREFIX}_universal.apk" \
+          -a "$APK_DIR_PATH/${APK_BASENAME_PREFIX}_arm64-v8a.apk" \
+          -a "$APK_DIR_PATH/${APK_BASENAME_PREFIX}_armeabi-v7a.apk" \
+          -a "$APK_DIR_PATH/${APK_BASENAME_PREFIX}_x86_64.apk" \
+          -a "$APK_DIR_PATH/${APK_BASENAME_PREFIX}_x86.apk" \
+          -a "$APK_DIR_PATH/sha256sums" \
+          "$RELEASE_VERSION_NAME"; then
+            exit_on_error "Attach APKs to release failed for '$RELEASE_VERSION_NAME' release."
+          fi
diff --git a/.github/workflows/debug_build.yml b/.github/workflows/debug_build.yml
index cc3051f0fc..d22876ac49 100644
--- a/.github/workflows/debug_build.yml
+++ b/.github/workflows/debug_build.yml
@@ -4,53 +4,110 @@ on:
   push:
     branches:
       - master
-      - android-10
   pull_request:
     branches:
       - master
-      - android-10
 
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - name: Clone repository
-      uses: actions/checkout@v2
-    - name: Build
-      run: |
-        ./gradlew assembleDebug
-    - name: Store generated universal 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: Clone repository
+        uses: actions/checkout@v2
+
+      - name: Build APKs
+        shell: bash {0}
+        run: |
+          exit_on_error() { echo "$1"; exit 1; }
+
+          echo "Setting vars"
+          # Set RELEASE_VERSION_NAME to "<CURRENT_VERSION_NAME>+<last_commit_hash>"
+          CURRENT_VERSION_NAME_REGEX='\s+versionName "([^"]+)"$'
+          CURRENT_VERSION_NAME="$(grep -m 1 -E "$CURRENT_VERSION_NAME_REGEX" ./app/build.gradle | sed -r "s/$CURRENT_VERSION_NAME_REGEX/\1/")"
+          RELEASE_VERSION_NAME="v$CURRENT_VERSION_NAME+${GITHUB_SHA:0:7}" # The "+" is necessary so that versioning precedence is not affected
+          if ! printf "%s" "${RELEASE_VERSION_NAME/v/}" | grep -qP '^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$'; then
+           exit_on_error "The versionName '${RELEASE_VERSION_NAME/v/}' is not a valid version as per semantic version '2.0.0' spec in the format 'major.minor.patch(-prerelease)(+buildmetadata)'. https://semver.org/spec/v2.0.0.html."
+          fi
+
+          APK_DIR_PATH="./app/build/outputs/apk/debug"
+          APK_VERSION_TAG="$RELEASE_VERSION_NAME-github-debug" # Note the "-", GITHUB_SHA will already have "+" before it
+          APK_BASENAME_PREFIX="termux-app_$APK_VERSION_TAG"
+
+          # Used by attachment steps later
+          echo "APK_DIR_PATH=$APK_DIR_PATH" >> $GITHUB_ENV
+          echo "APK_VERSION_TAG=$APK_VERSION_TAG" >> $GITHUB_ENV
+          echo "APK_BASENAME_PREFIX=$APK_BASENAME_PREFIX" >> $GITHUB_ENV
+
+          echo "Building APKs for '$RELEASE_VERSION_NAME' build"
+          export TERMUX_APP_VERSION_NAME="${RELEASE_VERSION_NAME/v/}" # Used by app/build.gradle
+          export TERMUX_APK_VERSION_TAG="$APK_VERSION_TAG" # Used by app/build.gradle
+          if ! ./gradlew assembleDebug; then
+            exit_on_error "Build failed for '$RELEASE_VERSION_NAME' build."
+          fi
+
+          echo "Validating APKs"
+          for abi in universal arm64-v8a armeabi-v7a x86_64 x86; do
+            if ! test -f "$APK_DIR_PATH/${APK_BASENAME_PREFIX}_$abi.apk"; then
+              files_found="$(ls "$APK_DIR_PATH")"
+              exit_on_error "Failed to find built APK at '$APK_DIR_PATH/${APK_BASENAME_PREFIX}_$abi.apk'. Files found: "$'\n'"$files_found"
+            fi
+          done
+
+          echo "Generating sha25sums file"
+          if ! (cd "$APK_DIR_PATH"; sha256sum \
+            "${APK_BASENAME_PREFIX}_universal.apk" \
+            "${APK_BASENAME_PREFIX}_arm64-v8a.apk" \
+            "${APK_BASENAME_PREFIX}_armeabi-v7a.apk" \
+            "${APK_BASENAME_PREFIX}_x86_64.apk" \
+            "${APK_BASENAME_PREFIX}_x86.apk" \
+            > sha256sums); then
+            exit_on_error "Generate sha25sums failed for '$RELEASE_VERSION_NAME' release."
+          fi
+
+      - name: Attach universal APK file
+        uses: actions/upload-artifact@v2
+        with:
+          name: ${{ env.APK_BASENAME_PREFIX }}_universal
+          path: |
+            ${{ env.APK_DIR_PATH }}/${{ env.APK_BASENAME_PREFIX }}_universal.apk
+            ${{ env.APK_DIR_PATH }}/output-metadata.json
+
+      - name: Attach arm64-v8a APK file
+        uses: actions/upload-artifact@v2
+        with:
+          name: ${{ env.APK_BASENAME_PREFIX }}_arm64-v8a
+          path: |
+            ${{ env.APK_DIR_PATH }}/${{ env.APK_BASENAME_PREFIX }}_arm64-v8a.apk
+            ${{ env.APK_DIR_PATH }}/output-metadata.json
+
+      - name: Attach armeabi-v7a APK file
+        uses: actions/upload-artifact@v2
+        with:
+          name: ${{ env.APK_BASENAME_PREFIX }}_armeabi-v7a
+          path: |
+            ${{ env.APK_DIR_PATH }}/${{ env.APK_BASENAME_PREFIX }}_armeabi-v7a.apk
+            ${{ env.APK_DIR_PATH }}/output-metadata.json
+
+      - name: Attach x86_64 APK file
+        uses: actions/upload-artifact@v2
+        with:
+          name: ${{ env.APK_BASENAME_PREFIX }}_x86_64
+          path: |
+            ${{ env.APK_DIR_PATH }}/${{ env.APK_BASENAME_PREFIX }}_x86_64.apk
+            ${{ env.APK_DIR_PATH }}/output-metadata.json
+
+      - name: Attach x86 APK file
+        uses: actions/upload-artifact@v2
+        with:
+          name: ${{ env.APK_BASENAME_PREFIX }}_x86
+          path: |
+            ${{ env.APK_DIR_PATH }}/${{ env.APK_BASENAME_PREFIX }}_x86.apk
+            ${{ env.APK_DIR_PATH }}/output-metadata.json
+
+      - name: Attach sha256sums file
+        uses: actions/upload-artifact@v2
+        with:
+          name: sha256sums
+          path: |
+            ${{ env.APK_DIR_PATH }}/sha256sums
+            ${{ env.APK_DIR_PATH }}/output-metadata.json
diff --git a/.github/workflows/trigger_library_builds_on_jitpack.yml b/.github/workflows/trigger_library_builds_on_jitpack.yml
index 19c1a81eb5..fd00f13bfe 100644
--- a/.github/workflows/trigger_library_builds_on_jitpack.yml
+++ b/.github/workflows/trigger_library_builds_on_jitpack.yml
@@ -6,19 +6,16 @@ on:
       - published
 
 jobs:
-  build:
+  trigger-termux-library-builds:
     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: Set vars
+        run: echo "TERMUX_LIB_VERSION=${GITHUB_REF/refs\/tags\/v/}" >> $GITHUB_ENV # Do not include "v" prefix
+      - name: Echo release
+        run: echo "Triggering termux library builds on jitpack for '$TERMUX_LIB_VERSION' release 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
+          curl --max-time 600 --no-progress-meter "https://jitpack.io/com/termux/termux-app/terminal-emulator/$TERMUX_LIB_VERSION/terminal-emulator-$TERMUX_LIB_VERSION.pom"
+          curl --max-time 600 --no-progress-meter "https://jitpack.io/com/termux/termux-app/terminal-view/$TERMUX_LIB_VERSION/terminal-view-$TERMUX_LIB_VERSION.pom"
+          curl --max-time 600 --no-progress-meter "https://jitpack.io/com/termux/termux-app/termux-shared/$TERMUX_LIB_VERSION/termux-shared-$TERMUX_LIB_VERSION.pom"
diff --git a/app/build.gradle b/app/build.gradle
index ca3fdf72cc..9181ceb277 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -5,6 +5,10 @@ plugins {
 android {
     compileSdkVersion project.properties.compileSdkVersion.toInteger()
     ndkVersion = System.getenv("JITPACK_NDK_VERSION") ?: project.properties.ndkVersion
+    def appVersionName = System.getenv("TERMUX_APP_VERSION_NAME") ?: ""
+    def apkVersionTag = System.getenv("TERMUX_APK_VERSION_TAG") ?: ""
+    def splitAPKsForDebugBuilds = System.getenv("TERMUX_SPLIT_APKS_FOR_DEBUG_BUILDS") ?: "1"
+    def splitAPKsForReleaseBuilds = System.getenv("TERMUX_SPLIT_APKS_FOR_RELEASE_BUILDS") ?: "0" // F-Droid does not support split APKs #1904
 
     dependencies {
         implementation "androidx.annotation:annotation:1.2.0"
@@ -27,7 +31,10 @@ android {
         minSdkVersion project.properties.minSdkVersion.toInteger()
         targetSdkVersion project.properties.targetSdkVersion.toInteger()
         versionCode 117
-        versionName "0.117"
+        versionName "0.117.0"
+
+        if (appVersionName) versionName = appVersionName
+        validateVersionName(versionName)
 
         manifestPlaceholders.TERMUX_PACKAGE_NAME = "com.termux"
         manifestPlaceholders.TERMUX_APP_NAME = "Termux"
@@ -46,7 +53,8 @@ android {
 
         splits {
             abi {
-                enable gradle.startParameter.taskNames.any { it.contains("Debug") }
+                enable ((gradle.startParameter.taskNames.any { it.contains("Debug") } && splitAPKsForDebugBuilds == "1") ||
+                    (gradle.startParameter.taskNames.any { it.contains("Release") } && splitAPKsForReleaseBuilds == "1"))
                 reset ()
                 include 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a'
                 universalApk true
@@ -106,8 +114,10 @@ android {
         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")
+                outputFileName = new File("termux-app_" + (apkVersionTag ? apkVersionTag : "debug") + "_" + (abi ? abi : "universal") + ".apk")
+            } else if (variant.buildType.name == "release") {
+                def abi = output.getFilter(com.android.build.OutputFile.ABI)
+                outputFileName = new File("termux-app_" + (apkVersionTag ? apkVersionTag : "release") + "_" + (abi ? abi : "universal") + ".apk")
             }
         }
     }
@@ -125,6 +135,13 @@ task versionName {
     }
 }
 
+def validateVersionName(String versionName) {
+    // https://semver.org/spec/v2.0.0.html#is-there-a-suggested-regular-expression-regex-to-check-a-semver-string
+    // ^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$
+    if (!java.util.regex.Pattern.matches("^(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)(?:-((?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\\.(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?\$", versionName))
+        throw new GradleException("The versionName '"  + versionName + "' is not a valid version as per semantic version '2.0.0' spec in the format 'major.minor.patch(-prerelease)(+buildmetadata)'. https://semver.org/spec/v2.0.0.html.")
+}
+
 def downloadBootstrap(String arch, String expectedChecksum, String version) {
     def digest = java.security.MessageDigest.getInstance("SHA-256")
 

From 085b17e496ef6f57b72ee3f48742d5f66100f6ec Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Fri, 7 Jan 2022 23:09:23 +0500
Subject: [PATCH 582/912] Changed: Bump dependency versions

---
 app/build.gradle           | 4 ++--
 terminal-view/build.gradle | 2 +-
 termux-shared/build.gradle | 9 ++++++---
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 9181ceb277..247a8bcaba 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -11,8 +11,8 @@ android {
     def splitAPKsForReleaseBuilds = System.getenv("TERMUX_SPLIT_APKS_FOR_RELEASE_BUILDS") ?: "0" // F-Droid does not support split APKs #1904
 
     dependencies {
-        implementation "androidx.annotation:annotation:1.2.0"
-        implementation "androidx.core:core:1.6.0-rc01"
+        implementation "androidx.annotation:annotation:1.3.0"
+        implementation "androidx.core:core:1.6.0"
         implementation "androidx.drawerlayout:drawerlayout:1.1.1"
         implementation "androidx.preference:preference:1.1.1"
         implementation "androidx.viewpager:viewpager:1.0.0"
diff --git a/terminal-view/build.gradle b/terminal-view/build.gradle
index 5bf11e100a..5867765f16 100644
--- a/terminal-view/build.gradle
+++ b/terminal-view/build.gradle
@@ -5,7 +5,7 @@ android {
     compileSdkVersion project.properties.compileSdkVersion.toInteger()
 
     dependencies {
-        implementation "androidx.annotation:annotation:1.2.0"
+        implementation "androidx.annotation:annotation:1.3.0"
         api project(":terminal-emulator")
     }
 
diff --git a/termux-shared/build.gradle b/termux-shared/build.gradle
index a4891703c7..5bbd41c848 100644
--- a/termux-shared/build.gradle
+++ b/termux-shared/build.gradle
@@ -6,9 +6,8 @@ android {
 
     dependencies {
         implementation 'androidx.appcompat:appcompat:1.3.1'
-        implementation "androidx.annotation:annotation:1.2.0"
-        implementation "androidx.core:core:1.6.0-rc01"
-        implementation "androidx.window:window:1.0.0-alpha09"
+        implementation "androidx.annotation:annotation:1.3.0"
+        implementation "androidx.core:core:1.6.0"
         implementation 'com.google.android.material:material:1.4.0'
         implementation "com.google.guava:guava:24.1-jre"
         implementation "io.noties.markwon:core:$markwonVersion"
@@ -16,6 +15,10 @@ android {
         implementation "io.noties.markwon:linkify:$markwonVersion"
         implementation "io.noties.markwon:recycler:$markwonVersion"
 
+        // Do not increment version higher than 1.0.0-alpha09 since it will break ViewUtils and needs to be looked into
+        // noinspection GradleDependency
+        implementation "androidx.window:window:1.0.0-alpha09"
+
         // Do not increment version higher than 2.5 or there
         // will be runtime exceptions on android < 8
         // due to missing classes like java.nio.file.Path.

From 903b1c75a2986f767278972168e9f64ebdb423d3 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 8 Jan 2022 00:23:40 +0500
Subject: [PATCH 583/912] Fixed: Fix bootstrap checksum check if it contained
 leading zeros

---
 app/build.gradle | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/build.gradle b/app/build.gradle
index 247a8bcaba..484a9df66f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -177,6 +177,7 @@ def downloadBootstrap(String arch, String expectedChecksum, String version) {
     out.close()
 
     def checksum = new BigInteger(1, digest.digest()).toString(16)
+    while (checksum.length() < 64) { checksum = "0" + checksum }
     if (checksum != expectedChecksum) {
         file.delete()
         throw new GradleException("Wrong checksum for " + remoteUrl + ": expected: " + expectedChecksum + ", actual: " + checksum)

From 0eaaa1372ad0909adee30e0ee2c5d6abb9846ec2 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 8 Jan 2022 00:24:48 +0500
Subject: [PATCH 584/912] Changed: Bump bootstrap to v2022.01.07-r1

---
 app/build.gradle | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 484a9df66f..351e3032e8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -194,11 +194,11 @@ clean {
 
 task downloadBootstraps() {
     doLast {
-        def version = "2022.01.02-r1"
-        downloadBootstrap("aarch64", "748510c29e99b6c871ea527518839d72ac66b758f67da697c90c39194addd997", version)
-        downloadBootstrap("arm",     "4f95946ab1f014e3ba94087568285f02d7f065413230165d2f557b945a6af969", version)
-        downloadBootstrap("i686",    "f51e9cf70ff2ebeaa09aa08d27120def462777e01b2262cac6966d814ca055c5", version)
-        downloadBootstrap("x86_64",  "2d1e84702680d22eef41844bef62f32143462a90b1a8a957c190adc8c6e7b741", version)
+        def version = "2022.01.07-r1"
+        downloadBootstrap("aarch64", "0fe6d0159d12fcb8baf7750ce9072b9b36f742662b02ad4da145ab85873614cd", version)
+        downloadBootstrap("arm",     "0a6014e2ec3b7079524fee3caabd02be05bcb4add3c6cd9e5ad98408b428c717", version)
+        downloadBootstrap("i686",    "c55369a9af1316dc3d99457aa23cce64b29c1e60e375159352c0d4b9cfed4ac6", version)
+        downloadBootstrap("x86_64",  "e93a7c66d15edb7d1b5ceca906255c85ead35a8b6a52f93524e117cfb07e6778", version)
     }
 }
 

From b01a738791d6ad0d4a81064d37caf64800de59e8 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 8 Jan 2022 00:28:52 +0500
Subject: [PATCH 585/912] Docs: Update README.md

---
 README.md | 49 ++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 42 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 29dc5b0388..635cdfff4d 100644
--- a/README.md
+++ b/README.md
@@ -26,6 +26,7 @@ Issue https://github.com/termux/termux-app/issues/1072 needs extra attention.
 - [Installation](#Installation)
 - [Uninstallation](#Uninstallation)
 - [Important Links](#Important-Links)
+- [Debugging](#Debugging)
 - [For Maintainers and Contributors](#For-Maintainers-and-Contributors)
 - [Forking](#Forking)
 ##
@@ -48,6 +49,8 @@ The core [Termux](https://github.com/termux/termux-app) app comes with the follo
 
 ## Installation
 
+Latest version is `v0.117`.
+
 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.
@@ -64,15 +67,17 @@ You **do not** need to download the `F-Droid` app (via the `Download F-Droid` li
 
 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.
 
+The `F-Droid` app often may not notify you of updates and you will manually have to do a pull down swipe action in the `Updates` tab of the app for it to check updates. Make sure battery optimizations are disabled for the app, check https://dontkillmyapp.com/ for details on how to do that.
+
 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.
 
 ### 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.
+Termux application can be obtained on `Github` either from [`Github Releases`](https://github.com/termux/termux-app/releases) for version `>= 0.118.0` 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 `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. Note that for action workflows, you need to be [**logged into a `Github` account**](https://github.com/login) for the `Artifacts` links to be enabled/clickable. If you are using the [`Github` app](https://github.com/mobile), then make sure to open workflow link in a browser like Chrome or Firefox that has your Github account logged in since the in-app browser may not be logged in. 
 
 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.
 
@@ -88,9 +93,11 @@ You **will not need to buy plugins again** if you bought them on Play Store. All
 
 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.
+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. 
+
+Note that by upgrading old packages to latest versions, like that of `python` may break your setups/scripts since they may not be compatible anymore. Moreover, you will not be able to downgrade the package versions since termux repos only keep the latest version and you will have to manually rebuild the old versions of the packages if required as per https://github.com/termux/termux-packages/wiki/Building-packages.
 
-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.
+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. The `termux-tools` [version `>= 0.135`](https://github.com/termux/termux-packages/pull/7493) will also show a banner at the top of the terminal saying `You are likely using a very old version of Termux, probably installed from the Google Play Store.`, you can remove it by running `rm -f /data/data/com.termux/files/usr/etc/motd-playstore` and restarting the app.
 
 #### Why Disable?
 
@@ -151,7 +158,7 @@ The main ones are the following.
 - [Termux File System Layout](https://github.com/termux/termux-packages/wiki/Termux-file-system-layout)
 - [Differences From Linux](https://wiki.termux.com/wiki/Differences_from_Linux)
 - [Package Management](https://wiki.termux.com/wiki/Package_Management)
-- [Remote_Access](https://wiki.termux.com/wiki/Remote_Access)
+- [Remote Access](https://wiki.termux.com/wiki/Remote_Access)
 - [Backing up Termux](https://wiki.termux.com/wiki/Backing_up_Termux)
 - [Terminal Settings](https://wiki.termux.com/wiki/Terminal_Settings)
 - [Touch Keyboard](https://wiki.termux.com/wiki/Touch_Keyboard)
@@ -194,15 +201,37 @@ The main ones are the following.
 
 
 
+### Debugging
+
+You can help debug problems of the `Termux` app and its plugins by setting appropriate `logcat` `Log Level` in `Termux` app settings -> `<APP_NAME>` -> `Debugging` -> `Log Level` (Requires `Termux` app version `>= 0.118.0`). The `Log Level` defaults to `Normal` and log level `Verbose` currently logs additional information. Its best to revert log level to `Normal` after you have finished debugging since private data may otherwise be passed to `logcat` during normal operation and moreover, additional logging increases execution time.
+
+The plugin apps **do not execute the commands themselves** but send execution intents to `Termux` app, which has its own log level which can be set in `Termux` app settings -> `Termux` -> `Debugging` -> `Log Level`. So you must set log level for both `Termux` and the respective plugin app settings to get all the info.
+
+Once log levels have been set, you can run the `logcat` command in `Termux` app terminal to view the logs in realtime (`Ctrl+c` to stop) or use `logcat -d > logcat.txt` to take a dump of the log. You can also view the logs from a PC over `ADB`. For more information, check official android `logcat` guide [here](https://developer.android.com/studio/command-line/logcat).
+
+Moreover, users can generate termux files `stat` info and `logcat` dump automatically too with terminal's long hold options menu `More` -> `Report Issue` option and selecting `YES` in the prompt shown to add debug info. This can be helpful for reporting and debugging other issues. If the report generated is too large, then `Save To File` option in context menu (3 dots on top right) of `ReportActivity` can be used and the file viewed/shared instead.
+
+Users must post complete report (optionally without sensitive info) when reporting issues. Issues opened with **(partial) screenshots of error reports** instead of text will likely be automatically closed/deleted.
+
+##### Log Levels
+
+- `Off` - Log nothing.
+- `Normal` - Start logging error, warn and info messages and stacktraces.
+- `Debug` - Start logging debug messages.
+- `Verbose` - Start logging verbose messages.
+##
+
+
+
 ## For Maintainers 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 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. Termux app and plugin specific classes must be added under `com.termux.shared.termux` package and general classes outside it. The [`termux-shared` `LICENSE`](termux-shared/LICENSE.md) must also be checked and updated if necessary when contributing code. The licenses of any external library or code must be honoured.
 
 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.
+Commit messages **must** use [Conventional Commits](https://www.conventionalcommits.org) specs so that chagelogs can automatically be generated by the [`create-conventional-changelog`](https://github.com/termux/create-conventional-changelog) script, check its repo for further details on the spec. Use the following `types` as `Added: Add foo`, `Added|Fixed: Add foo and fix bar`, `Changed!: Change baz as a breaking change`, etc. You can optionally add a scope as well, like `Fixed(terminal): Some bug`. The space after `:` is necessary.
 
 - **Added** for new features.
 - **Changed** for changes in existing functionality.
@@ -210,9 +239,15 @@ Commit messages should preferably use [Conventional Commits](https://www.convent
 - **Removed** for now removed features.
 - **Fixed** for any bug fixes.
 - **Security** in case of vulnerabilities.
+- **Docs** for updating documentation.
 
 Changelogs for releases are generated based on [Keep a Changelog](https://github.com/olivierlacan/keep-a-changelog) specs.
 
+The `versionName` in `build.gradle` files of Termux and its plugin apps must follow the [semantic version `2.0.0` spec](https://semver.org/spec/v2.0.0.html) in the format `major.minor.patch(-prerelease)(+buildmetadata)`. When bumping `versionName` in `build.gradle` files and when creating a tag for new releases on github, make sure to include the patch number as well, like `v0.1.0` instead of just `v0.1`. The `build.gradle` files and `attach_debug_apks_to_release` workflow validates the version as well and the build/attachment will fail if `versionName` does not follow the spec.
+##
+
+
+
 ## 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.

From 480f92880c2e355c3b666b0773dcc5411c27bb93 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 8 Jan 2022 03:30:15 +0500
Subject: [PATCH 586/912] Fixed: Fix bootstrap checksum check if it contained
 leading zeros

---
 app/build.gradle | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/build.gradle b/app/build.gradle
index 351e3032e8..6dc0fe7aaf 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -156,6 +156,7 @@ def downloadBootstrap(String arch, String expectedChecksum, String version) {
             digest.update(buffer, 0, readBytes)
         }
         def checksum = new BigInteger(1, digest.digest()).toString(16)
+        while (checksum.length() < 64) { checksum = "0" + checksum }
         if (checksum == expectedChecksum) {
             return
         } else {

From 9259ef0be198f5981e8fb06e9458c702b6bba5ac Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 8 Jan 2022 03:32:35 +0500
Subject: [PATCH 587/912] Changed: Bump to v0.118.0

---
 README.md                      | 2 +-
 app/build.gradle               | 4 ++--
 terminal-emulator/build.gradle | 2 +-
 terminal-view/build.gradle     | 2 +-
 termux-shared/build.gradle     | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 635cdfff4d..c8597247de 100644
--- a/README.md
+++ b/README.md
@@ -49,7 +49,7 @@ The core [Termux](https://github.com/termux/termux-app) app comes with the follo
 
 ## Installation
 
-Latest version is `v0.117`.
+Latest version is `v0.118.0`.
 
 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).
 
diff --git a/app/build.gradle b/app/build.gradle
index 6dc0fe7aaf..df251f0c88 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -30,8 +30,8 @@ android {
         applicationId "com.termux"
         minSdkVersion project.properties.minSdkVersion.toInteger()
         targetSdkVersion project.properties.targetSdkVersion.toInteger()
-        versionCode 117
-        versionName "0.117.0"
+        versionCode 118
+        versionName "0.118.0"
 
         if (appVersionName) versionName = appVersionName
         validateVersionName(versionName)
diff --git a/terminal-emulator/build.gradle b/terminal-emulator/build.gradle
index 97f9ed7ea7..71a9334810 100644
--- a/terminal-emulator/build.gradle
+++ b/terminal-emulator/build.gradle
@@ -66,7 +66,7 @@ afterEvaluate {
                 from components.release
                 groupId = 'com.termux'
                 artifactId = 'terminal-emulator'
-                version = '0.117'
+                version = '0.118.0'
                 artifact(sourceJar)
             }
         }
diff --git a/terminal-view/build.gradle b/terminal-view/build.gradle
index 5867765f16..1504f68856 100644
--- a/terminal-view/build.gradle
+++ b/terminal-view/build.gradle
@@ -45,7 +45,7 @@ afterEvaluate {
                 from components.release
                 groupId = 'com.termux'
                 artifactId = 'terminal-view'
-                version = '0.117'
+                version = '0.118.0'
                 artifact(sourceJar)
             }
         }
diff --git a/termux-shared/build.gradle b/termux-shared/build.gradle
index 5bbd41c848..297e115791 100644
--- a/termux-shared/build.gradle
+++ b/termux-shared/build.gradle
@@ -65,7 +65,7 @@ afterEvaluate {
                 from components.release
                 groupId = 'com.termux'
                 artifactId = 'termux-shared'
-                version = '0.117'
+                version = '0.118.0'
                 artifact(sourceJar)
             }
         }

From 009c128052766665a4363a048dc6e008e249dfcd Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Fri, 8 Oct 2021 16:32:27 +0500
Subject: [PATCH 588/912] Changed: Move termux apps properties file list to
 TermuxConstants and do not follow symlinks

---
 .../com/termux/app/TermuxOpenReceiver.java    | 16 ++--
 .../properties/TermuxPropertyConstants.java   | 75 ++++++++++---------
 .../termux/shared/termux/TermuxConstants.java | 40 +++++++---
 3 files changed, 80 insertions(+), 51 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxOpenReceiver.java b/app/src/main/java/com/termux/app/TermuxOpenReceiver.java
index b5cb358ec3..3a85552b1a 100644
--- a/app/src/main/java/com/termux/app/TermuxOpenReceiver.java
+++ b/app/src/main/java/com/termux/app/TermuxOpenReceiver.java
@@ -184,25 +184,25 @@ public ParcelFileDescriptor openFile(@NonNull Uri uri, @NonNull String mode) thr
             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 callingPackage = getCallingPackage();
+                Logger.logDebug(LOG_TAG, "Open file request received from " + callingPackage + " 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
+                // If TermuxConstants.PROP_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)) {
+                // **DO NOT** allow these files to be modified by ContentProvider exposed to external
+                // apps, since they may silently modify the values for security properties like
+                // TermuxConstants.PROP_ALLOW_EXTERNAL_APPS set by users without their explicit consent.
+                if (TermuxConstants.TERMUX_PROPERTIES_FILE_PATHS_LIST.contains(path) ||
+                    TermuxConstants.TERMUX_FLOAT_PROPERTIES_FILE_PATHS_LIST.contains(path)) {
                     mode = "r";
                 }
 
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java b/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java
index c868450b62..638ff18f30 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java
@@ -1,8 +1,8 @@
 package com.termux.shared.settings.properties;
 
-import androidx.annotation.NonNull;
-
 import com.google.common.collect.ImmutableBiMap;
+import com.termux.shared.file.FileUtils;
+import com.termux.shared.file.filesystem.FileType;
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.logger.Logger;
 import com.termux.terminal.TerminalEmulator;
@@ -11,6 +11,7 @@
 import java.io.File;
 import java.util.Arrays;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 
 /*
@@ -81,6 +82,8 @@
  */
 public final class TermuxPropertyConstants {
 
+    private static final String LOG_TAG = "TermuxPropertyConstants";
+
     /* boolean */
 
     /** Defines the key for whether hardware keyboard shortcuts are enabled. */
@@ -413,50 +416,54 @@ public final class TermuxPropertyConstants {
 
 
 
-    /** Returns the first {@link File} found at
-     * {@link TermuxConstants#TERMUX_PROPERTIES_PRIMARY_FILE_PATH} or
-     * {@link TermuxConstants#TERMUX_PROPERTIES_SECONDARY_FILE_PATH}
-     * from which termux properties can be loaded.
-     * If the {@link File} found is not a regular file or is not readable then null is returned.
+    /** Returns the first {@link File} found in
+     * {@link TermuxConstants#TERMUX_PROPERTIES_FILE_PATHS_LIST} via a call to
+     * {@link #getPropertiesFile(List)}.
      *
-     * @return Returns the {@link File} object for termux properties.
+     * @return Returns the {@link File} object for Termux app properties.
      */
     public static File getTermuxPropertiesFile() {
-        return getPropertiesFile(new String[]{
-            TermuxConstants.TERMUX_PROPERTIES_PRIMARY_FILE_PATH,
-            TermuxConstants.TERMUX_PROPERTIES_SECONDARY_FILE_PATH
-        });
+        return getPropertiesFile(TermuxConstants.TERMUX_PROPERTIES_FILE_PATHS_LIST);
     }
 
-    /** Returns the first {@link File} found at
-     * {@link TermuxConstants#TERMUX_FLOAT_PROPERTIES_PRIMARY_FILE_PATH} or
-     * {@link TermuxConstants#TERMUX_FLOAT_PROPERTIES_SECONDARY_FILE_PATH}
-     * from which termux properties can be loaded.
-     * If the {@link File} found is not a regular file or is not readable then null is returned.
+    /** Returns the first {@link File} found in
+     * {@link TermuxConstants#TERMUX_FLOAT_PROPERTIES_FILE_PATHS_LIST} via a call to
+     * {@link #getPropertiesFile(List)}.
      *
-     * @return Returns the {@link File} object for termux properties.
+     * @return Returns the {@link File} object for Termux:Float app properties.
      */
     public static File getTermuxFloatPropertiesFile() {
-        return getPropertiesFile(new String[]{
-            TermuxConstants.TERMUX_FLOAT_PROPERTIES_PRIMARY_FILE_PATH,
-            TermuxConstants.TERMUX_FLOAT_PROPERTIES_SECONDARY_FILE_PATH
-        });
+        return getPropertiesFile(TermuxConstants.TERMUX_FLOAT_PROPERTIES_FILE_PATHS_LIST);
     }
 
-    public static File getPropertiesFile(@NonNull String[] possiblePropertiesFileLocations) {
-        File propertiesFile = new File(possiblePropertiesFileLocations[0]);
-        int i = 0;
-        while (!propertiesFile.exists() && i < possiblePropertiesFileLocations.length) {
-            propertiesFile = new File(possiblePropertiesFileLocations[i]);
-            i += 1;
-        }
-
-        if (propertiesFile.isFile() && propertiesFile.canRead()) {
-            return propertiesFile;
-        } else {
-            Logger.logDebug("No readable properties file found at: " + Arrays.toString(possiblePropertiesFileLocations));
+    /** Returns the first {@link File} found in
+     * {@code propertiesFilePaths} from which app properties can be loaded. If the {@link File} found
+     * is not a regular file or is not readable, then {@code null} is returned. Symlinks **will not**
+     * be followed for potential security reasons.
+     *
+     * @return Returns the {@link File} object for Termux:Float app properties.
+     */
+    public static File getPropertiesFile(List<String> propertiesFilePaths) {
+        if (propertiesFilePaths == null || propertiesFilePaths.size() == 0)
             return null;
+
+        for(String propertiesFilePath : propertiesFilePaths) {
+            File propertiesFile = new File(propertiesFilePath);
+
+            // Symlinks **will not** be followed.
+            FileType fileType = FileUtils.getFileType(propertiesFilePath, false);
+            if (fileType == FileType.REGULAR) {
+                if (propertiesFile.canRead())
+                    return propertiesFile;
+                else
+                    Logger.logWarn(LOG_TAG, "Ignoring properties file at \"" + propertiesFilePath + "\" since it is not readable");
+            } else if (fileType != FileType.NO_EXIST) {
+                Logger.logWarn(LOG_TAG, "Ignoring properties file at \"" + propertiesFilePath + "\" of type: \"" + fileType.getName() + "\"");
+            }
         }
+
+        Logger.logDebug(LOG_TAG, "No readable properties file found at: " + propertiesFilePaths);
+        return null;
     }
 
 }
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
index 57b619fc6d..65ec62f4ab 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
@@ -12,7 +12,7 @@
 import java.util.List;
 
 /*
- * Version: v0.32.0
+ * Version: v0.33.0
  *
  * Changelog
  *
@@ -211,6 +211,9 @@
  * - 0.32.0 (2021-09-23)
  *      - Added `TERMUX_API.TERMUX_API_ACTIVITY_NAME`, `TERMUX_TASKER.TERMUX_TASKER_ACTIVITY_NAME`
  *          and `TERMUX_WIDGET.TERMUX_WIDGET_ACTIVITY_NAME`.
+ *
+ * - 0.33.0 (2021-10-08)
+ *      - Added `TERMUX_PROPERTIES_FILE_PATHS_LIST` and `TERMUX_FLOAT_PROPERTIES_FILE_PATHS_LIST`.
  */
 
 /**
@@ -653,27 +656,46 @@ public final class TermuxConstants {
     public static final String TERMUX_WIDGET_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION = TERMUX_WIDGET_PACKAGE_NAME + "_preferences"; // Default: "com.termux.widget_preferences"
 
 
-    /** Termux app termux.properties primary file path */
+
+    /** Termux app properties primary file path */
     public static final String TERMUX_PROPERTIES_PRIMARY_FILE_PATH = TERMUX_DATA_HOME_DIR_PATH + "/termux.properties"; // Default: "/data/data/com.termux/files/home/.termux/termux.properties"
-    /** Termux app termux.properties primary file */
+    /** Termux app properties primary file */
     public static final File TERMUX_PROPERTIES_PRIMARY_FILE = new File(TERMUX_PROPERTIES_PRIMARY_FILE_PATH);
 
-    /** Termux app termux.properties secondary file path */
+    /** Termux app properties secondary file path */
     public static final String TERMUX_PROPERTIES_SECONDARY_FILE_PATH = TERMUX_CONFIG_HOME_DIR_PATH + "/termux.properties"; // Default: "/data/data/com.termux/files/home/.config/termux/termux.properties"
-    /** Termux app termux.properties secondary file */
+    /** Termux app properties secondary file */
     public static final File TERMUX_PROPERTIES_SECONDARY_FILE = new File(TERMUX_PROPERTIES_SECONDARY_FILE_PATH);
 
+    /** Termux app properties file paths list. **DO NOT** allow these files to be modified by
+     * {@link android.content.ContentProvider} exposed to external apps, since they may silently
+     * modify the values for security properties like {@link #PROP_ALLOW_EXTERNAL_APPS} set by users
+     * without their explicit consent. */
+    public static final List<String> TERMUX_PROPERTIES_FILE_PATHS_LIST = Arrays.asList(
+        TERMUX_PROPERTIES_PRIMARY_FILE_PATH,
+        TERMUX_PROPERTIES_SECONDARY_FILE_PATH);
+
 
-    /** Termux:Float app termux.properties primary file path */
+
+    /** Termux:Float app properties primary file path */
     public static final String TERMUX_FLOAT_PROPERTIES_PRIMARY_FILE_PATH = TERMUX_DATA_HOME_DIR_PATH + "/termux.float.properties"; // Default: "/data/data/com.termux/files/home/.termux/termux.float.properties"
-    /** Termux:Float app termux.properties primary file */
+    /** Termux:Float app properties primary file */
     public static final File TERMUX_FLOAT_PROPERTIES_PRIMARY_FILE = new File(TERMUX_FLOAT_PROPERTIES_PRIMARY_FILE_PATH);
 
-    /** Termux:Float app termux.properties secondary file path */
+    /** Termux:Float app properties secondary file path */
     public static final String TERMUX_FLOAT_PROPERTIES_SECONDARY_FILE_PATH = TERMUX_CONFIG_HOME_DIR_PATH + "/termux.float.properties"; // Default: "/data/data/com.termux/files/home/.config/termux/termux.float.properties"
-    /** Termux:Float app termux.properties secondary file */
+    /** Termux:Float app properties secondary file */
     public static final File TERMUX_FLOAT_PROPERTIES_SECONDARY_FILE = new File(TERMUX_FLOAT_PROPERTIES_SECONDARY_FILE_PATH);
 
+    /** Termux:Float app properties file paths list. **DO NOT** allow these files to be modified by
+     * {@link android.content.ContentProvider} exposed to external apps, since they may silently
+     * modify the values for security properties like {@link #PROP_ALLOW_EXTERNAL_APPS} set by users
+     * without their explicit consent. */
+    public static final List<String> TERMUX_FLOAT_PROPERTIES_FILE_PATHS_LIST = Arrays.asList(
+        TERMUX_FLOAT_PROPERTIES_PRIMARY_FILE_PATH,
+        TERMUX_FLOAT_PROPERTIES_SECONDARY_FILE_PATH);
+
+
 
     /** Termux app and Termux:Styling colors.properties file path */
     public static final String TERMUX_COLOR_PROPERTIES_FILE_PATH = TERMUX_DATA_HOME_DIR_PATH + "/colors.properties"; // Default: "/data/data/com.termux/files/home/.termux/colors.properties"

From 09412da9d76c7ad2d3cc530a1efedf9482e05e3e Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Fri, 8 Oct 2021 22:31:26 +0500
Subject: [PATCH 589/912] Fixed: Fix NullPointerException when getting spanned
 markdown like for notification

---
 .../main/java/com/termux/shared/markdown/MarkdownUtils.java    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/markdown/MarkdownUtils.java b/termux-shared/src/main/java/com/termux/shared/markdown/MarkdownUtils.java
index c541ba686a..0fc4f15793 100644
--- a/termux-shared/src/main/java/com/termux/shared/markdown/MarkdownUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/markdown/MarkdownUtils.java
@@ -191,9 +191,8 @@ public void configureSpansFactory(@NonNull MarkwonSpansFactory.Builder builder)
     }
 
     public static Spanned getSpannedMarkdownText(Context context, String string) {
-
+        if (context == null || string == null) return null;
         final Markwon markwon = getSpannedMarkwonBuilder(context);
-
         return markwon.toMarkdown(string);
     }
 

From 0da1984b59ed58013404435c4ec4069e5f4670de Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Fri, 8 Oct 2021 22:32:19 +0500
Subject: [PATCH 590/912] Changed: Do not show toast if text null or empty

---
 .../src/main/java/com/termux/shared/logger/Logger.java         | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/logger/Logger.java b/termux-shared/src/main/java/com/termux/shared/logger/Logger.java
index 33956363ae..3865a7cebd 100644
--- a/termux-shared/src/main/java/com/termux/shared/logger/Logger.java
+++ b/termux-shared/src/main/java/com/termux/shared/logger/Logger.java
@@ -7,6 +7,7 @@
 import android.widget.Toast;
 
 import com.termux.shared.R;
+import com.termux.shared.data.DataUtils;
 import com.termux.shared.termux.TermuxConstants;
 
 import java.io.IOException;
@@ -363,7 +364,7 @@ public static String getMultiLineLogStringEntry(String label, Object object, Str
 
 
     public static void showToast(final Context context, final String toastText, boolean longDuration) {
-        if (context == null) return;
+        if (context == null || DataUtils.isNullOrEmpty(toastText)) return;
 
         new Handler(Looper.getMainLooper()).post(() -> Toast.makeText(context, toastText, longDuration ? Toast.LENGTH_LONG : Toast.LENGTH_SHORT).show());
     }

From 1327cef7b4002f14409b23cef14bd53a2e657bd6 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 9 Oct 2021 02:07:09 +0500
Subject: [PATCH 591/912] Added: Add support for getting external app info

PackageUtils were previously based on using `Context` object to get app info, which was only possible to get for Termux app and its sharedUserId plugins. Now it has been refactored to used `PackageInfo` and `ApplicationInfo` objects to get the info, which will also allow getting info of external apps. However, when targeting sdk `30`, queries entries or `QUERY_ALL_PACKAGES` permission will be required. Check `PackageUtils.isAppInstalled()` for more info.
---
 .../termux/shared/packages/PackageUtils.java  | 221 +++++++++++++++---
 .../termux/shared/termux/AndroidUtils.java    |  48 +++-
 2 files changed, 231 insertions(+), 38 deletions(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/packages/PackageUtils.java b/termux-shared/src/main/java/com/termux/shared/packages/PackageUtils.java
index 60997b2730..de1aae98c4 100644
--- a/termux-shared/src/main/java/com/termux/shared/packages/PackageUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/packages/PackageUtils.java
@@ -68,6 +68,8 @@ public static Context getContextForPackageOrExitApp(@NonNull Context context, St
         return packageContext;
     }
 
+
+
     /**
      * Get the {@link PackageInfo} for the package associated with the {@code context}.
      *
@@ -75,7 +77,7 @@ public static Context getContextForPackageOrExitApp(@NonNull Context context, St
      * @return Returns the {@link PackageInfo}. This will be {@code null} if an exception is raised.
      */
     public static PackageInfo getPackageInfoForPackage(@NonNull final Context context) {
-            return getPackageInfoForPackage(context, 0);
+        return getPackageInfoForPackage(context, context.getPackageName());
     }
 
     /**
@@ -87,13 +89,76 @@ public static PackageInfo getPackageInfoForPackage(@NonNull final Context contex
      */
     @Nullable
     public static PackageInfo getPackageInfoForPackage(@NonNull final Context context, final int flags) {
+        return getPackageInfoForPackage(context, context.getPackageName(), flags);
+    }
+
+    /**
+     * Get the {@link PackageInfo} for the package associated with the {@code packageName}.
+     *
+     * @param context The {@link Context} for operations.
+     * @param packageName The package name of the package.
+     * @return Returns the {@link PackageInfo}. This will be {@code null} if an exception is raised.
+     */
+    public static PackageInfo getPackageInfoForPackage(@NonNull final Context context, @NonNull final String packageName) {
+        return getPackageInfoForPackage(context, packageName, 0);
+    }
+
+    /**
+     * Get the {@link PackageInfo} for the package associated with the {@code packageName}.
+     *
+     * Also check {@link #isAppInstalled(Context, String, String) if targetting targeting sdk
+     * `30` (android `11`) since {@link PackageManager.NameNotFoundException} may be thrown.
+     *
+     * @param context The {@link Context} for operations.
+     * @param packageName The package name of the package.
+     * @param flags The flags to pass to {@link PackageManager#getPackageInfo(String, int)}.
+     * @return Returns the {@link PackageInfo}. This will be {@code null} if an exception is raised.
+     */
+    @Nullable
+    public static PackageInfo getPackageInfoForPackage(@NonNull final Context context, @NonNull final String packageName, final int flags) {
+        try {
+            return context.getPackageManager().getPackageInfo(packageName, flags);
+        } catch (final Exception e) {
+            return null;
+        }
+    }
+
+
+
+    /**
+     * Get the {@link ApplicationInfo} for the {@code packageName}.
+     *
+     * @param context The {@link Context} for operations.
+     * @param packageName The package name of the package.
+     * @return Returns the {@link ApplicationInfo}. This will be {@code null} if an exception is raised.
+     */
+    @Nullable
+    public static ApplicationInfo getApplicationInfoForPackage(@NonNull final Context context, @NonNull final String packageName) {
+        return getApplicationInfoForPackage(context, packageName, 0);
+    }
+
+    /**
+     * Get the {@link ApplicationInfo} for the {@code packageName}.
+     *
+     * Also check {@link #isAppInstalled(Context, String, String) if targetting targeting sdk
+     * `30` (android `11`) since {@link PackageManager.NameNotFoundException} may be thrown.
+     *
+     * @param context The {@link Context} for operations.
+     * @param packageName The package name of the package.
+     * @param flags The flags to pass to {@link PackageManager#getApplicationInfo(String, int)}.
+     * @return Returns the {@link ApplicationInfo}. This will be {@code null} if an exception is raised.
+     */
+    @Nullable
+    public static ApplicationInfo getApplicationInfoForPackage(@NonNull final Context context, @NonNull final String packageName, final int flags) {
         try {
-            return context.getPackageManager().getPackageInfo(context.getPackageName(), flags);
+            return context.getPackageManager().getApplicationInfo(packageName, flags);
         } catch (final Exception e) {
             return null;
         }
     }
 
+
+
     /**
      * Get the app name for the package associated with the {@code context}.
      *
@@ -101,9 +166,22 @@ public static PackageInfo getPackageInfoForPackage(@NonNull final Context contex
      * @return Returns the {@code android:name} attribute.
      */
     public static String getAppNameForPackage(@NonNull final Context context) {
-        return context.getApplicationInfo().loadLabel(context.getPackageManager()).toString();
+        return getAppNameForPackage(context, context.getApplicationInfo());
     }
 
+    /**
+     * Get the app name for the package associated with the {@code applicationInfo}.
+     *
+     * @param context The {@link Context} for operations.
+     * @param applicationInfo The {@link ApplicationInfo} for the package.
+     * @return Returns the {@code android:name} attribute.
+     */
+    public static String getAppNameForPackage(@NonNull final Context context, @NonNull final ApplicationInfo applicationInfo) {
+        return applicationInfo.loadLabel(context.getPackageManager()).toString();
+    }
+
+
+
     /**
      * Get the package name for the package associated with the {@code context}.
      *
@@ -111,9 +189,21 @@ public static String getAppNameForPackage(@NonNull final Context context) {
      * @return Returns the package name.
      */
     public static String getPackageNameForPackage(@NonNull final Context context) {
-        return context.getApplicationInfo().packageName;
+        return getPackageNameForPackage(context.getApplicationInfo());
     }
 
+    /**
+     * Get the package name for the package associated with the {@code applicationInfo}.
+     *
+     * @param applicationInfo The {@link ApplicationInfo} for the package.
+     * @return Returns the package name.
+     */
+    public static String getPackageNameForPackage(@NonNull final ApplicationInfo applicationInfo) {
+        return applicationInfo.packageName;
+    }
+
+
+
     /**
      * Get the {@code targetSdkVersion} for the package associated with the {@code context}.
      *
@@ -121,9 +211,21 @@ public static String getPackageNameForPackage(@NonNull final Context context) {
      * @return Returns the {@code targetSdkVersion}.
      */
     public static int getTargetSDKForPackage(@NonNull final Context context) {
-        return context.getApplicationInfo().targetSdkVersion;
+        return getTargetSDKForPackage(context.getApplicationInfo());
     }
 
+    /**
+     * Get the {@code targetSdkVersion} for the package associated with the {@code applicationInfo}.
+     *
+     * @param applicationInfo The {@link ApplicationInfo} for the package.
+     * @return Returns the {@code targetSdkVersion}.
+     */
+    public static int getTargetSDKForPackage(@NonNull final ApplicationInfo applicationInfo) {
+        return applicationInfo.targetSdkVersion;
+    }
+
+
+
     /**
      * Check if the app associated with the {@code context} has {@link ApplicationInfo#FLAG_DEBUGGABLE}
      * set.
@@ -132,9 +234,22 @@ public static int getTargetSDKForPackage(@NonNull final Context context) {
      * @return Returns the {@code versionName}. This will be {@code null} if an exception is raised.
      */
     public static Boolean isAppForPackageADebuggableBuild(@NonNull final Context context) {
-        return ( 0 != ( context.getApplicationInfo().flags & ApplicationInfo.FLAG_DEBUGGABLE ) );
+        return isAppForPackageADebuggableBuild(context.getApplicationInfo());
     }
 
+    /**
+     * Check if the app associated with the {@code applicationInfo} has {@link ApplicationInfo#FLAG_DEBUGGABLE}
+     * set.
+     *
+     * @param applicationInfo The {@link ApplicationInfo} for the package.
+     * @return Returns the {@code versionName}. This will be {@code null} if an exception is raised.
+     */
+    public static Boolean isAppForPackageADebuggableBuild(@NonNull final ApplicationInfo applicationInfo) {
+        return ( 0 != ( applicationInfo.flags & ApplicationInfo.FLAG_DEBUGGABLE ) );
+    }
+
+
+
     /**
      * Check if the app associated with the {@code context} has {@link ApplicationInfo#FLAG_EXTERNAL_STORAGE}
      * set.
@@ -143,9 +258,22 @@ public static Boolean isAppForPackageADebuggableBuild(@NonNull final Context con
      * @return Returns the {@code versionName}. This will be {@code null} if an exception is raised.
      */
     public static Boolean isAppInstalledOnExternalStorage(@NonNull final Context context) {
-        return ( 0 != ( context.getApplicationInfo().flags & ApplicationInfo.FLAG_EXTERNAL_STORAGE ) );
+        return isAppInstalledOnExternalStorage(context.getApplicationInfo());
+    }
+
+    /**
+     * Check if the app associated with the {@code applicationInfo} has {@link ApplicationInfo#FLAG_EXTERNAL_STORAGE}
+     * set.
+     *
+     * @param applicationInfo The {@link ApplicationInfo} for the package.
+     * @return Returns the {@code versionName}. This will be {@code null} if an exception is raised.
+     */
+    public static Boolean isAppInstalledOnExternalStorage(@NonNull final ApplicationInfo applicationInfo) {
+        return ( 0 != ( applicationInfo.flags & ApplicationInfo.FLAG_EXTERNAL_STORAGE ) );
     }
 
+
+
     /**
      * Get the {@code versionCode} for the package associated with the {@code context}.
      *
@@ -154,13 +282,27 @@ public static Boolean isAppInstalledOnExternalStorage(@NonNull final Context con
      */
     @Nullable
     public static Integer getVersionCodeForPackage(@NonNull final Context context) {
+        return getVersionCodeForPackage(context, context.getPackageName());
+    }
+
+    /**
+     * Get the {@code versionCode} for the {@code packageName}.
+     *
+     * @param context The {@link Context} for operations.
+     * @param packageName The package name of the package.
+     * @return Returns the {@code versionCode}. This will be {@code null} if an exception is raised.
+     */
+    @Nullable
+    public static Integer getVersionCodeForPackage(@NonNull final Context context, @NonNull final String packageName) {
         try {
-            return getPackageInfoForPackage(context).versionCode;
+            return getPackageInfoForPackage(context, packageName).versionCode;
         } catch (final Exception e) {
             return null;
         }
     }
 
+
+
     /**
      * Get the {@code versionName} for the package associated with the {@code context}.
      *
@@ -169,13 +311,26 @@ public static Integer getVersionCodeForPackage(@NonNull final Context context) {
      */
     @Nullable
     public static String getVersionNameForPackage(@NonNull final Context context) {
+        return getVersionNameForPackage(context, context.getPackageName());
+    }
+    /**
+     * Get the {@code versionName} for the {@code packageName}.
+     *
+     * @param context The {@link Context} for operations.
+     * @param packageName The package name of the package.
+     * @return Returns the {@code versionName}. This will be {@code null} if an exception is raised.
+     */
+    @Nullable
+    public static String getVersionNameForPackage(@NonNull final Context context, @NonNull final String packageName) {
         try {
-            return getPackageInfoForPackage(context).versionName;
+            return getPackageInfoForPackage(context, packageName).versionName;
         } catch (final Exception e) {
             return null;
         }
     }
 
+
+
     /**
      * Get the {@code SHA-256 digest} of signing certificate for the package associated with the {@code context}.
      *
@@ -184,16 +339,28 @@ public static String getVersionNameForPackage(@NonNull final Context context) {
      */
     @Nullable
     public static String getSigningCertificateSHA256DigestForPackage(@NonNull final Context context) {
+        return getSigningCertificateSHA256DigestForPackage(context, context.getPackageName());
+    }
+
+    /**
+     * Get the {@code SHA-256 digest} of signing certificate for the {@code packageName}.
+     *
+     * @param context The {@link Context} for operations.
+     * @param packageName The package name of the package.
+     * @return Returns the {@code SHA-256 digest}. This will be {@code null} if an exception is raised.
+     */
+    @Nullable
+    public static String getSigningCertificateSHA256DigestForPackage(@NonNull final Context context, @NonNull final String packageName) {
         try {
             /*
-            * Todo: We may need AndroidManifest queries entries if package is installed but with a different signature on android 11
-            * https://developer.android.com/training/package-visibility
-            * Need a device that allows (manual) installation of apk with mismatched signature of
-            * sharedUserId apps to test. Currently, if its done, PackageManager just doesn't load
-            * the package and removes its apk automatically if its installed as a user app instead of system app
-            * W/PackageManager: Failed to parse /path/to/com.termux.tasker.apk: Signature mismatch for shared user: SharedUserSetting{xxxxxxx com.termux/10xxx}
-            */
-            PackageInfo packageInfo = getPackageInfoForPackage(context, PackageManager.GET_SIGNATURES);
+             * Todo: We may need AndroidManifest queries entries if package is installed but with a different signature on android 11
+             * https://developer.android.com/training/package-visibility
+             * Need a device that allows (manual) installation of apk with mismatched signature of
+             * sharedUserId apps to test. Currently, if its done, PackageManager just doesn't load
+             * the package and removes its apk automatically if its installed as a user app instead of system app
+             * W/PackageManager: Failed to parse /path/to/com.termux.tasker.apk: Signature mismatch for shared user: SharedUserSetting{xxxxxxx com.termux/10xxx}
+             */
+            PackageInfo packageInfo = getPackageInfoForPackage(context, packageName, PackageManager.GET_SIGNATURES);
             if (packageInfo == null) return null;
             return DataUtils.bytesToHex(MessageDigest.getInstance("SHA-256").digest(packageInfo.signatures[0].toByteArray()));
         } catch (final Exception e) {
@@ -287,7 +454,8 @@ public static String getPackagePID(final Context context, String packageName) {
      * If your third-party app is targeting sdk `30` (android `11`), then it needs to add package
      * name to the `queries` element or request `QUERY_ALL_PACKAGES` permission in its
      * `AndroidManifest.xml`. Otherwise it will get `PackageSetting{...... package_name/......} BLOCKED`
-     * errors in `logcat` and `RUN_COMMAND` won't work.
+     * errors in `logcat` and  {@link PackageManager.NameNotFoundException} may be thrown.
+     * `RUN_COMMAND` intent won't work either.
      * Check [package-visibility](https://developer.android.com/training/basics/intents/package-visibility#package-name),
      * `QUERY_ALL_PACKAGES` [googleplay policy](https://support.google.com/googleplay/android-developer/answer/10158779
      * and this [article](https://medium.com/androiddevelopers/working-with-package-visibility-dc252829de2d) for more info.
@@ -295,25 +463,24 @@ public static String getPackagePID(final Context context, String packageName) {
      * {@code
      * <manifest
      *     <queries>
-     *         <package android:name="package_name" />
+     *         <package android:name="com.termux" />
      *    </queries>
+     *
+     *    <application
+     *        ....
+     *    </application>
      * </manifest>
      * }
      *
      * @param context The context for operations.
+     * @param appName The name of the app.
+     * @param packageName The package name of the package.
      * @return Returns {@code errmsg} if {@code packageName} is not installed or disabled, otherwise {@code null}.
      */
     public static String isAppInstalled(@NonNull final Context context, String appName, String packageName) {
         String errmsg = null;
 
-        PackageManager packageManager = context.getPackageManager();
-
-        ApplicationInfo applicationInfo;
-        try {
-            applicationInfo = packageManager.getApplicationInfo(packageName, 0);
-        } catch (final PackageManager.NameNotFoundException e) {
-            applicationInfo = null;
-        }
+        ApplicationInfo applicationInfo = getApplicationInfoForPackage(context, packageName);
         boolean isAppEnabled = (applicationInfo != null && applicationInfo.enabled);
 
         // If app is not installed or is disabled
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/AndroidUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/AndroidUtils.java
index 2b1ac94296..80e4f13080 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/AndroidUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/AndroidUtils.java
@@ -2,6 +2,7 @@
 
 import android.annotation.SuppressLint;
 import android.content.Context;
+import android.content.pm.ApplicationInfo;
 import android.os.Build;
 
 import androidx.annotation.NonNull;
@@ -26,6 +27,9 @@ public class AndroidUtils {
 
     /**
      * Get a markdown {@link String} for the app info for the package associated with the {@code context}.
+     * This will contain additional info about the app in addition to the one returned by
+     * {@link #getAppInfoMarkdownString(Context, String)}, which will be got via the {@code context}
+     * object.
      *
      * @param context The context for operations for the package.
      * @return Returns the markdown {@link String}.
@@ -33,21 +37,16 @@ public class AndroidUtils {
     public static String getAppInfoMarkdownString(@NonNull final Context context) {
         StringBuilder markdownString = new StringBuilder();
 
-        AndroidUtils.appendPropertyToMarkdown(markdownString,"APP_NAME", PackageUtils.getAppNameForPackage(context));
-        AndroidUtils.appendPropertyToMarkdown(markdownString,"PACKAGE_NAME", PackageUtils.getPackageNameForPackage(context));
-        AndroidUtils.appendPropertyToMarkdown(markdownString,"VERSION_NAME", PackageUtils.getVersionNameForPackage(context));
-        AndroidUtils.appendPropertyToMarkdown(markdownString,"VERSION_CODE", PackageUtils.getVersionCodeForPackage(context));
-        AndroidUtils.appendPropertyToMarkdown(markdownString,"TARGET_SDK", PackageUtils.getTargetSDKForPackage(context));
-        AndroidUtils.appendPropertyToMarkdown(markdownString,"IS_DEBUGGABLE_BUILD", PackageUtils.isAppForPackageADebuggableBuild(context));
-
-        if (PackageUtils.isAppInstalledOnExternalStorage(context)) {
-            AndroidUtils.appendPropertyToMarkdown(markdownString,"IS_INSTALLED_ON_EXTERNAL_STORAGE", true);
-        }
+        String appInfo = getAppInfoMarkdownString(context, context.getPackageName());
+        if (appInfo == null)
+            return markdownString.toString();
+        else
+            markdownString.append(appInfo);
 
         String filesDir = context.getFilesDir().getAbsolutePath();
         if (!filesDir.equals("/data/user/0/" + context.getPackageName() + "/files") &&
             !filesDir.equals("/data/data/" + context.getPackageName() + "/files"))
-        AndroidUtils.appendPropertyToMarkdown(markdownString,"FILES_DIR", filesDir);
+            AndroidUtils.appendPropertyToMarkdown(markdownString,"FILES_DIR", filesDir);
 
         Long userId = PackageUtils.getSerialNumberForCurrentUser(context);
         if (userId == null || userId != 0)
@@ -58,6 +57,33 @@ public static String getAppInfoMarkdownString(@NonNull final Context context) {
         return markdownString.toString();
     }
 
+    /**
+     * Get a markdown {@link String} for the app info for the {@code packageName}.
+     *
+     * @param context The {@link Context} for operations.
+     * @param packageName The package name of the package.
+     * @return Returns the markdown {@link String}.
+     */
+    public static String getAppInfoMarkdownString(@NonNull final Context context, @NonNull final String packageName) {
+        ApplicationInfo applicationInfo = PackageUtils.getApplicationInfoForPackage(context, packageName);
+        if (applicationInfo == null) return null;
+
+        StringBuilder markdownString = new StringBuilder();
+
+        AndroidUtils.appendPropertyToMarkdown(markdownString,"APP_NAME", PackageUtils.getAppNameForPackage(context, applicationInfo));
+        AndroidUtils.appendPropertyToMarkdown(markdownString,"PACKAGE_NAME", PackageUtils.getPackageNameForPackage(applicationInfo));
+        AndroidUtils.appendPropertyToMarkdown(markdownString,"VERSION_NAME", PackageUtils.getVersionNameForPackage(context, packageName));
+        AndroidUtils.appendPropertyToMarkdown(markdownString,"VERSION_CODE", PackageUtils.getVersionCodeForPackage(context, packageName));
+        AndroidUtils.appendPropertyToMarkdown(markdownString,"TARGET_SDK", PackageUtils.getTargetSDKForPackage(applicationInfo));
+        AndroidUtils.appendPropertyToMarkdown(markdownString,"IS_DEBUGGABLE_BUILD", PackageUtils.isAppForPackageADebuggableBuild(applicationInfo));
+
+        if (PackageUtils.isAppInstalledOnExternalStorage(applicationInfo)) {
+            AndroidUtils.appendPropertyToMarkdown(markdownString,"IS_INSTALLED_ON_EXTERNAL_STORAGE", true);
+        }
+
+        return markdownString.toString();
+    }
+
     /**
      * Get a markdown {@link String} for the device info.
      *

From fd4159f1bad97a5d4dafcf1411a7eb0b113131d7 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 9 Oct 2021 02:09:49 +0500
Subject: [PATCH 592/912] Added: Add generic function TermuxUtils to get app
 info for termux app, its installed plugin apps and external apps

---
 .../app/activities/SettingsActivity.java      |  7 +-
 .../com/termux/shared/termux/TermuxUtils.java | 95 ++++++++++++++++++-
 2 files changed, 94 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/termux/app/activities/SettingsActivity.java b/app/src/main/java/com/termux/app/activities/SettingsActivity.java
index 3ffbaad952..7af92e1764 100644
--- a/app/src/main/java/com/termux/app/activities/SettingsActivity.java
+++ b/app/src/main/java/com/termux/app/activities/SettingsActivity.java
@@ -112,12 +112,7 @@ 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(TermuxUtils.getAppInfoMarkdownString(context, TermuxUtils.AppInfoMode.TERMUX_AND_PLUGIN_PACKAGES));
                             aboutString.append("\n\n").append(AndroidUtils.getDeviceInfoMarkdownString(context));
                             aboutString.append("\n\n").append(TermuxUtils.getImportantLinksMarkdownString(context));
 
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
index 0b5fbf82e4..3ea4d1d97b 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
@@ -8,8 +8,10 @@
 import android.content.pm.ResolveInfo;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.termux.shared.R;
+import com.termux.shared.data.DataUtils;
 import com.termux.shared.file.FileUtils;
 import com.termux.shared.file.TermuxFileUtils;
 import com.termux.shared.logger.Logger;
@@ -30,6 +32,18 @@
 
 public class TermuxUtils {
 
+    /** The modes used by {@link #getAppInfoMarkdownString(Context, AppInfoMode, String)}. */
+    public enum AppInfoMode {
+        /** Get info for Termux app only. */
+        TERMUX_PACKAGE,
+        /** Get info for Termux app and its plugins listed in {@link TermuxConstants#TERMUX_PLUGIN_APP_PACKAGE_NAMES_LIST}. */
+        TERMUX_AND_PLUGIN_PACKAGES,
+        /* Get info for all the Termux app plugins listed in {@link TermuxConstants#TERMUX_PLUGIN_APP_PACKAGE_NAMES_LIST}. */
+        TERMUX_PLUGIN_PACKAGES,
+        /* Get info for Termux app and the calling package that called a Termux API. */
+        TERMUX_AND_CALLING_PACKAGE,
+    }
+
     private static final String LOG_TAG = "TermuxUtils";
 
     /**
@@ -157,7 +171,7 @@ public static String isTermuxAPIAppInstalled(@NonNull final Context context) {
      *
      * @param currentPackageContext The context of current package.
      * @return Returns {@code errmsg} if failed to get termux package {@link Context} or
-     *         {@link TermuxConstants#TERMUX_PREFIX_DIR_PATH} is accessible, otherwise {@code null}.
+     * {@link TermuxConstants#TERMUX_PREFIX_DIR_PATH} is accessible, otherwise {@code null}.
      */
     public static String isTermuxAppAccessible(@NonNull final Context currentPackageContext) {
         String errmsg = isTermuxAppInstalled(currentPackageContext);
@@ -206,6 +220,82 @@ public static void sendTermuxOpenedBroadcast(@NonNull Context context) {
         }
     }
 
+
+
+    /**
+     * Wrapper for {@link #getAppInfoMarkdownString(Context, AppInfoMode, String)}.
+     *
+     * @param currentPackageContext The context of current package.
+     * @param appInfoMode The {@link AppInfoMode} to decide the app info required.
+     * @return Returns the markdown {@link String}.
+     */
+    public static String getAppInfoMarkdownString(final Context currentPackageContext, final AppInfoMode appInfoMode) {
+        return getAppInfoMarkdownString(currentPackageContext, appInfoMode, null);
+    }
+
+    /**
+     * Get a markdown {@link String} for the apps info of termux app, its installed plugin apps or
+     * external apps that called a Termux API depending on {@link AppInfoMode} passed.
+     *
+     * Also check {@link PackageUtils#isAppInstalled(Context, String, String) if targetting targeting
+     * sdk `30` (android `11`) since {@link PackageManager.NameNotFoundException} may be thrown while
+     * getting info of {@code callingPackageName} app.
+     *
+     * @param currentPackageContext The context of current package.
+     * @param appInfoMode The {@link AppInfoMode} to decide the app info required.
+     * @param callingPackageName The optional package name for a plugin or external app.
+     * @return Returns the markdown {@link String}.
+     */
+    public static String getAppInfoMarkdownString(final Context currentPackageContext, final AppInfoMode appInfoMode, @Nullable String callingPackageName) {
+        if (appInfoMode == null) return null;
+
+        StringBuilder appInfo = new StringBuilder();
+        switch (appInfoMode) {
+            case TERMUX_PACKAGE:
+                return getAppInfoMarkdownString(currentPackageContext, false);
+
+            case TERMUX_AND_PLUGIN_PACKAGES:
+                appInfo.append(TermuxUtils.getAppInfoMarkdownString(currentPackageContext, false));
+
+                String termuxPluginAppsInfo =  TermuxUtils.getTermuxPluginAppsInfoMarkdownString(currentPackageContext);
+                if (termuxPluginAppsInfo != null)
+                    appInfo.append("\n\n").append(termuxPluginAppsInfo);
+                return appInfo.toString();
+
+            case TERMUX_PLUGIN_PACKAGES:
+                return TermuxUtils.getTermuxPluginAppsInfoMarkdownString(currentPackageContext);
+
+            case TERMUX_AND_CALLING_PACKAGE:
+                appInfo.append(TermuxUtils.getAppInfoMarkdownString(currentPackageContext, false));
+                if (!DataUtils.isNullOrEmpty(callingPackageName)) {
+                    String callingPackageAppInfo;
+                    if (TermuxConstants.TERMUX_PLUGIN_APP_PACKAGE_NAMES_LIST.contains(callingPackageName)) {
+                        Context termuxPluginAppContext = PackageUtils.getContextForPackage(currentPackageContext, callingPackageName);
+                        if (termuxPluginAppContext != null)
+                            callingPackageAppInfo = getAppInfoMarkdownString(termuxPluginAppContext, false);
+                        else
+                            callingPackageAppInfo = AndroidUtils.getAppInfoMarkdownString(currentPackageContext, callingPackageName);
+                    } else {
+                        callingPackageAppInfo = AndroidUtils.getAppInfoMarkdownString(currentPackageContext, callingPackageName);
+                    }
+
+                    if (callingPackageAppInfo != null) {
+                        ApplicationInfo applicationInfo = PackageUtils.getApplicationInfoForPackage(currentPackageContext, callingPackageName);
+                        if (applicationInfo != null) {
+                            appInfo.append("\n\n## ").append(PackageUtils.getAppNameForPackage(currentPackageContext, applicationInfo)).append(" App Info\n");
+                            appInfo.append(callingPackageAppInfo);
+                            appInfo.append("\n##\n");
+                        }
+                    }
+                }
+                return appInfo.toString();
+
+            default:
+                return null;
+        }
+
+    }
+
     /**
      * Get a markdown {@link String} for the apps info of all/any termux plugin apps installed.
      *
@@ -274,13 +364,14 @@ public static String getAppInfoMarkdownString(final Context currentPackageContex
         else
             markdownString.append("## ").append(currentAppName).append(" App Info\n");
         markdownString.append(getAppInfoMarkdownStringInner(currentPackageContext));
+        markdownString.append("\n##\n");
 
         if (returnTermuxPackageInfoToo && termuxPackageContext != null && !isTermuxPackage) {
             markdownString.append("\n\n## ").append(termuxAppName).append(" App Info\n");
             markdownString.append(getAppInfoMarkdownStringInner(termuxPackageContext));
+            markdownString.append("\n##\n");
         }
 
-        markdownString.append("\n##\n");
 
         return markdownString.toString();
     }

From ae7f141acab8d0e20097e3a6a1ce8213fdc6d8c7 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 9 Oct 2021 02:11:12 +0500
Subject: [PATCH 593/912] Added: Add info of installed plugin apps when report
 issue report is generated with debug mode enabled

---
 .../com/termux/app/terminal/TermuxTerminalViewClient.java  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
index 0a565a9aec..aafc90ae45 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
@@ -724,7 +724,12 @@ public void run() {
                 reportString.append("\n").append(MarkdownUtils.getMarkdownCodeForString(transcriptText, true));
                 reportString.append("\n##\n");
 
-                reportString.append("\n\n").append(TermuxUtils.getAppInfoMarkdownString(mActivity, true));
+                if (addTermuxDebugInfo) {
+                    reportString.append("\n\n").append(TermuxUtils.getAppInfoMarkdownString(mActivity, TermuxUtils.AppInfoMode.TERMUX_AND_PLUGIN_PACKAGES));
+                } else {
+                    reportString.append("\n\n").append(TermuxUtils.getAppInfoMarkdownString(mActivity, TermuxUtils.AppInfoMode.TERMUX_PACKAGE));
+                }
+
                 reportString.append("\n\n").append(AndroidUtils.getDeviceInfoMarkdownString(mActivity));
 
                 String termuxAptInfo = TermuxUtils.geAPTInfoMarkdownString(mActivity);

From 9814438ae5bd93511c1f1f07160bec11b3688ce0 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 9 Oct 2021 02:18:11 +0500
Subject: [PATCH 594/912] Added: Add info of Termux API calling app in plugin
 command error reports and refactor notification functions

Now when a Termux API command like `RUN_COMMAND` intent is called by an external app with PendingIntent, then the info of the app will be shown in error reports as well. This should provide more info about the caller which should be useful for debugging or in case a malicious app ran commands with `allow-external-app` disabled.

Moreover, `PluginUtils.sendPluginCommandErrorNotification()` has been refactored to send generic messages instead of just for `ExecutionCommand`. This will allow usage with other Termux APIs as well.
---
 .../com/termux/app/utils/PluginUtils.java     | 81 ++++++++++++++-----
 1 file changed, 60 insertions(+), 21 deletions(-)

diff --git a/app/src/main/java/com/termux/app/utils/PluginUtils.java b/app/src/main/java/com/termux/app/utils/PluginUtils.java
index adc165a2b2..52e2f55e1a 100644
--- a/app/src/main/java/com/termux/app/utils/PluginUtils.java
+++ b/app/src/main/java/com/termux/app/utils/PluginUtils.java
@@ -18,6 +18,7 @@
 import com.termux.shared.models.errors.Error;
 import com.termux.shared.notification.NotificationUtils;
 import com.termux.shared.notification.TermuxNotificationUtils;
+import com.termux.shared.settings.preferences.TermuxPreferenceConstants;
 import com.termux.shared.shell.ResultSender;
 import com.termux.shared.shell.ShellUtils;
 import com.termux.shared.termux.AndroidUtils;
@@ -89,8 +90,12 @@ public static void processPluginExecutionCommandResult(final Context context, St
                 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));
+                sendPluginCommandErrorNotification(context, logTag, null,
+                    ResultData.getErrorsListMinimalString(resultData),
+                    ExecutionCommand.getExecutionCommandMarkdownString(executionCommand),
+                    false, true, TermuxUtils.AppInfoMode.TERMUX_AND_CALLING_PACKAGE,
+                    executionCommand.resultConfig.resultPendingIntent != null ? executionCommand.resultConfig.resultPendingIntent.getCreatorPackage(): null,
+                    true);
             }
 
         }
@@ -165,17 +170,13 @@ public static void processPluginExecutionCommandError(final Context context, Str
             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)
-            return;
-
         // Flash and send notification for the error
-        Logger.showToast(context, ResultData.getErrorsListMinimalString(resultData), true);
-        sendPluginCommandErrorNotification(context, logTag, executionCommand, ResultData.getErrorsListMinimalString(resultData));
-
+        sendPluginCommandErrorNotification(context, logTag, null,
+            ResultData.getErrorsListMinimalString(resultData),
+            ExecutionCommand.getExecutionCommandMarkdownString(executionCommand),
+            forceNotification, true, TermuxUtils.AppInfoMode.TERMUX_AND_CALLING_PACKAGE,
+            executionCommand.resultConfig.resultPendingIntent != null ? executionCommand.resultConfig.resultPendingIntent.getCreatorPackage(): null,
+            true);
     }
 
     /** Set variables which will be used by {@link ResultSender#sendCommandResultData(Context, String, String, ResultConfig, ResultData, boolean)}
@@ -213,23 +214,60 @@ public static void setPluginResultDirectoryVariables(ExecutionCommand executionC
      * 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 title The title for the error report and notification.
      * @param notificationTextString The text of the notification.
+     * @param message The message for the error 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_PLUGIN_ERROR_NOTIFICATIONS_ENABLED}
+     *                          is {@code false}.
+     * @param showToast If set to {@code true}, then a toast will be shown for {@code notificationTextString}.
+     * @param appInfoMode The {@link TermuxUtils.AppInfoMode} to use to add app info to the message.
+     *                    Set to {@code null} if app info should not be appended to the message.
+     * @param callingPackageName The optional package name of the app for which the plugin command
+     *                           was run.
+     * @param addDeviceInfo If set to {@code true}, then device info should be appended to the message.
      */
-    public static void sendPluginCommandErrorNotification(Context context, String logTag, ExecutionCommand executionCommand, String notificationTextString) {
+    public static void sendPluginCommandErrorNotification(Context context, String logTag,
+                                                          CharSequence title,
+                                                          String notificationTextString,
+                                                          String message, boolean forceNotification,
+                                                          boolean showToast,
+                                                          TermuxUtils.AppInfoMode appInfoMode,
+                                                          String callingPackageName,
+                                                          boolean addDeviceInfo) {
+        if (context == null) 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)
+            return;
+
+        logTag = DataUtils.getDefaultIfNull(logTag, LOG_TAG);
+
+        if (showToast)
+            Logger.showToast(context, notificationTextString, true);
+
         // Send a notification to show the error which when clicked will open the ReportActivity
         // to show the details of the error
-        String title = TermuxConstants.TERMUX_APP_NAME + " Plugin Execution Command Error";
+        if (title == null || title.toString().isEmpty())
+            title = TermuxConstants.TERMUX_APP_NAME + " Plugin Execution Command Error";
+
+        Logger.logDebug(logTag, "Sending \"" + title + "\" notification.");
+
+        StringBuilder reportString = new StringBuilder(message);
 
-        StringBuilder reportString = new StringBuilder();
+        if (appInfoMode != null)
+            reportString.append("\n\n").append(TermuxUtils.getAppInfoMarkdownString(context, appInfoMode, callingPackageName));
 
-        reportString.append(ExecutionCommand.getExecutionCommandMarkdownString(executionCommand));
-        reportString.append("\n\n").append(TermuxUtils.getAppInfoMarkdownString(context, true));
-        reportString.append("\n\n").append(AndroidUtils.getDeviceInfoMarkdownString(context));
+        if (addDeviceInfo)
+            reportString.append("\n\n").append(AndroidUtils.getDeviceInfoMarkdownString(context));
 
         String userActionName = UserAction.PLUGIN_EXECUTION_COMMAND.getName();
         ReportActivity.NewInstanceResult result = ReportActivity.newInstance(context,
-            new ReportInfo(userActionName, logTag, title, null,
+            new ReportInfo(userActionName, logTag, title.toString(), null,
                 reportString.toString(), null,true,
                 userActionName,
                 Environment.getExternalStorageDirectory() + "/" +
@@ -254,7 +292,8 @@ public static void sendPluginCommandErrorNotification(Context context, String lo
 
         // Build the notification
         Notification.Builder builder = getPluginCommandErrorsNotificationBuilder(context, title,
-            notificationTextCharSequence, notificationTextCharSequence, contentIntent, deleteIntent, NotificationUtils.NOTIFICATION_MODE_VIBRATE);
+            notificationTextCharSequence, notificationTextCharSequence, contentIntent, deleteIntent,
+            NotificationUtils.NOTIFICATION_MODE_VIBRATE);
         if (builder == null) return;
 
         // Send the notification

From 64adc521de4b7bd1476f6e479070e9d790c832eb Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 9 Oct 2021 02:27:18 +0500
Subject: [PATCH 595/912] Added: Add info of all Termux plugins in bootstrap
 error reports and refactor notification functions

Now in case of bootstrap failure, the app info of all installed termux plugin apps will be added as well, including whether they are installed on external/portable sd card. Apparently, as per reports, installing termux app or even plugin apps on external/portable sd cards prevents termux apps from accessing its files directory `/data/data/com.termux/file` and bootstrap checks fail. This commit should provide more info or proof of it.

Moreover, adding plugin info would be useful in future for diagnosing targetsdk mismatch between Termux and its plugins when sdk `30` is targeted by Termux app.
---
 .../java/com/termux/app/TermuxInstaller.java  | 17 ++++++--
 .../java/com/termux/app/utils/CrashUtils.java | 43 ++++++++++++++-----
 2 files changed, 45 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxInstaller.java b/app/src/main/java/com/termux/app/TermuxInstaller.java
index 763d167091..1c0688d9bf 100644
--- a/app/src/main/java/com/termux/app/TermuxInstaller.java
+++ b/app/src/main/java/com/termux/app/TermuxInstaller.java
@@ -252,14 +252,19 @@ public static void showBootstrapErrorDialog(Activity activity, Runnable whenDone
     }
 
     private static void sendBootstrapCrashReportNotification(Activity activity, String message) {
+        final String title = TermuxConstants.TERMUX_APP_NAME + " Bootstrap Error";
+
+        // Add info of all install Termux plugin apps as well since their target sdk or installation
+        // on external/portable sd card can affect Termux app files directory access or exec.
         CrashUtils.sendCrashReportNotification(activity, LOG_TAG,
-            "## Bootstrap Error\n\n" + message + "\n\n" +
+            title, null, "## " + title + "\n\n" + message + "\n\n" +
                 TermuxUtils.getTermuxDebugMarkdownString(activity),
-            true, true);
+            true, false, TermuxUtils.AppInfoMode.TERMUX_AND_PLUGIN_PACKAGES, true);
     }
 
     static void setupStorageSymlinks(final Context context) {
         final String LOG_TAG = "termux-storage";
+        final String title = TermuxConstants.TERMUX_APP_NAME + " Setup Storage Error";
 
         Logger.logInfo(LOG_TAG, "Setting up storage symlinks.");
 
@@ -273,7 +278,9 @@ public void run() {
                     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);
+                        CrashUtils.sendCrashReportNotification(context, LOG_TAG, title, null,
+                            "## " + title + "\n\n" + Error.getErrorMarkdownString(error),
+                            true, false, TermuxUtils.AppInfoMode.TERMUX_PACKAGE, true);
                         return;
                     }
 
@@ -312,7 +319,9 @@ public void run() {
                 } 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);
+                    CrashUtils.sendCrashReportNotification(context, LOG_TAG, title, null,
+                        "## " + title + "\n\n" + Logger.getStackTracesMarkdownString(null, Logger.getStackTracesStringArray(e)),
+                        true, false, TermuxUtils.AppInfoMode.TERMUX_PACKAGE, true);
                 }
             }
         }.start();
diff --git a/app/src/main/java/com/termux/app/utils/CrashUtils.java b/app/src/main/java/com/termux/app/utils/CrashUtils.java
index 73e7d676f2..70ad36e492 100644
--- a/app/src/main/java/com/termux/app/utils/CrashUtils.java
+++ b/app/src/main/java/com/termux/app/utils/CrashUtils.java
@@ -10,6 +10,7 @@
 
 import com.termux.R;
 import com.termux.shared.activities.ReportActivity;
+import com.termux.shared.markdown.MarkdownUtils;
 import com.termux.shared.models.errors.Error;
 import com.termux.shared.notification.NotificationUtils;
 import com.termux.shared.file.FileUtils;
@@ -87,7 +88,7 @@ public void run() {
 
                 Logger.logDebug(logTag, "A crash log file found at \"" + TermuxConstants.TERMUX_CRASH_LOG_FILE_PATH +  "\".");
 
-                sendCrashReportNotification(context, logTag, reportString, false, false);
+                sendCrashReportNotification(context, logTag, null, null, reportString, false, false, null, false);
             }
         }.start();
     }
@@ -98,15 +99,25 @@ public void run() {
      *
      * @param context The {@link Context} for operations.
      * @param logTag The log tag to use for logging.
+     * @param title The title for the crash report and notification.
+     * @param notificationTextString The text of the notification.
      * @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.
+     * @param showToast If set to {@code true}, then a toast will be shown for {@code notificationTextString}.
+     * @param appInfoMode The {@link TermuxUtils.AppInfoMode} to use to add app info to the message.
+     *                    Set to {@code null} if app info should not be appended to the message.
+     * @param addDeviceInfo If set to {@code true}, then device info should be appended to the message.
      */
-    public static void sendCrashReportNotification(final Context context, String logTag, String message, boolean forceNotification, boolean addAppAndDeviceInfo) {
+    public static void sendCrashReportNotification(final Context context, String logTag,
+                                                   CharSequence title,
+                                                   String notificationTextString,
+                                                   String message, boolean forceNotification,
+                                                   boolean showToast,
+                                                   TermuxUtils.AppInfoMode appInfoMode,
+                                                   boolean addDeviceInfo) {
         if (context == null) return;
 
         TermuxAppSharedPreferences preferences = TermuxAppSharedPreferences.build(context);
@@ -118,22 +129,27 @@ public static void sendCrashReportNotification(final Context context, String log
 
         logTag = DataUtils.getDefaultIfNull(logTag, LOG_TAG);
 
+        if (showToast)
+            Logger.showToast(context, notificationTextString, true);
+
         // 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";
+        if (title == null || title.toString().isEmpty())
+            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));
+        if (appInfoMode != null)
+            reportString.append("\n\n").append(TermuxUtils.getAppInfoMarkdownString(context, appInfoMode));
+
+        if (addDeviceInfo)
             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(),
+            logTag, title.toString(), null, reportString.toString(),
             "\n\n" + TermuxUtils.getReportIssueMarkdownString(context), true,
             userActionName,
             Environment.getExternalStorageDirectory() + "/" +
@@ -152,9 +168,14 @@ public static void sendCrashReportNotification(final Context context, String log
         // Setup the notification channel if not already set up
         setupCrashReportsNotificationChannel(context);
 
+        // Use markdown in notification
+        CharSequence notificationTextCharSequence = MarkdownUtils.getSpannedMarkdownText(context, notificationTextString);
+        //CharSequence notificationTextCharSequence = notificationTextString;
+
         // Build the notification
-        Notification.Builder builder = getCrashReportsNotificationBuilder(context, title, null,
-            null, contentIntent, deleteIntent, NotificationUtils.NOTIFICATION_MODE_VIBRATE);
+        Notification.Builder builder = getCrashReportsNotificationBuilder(context, title,
+            notificationTextCharSequence, notificationTextCharSequence, contentIntent, deleteIntent,
+            NotificationUtils.NOTIFICATION_MODE_VIBRATE);
         if (builder == null) return;
 
         // Send the notification

From fa91205bcaa18f7afb317fea369bfda27f396888 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 9 Oct 2021 14:50:12 +0500
Subject: [PATCH 596/912] Changed!: Move ReportInfo parameters from constructor
 to functions

---
 .../app/activities/SettingsActivity.java      | 13 ++++--
 .../terminal/TermuxTerminalViewClient.java    | 18 ++++----
 .../java/com/termux/app/utils/CrashUtils.java | 14 ++++--
 .../com/termux/app/utils/PluginUtils.java     | 16 ++++---
 .../com/termux/shared/models/ReportInfo.java  | 46 ++++++++++++++-----
 5 files changed, 71 insertions(+), 36 deletions(-)

diff --git a/app/src/main/java/com/termux/app/activities/SettingsActivity.java b/app/src/main/java/com/termux/app/activities/SettingsActivity.java
index 7af92e1764..70b0b44a7e 100644
--- a/app/src/main/java/com/termux/app/activities/SettingsActivity.java
+++ b/app/src/main/java/com/termux/app/activities/SettingsActivity.java
@@ -117,12 +117,15 @@ public void run() {
                             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,
+
+                            ReportInfo reportInfo = new ReportInfo(userActionName,
+                                TermuxConstants.TERMUX_APP.TERMUX_SETTINGS_ACTIVITY_NAME, title);
+                            reportInfo.setReportString(aboutString.toString());
+                            reportInfo.setReportSaveFileLabelAndPath(userActionName,
                                 Environment.getExternalStorageDirectory() + "/" +
-                                    FileUtils.sanitizeFileName(TermuxConstants.TERMUX_APP_NAME + "-" + userActionName + ".log", true, true)));
+                                    FileUtils.sanitizeFileName(TermuxConstants.TERMUX_APP_NAME + "-" + userActionName + ".log", true, true));
+
+                            ReportActivity.startReportActivity(context, reportInfo);
                         }
                     }.start();
 
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
index aafc90ae45..700173ed2e 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
@@ -743,14 +743,16 @@ public void run() {
                 }
 
                 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)));
+
+                ReportInfo reportInfo = new ReportInfo(userActionName,
+                    TermuxConstants.TERMUX_APP.TERMUX_ACTIVITY_NAME, title);
+                reportInfo.setReportString(reportString.toString());
+                reportInfo.setReportStringSuffix("\n\n" + TermuxUtils.getReportIssueMarkdownString(mActivity));
+                reportInfo.setReportSaveFileLabelAndPath(userActionName,
+                    Environment.getExternalStorageDirectory() + "/" +
+                        FileUtils.sanitizeFileName(TermuxConstants.TERMUX_APP_NAME + "-" + userActionName + ".log", true, true));
+
+                ReportActivity.startReportActivity(mActivity, reportInfo);
             }
         }.start();
     }
diff --git a/app/src/main/java/com/termux/app/utils/CrashUtils.java b/app/src/main/java/com/termux/app/utils/CrashUtils.java
index 70ad36e492..2a079b34b5 100644
--- a/app/src/main/java/com/termux/app/utils/CrashUtils.java
+++ b/app/src/main/java/com/termux/app/utils/CrashUtils.java
@@ -148,12 +148,16 @@ public static void sendCrashReportNotification(final Context context, String log
             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.toString(), null, reportString.toString(),
-            "\n\n" + TermuxUtils.getReportIssueMarkdownString(context), true,
-            userActionName,
+
+        ReportInfo reportInfo = new ReportInfo(userActionName, logTag, title.toString());
+        reportInfo.setReportString(reportString.toString());
+        reportInfo.setReportStringSuffix("\n\n" + TermuxUtils.getReportIssueMarkdownString(context));
+        reportInfo.setAddReportInfoHeaderToMarkdown(true);
+        reportInfo.setReportSaveFileLabelAndPath(userActionName,
             Environment.getExternalStorageDirectory() + "/" +
-                FileUtils.sanitizeFileName(TermuxConstants.TERMUX_APP_NAME + "-" + userActionName + ".log", true, true)));
+                FileUtils.sanitizeFileName(TermuxConstants.TERMUX_APP_NAME + "-" + userActionName + ".log", true, true));
+
+        ReportActivity.NewInstanceResult result = ReportActivity.newInstance(context, reportInfo);
         if (result.contentIntent == null) return;
 
         // Must ensure result code for PendingIntents and id for notification are unique otherwise will override previous
diff --git a/app/src/main/java/com/termux/app/utils/PluginUtils.java b/app/src/main/java/com/termux/app/utils/PluginUtils.java
index 52e2f55e1a..4dfc5c6cb2 100644
--- a/app/src/main/java/com/termux/app/utils/PluginUtils.java
+++ b/app/src/main/java/com/termux/app/utils/PluginUtils.java
@@ -266,12 +266,16 @@ public static void sendPluginCommandErrorNotification(Context context, String lo
             reportString.append("\n\n").append(AndroidUtils.getDeviceInfoMarkdownString(context));
 
         String userActionName = UserAction.PLUGIN_EXECUTION_COMMAND.getName();
-        ReportActivity.NewInstanceResult result = ReportActivity.newInstance(context,
-            new ReportInfo(userActionName, logTag, title.toString(), null,
-                reportString.toString(), null,true,
-                userActionName,
-                Environment.getExternalStorageDirectory() + "/" +
-                    FileUtils.sanitizeFileName(TermuxConstants.TERMUX_APP_NAME + "-" + userActionName + ".log", true, true)));
+
+        ReportInfo reportInfo = new ReportInfo(userActionName, logTag, title.toString());
+        reportInfo.setReportString(reportString.toString());
+        reportInfo.setReportStringSuffix("\n\n" + TermuxUtils.getReportIssueMarkdownString(context));
+        reportInfo.setAddReportInfoHeaderToMarkdown(true);
+        reportInfo.setReportSaveFileLabelAndPath(userActionName,
+            Environment.getExternalStorageDirectory() + "/" +
+                FileUtils.sanitizeFileName(TermuxConstants.TERMUX_APP_NAME + "-" + userActionName + ".log", true, true));
+
+        ReportActivity.NewInstanceResult result = ReportActivity.newInstance(context, reportInfo);
         if (result.contentIntent == null) return;
 
         // Must ensure result code for PendingIntents and id for notification are unique otherwise will override previous
diff --git a/termux-shared/src/main/java/com/termux/shared/models/ReportInfo.java b/termux-shared/src/main/java/com/termux/shared/models/ReportInfo.java
index 253d9d37a1..129fb337bd 100644
--- a/termux-shared/src/main/java/com/termux/shared/models/ReportInfo.java
+++ b/termux-shared/src/main/java/com/termux/shared/models/ReportInfo.java
@@ -16,37 +16,59 @@ public class ReportInfo implements Serializable {
     public final String sender;
     /** The report title. */
     public final String reportTitle;
+    /** The timestamp for the report. */
+    public final String reportTimestamp;
+
     /** The markdown report text prefix. Will not be part of copy and share operations, etc. */
     public String reportStringPrefix;
     /** The markdown report text. */
     public String reportString;
     /** The markdown report text suffix. Will not be part of copy and share operations, etc. */
     public 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;
-    /** The timestamp for the report. */
-    public final String reportTimestamp;
+
+    /** If set to {@code true}, then report header info will be added to the report when markdown is
+     * generated. */
+    public boolean addReportInfoHeaderToMarkdown = false;
 
     /** The label for the report file to save if user selects menu_item_save_report_to_file. */
-    public final String reportSaveFileLabel;
+    public String reportSaveFileLabel;
     /** The path for the report file to save if user selects menu_item_save_report_to_file. */
-    public final String reportSaveFilePath;
+    public String reportSaveFilePath;
 
-    public ReportInfo(String userAction, String sender, String reportTitle, String reportStringPrefix,
-                      String reportString, String reportStringSuffix, boolean addReportInfoHeaderToMarkdown,
-                      String reportSaveFileLabel, String reportSaveFilePath) {
+    public ReportInfo(String userAction, String sender, String reportTitle) {
         this.userAction = userAction;
         this.sender = sender;
         this.reportTitle = reportTitle;
+        this.reportTimestamp = AndroidUtils.getCurrentMilliSecondUTCTimeStamp();
+    }
+
+    public void setReportStringPrefix(String reportStringPrefix) {
         this.reportStringPrefix = reportStringPrefix;
+    }
+
+    public void setReportString(String reportString) {
         this.reportString = reportString;
+    }
+
+    public void setReportStringSuffix(String reportStringSuffix) {
         this.reportStringSuffix = reportStringSuffix;
+    }
+
+    public void setAddReportInfoHeaderToMarkdown(boolean addReportInfoHeaderToMarkdown) {
         this.addReportInfoHeaderToMarkdown = addReportInfoHeaderToMarkdown;
+    }
+
+    public void setReportSaveFileLabelAndPath(String reportSaveFileLabel, String reportSaveFilePath) {
+        setReportSaveFileLabel(reportSaveFileLabel);
+        setReportSaveFilePath(reportSaveFilePath);
+    }
+
+    public void setReportSaveFileLabel(String reportSaveFileLabel) {
         this.reportSaveFileLabel = reportSaveFileLabel;
+    }
+
+    public void setReportSaveFilePath(String reportSaveFilePath) {
         this.reportSaveFilePath = reportSaveFilePath;
-        this.reportTimestamp = AndroidUtils.getCurrentMilliSecondUTCTimeStamp();
     }
 
     /**

From 9798b30c76c032393854280389fa5a9c75383ac9 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 13 Oct 2021 22:48:37 +0500
Subject: [PATCH 597/912] Fixed: Fix issue where menu wouldn't show when text
 on bottom row of terminal was selected

Closes #2233
---
 .../textselection/TextSelectionCursorController.java     | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/terminal-view/src/main/java/com/termux/view/textselection/TextSelectionCursorController.java b/terminal-view/src/main/java/com/termux/view/textselection/TextSelectionCursorController.java
index 253e8deae6..09e9ba224c 100644
--- a/terminal-view/src/main/java/com/termux/view/textselection/TextSelectionCursorController.java
+++ b/terminal-view/src/main/java/com/termux/view/textselection/TextSelectionCursorController.java
@@ -183,14 +183,19 @@ public void onGetContentRect(ActionMode mode, View view, Rect outRect) {
                 int y1 = Math.round((mSelY1 - 1 - terminalView.getTopRow()) * terminalView.mRenderer.getFontLineSpacing());
                 int y2 = Math.round((mSelY2 + 1 - terminalView.getTopRow()) * terminalView.mRenderer.getFontLineSpacing());
 
-
                 if (x1 > x2) {
                     int tmp = x1;
                     x1 = x2;
                     x2 = tmp;
                 }
 
-                outRect.set(x1, y1 + mHandleHeight, x2, y2 + mHandleHeight);
+                int terminalBottom = terminalView.getBottom();
+                int top = y1 + mHandleHeight;
+                int bottom = y2 + mHandleHeight;
+                if (top > terminalBottom) top = terminalBottom;
+                if (bottom > terminalBottom) bottom = terminalBottom;
+
+                outRect.set(x1, top, x2, bottom);
             }
         }, ActionMode.TYPE_FLOATING);
     }

From 701b5ccd5ca8ccb426046c6bc7c86279e29b5ae0 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 13 Oct 2021 22:53:15 +0500
Subject: [PATCH 598/912] Fixed: Fix ArrayIndexOutOfBoundsException thrown
 because length was less than 0 when selecting text from terminal buffer

java.lang.ArrayIndexOutOfBoundsException: src.length=132 srcPos=90 dst.length=16 dstPos=0 length=-2
at java.lang.System.arraycopy(System.java:469)
at java.lang.AbstractStringBuilder.append(AbstractStringBuilder.java:597)
at java.lang.StringBuilder.append(StringBuilder.java:191)
at com.termux.terminal.TerminalBuffer.getSelectedText(TerminalBuffer.java:97)
at com.termux.terminal.TerminalBuffer.getSelectedText(TerminalBuffer.java:57)
at com.termux.terminal.TerminalBuffer.getSelectedText(TerminalBuffer.java:53)
at com.termux.terminal.TerminalEmulator.getSelectedText(TerminalEmulator.java:2401)
at com.termux.view.textselection.TextSelectionCursorController$1.onActionItemClicked(TextSelectionCursorController.java:140)
---
 .../src/main/java/com/termux/terminal/TerminalBuffer.java  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/terminal-emulator/src/main/java/com/termux/terminal/TerminalBuffer.java b/terminal-emulator/src/main/java/com/termux/terminal/TerminalBuffer.java
index 8b898434ff..4a74ee6f1d 100644
--- a/terminal-emulator/src/main/java/com/termux/terminal/TerminalBuffer.java
+++ b/terminal-emulator/src/main/java/com/termux/terminal/TerminalBuffer.java
@@ -93,8 +93,11 @@ public String getSelectedText(int selX1, int selY1, int selX2, int selY2, boolea
                     if (c != ' ') lastPrintingCharIndex = i;
                 }
             }
-            if (lastPrintingCharIndex != -1)
-                builder.append(line, x1Index, lastPrintingCharIndex - x1Index + 1);
+
+            int len = lastPrintingCharIndex - x1Index + 1;
+            if (lastPrintingCharIndex != -1 && len > 0)
+                builder.append(line, x1Index, len);
+
             boolean lineFillsWidth = lastPrintingCharIndex == x2Index - 1;
             if ((!joinBackLines || !rowLineWrap) && (!joinFullLines || !lineFillsWidth)
                 && row < selY2 && row < mScreenRows - 1) builder.append('\n');

From 4faf2b9d28f4151e41fe2f008bb95b98afc2d8d1 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 13 Oct 2021 23:34:38 +0500
Subject: [PATCH 599/912] Fixed: Fix CSI Delete Ps Column(s) (DECDC)

Firstly, `TerminalBuffer.blockSet()` was throwing the exception since `sx + w > mColumns` which was technically passed by TerminalEmulator.blockClear()`. Actual value would be `mCursorRow + columnsToMove + columnsToDelete > mColumns`.

Secondly, the call to `blockClear()` should not be needed since it the `blockCopy()` would overwrite the columns to be deleted on copy.

Run `printf "\e['~"` to delete 1 column and `printf "\e[3'~"` to delete 3 columns. Run `printf "\e[3'}"` to insert 2 columns.

java.lang.IllegalArgumentException: Illegal arguments! blockSet(78, 0, 1, 30, 32, 56, 30)
at com.termux.terminal.TerminalBuffer.blockSet(TerminalBuffer.java:397)
at com.termux.terminal.TerminalEmulator.blockClear(TerminalEmulator.java:2035)
at com.termux.terminal.TerminalEmulator.processCodePoint(TerminalEmulator.java:799)
---
 .../src/main/java/com/termux/terminal/TerminalEmulator.java      | 1 -
 1 file changed, 1 deletion(-)

diff --git a/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java b/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
index bf95aafd6f..471c5df534 100644
--- a/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
+++ b/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
@@ -796,7 +796,6 @@ public void processCodePoint(int b) {
                             int columnsToDelete = Math.min(getArg0(1), columnsAfterCursor);
                             int columnsToMove = columnsAfterCursor - columnsToDelete;
                             mScreen.blockCopy(mCursorCol + columnsToDelete, 0, columnsToMove, mRows, mCursorCol, 0);
-                            blockClear(mCursorRow + columnsToMove, 0, columnsToDelete, mRows);
                         } else {
                             unknownSequence(b);
                         }

From 79980a07a86ced101a100e310d611459700303a1 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 14 Oct 2021 00:06:38 +0500
Subject: [PATCH 600/912] Fixed: Use android.util.Log for terminal-emulator
 logging if TerminalSessionClient is null like when running tests

---
 .../main/java/com/termux/terminal/Logger.java | 80 +++++++++++++++++++
 .../com/termux/terminal/TerminalEmulator.java | 22 ++---
 .../com/termux/terminal/TerminalSession.java  |  6 +-
 3 files changed, 94 insertions(+), 14 deletions(-)
 create mode 100644 terminal-emulator/src/main/java/com/termux/terminal/Logger.java

diff --git a/terminal-emulator/src/main/java/com/termux/terminal/Logger.java b/terminal-emulator/src/main/java/com/termux/terminal/Logger.java
new file mode 100644
index 0000000000..d4d502e0e4
--- /dev/null
+++ b/terminal-emulator/src/main/java/com/termux/terminal/Logger.java
@@ -0,0 +1,80 @@
+package com.termux.terminal;
+
+import android.util.Log;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
+public class Logger {
+
+    public static void logError(TerminalSessionClient client, String logTag, String message) {
+        if (client != null)
+            client.logError(logTag, message);
+        else
+            Log.e(logTag, message);
+    }
+
+    public static void logWarn(TerminalSessionClient client, String logTag, String message) {
+        if (client != null)
+            client.logWarn(logTag, message);
+        else
+            Log.w(logTag, message);
+    }
+
+    public static void logInfo(TerminalSessionClient client, String logTag, String message) {
+        if (client != null)
+            client.logInfo(logTag, message);
+        else
+            Log.i(logTag, message);
+    }
+
+    public static void logDebug(TerminalSessionClient client, String logTag, String message) {
+        if (client != null)
+            client.logDebug(logTag, message);
+        else
+            Log.d(logTag, message);
+    }
+
+    public static void logVerbose(TerminalSessionClient client, String logTag, String message) {
+        if (client != null)
+            client.logVerbose(logTag, message);
+        else
+            Log.v(logTag, message);
+    }
+
+    public static void logStackTraceWithMessage(TerminalSessionClient client, String tag, String message, Throwable throwable) {
+        logError(client, tag, getMessageAndStackTraceString(message, throwable));
+    }
+
+    public static String getMessageAndStackTraceString(String message, Throwable throwable) {
+        if (message == null && throwable == null)
+            return null;
+        else if (message != null && throwable != null)
+            return message + ":\n" + getStackTraceString(throwable);
+        else if (throwable == null)
+            return message;
+        else
+            return getStackTraceString(throwable);
+    }
+
+    public static String getStackTraceString(Throwable throwable) {
+        if (throwable == null) return null;
+
+        String stackTraceString = null;
+
+        try {
+            StringWriter errors = new StringWriter();
+            PrintWriter pw = new PrintWriter(errors);
+            throwable.printStackTrace(pw);
+            pw.close();
+            stackTraceString = errors.toString();
+            errors.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        return stackTraceString;
+    }
+
+}
diff --git a/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java b/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
index 471c5df534..d37eab8db5 100644
--- a/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
+++ b/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
@@ -824,7 +824,7 @@ public void processCodePoint(int b) {
                                 if (internalBit != -1) {
                                     value = isDecsetInternalBitSet(internalBit) ? 1 : 2; // 1=set, 2=reset.
                                 } else {
-                                    mClient.logError(LOG_TAG, "Got DECRQM for unrecognized private DEC mode=" + mode);
+                                    Logger.logError(mClient, LOG_TAG, "Got DECRQM for unrecognized private DEC mode=" + mode);
                                     value = 0; // 0=not recognized, 3=permanently set, 4=permanently reset
                                 }
                             }
@@ -961,7 +961,7 @@ private void doDeviceControl(int b) {
                                     case "&8": // Undo key - ignore.
                                         break;
                                     default:
-                                        mClient.logWarn(LOG_TAG, "Unhandled termcap/terminfo name: '" + trans + "'");
+                                        Logger.logWarn(mClient, LOG_TAG, "Unhandled termcap/terminfo name: '" + trans + "'");
                                 }
                                 // Respond with invalid request:
                                 mSession.write("\033P0+r" + part + "\033\\");
@@ -973,12 +973,12 @@ private void doDeviceControl(int b) {
                                 mSession.write("\033P1+r" + part + "=" + hexEncoded + "\033\\");
                             }
                         } else {
-                            mClient.logError(LOG_TAG, "Invalid device termcap/terminfo name of odd length: " + part);
+                            Logger.logError(mClient, LOG_TAG, "Invalid device termcap/terminfo name of odd length: " + part);
                         }
                     }
                 } else {
                     if (LOG_ESCAPE_SEQUENCES)
-                        mClient.logError(LOG_TAG, "Unrecognized device control string: " + dcs);
+                        Logger.logError(mClient, LOG_TAG, "Unrecognized device control string: " + dcs);
                 }
                 finishSequence();
             }
@@ -1068,7 +1068,7 @@ private void doCsiQuestionMark(int b) {
                     int externalBit = mArgs[i];
                     int internalBit = mapDecSetBitToInternalBit(externalBit);
                     if (internalBit == -1) {
-                        mClient.logWarn(LOG_TAG, "Ignoring request to save/recall decset bit=" + externalBit);
+                        Logger.logWarn(mClient, LOG_TAG, "Ignoring request to save/recall decset bit=" + externalBit);
                     } else {
                         if (b == 's') {
                             mSavedDecSetFlags |= internalBit;
@@ -1258,7 +1258,7 @@ private void doCsiBiggerThan(int b) {
                 // (1) enables this feature for keys except for those with well-known behavior, e.g., Tab, Backarrow and
                 // some special control character cases, e.g., Control-Space to make a NUL.
                 // (2) enables this feature for keys including the exceptions listed.
-                mClient.logError(LOG_TAG, "(ignored) CSI > MODIFY RESOURCE: " + getArg0(-1) + " to " + getArg1(-1));
+                Logger.logError(mClient, LOG_TAG, "(ignored) CSI > MODIFY RESOURCE: " + getArg0(-1) + " to " + getArg1(-1));
                 break;
             default:
                 parseArg(b);
@@ -1805,7 +1805,7 @@ private void selectGraphicRendition() {
                 int firstArg = mArgs[i + 1];
                 if (firstArg == 2) {
                     if (i + 4 > mArgIndex) {
-                        mClient.logWarn(LOG_TAG, "Too few CSI" + code + ";2 RGB arguments");
+                        Logger.logWarn(mClient, LOG_TAG, "Too few CSI" + code + ";2 RGB arguments");
                     } else {
                         int red = mArgs[i + 2], green = mArgs[i + 3], blue = mArgs[i + 4];
                         if (red < 0 || green < 0 || blue < 0 || red > 255 || green > 255 || blue > 255) {
@@ -1830,7 +1830,7 @@ private void selectGraphicRendition() {
                             mBackColor = color;
                         }
                     } else {
-                        if (LOG_ESCAPE_SEQUENCES) mClient.logWarn(LOG_TAG, "Invalid color index: " + color);
+                        if (LOG_ESCAPE_SEQUENCES) Logger.logWarn(mClient, LOG_TAG, "Invalid color index: " + color);
                     }
                 } else {
                     finishSequenceAndLogError("Invalid ISO-8613-3 SGR first argument: " + firstArg);
@@ -1847,7 +1847,7 @@ private void selectGraphicRendition() {
                 mBackColor = code - 100 + 8;
             } else {
                 if (LOG_ESCAPE_SEQUENCES)
-                    mClient.logWarn(LOG_TAG, String.format("SGR unknown code %d", code));
+                    Logger.logWarn(mClient, LOG_TAG, String.format("SGR unknown code %d", code));
             }
         }
     }
@@ -1981,7 +1981,7 @@ private void doOscSetTextParameters(String bellOrStringTerminator) {
                     String clipboardText = new String(Base64.decode(textParameter.substring(startIndex), 0), StandardCharsets.UTF_8);
                     mSession.onCopyTextToClipboard(clipboardText);
                 } catch (Exception e) {
-                    mClient.logError(LOG_TAG, "OSC Manipulate selection, invalid string '" + textParameter + "");
+                    Logger.logError(mClient, LOG_TAG, "OSC Manipulate selection, invalid string '" + textParameter + "");
                 }
                 break;
             case 104:
@@ -2177,7 +2177,7 @@ private void logError(String errorType) {
     }
 
     private void finishSequenceAndLogError(String error) {
-        if (LOG_ESCAPE_SEQUENCES) mClient.logWarn(LOG_TAG, error);
+        if (LOG_ESCAPE_SEQUENCES) Logger.logWarn(mClient, LOG_TAG, error);
         finishSequence();
     }
 
diff --git a/terminal-emulator/src/main/java/com/termux/terminal/TerminalSession.java b/terminal-emulator/src/main/java/com/termux/terminal/TerminalSession.java
index 47ea853309..b06f0dea80 100644
--- a/terminal-emulator/src/main/java/com/termux/terminal/TerminalSession.java
+++ b/terminal-emulator/src/main/java/com/termux/terminal/TerminalSession.java
@@ -236,7 +236,7 @@ public void finishIfRunning() {
             try {
                 Os.kill(mShellPid, OsConstants.SIGKILL);
             } catch (ErrnoException e) {
-                mClient.logWarn(LOG_TAG, "Failed sending SIGKILL: " + e.getMessage());
+                Logger.logWarn(mClient, LOG_TAG, "Failed sending SIGKILL: " + e.getMessage());
             }
         }
     }
@@ -308,7 +308,7 @@ public String getCwd() {
                 return outputPath;
             }
         } catch (IOException | SecurityException e) {
-            mClient.logStackTraceWithMessage(LOG_TAG, "Error getting current directory", e);
+            Logger.logStackTraceWithMessage(mClient, LOG_TAG, "Error getting current directory", e);
         }
         return null;
     }
@@ -326,7 +326,7 @@ private static FileDescriptor wrapFileDescriptor(int fileDescriptor, TerminalSes
             descriptorField.setAccessible(true);
             descriptorField.set(result, fileDescriptor);
         } catch (NoSuchFieldException | IllegalAccessException | IllegalArgumentException e) {
-            client.logStackTraceWithMessage(LOG_TAG, "Error accessing FileDescriptor#descriptor private field", e);
+            Logger.logStackTraceWithMessage(client, LOG_TAG, "Error accessing FileDescriptor#descriptor private field", e);
             System.exit(1);
         }
         return result;

From f62997a60e5980ecf4522c4def2c2ef32de31194 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 14 Oct 2021 00:26:46 +0500
Subject: [PATCH 601/912] Fixed: Log exception instead of crashing app on
 NumberFormatException for invalid termcap/terminfo string requested

java.lang.NumberFormatException: For input string: " a"
at java.lang.Long.parseLong(Long.java:583)
at java.lang.Long.valueOf(Long.java:781)
at java.lang.Long.decode(Long.java:933)
at com.termux.terminal.TerminalEmulator.doDeviceControl(TerminalEmulator.java:940)
at com.termux.terminal.TerminalEmulator.processCodePoint(TerminalEmulator.java:813)
---
 .../main/java/com/termux/terminal/TerminalEmulator.java  | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java b/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
index d37eab8db5..8efb949bd2 100644
--- a/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
+++ b/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
@@ -935,10 +935,17 @@ private void doDeviceControl(int b) {
                     for (String part : dcs.substring(2).split(";")) {
                         if (part.length() % 2 == 0) {
                             StringBuilder transBuffer = new StringBuilder();
+                            char c;
                             for (int i = 0; i < part.length(); i += 2) {
-                                char c = (char) Long.decode("0x" + part.charAt(i) + "" + part.charAt(i + 1)).longValue();
+                                try {
+                                    c = (char) Long.decode("0x" + part.charAt(i) + "" + part.charAt(i + 1)).longValue();
+                                } catch (NumberFormatException e) {
+                                    Logger.logStackTraceWithMessage(mClient, LOG_TAG, "Invalid device termcap/terminfo encoded name \"" + part + "\"", e);
+                                    continue;
+                                }
                                 transBuffer.append(c);
                             }
+
                             String trans = transBuffer.toString();
                             String responseValue;
                             switch (trans) {

From 059feaacf181aefd154c8d0d93618b4c7b70311b Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 14 Oct 2021 01:10:25 +0500
Subject: [PATCH 602/912] Changed: Move UrlUtils to TermuxUrlUtils

---
 .../termux/app/terminal/TermuxTerminalViewClient.java    | 9 +++------
 app/src/test/java/com/termux/app/TermuxActivityTest.java | 4 ++--
 .../UrlUtils.java => termux/data/TermuxUrlUtils.java}    | 4 ++--
 3 files changed, 7 insertions(+), 10 deletions(-)
 rename termux-shared/src/main/java/com/termux/shared/{data/UrlUtils.java => termux/data/TermuxUrlUtils.java} (98%)

diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
index 700173ed2e..f520a1d422 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
@@ -2,13 +2,11 @@
 
 import android.annotation.SuppressLint;
 import android.app.AlertDialog;
-import android.content.ActivityNotFoundException;
 import android.content.ClipData;
 import android.content.ClipboardManager;
 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;
@@ -22,7 +20,6 @@
 
 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;
@@ -40,10 +37,10 @@
 import com.termux.shared.logger.Logger;
 import com.termux.shared.markdown.MarkdownUtils;
 import com.termux.shared.termux.TermuxUtils;
+import com.termux.shared.termux.data.TermuxUrlUtils;
 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;
 
@@ -179,7 +176,7 @@ public void onSingleTapUp(MotionEvent e) {
         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);
+            LinkedHashSet<CharSequence> urlSet = TermuxUrlUtils.extractUrls(wordAtTap);
 
             if (!urlSet.isEmpty()) {
                 String url = (String) urlSet.iterator().next();
@@ -665,7 +662,7 @@ public void showUrlSelection() {
 
         String text = ShellUtils.getTerminalSessionTranscriptText(session, true, true);
 
-        LinkedHashSet<CharSequence> urlSet = UrlUtils.extractUrls(text);
+        LinkedHashSet<CharSequence> urlSet = TermuxUrlUtils.extractUrls(text);
         if (urlSet.isEmpty()) {
             new AlertDialog.Builder(mActivity).setMessage(R.string.title_select_url_none_found).show();
             return;
diff --git a/app/src/test/java/com/termux/app/TermuxActivityTest.java b/app/src/test/java/com/termux/app/TermuxActivityTest.java
index 2761382975..bcb80f2c7d 100644
--- a/app/src/test/java/com/termux/app/TermuxActivityTest.java
+++ b/app/src/test/java/com/termux/app/TermuxActivityTest.java
@@ -1,6 +1,6 @@
 package com.termux.app;
 
-import com.termux.shared.data.UrlUtils;
+import com.termux.shared.termux.data.TermuxUrlUtils;
 
 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, TermuxUrlUtils.extractUrls(text));
     }
 
     @Test
diff --git a/termux-shared/src/main/java/com/termux/shared/data/UrlUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/data/TermuxUrlUtils.java
similarity index 98%
rename from termux-shared/src/main/java/com/termux/shared/data/UrlUtils.java
rename to termux-shared/src/main/java/com/termux/shared/termux/data/TermuxUrlUtils.java
index 29f3a8c054..6eabde8eab 100644
--- a/termux-shared/src/main/java/com/termux/shared/data/UrlUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/data/TermuxUrlUtils.java
@@ -1,10 +1,10 @@
-package com.termux.shared.data;
+package com.termux.shared.termux.data;
 
 import java.util.LinkedHashSet;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-public class UrlUtils {
+public class TermuxUrlUtils {
 
     public static Pattern URL_MATCH_REGEX;
 

From a987246bd82f668e94d180ccefbdc3518688c95c Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sun, 17 Oct 2021 21:59:36 +0500
Subject: [PATCH 603/912] Added: Add comment for why clearing of $TMPDIR may be
 skipped on termux exit

---
 .../main/java/com/termux/shared/shell/TermuxShellUtils.java  | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/termux-shared/src/main/java/com/termux/shared/shell/TermuxShellUtils.java b/termux-shared/src/main/java/com/termux/shared/shell/TermuxShellUtils.java
index c41ca55c46..18dcc54915 100644
--- a/termux-shared/src/main/java/com/termux/shared/shell/TermuxShellUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/shell/TermuxShellUtils.java
@@ -150,6 +150,11 @@ public static String[] setupProcessArgs(@NonNull String fileToExecute, String[]
     }
 
     public static void clearTermuxTMPDIR(boolean onlyIfExists) {
+        // Existence check before clearing may be required since clearDirectory() will automatically
+        // re-create empty directory if doesn't exist, which should not be done for things like
+        // termux-reset (d6eb5e35). Moreover, TMPDIR must be a directory and not a symlink, this can
+        // also allow users who don't want TMPDIR to be cleared automatically on termux exit, since
+        // it may remove files still being used by background processes (#1159).
         if(onlyIfExists && !FileUtils.directoryFileExists(TermuxConstants.TERMUX_TMP_PREFIX_DIR_PATH, false))
             return;
 

From 2c6d009657a872decbb7b3aeab2e435dc57b158d Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Mon, 18 Oct 2021 15:34:23 +0500
Subject: [PATCH 604/912] Added: Add uid to app info

---
 .../termux/shared/packages/PackageUtils.java  | 22 +++++++++++++++++++
 .../termux/shared/termux/AndroidUtils.java    |  1 +
 2 files changed, 23 insertions(+)

diff --git a/termux-shared/src/main/java/com/termux/shared/packages/PackageUtils.java b/termux-shared/src/main/java/com/termux/shared/packages/PackageUtils.java
index de1aae98c4..fea706245b 100644
--- a/termux-shared/src/main/java/com/termux/shared/packages/PackageUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/packages/PackageUtils.java
@@ -204,6 +204,28 @@ public static String getPackageNameForPackage(@NonNull final ApplicationInfo app
 
 
 
+    /**
+     * Get the uid for the package associated with the {@code context}.
+     *
+     * @param context The {@link Context} for the package.
+     * @return Returns the uid.
+     */
+    public static int getUidForPackage(@NonNull final Context context) {
+        return getUidForPackage(context.getApplicationInfo());
+    }
+
+    /**
+     * Get the uid for the package associated with the {@code applicationInfo}.
+     *
+     * @param applicationInfo The {@link ApplicationInfo} for the package.
+     * @return Returns the uid.
+     */
+    public static int getUidForPackage(@NonNull final ApplicationInfo applicationInfo) {
+        return applicationInfo.uid;
+    }
+
+
+
     /**
      * Get the {@code targetSdkVersion} for the package associated with the {@code context}.
      *
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/AndroidUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/AndroidUtils.java
index 80e4f13080..6b59598584 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/AndroidUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/AndroidUtils.java
@@ -74,6 +74,7 @@ public static String getAppInfoMarkdownString(@NonNull final Context context, @N
         AndroidUtils.appendPropertyToMarkdown(markdownString,"PACKAGE_NAME", PackageUtils.getPackageNameForPackage(applicationInfo));
         AndroidUtils.appendPropertyToMarkdown(markdownString,"VERSION_NAME", PackageUtils.getVersionNameForPackage(context, packageName));
         AndroidUtils.appendPropertyToMarkdown(markdownString,"VERSION_CODE", PackageUtils.getVersionCodeForPackage(context, packageName));
+        AndroidUtils.appendPropertyToMarkdown(markdownString,"UID", PackageUtils.getUidForPackage(applicationInfo));
         AndroidUtils.appendPropertyToMarkdown(markdownString,"TARGET_SDK", PackageUtils.getTargetSDKForPackage(applicationInfo));
         AndroidUtils.appendPropertyToMarkdown(markdownString,"IS_DEBUGGABLE_BUILD", PackageUtils.isAppForPackageADebuggableBuild(applicationInfo));
 

From 65252dc6405fc3eb1de9cbe693bf7c1ef1eed349 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Mon, 18 Oct 2021 15:51:39 +0500
Subject: [PATCH 605/912] Changed: Use cached PackageInfo while getting version
 code and name for app

---
 .../termux/shared/packages/PackageUtils.java  | 36 +++++++++++++------
 .../termux/shared/termux/AndroidUtils.java    |  7 ++--
 2 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/packages/PackageUtils.java b/termux-shared/src/main/java/com/termux/shared/packages/PackageUtils.java
index fea706245b..121fc0a0f7 100644
--- a/termux-shared/src/main/java/com/termux/shared/packages/PackageUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/packages/PackageUtils.java
@@ -316,11 +316,18 @@ public static Integer getVersionCodeForPackage(@NonNull final Context context) {
      */
     @Nullable
     public static Integer getVersionCodeForPackage(@NonNull final Context context, @NonNull final String packageName) {
-        try {
-            return getPackageInfoForPackage(context, packageName).versionCode;
-        } catch (final Exception e) {
-            return null;
-        }
+        return getVersionCodeForPackage(getPackageInfoForPackage(context, packageName));
+    }
+
+    /**
+     * Get the {@code versionCode} for the {@code packageName}.
+     *
+     * @param packageInfo The {@link PackageInfo} for the package.
+     * @return Returns the {@code versionCode}. This will be {@code null} if an exception is raised.
+     */
+    @Nullable
+    public static Integer getVersionCodeForPackage(@Nullable final PackageInfo packageInfo) {
+        return packageInfo != null? packageInfo.versionCode : null;
     }
 
 
@@ -335,6 +342,7 @@ public static Integer getVersionCodeForPackage(@NonNull final Context context, @
     public static String getVersionNameForPackage(@NonNull final Context context) {
         return getVersionNameForPackage(context, context.getPackageName());
     }
+
     /**
      * Get the {@code versionName} for the {@code packageName}.
      *
@@ -344,11 +352,19 @@ public static String getVersionNameForPackage(@NonNull final Context context) {
      */
     @Nullable
     public static String getVersionNameForPackage(@NonNull final Context context, @NonNull final String packageName) {
-        try {
-            return getPackageInfoForPackage(context, packageName).versionName;
-        } catch (final Exception e) {
-            return null;
-        }
+        return getVersionNameForPackage(getPackageInfoForPackage(context, packageName));
+    }
+
+    /**
+     * Get the {@code versionName} for the {@code packageName}.
+     *
+     * @param packageInfo The {@link PackageInfo} for the package.
+     * @return Returns the {@code versionName}. This will be {@code null} if an {@code packageInfo}
+     * is {@code null}.
+     */
+    @Nullable
+    public static String getVersionNameForPackage(@Nullable final PackageInfo packageInfo) {
+        return packageInfo != null? packageInfo.versionName : null;
     }
 
 
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/AndroidUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/AndroidUtils.java
index 6b59598584..b248fa4d01 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/AndroidUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/AndroidUtils.java
@@ -3,6 +3,7 @@
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageInfo;
 import android.os.Build;
 
 import androidx.annotation.NonNull;
@@ -65,6 +66,8 @@ public static String getAppInfoMarkdownString(@NonNull final Context context) {
      * @return Returns the markdown {@link String}.
      */
     public static String getAppInfoMarkdownString(@NonNull final Context context, @NonNull final String packageName) {
+        PackageInfo packageInfo = PackageUtils.getPackageInfoForPackage(context, packageName);
+        if (packageInfo == null) return null;
         ApplicationInfo applicationInfo = PackageUtils.getApplicationInfoForPackage(context, packageName);
         if (applicationInfo == null) return null;
 
@@ -72,8 +75,8 @@ public static String getAppInfoMarkdownString(@NonNull final Context context, @N
 
         AndroidUtils.appendPropertyToMarkdown(markdownString,"APP_NAME", PackageUtils.getAppNameForPackage(context, applicationInfo));
         AndroidUtils.appendPropertyToMarkdown(markdownString,"PACKAGE_NAME", PackageUtils.getPackageNameForPackage(applicationInfo));
-        AndroidUtils.appendPropertyToMarkdown(markdownString,"VERSION_NAME", PackageUtils.getVersionNameForPackage(context, packageName));
-        AndroidUtils.appendPropertyToMarkdown(markdownString,"VERSION_CODE", PackageUtils.getVersionCodeForPackage(context, packageName));
+        AndroidUtils.appendPropertyToMarkdown(markdownString,"VERSION_NAME", PackageUtils.getVersionNameForPackage(packageInfo));
+        AndroidUtils.appendPropertyToMarkdown(markdownString,"VERSION_CODE", PackageUtils.getVersionCodeForPackage(packageInfo));
         AndroidUtils.appendPropertyToMarkdown(markdownString,"UID", PackageUtils.getUidForPackage(applicationInfo));
         AndroidUtils.appendPropertyToMarkdown(markdownString,"TARGET_SDK", PackageUtils.getTargetSDKForPackage(applicationInfo));
         AndroidUtils.appendPropertyToMarkdown(markdownString,"IS_DEBUGGABLE_BUILD", PackageUtils.isAppForPackageADebuggableBuild(applicationInfo));

From cbac7c8fbd12c54a896953237d313dafdf427ee2 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Mon, 18 Oct 2021 16:52:04 +0500
Subject: [PATCH 606/912] Changed: Get user handle for package instead of
 process user handle when getting profile user serial number

---
 .../java/com/termux/shared/packages/PackageUtils.java | 11 ++++++-----
 .../java/com/termux/shared/termux/AndroidUtils.java   |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/packages/PackageUtils.java b/termux-shared/src/main/java/com/termux/shared/packages/PackageUtils.java
index 121fc0a0f7..cdba0fd96e 100644
--- a/termux-shared/src/main/java/com/termux/shared/packages/PackageUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/packages/PackageUtils.java
@@ -8,6 +8,7 @@
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
+import android.os.UserHandle;
 import android.os.UserManager;
 
 import androidx.annotation.NonNull;
@@ -409,16 +410,16 @@ public static String getSigningCertificateSHA256DigestForPackage(@NonNull final
 
 
     /**
-     * Get the serial number for the current user.
+     * Get the serial number for the user for the package associated with the {@code context}.
      *
-     * @param context The {@link Context} for operations.
+     * @param context The {@link Context} for the package.
      * @return Returns the serial number. This will be {@code null} if failed to get it.
      */
     @Nullable
-    public static Long getSerialNumberForCurrentUser(@NonNull Context context) {
+    public static Long getUserIdForPackage(@NonNull Context context) {
         UserManager userManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
         if (userManager == null) return null;
-        return userManager.getSerialNumberForUser(android.os.Process.myUserHandle());
+        return userManager.getSerialNumberForUser(UserHandle.getUserHandleForUid(getUidForPackage(context)));
     }
 
     /**
@@ -429,7 +430,7 @@ public static Long getSerialNumberForCurrentUser(@NonNull Context context) {
      * @return Returns {@code true} if the current user is the primary user, otherwise [@code false}.
      */
     public static boolean isCurrentUserThePrimaryUser(@NonNull Context context) {
-        Long userId = getSerialNumberForCurrentUser(context);
+        Long userId = getUserIdForPackage(context);
         return userId != null && userId == 0;
     }
 
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/AndroidUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/AndroidUtils.java
index b248fa4d01..4a5dd59db1 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/AndroidUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/AndroidUtils.java
@@ -49,7 +49,7 @@ public static String getAppInfoMarkdownString(@NonNull final Context context) {
             !filesDir.equals("/data/data/" + context.getPackageName() + "/files"))
             AndroidUtils.appendPropertyToMarkdown(markdownString,"FILES_DIR", filesDir);
 
-        Long userId = PackageUtils.getSerialNumberForCurrentUser(context);
+        Long userId = PackageUtils.getUserIdForPackage(context);
         if (userId == null || userId != 0)
             AndroidUtils.appendPropertyToMarkdown(markdownString,"USER_ID", userId);
 

From 304aed306353a2f8084e94fe0775229ce2e326c6 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Tue, 19 Oct 2021 16:24:51 +0500
Subject: [PATCH 607/912] Added: Add UrlUtils

---
 .../java/com/termux/shared/net/UrlUtils.java  | 113 ++++++++++++++++++
 1 file changed, 113 insertions(+)
 create mode 100644 termux-shared/src/main/java/com/termux/shared/net/UrlUtils.java

diff --git a/termux-shared/src/main/java/com/termux/shared/net/UrlUtils.java b/termux-shared/src/main/java/com/termux/shared/net/UrlUtils.java
new file mode 100644
index 0000000000..0e9101f3ac
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/net/UrlUtils.java
@@ -0,0 +1,113 @@
+package com.termux.shared.net;
+
+import androidx.annotation.Nullable;
+
+import com.termux.shared.data.DataUtils;
+import com.termux.shared.logger.Logger;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+
+public class UrlUtils {
+
+    /** The parts of a {@link URL}. */
+    public enum UrlPart {
+        AUTHORITY,
+        FILE,
+        HOST,
+        REF,
+        FRAGMENT,
+        PATH,
+        PORT,
+        PROTOCOL,
+        QUERY,
+        USER_INFO
+    }
+
+    private static final String LOG_TAG = "UrlUtils";
+
+    /**
+     * Join a url base and destination.
+     *
+     * @param base The base url to open.
+     * @param destination The destination url to open.
+     * @param logError If an error message should be logged.
+     * @return Returns the joined {@link String} Url, otherwise {@code null}.
+     */
+    @Nullable
+    public static String joinUrl(final String base, String destination, boolean logError) {
+        if (DataUtils.isNullOrEmpty(base)) return null;
+        try {
+            return new URL(new URL(base), destination).toString();
+        } catch (MalformedURLException e) {
+            if (logError)
+                Logger.logError(LOG_TAG, "Failed to join url base \"" + base + "\" and destination \"" + destination + "\": " + e.getMessage());
+            return null;
+        }
+    }
+
+    /**
+     * Get {@link URL} from url string.
+     *
+     * @param urlString The urlString string.
+     * @return Returns the {@link URL} if a valid urlString, otherwise {@code null}.
+     */
+    @Nullable
+    public static URL getUrl(String urlString) {
+        if (DataUtils.isNullOrEmpty(urlString)) return null;
+        try {
+            return new URL(urlString);
+        } catch (MalformedURLException e) {
+            return null;
+        }
+    }
+
+    /**
+     * Get a {@link URL} part from url string.
+     *
+     * @param urlString The urlString string.
+     * @param urlPart The part to get.
+     * @return Returns the {@link URL} part if a valid urlString and part, otherwise {@code null}.
+     */
+    @Nullable
+    public static String getUrlPart(String urlString, UrlPart urlPart) {
+        URL url = getUrl(urlString);
+        if (url == null) return null;
+        switch (urlPart) {
+            case AUTHORITY:
+                return url.getAuthority();
+            case FILE:
+                return url.getFile();
+            case HOST:
+                return url.getHost();
+            case REF:
+            case FRAGMENT:
+                return url.getRef();
+            case PATH:
+                return url.getPath();
+            case PORT:
+                return String.valueOf(url.getPort());
+            case PROTOCOL:
+                return url.getProtocol();
+            case QUERY:
+                return url.getQuery();
+            case USER_INFO:
+                return url.getUserInfo();
+            default:
+                return null;
+        }
+    }
+
+    /** Remove "https://www.", "https://", "www.", etc */
+    public static String removeProtocol(String urlString) {
+        if (urlString == null) return null;
+        return urlString.replaceFirst("^(http[s]?://www\\.|http[s]?://|www\\.)","");
+    }
+
+    public static boolean areUrlsEqual(String url1, String url2) {
+        if (url1 == null && url2 == null) return true;
+        if (url1 == null || url2 == null) return false;
+        return UrlUtils.removeProtocol(url1).replaceAll("/+$", "").equals(UrlUtils.removeProtocol(url2).replaceAll("/+$", ""));
+    }
+
+}

From 5252fbbe114be661fa73735b44f9599ffb6a503c Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Tue, 19 Oct 2021 17:26:39 +0500
Subject: [PATCH 608/912] Changed!: Move Termux specific classes to
 com.termux.shared.termux package

This will allow segregation of Termux utils/classes from general ones and also allow easier management of GPLv3 License for Termux classes
---
 .../main/java/com/termux/app/RunCommandService.java |  2 +-
 .../main/java/com/termux/app/TermuxActivity.java    |  6 +++---
 .../main/java/com/termux/app/TermuxApplication.java |  4 ++--
 .../main/java/com/termux/app/TermuxInstaller.java   |  2 +-
 app/src/main/java/com/termux/app/TermuxService.java | 10 +++++-----
 .../com/termux/app/activities/SettingsActivity.java | 10 +++++-----
 .../settings/TermuxAPIPreferencesFragment.java      |  2 +-
 .../settings/TermuxFloatPreferencesFragment.java    |  2 +-
 .../settings/TermuxPreferencesFragment.java         |  2 +-
 .../settings/TermuxTaskerPreferencesFragment.java   |  2 +-
 .../settings/TermuxWidgetPreferencesFragment.java   |  2 +-
 .../termux/DebuggingPreferencesFragment.java        |  2 +-
 .../termux/TerminalIOPreferencesFragment.java       |  2 +-
 .../termux/TerminalViewPreferencesFragment.java     |  2 +-
 .../termux_api/DebuggingPreferencesFragment.java    |  2 +-
 .../termux_float/DebuggingPreferencesFragment.java  |  2 +-
 .../termux_tasker/DebuggingPreferencesFragment.java |  2 +-
 .../termux_widget/DebuggingPreferencesFragment.java |  2 +-
 .../properties/TermuxAppSharedProperties.java       | 10 +++++-----
 .../terminal/TermuxSessionsListViewController.java  |  2 +-
 .../app/terminal/TermuxTerminalSessionClient.java   | 10 +++++-----
 .../app/terminal/TermuxTerminalViewClient.java      |  8 ++++----
 .../app/terminal/io/TerminalToolbarViewPager.java   |  2 +-
 .../app/terminal/io/TermuxTerminalExtraKeys.java    |  2 +-
 .../main/java/com/termux/app/utils/CrashUtils.java  |  8 ++++----
 .../main/java/com/termux/app/utils/PluginUtils.java | 13 ++++++-------
 .../filepicker/TermuxFileReceiverActivity.java      |  2 +-
 .../res/layout/view_terminal_toolbar_extra_keys.xml |  2 +-
 .../shared/{termux => android}/AndroidUtils.java    |  2 +-
 .../java/com/termux/shared/crash/CrashHandler.java  |  2 +-
 .../java/com/termux/shared/shell/ResultSender.java  |  2 +-
 .../java/com/termux/shared/termux/TermuxUtils.java  |  5 +++--
 .../shared/{ => termux}/crash/TermuxCrashUtils.java |  3 ++-
 .../io => termux}/extrakeys/ExtraKeyButton.java     |  2 +-
 .../io => termux}/extrakeys/ExtraKeysConstants.java |  2 +-
 .../io => termux}/extrakeys/ExtraKeysInfo.java      |  7 ++++---
 .../io => termux}/extrakeys/ExtraKeysView.java      |  8 +++++---
 .../io => termux}/extrakeys/SpecialButton.java      |  2 +-
 .../io => termux}/extrakeys/SpecialButtonState.java |  2 +-
 .../shared/{ => termux}/file/TermuxFileUtils.java   |  7 ++++---
 .../{ => termux}/interact/TextInputDialogUtils.java |  8 +-------
 .../notification/TermuxNotificationUtils.java       |  6 +++---
 .../preferences/TermuxAPIAppSharedPreferences.java  |  5 +++--
 .../preferences/TermuxAppSharedPreferences.java     |  5 +++--
 .../preferences/TermuxBootAppSharedPreferences.java |  5 +++--
 .../TermuxFloatAppSharedPreferences.java            |  5 +++--
 .../preferences/TermuxPreferenceConstants.java      |  2 +-
 .../TermuxStylingAppSharedPreferences.java          |  5 +++--
 .../TermuxTaskerAppSharedPreferences.java           |  5 +++--
 .../TermuxWidgetAppSharedPreferences.java           |  5 +++--
 .../properties/TermuxPropertyConstants.java         |  3 ++-
 .../settings/properties/TermuxSharedProperties.java |  5 +++--
 .../shared/{ => termux}/shell/TermuxSession.java    |  4 +++-
 .../shell/TermuxShellEnvironmentClient.java         |  4 +++-
 .../shared/{ => termux}/shell/TermuxShellUtils.java |  2 +-
 .../terminal/TermuxTerminalSessionClientBase.java   |  2 +-
 .../terminal/TermuxTerminalViewClientBase.java      |  2 +-
 .../{ => termux}/terminal/io/BellHandler.java       |  2 +-
 .../{ => termux}/terminal/io/TerminalExtraKeys.java | 10 +++++-----
 59 files changed, 129 insertions(+), 117 deletions(-)
 rename termux-shared/src/main/java/com/termux/shared/{termux => android}/AndroidUtils.java (99%)
 rename termux-shared/src/main/java/com/termux/shared/{ => termux}/crash/TermuxCrashUtils.java (91%)
 rename termux-shared/src/main/java/com/termux/shared/{terminal/io => termux}/extrakeys/ExtraKeyButton.java (99%)
 rename termux-shared/src/main/java/com/termux/shared/{terminal/io => termux}/extrakeys/ExtraKeysConstants.java (99%)
 rename termux-shared/src/main/java/com/termux/shared/{terminal/io => termux}/extrakeys/ExtraKeysInfo.java (97%)
 rename termux-shared/src/main/java/com/termux/shared/{terminal/io => termux}/extrakeys/ExtraKeysView.java (98%)
 rename termux-shared/src/main/java/com/termux/shared/{terminal/io => termux}/extrakeys/SpecialButton.java (96%)
 rename termux-shared/src/main/java/com/termux/shared/{terminal/io => termux}/extrakeys/SpecialButtonState.java (96%)
 rename termux-shared/src/main/java/com/termux/shared/{ => termux}/file/TermuxFileUtils.java (99%)
 rename termux-shared/src/main/java/com/termux/shared/{ => termux}/interact/TextInputDialogUtils.java (94%)
 rename termux-shared/src/main/java/com/termux/shared/{ => termux}/notification/TermuxNotificationUtils.java (88%)
 rename termux-shared/src/main/java/com/termux/shared/{ => termux}/settings/preferences/TermuxAPIAppSharedPreferences.java (94%)
 rename termux-shared/src/main/java/com/termux/shared/{ => termux}/settings/preferences/TermuxAppSharedPreferences.java (97%)
 rename termux-shared/src/main/java/com/termux/shared/{ => termux}/settings/preferences/TermuxBootAppSharedPreferences.java (94%)
 rename termux-shared/src/main/java/com/termux/shared/{ => termux}/settings/preferences/TermuxFloatAppSharedPreferences.java (96%)
 rename termux-shared/src/main/java/com/termux/shared/{ => termux}/settings/preferences/TermuxPreferenceConstants.java (99%)
 rename termux-shared/src/main/java/com/termux/shared/{ => termux}/settings/preferences/TermuxStylingAppSharedPreferences.java (94%)
 rename termux-shared/src/main/java/com/termux/shared/{ => termux}/settings/preferences/TermuxTaskerAppSharedPreferences.java (95%)
 rename termux-shared/src/main/java/com/termux/shared/{ => termux}/settings/preferences/TermuxWidgetAppSharedPreferences.java (95%)
 rename termux-shared/src/main/java/com/termux/shared/{ => termux}/settings/properties/TermuxPropertyConstants.java (99%)
 rename termux-shared/src/main/java/com/termux/shared/{ => termux}/settings/properties/TermuxSharedProperties.java (99%)
 rename termux-shared/src/main/java/com/termux/shared/{ => termux}/shell/TermuxSession.java (99%)
 rename termux-shared/src/main/java/com/termux/shared/{ => termux}/shell/TermuxShellEnvironmentClient.java (90%)
 rename termux-shared/src/main/java/com/termux/shared/{ => termux}/shell/TermuxShellUtils.java (99%)
 rename termux-shared/src/main/java/com/termux/shared/{ => termux}/terminal/TermuxTerminalSessionClientBase.java (97%)
 rename termux-shared/src/main/java/com/termux/shared/{ => termux}/terminal/TermuxTerminalViewClientBase.java (98%)
 rename termux-shared/src/main/java/com/termux/shared/{ => termux}/terminal/io/BellHandler.java (98%)
 rename termux-shared/src/main/java/com/termux/shared/{ => termux}/terminal/io/TerminalExtraKeys.java (89%)

diff --git a/app/src/main/java/com/termux/app/RunCommandService.java b/app/src/main/java/com/termux/app/RunCommandService.java
index 7939d9c537..08f7dd97a0 100644
--- a/app/src/main/java/com/termux/app/RunCommandService.java
+++ b/app/src/main/java/com/termux/app/RunCommandService.java
@@ -12,7 +12,7 @@
 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.termux.file.TermuxFileUtils;
 import com.termux.shared.file.filesystem.FileType;
 import com.termux.shared.models.errors.Errno;
 import com.termux.shared.models.errors.Error;
diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index 7a55489223..524cc93155 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -40,14 +40,14 @@
 import com.termux.shared.termux.TermuxConstants.TERMUX_APP.TERMUX_ACTIVITY;
 import com.termux.app.activities.HelpActivity;
 import com.termux.app.activities.SettingsActivity;
-import com.termux.shared.settings.preferences.TermuxAppSharedPreferences;
+import com.termux.shared.termux.settings.preferences.TermuxAppSharedPreferences;
 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.shared.termux.extrakeys.ExtraKeysView;
 import com.termux.app.settings.properties.TermuxAppSharedProperties;
-import com.termux.shared.interact.TextInputDialogUtils;
+import com.termux.shared.termux.interact.TextInputDialogUtils;
 import com.termux.shared.logger.Logger;
 import com.termux.shared.termux.TermuxUtils;
 import com.termux.shared.view.ViewUtils;
diff --git a/app/src/main/java/com/termux/app/TermuxApplication.java b/app/src/main/java/com/termux/app/TermuxApplication.java
index b7f2898003..83a848618d 100644
--- a/app/src/main/java/com/termux/app/TermuxApplication.java
+++ b/app/src/main/java/com/termux/app/TermuxApplication.java
@@ -2,8 +2,8 @@
 
 import android.app.Application;
 
-import com.termux.shared.crash.TermuxCrashUtils;
-import com.termux.shared.settings.preferences.TermuxAppSharedPreferences;
+import com.termux.shared.termux.crash.TermuxCrashUtils;
+import com.termux.shared.termux.settings.preferences.TermuxAppSharedPreferences;
 import com.termux.shared.logger.Logger;
 
 
diff --git a/app/src/main/java/com/termux/app/TermuxInstaller.java b/app/src/main/java/com/termux/app/TermuxInstaller.java
index 1c0688d9bf..6b3b8f0a05 100644
--- a/app/src/main/java/com/termux/app/TermuxInstaller.java
+++ b/app/src/main/java/com/termux/app/TermuxInstaller.java
@@ -12,7 +12,7 @@
 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.termux.file.TermuxFileUtils;
 import com.termux.shared.interact.MessageDialogUtils;
 import com.termux.shared.logger.Logger;
 import com.termux.shared.markdown.MarkdownUtils;
diff --git a/app/src/main/java/com/termux/app/TermuxService.java b/app/src/main/java/com/termux/app/TermuxService.java
index f7034e2883..0b3baaa6c8 100644
--- a/app/src/main/java/com/termux/app/TermuxService.java
+++ b/app/src/main/java/com/termux/app/TermuxService.java
@@ -28,14 +28,14 @@
 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.shell.TermuxShellEnvironmentClient;
+import com.termux.shared.termux.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;
-import com.termux.shared.settings.preferences.TermuxAppSharedPreferences;
-import com.termux.shared.shell.TermuxSession;
-import com.termux.shared.terminal.TermuxTerminalSessionClientBase;
+import com.termux.shared.termux.settings.preferences.TermuxAppSharedPreferences;
+import com.termux.shared.termux.shell.TermuxSession;
+import com.termux.shared.termux.terminal.TermuxTerminalSessionClientBase;
 import com.termux.shared.logger.Logger;
 import com.termux.shared.notification.NotificationUtils;
 import com.termux.shared.packages.PermissionUtils;
diff --git a/app/src/main/java/com/termux/app/activities/SettingsActivity.java b/app/src/main/java/com/termux/app/activities/SettingsActivity.java
index 70b0b44a7e..05b402c7cb 100644
--- a/app/src/main/java/com/termux/app/activities/SettingsActivity.java
+++ b/app/src/main/java/com/termux/app/activities/SettingsActivity.java
@@ -17,11 +17,11 @@
 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.settings.preferences.TermuxAPIAppSharedPreferences;
+import com.termux.shared.termux.settings.preferences.TermuxFloatAppSharedPreferences;
+import com.termux.shared.termux.settings.preferences.TermuxTaskerAppSharedPreferences;
+import com.termux.shared.termux.settings.preferences.TermuxWidgetAppSharedPreferences;
+import com.termux.shared.android.AndroidUtils;
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.termux.TermuxUtils;
 
diff --git a/app/src/main/java/com/termux/app/fragments/settings/TermuxAPIPreferencesFragment.java b/app/src/main/java/com/termux/app/fragments/settings/TermuxAPIPreferencesFragment.java
index de8508e97d..8f4a17145b 100644
--- a/app/src/main/java/com/termux/app/fragments/settings/TermuxAPIPreferencesFragment.java
+++ b/app/src/main/java/com/termux/app/fragments/settings/TermuxAPIPreferencesFragment.java
@@ -9,7 +9,7 @@
 import androidx.preference.PreferenceManager;
 
 import com.termux.R;
-import com.termux.shared.settings.preferences.TermuxAPIAppSharedPreferences;
+import com.termux.shared.termux.settings.preferences.TermuxAPIAppSharedPreferences;
 
 @Keep
 public class TermuxAPIPreferencesFragment extends PreferenceFragmentCompat {
diff --git a/app/src/main/java/com/termux/app/fragments/settings/TermuxFloatPreferencesFragment.java b/app/src/main/java/com/termux/app/fragments/settings/TermuxFloatPreferencesFragment.java
index ee0bacb43d..a6f25c83dc 100644
--- a/app/src/main/java/com/termux/app/fragments/settings/TermuxFloatPreferencesFragment.java
+++ b/app/src/main/java/com/termux/app/fragments/settings/TermuxFloatPreferencesFragment.java
@@ -9,7 +9,7 @@
 import androidx.preference.PreferenceManager;
 
 import com.termux.R;
-import com.termux.shared.settings.preferences.TermuxFloatAppSharedPreferences;
+import com.termux.shared.termux.settings.preferences.TermuxFloatAppSharedPreferences;
 
 @Keep
 public class TermuxFloatPreferencesFragment extends PreferenceFragmentCompat {
diff --git a/app/src/main/java/com/termux/app/fragments/settings/TermuxPreferencesFragment.java b/app/src/main/java/com/termux/app/fragments/settings/TermuxPreferencesFragment.java
index 273fa0f552..448b9c7baa 100644
--- a/app/src/main/java/com/termux/app/fragments/settings/TermuxPreferencesFragment.java
+++ b/app/src/main/java/com/termux/app/fragments/settings/TermuxPreferencesFragment.java
@@ -9,7 +9,7 @@
 import androidx.preference.PreferenceManager;
 
 import com.termux.R;
-import com.termux.shared.settings.preferences.TermuxAppSharedPreferences;
+import com.termux.shared.termux.settings.preferences.TermuxAppSharedPreferences;
 
 @Keep
 public class TermuxPreferencesFragment extends PreferenceFragmentCompat {
diff --git a/app/src/main/java/com/termux/app/fragments/settings/TermuxTaskerPreferencesFragment.java b/app/src/main/java/com/termux/app/fragments/settings/TermuxTaskerPreferencesFragment.java
index b86685b60b..1e02880765 100644
--- a/app/src/main/java/com/termux/app/fragments/settings/TermuxTaskerPreferencesFragment.java
+++ b/app/src/main/java/com/termux/app/fragments/settings/TermuxTaskerPreferencesFragment.java
@@ -9,7 +9,7 @@
 import androidx.preference.PreferenceManager;
 
 import com.termux.R;
-import com.termux.shared.settings.preferences.TermuxTaskerAppSharedPreferences;
+import com.termux.shared.termux.settings.preferences.TermuxTaskerAppSharedPreferences;
 
 @Keep
 public class TermuxTaskerPreferencesFragment extends PreferenceFragmentCompat {
diff --git a/app/src/main/java/com/termux/app/fragments/settings/TermuxWidgetPreferencesFragment.java b/app/src/main/java/com/termux/app/fragments/settings/TermuxWidgetPreferencesFragment.java
index b87e93e5af..ded9c7010e 100644
--- a/app/src/main/java/com/termux/app/fragments/settings/TermuxWidgetPreferencesFragment.java
+++ b/app/src/main/java/com/termux/app/fragments/settings/TermuxWidgetPreferencesFragment.java
@@ -9,7 +9,7 @@
 import androidx.preference.PreferenceManager;
 
 import com.termux.R;
-import com.termux.shared.settings.preferences.TermuxWidgetAppSharedPreferences;
+import com.termux.shared.termux.settings.preferences.TermuxWidgetAppSharedPreferences;
 
 @Keep
 public class TermuxWidgetPreferencesFragment extends PreferenceFragmentCompat {
diff --git a/app/src/main/java/com/termux/app/fragments/settings/termux/DebuggingPreferencesFragment.java b/app/src/main/java/com/termux/app/fragments/settings/termux/DebuggingPreferencesFragment.java
index 72ced348a6..059dccbea8 100644
--- a/app/src/main/java/com/termux/app/fragments/settings/termux/DebuggingPreferencesFragment.java
+++ b/app/src/main/java/com/termux/app/fragments/settings/termux/DebuggingPreferencesFragment.java
@@ -13,7 +13,7 @@
 import androidx.preference.PreferenceManager;
 
 import com.termux.R;
-import com.termux.shared.settings.preferences.TermuxAppSharedPreferences;
+import com.termux.shared.termux.settings.preferences.TermuxAppSharedPreferences;
 import com.termux.shared.logger.Logger;
 
 @Keep
diff --git a/app/src/main/java/com/termux/app/fragments/settings/termux/TerminalIOPreferencesFragment.java b/app/src/main/java/com/termux/app/fragments/settings/termux/TerminalIOPreferencesFragment.java
index 46e7504940..f8504f43fd 100644
--- a/app/src/main/java/com/termux/app/fragments/settings/termux/TerminalIOPreferencesFragment.java
+++ b/app/src/main/java/com/termux/app/fragments/settings/termux/TerminalIOPreferencesFragment.java
@@ -9,7 +9,7 @@
 import androidx.preference.PreferenceManager;
 
 import com.termux.R;
-import com.termux.shared.settings.preferences.TermuxAppSharedPreferences;
+import com.termux.shared.termux.settings.preferences.TermuxAppSharedPreferences;
 
 @Keep
 public class TerminalIOPreferencesFragment extends PreferenceFragmentCompat {
diff --git a/app/src/main/java/com/termux/app/fragments/settings/termux/TerminalViewPreferencesFragment.java b/app/src/main/java/com/termux/app/fragments/settings/termux/TerminalViewPreferencesFragment.java
index ed10d18a5a..ff033fd369 100644
--- a/app/src/main/java/com/termux/app/fragments/settings/termux/TerminalViewPreferencesFragment.java
+++ b/app/src/main/java/com/termux/app/fragments/settings/termux/TerminalViewPreferencesFragment.java
@@ -9,7 +9,7 @@
 import androidx.preference.PreferenceManager;
 
 import com.termux.R;
-import com.termux.shared.settings.preferences.TermuxAppSharedPreferences;
+import com.termux.shared.termux.settings.preferences.TermuxAppSharedPreferences;
 
 @Keep
 public class TerminalViewPreferencesFragment extends PreferenceFragmentCompat {
diff --git a/app/src/main/java/com/termux/app/fragments/settings/termux_api/DebuggingPreferencesFragment.java b/app/src/main/java/com/termux/app/fragments/settings/termux_api/DebuggingPreferencesFragment.java
index 6d09eae13e..908c6ebd89 100644
--- a/app/src/main/java/com/termux/app/fragments/settings/termux_api/DebuggingPreferencesFragment.java
+++ b/app/src/main/java/com/termux/app/fragments/settings/termux_api/DebuggingPreferencesFragment.java
@@ -13,7 +13,7 @@
 import androidx.preference.PreferenceManager;
 
 import com.termux.R;
-import com.termux.shared.settings.preferences.TermuxAPIAppSharedPreferences;
+import com.termux.shared.termux.settings.preferences.TermuxAPIAppSharedPreferences;
 
 @Keep
 public class DebuggingPreferencesFragment extends PreferenceFragmentCompat {
diff --git a/app/src/main/java/com/termux/app/fragments/settings/termux_float/DebuggingPreferencesFragment.java b/app/src/main/java/com/termux/app/fragments/settings/termux_float/DebuggingPreferencesFragment.java
index a52f78571e..1d815aa09a 100644
--- a/app/src/main/java/com/termux/app/fragments/settings/termux_float/DebuggingPreferencesFragment.java
+++ b/app/src/main/java/com/termux/app/fragments/settings/termux_float/DebuggingPreferencesFragment.java
@@ -13,7 +13,7 @@
 import androidx.preference.PreferenceManager;
 
 import com.termux.R;
-import com.termux.shared.settings.preferences.TermuxFloatAppSharedPreferences;
+import com.termux.shared.termux.settings.preferences.TermuxFloatAppSharedPreferences;
 
 @Keep
 public class DebuggingPreferencesFragment extends PreferenceFragmentCompat {
diff --git a/app/src/main/java/com/termux/app/fragments/settings/termux_tasker/DebuggingPreferencesFragment.java b/app/src/main/java/com/termux/app/fragments/settings/termux_tasker/DebuggingPreferencesFragment.java
index a66708140f..7e2918392f 100644
--- a/app/src/main/java/com/termux/app/fragments/settings/termux_tasker/DebuggingPreferencesFragment.java
+++ b/app/src/main/java/com/termux/app/fragments/settings/termux_tasker/DebuggingPreferencesFragment.java
@@ -13,7 +13,7 @@
 import androidx.preference.PreferenceManager;
 
 import com.termux.R;
-import com.termux.shared.settings.preferences.TermuxTaskerAppSharedPreferences;
+import com.termux.shared.termux.settings.preferences.TermuxTaskerAppSharedPreferences;
 
 @Keep
 public class DebuggingPreferencesFragment extends PreferenceFragmentCompat {
diff --git a/app/src/main/java/com/termux/app/fragments/settings/termux_widget/DebuggingPreferencesFragment.java b/app/src/main/java/com/termux/app/fragments/settings/termux_widget/DebuggingPreferencesFragment.java
index 919f159e55..50823d540e 100644
--- a/app/src/main/java/com/termux/app/fragments/settings/termux_widget/DebuggingPreferencesFragment.java
+++ b/app/src/main/java/com/termux/app/fragments/settings/termux_widget/DebuggingPreferencesFragment.java
@@ -13,7 +13,7 @@
 import androidx.preference.PreferenceManager;
 
 import com.termux.R;
-import com.termux.shared.settings.preferences.TermuxWidgetAppSharedPreferences;
+import com.termux.shared.termux.settings.preferences.TermuxWidgetAppSharedPreferences;
 
 @Keep
 public class DebuggingPreferencesFragment extends PreferenceFragmentCompat {
diff --git a/app/src/main/java/com/termux/app/settings/properties/TermuxAppSharedProperties.java b/app/src/main/java/com/termux/app/settings/properties/TermuxAppSharedProperties.java
index 7dbf2e1cb9..d48d64057f 100644
--- a/app/src/main/java/com/termux/app/settings/properties/TermuxAppSharedProperties.java
+++ b/app/src/main/java/com/termux/app/settings/properties/TermuxAppSharedProperties.java
@@ -5,12 +5,12 @@
 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.shared.termux.extrakeys.ExtraKeysConstants;
+import com.termux.shared.termux.extrakeys.ExtraKeysConstants.EXTRA_KEY_DISPLAY_MAPS;
+import com.termux.shared.termux.extrakeys.ExtraKeysInfo;
 import com.termux.shared.logger.Logger;
-import com.termux.shared.settings.properties.TermuxPropertyConstants;
-import com.termux.shared.settings.properties.TermuxSharedProperties;
+import com.termux.shared.termux.settings.properties.TermuxPropertyConstants;
+import com.termux.shared.termux.settings.properties.TermuxSharedProperties;
 import com.termux.shared.termux.TermuxConstants;
 
 import org.json.JSONException;
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxSessionsListViewController.java b/app/src/main/java/com/termux/app/terminal/TermuxSessionsListViewController.java
index 76c7930912..61e07ec1e2 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxSessionsListViewController.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxSessionsListViewController.java
@@ -20,7 +20,7 @@
 
 import com.termux.R;
 import com.termux.app.TermuxActivity;
-import com.termux.shared.shell.TermuxSession;
+import com.termux.shared.termux.shell.TermuxSession;
 import com.termux.terminal.TerminalSession;
 
 import java.util.List;
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java
index 78d25fe3b4..5c83c66f8e 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java
@@ -13,14 +13,14 @@
 import android.widget.ListView;
 
 import com.termux.R;
-import com.termux.shared.shell.TermuxSession;
-import com.termux.shared.interact.TextInputDialogUtils;
+import com.termux.shared.termux.shell.TermuxSession;
+import com.termux.shared.termux.interact.TextInputDialogUtils;
 import com.termux.app.TermuxActivity;
-import com.termux.shared.terminal.TermuxTerminalSessionClientBase;
+import com.termux.shared.termux.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.shared.termux.settings.properties.TermuxPropertyConstants;
+import com.termux.shared.termux.terminal.io.BellHandler;
 import com.termux.shared.logger.Logger;
 import com.termux.terminal.TerminalColors;
 import com.termux.terminal.TerminalSession;
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
index f520a1d422..248ae17e92 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
@@ -24,15 +24,15 @@
 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.terminal.TermuxTerminalViewClientBase;
+import com.termux.shared.termux.extrakeys.SpecialButton;
+import com.termux.shared.android.AndroidUtils;
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.activities.ReportActivity;
 import com.termux.shared.models.ReportInfo;
 import com.termux.app.models.UserAction;
 import com.termux.app.terminal.io.KeyboardShortcut;
-import com.termux.shared.settings.properties.TermuxPropertyConstants;
+import com.termux.shared.termux.settings.properties.TermuxPropertyConstants;
 import com.termux.shared.data.DataUtils;
 import com.termux.shared.logger.Logger;
 import com.termux.shared.markdown.MarkdownUtils;
diff --git a/app/src/main/java/com/termux/app/terminal/io/TerminalToolbarViewPager.java b/app/src/main/java/com/termux/app/terminal/io/TerminalToolbarViewPager.java
index de49b3cd0d..7a3f945ec0 100644
--- a/app/src/main/java/com/termux/app/terminal/io/TerminalToolbarViewPager.java
+++ b/app/src/main/java/com/termux/app/terminal/io/TerminalToolbarViewPager.java
@@ -11,7 +11,7 @@
 
 import com.termux.R;
 import com.termux.app.TermuxActivity;
-import com.termux.shared.terminal.io.extrakeys.ExtraKeysView;
+import com.termux.shared.termux.extrakeys.ExtraKeysView;
 import com.termux.terminal.TerminalSession;
 
 public class TerminalToolbarViewPager {
diff --git a/app/src/main/java/com/termux/app/terminal/io/TermuxTerminalExtraKeys.java b/app/src/main/java/com/termux/app/terminal/io/TermuxTerminalExtraKeys.java
index 8eed51797b..030f852f35 100644
--- a/app/src/main/java/com/termux/app/terminal/io/TermuxTerminalExtraKeys.java
+++ b/app/src/main/java/com/termux/app/terminal/io/TermuxTerminalExtraKeys.java
@@ -9,7 +9,7 @@
 
 import com.termux.app.terminal.TermuxTerminalSessionClient;
 import com.termux.app.terminal.TermuxTerminalViewClient;
-import com.termux.shared.terminal.io.TerminalExtraKeys;
+import com.termux.shared.termux.terminal.io.TerminalExtraKeys;
 import com.termux.view.TerminalView;
 
 public class TermuxTerminalExtraKeys extends TerminalExtraKeys {
diff --git a/app/src/main/java/com/termux/app/utils/CrashUtils.java b/app/src/main/java/com/termux/app/utils/CrashUtils.java
index 2a079b34b5..eec5fd04c9 100644
--- a/app/src/main/java/com/termux/app/utils/CrashUtils.java
+++ b/app/src/main/java/com/termux/app/utils/CrashUtils.java
@@ -16,12 +16,12 @@
 import com.termux.shared.file.FileUtils;
 import com.termux.shared.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.termux.notification.TermuxNotificationUtils;
+import com.termux.shared.termux.settings.preferences.TermuxAppSharedPreferences;
+import com.termux.shared.termux.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.android.AndroidUtils;
 import com.termux.shared.termux.TermuxUtils;
 
 import com.termux.shared.termux.TermuxConstants;
diff --git a/app/src/main/java/com/termux/app/utils/PluginUtils.java b/app/src/main/java/com/termux/app/utils/PluginUtils.java
index 4dfc5c6cb2..94591e6360 100644
--- a/app/src/main/java/com/termux/app/utils/PluginUtils.java
+++ b/app/src/main/java/com/termux/app/utils/PluginUtils.java
@@ -4,7 +4,6 @@
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.content.Context;
-import android.os.Environment;
 
 import androidx.annotation.Nullable;
 
@@ -17,19 +16,19 @@
 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.settings.preferences.TermuxPreferenceConstants;
+import com.termux.shared.termux.notification.TermuxNotificationUtils;
+import com.termux.shared.termux.settings.preferences.TermuxPreferenceConstants;
 import com.termux.shared.shell.ResultSender;
 import com.termux.shared.shell.ShellUtils;
-import com.termux.shared.termux.AndroidUtils;
+import com.termux.shared.android.AndroidUtils;
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.termux.TermuxConstants.TERMUX_APP.TERMUX_SERVICE;
 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.termux.settings.preferences.TermuxAppSharedPreferences;
+import com.termux.shared.termux.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.shared.termux.settings.properties.TermuxPropertyConstants;
 import com.termux.shared.models.ExecutionCommand;
 import com.termux.app.models.UserAction;
 import com.termux.shared.data.DataUtils;
diff --git a/app/src/main/java/com/termux/filepicker/TermuxFileReceiverActivity.java b/app/src/main/java/com/termux/filepicker/TermuxFileReceiverActivity.java
index 2dae743695..17244e41ab 100644
--- a/app/src/main/java/com/termux/filepicker/TermuxFileReceiverActivity.java
+++ b/app/src/main/java/com/termux/filepicker/TermuxFileReceiverActivity.java
@@ -11,7 +11,7 @@
 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.termux.interact.TextInputDialogUtils;
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.termux.TermuxConstants.TERMUX_APP.TERMUX_SERVICE;
 import com.termux.app.TermuxService;
diff --git a/app/src/main/res/layout/view_terminal_toolbar_extra_keys.xml b/app/src/main/res/layout/view_terminal_toolbar_extra_keys.xml
index 21a25c8100..7dbd46fd1b 100644
--- a/app/src/main/res/layout/view_terminal_toolbar_extra_keys.xml
+++ b/app/src/main/res/layout/view_terminal_toolbar_extra_keys.xml
@@ -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.shared.termux.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"
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/AndroidUtils.java b/termux-shared/src/main/java/com/termux/shared/android/AndroidUtils.java
similarity index 99%
rename from termux-shared/src/main/java/com/termux/shared/termux/AndroidUtils.java
rename to termux-shared/src/main/java/com/termux/shared/android/AndroidUtils.java
index 4a5dd59db1..b40d0cde86 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/AndroidUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/android/AndroidUtils.java
@@ -1,4 +1,4 @@
-package com.termux.shared.termux;
+package com.termux.shared.android;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
diff --git a/termux-shared/src/main/java/com/termux/shared/crash/CrashHandler.java b/termux-shared/src/main/java/com/termux/shared/crash/CrashHandler.java
index 7b920f7568..4691d5486d 100644
--- a/termux-shared/src/main/java/com/termux/shared/crash/CrashHandler.java
+++ b/termux-shared/src/main/java/com/termux/shared/crash/CrashHandler.java
@@ -8,7 +8,7 @@
 import com.termux.shared.logger.Logger;
 import com.termux.shared.markdown.MarkdownUtils;
 import com.termux.shared.models.errors.Error;
-import com.termux.shared.termux.AndroidUtils;
+import com.termux.shared.android.AndroidUtils;
 
 import java.nio.charset.Charset;
 
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/ResultSender.java b/termux-shared/src/main/java/com/termux/shared/shell/ResultSender.java
index 20b384e333..be7db2ecfe 100644
--- a/termux-shared/src/main/java/com/termux/shared/shell/ResultSender.java
+++ b/termux-shared/src/main/java/com/termux/shared/shell/ResultSender.java
@@ -16,7 +16,7 @@
 import com.termux.shared.models.ResultData;
 import com.termux.shared.models.errors.FunctionErrno;
 import com.termux.shared.models.errors.ResultSenderErrno;
-import com.termux.shared.termux.AndroidUtils;
+import com.termux.shared.android.AndroidUtils;
 import com.termux.shared.termux.TermuxConstants.RESULT_SENDER;
 
 public class ResultSender {
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
index 3ea4d1d97b..b2e40b94aa 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
@@ -11,15 +11,16 @@
 import androidx.annotation.Nullable;
 
 import com.termux.shared.R;
+import com.termux.shared.android.AndroidUtils;
 import com.termux.shared.data.DataUtils;
 import com.termux.shared.file.FileUtils;
-import com.termux.shared.file.TermuxFileUtils;
+import com.termux.shared.termux.file.TermuxFileUtils;
 import com.termux.shared.logger.Logger;
 import com.termux.shared.markdown.MarkdownUtils;
 import com.termux.shared.models.ExecutionCommand;
 import com.termux.shared.models.errors.Error;
 import com.termux.shared.packages.PackageUtils;
-import com.termux.shared.shell.TermuxShellEnvironmentClient;
+import com.termux.shared.termux.shell.TermuxShellEnvironmentClient;
 import com.termux.shared.shell.TermuxTask;
 
 import org.apache.commons.io.IOUtils;
diff --git a/termux-shared/src/main/java/com/termux/shared/crash/TermuxCrashUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/crash/TermuxCrashUtils.java
similarity index 91%
rename from termux-shared/src/main/java/com/termux/shared/crash/TermuxCrashUtils.java
rename to termux-shared/src/main/java/com/termux/shared/termux/crash/TermuxCrashUtils.java
index d8b877fe63..e7bc71009d 100644
--- a/termux-shared/src/main/java/com/termux/shared/crash/TermuxCrashUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/crash/TermuxCrashUtils.java
@@ -1,9 +1,10 @@
-package com.termux.shared.crash;
+package com.termux.shared.termux.crash;
 
 import android.content.Context;
 
 import androidx.annotation.NonNull;
 
+import com.termux.shared.crash.CrashHandler;
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.termux.TermuxUtils;
 
diff --git a/termux-shared/src/main/java/com/termux/shared/terminal/io/extrakeys/ExtraKeyButton.java b/termux-shared/src/main/java/com/termux/shared/termux/extrakeys/ExtraKeyButton.java
similarity index 99%
rename from termux-shared/src/main/java/com/termux/shared/terminal/io/extrakeys/ExtraKeyButton.java
rename to termux-shared/src/main/java/com/termux/shared/termux/extrakeys/ExtraKeyButton.java
index e22879857c..bcec59daa5 100644
--- a/termux-shared/src/main/java/com/termux/shared/terminal/io/extrakeys/ExtraKeyButton.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/extrakeys/ExtraKeyButton.java
@@ -1,4 +1,4 @@
-package com.termux.shared.terminal.io.extrakeys;
+package com.termux.shared.termux.extrakeys;
 
 import android.text.TextUtils;
 
diff --git a/termux-shared/src/main/java/com/termux/shared/terminal/io/extrakeys/ExtraKeysConstants.java b/termux-shared/src/main/java/com/termux/shared/termux/extrakeys/ExtraKeysConstants.java
similarity index 99%
rename from termux-shared/src/main/java/com/termux/shared/terminal/io/extrakeys/ExtraKeysConstants.java
rename to termux-shared/src/main/java/com/termux/shared/termux/extrakeys/ExtraKeysConstants.java
index f05ea48162..f67a127a35 100644
--- a/termux-shared/src/main/java/com/termux/shared/terminal/io/extrakeys/ExtraKeysConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/extrakeys/ExtraKeysConstants.java
@@ -1,4 +1,4 @@
-package com.termux.shared.terminal.io.extrakeys;
+package com.termux.shared.termux.extrakeys;
 
 import android.view.KeyEvent;
 
diff --git a/termux-shared/src/main/java/com/termux/shared/terminal/io/extrakeys/ExtraKeysInfo.java b/termux-shared/src/main/java/com/termux/shared/termux/extrakeys/ExtraKeysInfo.java
similarity index 97%
rename from termux-shared/src/main/java/com/termux/shared/terminal/io/extrakeys/ExtraKeysInfo.java
rename to termux-shared/src/main/java/com/termux/shared/termux/extrakeys/ExtraKeysInfo.java
index 7bf47d7d40..9140c13edd 100644
--- a/termux-shared/src/main/java/com/termux/shared/terminal/io/extrakeys/ExtraKeysInfo.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/extrakeys/ExtraKeysInfo.java
@@ -1,11 +1,12 @@
-package com.termux.shared.terminal.io.extrakeys;
+package com.termux.shared.termux.extrakeys;
 
 import android.view.View;
 import android.widget.Button;
 
 import androidx.annotation.NonNull;
 
-import com.termux.shared.terminal.io.extrakeys.ExtraKeysConstants.EXTRA_KEY_DISPLAY_MAPS;
+import com.termux.shared.termux.extrakeys.ExtraKeysConstants.EXTRA_KEY_DISPLAY_MAPS;
+import com.termux.shared.termux.terminal.io.TerminalExtraKeys;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -68,7 +69,7 @@
  * Its up to the {@link ExtraKeysView.IExtraKeysView} client on how to handle individual key values
  * of an {@link ExtraKeyButton}. They are sent as is via
  * {@link ExtraKeysView.IExtraKeysView#onExtraKeyButtonClick(View, ExtraKeyButton, Button)}. The
- * {@link com.termux.shared.terminal.io.TerminalExtraKeys} which is an implementation of the interface,
+ * {@link TerminalExtraKeys} which is an implementation of the interface,
  * checks if the key is one of {@link ExtraKeysConstants#PRIMARY_KEY_CODES_FOR_STRINGS} and generates
  * a {@link android.view.KeyEvent} for it, and if its not, then converts the key to code points by
  * calling {@link CharSequence#codePoints()} and passes them to the terminal as literal strings.
diff --git a/termux-shared/src/main/java/com/termux/shared/terminal/io/extrakeys/ExtraKeysView.java b/termux-shared/src/main/java/com/termux/shared/termux/extrakeys/ExtraKeysView.java
similarity index 98%
rename from termux-shared/src/main/java/com/termux/shared/terminal/io/extrakeys/ExtraKeysView.java
rename to termux-shared/src/main/java/com/termux/shared/termux/extrakeys/ExtraKeysView.java
index e149e36dcc..c20edeb649 100644
--- a/termux-shared/src/main/java/com/termux/shared/terminal/io/extrakeys/ExtraKeysView.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/extrakeys/ExtraKeysView.java
@@ -1,4 +1,4 @@
-package com.termux.shared.terminal.io.extrakeys;
+package com.termux.shared.termux.extrakeys;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -32,6 +32,8 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import com.termux.shared.termux.terminal.io.TerminalExtraKeys;
+
 /**
  * A {@link View} showing extra keys (such as Escape, Ctrl, Alt) not normally available on an Android soft
  * keyboards.
@@ -40,7 +42,7 @@
  * it with a {@link androidx.viewpager.widget.ViewPager}.:
  * {@code
  * <?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.shared.termux.extrakeys.ExtraKeysView xmlns:android="http://schemas.android.com/apk/res/android"
  *     android:id="@+id/extra_keys"
  *     style="?android:attr/buttonBarStyle"
  *     android:layout_width="match_parent"
@@ -66,7 +68,7 @@
  * The {@link ExtraKeysInfo} is created by TermuxAppSharedProperties.setExtraKeys().
  * Then its got and the view height is adjusted in TermuxActivity.setTerminalToolbarHeight().
  * The client used is TermuxTerminalExtraKeys, which extends
- * {@link com.termux.shared.terminal.io.TerminalExtraKeys} to handle Termux app specific logic and
+ * {@link TerminalExtraKeys } to handle Termux app specific logic and
  * leave the rest to the super class.
  */
 public final class ExtraKeysView extends GridLayout {
diff --git a/termux-shared/src/main/java/com/termux/shared/terminal/io/extrakeys/SpecialButton.java b/termux-shared/src/main/java/com/termux/shared/termux/extrakeys/SpecialButton.java
similarity index 96%
rename from termux-shared/src/main/java/com/termux/shared/terminal/io/extrakeys/SpecialButton.java
rename to termux-shared/src/main/java/com/termux/shared/termux/extrakeys/SpecialButton.java
index 34dc258b99..382377b4b4 100644
--- a/termux-shared/src/main/java/com/termux/shared/terminal/io/extrakeys/SpecialButton.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/extrakeys/SpecialButton.java
@@ -1,4 +1,4 @@
-package com.termux.shared.terminal.io.extrakeys;
+package com.termux.shared.termux.extrakeys;
 
 import androidx.annotation.NonNull;
 
diff --git a/termux-shared/src/main/java/com/termux/shared/terminal/io/extrakeys/SpecialButtonState.java b/termux-shared/src/main/java/com/termux/shared/termux/extrakeys/SpecialButtonState.java
similarity index 96%
rename from termux-shared/src/main/java/com/termux/shared/terminal/io/extrakeys/SpecialButtonState.java
rename to termux-shared/src/main/java/com/termux/shared/termux/extrakeys/SpecialButtonState.java
index 0af0359a9e..381e4c5147 100644
--- a/termux-shared/src/main/java/com/termux/shared/terminal/io/extrakeys/SpecialButtonState.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/extrakeys/SpecialButtonState.java
@@ -1,4 +1,4 @@
-package com.termux.shared.terminal.io.extrakeys;
+package com.termux.shared.termux.extrakeys;
 
 import android.widget.Button;
 
diff --git a/termux-shared/src/main/java/com/termux/shared/file/TermuxFileUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/file/TermuxFileUtils.java
similarity index 99%
rename from termux-shared/src/main/java/com/termux/shared/file/TermuxFileUtils.java
rename to termux-shared/src/main/java/com/termux/shared/termux/file/TermuxFileUtils.java
index 5bb1252eec..704c93e350 100644
--- a/termux-shared/src/main/java/com/termux/shared/file/TermuxFileUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/file/TermuxFileUtils.java
@@ -1,18 +1,19 @@
-package com.termux.shared.file;
+package com.termux.shared.termux.file;
 
 import android.content.Context;
 import android.os.Environment;
 
 import androidx.annotation.NonNull;
 
+import com.termux.shared.file.FileUtils;
 import com.termux.shared.logger.Logger;
 import com.termux.shared.markdown.MarkdownUtils;
 import com.termux.shared.models.ExecutionCommand;
 import com.termux.shared.models.errors.Error;
 import com.termux.shared.models.errors.FileUtilsErrno;
-import com.termux.shared.shell.TermuxShellEnvironmentClient;
+import com.termux.shared.termux.shell.TermuxShellEnvironmentClient;
 import com.termux.shared.shell.TermuxTask;
-import com.termux.shared.termux.AndroidUtils;
+import com.termux.shared.android.AndroidUtils;
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.termux.TermuxUtils;
 
diff --git a/termux-shared/src/main/java/com/termux/shared/interact/TextInputDialogUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/interact/TextInputDialogUtils.java
similarity index 94%
rename from termux-shared/src/main/java/com/termux/shared/interact/TextInputDialogUtils.java
rename to termux-shared/src/main/java/com/termux/shared/termux/interact/TextInputDialogUtils.java
index 7d111d06cc..d644af7260 100644
--- a/termux-shared/src/main/java/com/termux/shared/interact/TextInputDialogUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/interact/TextInputDialogUtils.java
@@ -1,20 +1,14 @@
-package com.termux.shared.interact;
+package com.termux.shared.termux.interact;
 
 import android.app.Activity;
 import android.app.AlertDialog;
-import android.content.Context;
 import android.content.DialogInterface;
 import android.text.Selection;
 import android.util.TypedValue;
 import android.view.KeyEvent;
-import android.view.LayoutInflater;
-import android.view.View;
 import android.view.ViewGroup.LayoutParams;
 import android.widget.EditText;
 import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import com.termux.shared.R;
 
 public final class TextInputDialogUtils {
 
diff --git a/termux-shared/src/main/java/com/termux/shared/notification/TermuxNotificationUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/notification/TermuxNotificationUtils.java
similarity index 88%
rename from termux-shared/src/main/java/com/termux/shared/notification/TermuxNotificationUtils.java
rename to termux-shared/src/main/java/com/termux/shared/termux/notification/TermuxNotificationUtils.java
index 585cd605fe..eb0b50626d 100644
--- a/termux-shared/src/main/java/com/termux/shared/notification/TermuxNotificationUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/notification/TermuxNotificationUtils.java
@@ -1,9 +1,9 @@
-package com.termux.shared.notification;
+package com.termux.shared.termux.notification;
 
 import android.content.Context;
 
-import com.termux.shared.settings.preferences.TermuxAppSharedPreferences;
-import com.termux.shared.settings.preferences.TermuxPreferenceConstants;
+import com.termux.shared.termux.settings.preferences.TermuxAppSharedPreferences;
+import com.termux.shared.termux.settings.preferences.TermuxPreferenceConstants;
 import com.termux.shared.termux.TermuxConstants;
 
 public class TermuxNotificationUtils {
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxAPIAppSharedPreferences.java b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxAPIAppSharedPreferences.java
similarity index 94%
rename from termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxAPIAppSharedPreferences.java
rename to termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxAPIAppSharedPreferences.java
index 7ed02e09a7..1bc0171d36 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxAPIAppSharedPreferences.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxAPIAppSharedPreferences.java
@@ -1,4 +1,4 @@
-package com.termux.shared.settings.preferences;
+package com.termux.shared.termux.settings.preferences;
 
 import android.app.Activity;
 import android.content.Context;
@@ -9,7 +9,8 @@
 
 import com.termux.shared.logger.Logger;
 import com.termux.shared.packages.PackageUtils;
-import com.termux.shared.settings.preferences.TermuxPreferenceConstants.TERMUX_API_APP;
+import com.termux.shared.settings.preferences.SharedPreferenceUtils;
+import com.termux.shared.termux.settings.preferences.TermuxPreferenceConstants.TERMUX_API_APP;
 import com.termux.shared.termux.TermuxConstants;
 
 public class TermuxAPIAppSharedPreferences {
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxAppSharedPreferences.java b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxAppSharedPreferences.java
similarity index 97%
rename from termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxAppSharedPreferences.java
rename to termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxAppSharedPreferences.java
index 934ed02121..b2f986ecad 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxAppSharedPreferences.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxAppSharedPreferences.java
@@ -1,4 +1,4 @@
-package com.termux.shared.settings.preferences;
+package com.termux.shared.termux.settings.preferences;
 
 import android.app.Activity;
 import android.content.Context;
@@ -9,10 +9,11 @@
 import androidx.annotation.Nullable;
 
 import com.termux.shared.packages.PackageUtils;
+import com.termux.shared.settings.preferences.SharedPreferenceUtils;
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.logger.Logger;
 import com.termux.shared.data.DataUtils;
-import com.termux.shared.settings.preferences.TermuxPreferenceConstants.TERMUX_APP;
+import com.termux.shared.termux.settings.preferences.TermuxPreferenceConstants.TERMUX_APP;
 
 public class TermuxAppSharedPreferences {
 
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxBootAppSharedPreferences.java b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxBootAppSharedPreferences.java
similarity index 94%
rename from termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxBootAppSharedPreferences.java
rename to termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxBootAppSharedPreferences.java
index b8a5aa1ac1..85bd822da5 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxBootAppSharedPreferences.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxBootAppSharedPreferences.java
@@ -1,4 +1,4 @@
-package com.termux.shared.settings.preferences;
+package com.termux.shared.termux.settings.preferences;
 
 import android.app.Activity;
 import android.content.Context;
@@ -9,7 +9,8 @@
 
 import com.termux.shared.logger.Logger;
 import com.termux.shared.packages.PackageUtils;
-import com.termux.shared.settings.preferences.TermuxPreferenceConstants.TERMUX_BOOT_APP;
+import com.termux.shared.settings.preferences.SharedPreferenceUtils;
+import com.termux.shared.termux.settings.preferences.TermuxPreferenceConstants.TERMUX_BOOT_APP;
 import com.termux.shared.termux.TermuxConstants;
 
 public class TermuxBootAppSharedPreferences {
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxFloatAppSharedPreferences.java b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxFloatAppSharedPreferences.java
similarity index 96%
rename from termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxFloatAppSharedPreferences.java
rename to termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxFloatAppSharedPreferences.java
index 42f21f2cba..0e0a8620ee 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxFloatAppSharedPreferences.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxFloatAppSharedPreferences.java
@@ -1,4 +1,4 @@
-package com.termux.shared.settings.preferences;
+package com.termux.shared.termux.settings.preferences;
 
 import android.app.Activity;
 import android.content.Context;
@@ -10,7 +10,8 @@
 import com.termux.shared.data.DataUtils;
 import com.termux.shared.logger.Logger;
 import com.termux.shared.packages.PackageUtils;
-import com.termux.shared.settings.preferences.TermuxPreferenceConstants.TERMUX_FLOAT_APP;
+import com.termux.shared.settings.preferences.SharedPreferenceUtils;
+import com.termux.shared.termux.settings.preferences.TermuxPreferenceConstants.TERMUX_FLOAT_APP;
 import com.termux.shared.termux.TermuxConstants;
 
 public class TermuxFloatAppSharedPreferences {
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxPreferenceConstants.java b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxPreferenceConstants.java
similarity index 99%
rename from termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxPreferenceConstants.java
rename to termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxPreferenceConstants.java
index 5d3d06e183..b03f19d001 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxPreferenceConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxPreferenceConstants.java
@@ -1,4 +1,4 @@
-package com.termux.shared.settings.preferences;
+package com.termux.shared.termux.settings.preferences;
 
 /*
  * Version: v0.15.0
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxStylingAppSharedPreferences.java b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxStylingAppSharedPreferences.java
similarity index 94%
rename from termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxStylingAppSharedPreferences.java
rename to termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxStylingAppSharedPreferences.java
index 85432c7db5..10bbb67742 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxStylingAppSharedPreferences.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxStylingAppSharedPreferences.java
@@ -1,4 +1,4 @@
-package com.termux.shared.settings.preferences;
+package com.termux.shared.termux.settings.preferences;
 
 import android.app.Activity;
 import android.content.Context;
@@ -9,7 +9,8 @@
 
 import com.termux.shared.logger.Logger;
 import com.termux.shared.packages.PackageUtils;
-import com.termux.shared.settings.preferences.TermuxPreferenceConstants.TERMUX_STYLING_APP;
+import com.termux.shared.settings.preferences.SharedPreferenceUtils;
+import com.termux.shared.termux.settings.preferences.TermuxPreferenceConstants.TERMUX_STYLING_APP;
 import com.termux.shared.termux.TermuxConstants;
 
 public class TermuxStylingAppSharedPreferences {
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxTaskerAppSharedPreferences.java b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxTaskerAppSharedPreferences.java
similarity index 95%
rename from termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxTaskerAppSharedPreferences.java
rename to termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxTaskerAppSharedPreferences.java
index 87205f43d9..0945a33b38 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxTaskerAppSharedPreferences.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxTaskerAppSharedPreferences.java
@@ -1,4 +1,4 @@
-package com.termux.shared.settings.preferences;
+package com.termux.shared.termux.settings.preferences;
 
 import android.app.Activity;
 import android.content.Context;
@@ -8,8 +8,9 @@
 import androidx.annotation.Nullable;
 
 import com.termux.shared.packages.PackageUtils;
+import com.termux.shared.settings.preferences.SharedPreferenceUtils;
 import com.termux.shared.termux.TermuxConstants;
-import com.termux.shared.settings.preferences.TermuxPreferenceConstants.TERMUX_TASKER_APP;
+import com.termux.shared.termux.settings.preferences.TermuxPreferenceConstants.TERMUX_TASKER_APP;
 import com.termux.shared.logger.Logger;
 
 public class TermuxTaskerAppSharedPreferences {
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxWidgetAppSharedPreferences.java b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxWidgetAppSharedPreferences.java
similarity index 95%
rename from termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxWidgetAppSharedPreferences.java
rename to termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxWidgetAppSharedPreferences.java
index df667e3d28..a6e181cd78 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxWidgetAppSharedPreferences.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxWidgetAppSharedPreferences.java
@@ -1,4 +1,4 @@
-package com.termux.shared.settings.preferences;
+package com.termux.shared.termux.settings.preferences;
 
 import android.app.Activity;
 import android.content.Context;
@@ -9,7 +9,8 @@
 
 import com.termux.shared.logger.Logger;
 import com.termux.shared.packages.PackageUtils;
-import com.termux.shared.settings.preferences.TermuxPreferenceConstants.TERMUX_WIDGET_APP;
+import com.termux.shared.settings.preferences.SharedPreferenceUtils;
+import com.termux.shared.termux.settings.preferences.TermuxPreferenceConstants.TERMUX_WIDGET_APP;
 import com.termux.shared.termux.TermuxConstants;
 
 import java.util.UUID;
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java b/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxPropertyConstants.java
similarity index 99%
rename from termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java
rename to termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxPropertyConstants.java
index 638ff18f30..8187104877 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxPropertyConstants.java
@@ -1,8 +1,9 @@
-package com.termux.shared.settings.properties;
+package com.termux.shared.termux.settings.properties;
 
 import com.google.common.collect.ImmutableBiMap;
 import com.termux.shared.file.FileUtils;
 import com.termux.shared.file.filesystem.FileType;
+import com.termux.shared.settings.properties.SharedProperties;
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.logger.Logger;
 import com.termux.terminal.TerminalEmulator;
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxSharedProperties.java b/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxSharedProperties.java
similarity index 99%
rename from termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxSharedProperties.java
rename to termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxSharedProperties.java
index d883884e68..2d760ff5e7 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxSharedProperties.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxSharedProperties.java
@@ -1,12 +1,13 @@
-package com.termux.shared.settings.properties;
+package com.termux.shared.termux.settings.properties;
 
 import android.content.Context;
-import android.content.res.Configuration;
 
 import androidx.annotation.NonNull;
 
 import com.termux.shared.logger.Logger;
 import com.termux.shared.data.DataUtils;
+import com.termux.shared.settings.properties.SharedProperties;
+import com.termux.shared.settings.properties.SharedPropertiesParser;
 
 import java.io.File;
 import java.util.HashMap;
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/TermuxSession.java b/termux-shared/src/main/java/com/termux/shared/termux/shell/TermuxSession.java
similarity index 99%
rename from termux-shared/src/main/java/com/termux/shared/shell/TermuxSession.java
rename to termux-shared/src/main/java/com/termux/shared/termux/shell/TermuxSession.java
index b69e36daeb..ce13ea87c0 100644
--- a/termux-shared/src/main/java/com/termux/shared/shell/TermuxSession.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/shell/TermuxSession.java
@@ -1,4 +1,4 @@
-package com.termux.shared.shell;
+package com.termux.shared.termux.shell;
 
 import android.content.Context;
 import android.system.OsConstants;
@@ -10,6 +10,8 @@
 import com.termux.shared.models.ResultData;
 import com.termux.shared.models.errors.Errno;
 import com.termux.shared.logger.Logger;
+import com.termux.shared.shell.ShellEnvironmentClient;
+import com.termux.shared.shell.ShellUtils;
 import com.termux.terminal.TerminalSession;
 import com.termux.terminal.TerminalSessionClient;
 
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/TermuxShellEnvironmentClient.java b/termux-shared/src/main/java/com/termux/shared/termux/shell/TermuxShellEnvironmentClient.java
similarity index 90%
rename from termux-shared/src/main/java/com/termux/shared/shell/TermuxShellEnvironmentClient.java
rename to termux-shared/src/main/java/com/termux/shared/termux/shell/TermuxShellEnvironmentClient.java
index a2cb80c636..3d94a65cf8 100644
--- a/termux-shared/src/main/java/com/termux/shared/shell/TermuxShellEnvironmentClient.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/shell/TermuxShellEnvironmentClient.java
@@ -1,9 +1,11 @@
-package com.termux.shared.shell;
+package com.termux.shared.termux.shell;
 
 import android.content.Context;
 
 import androidx.annotation.NonNull;
 
+import com.termux.shared.shell.ShellEnvironmentClient;
+
 public class TermuxShellEnvironmentClient implements ShellEnvironmentClient {
 
     @NonNull
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/TermuxShellUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/shell/TermuxShellUtils.java
similarity index 99%
rename from termux-shared/src/main/java/com/termux/shared/shell/TermuxShellUtils.java
rename to termux-shared/src/main/java/com/termux/shared/termux/shell/TermuxShellUtils.java
index 18dcc54915..aad62427de 100644
--- a/termux-shared/src/main/java/com/termux/shared/shell/TermuxShellUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/shell/TermuxShellUtils.java
@@ -1,4 +1,4 @@
-package com.termux.shared.shell;
+package com.termux.shared.termux.shell;
 
 import android.content.Context;
 
diff --git a/termux-shared/src/main/java/com/termux/shared/terminal/TermuxTerminalSessionClientBase.java b/termux-shared/src/main/java/com/termux/shared/termux/terminal/TermuxTerminalSessionClientBase.java
similarity index 97%
rename from termux-shared/src/main/java/com/termux/shared/terminal/TermuxTerminalSessionClientBase.java
rename to termux-shared/src/main/java/com/termux/shared/termux/terminal/TermuxTerminalSessionClientBase.java
index df6eb5fe00..6764d5a9b1 100644
--- a/termux-shared/src/main/java/com/termux/shared/terminal/TermuxTerminalSessionClientBase.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/terminal/TermuxTerminalSessionClientBase.java
@@ -1,4 +1,4 @@
-package com.termux.shared.terminal;
+package com.termux.shared.termux.terminal;
 
 import com.termux.shared.logger.Logger;
 import com.termux.terminal.TerminalSession;
diff --git a/termux-shared/src/main/java/com/termux/shared/terminal/TermuxTerminalViewClientBase.java b/termux-shared/src/main/java/com/termux/shared/termux/terminal/TermuxTerminalViewClientBase.java
similarity index 98%
rename from termux-shared/src/main/java/com/termux/shared/terminal/TermuxTerminalViewClientBase.java
rename to termux-shared/src/main/java/com/termux/shared/termux/terminal/TermuxTerminalViewClientBase.java
index 167ec6bcbb..a4d30726ff 100644
--- a/termux-shared/src/main/java/com/termux/shared/terminal/TermuxTerminalViewClientBase.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/terminal/TermuxTerminalViewClientBase.java
@@ -1,4 +1,4 @@
-package com.termux.shared.terminal;
+package com.termux.shared.termux.terminal;
 
 import android.view.KeyEvent;
 import android.view.MotionEvent;
diff --git a/termux-shared/src/main/java/com/termux/shared/terminal/io/BellHandler.java b/termux-shared/src/main/java/com/termux/shared/termux/terminal/io/BellHandler.java
similarity index 98%
rename from termux-shared/src/main/java/com/termux/shared/terminal/io/BellHandler.java
rename to termux-shared/src/main/java/com/termux/shared/termux/terminal/io/BellHandler.java
index fbaeaba5e2..1ec7b181a7 100644
--- a/termux-shared/src/main/java/com/termux/shared/terminal/io/BellHandler.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/terminal/io/BellHandler.java
@@ -1,4 +1,4 @@
-package com.termux.shared.terminal.io;
+package com.termux.shared.termux.terminal.io;
 
 import android.content.Context;
 import android.os.Build;
diff --git a/termux-shared/src/main/java/com/termux/shared/terminal/io/TerminalExtraKeys.java b/termux-shared/src/main/java/com/termux/shared/termux/terminal/io/TerminalExtraKeys.java
similarity index 89%
rename from termux-shared/src/main/java/com/termux/shared/terminal/io/TerminalExtraKeys.java
rename to termux-shared/src/main/java/com/termux/shared/termux/terminal/io/TerminalExtraKeys.java
index faac49771d..f8d8cebaa2 100644
--- a/termux-shared/src/main/java/com/termux/shared/terminal/io/TerminalExtraKeys.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/terminal/io/TerminalExtraKeys.java
@@ -1,4 +1,4 @@
-package com.termux.shared.terminal.io;
+package com.termux.shared.termux.terminal.io;
 
 import android.view.KeyEvent;
 import android.view.View;
@@ -6,12 +6,12 @@
 
 import androidx.annotation.NonNull;
 
-import com.termux.shared.terminal.io.extrakeys.ExtraKeyButton;
-import com.termux.shared.terminal.io.extrakeys.ExtraKeysView;
-import com.termux.shared.terminal.io.extrakeys.SpecialButton;
+import com.termux.shared.termux.extrakeys.ExtraKeyButton;
+import com.termux.shared.termux.extrakeys.ExtraKeysView;
+import com.termux.shared.termux.extrakeys.SpecialButton;
 import com.termux.view.TerminalView;
 
-import static com.termux.shared.terminal.io.extrakeys.ExtraKeysConstants.PRIMARY_KEY_CODES_FOR_STRINGS;
+import static com.termux.shared.termux.extrakeys.ExtraKeysConstants.PRIMARY_KEY_CODES_FOR_STRINGS;
 
 
 public class TerminalExtraKeys implements ExtraKeysView.IExtraKeysView {

From aca0000ee6765fc1411bd7fd6c3020e89d0b3917 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Tue, 19 Oct 2021 18:17:08 +0500
Subject: [PATCH 609/912] Update LICENSE.md as per 5252fbbe

---
 LICENSE.md                                    |  2 +-
 termux-shared/LICENSE.md                      | 53 ++-----------------
 .../termux/shared/termux/TermuxConstants.java |  1 +
 .../properties/TermuxPropertyConstants.java   |  1 +
 4 files changed, 8 insertions(+), 49 deletions(-)

diff --git a/LICENSE.md b/LICENSE.md
index 36cd48f871..4b66170283 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -2,5 +2,5 @@ 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.
+- [Terminal Emulator for Android](https://github.com/jackpal/Android-Terminal-Emulator) code is used which is released under [Apache 2.0](https://www.apache.org/licenses/LICENSE-2.0) license. 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.
diff --git a/termux-shared/LICENSE.md b/termux-shared/LICENSE.md
index 64e552771a..8a9fca1413 100644
--- a/termux-shared/LICENSE.md
+++ b/termux-shared/LICENSE.md
@@ -1,55 +1,12 @@
-The `termux-shared` library is released under [GPLv3 only](https://www.gnu.org/licenses/gpl-3.0.html) license.
+The `termux-shared` library is released under [MIT](https://opensource.org/licenses/MIT) license.
 
 ### Exceptions
 
-#### [MIT License](https://opensource.org/licenses/MIT)
+#### [GPLv3 only](https://www.gnu.org/licenses/gpl-3.0.html)
 
-- [`src/main/java/com/termux/shared/termux/TermuxConstants.java`](src/main/java/com/termux/shared/termux/TermuxConstants.java).
-- [`src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java`](src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java).
+- [`src/main/java/com/termux/shared/termux/*`](src/main/java/com/termux/shared/termux).
 
-- [`src/main/java/com/termux/shared/activities/*`](src/main/java/com/termux/shared/activities).
-
-- [`src/main/java/com/termux/shared/crash/CrashHandler.java`](src/main/java/com/termux/shared/crash/CrashHandler.java).
-
-- [`src/main/java/com/termux/shared/data/DataUtils.java`](src/main/java/com/termux/shared/data/DataUtils.java).
-- [`src/main/java/com/termux/shared/data/IntentUtils.java`](src/main/java/com/termux/shared/data/IntentUtils.java).
-
-- [`src/main/java/com/termux/shared/file/filesystem/FileType.java`](src/main/java/com/termux/shared/file/filesystem/FileType.java).
-- [`src/main/java/com/termux/shared/file/filesystem/FileTypes.java`](src/main/java/com/termux/shared/file/filesystem/FileTypes.java).
-- [`src/main/java/com/termux/shared/file/filesystem/NativeDispatcher.java`](src/main/java/com/termux/shared/file/filesystem/NativeDispatcher.java).
-- [`src/main/java/com/termux/shared/file/tests/FileUtilsTests.java`](src/main/java/com/termux/shared/file/tests/FileUtilsTests.java).
-- [`src/main/java/com/termux/shared/file/FileUtils.java`](src/main/java/com/termux/shared/file/FileUtils.java).
-
-- [`src/main/java/com/termux/shared/interact/ShareUtils.java`](src/main/java/com/termux/shared/interact/ShareUtils.java).
-- [`src/main/java/com/termux/shared/interact/MessageDialogUtils.java`](src/main/java/com/termux/shared/interact/MessageDialogUtils.java).
-
-- [`src/main/java/com/termux/shared/logger/Logger.java`](src/main/java/com/termux/shared/logger/Logger.java).
-
-- [`src/main/java/com/termux/shared/markdown/MarkdownUtils.java`](src/main/java/com/termux/shared/markdown/MarkdownUtils.java).
-
-- [`src/main/java/com/termux/shared/models/*`](src/main/java/com/termux/shared/models).
-
-- [`src/main/java/com/termux/shared/notification/NotificationUtils.java`](src/main/java/com/termux/shared/notification/NotificationUtils.java).
-
-- [`src/main/java/com/termux/shared/settings/preferences/SharedPreferenceUtils.java`](src/main/java/com/termux/shared/settings/preferences/SharedPreferenceUtils.java).
-
-- [`src/main/java/com/termux/shared/settings/properties/SharedPropertiesParser.java`](src/main/java/com/termux/shared/settings/properties/SharedPropertiesParser.java).
-- [`src/main/java/com/termux/shared/settings/properties/SharedProperties.java`](src/main/java/com/termux/shared/settings/properties/SharedProperties.java).
-
-- [`src/main/java/com/termux/shared/shell/ResultSender.java`](src/main/java/com/termux/shared/shell/ResultSender.java).
-- [`src/main/java/com/termux/shared/shell/ShellEnvironmentClient.java`](src/main/java/com/termux/shared/shell/ShellEnvironmentClient.java).
-- [`src/main/java/com/termux/shared/shell/ShellUtils.java`](src/main/java/com/termux/shared/shell/ShellUtils.java).
-- [`src/main/java/com/termux/shared/shell/TermuxTask.java`](src/main/java/com/termux/shared/shell/TermuxTask.java).
-
-- [`src/main/java/com/termux/shared/termux/AndroidUtils.java`](src/main/java/com/termux/shared/termux/AndroidUtils.java).
-
-- [`src/main/java/com/termux/shared/view/KeyboardUtils.java`](src/main/java/com/termux/shared/view/KeyboardUtils.java).
-- [`src/main/java/com/termux/shared/view/ViewUtils.java`](src/main/java/com/termux/shared/view/ViewUtils.java).
-
-- [`src/main/res/drawable/*`](src/main/res/drawable).
-- [`src/main/res/layout/*`](src/main/res/layout).
-- [`src/main/res/menu/*`](src/main/res/menu).
-- [`src/main/res/values/*`](src/main/res/values).
+The `GPLv3 only` license applies to all files unless specifically specified by a file/directory, like the [`src/main/java/com/termux/shared/termux/TermuxConstants.java`](src/main/java/com/termux/shared/termux/TermuxConstants.java) and [`src/main/java/com/termux/shared/termux/settings/properties/TermuxPropertyConstants.java`](src/main/java/com/termux/shared/termux/settings/properties/TermuxPropertyConstants.java) files are released under the `MIT` license.
 ##
 
 
@@ -59,7 +16,7 @@ The `termux-shared` library is released under [GPLv3 only](https://www.gnu.org/l
 ##
 
 
-#### [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0)
+#### [Apache 2.0](https://www.apache.org/licenses/LICENSE-2.0)
 
 - [`src/main/java/com/termux/shared/shell/StreamGobbler.java`](src/main/java/com/termux/shared/shell/StreamGobbler.java) uses code from [libsuperuser ](https://github.com/Chainfire/libsuperuser).
 ##
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
index 65ec62f4ab..14b6327865 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
@@ -13,6 +13,7 @@
 
 /*
  * Version: v0.33.0
+ * SPDX-License-Identifier: MIT
  *
  * Changelog
  *
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxPropertyConstants.java b/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxPropertyConstants.java
index 8187104877..4762935e44 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxPropertyConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxPropertyConstants.java
@@ -17,6 +17,7 @@
 
 /*
  * Version: v0.15.0
+ * SPDX-License-Identifier: MIT
  *
  * Changelog
  *

From 3c202928b47f92dbc078e4796b69d9d57fe44a20 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 20 Oct 2021 17:32:28 +0500
Subject: [PATCH 610/912] Changed: Fix typos is PackageUtils

---
 .../termux/shared/packages/PackageUtils.java  | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/packages/PackageUtils.java b/termux-shared/src/main/java/com/termux/shared/packages/PackageUtils.java
index cdba0fd96e..20c888aa0c 100644
--- a/termux-shared/src/main/java/com/termux/shared/packages/PackageUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/packages/PackageUtils.java
@@ -254,9 +254,9 @@ public static int getTargetSDKForPackage(@NonNull final ApplicationInfo applicat
      * set.
      *
      * @param context The {@link Context} for the package.
-     * @return Returns the {@code versionName}. This will be {@code null} if an exception is raised.
+     * @return Returns {@code true} if app is debuggable, otherwise {@code false}.
      */
-    public static Boolean isAppForPackageADebuggableBuild(@NonNull final Context context) {
+    public static boolean isAppForPackageADebuggableBuild(@NonNull final Context context) {
         return isAppForPackageADebuggableBuild(context.getApplicationInfo());
     }
 
@@ -265,9 +265,9 @@ public static Boolean isAppForPackageADebuggableBuild(@NonNull final Context con
      * set.
      *
      * @param applicationInfo The {@link ApplicationInfo} for the package.
-     * @return Returns the {@code versionName}. This will be {@code null} if an exception is raised.
+     * @return Returns {@code true} if app is debuggable, otherwise {@code false}.
      */
-    public static Boolean isAppForPackageADebuggableBuild(@NonNull final ApplicationInfo applicationInfo) {
+    public static boolean isAppForPackageADebuggableBuild(@NonNull final ApplicationInfo applicationInfo) {
         return ( 0 != ( applicationInfo.flags & ApplicationInfo.FLAG_DEBUGGABLE ) );
     }
 
@@ -278,9 +278,9 @@ public static Boolean isAppForPackageADebuggableBuild(@NonNull final Application
      * set.
      *
      * @param context The {@link Context} for the package.
-     * @return Returns the {@code versionName}. This will be {@code null} if an exception is raised.
+     * @return Returns {@code true} if app is installed on external storage, otherwise {@code false}.
      */
-    public static Boolean isAppInstalledOnExternalStorage(@NonNull final Context context) {
+    public static boolean isAppInstalledOnExternalStorage(@NonNull final Context context) {
         return isAppInstalledOnExternalStorage(context.getApplicationInfo());
     }
 
@@ -289,9 +289,9 @@ public static Boolean isAppInstalledOnExternalStorage(@NonNull final Context con
      * set.
      *
      * @param applicationInfo The {@link ApplicationInfo} for the package.
-     * @return Returns the {@code versionName}. This will be {@code null} if an exception is raised.
+     * @return Returns {@code true} if app is installed on external storage, otherwise {@code false}.
      */
-    public static Boolean isAppInstalledOnExternalStorage(@NonNull final ApplicationInfo applicationInfo) {
+    public static boolean isAppInstalledOnExternalStorage(@NonNull final ApplicationInfo applicationInfo) {
         return ( 0 != ( applicationInfo.flags & ApplicationInfo.FLAG_EXTERNAL_STORAGE ) );
     }
 
@@ -328,7 +328,7 @@ public static Integer getVersionCodeForPackage(@NonNull final Context context, @
      */
     @Nullable
     public static Integer getVersionCodeForPackage(@Nullable final PackageInfo packageInfo) {
-        return packageInfo != null? packageInfo.versionCode : null;
+        return packageInfo != null ? packageInfo.versionCode : null;
     }
 
 
@@ -365,7 +365,7 @@ public static String getVersionNameForPackage(@NonNull final Context context, @N
      */
     @Nullable
     public static String getVersionNameForPackage(@Nullable final PackageInfo packageInfo) {
-        return packageInfo != null? packageInfo.versionName : null;
+        return packageInfo != null ? packageInfo.versionName : null;
     }
 
 

From f4a997b7ddc4d7c247af2f8747fe52330b641d69 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 21 Oct 2021 23:01:26 +0500
Subject: [PATCH 611/912] Added: Add ActivityUtils with functions to start
 activities for result

---
 .../shared/models/errors/FunctionErrno.java   |  1 +
 .../com/termux/shared/view/ActivityUtils.java | 86 +++++++++++++++++++
 termux-shared/src/main/res/values/strings.xml |  6 ++
 3 files changed, 93 insertions(+)
 create mode 100644 termux-shared/src/main/java/com/termux/shared/view/ActivityUtils.java

diff --git a/termux-shared/src/main/java/com/termux/shared/models/errors/FunctionErrno.java b/termux-shared/src/main/java/com/termux/shared/models/errors/FunctionErrno.java
index bade0e1d85..ff3759ccf4 100644
--- a/termux-shared/src/main/java/com/termux/shared/models/errors/FunctionErrno.java
+++ b/termux-shared/src/main/java/com/termux/shared/models/errors/FunctionErrno.java
@@ -12,6 +12,7 @@ public class FunctionErrno extends Errno {
     public static final Errno ERRNO_UNSET_PARAMETER = new Errno(TYPE, 102, "The %1$s parameter passed to \"%2$s\" must be set.");
     public static final Errno ERRNO_UNSET_PARAMETERS = new Errno(TYPE, 103, "The %1$s parameters passed to \"%2$s\" must be set.");
     public static final Errno ERRNO_INVALID_PARAMETER = new Errno(TYPE, 104, "The %1$s parameter passed to \"%2$s\" is invalid.\"%3$s\"");
+    public static final Errno ERRNO_PARAMETER_NOT_INSTANCE_OF = new Errno(TYPE, 104, "The %1$s parameter passed to \"%2$s\" is not an instance of %3$s.");
 
 
     FunctionErrno(final String type, final int code, final String message) {
diff --git a/termux-shared/src/main/java/com/termux/shared/view/ActivityUtils.java b/termux-shared/src/main/java/com/termux/shared/view/ActivityUtils.java
new file mode 100644
index 0000000000..963d597020
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/view/ActivityUtils.java
@@ -0,0 +1,86 @@
+package com.termux.shared.view;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+
+import com.termux.shared.R;
+import com.termux.shared.logger.Logger;
+import com.termux.shared.models.errors.Error;
+import com.termux.shared.models.errors.FunctionErrno;
+
+
+public class ActivityUtils {
+
+    private static final String LOG_TAG = "ActivityUtils";
+
+    /**
+     * Wrapper for {@link #startActivityForResult(Context, int, Intent, boolean, boolean, ActivityResultLauncher)}.
+     */
+    public static boolean startActivityForResult(Context context, int requestCode, @NonNull Intent intent) {
+        return startActivityForResult(context, requestCode, intent, true, true, null);
+    }
+
+    /**
+     * Wrapper for {@link #startActivityForResult(Context, int, Intent, boolean, boolean, ActivityResultLauncher)}.
+     */
+    public static boolean startActivityForResult(Context context, int requestCode, @NonNull Intent intent, boolean logErrorMessage, boolean showErrorMessage) {
+        return startActivityForResult(context, requestCode, intent, logErrorMessage, showErrorMessage, null);
+    }
+
+    /**
+     * Start an {@link Activity} for result.
+     *
+     * @param context The context for operations. It must be an instance of {@link Activity} or
+     *               {@link AppCompatActivity}. It is ignored if {@code activityResultLauncher}
+     *                is not {@code null}.
+     * @param requestCode The request code to use while sending intent. This must be >= 0, otherwise
+     *                    exception will be raised. This is ignored if {@code activityResultLauncher}
+     *                    is {@code null}.
+     * @param intent The {@link Intent} to send to start the activity.
+     * @param logErrorMessage If an error message should be logged if failed to start activity.
+     * @param showErrorMessage If an error message toast should be shown if failed to start activity
+     *                         in addition to logging a message.
+     * @param activityResultLauncher The {@link ActivityResultLauncher<Intent>} to use for start the
+     *                               activity. If this is {@code null}, then
+     *                               {@link Activity#startActivity(Intent)} will be used instead.
+     *                               Note that later is deprecated.
+     * @return Returns {@code true} if starting activity was successful, otherwise {@code false}.
+     */
+    public static boolean startActivityForResult(@NonNull Context context, int requestCode, @NonNull Intent intent,
+                                                 boolean logErrorMessage, boolean showErrorMessage, @Nullable ActivityResultLauncher<Intent> activityResultLauncher) {
+        try {
+            if (activityResultLauncher != null) {
+                activityResultLauncher.launch(intent);
+            } else {
+                if (context instanceof AppCompatActivity)
+                    ((AppCompatActivity) context).startActivityForResult(intent, requestCode);
+                else if (context instanceof Activity)
+                    ((Activity) context).startActivityForResult(intent, requestCode);
+                else {
+                    if (logErrorMessage)
+                        Error.logErrorAndShowToast(showErrorMessage ? context : null, LOG_TAG,
+                            FunctionErrno.ERRNO_PARAMETER_NOT_INSTANCE_OF.getError("context", "startActivityForResult", "Activity or AppCompatActivity"));
+                    return false;
+                }
+            }
+        } catch (Exception e) {
+            if (logErrorMessage) {
+                String activityName = intent.getComponent() != null ? intent.getComponent().getShortClassName() : "Unknown";
+                String errmsg = context.getString(R.string.error_failed_to_start_activity_for_result, activityName);
+                Logger.logStackTraceWithMessage(LOG_TAG, errmsg, e);
+                if (showErrorMessage)
+                    Logger.showToast(context, errmsg + ": " + e.getMessage(), true);
+            }
+            return false;
+        }
+
+        return true;
+    }
+
+}
diff --git a/termux-shared/src/main/res/values/strings.xml b/termux-shared/src/main/res/values/strings.xml
index 06433ecb24..074ce95943 100644
--- a/termux-shared/src/main/res/values/strings.xml
+++ b/termux-shared/src/main/res/values/strings.xml
@@ -18,6 +18,12 @@
 
 
 
+    <!-- ActivityUtils -->
+    <string name="error_failed_to_start_activity">Failed to start %1$s activity</string>
+    <string name="error_failed_to_start_activity_for_result">Failed to start %1$s activity for result</string>
+
+
+
     <!-- PackageUtils -->
     <string name="error_app_not_installed_or_disabled_warning">The %1$s (%2$s) app is not installed or is disabled."</string>
     <string name="error_get_package_context_failed_title">Failed To Get Package Context</string>

From 50a97b1977fd3a8881e0f69ef81894cb4d173ba3 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 21 Oct 2021 23:05:45 +0500
Subject: [PATCH 612/912] Added: Add ReflectionUtils and add dependency for
 org.lsposed.hiddenapibypass:hiddenapibypass

The call to bypassHiddenAPIReflectionRestrictions() must be made before trying to reflect hidden or non-sdk APIs.

Reflection will be used for accessing hidden (@hide) APIs by Termux and its plugins later.

https://github.com/LSPosed/AndroidHiddenApiBypass
https://developer.android.com/guide/app-compatibility/restrictions-non-sdk-interfaces
---
 termux-shared/build.gradle                    |   1 +
 .../shared/reflection/ReflectionUtils.java    | 275 ++++++++++++++++++
 2 files changed, 276 insertions(+)
 create mode 100644 termux-shared/src/main/java/com/termux/shared/reflection/ReflectionUtils.java

diff --git a/termux-shared/build.gradle b/termux-shared/build.gradle
index 297e115791..4883864e6f 100644
--- a/termux-shared/build.gradle
+++ b/termux-shared/build.gradle
@@ -14,6 +14,7 @@ android {
         implementation "io.noties.markwon:ext-strikethrough:$markwonVersion"
         implementation "io.noties.markwon:linkify:$markwonVersion"
         implementation "io.noties.markwon:recycler:$markwonVersion"
+        implementation 'org.lsposed.hiddenapibypass:hiddenapibypass:2.0'
 
         // Do not increment version higher than 1.0.0-alpha09 since it will break ViewUtils and needs to be looked into
         // noinspection GradleDependency
diff --git a/termux-shared/src/main/java/com/termux/shared/reflection/ReflectionUtils.java b/termux-shared/src/main/java/com/termux/shared/reflection/ReflectionUtils.java
new file mode 100644
index 0000000000..d4f2ac2876
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/reflection/ReflectionUtils.java
@@ -0,0 +1,275 @@
+package com.termux.shared.reflection;
+
+import android.os.Build;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.termux.shared.logger.Logger;
+
+import org.lsposed.hiddenapibypass.HiddenApiBypass;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.Arrays;
+
+public class ReflectionUtils {
+
+    private static boolean HIDDEN_API_REFLECTION_RESTRICTIONS_BYPASSED = Build.VERSION.SDK_INT < Build.VERSION_CODES.P;
+
+    private static final String LOG_TAG = "ReflectionUtils";
+
+    /**
+     * Bypass android hidden API reflection restrictions.
+     * https://github.com/LSPosed/AndroidHiddenApiBypass
+     * https://developer.android.com/guide/app-compatibility/restrictions-non-sdk-interfaces
+     */
+    public static void bypassHiddenAPIReflectionRestrictions() {
+        if (!HIDDEN_API_REFLECTION_RESTRICTIONS_BYPASSED && Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+            Logger.logDebug(LOG_TAG, "Bypassing android hidden api reflection restrictions");
+            HiddenApiBypass.addHiddenApiExemptions("");
+            HIDDEN_API_REFLECTION_RESTRICTIONS_BYPASSED = true;
+        }
+    }
+
+    /** Check if android hidden API reflection restrictions are bypassed. */
+    public static boolean areHiddenAPIReflectionRestrictionsBypassed() {
+        return HIDDEN_API_REFLECTION_RESTRICTIONS_BYPASSED;
+    }
+
+
+
+
+
+    /**
+     * Get a {@link Field} for the specified class.
+     *
+     * @param clazz The {@link Class} for which to return the field.
+     * @param fieldName The name of the {@link Field}.
+     * @return Returns the {@link Field} if getting the it was successful, otherwise {@code null}.
+     */
+    @Nullable
+    public static Field getDeclaredField(@NonNull Class<?> clazz, @NonNull String fieldName) {
+        try {
+            Field field = clazz.getDeclaredField(fieldName);
+            field.setAccessible(true);
+            return field;
+        } catch (Exception e) {
+            Logger.logStackTraceWithMessage(LOG_TAG, "Failed to get \"" + fieldName + "\" field for \"" + clazz.getName() + "\" class", e);
+            return null;
+        }
+    }
+
+
+
+    /** Class that represents result of invoking a field. */
+    public static class FieldInvokeResult {
+        public boolean success;
+        public Object value;
+
+        FieldInvokeResult(boolean success, Object value) {
+            this.value = success;
+            this.value = value;
+        }
+    }
+
+    /**
+     * Get a value for a {@link Field} of an object for the specified class.
+     *
+     * @param clazz The {@link Class} to which the object belongs to.
+     * @param fieldName The name of the {@link Field}.
+     * @param object The {@link Object} instance from which to get the field value.
+     * @return Returns the {@link FieldInvokeResult} of invoking the field. The
+     * {@link FieldInvokeResult#success} will be {@code true} if invoking the field was successful,
+     * otherwise {@code false}. The {@link FieldInvokeResult#value} will contain the field
+     * {@link Object} value.
+     */
+    @NonNull
+    public static <T> FieldInvokeResult invokeField(@NonNull Class<T> clazz, @NonNull String fieldName, T object) {
+        try {
+            Field field = getDeclaredField(clazz, fieldName);
+            if (field == null) return new FieldInvokeResult(false, null);
+            return new FieldInvokeResult(true, field.get(object));
+        } catch (Exception e) {
+            Logger.logStackTraceWithMessage(LOG_TAG, "Failed to get \"" + fieldName + "\" field value for \"" + clazz.getName() + "\" class", e);
+            return new FieldInvokeResult(false, null);
+        }
+    }
+
+
+
+
+
+    /**
+     * Wrapper for {@link #getDeclaredMethod(Class, String, Class[])} without parameters.
+     */
+    @Nullable
+    public static Method getDeclaredMethod(@NonNull Class<?> clazz, @NonNull String methodName) {
+        return getDeclaredMethod(clazz, methodName, new Class<?>[0]);
+    }
+
+    /**
+     * Get a {@link Method} for the specified class with the specified parameters.
+     *
+     * @param clazz The {@link Class} for which to return the method.
+     * @param methodName The name of the {@link Method}.
+     * @param parameterTypes The parameter types of the method.
+     * @return Returns the {@link Method} if getting the it was successful, otherwise {@code null}.
+     */
+    @Nullable
+    public static Method getDeclaredMethod(@NonNull Class<?> clazz, @NonNull String methodName, Class<?>... parameterTypes) {
+        try {
+            Method method = clazz.getDeclaredMethod(methodName, parameterTypes);
+            method.setAccessible(true);
+            return method;
+        } catch (Exception e) {
+            Logger.logStackTraceWithMessage(LOG_TAG, "Failed to get \"" + methodName + "\" method for \"" + clazz.getName() + "\" class with parameter types: " + Arrays.toString(parameterTypes), e);
+            return null;
+        }
+    }
+
+
+
+    /**
+     * Wrapper for {@link #invokeVoidMethod(Method, Object, Object...)} without arguments.
+     */
+    public static boolean invokeVoidMethod(@NonNull Method method, Object obj) {
+        return invokeVoidMethod(method, obj, new Object[0]);
+    }
+
+    /**
+     * Invoke a {@link Method} on the specified object with the specified arguments that returns
+     * {@code void}.
+     *
+     * @param method The {@link Method} to invoke.
+     * @param obj The {@link Object} the method should be invoked from.
+     * @param args The arguments to pass to the method.
+     * @return Returns {@code true} if invoking the method was successful, otherwise {@code false}.
+     */
+    public static boolean invokeVoidMethod(@NonNull Method method, Object obj, Object... args) {
+        try {
+            method.setAccessible(true);
+            method.invoke(obj, args);
+            return true;
+        } catch (Exception e) {
+            Logger.logStackTraceWithMessage(LOG_TAG, "Failed to invoke \"" + method.getName() + "\" method with object \"" + obj + "\" and args: " + Arrays.toString(args), e);
+            return false;
+        }
+    }
+
+
+
+    /** Class that represents result of invoking a method that has a non-void return type. */
+    public static class MethodInvokeResult {
+        public boolean success;
+        public Object value;
+
+        MethodInvokeResult(boolean success, Object value) {
+            this.value = success;
+            this.value = value;
+        }
+    }
+
+    /**
+     * Wrapper for {@link #invokeMethod(Method, Object, Object...)} without arguments.
+     */
+    @NonNull
+    public static MethodInvokeResult invokeMethod(@NonNull Method method, Object obj) {
+        return invokeMethod(method, obj, new Object[0]);
+    }
+
+    /**
+     * Invoke a {@link Method} on the specified object with the specified arguments.
+     *
+     * @param method The {@link Method} to invoke.
+     * @param obj The {@link Object} the method should be invoked from.
+     * @param args The arguments to pass to the method.
+     * @return Returns the {@link MethodInvokeResult} of invoking the method. The
+     * {@link MethodInvokeResult#success} will be {@code true} if invoking the method was successful,
+     * otherwise {@code false}. The {@link MethodInvokeResult#value} will contain the {@link Object}
+     * returned by the method.
+     */
+    @NonNull
+    public static MethodInvokeResult invokeMethod(@NonNull Method method, Object obj, Object... args) {
+        try {
+            method.setAccessible(true);
+            return new MethodInvokeResult(true, method.invoke(obj, args));
+        } catch (Exception e) {
+            Logger.logStackTraceWithMessage(LOG_TAG, "Failed to invoke \"" + method.getName() + "\" method with object \"" + obj + "\" and args: " + Arrays.toString(args), e);
+            return new MethodInvokeResult(false, null);
+        }
+    }
+
+
+
+    /**
+     * Wrapper for {@link #getConstructor(String, Class[])} without parameters.
+     */
+    @Nullable
+    public static Constructor<?> getConstructor(@NonNull String className) {
+        return getConstructor(className, new Class<?>[0]);
+    }
+
+    /**
+     * Wrapper for {@link #getConstructor(Class, Class[])} to get a {@link Constructor} for the
+     * {@code className}.
+     */
+    @Nullable
+    public static Constructor<?> getConstructor(@NonNull String className, Class<?>... parameterTypes) {
+        try {
+            return getConstructor(Class.forName(className), parameterTypes);
+        } catch (Exception e) {
+            Logger.logStackTraceWithMessage(LOG_TAG, "Failed to get constructor for \"" + className + "\" class with parameter types: " + Arrays.toString(parameterTypes), e);
+            return null;
+        }
+    }
+
+    /**
+     * Get a {@link Constructor} for the specified class with the specified parameters.
+     *
+     * @param clazz The {@link Class} for which to return the constructor.
+     * @param parameterTypes The parameter types of the constructor.
+     * @return Returns the {@link Constructor} if getting the it was successful, otherwise {@code null}.
+     */
+    @Nullable
+    public static Constructor<?> getConstructor(@NonNull Class<?> clazz, Class<?>... parameterTypes) {
+        try {
+            Constructor<?> constructor = clazz.getConstructor(parameterTypes);
+            constructor.setAccessible(true);
+            return constructor;
+        } catch (Exception e) {
+            Logger.logStackTraceWithMessage(LOG_TAG, "Failed to get constructor for \"" + clazz.getName() + "\" class with parameter types: " + Arrays.toString(parameterTypes), e);
+            return null;
+        }
+    }
+
+
+
+    /**
+     * Wrapper for {@link #invokeConstructor(Constructor, Object...)} without arguments.
+     */
+    @Nullable
+    public static Object invokeConstructor(@NonNull Constructor<?> constructor) {
+        return invokeConstructor(constructor, new Object[0]);
+    }
+
+    /**
+     * Invoke a {@link Constructor} with the specified arguments.
+     *
+     * @param constructor The {@link Constructor} to invoke.
+     * @param args The arguments to pass to the constructor.
+     * @return Returns the new instance if invoking the constructor was successful, otherwise {@code null}.
+     */
+    @Nullable
+    public static Object invokeConstructor(@NonNull Constructor<?> constructor, Object... args) {
+        try {
+            constructor.setAccessible(true);
+            return constructor.newInstance(args);
+        } catch (Exception e) {
+            Logger.logStackTraceWithMessage(LOG_TAG, "Failed to invoke \"" + constructor.getName() + "\" constructor with args: " + Arrays.toString(args), e);
+            return null;
+        }
+    }
+
+}

From 32dd7eab03ad252c5669b64529e39807088f607c Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 21 Oct 2021 23:10:00 +0500
Subject: [PATCH 613/912] Changed|Fixed: Add java docs to PermissionUtils and
 fix permission checking

ContextCompat.checkSelfPermission() may return true for permissions not even requested so it now checked if permissions are even requested in app manifest before checking if they are granted and before asking for permission to be granted.

Also some general improvements in code quality, including using ActivityUtils to request non-standard permissions and added support for AppCompatActivity instances to request permissions in addition to Activity instances.
---
 .../shared/packages/PermissionUtils.java      | 232 +++++++++++++++---
 termux-shared/src/main/res/values/strings.xml |   6 +-
 2 files changed, 205 insertions(+), 33 deletions(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/packages/PermissionUtils.java b/termux-shared/src/main/java/com/termux/shared/packages/PermissionUtils.java
index 8752a0a9c6..e422ff42b5 100644
--- a/termux-shared/src/main/java/com/termux/shared/packages/PermissionUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/packages/PermissionUtils.java
@@ -1,21 +1,32 @@
 package com.termux.shared.packages;
 
+import android.Manifest;
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Build;
 import android.os.PowerManager;
 import android.provider.Settings;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.content.ContextCompat;
 
+import com.google.common.base.Joiner;
 import com.termux.shared.R;
 import com.termux.shared.logger.Logger;
+import com.termux.shared.models.errors.Error;
+import com.termux.shared.models.errors.FunctionErrno;
+import com.termux.shared.view.ActivityUtils;
 
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
 
 public class PermissionUtils {
 
@@ -27,66 +38,206 @@ public class PermissionUtils {
     private static final String LOG_TAG = "PermissionUtils";
 
 
-    public static boolean checkPermission(Context context, String permission) {
-        if (permission == null) return false;
+    /**
+     * Check if app has been granted the required permission.
+     *
+     * @param context The context for operations.
+     * @param permission The {@link String} name for permission to check.
+     * @return Returns {@code true} if permission is granted, otherwise {@code false}.
+     */
+    public static boolean checkPermission(@NonNull Context context, @NonNull String permission) {
         return checkPermissions(context, new String[]{permission});
     }
 
-    public static boolean checkPermissions(Context context, String[] permissions) {
-        if (permissions == null) return false;
+    /**
+     * Check if app has been granted the required permissions.
+     *
+     * @param context The context for operations.
+     * @param permissions The {@link String[]} names for permissions to check.
+     * @return Returns {@code true} if permissions are granted, otherwise {@code false}.
+     */
+    public static boolean checkPermissions(@NonNull Context context, @NonNull String[] permissions) {
+        // checkSelfPermission may return true for permissions not even requested
+        List<String> permissionsNotRequested = getPermissionsNotRequested(context, permissions);
+        if (permissionsNotRequested.size() > 0) {
+            Logger.logError(LOG_TAG,
+                context.getString(R.string.error_attempted_to_check_for_permissions_not_requested,
+                    Joiner.on(", ").join(permissionsNotRequested)));
+            return false;
+        }
 
         int result;
-        for (String p:permissions) {
-            result = ContextCompat.checkSelfPermission(context,p);
+        for (String permission : permissions) {
+            result = ContextCompat.checkSelfPermission(context, permission);
             if (result != PackageManager.PERMISSION_GRANTED) {
                 return false;
             }
         }
+
         return true;
     }
 
 
 
-    public static void requestPermission(Activity activity, String permission, int requestCode) {
-        if (permission == null) return;
-        requestPermissions(activity, new String[]{permission}, requestCode);
+    /**
+     * Request user to grant required permissions to the app.
+     *
+     * @param context The context for operations. It must be an instance of {@link Activity} or
+     * {@link AppCompatActivity}.
+     * @param permission The {@link String} name for permission to request.
+     * @param requestCode The request code to use while asking for permission. It must be `>=0` or
+     *                    will fail silently and will log an exception.
+     * @return Returns {@code true} if requesting the permission was successful, otherwise {@code false}.
+     */
+    public static boolean requestPermission(@NonNull Context context, @NonNull String permission,
+                                            int requestCode) {
+        return requestPermissions(context, new String[]{permission}, requestCode);
     }
 
-    public static void requestPermissions(Activity activity, String[] permissions, int requestCode) {
-        if (activity == null || permissions == null) return;
-
-        int result;
-        Logger.showToast(activity, activity.getString(R.string.message_sudo_please_grant_permissions), true);
-        try {Thread.sleep(1000);} catch (InterruptedException e) {e.printStackTrace();}
+    /**
+     * Request user to grant required permissions to the app.
+     *
+     * On sdk 30 (android 11), Activity.onRequestPermissionsResult() will pass
+     * {@link PackageManager#PERMISSION_DENIED} (-1) without asking the user for the permission
+     * if user previously denied the permission prompt. On sdk 29 (android 10),
+     * Activity.onRequestPermissionsResult() will pass {@link PackageManager#PERMISSION_DENIED} (-1)
+     * without asking the user for the permission if user previously selected "Deny & don't ask again"
+     * option in prompt. The user will have to manually enable permission in app info in Android
+     * settings. If user grants and then denies in settings, then next time prompt will shown.
+     *
+     * @param context The context for operations. It must be an instance of {@link Activity} or
+     * {@link AppCompatActivity}.
+     * @param permissions The {@link String[]} names for permissions to request.
+     * @param requestCode The request code to use while asking for permissions. It must be `>=0` or
+     *                    will fail silently and will log an exception.
+     * @return Returns {@code true} if requesting the permissions was successful, otherwise {@code false}.
+     */
+    public static boolean requestPermissions(@NonNull Context context, @NonNull String[] permissions,
+                                             int requestCode) {
+        List<String> permissionsNotRequested = getPermissionsNotRequested(context, permissions);
+        if (permissionsNotRequested.size() > 0) {
+            Logger.logErrorAndShowToast(context, LOG_TAG,
+                context.getString(R.string.error_attempted_to_ask_for_permissions_not_requested,
+                    Joiner.on(", ").join(permissionsNotRequested)));
+            return false;
+        }
 
-        for (String permission:permissions) {
-            result = ContextCompat.checkSelfPermission(activity, permission);
+        for (String permission : permissions) {
+            int result = ContextCompat.checkSelfPermission(context, permission);
+            // If at least one permission not granted
             if (result != PackageManager.PERMISSION_GRANTED) {
-                Logger.logDebug(LOG_TAG, "Requesting Permissions: " + Arrays.toString(permissions));
+                Logger.logInfo(LOG_TAG, "Requesting Permissions: " + Arrays.toString(permissions));
+
                 try {
-                    activity.requestPermissions(new String[]{permission}, requestCode);
+                    if (context instanceof AppCompatActivity)
+                        ((AppCompatActivity) context).requestPermissions(new String[]{permission}, requestCode);
+                    else if (context instanceof Activity)
+                        ((Activity) context).requestPermissions(new String[]{permission}, requestCode);
+                    else {
+                        Error.logErrorAndShowToast(context, LOG_TAG,
+                            FunctionErrno.ERRNO_PARAMETER_NOT_INSTANCE_OF.getError("context", "requestPermissions", "Activity or AppCompatActivity"));
+                        return false;
+                    }
                 } catch (Exception e) {
-                    Logger.logStackTraceWithMessage(LOG_TAG, "Failed to request permissions with request code " + requestCode + ": " + Arrays.toString(permissions), e);
+                    String errmsg = context.getString(R.string.error_failed_to_request_permissions, requestCode, Arrays.toString(permissions));
+                    Logger.logStackTraceWithMessage(LOG_TAG, errmsg, e);
+                    Logger.showToast(context, errmsg + "\n" + e.getMessage(), true);
+                    return false;
                 }
             }
         }
+
+        return true;
     }
 
 
 
-    public static boolean checkDisplayOverOtherAppsPermission(Context context) {
+
+    /**
+     * Check if app has requested the required permission in the manifest.
+     *
+     * @param context The context for operations.
+     * @param permission The {@link String} name for permission to check.
+     * @return Returns {@code true} if permission has been requested, otherwise {@code false}.
+     */
+    public static boolean isPermissionRequested(@NonNull Context context, @NonNull String permission) {
+        return getPermissionsNotRequested(context, new String[]{permission}).size() == 0;
+    }
+
+    /**
+     * Check if app has requested the required permissions or not in the manifest.
+     *
+     * @param context The context for operations.
+     * @param permissions The {@link String[]} names for permissions to check.
+     * @return Returns {@link List<String>} of permissions that have not been requested. It will have
+     * size 0 if all permissions have been requested.
+     */
+    @NonNull
+    public static List<String> getPermissionsNotRequested(@NonNull Context context, @NonNull String[] permissions) {
+        List<String> permissionsNotRequested = new ArrayList<>();
+        Collections.addAll(permissionsNotRequested, permissions);
+
+        PackageInfo packageInfo = PackageUtils.getPackageInfoForPackage(context, PackageManager.GET_PERMISSIONS);
+        if (packageInfo == null) {
+            return permissionsNotRequested;
+        }
+
+        // If no permissions are requested, then nothing to check
+        if (packageInfo.requestedPermissions == null || packageInfo.requestedPermissions.length == 0)
+            return permissionsNotRequested;
+
+        List<String> requestedPermissionsList = Arrays.asList(packageInfo.requestedPermissions);
+        for (String permission : permissions) {
+            if (requestedPermissionsList.contains(permission)) {
+                permissionsNotRequested.remove(permission);
+            }
+        }
+
+        return permissionsNotRequested;
+    }
+
+
+
+
+
+    /**
+     * Check if {@link Manifest.permission#SYSTEM_ALERT_WINDOW} permission has been granted.
+     *
+     * @param context The context for operations.
+     * @return Returns {@code true} if permission is granted, otherwise {@code false}.
+     */
+    public static boolean checkDisplayOverOtherAppsPermission(@NonNull Context context) {
         return Settings.canDrawOverlays(context);
     }
 
-    public static void requestDisplayOverOtherAppsPermission(Activity context, int requestCode) {
-        Intent intent = new Intent(Settings.ACTION_MANAGE_OVERLAY_PERMISSION, Uri.parse("package:" + context.getPackageName()));
-        context.startActivityForResult(intent, requestCode);
+    /**
+     * Request user to grant {@link Manifest.permission#SYSTEM_ALERT_WINDOW} permission to the app.
+     *
+     * @param context The context for operations. It must be an instance of {@link Activity} or
+     * {@link AppCompatActivity}.
+     * @param requestCode The request code to use while asking for permission. It must be `>=0` or
+     *                    will fail silently and will log an exception.
+     * @return Returns {@code true} if requesting the permission was successful, otherwise {@code false}.
+     */
+    public static boolean requestDisplayOverOtherAppsPermission(@NonNull Context context, int requestCode) {
+        Intent intent = new Intent(Settings.ACTION_MANAGE_OVERLAY_PERMISSION);
+        intent.setData(Uri.parse("package:" + context.getPackageName()));
+        return ActivityUtils.startActivityForResult(context, requestCode, intent);
     }
 
-    public static boolean validateDisplayOverOtherAppsPermissionForPostAndroid10(Context context, boolean logResults) {
+    /**
+     * Check if running on sdk 29 (android 10) or higher and {@link Manifest.permission#SYSTEM_ALERT_WINDOW}
+     * permission has been granted or not.
+     *
+     * @param context The context for operations.
+     * @param logResults If it should be logged that permission has been granted or not.
+     * @return Returns {@code true} if permission is granted, otherwise {@code false}.
+     */
+    public static boolean validateDisplayOverOtherAppsPermissionForPostAndroid10(@NonNull Context context,
+                                                                                 boolean logResults) {
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) return true;
-        
-        if (!PermissionUtils.checkDisplayOverOtherAppsPermission(context)) {
+
+        if (!checkDisplayOverOtherAppsPermission(context)) {
             if (logResults)
                 Logger.logWarn(LOG_TAG, context.getPackageName() + " does not have Display over other apps (SYSTEM_ALERT_WINDOW) permission");
             return false;
@@ -99,16 +250,35 @@ public static boolean validateDisplayOverOtherAppsPermissionForPostAndroid10(Con
 
 
 
-    public static boolean checkIfBatteryOptimizationsDisabled(Context context) {
+
+
+    /**
+     * Check if {@link Manifest.permission#REQUEST_IGNORE_BATTERY_OPTIMIZATIONS} permission has been
+     * granted.
+     *
+     * @param context The context for operations.
+     * @return Returns {@code true} if permission is granted, otherwise {@code false}.
+     */
+    public static boolean checkIfBatteryOptimizationsDisabled(@NonNull Context context) {
         PowerManager powerManager = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
         return powerManager.isIgnoringBatteryOptimizations(context.getPackageName());
     }
 
+    /**
+     * Request user to grant {@link Manifest.permission#REQUEST_IGNORE_BATTERY_OPTIMIZATIONS}
+     * permission to the app.
+     *
+     * @param context The context for operations. It must be an instance of {@link Activity} or
+     * {@link AppCompatActivity}.
+     * @param requestCode The request code to use while asking for permission. It must be `>=0` or
+     *                    will fail silently and will log an exception.
+     * @return Returns {@code true} if requesting the permission was successful, otherwise {@code false}.
+     */
     @SuppressLint("BatteryLife")
-    public static void requestDisableBatteryOptimizations(Activity activity, int requestCode) {
+    public static boolean requestDisableBatteryOptimizations(@NonNull Context context, int requestCode) {
         Intent intent = new Intent(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS);
-        intent.setData(Uri.parse("package:" + activity.getPackageName()));
-        activity.startActivityForResult(intent, requestCode);
+        intent.setData(Uri.parse("package:" + context.getPackageName()));
+        return ActivityUtils.startActivityForResult(context, requestCode, intent);
     }
 
 }
diff --git a/termux-shared/src/main/res/values/strings.xml b/termux-shared/src/main/res/values/strings.xml
index 074ce95943..0c351a5d6b 100644
--- a/termux-shared/src/main/res/values/strings.xml
+++ b/termux-shared/src/main/res/values/strings.xml
@@ -36,9 +36,11 @@
 
 
 
-
     <!-- PermissionUtils -->
-    <string name="message_sudo_please_grant_permissions">Please grant permissions on next screen</string>
+    <string name="message_sudo_please_grant_permissions">Please grant requested permission(s)</string>
+    <string name="error_failed_to_request_permissions">Failed to request permissions with request code %1$d: %2$s</string>
+    <string name="error_attempted_to_check_for_permissions_not_requested">Attempted to check for permissions that have not been requested in app manifest: %1$s</string>
+    <string name="error_attempted_to_ask_for_permissions_not_requested">Attempted to ask for permissions that have not been requested in app manifest: %1$s</string>
 
 
 

From 9eeb2babd7638f8b2967ebd93020e7e37d19cc2b Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 21 Oct 2021 23:16:06 +0500
Subject: [PATCH 614/912] Added: Add support for MANAGE_EXTERNAL_STORAGE when
 targeting targetSdkVersion 30

Termux will now automatically request legacy `WRITE_EXTERNAL_STORAGE` or `MANAGE_EXTERNAL_STORAGE` permissions if targeting targetSdkVersion `30` (android `11`) and running on sdk `30` (android `11`) and higher when `termux-setup-storage` is run.

Functions have been added to `PermissionUtils` to automatically check and request either permission depending on app `targetSdkVersion` and android version. Functions have been added to `PackagUtils` to get `requestLegacyExternalStorage` value from app manifest if added. If legacy storage is possible, then it must be set to `true`. Check `PermissionUtils.checkAndRequestLegacyOrManageExternalStoragePermission()`, `PermissionUtils.isLegacyExternalStoragePossible()` and `PermissionUtils.checkIfHasRequestedLegacyExternalStorage()` for details.
---
 app/src/main/AndroidManifest.xml              |   3 +
 .../java/com/termux/app/TermuxActivity.java   |  58 +++--
 .../termux/shared/packages/PackageUtils.java  |  97 +++++++-
 .../shared/packages/PermissionUtils.java      | 211 ++++++++++++++++++
 termux-shared/src/main/res/values/strings.xml |   4 +
 5 files changed, 352 insertions(+), 21 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d43f17c302..988c0f4719 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -22,7 +22,9 @@
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" tools:ignore="ScopedStorage" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
@@ -41,6 +43,7 @@
         android:extractNativeLibs="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/application_name"
+        android:requestLegacyExternalStorage="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="false"
         android:theme="@style/Theme.Termux">
diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index 524cc93155..2c0797ec92 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -1,6 +1,5 @@
 package com.termux.app;
 
-import android.Manifest;
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -11,7 +10,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;
@@ -35,6 +33,7 @@
 import com.termux.R;
 import com.termux.app.terminal.TermuxActivityRootView;
 import com.termux.shared.activities.ReportActivity;
+import com.termux.shared.data.IntentUtils;
 import com.termux.shared.packages.PermissionUtils;
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.termux.TermuxConstants.TERMUX_APP.TERMUX_ACTIVITY;
@@ -63,6 +62,8 @@
 import androidx.drawerlayout.widget.DrawerLayout;
 import androidx.viewpager.widget.ViewPager;
 
+import java.util.Arrays;
+
 /**
  * A terminal emulator activity.
  * <p/>
@@ -712,25 +713,49 @@ private void requestAutoFill() {
 
 
     /**
-     * For processes to access shared internal storage (/sdcard) we need this permission.
+     * For processes to access primary external storage (/sdcard, /storage/emulated/0, ~/storage/shared),
+     * termux needs to be granted legacy WRITE_EXTERNAL_STORAGE or MANAGE_EXTERNAL_STORAGE permissions
+     * if targeting targetSdkVersion 30 (android 11) and running on sdk 30 (android 11) and higher.
      */
-    public boolean ensureStoragePermissionGranted() {
-        if (PermissionUtils.checkPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE)) {
-            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);
-            return false;
+    public void requestStoragePermission(boolean isPermissionCallback) {
+         new Thread() {
+            @Override
+            public void run() {
+                // Do not ask for permission again
+                int requestCode = isPermissionCallback ? -1 : PermissionUtils.REQUEST_GRANT_STORAGE_PERMISSION;
+
+                // If permission is granted, then also setup storage symlinks.
+                if(PermissionUtils.checkAndRequestLegacyOrManageExternalStoragePermission(
+                    TermuxActivity.this, requestCode, !isPermissionCallback)) {
+                    if (isPermissionCallback)
+                        Logger.logInfoAndShowToast(TermuxActivity.this, LOG_TAG,
+                            getString(com.termux.shared.R.string.msg_storage_permission_granted_on_request));
+
+                    TermuxInstaller.setupStorageSymlinks(TermuxActivity.this);
+                } else {
+                    if (isPermissionCallback)
+                        Logger.logInfoAndShowToast(TermuxActivity.this, LOG_TAG,
+                            getString(com.termux.shared.R.string.msg_storage_permission_not_granted_on_request));
+                }
+            }
+        }.start();
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        Logger.logVerbose(LOG_TAG, "onActivityResult: requestCode: " + requestCode + ", resultCode: "  + resultCode + ", data: "  + IntentUtils.getIntentString(data));
+        if (requestCode == PermissionUtils.REQUEST_GRANT_STORAGE_PERMISSION) {
+            requestStoragePermission(true);
         }
     }
 
     @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.");
-            TermuxInstaller.setupStorageSymlinks(this);
-        } else {
-            Logger.logInfo(LOG_TAG, "Storage permission denied by user on request.");
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+        Logger.logVerbose(LOG_TAG, "onRequestPermissionsResult: requestCode: " + requestCode + ", permissions: "  + Arrays.toString(permissions) + ", grantResults: "  + Arrays.toString(grantResults));
+        if (requestCode == PermissionUtils.REQUEST_GRANT_STORAGE_PERMISSION) {
+            requestStoragePermission(true);
         }
     }
 
@@ -862,8 +887,7 @@ public void onReceive(Context context, Intent intent) {
                 switch (intent.getAction()) {
                     case TERMUX_ACTIVITY.ACTION_REQUEST_PERMISSIONS:
                         Logger.logDebug(LOG_TAG, "Received intent to request storage permissions");
-                        if (ensureStoragePermissionGranted())
-                            TermuxInstaller.setupStorageSymlinks(TermuxActivity.this);
+                        requestStoragePermission(false);
                         return;
                     case TERMUX_ACTIVITY.ACTION_RELOAD_STYLE:
                         Logger.logDebug(LOG_TAG, "Received intent to reload styling");
diff --git a/termux-shared/src/main/java/com/termux/shared/packages/PackageUtils.java b/termux-shared/src/main/java/com/termux/shared/packages/PackageUtils.java
index 20c888aa0c..e827bb090f 100644
--- a/termux-shared/src/main/java/com/termux/shared/packages/PackageUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/packages/PackageUtils.java
@@ -18,8 +18,10 @@
 import com.termux.shared.data.DataUtils;
 import com.termux.shared.interact.MessageDialogUtils;
 import com.termux.shared.logger.Logger;
+import com.termux.shared.reflection.ReflectionUtils;
 import com.termux.shared.termux.TermuxConstants;
 
+import java.lang.reflect.Field;
 import java.security.MessageDigest;
 import java.util.List;
 
@@ -158,6 +160,63 @@ public static ApplicationInfo getApplicationInfoForPackage(@NonNull final Contex
         }
     }
 
+    /**
+     * Get the {@code privateFlags} {@link Field} of the {@link ApplicationInfo} class.
+     *
+     * @param applicationInfo The {@link ApplicationInfo} for the package.
+     * @return Returns the private flags or {@code null} if an exception was raised.
+     */
+    @Nullable
+    public static Integer getApplicationInfoPrivateFlagsForPackage(@NonNull final ApplicationInfo applicationInfo) {
+        ReflectionUtils.bypassHiddenAPIReflectionRestrictions();
+        try {
+            return (Integer) ReflectionUtils.invokeField(ApplicationInfo.class, "privateFlags", applicationInfo).value;
+        } catch (Exception e) {
+            // ClassCastException may be thrown
+            Logger.logStackTraceWithMessage(LOG_TAG, "Failed to get privateFlags field value for ApplicationInfo class", e);
+            return null;
+        }
+    }
+
+    /**
+     * Get the {@code privateFlags} {@link Field} of the {@link ApplicationInfo} class.
+     *
+     * @param fieldName The name of the field to get.
+     * @return Returns the field value or {@code null} if an exception was raised.
+     */
+    @Nullable
+    public static Integer getApplicationInfoStaticIntFieldValue(@NonNull String fieldName) {
+        ReflectionUtils.bypassHiddenAPIReflectionRestrictions();
+        try {
+            return (Integer) ReflectionUtils.invokeField(ApplicationInfo.class, fieldName, null).value;
+        } catch (Exception e) {
+            // ClassCastException may be thrown
+            Logger.logStackTraceWithMessage(LOG_TAG, "Failed to get \"" + fieldName + "\" field value for ApplicationInfo class", e);
+            return null;
+        }
+    }
+
+    /**
+     * Check if the app associated with the {@code applicationInfo} has a specific flag set.
+     *
+     * @param flagToCheckName The name of the field for the flag to check.
+     * @param applicationInfo The {@link ApplicationInfo} for the package.
+     * @return Returns {@code true} if app has flag is set, otherwise {@code false}. This will be
+     * {@code null} if an exception is raised.
+     */
+    @Nullable
+    public static Boolean isApplicationInfoPrivateFlagSetForPackage(@NonNull String flagToCheckName, @NonNull final ApplicationInfo applicationInfo) {
+        Integer privateFlags = getApplicationInfoPrivateFlagsForPackage(applicationInfo);
+        if (privateFlags == null) return null;
+
+        Integer flagToCheck = getApplicationInfoStaticIntFieldValue(flagToCheckName);
+        if (flagToCheck == null) return null;
+
+        return ( 0 != ( privateFlags & flagToCheck ) );
+    }
+
+
+
 
 
     /**
@@ -297,6 +356,36 @@ public static boolean isAppInstalledOnExternalStorage(@NonNull final Application
 
 
 
+    /**
+     * Check if the app associated with the {@code context} has
+     * ApplicationInfo.PRIVATE_FLAG_REQUEST_LEGACY_EXTERNAL_STORAGE (requestLegacyExternalStorage)
+     * set to {@code true} in app manifest.
+     *
+     * @param context The {@link Context} for the package.
+     * @return Returns {@code true} if app has requested legacy external storage, otherwise
+     * {@code false}. This will be {@code null} if an exception is raised.
+     */
+    @Nullable
+    public static Boolean hasRequestedLegacyExternalStorage(@NonNull final Context context) {
+        return hasRequestedLegacyExternalStorage(context.getApplicationInfo());
+    }
+
+    /**
+     * Check if the app associated with the {@code applicationInfo} has
+     * ApplicationInfo.PRIVATE_FLAG_REQUEST_LEGACY_EXTERNAL_STORAGE (requestLegacyExternalStorage)
+     * set to {@code true} in app manifest.
+     *
+     * @param applicationInfo The {@link ApplicationInfo} for the package.
+     * @return Returns {@code true} if app has requested legacy external storage, otherwise
+     * {@code false}. This will be {@code null} if an exception is raised.
+     */
+    @Nullable
+    public static Boolean hasRequestedLegacyExternalStorage(@NonNull final ApplicationInfo applicationInfo) {
+        return isApplicationInfoPrivateFlagSetForPackage("PRIVATE_FLAG_REQUEST_LEGACY_EXTERNAL_STORAGE", applicationInfo);
+    }
+
+
+
     /**
      * Get the {@code versionCode} for the package associated with the {@code context}.
      *
@@ -545,8 +634,8 @@ public static String isAppInstalled(@NonNull final Context context, String appNa
      */
     @Nullable
     public static String setComponentState(@NonNull final Context context, @NonNull String packageName,
-                                         @NonNull String className, boolean state, String toastString,
-                                         boolean showErrorMessage) {
+                                           @NonNull String className, boolean state, String toastString,
+                                           boolean showErrorMessage) {
         try {
             PackageManager packageManager = context.getPackageManager();
             if (packageManager != null) {
@@ -579,7 +668,7 @@ public static String setComponentState(@NonNull final Context context, @NonNull
      * get the state.
      */
     public static Boolean isComponentDisabled(@NonNull final Context context, @NonNull String packageName,
-                                           @NonNull String className, boolean logErrorMessage) {
+                                              @NonNull String className, boolean logErrorMessage) {
         try {
             PackageManager packageManager = context.getPackageManager();
             if (packageManager != null) {
@@ -607,7 +696,7 @@ public static Boolean isComponentDisabled(@NonNull final Context context, @NonNu
      * @return Returns {@code true} if it exists, otherwise {@code false}.
      */
     public static boolean doesActivityComponentExist(@NonNull final Context context, @NonNull String packageName,
-                                              @NonNull String className, int flags) {
+                                                     @NonNull String className, int flags) {
         try {
             PackageManager packageManager = context.getPackageManager();
             if (packageManager != null) {
diff --git a/termux-shared/src/main/java/com/termux/shared/packages/PermissionUtils.java b/termux-shared/src/main/java/com/termux/shared/packages/PermissionUtils.java
index e422ff42b5..0ab49d6426 100644
--- a/termux-shared/src/main/java/com/termux/shared/packages/PermissionUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/packages/PermissionUtils.java
@@ -9,6 +9,7 @@
 import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Build;
+import android.os.Environment;
 import android.os.PowerManager;
 import android.provider.Settings;
 
@@ -18,6 +19,7 @@
 
 import com.google.common.base.Joiner;
 import com.termux.shared.R;
+import com.termux.shared.file.FileUtils;
 import com.termux.shared.logger.Logger;
 import com.termux.shared.models.errors.Error;
 import com.termux.shared.models.errors.FunctionErrno;
@@ -199,6 +201,215 @@ public static List<String> getPermissionsNotRequested(@NonNull Context context,
 
 
 
+    /** If path is under primary external storage directory and storage permission is missing,
+     * then legacy or manage external storage permission will be requested from the user via a call
+     * to {@link #checkAndRequestLegacyOrManageExternalStoragePermission(Context, int, boolean)}.
+     *
+     * @param context The context for operations.
+     * @param filePath The path to check.
+     * @param requestCode The request code to use while asking for permission.
+     * @param showErrorMessage If an error message toast should be shown if permission is not granted.
+     * @return Returns {@code true} if permission is granted, otherwise {@code false}.
+     */
+    @SuppressLint("SdCardPath")
+    public static boolean checkAndRequestLegacyOrManageExternalStoragePermissionIfPathOnPrimaryExternalStorage(
+        @NonNull Context context, String filePath, int requestCode, boolean showErrorMessage) {
+        // If path is under primary external storage directory, then check for missing permissions.
+        if (!FileUtils.isPathInDirPaths(filePath,
+            Arrays.asList(Environment.getExternalStorageDirectory().getAbsolutePath(), "/sdcard"), true))
+            return true;
+
+        return checkAndRequestLegacyOrManageExternalStoragePermission(context, requestCode, showErrorMessage);
+    }
+
+    /**
+     * Check if legacy or manage external storage permissions has been granted. If
+     * {@link #isLegacyExternalStoragePossible(Context)} returns {@code true}, them it will be
+     * checked if app has has been granted {@link Manifest.permission#READ_EXTERNAL_STORAGE} and
+     * {@link Manifest.permission#WRITE_EXTERNAL_STORAGE} permissions, otherwise it will be checked
+     * if app has been granted the {@link Manifest.permission#MANAGE_EXTERNAL_STORAGE} permission.
+     *
+     * If storage permission is missing, it will be requested from the user if {@code context} is an
+     * instance of {@link Activity} or {@link AppCompatActivity} and {@code requestCode}
+     * is `>=0` and the function will automatically return. The caller should register for
+     * Activity.onActivityResult() and Activity.onRequestPermissionsResult() and call this function
+     * again but set {@code requestCode} to `-1` to check if permission was granted or not.
+     *
+     * Caller must add following to AndroidManifest.xml of the app, otherwise errors will be thrown.
+     * {@code
+     * <manifest
+     *     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+     *     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+     *     <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" tools:ignore="ScopedStorage" />
+     *
+     *    <application
+     *        android:requestLegacyExternalStorage="true"
+     *        ....
+     *    </application>
+     * </manifest>
+     *}
+     * @param context The context for operations.
+     * @param requestCode The request code to use while asking for permission.
+     * @param showErrorMessage If an error message toast should be shown if permission is not granted.
+     * @return Returns {@code true} if permission is granted, otherwise {@code false}.
+     */
+    public static boolean checkAndRequestLegacyOrManageExternalStoragePermission(@NonNull Context context,
+                                                                                 int requestCode,
+                                                                                 boolean showErrorMessage) {
+        String errmsg;
+        boolean requestLegacyStoragePermission = isLegacyExternalStoragePossible(context);
+        boolean checkIfHasRequestedLegacyExternalStorage = checkIfHasRequestedLegacyExternalStorage(context);
+
+        if (requestLegacyStoragePermission && checkIfHasRequestedLegacyExternalStorage) {
+            // Check if requestLegacyExternalStorage is set to true in app manifest
+            if (!hasRequestedLegacyExternalStorage(context, showErrorMessage))
+                return false;
+        }
+
+        if (checkStoragePermission(context, requestLegacyStoragePermission)) {
+            return true;
+        }
+
+        errmsg = context.getString(R.string.msg_storage_permission_not_granted);
+        Logger.logError(LOG_TAG, errmsg);
+        if (showErrorMessage)
+            Logger.showToast(context, errmsg, false);
+
+        if (requestCode < 0)
+            return false;
+
+        if (requestLegacyStoragePermission) {
+            requestLegacyStorageExternalPermission(context, requestCode);
+        } else {
+            requestManageStorageExternalPermission(context, requestCode);
+        }
+
+        return false;
+    }
+
+    /**
+     * Check if app has been granted storage permission.
+     *
+     * @param context The context for operations.
+     * @param checkLegacyStoragePermission If set to {@code true}, then it will be checked if app
+     *                                     has been granted {@link Manifest.permission#READ_EXTERNAL_STORAGE}
+     *                                     and {@link Manifest.permission#WRITE_EXTERNAL_STORAGE}
+     *                                     permissions, otherwise it will be checked if app has been
+     *                                     granted the {@link Manifest.permission#MANAGE_EXTERNAL_STORAGE}
+     *                                     permission.
+     * @return Returns {@code true} if permission is granted, otherwise {@code false}.
+     */
+    public static boolean checkStoragePermission(@NonNull Context context, boolean checkLegacyStoragePermission) {
+        if (checkLegacyStoragePermission) {
+            return checkPermissions(context,
+                new String[]{Manifest.permission.READ_EXTERNAL_STORAGE,
+                    Manifest.permission.WRITE_EXTERNAL_STORAGE});
+        } else {
+            return Environment.isExternalStorageManager();
+        }
+    }
+
+    /**
+     * Request user to grant {@link Manifest.permission#READ_EXTERNAL_STORAGE} and
+     * {@link Manifest.permission#WRITE_EXTERNAL_STORAGE} permissions to the app.
+     *
+     * @param context The context for operations. It must be an instance of {@link Activity} or
+     * {@link AppCompatActivity}.
+     * @param requestCode The request code to use while asking for permission. It must be `>=0` or
+     *                    will fail silently and will log an exception.
+     * @return Returns {@code true} if requesting the permission was successful, otherwise {@code false}.
+     */
+    public static boolean requestLegacyStorageExternalPermission(@NonNull Context context, int requestCode) {
+        Logger.logInfo(LOG_TAG, "Requesting legacy external storage permission");
+        return requestPermission(context, Manifest.permission.WRITE_EXTERNAL_STORAGE, requestCode);
+    }
+
+    /**
+     * Request user to grant {@link Manifest.permission#MANAGE_EXTERNAL_STORAGE} permission to the app.
+     *
+     * @param context The context for operations. It must be an instance of {@link Activity} or
+     * {@link AppCompatActivity}.
+     * @param requestCode The request code to use while asking for permission. It must be `>=0` or
+     *                    will fail silently and will log an exception.
+     * @return Returns {@code true} if requesting the permission was successful, otherwise {@code false}.
+     */
+    public static boolean requestManageStorageExternalPermission(@NonNull Context context, int requestCode) {
+        Logger.logInfo(LOG_TAG, "Requesting manage external storage permission");
+
+        Intent intent = new Intent(Settings.ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION);
+        intent.addCategory("android.intent.category.DEFAULT");
+        intent.setData(Uri.parse("package:" + context.getPackageName()));
+        boolean result = ActivityUtils.startActivityForResult(context, requestCode, intent);
+
+        // Use fallback if matching Activity did not exist for ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION.
+        if (!result) {
+            intent = new Intent();
+            intent.setAction(Settings.ACTION_MANAGE_ALL_FILES_ACCESS_PERMISSION);
+            return ActivityUtils.startActivityForResult(context, requestCode, intent);
+        }
+
+        return true;
+    }
+
+    /**
+     * If app is targeting targetSdkVersion 30 (android 11) and running on sdk 30 (android 11) or
+     * higher, then {@link android.R.attr#requestLegacyExternalStorage} attribute is ignored.
+     * https://developer.android.com/training/data-storage/use-cases#opt-out-scoped-storage
+     */
+    public static boolean isLegacyExternalStoragePossible(@NonNull Context context) {
+        return !(PackageUtils.getTargetSDKForPackage(context) >= Build.VERSION_CODES.R &&
+            Build.VERSION.SDK_INT >= Build.VERSION_CODES.R);
+    }
+
+    /**
+     * Return whether it should be checked if app has set
+     * {@link android.R.attr#requestLegacyExternalStorage} attribute to {@code true}, if storage
+     * permissions are to be requested based on if {@link #isLegacyExternalStoragePossible(Context)}
+     * return {@code true}.
+     *
+     * If app is targeting targetSdkVersion 30 (android 11), then legacy storage can only be
+     * requested if running on sdk 29 (android 10).
+     * If app is targeting targetSdkVersion 29 (android 10), then legacy storage can only be
+     * requested if running on sdk 29 (android 10) and higher.
+     */
+    public static boolean checkIfHasRequestedLegacyExternalStorage(@NonNull Context context) {
+        int targetSdkVersion = PackageUtils.getTargetSDKForPackage(context);
+
+        if (targetSdkVersion >= Build.VERSION_CODES.R) {
+            return Build.VERSION.SDK_INT == Build.VERSION_CODES.Q;
+        } else if (targetSdkVersion == Build.VERSION_CODES.Q) {
+            return Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q;
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * Call to {@link Environment#isExternalStorageLegacy()} will not return the actual value defined
+     * in app manifest for {@link android.R.attr#requestLegacyExternalStorage} attribute,
+     * since an app may inherit its legacy state based on when it was first installed, target sdk and
+     * other factors. To provide consistent experience for all users regardless of current legacy
+     * state on a specific device, we directly use the value defined in app` manifest.
+     */
+    public static boolean hasRequestedLegacyExternalStorage(@NonNull Context context,
+                                                            boolean showErrorMessage) {
+        String errmsg;
+        Boolean hasRequestedLegacyExternalStorage = PackageUtils.hasRequestedLegacyExternalStorage(context);
+        if (hasRequestedLegacyExternalStorage != null && !hasRequestedLegacyExternalStorage) {
+            errmsg = context.getString(R.string.error_has_not_requested_legacy_external_storage,
+                context.getPackageName(), PackageUtils.getTargetSDKForPackage(context), Build.VERSION.SDK_INT);
+            Logger.logError(LOG_TAG, errmsg);
+            if (showErrorMessage)
+                Logger.showToast(context, errmsg, true);
+            return false;
+        }
+
+        return true;
+    }
+
+
+
+
 
     /**
      * Check if {@link Manifest.permission#SYSTEM_ALERT_WINDOW} permission has been granted.
diff --git a/termux-shared/src/main/res/values/strings.xml b/termux-shared/src/main/res/values/strings.xml
index 0c351a5d6b..b67468aac6 100644
--- a/termux-shared/src/main/res/values/strings.xml
+++ b/termux-shared/src/main/res/values/strings.xml
@@ -41,6 +41,7 @@
     <string name="error_failed_to_request_permissions">Failed to request permissions with request code %1$d: %2$s</string>
     <string name="error_attempted_to_check_for_permissions_not_requested">Attempted to check for permissions that have not been requested in app manifest: %1$s</string>
     <string name="error_attempted_to_ask_for_permissions_not_requested">Attempted to ask for permissions that have not been requested in app manifest: %1$s</string>
+    <string name="error_has_not_requested_legacy_external_storage">The \"%1$s\" package is targeting targetSdkVersion %2$d and is running on android sdk %3$d but has not set requestLegacyExternalStorage to true in app manifest"</string>
 
 
 
@@ -101,6 +102,9 @@
     <string name="action_cancel">Cancel</string>
     <string name="action_save_to_file">Save To File</string>
 
+    <string name="msg_storage_permission_granted_on_request">"The storage permission granted by user on request"</string>
+    <string name="msg_storage_permission_not_granted_on_request">"The storage permission not granted by user on request"</string>
+
 
 
     <!-- Launcher Icons -->

From 2c0e9c6c5c28b42e1732ca425ee75a4530a9724e Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 21 Oct 2021 23:27:55 +0500
Subject: [PATCH 615/912] Added: Add Logger.logInfoAndShowToast() and log
 messages even if not showing toast due to null Context

---
 .../java/com/termux/shared/logger/Logger.java   | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/logger/Logger.java b/termux-shared/src/main/java/com/termux/shared/logger/Logger.java
index 3865a7cebd..f6d386fc84 100644
--- a/termux-shared/src/main/java/com/termux/shared/logger/Logger.java
+++ b/termux-shared/src/main/java/com/termux/shared/logger/Logger.java
@@ -195,9 +195,20 @@ public static void logVerboseForce(String tag, String message) {
 
 
 
-    public static void logErrorAndShowToast(Context context, String tag, String message) {
-        if (context == null) return;
+    public static void logInfoAndShowToast(Context context, String tag, String message) {
+        if (CURRENT_LOG_LEVEL >= LOG_LEVEL_NORMAL) {
+            logInfo(tag, message);
+            showToast(context, message, true);
+        }
+    }
 
+    public static void logInfoAndShowToast(Context context, String message) {
+        logInfoAndShowToast(context, DEFAULT_LOG_TAG, message);
+    }
+
+
+
+    public static void logErrorAndShowToast(Context context, String tag, String message) {
         if (CURRENT_LOG_LEVEL >= LOG_LEVEL_NORMAL) {
             logError(tag, message);
             showToast(context, message, true);
@@ -211,8 +222,6 @@ public static void logErrorAndShowToast(Context context, String message) {
 
 
     public static void logDebugAndShowToast(Context context, String tag, String message) {
-        if (context == null) return;
-
         if (CURRENT_LOG_LEVEL >= LOG_LEVEL_DEBUG) {
             logDebug(tag, message);
             showToast(context, message, true);

From 63c106c74660a0bab97acde124093db7e1a00aad Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 21 Oct 2021 23:40:37 +0500
Subject: [PATCH 616/912] Added: Add Error.logErrorAndShowToast() and provide
 non-static logging functions to be used when Error may not be null

---
 .../termux/shared/models/errors/Error.java    | 57 +++++++++++++++----
 1 file changed, 46 insertions(+), 11 deletions(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/models/errors/Error.java b/termux-shared/src/main/java/com/termux/shared/models/errors/Error.java
index f74f44850b..56a04e9703 100644
--- a/termux-shared/src/main/java/com/termux/shared/models/errors/Error.java
+++ b/termux-shared/src/main/java/com/termux/shared/models/errors/Error.java
@@ -1,5 +1,7 @@
 package com.termux.shared.models.errors;
 
+import android.content.Context;
+
 import androidx.annotation.NonNull;
 
 import com.termux.shared.logger.Logger;
@@ -171,6 +173,26 @@ public String toString() {
         return getErrorLogString(this);
     }
 
+
+
+    /**
+     * Log the {@link Error} and show a toast for the minimal {@link String} for the {@link Error}.
+     *
+     * @param context The {@link Context} for operations.
+     * @param logTag The log tag to use for logging.
+     * @param error The {@link Error} to convert.
+     */
+    public static void logErrorAndShowToast(Context context, String logTag, Error error) {
+        if (error == null) return;
+        error.logErrorAndShowToast(context, logTag);
+    }
+
+    public void logErrorAndShowToast(Context context, String logTag) {
+        Logger.logErrorExtended(logTag, getErrorLogString());
+        Logger.showToast(context, getMinimalErrorLogString(), true);
+    }
+
+
     /**
      * Get a log friendly {@link String} for {@link Error} error parameters.
      *
@@ -179,13 +201,16 @@ public String toString() {
      */
     public static String getErrorLogString(final Error error) {
         if (error == null) return "null";
+        return error.getErrorLogString();
+    }
 
+    public String getErrorLogString() {
         StringBuilder logString = new StringBuilder();
 
-        logString.append(error.getCodeString());
-        logString.append("\n").append(error.getTypeAndMessageLogString());
-        if (error.throwablesList != null)
-            logString.append("\n").append(error.geStackTracesLogString());
+        logString.append(getCodeString());
+        logString.append("\n").append(getTypeAndMessageLogString());
+        if (this.throwablesList != null)
+            logString.append("\n").append(geStackTracesLogString());
 
         return logString.toString();
     }
@@ -198,11 +223,14 @@ public static String getErrorLogString(final Error error) {
      */
     public static String getMinimalErrorLogString(final Error error) {
         if (error == null) return "null";
+        return error.getMinimalErrorLogString();
+    }
 
+    public String getMinimalErrorLogString() {
         StringBuilder logString = new StringBuilder();
 
-        logString.append(error.getCodeString());
-        logString.append(error.getTypeAndMessageLogString());
+        logString.append(getCodeString());
+        logString.append(getTypeAndMessageLogString());
 
         return logString.toString();
     }
@@ -215,11 +243,14 @@ public static String getMinimalErrorLogString(final Error error) {
      */
     public static String getMinimalErrorString(final Error error) {
         if (error == null) return "null";
+        return error.getMinimalErrorString();
+    }
 
+    public String getMinimalErrorString() {
         StringBuilder logString = new StringBuilder();
 
-        logString.append("(").append(error.getCode()).append(") ");
-        logString.append(error.getType()).append(": ").append(error.getMessage());
+        logString.append("(").append(getCode()).append(") ");
+        logString.append(getType()).append(": ").append(getMessage());
 
         return logString.toString();
     }
@@ -232,12 +263,16 @@ public static String getMinimalErrorString(final Error error) {
      */
     public static String getErrorMarkdownString(final Error error) {
         if (error == null) return "null";
+        return error.getErrorMarkdownString();
+    }
 
+    public String getErrorMarkdownString() {
         StringBuilder markdownString = new StringBuilder();
 
-        markdownString.append(MarkdownUtils.getSingleLineMarkdownStringEntry("Error Code", error.getCode(), "-"));
-        markdownString.append("\n").append(MarkdownUtils.getMultiLineMarkdownStringEntry((Errno.TYPE.equals(error.getType()) ? "Error Message" : "Error Message (" + error.getType() + ")"), error.message, "-"));
-        markdownString.append("\n\n").append(error.geStackTracesMarkdownString());
+        markdownString.append(MarkdownUtils.getSingleLineMarkdownStringEntry("Error Code", getCode(), "-"));
+        markdownString.append("\n").append(MarkdownUtils.getMultiLineMarkdownStringEntry(
+            (Errno.TYPE.equals(getType()) ? "Error Message" : "Error Message (" + getType() + ")"), message, "-"));
+        markdownString.append("\n\n").append(geStackTracesMarkdownString());
 
         return markdownString.toString();
     }

From f7ebcae7b3c754feb957dee47441e84a56634d36 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 21 Oct 2021 23:53:50 +0500
Subject: [PATCH 617/912] Added: Add functions to get dirname and basename in
 FileUtils

---
 .../com/termux/shared/file/FileUtils.java     | 40 ++++++++++++++++++-
 .../com/termux/shared/shell/ShellUtils.java   |  5 +--
 2 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/file/FileUtils.java b/termux-shared/src/main/java/com/termux/shared/file/FileUtils.java
index 6a24dae1ec..4b4f89314d 100644
--- a/termux-shared/src/main/java/com/termux/shared/file/FileUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/file/FileUtils.java
@@ -117,7 +117,7 @@ public static String normalizePath(String path) {
      * @param fileName The name to sanitize.
      * @param sanitizeWhitespaces If set to {@code true}, then white space characters ` \t\n` will be
      *                            converted.
-     * @param sanitizeWhitespaces If set to {@code true}, then file name will be converted to lowe case.
+     * @param toLower If set to {@code true}, then file name will be converted to lower case.
      * @return Returns the {@code sanitized name}.
      */
     public static String sanitizeFileName(String fileName, boolean sanitizeWhitespaces, boolean toLower) {
@@ -1855,4 +1855,42 @@ public static Error getShortFileUtilsError(final Error error) {
             return shortErrno.getError(throwables, error.getLabel(), "file");
     }
 
+
+    /**
+     * Get file dirname for file at {@code filePath}.
+     *
+     * @param filePath The {@code path} for file.
+     * @return Returns the file dirname if not {@code null}.
+     */
+    public static String getFileDirname(String filePath) {
+        if (DataUtils.isNullOrEmpty(filePath)) return null;
+        int lastSlash = filePath.lastIndexOf('/');
+        return (lastSlash == -1) ? null : filePath.substring(0, lastSlash);
+    }
+
+    /**
+     * Get file basename for file at {@code filePath}.
+     *
+     * @param filePath The {@code path} for file.
+     * @return Returns the file basename if not {@code null}.
+     */
+    public static String getFileBasename(String filePath) {
+        if (DataUtils.isNullOrEmpty(filePath)) return null;
+        int lastSlash = filePath.lastIndexOf('/');
+        return (lastSlash == -1) ? filePath : filePath.substring(lastSlash + 1);
+    }
+
+    /**
+     * Get file basename for file at {@code filePath} without extension.
+     *
+     * @param filePath The {@code path} for file.
+     * @return Returns the file basename without extension if not {@code null}.
+     */
+    public static String getFileBasenameWithoutExtension(String filePath) {
+        String fileBasename = getFileBasename(filePath);
+        if (DataUtils.isNullOrEmpty(fileBasename)) return null;
+        int lastDot = fileBasename.lastIndexOf('.');
+        return (lastDot == -1) ? fileBasename : fileBasename.substring(0, lastDot);
+    }
+
 }
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/ShellUtils.java b/termux-shared/src/main/java/com/termux/shared/shell/ShellUtils.java
index d6687e05cc..302528b794 100644
--- a/termux-shared/src/main/java/com/termux/shared/shell/ShellUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/shell/ShellUtils.java
@@ -1,5 +1,6 @@
 package com.termux.shared.shell;
 
+import com.termux.shared.file.FileUtils;
 import com.termux.terminal.TerminalBuffer;
 import com.termux.terminal.TerminalEmulator;
 import com.termux.terminal.TerminalSession;
@@ -23,9 +24,7 @@ public static int getPid(Process p) {
     }
 
     public static String getExecutableBasename(String executable) {
-        if (executable == null) return null;
-        int lastSlash = executable.lastIndexOf('/');
-        return (lastSlash == -1) ? executable : executable.substring(lastSlash + 1);
+        return FileUtils.getFileBasename(executable);
     }
 
     public static String getTerminalSessionTranscriptText(TerminalSession terminalSession, boolean linesJoined, boolean trim) {

From 93d738ae636c9d08bdd188ce37fdd6d15f09c01b Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 21 Oct 2021 23:56:49 +0500
Subject: [PATCH 618/912] Fixed: Remove all trailing slashes when normalizing
 path

---
 .../src/main/java/com/termux/shared/file/FileUtils.java         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/file/FileUtils.java b/termux-shared/src/main/java/com/termux/shared/file/FileUtils.java
index 4b4f89314d..79459ca97e 100644
--- a/termux-shared/src/main/java/com/termux/shared/file/FileUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/file/FileUtils.java
@@ -105,7 +105,7 @@ public static String normalizePath(String path) {
         path = path.replaceAll("\\./", "");
 
         if (path.endsWith("/")) {
-            path = path.substring(0, path.length() - 1);
+            path = path.replaceAll("/+$", "");
         }
 
         return path;

From 5b2aca9cf72222b411b657e54e604b9106c15555 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 21 Oct 2021 23:59:12 +0500
Subject: [PATCH 619/912] Changed: Fix minor typos in FileUtils and
 FileUtilsErrno

---
 .../com/termux/shared/file/FileUtils.java     | 24 +++++++++----------
 .../shared/models/errors/FileUtilsErrno.java  |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/file/FileUtils.java b/termux-shared/src/main/java/com/termux/shared/file/FileUtils.java
index 79459ca97e..0860c9ae0e 100644
--- a/termux-shared/src/main/java/com/termux/shared/file/FileUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/file/FileUtils.java
@@ -145,7 +145,7 @@ public static String sanitizeFileName(String fileName, boolean sanitizeWhitespac
      * @return Returns {@code true} if path in {@code dirPath}, otherwise returns {@code false}.
      */
     public static boolean isPathInDirPath(String path, final String dirPath, final boolean ensureUnder) {
-       return isPathInDirPaths(path, Collections.singletonList(dirPath), ensureUnder);
+        return isPathInDirPaths(path, Collections.singletonList(dirPath), ensureUnder);
     }
 
     /**
@@ -275,8 +275,8 @@ public static FileType getFileType(final String filePath, final boolean followLi
      * failed, otherwise {@code null}.
      */
     public static Error validateRegularFileExistenceAndPermissions(String label, final String filePath, final String parentDirPath,
-                                                                    final String permissionsToCheck, final boolean setPermissions, final boolean setMissingPermissionsOnly,
-                                                                    final boolean ignoreErrorsIfPathIsUnderParentDirPath) {
+                                                                   final String permissionsToCheck, final boolean setPermissions, final boolean setMissingPermissionsOnly,
+                                                                   final boolean ignoreErrorsIfPathIsUnderParentDirPath) {
         label = (label == null ? "" : label + " ");
         if (filePath == null || filePath.isEmpty()) return FunctionErrno.ERRNO_NULL_OR_EMPTY_PARAMETER.getError(label + "regular file path", "validateRegularFileExistenceAndPermissions");
 
@@ -356,8 +356,8 @@ public static Error validateRegularFileExistenceAndPermissions(String label, fin
      * or validating permissions failed, otherwise {@code null}.
      */
     public static Error validateDirectoryFileExistenceAndPermissions(String label, final String filePath, final String parentDirPath, final boolean createDirectoryIfMissing,
-                                                                      final String permissionsToCheck, final boolean setPermissions, final boolean setMissingPermissionsOnly,
-                                                                      final boolean ignoreErrorsIfPathIsInParentDirPath, final boolean ignoreIfNotExecutable) {
+                                                                     final String permissionsToCheck, final boolean setPermissions, final boolean setMissingPermissionsOnly,
+                                                                     final boolean ignoreErrorsIfPathIsInParentDirPath, final boolean ignoreIfNotExecutable) {
         label = (label == null ? "" : label + " ");
         if (filePath == null || filePath.isEmpty()) return FunctionErrno.ERRNO_NULL_OR_EMPTY_PARAMETER.getError(label + "directory file path", "validateDirectoryExistenceAndPermissions");
 
@@ -471,7 +471,7 @@ public static Error createRegularFile(final String label, final String filePath)
      * or validating permissions failed, otherwise {@code null}.
      */
     public static Error createRegularFile(String label, final String filePath,
-                                           final String permissionsToCheck, final boolean setPermissions, final boolean setMissingPermissionsOnly) {
+                                          final String permissionsToCheck, final boolean setPermissions, final boolean setMissingPermissionsOnly) {
         label = (label == null ? "" : label + " ");
         if (filePath == null || filePath.isEmpty()) return FunctionErrno.ERRNO_NULL_OR_EMPTY_PARAMETER.getError(label + "file path", "createRegularFile");
 
@@ -583,7 +583,7 @@ public static Error createDirectoryFile(final String label, final String filePat
      * or validating permissions failed, otherwise {@code null}.
      */
     public static Error createDirectoryFile(final String label, final String filePath,
-                                             final String permissionsToCheck, final boolean setPermissions, final boolean setMissingPermissionsOnly) {
+                                            final String permissionsToCheck, final boolean setPermissions, final boolean setMissingPermissionsOnly) {
         return validateDirectoryFileExistenceAndPermissions(label, filePath,
             null, true,
             permissionsToCheck, setPermissions, setMissingPermissionsOnly,
@@ -648,7 +648,7 @@ public static Error createSymlinkFile(String label, final String targetFilePath,
      * or validating permissions failed, otherwise {@code null}.
      */
     public static Error createSymlinkFile(String label, final String targetFilePath, final String destFilePath,
-                                           final boolean allowDangling, final boolean overwrite, final boolean overwriteOnlyIfDestIsASymlink) {
+                                          final boolean allowDangling, final boolean overwrite, final boolean overwriteOnlyIfDestIsASymlink) {
         label = (label == null ? "" : label + " ");
         if (targetFilePath == null || targetFilePath.isEmpty()) return FunctionErrno.ERRNO_NULL_OR_EMPTY_PARAMETER.getError(label + "target file path", "createSymlinkFile");
         if (destFilePath == null || destFilePath.isEmpty()) return FunctionErrno.ERRNO_NULL_OR_EMPTY_PARAMETER.getError(label + "destination file path", "createSymlinkFile");
@@ -920,8 +920,8 @@ public static Error moveFile(final String label, final String srcFilePath, final
      * @return Returns the {@code error} if copy or move was not successful, otherwise {@code null}.
      */
     public static Error copyOrMoveFile(String label, final String srcFilePath, final String destFilePath,
-                                        final boolean moveFile, final boolean ignoreNonExistentSrcFile, int allowedFileTypeFlags,
-                                        final boolean overwrite, final boolean overwriteOnlyIfDestSameFileTypeAsSrc) {
+                                       final boolean moveFile, final boolean ignoreNonExistentSrcFile, int allowedFileTypeFlags,
+                                       final boolean overwrite, final boolean overwriteOnlyIfDestSameFileTypeAsSrc) {
         label = (label == null ? "" : label + " ");
         if (srcFilePath == null || srcFilePath.isEmpty()) return FunctionErrno.ERRNO_NULL_OR_EMPTY_PARAMETER.getError(label + "source file path", "copyOrMoveFile");
         if (destFilePath == null || destFilePath.isEmpty()) return FunctionErrno.ERRNO_NULL_OR_EMPTY_PARAMETER.getError(label + "destination file path", "copyOrMoveFile");
@@ -1151,7 +1151,7 @@ public static Error deleteFile(String label, final String filePath, final boolea
                 // If delete is to be ignored if file does not exist
                 if (ignoreNonExistentFile)
                     return null;
-                // Else return with error
+                    // Else return with error
                 else {
                     label += "file meant to be deleted";
                     return FileUtilsErrno.ERRNO_FILE_NOT_FOUND_AT_PATH.getError(label, filePath).setLabel(label);
@@ -1423,7 +1423,7 @@ public static Error readStringFromFile(String label, final String filePath, Char
 
             Logger.logVerbose(LOG_TAG, Logger.getMultiLineLogStringEntry("String", DataUtils.getTruncatedCommandOutput(dataStringBuilder.toString(), Logger.LOGGER_ENTRY_MAX_SAFE_PAYLOAD, true, false, true), "-"));
         } catch (Exception e) {
-            return FileUtilsErrno.ERRNO_READING_STRING_TO_FILE_FAILED_WITH_EXCEPTION.getError(e, label + "file", filePath, e.getMessage());
+            return FileUtilsErrno.ERRNO_READING_STRING_FROM_FILE_FAILED_WITH_EXCEPTION.getError(e, label + "file", filePath, e.getMessage());
         } finally {
             closeCloseable(fileInputStream);
             closeCloseable(bufferedReader);
diff --git a/termux-shared/src/main/java/com/termux/shared/models/errors/FileUtilsErrno.java b/termux-shared/src/main/java/com/termux/shared/models/errors/FileUtilsErrno.java
index f8c701d862..645740411a 100644
--- a/termux-shared/src/main/java/com/termux/shared/models/errors/FileUtilsErrno.java
+++ b/termux-shared/src/main/java/com/termux/shared/models/errors/FileUtilsErrno.java
@@ -65,7 +65,7 @@ public class FileUtilsErrno extends Errno {
 
 
     /* Errors for file reading and writing (350-400) */
-    public static final Errno ERRNO_READING_STRING_TO_FILE_FAILED_WITH_EXCEPTION = new Errno(TYPE, 350, "Reading string from %1$s at path \"%2$s\" failed.\nException: %3$s");
+    public static final Errno ERRNO_READING_STRING_FROM_FILE_FAILED_WITH_EXCEPTION = new Errno(TYPE, 350, "Reading string from %1$s at path \"%2$s\" failed.\nException: %3$s");
     public static final Errno ERRNO_WRITING_STRING_TO_FILE_FAILED_WITH_EXCEPTION = new Errno(TYPE, 351, "Writing string to %1$s at path \"%2$s\" failed.\nException: %3$s");
     public static final Errno ERRNO_UNSUPPORTED_CHARSET = new Errno(TYPE, 352, "Unsupported charset \"%1$s\"");
     public static final Errno ERRNO_CHECKING_IF_CHARSET_SUPPORTED_FAILED = new Errno(TYPE, 353, "Checking if charset \"%1$s\" is supported failed.\nException: %2$s");

From aed4b96a314c74b50e90a29e9da6149decd4ec48 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Fri, 22 Oct 2021 00:01:24 +0500
Subject: [PATCH 620/912] Added: Add FileUtils.regularOrDirectoryFileExists()

---
 .../java/com/termux/shared/file/FileUtils.java     | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/termux-shared/src/main/java/com/termux/shared/file/FileUtils.java b/termux-shared/src/main/java/com/termux/shared/file/FileUtils.java
index 0860c9ae0e..ee9bf9b3e6 100644
--- a/termux-shared/src/main/java/com/termux/shared/file/FileUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/file/FileUtils.java
@@ -220,6 +220,20 @@ public static boolean symlinkFileExists(final String filePath) {
         return getFileType(filePath, false) == FileType.SYMLINK;
     }
 
+    /**
+     * Checks whether a regular or directory file exists at {@code filePath}.
+     *
+     * @param filePath The {@code path} for regular file to check.
+     * @param followLinks The {@code boolean} that decides if symlinks will be followed while
+     *                       finding if file exists. Check {@link #getFileType(String, boolean)}
+     *                       for details.
+     * @return Returns {@code true} if regular or directory file exists, otherwise {@code false}.
+     */
+    public static boolean regularOrDirectoryFileExists(final String filePath, final boolean followLinks) {
+        FileType fileType = getFileType(filePath, followLinks);
+        return fileType == FileType.REGULAR || fileType == FileType.DIRECTORY;
+    }
+
     /**
      * Checks whether any file exists at {@code filePath}.
      *

From 5d64f1225cb52de26018cb9f078644542e9d2a3b Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Fri, 22 Oct 2021 00:21:16 +0500
Subject: [PATCH 621/912] Added: Add support in SharedProperties to modify
 properties loaded from disk before they are mapped to internal values

---
 .../settings/properties/SharedProperties.java | 61 ++++++++++++++-----
 .../properties/SharedPropertiesParser.java    | 16 ++++-
 2 files changed, 62 insertions(+), 15 deletions(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/settings/properties/SharedProperties.java b/termux-shared/src/main/java/com/termux/shared/settings/properties/SharedProperties.java
index 91cf699f7f..99d7dea5e6 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/properties/SharedProperties.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/properties/SharedProperties.java
@@ -160,7 +160,7 @@ public Properties getProperties(boolean cached) {
                 if (mProperties == null) mProperties = new Properties();
                 return getPropertiesCopy(mProperties);
             } else {
-                return getPropertiesFromFile(mContext, mPropertiesFile);
+                return getPropertiesFromFile(mContext, mPropertiesFile, mSharedPropertiesParser);
             }
         }
     }
@@ -227,7 +227,7 @@ public Object getInternalProperty(String key) {
      * @return Returns the {@link Properties} object. It will be {@code null} if an exception is
      * raised while reading the file.
      */
-    public static Properties getPropertiesFromFile(Context context, File propertiesFile) {
+    public static Properties getPropertiesFromFile(Context context, File propertiesFile, @Nullable SharedPropertiesParser sharedPropertiesParser) {
         Properties properties = new Properties();
 
         if (propertiesFile == null) {
@@ -247,28 +247,38 @@ public static Properties getPropertiesFromFile(Context context, File propertiesF
             return null;
         }
 
-        return properties;
+        if (sharedPropertiesParser != null && context != null)
+            return sharedPropertiesParser.preProcessPropertiesOnReadFromDisk(context, properties);
+        else
+            return properties;
+    }
+
+
+
+    public static String getProperty(Context context, File propertiesFile, String key, String def) {
+        return getProperty(context, propertiesFile, key, def, null);
     }
 
     /**
      * A static function to get the {@link String} value for the {@link Properties} key read from
      * the propertiesFile file.
      *
-     * @param context The {@link Context} for the {@link #getPropertiesFromFile(Context,File)} call.
+     * @param context The {@link Context} for the {@link #getPropertiesFromFile(Context,File,SharedPropertiesParser)} call.
      * @param propertiesFile The {@link File} to read the {@link Properties} from.
      * @param key The key to read.
      * @param def The default value.
+     * @param sharedPropertiesParser The implementation of the {@link SharedPropertiesParser} interface.
      * @return Returns the {@link String} object. This will be {@code null} if key is not found.
      */
-    public static String getProperty(Context context, File propertiesFile, String key, String def) {
-        return (String) getDefaultIfNull(getDefaultIfNull(getPropertiesFromFile(context, propertiesFile), new Properties()).get(key), def);
+    public static String getProperty(Context context, File propertiesFile, String key, String def, @Nullable SharedPropertiesParser sharedPropertiesParser) {
+        return (String) getDefaultIfNull(getDefaultIfNull(getPropertiesFromFile(context, propertiesFile, sharedPropertiesParser), new Properties()).get(key), def);
     }
 
     /**
      * A static function to get the internal {@link Object} value for the {@link String} value for
      * the {@link Properties} key read from the propertiesFile file.
      *
-     * @param context The {@link Context} for the {@link #getPropertiesFromFile(Context,File)} call.
+     * @param context The {@link Context} for the {@link #getPropertiesFromFile(Context,File,SharedPropertiesParser)} call.
      * @param propertiesFile The {@link File} to read the {@link Properties} from.
      * @param key The key to read.
      * @param sharedPropertiesParser The implementation of the {@link SharedPropertiesParser} interface.
@@ -276,45 +286,57 @@ public static String getProperty(Context context, File propertiesFile, String ke
      * {@link SharedPropertiesParser#getInternalPropertyValueFromValue(Context,String,String)}.
      */
     public static Object getInternalProperty(Context context, File propertiesFile, String key, @NonNull SharedPropertiesParser sharedPropertiesParser) {
-        String value = (String) getDefaultIfNull(getPropertiesFromFile(context, propertiesFile), new Properties()).get(key);
+        String value = (String) getDefaultIfNull(getPropertiesFromFile(context, propertiesFile, sharedPropertiesParser), new Properties()).get(key);
 
         // Call the {@link SharedPropertiesParser#getInternalPropertyValueFromValue(Context,String,String)}
         // interface method to get the internal value to return.
         return sharedPropertiesParser.getInternalPropertyValueFromValue(context, key, value);
     }
 
+
+    public static boolean isPropertyValueTrue(Context context, File propertiesFile, String key, boolean logErrorOnInvalidValue) {
+        return isPropertyValueTrue(context, propertiesFile, key, logErrorOnInvalidValue, null);
+    }
+
     /**
      * A static function to check if the value is {@code true} for {@link Properties} key read from
      * the propertiesFile file.
      *
-     * @param context The {@link Context} for the {@link #getPropertiesFromFile(Context,File)}call.
+     * @param context The {@link Context} for the {@link #getPropertiesFromFile(Context,File,SharedPropertiesParser)} call.
      * @param propertiesFile The {@link File} to read the {@link Properties} from.
      * @param key The key to read.
      * @param logErrorOnInvalidValue If {@code true}, then an error will be logged if key value
      *                               was found in {@link Properties} but was invalid.
+     * @param sharedPropertiesParser The implementation of the {@link SharedPropertiesParser} interface.
      * @return Returns the {@code true} if the {@link Properties} key {@link String} value equals "true",
      * regardless of case. If the key does not exist in the file or does not equal "true", then
      * {@code false} will be returned.
      */
-    public static boolean isPropertyValueTrue(Context context, File propertiesFile, String key, boolean logErrorOnInvalidValue) {
-        return (boolean) getBooleanValueForStringValue(key, (String) getProperty(context, propertiesFile, key, null), false, logErrorOnInvalidValue, LOG_TAG);
+    public static boolean isPropertyValueTrue(Context context, File propertiesFile, String key, boolean logErrorOnInvalidValue, @Nullable SharedPropertiesParser sharedPropertiesParser) {
+        return (boolean) getBooleanValueForStringValue(key, (String) getProperty(context, propertiesFile, key, null, sharedPropertiesParser), false, logErrorOnInvalidValue, LOG_TAG);
+    }
+
+
+    public static boolean isPropertyValueFalse(Context context, File propertiesFile, String key, boolean logErrorOnInvalidValue) {
+        return isPropertyValueFalse(context, propertiesFile, key, logErrorOnInvalidValue, null);
     }
 
     /**
      * A static function to check if the value is {@code false} for {@link Properties} key read from
      * the propertiesFile file.
      *
-     * @param context The {@link Context} for the {@link #getPropertiesFromFile(Context,File)} call.
+     * @param context The {@link Context} for the {@link #getPropertiesFromFile(Context,File,SharedPropertiesParser)} call.
      * @param propertiesFile The {@link File} to read the {@link Properties} from.
      * @param key The key to read.
      * @param logErrorOnInvalidValue If {@code true}, then an error will be logged if key value
      *                               was found in {@link Properties} but was invalid.
+     * @param sharedPropertiesParser The implementation of the {@link SharedPropertiesParser} interface.
      * @return Returns the {@code true} if the {@link Properties} key {@link String} value equals "false",
      * regardless of case. If the key does not exist in the file or does not equal "false", then
      * {@code true} will be returned.
      */
-    public static boolean isPropertyValueFalse(Context context, File propertiesFile, String key, boolean logErrorOnInvalidValue) {
-        return (boolean) getInvertedBooleanValueForStringValue(key, (String) getProperty(context, propertiesFile, key, null), true, logErrorOnInvalidValue, LOG_TAG);
+    public static boolean isPropertyValueFalse(Context context, File propertiesFile, String key, boolean logErrorOnInvalidValue, @Nullable SharedPropertiesParser sharedPropertiesParser) {
+        return (boolean) getInvertedBooleanValueForStringValue(key, (String) getProperty(context, propertiesFile, key, null, sharedPropertiesParser), true, logErrorOnInvalidValue, LOG_TAG);
     }
 
 
@@ -419,6 +441,17 @@ public static Map<String, Object> getMapCopy(Map<String, Object> map) {
 
 
 
+    /**
+     * Get the boolean value for the {@link String} value.
+     *
+     * @param value The {@link String} value to convert.
+     * @return Returns {@code true} or {@code false} if value is the literal string "true" or "false" respectively,
+     * regardless of case. Otherwise returns {@code null}.
+     */
+    public static Boolean getBooleanValueForStringValue(String value) {
+        return MAP_GENERIC_BOOLEAN.get(toLowerCase(value));
+    }
+
     /**
      * Get the boolean value for the {@link String} value.
      *
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/properties/SharedPropertiesParser.java b/termux-shared/src/main/java/com/termux/shared/settings/properties/SharedPropertiesParser.java
index 8fd09eea6a..1e6c67f220 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/properties/SharedPropertiesParser.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/properties/SharedPropertiesParser.java
@@ -2,13 +2,27 @@
 
 import android.content.Context;
 
+import androidx.annotation.NonNull;
+
 import java.util.HashMap;
+import java.util.Properties;
 
 /**
  * An interface that must be defined by the caller of the {@link SharedProperties} class.
  */
 public interface SharedPropertiesParser {
 
+    /**
+     * Called when properties are loaded from file to allow client to update the {@link Properties}
+     * loaded from properties file before key/value pairs are stored in the {@link HashMap <>} in-memory
+     * cache.
+     *
+     * @param context The context for operations.
+     * @param properties The key for which the internal object is required.
+     */
+    @NonNull
+    Properties preProcessPropertiesOnReadFromDisk(@NonNull Context context, @NonNull Properties properties);
+
     /**
      * A function that should return the internal {@link Object} to be stored for a key/value pair
      * read from properties file in the {@link HashMap <>} in-memory cache.
@@ -18,6 +32,6 @@ public interface SharedPropertiesParser {
      * @param value The literal value for the property found is the properties file.
      * @return Returns the {@link Object} object to store in the {@link HashMap <>} in-memory cache.
      */
-    Object getInternalPropertyValueFromValue(Context context, String key, String value);
+    Object getInternalPropertyValueFromValue(@NonNull Context context, String key, String value);
 
 }

From 28ecb6499242b372d65966eaf5c307dc6aaeea89 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Fri, 22 Oct 2021 00:32:38 +0500
Subject: [PATCH 622/912] Changed: Automatically use default properties file
 and client for TermuxSharedProperties.getTermuxInternalPropertyValue()

---
 .../app/settings/properties/TermuxAppSharedProperties.java | 4 ++--
 .../termux/settings/properties/TermuxSharedProperties.java | 7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/termux/app/settings/properties/TermuxAppSharedProperties.java b/app/src/main/java/com/termux/app/settings/properties/TermuxAppSharedProperties.java
index d48d64057f..3f7326af2e 100644
--- a/app/src/main/java/com/termux/app/settings/properties/TermuxAppSharedProperties.java
+++ b/app/src/main/java/com/termux/app/settings/properties/TermuxAppSharedProperties.java
@@ -112,8 +112,8 @@ public ExtraKeysInfo getExtraKeysInfo() {
      * 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());
+        return (int) TermuxSharedProperties.getTermuxInternalPropertyValue(context,
+            TermuxPropertyConstants.KEY_TERMINAL_TRANSCRIPT_ROWS);
     }
 
 }
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxSharedProperties.java b/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxSharedProperties.java
index 2d760ff5e7..a5ff7f6fd2 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxSharedProperties.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxSharedProperties.java
@@ -167,7 +167,7 @@ public Object getInternalPropertyValue(String key, boolean cached) {
 
     /**
      * Get the internal {@link Object} value for the key passed from the file returned by
-     * {@code propertiesFile}. The {@link Properties} object is
+     * {@link TermuxPropertyConstants#getTermuxPropertiesFile()}. The {@link Properties} object is
      * read directly from the file and internal value is returned for the property value against the key.
      *
      * @param context The context for operations.
@@ -175,9 +175,8 @@ public Object getInternalPropertyValue(String key, boolean cached) {
      * @return Returns the {@link Object} object. This will be {@code null} if key is not found or
      * the object stored against the key is {@code null}.
      */
-    public static Object getInternalPropertyValue(Context context, File propertiesFile, String key,
-                                                  @NonNull SharedPropertiesParser sharedPropertiesParser) {
-        return SharedProperties.getInternalProperty(context, propertiesFile, key, sharedPropertiesParser);
+    public static Object getTermuxInternalPropertyValue(Context context, String key) {
+        return SharedProperties.getInternalProperty(context, TermuxPropertyConstants.getTermuxPropertiesFile(), key, new SharedPropertiesParserClient());
     }
 
     /**

From d96883c4d62427a2e84ab53bbf9d40ecc450bdd9 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Fri, 22 Oct 2021 00:58:16 +0500
Subject: [PATCH 623/912] Changed|Deprecated: Deprecate `use-black-ui` termux
 property and replace it with `night-mode`

This will not break existing `use-black-ui` settings for users and it will automatically be converted to `night-mode` when properties are loaded from disk but a deprecation message will be logged.

This `night-mode` key can be used to set the day/night theme variant for activities used by termux app and its plugin. The user can set a string value to `true` to force use dark variant of theme, `false` to force use light variant of theme or `system` to automatically set theme based on current system settings. The default value is still `system`. The app must be restarted for changes to take effect for existing activities, including main terminal `TermuxActivity`.

This is required since "theme != night mode". In future custom theme or color support may be provided that will have both dark and night modes for the same theme.
---
 .../java/com/termux/app/TermuxActivity.java   |  5 +-
 .../TermuxSessionsListViewController.java     |  7 +-
 .../termux/shared/models/theme/NightMode.java | 48 +++++++++++
 .../properties/TermuxPropertyConstants.java   | 29 ++++++-
 .../properties/TermuxSharedProperties.java    | 86 +++++++++++++------
 .../com/termux/shared/theme/ThemeUtils.java   | 33 +++++++
 6 files changed, 174 insertions(+), 34 deletions(-)
 create mode 100644 termux-shared/src/main/java/com/termux/shared/models/theme/NightMode.java
 create mode 100644 termux-shared/src/main/java/com/termux/shared/theme/ThemeUtils.java

diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index 2c0797ec92..bf5837ec96 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -49,6 +49,7 @@
 import com.termux.shared.termux.interact.TextInputDialogUtils;
 import com.termux.shared.logger.Logger;
 import com.termux.shared.termux.TermuxUtils;
+import com.termux.shared.theme.ThemeUtils;
 import com.termux.shared.view.ViewUtils;
 import com.termux.terminal.TerminalSession;
 import com.termux.terminal.TerminalSessionClient;
@@ -406,7 +407,7 @@ public void onServiceDisconnected(ComponentName name) {
 
 
     private void setActivityTheme() {
-        if (mProperties.isUsingBlackUI()) {
+        if (ThemeUtils.shouldEnableDarkTheme(this, mProperties.getNightMode())) {
             this.setTheme(R.style.Theme_Termux_Black);
         } else {
             this.setTheme(R.style.Theme_Termux);
@@ -414,7 +415,7 @@ private void setActivityTheme() {
     }
 
     private void setDrawerTheme() {
-        if (mProperties.isUsingBlackUI()) {
+        if (ThemeUtils.shouldEnableDarkTheme(this, mProperties.getNightMode())) {
             findViewById(R.id.left_drawer).setBackgroundColor(ContextCompat.getColor(this,
                 android.R.color.background_dark));
             ((ImageButton) findViewById(R.id.settings_button)).setColorFilter(Color.WHITE);
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxSessionsListViewController.java b/app/src/main/java/com/termux/app/terminal/TermuxSessionsListViewController.java
index 61e07ec1e2..5e10d66dc4 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxSessionsListViewController.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxSessionsListViewController.java
@@ -21,6 +21,7 @@
 import com.termux.R;
 import com.termux.app.TermuxActivity;
 import com.termux.shared.termux.shell.TermuxSession;
+import com.termux.shared.theme.ThemeUtils;
 import com.termux.terminal.TerminalSession;
 
 import java.util.List;
@@ -55,9 +56,9 @@ public View getView(int position, View convertView, @NonNull ViewGroup parent) {
             return sessionRowView;
         }
 
-        boolean isUsingBlackUI = mActivity.getProperties().isUsingBlackUI();
+        boolean shouldEnableDarkTheme = ThemeUtils.shouldEnableDarkTheme(mActivity, mActivity.getProperties().getNightMode());
 
-        if (isUsingBlackUI) {
+        if (shouldEnableDarkTheme) {
             sessionTitleView.setBackground(
                 ContextCompat.getDrawable(mActivity, R.drawable.session_background_black_selected)
             );
@@ -84,7 +85,7 @@ public View getView(int position, View convertView, @NonNull ViewGroup parent) {
         } else {
             sessionTitleView.setPaintFlags(sessionTitleView.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG);
         }
-        int defaultColor = isUsingBlackUI ? Color.WHITE : Color.BLACK;
+        int defaultColor = shouldEnableDarkTheme ? Color.WHITE : Color.BLACK;
         int color = sessionRunning || sessionAtRow.getExitStatus() == 0 ? defaultColor : Color.RED;
         sessionTitleView.setTextColor(color);
         return sessionRowView;
diff --git a/termux-shared/src/main/java/com/termux/shared/models/theme/NightMode.java b/termux-shared/src/main/java/com/termux/shared/models/theme/NightMode.java
new file mode 100644
index 0000000000..f37ac57fc0
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/models/theme/NightMode.java
@@ -0,0 +1,48 @@
+package com.termux.shared.models.theme;
+
+import androidx.appcompat.app.AppCompatDelegate;
+
+/** The modes used by to decide night mode for themes. */
+public enum NightMode {
+
+    /** Night theme should be enabled. */
+    TRUE("true", AppCompatDelegate.MODE_NIGHT_YES),
+
+    /** Dark theme should be enabled. */
+    FALSE("false", AppCompatDelegate.MODE_NIGHT_NO),
+
+    /**
+     * Use night or dark theme depending on system night mode.
+     * https://developer.android.com/guide/topics/resources/providing-resources#NightQualifier
+     */
+    SYSTEM("system", AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM);
+
+    private final String name;
+    private final int mode;
+
+    NightMode(final String name, int mode) {
+        this.name = name;
+        this.mode = mode;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public int getMode() {
+        return mode;
+    }
+
+    public static Integer modeOf(String name) {
+        if (TRUE.name.equals(name))
+            return TRUE.mode;
+        else if (FALSE.name.equals(name))
+            return FALSE.mode;
+        else if (SYSTEM.name.equals(name)) {
+            return SYSTEM.mode;
+        } else {
+            return null;
+        }
+    }
+
+}
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxPropertyConstants.java b/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxPropertyConstants.java
index 4762935e44..a657613cf6 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxPropertyConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxPropertyConstants.java
@@ -1,6 +1,7 @@
 package com.termux.shared.termux.settings.properties;
 
 import com.google.common.collect.ImmutableBiMap;
+import com.termux.shared.models.theme.NightMode;
 import com.termux.shared.file.FileUtils;
 import com.termux.shared.file.filesystem.FileType;
 import com.termux.shared.settings.properties.SharedProperties;
@@ -16,7 +17,7 @@
 import java.util.Set;
 
 /*
- * Version: v0.15.0
+ * Version: v0.16.0
  * SPDX-License-Identifier: MIT
  *
  * Changelog
@@ -69,6 +70,9 @@
  *
  * - 0.15.0 (2021-09-05)
  *      - Add `KEY_EXTRA_KEYS_TEXT_ALL_CAPS`.
+ *
+ * - 0.16.0 (2021-10-21)
+ *      - Add `KEY_NIGHT_MODE`.
  */
 
 /**
@@ -118,6 +122,7 @@ public final class TermuxPropertyConstants {
 
 
     /** Defines the key for whether to use black UI */
+    @Deprecated
     public static final String KEY_USE_BLACK_UI =  "use-black-ui"; // Default: "use-black-ui"
 
 
@@ -295,6 +300,24 @@ public final class TermuxPropertyConstants {
 
 
 
+    /** Defines the key for {@link NightMode}. */
+    public static final String KEY_NIGHT_MODE = "night-mode"; // Default: "night-mode"
+
+    public static final String IVALUE_NIGHT_MODE_TRUE = NightMode.TRUE.getName();
+    public static final String IVALUE_NIGHT_MODE_FALSE = NightMode.FALSE.getName();
+    public static final String IVALUE_NIGHT_MODE_SYSTEM = NightMode.SYSTEM.getName();
+    public static final String DEFAULT_IVALUE_NIGHT_MODE = IVALUE_NIGHT_MODE_SYSTEM;
+
+    /** Defines the bidirectional map for {@link NightMode} values and their internal values */
+    public static final ImmutableBiMap<String, String> MAP_NIGHT_MODE =
+        new ImmutableBiMap.Builder<String, String>()
+            .put(IVALUE_NIGHT_MODE_TRUE, IVALUE_NIGHT_MODE_TRUE)
+            .put(IVALUE_NIGHT_MODE_FALSE, IVALUE_NIGHT_MODE_FALSE)
+            .put(IVALUE_NIGHT_MODE_SYSTEM, IVALUE_NIGHT_MODE_SYSTEM)
+            .build();
+
+
+
     /** Defines the key for whether toggle soft keyboard request will show/hide or enable/disable keyboard */
     public static final String KEY_SOFT_KEYBOARD_TOGGLE_BEHAVIOUR =  "soft-keyboard-toggle-behaviour"; // Default: "soft-keyboard-toggle-behaviour"
 
@@ -340,7 +363,6 @@ public final class TermuxPropertyConstants {
         KEY_EXTRA_KEYS_TEXT_ALL_CAPS,
         KEY_HIDE_SOFT_KEYBOARD_ON_STARTUP,
         KEY_TERMINAL_ONCLICK_URL_OPEN,
-        KEY_USE_BLACK_UI,
         KEY_USE_CTRL_SPACE_WORKAROUND,
         KEY_USE_FULLSCREEN,
         KEY_USE_FULLSCREEN_WORKAROUND,
@@ -368,9 +390,10 @@ public final class TermuxPropertyConstants {
         KEY_DEFAULT_WORKING_DIRECTORY,
         KEY_EXTRA_KEYS,
         KEY_EXTRA_KEYS_STYLE,
+        KEY_NIGHT_MODE,
         KEY_SOFT_KEYBOARD_TOGGLE_BEHAVIOUR,
         KEY_VOLUME_KEYS_BEHAVIOUR
-        ));
+    ));
 
     /** Defines the set for keys loaded by termux that have default boolean behaviour with false as default.
      * "true" -> true
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxSharedProperties.java b/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxSharedProperties.java
index a5ff7f6fd2..f46de32cd0 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxSharedProperties.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxSharedProperties.java
@@ -183,17 +183,47 @@ public static Object getTermuxInternalPropertyValue(Context context, String key)
      * The class that implements the {@link SharedPropertiesParser} interface.
      */
     public static class SharedPropertiesParserClient implements SharedPropertiesParser {
+        @NonNull
+        @Override
+        public Properties preProcessPropertiesOnReadFromDisk(@NonNull Context context, @NonNull Properties properties) {
+            return replaceUseBlackUIProperty(properties);
+        }
+
         /**
          * Override the
          * {@link SharedPropertiesParser#getInternalPropertyValueFromValue(Context,String,String)}
          * interface function.
          */
         @Override
-        public Object getInternalPropertyValueFromValue(Context context, String key, String value) {
+        public Object getInternalPropertyValueFromValue(@NonNull Context context, String key, String value) {
             return getInternalTermuxPropertyValueFromValue(context, key, value);
         }
     }
 
+    @NonNull
+    public static Properties replaceUseBlackUIProperty(@NonNull Properties properties) {
+        String useBlackUIStringValue = properties.getProperty(TermuxPropertyConstants.KEY_USE_BLACK_UI);
+        if (useBlackUIStringValue == null) return properties;
+
+        Logger.logWarn(LOG_TAG, "Removing deprecated property " + TermuxPropertyConstants.KEY_USE_BLACK_UI + "=" + useBlackUIStringValue);
+        properties.remove(TermuxPropertyConstants.KEY_USE_BLACK_UI);
+
+        // If KEY_NIGHT_MODE is not set
+        if (properties.getProperty(TermuxPropertyConstants.KEY_NIGHT_MODE) == null) {
+            Boolean useBlackUI = SharedProperties.getBooleanValueForStringValue(useBlackUIStringValue);
+            if (useBlackUI != null) {
+                String termuxAppTheme = useBlackUI ? TermuxPropertyConstants.IVALUE_NIGHT_MODE_TRUE :
+                    TermuxPropertyConstants.IVALUE_NIGHT_MODE_FALSE;
+                Logger.logWarn(LOG_TAG, "Replacing deprecated property " + TermuxPropertyConstants.KEY_USE_BLACK_UI + "=" + useBlackUI + " with " + TermuxPropertyConstants.KEY_NIGHT_MODE + "=" + termuxAppTheme);
+                properties.put(TermuxPropertyConstants.KEY_NIGHT_MODE, termuxAppTheme);
+            }
+        }
+
+        return properties;
+    }
+
+
+
     /**
      * A static function that should return the internal termux {@link Object} for a key/value pair
      * read from properties file.
@@ -213,10 +243,6 @@ public static Object getInternalTermuxPropertyValueFromValue(Context context, St
           - If the value is not null and does exist in MAP_*, then internal value returned by map will be used.
          */
         switch (key) {
-            /* boolean */
-            case TermuxPropertyConstants.KEY_USE_BLACK_UI:
-                return (boolean) getUseBlackUIInternalPropertyValueFromValue(context, value);
-
             /* int */
             case TermuxPropertyConstants.KEY_BELL_BEHAVIOUR:
                 return (int) getBellBehaviourInternalPropertyValueFromValue(value);
@@ -251,6 +277,8 @@ public static Object getInternalTermuxPropertyValueFromValue(Context context, St
                 return (String) getExtraKeysInternalPropertyValueFromValue(value);
             case TermuxPropertyConstants.KEY_EXTRA_KEYS_STYLE:
                 return (String) getExtraKeysStyleInternalPropertyValueFromValue(value);
+            case TermuxPropertyConstants.KEY_NIGHT_MODE:
+                return (String) getNightModeInternalPropertyValueFromValue(value);
             case TermuxPropertyConstants.KEY_SOFT_KEYBOARD_TOGGLE_BEHAVIOUR:
                 return (String) getSoftKeyboardToggleBehaviourInternalPropertyValueFromValue(value);
             case TermuxPropertyConstants.KEY_VOLUME_KEYS_BEHAVIOUR:
@@ -279,18 +307,6 @@ public static Object getInternalTermuxPropertyValueFromValue(Context context, St
 
 
 
-    /**
-     * Returns {@code true} or {@code false} if value is the literal string "true" or "false" respectively regardless of case.
-     * Otherwise returns {@code true} if the night mode is currently enabled in the system.
-     *
-     * @param value The {@link String} value to convert.
-     * @return Returns the internal value for value.
-     */
-    public static boolean getUseBlackUIInternalPropertyValueFromValue(Context context, String value) {
-        int nightMode = context.getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
-        return SharedProperties.getBooleanValueForStringValue(TermuxPropertyConstants.KEY_USE_BLACK_UI, value, nightMode == Configuration.UI_MODE_NIGHT_YES, true, LOG_TAG);
-    }
-
     /**
      * Returns the internal value after mapping it based on
      * {@code TermuxPropertyConstants#MAP_BELL_BEHAVIOUR} if the value is not {@code null}
@@ -314,11 +330,11 @@ public static int getBellBehaviourInternalPropertyValueFromValue(String value) {
      */
     public static int getTerminalCursorBlinkRateInternalPropertyValueFromValue(String value) {
         return SharedProperties.getDefaultIfNotInRange(TermuxPropertyConstants.KEY_TERMINAL_CURSOR_BLINK_RATE,
-                    DataUtils.getIntFromString(value, TermuxPropertyConstants.DEFAULT_IVALUE_TERMINAL_CURSOR_BLINK_RATE),
-                    TermuxPropertyConstants.DEFAULT_IVALUE_TERMINAL_CURSOR_BLINK_RATE,
-                    TermuxPropertyConstants.IVALUE_TERMINAL_CURSOR_BLINK_RATE_MIN,
-                    TermuxPropertyConstants.IVALUE_TERMINAL_CURSOR_BLINK_RATE_MAX,
-                    true, true, LOG_TAG);
+            DataUtils.getIntFromString(value, TermuxPropertyConstants.DEFAULT_IVALUE_TERMINAL_CURSOR_BLINK_RATE),
+            TermuxPropertyConstants.DEFAULT_IVALUE_TERMINAL_CURSOR_BLINK_RATE,
+            TermuxPropertyConstants.IVALUE_TERMINAL_CURSOR_BLINK_RATE_MIN,
+            TermuxPropertyConstants.IVALUE_TERMINAL_CURSOR_BLINK_RATE_MAX,
+            true, true, LOG_TAG);
     }
 
     /**
@@ -487,6 +503,18 @@ public static String getExtraKeysStyleInternalPropertyValueFromValue(String valu
         return SharedProperties.getDefaultIfNullOrEmpty(value, TermuxPropertyConstants.DEFAULT_IVALUE_EXTRA_KEYS_STYLE);
     }
 
+    /**
+     * Returns the value itself if it is not {@code null}, otherwise returns {@link TermuxPropertyConstants#DEFAULT_IVALUE_NIGHT_MODE}.
+     *
+     * @param value {@link String} value to convert.
+     * @return Returns the internal value for value.
+     */
+    public static String getNightModeInternalPropertyValueFromValue(String value) {
+        return (String) SharedProperties.getDefaultIfNotInMap(TermuxPropertyConstants.KEY_NIGHT_MODE,
+            TermuxPropertyConstants.MAP_NIGHT_MODE, SharedProperties.toLowerCase(value),
+            TermuxPropertyConstants.DEFAULT_IVALUE_NIGHT_MODE, true, LOG_TAG);
+    }
+
     /**
      * Returns the value itself if it is not {@code null}, otherwise returns {@link TermuxPropertyConstants#DEFAULT_IVALUE_SOFT_KEYBOARD_TOGGLE_BEHAVIOUR}.
      *
@@ -535,10 +563,6 @@ public boolean shouldOpenTerminalTranscriptURLOnClick() {
         return (boolean) getInternalPropertyValue(TermuxPropertyConstants.KEY_TERMINAL_ONCLICK_URL_OPEN, true);
     }
 
-    public boolean isUsingBlackUI() {
-        return (boolean) getInternalPropertyValue(TermuxPropertyConstants.KEY_USE_BLACK_UI, true);
-    }
-
     public boolean isUsingCtrlSpaceWorkaround() {
         return (boolean) getInternalPropertyValue(TermuxPropertyConstants.KEY_USE_CTRL_SPACE_WORKAROUND, true);
     }
@@ -587,6 +611,16 @@ public String getDefaultWorkingDirectory() {
         return (String) getInternalPropertyValue(TermuxPropertyConstants.KEY_DEFAULT_WORKING_DIRECTORY, true);
     }
 
+    public String getNightMode() {
+        return (String) getInternalPropertyValue(TermuxPropertyConstants.KEY_NIGHT_MODE, true);
+    }
+
+    /** Get the {@link TermuxPropertyConstants#KEY_NIGHT_MODE} value from the properties file on disk. */
+    public static String getNightMode(Context context) {
+        return (String) TermuxSharedProperties.getTermuxInternalPropertyValue(context,
+            TermuxPropertyConstants.KEY_NIGHT_MODE);
+    }
+
     public boolean shouldEnableDisableSoftKeyboardOnToggle() {
         return (boolean) TermuxPropertyConstants.IVALUE_SOFT_KEYBOARD_TOGGLE_BEHAVIOUR_ENABLE_DISABLE.equals(getInternalPropertyValue(TermuxPropertyConstants.KEY_SOFT_KEYBOARD_TOGGLE_BEHAVIOUR, true));
     }
diff --git a/termux-shared/src/main/java/com/termux/shared/theme/ThemeUtils.java b/termux-shared/src/main/java/com/termux/shared/theme/ThemeUtils.java
new file mode 100644
index 0000000000..0d73a7a90a
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/theme/ThemeUtils.java
@@ -0,0 +1,33 @@
+package com.termux.shared.theme;
+
+import android.content.Context;
+import android.content.res.Configuration;
+
+import com.termux.shared.models.theme.NightMode;
+
+public class ThemeUtils {
+
+    /**
+     * Will return true if system has enabled night mode.
+     * https://developer.android.com/guide/topics/resources/providing-resources#NightQualifier
+     */
+    public static boolean isNightModeEnabled(Context context) {
+        if (context == null) return false;
+        return (context.getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK) == Configuration.UI_MODE_NIGHT_YES;
+
+    }
+
+    /** Will return true if mode is set to {@link NightMode#TRUE}, otherwise will return true if
+     * mode is set to {@link NightMode#SYSTEM} and night mode is enabled by system. */
+    public static boolean shouldEnableDarkTheme(Context context, String name) {
+        if (NightMode.TRUE.getName().equals(name))
+            return true;
+        else if (NightMode.FALSE.getName().equals(name))
+            return false;
+        else if (NightMode.SYSTEM.getName().equals(name)) {
+            return isNightModeEnabled(context);
+        } else {
+            return false;
+        }
+    }
+}

From 3e518a6a75a26e64edd6b1f4643640c2459f5407 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 23 Oct 2021 04:16:50 +0500
Subject: [PATCH 624/912] Fixed: Fix termux-open failing to open files with "#"
 and remove hardcoded "content" and "file" strings

termux-open "/data/data/com.termux/files/home/te#st.sh"
---
 .../com/termux/app/TermuxOpenReceiver.java    | 18 +++--
 .../java/com/termux/shared/data/UriUtils.java | 75 +++++++++++++++++++
 2 files changed, 87 insertions(+), 6 deletions(-)
 create mode 100644 termux-shared/src/main/java/com/termux/shared/data/UriUtils.java

diff --git a/app/src/main/java/com/termux/app/TermuxOpenReceiver.java b/app/src/main/java/com/termux/app/TermuxOpenReceiver.java
index 3a85552b1a..7042ddd1b6 100644
--- a/app/src/main/java/com/termux/app/TermuxOpenReceiver.java
+++ b/app/src/main/java/com/termux/app/TermuxOpenReceiver.java
@@ -2,6 +2,7 @@
 
 import android.content.ActivityNotFoundException;
 import android.content.BroadcastReceiver;
+import android.content.ContentResolver;
 import android.content.ContentValues;
 import android.content.Context;
 import android.content.Intent;
@@ -15,6 +16,7 @@
 
 import com.termux.app.utils.PluginUtils;
 import com.termux.shared.data.IntentUtils;
+import com.termux.shared.data.UriUtils;
 import com.termux.shared.logger.Logger;
 import com.termux.shared.termux.TermuxConstants;
 
@@ -37,8 +39,8 @@ public void onReceive(Context context, Intent intent) {
         }
 
         Logger.logVerbose(LOG_TAG, "Intent Received:\n" + IntentUtils.getIntentString(intent));
+        Logger.logVerbose(LOG_TAG, "uri: \"" + data + "\", path: \"" + data.getPath() + "\", fragment: \"" + data.getFragment() + "\"");
 
-        final String filePath = data.getPath();
         final String contentTypeExtra = intent.getStringExtra("content-type");
         final boolean useChooser = intent.getBooleanExtra("chooser", false);
         final String intentAction = intent.getAction() == null ? Intent.ACTION_VIEW : intent.getAction();
@@ -52,8 +54,8 @@ public void onReceive(Context context, Intent intent) {
                 break;
         }
 
-        final boolean isExternalUrl = data.getScheme() != null && !data.getScheme().equals("file");
-        if (isExternalUrl) {
+        String scheme = data.getScheme();
+        if (scheme != null && !ContentResolver.SCHEME_FILE.equals(scheme)) {
             Intent urlIntent = new Intent(intentAction, data);
             if (intentAction.equals(Intent.ACTION_SEND)) {
                 urlIntent.putExtra(Intent.EXTRA_TEXT, data.toString());
@@ -70,6 +72,9 @@ public void onReceive(Context context, Intent intent) {
             return;
         }
 
+        // Get full path including fragment (anything after last "#")
+        String filePath = UriUtils.getUriFilePath(data);
+
         final File fileToShare = new File(filePath);
         if (!(fileToShare.isFile() && fileToShare.canRead())) {
             Logger.logError(LOG_TAG, "termux-open: Not a readable file: '" + fileToShare.getAbsolutePath() + "'");
@@ -93,7 +98,8 @@ public void onReceive(Context context, Intent intent) {
             contentTypeToUse = contentTypeExtra;
         }
 
-        Uri uriToShare = Uri.parse("content://" + TermuxConstants.TERMUX_FILE_SHARE_URI_AUTHORITY + fileToShare.getAbsolutePath());
+        // Do not create Uri with Uri.parse() and use Uri.Builder().path(), check UriUtils.getUriFilePath().
+        Uri uriToShare = UriUtils.getContentUri(TermuxConstants.TERMUX_FILE_SHARE_URI_AUTHORITY, fileToShare.getAbsolutePath());
 
         if (Intent.ACTION_SEND.equals(intentAction)) {
             sendIntent.putExtra(Intent.EXTRA_STREAM, uriToShare);
@@ -184,8 +190,8 @@ public ParcelFileDescriptor openFile(@NonNull Uri uri, @NonNull String mode) thr
             File file = new File(uri.getPath());
             try {
                 String path = file.getCanonicalPath();
-                String callingPackage = getCallingPackage();
-                Logger.logDebug(LOG_TAG, "Open file request received from " + callingPackage + " for \"" + path + "\" with mode \"" + mode + "\"");
+                String callingPackageName = getCallingPackage();
+                Logger.logDebug(LOG_TAG, "Open file request received from " + callingPackageName + " 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))) {
diff --git a/termux-shared/src/main/java/com/termux/shared/data/UriUtils.java b/termux-shared/src/main/java/com/termux/shared/data/UriUtils.java
new file mode 100644
index 0000000000..01aa6c72d8
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/data/UriUtils.java
@@ -0,0 +1,75 @@
+package com.termux.shared.data;
+
+import android.content.ContentResolver;
+import android.net.Uri;
+
+import androidx.annotation.NonNull;
+
+public class UriUtils {
+
+    /**
+     * Get the full file path from a {@link Uri}.
+     *
+     *  If the {@link Uri} was created from file path with {@link Uri#parse(String)}, like "am"
+     *  command "-d" option does, and the path contained a "#", then anything after it would become
+     *  the fragment and {@link Uri#getPath()} will only return the path before it, which would be
+     *  invalid. The fragment must be manually appended to the path to get the full path.
+     *
+     *  If the {@link Uri} was created with {@link Uri.Builder} and path was set
+     *  with {@link Uri.Builder#path(String)}, then "#" will automatically be encoded to "%23"
+     *  and separate fragment will not exist.
+     *
+     * @param uri The {@link Uri} to get basename from.
+     * @return Returns the file path if found, otherwise {@code null}.
+     */
+    public static String getUriFilePath(Uri uri) {
+        if (uri == null) return null;
+        String path = uri.getPath();
+        if (DataUtils.isNullOrEmpty(path)) return null;
+        String fragment = uri.getFragment();
+        return path + (DataUtils.isNullOrEmpty(fragment) ? "" : "#" + fragment);
+    }
+
+    /**
+     * Get {@link ContentResolver#SCHEME_FILE} {@link Uri} for path.
+     *
+     * @param path The path for the {@link Uri}.
+     * @return Returns the {@link Uri}.
+     */
+    public static Uri getFileUri(@NonNull String path) {
+        return new Uri.Builder().scheme(ContentResolver.SCHEME_FILE).path(path).build();
+    }
+
+    /**
+     * Get {@link ContentResolver#SCHEME_FILE} {@link Uri} for path.
+     *
+     * @param authority The authority for the {@link Uri}.
+     * @param path The path for the {@link Uri}.
+     * @return Returns the {@link Uri}.
+     */
+    public static Uri getFileUri(@NonNull String authority, @NonNull String path) {
+        return new Uri.Builder().scheme(ContentResolver.SCHEME_FILE).authority(authority).path(path).build();
+    }
+
+    /**
+     * Get {@link ContentResolver#SCHEME_CONTENT} {@link Uri} for path.
+     *
+     * @param path The path for the {@link Uri}.
+     * @return Returns the {@link Uri}.
+     */
+    public static Uri getContentUri(@NonNull String path) {
+        return new Uri.Builder().scheme(ContentResolver.SCHEME_CONTENT).path(path).build();
+    }
+
+    /**
+     * Get {@link ContentResolver#SCHEME_CONTENT} {@link Uri} for path.
+     *
+     * @param authority The authority for the {@link Uri}.
+     * @param path The path for the {@link Uri}.
+     * @return Returns the {@link Uri}.
+     */
+    public static Uri getContentUri(@NonNull String authority, @NonNull String path) {
+        return new Uri.Builder().scheme(ContentResolver.SCHEME_CONTENT).authority(authority).path(path).build();
+    }
+
+}

From b559d5a0bda866e8df0b241fe2c4f06fca416fcc Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 23 Oct 2021 04:20:16 +0500
Subject: [PATCH 625/912] Fixed: Fix TermuxService failing to execute files
 with "#"

am startservice --user 0 -n com.termux/.app.TermuxService -a com.termux.service_execute -d "file:///data/data/com.termux/files/home/te#st.sh"
---
 app/src/main/java/com/termux/app/TermuxService.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/termux/app/TermuxService.java b/app/src/main/java/com/termux/app/TermuxService.java
index 0b3baaa6c8..141ebdaf62 100644
--- a/app/src/main/java/com/termux/app/TermuxService.java
+++ b/app/src/main/java/com/termux/app/TermuxService.java
@@ -26,6 +26,7 @@
 import com.termux.app.terminal.TermuxTerminalSessionClient;
 import com.termux.app.utils.PluginUtils;
 import com.termux.shared.data.IntentUtils;
+import com.termux.shared.data.UriUtils;
 import com.termux.shared.models.errors.Errno;
 import com.termux.shared.shell.ShellUtils;
 import com.termux.shared.termux.shell.TermuxShellEnvironmentClient;
@@ -360,7 +361,10 @@ private void actionServiceExecute(Intent intent) {
         executionCommand.inBackground = intent.getBooleanExtra(TERMUX_SERVICE.EXTRA_BACKGROUND, false);
 
         if (executionCommand.executableUri != null) {
-            executionCommand.executable = executionCommand.executableUri.getPath();
+            Logger.logVerbose(LOG_TAG, "uri: \"" + executionCommand.executableUri + "\", path: \"" + executionCommand.executableUri.getPath() + "\", fragment: \"" + executionCommand.executableUri.getFragment() + "\"");
+
+            // Get full path including fragment (anything after last "#")
+            executionCommand.executable = UriUtils.getUriFilePath(executionCommand.executableUri);
             executionCommand.arguments = IntentUtils.getStringArrayExtraIfSet(intent, TERMUX_SERVICE.EXTRA_ARGUMENTS, null);
             if (executionCommand.inBackground)
                 executionCommand.stdin = IntentUtils.getStringExtraIfSet(intent, TERMUX_SERVICE.EXTRA_STDIN, null);

From 74b23cb2096652601050d0f4951f9fb92577743c Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 23 Oct 2021 04:33:23 +0500
Subject: [PATCH 626/912] Fixed: Fix TermuxFileReceiverActivity failing to open
 files with "#" and remove hardcoded "content" and "file" strings and fix
 indentation

am start -a android.intent.action.VIEW -n com.termux/.filepicker.TermuxFileReceiverActivity -d "file:///data/data/com.termux/files/home/te#st.sh"
---
 .../TermuxFileReceiverActivity.java           | 61 +++++++++++--------
 1 file changed, 35 insertions(+), 26 deletions(-)

diff --git a/app/src/main/java/com/termux/filepicker/TermuxFileReceiverActivity.java b/app/src/main/java/com/termux/filepicker/TermuxFileReceiverActivity.java
index 17244e41ab..d9af2c317f 100644
--- a/app/src/main/java/com/termux/filepicker/TermuxFileReceiverActivity.java
+++ b/app/src/main/java/com/termux/filepicker/TermuxFileReceiverActivity.java
@@ -1,15 +1,19 @@
 package com.termux.filepicker;
 
 import android.app.Activity;
+import android.content.ContentResolver;
 import android.content.Intent;
 import android.database.Cursor;
 import android.net.Uri;
 import android.provider.OpenableColumns;
 import android.util.Patterns;
 
+import androidx.annotation.NonNull;
+
 import com.termux.R;
 import com.termux.shared.data.DataUtils;
 import com.termux.shared.data.IntentUtils;
+import com.termux.shared.data.UriUtils;
 import com.termux.shared.interact.MessageDialogUtils;
 import com.termux.shared.termux.interact.TextInputDialogUtils;
 import com.termux.shared.termux.TermuxConstants;
@@ -89,11 +93,13 @@ protected void onResume() {
                 return;
             }
 
-            if ("content".equals(scheme)) {
+            if (ContentResolver.SCHEME_CONTENT.equals(scheme)) {
                 handleContentUri(dataUri, sharedTitle);
-            } else if ("file".equals(scheme)) {
-                // When e.g. clicking on a downloaded apk:
-                String path = dataUri.getPath();
+            } else if (ContentResolver.SCHEME_FILE.equals(scheme)) {
+                Logger.logVerbose(LOG_TAG, "uri: \"" + dataUri + "\", path: \"" + dataUri.getPath() + "\", fragment: \"" + dataUri.getFragment() + "\"");
+
+                // Get full path including fragment (anything after last "#")
+                String path = UriUtils.getUriFilePath(dataUri);
                 if (DataUtils.isNullOrEmpty(path)) {
                     showErrorDialogAndQuit("File path from data uri is null, empty or invalid.");
                     return;
@@ -121,8 +127,10 @@ void showErrorDialogAndQuit(String message) {
             dialog -> finish());
     }
 
-    void handleContentUri(final Uri uri, String subjectFromIntent) {
+    void handleContentUri(@NonNull final Uri uri, String subjectFromIntent) {
         try {
+            Logger.logVerbose(LOG_TAG, "uri: \"" + uri + "\", path: \"" + uri.getPath() + "\", fragment: \"" + uri.getFragment() + "\"");
+
             String attachmentFileName = null;
 
             String[] projection = new String[]{OpenableColumns.DISPLAY_NAME};
@@ -144,29 +152,30 @@ void handleContentUri(final Uri uri, String subjectFromIntent) {
     }
 
     void promptNameAndSave(final InputStream in, final String attachmentFileName) {
-        TextInputDialogUtils.textInput(this, R.string.title_file_received, attachmentFileName, R.string.action_file_received_edit, text -> {
-            File outFile = saveStreamWithName(in, text);
-            if (outFile == null) return;
-
-            final File editorProgramFile = new File(EDITOR_PROGRAM);
-            if (!editorProgramFile.isFile()) {
-                showErrorDialogAndQuit("The following file does not exist:\n$HOME/bin/termux-file-editor\n\n"
-                    + "Create this file as a script or a symlink - it will be called with the received file as only argument.");
-                return;
-            }
+        TextInputDialogUtils.textInput(this, R.string.title_file_received, attachmentFileName,
+            R.string.action_file_received_edit, text -> {
+                File outFile = saveStreamWithName(in, text);
+                if (outFile == null) return;
+
+                final File editorProgramFile = new File(EDITOR_PROGRAM);
+                if (!editorProgramFile.isFile()) {
+                    showErrorDialogAndQuit("The following file does not exist:\n$HOME/bin/termux-file-editor\n\n"
+                        + "Create this file as a script or a symlink - it will be called with the received file as only argument.");
+                    return;
+                }
 
-            // Do this for the user if necessary:
-            //noinspection ResultOfMethodCallIgnored
-            editorProgramFile.setExecutable(true);
+                // Do this for the user if necessary:
+                //noinspection ResultOfMethodCallIgnored
+                editorProgramFile.setExecutable(true);
 
-            final Uri scriptUri = new Uri.Builder().scheme("file").path(EDITOR_PROGRAM).build();
+                final Uri scriptUri = UriUtils.getFileUri(EDITOR_PROGRAM);
 
-            Intent executeIntent = new Intent(TERMUX_SERVICE.ACTION_SERVICE_EXECUTE, scriptUri);
-            executeIntent.setClass(TermuxFileReceiverActivity.this, TermuxService.class);
-            executeIntent.putExtra(TERMUX_SERVICE.EXTRA_ARGUMENTS, new String[]{outFile.getAbsolutePath()});
-            startService(executeIntent);
-            finish();
-        },
+                Intent executeIntent = new Intent(TERMUX_SERVICE.ACTION_SERVICE_EXECUTE, scriptUri);
+                executeIntent.setClass(TermuxFileReceiverActivity.this, TermuxService.class);
+                executeIntent.putExtra(TERMUX_SERVICE.EXTRA_ARGUMENTS, new String[]{outFile.getAbsolutePath()});
+                startService(executeIntent);
+                finish();
+            },
             R.string.action_file_received_open_directory, text -> {
                 if (saveStreamWithName(in, text) == null) return;
 
@@ -223,7 +232,7 @@ void handleUrlAndFinish(final String url) {
         //noinspection ResultOfMethodCallIgnored
         urlOpenerProgramFile.setExecutable(true);
 
-        final Uri urlOpenerProgramUri = new Uri.Builder().scheme("file").path(URL_OPENER_PROGRAM).build();
+        final Uri urlOpenerProgramUri = UriUtils.getFileUri(URL_OPENER_PROGRAM);
 
         Intent executeIntent = new Intent(TERMUX_SERVICE.ACTION_SERVICE_EXECUTE, urlOpenerProgramUri);
         executeIntent.setClass(TermuxFileReceiverActivity.this, TermuxService.class);

From 7bbc12c7c9e5310dbe6b1e425cb3b975d74ecaba Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 23 Oct 2021 22:41:08 +0500
Subject: [PATCH 627/912] Fixed: Get file basename from Uri path when opening
 files in termux if failed to get it ContentResolver and EXTRA_TITLE

---
 .../TermuxFileReceiverActivity.java           |  1 +
 .../java/com/termux/shared/data/UriUtils.java | 24 +++++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/app/src/main/java/com/termux/filepicker/TermuxFileReceiverActivity.java b/app/src/main/java/com/termux/filepicker/TermuxFileReceiverActivity.java
index d9af2c317f..b9022a0eb5 100644
--- a/app/src/main/java/com/termux/filepicker/TermuxFileReceiverActivity.java
+++ b/app/src/main/java/com/termux/filepicker/TermuxFileReceiverActivity.java
@@ -142,6 +142,7 @@ void handleContentUri(@NonNull final Uri uri, String subjectFromIntent) {
             }
 
             if (attachmentFileName == null) attachmentFileName = subjectFromIntent;
+            if (attachmentFileName == null) attachmentFileName = UriUtils.getUriFileBasename(uri, true);
 
             InputStream in = getContentResolver().openInputStream(uri);
             promptNameAndSave(in, attachmentFileName);
diff --git a/termux-shared/src/main/java/com/termux/shared/data/UriUtils.java b/termux-shared/src/main/java/com/termux/shared/data/UriUtils.java
index 01aa6c72d8..4149d45d04 100644
--- a/termux-shared/src/main/java/com/termux/shared/data/UriUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/data/UriUtils.java
@@ -5,6 +5,8 @@
 
 import androidx.annotation.NonNull;
 
+import com.termux.shared.file.FileUtils;
+
 public class UriUtils {
 
     /**
@@ -30,6 +32,28 @@ public static String getUriFilePath(Uri uri) {
         return path + (DataUtils.isNullOrEmpty(fragment) ? "" : "#" + fragment);
     }
 
+    /**
+     * Get the file basename from a {@link Uri}. The file basename is anything after last forward
+     * slash "/" in the path, or the path itself if its not found.
+     *
+     * @param uri The {@link Uri} to get basename from.
+     * @param withFragment If the {@link Uri} fragment should be included in basename.
+     * @return Returns the file basename if found, otherwise {@code null}.
+     */
+    public static String getUriFileBasename(Uri uri, boolean withFragment) {
+        if (uri == null) return null;
+
+        String path;
+        if (withFragment) {
+            path = getUriFilePath(uri);
+        } else {
+            path = uri.getPath();
+            if (DataUtils.isNullOrEmpty(path)) return null;
+        }
+
+        return FileUtils.getFileBasename(path);
+    }
+
     /**
      * Get {@link ContentResolver#SCHEME_FILE} {@link Uri} for path.
      *

From 37b9bcf5af7f0ea9beb86c1c6c43879a66968a29 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Mon, 25 Oct 2021 18:37:40 +0500
Subject: [PATCH 628/912] Changed!: Rename FileUtils readStringFromFile() to
 readTextFromFile() and writeStringToFile() to writeTextToFile()

---
 .../java/com/termux/app/utils/CrashUtils.java |  2 +-
 .../com/termux/shared/crash/CrashHandler.java |  2 +-
 .../com/termux/shared/file/FileUtils.java     | 26 +++++++++----------
 .../shared/file/tests/FileUtilsTests.java     |  6 ++---
 .../termux/shared/interact/ShareUtils.java    |  2 +-
 .../shared/models/errors/FileUtilsErrno.java  |  4 +--
 .../com/termux/shared/shell/ResultSender.java | 12 ++++-----
 7 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/app/src/main/java/com/termux/app/utils/CrashUtils.java b/app/src/main/java/com/termux/app/utils/CrashUtils.java
index eec5fd04c9..256515456e 100644
--- a/app/src/main/java/com/termux/app/utils/CrashUtils.java
+++ b/app/src/main/java/com/termux/app/utils/CrashUtils.java
@@ -69,7 +69,7 @@ public void run() {
                 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);
+                error = FileUtils.readTextFromFile("crash log", TermuxConstants.TERMUX_CRASH_LOG_FILE_PATH, Charset.defaultCharset(), reportStringBuilder, false);
                 if (error != null) {
                     Logger.logErrorExtended(logTag, error.toString());
                     return;
diff --git a/termux-shared/src/main/java/com/termux/shared/crash/CrashHandler.java b/termux-shared/src/main/java/com/termux/shared/crash/CrashHandler.java
index 4691d5486d..8b670c34c6 100644
--- a/termux-shared/src/main/java/com/termux/shared/crash/CrashHandler.java
+++ b/termux-shared/src/main/java/com/termux/shared/crash/CrashHandler.java
@@ -70,7 +70,7 @@ public static void logCrash(@NonNull final Context context, @NonNull final Crash
         Logger.logError(reportString.toString());
 
         // Write report string to crash log file
-        Error error = FileUtils.writeStringToFile("crash log", crashHandlerClient.getCrashLogFilePath(context),
+        Error error = FileUtils.writeTextToFile("crash log", crashHandlerClient.getCrashLogFilePath(context),
                         Charset.defaultCharset(), reportString.toString(), false);
         if (error != null) {
             Logger.logErrorExtended(LOG_TAG, error.toString());
diff --git a/termux-shared/src/main/java/com/termux/shared/file/FileUtils.java b/termux-shared/src/main/java/com/termux/shared/file/FileUtils.java
index ee9bf9b3e6..e3688728c3 100644
--- a/termux-shared/src/main/java/com/termux/shared/file/FileUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/file/FileUtils.java
@@ -1375,22 +1375,22 @@ public static Error deleteFilesOlderThanXDays(String label, final String filePat
 
 
     /**
-     * Read a {@link String} from file at path with a specific {@link Charset} into {@code dataString}.
+     * Read a text {@link String} from file at path with a specific {@link Charset} into {@code dataString}.
      *
      * @param label The optional label for file to read. This can optionally be {@code null}.
      * @param filePath The {@code path} for file to read.
      * @param charset The {@link Charset} of the file. If this is {@code null},
-     *      *                then default {@link Charset} will be used.
+     *                then default {@link Charset} will be used.
      * @param dataStringBuilder The {@code StringBuilder} to read data into.
      * @param ignoreNonExistentFile The {@code boolean} that decides if it should be considered an
      *                              error if file to read doesn't exist.
      * @return Returns the {@code error} if reading was not successful, otherwise {@code null}.
      */
-    public static Error readStringFromFile(String label, final String filePath, Charset charset, @NonNull final StringBuilder dataStringBuilder, final boolean ignoreNonExistentFile) {
+    public static Error readTextFromFile(String label, final String filePath, Charset charset, @NonNull final StringBuilder dataStringBuilder, final boolean ignoreNonExistentFile) {
         label = (label == null ? "" : label + " ");
         if (filePath == null || filePath.isEmpty()) return FunctionErrno.ERRNO_NULL_OR_EMPTY_PARAMETER.getError(label + "file path", "readStringFromFile");
 
-        Logger.logVerbose(LOG_TAG, "Reading string from " + label + "file at path \"" + filePath + "\"");
+        Logger.logVerbose(LOG_TAG, "Reading text from " + label + "file at path \"" + filePath + "\"");
 
         Error error;
 
@@ -1423,7 +1423,7 @@ public static Error readStringFromFile(String label, final String filePath, Char
         FileInputStream fileInputStream = null;
         BufferedReader bufferedReader = null;
         try {
-            // Read string from file
+            // Read text from file
             fileInputStream = new FileInputStream(filePath);
             bufferedReader = new BufferedReader(new InputStreamReader(fileInputStream, charset));
 
@@ -1437,7 +1437,7 @@ public static Error readStringFromFile(String label, final String filePath, Char
 
             Logger.logVerbose(LOG_TAG, Logger.getMultiLineLogStringEntry("String", DataUtils.getTruncatedCommandOutput(dataStringBuilder.toString(), Logger.LOGGER_ENTRY_MAX_SAFE_PAYLOAD, true, false, true), "-"));
         } catch (Exception e) {
-            return FileUtilsErrno.ERRNO_READING_STRING_FROM_FILE_FAILED_WITH_EXCEPTION.getError(e, label + "file", filePath, e.getMessage());
+            return FileUtilsErrno.ERRNO_READING_TEXT_FROM_FILE_FAILED_WITH_EXCEPTION.getError(e, label + "file", filePath, e.getMessage());
         } finally {
             closeCloseable(fileInputStream);
             closeCloseable(bufferedReader);
@@ -1497,7 +1497,7 @@ public static <T extends Serializable> ReadSerializableObjectResult readSerializ
         FileInputStream fileInputStream = null;
         ObjectInputStream objectInputStream = null;
         try {
-            // Read string from file
+            // Read serializable object from file
             fileInputStream = new FileInputStream(filePath);
             objectInputStream = new ObjectInputStream(fileInputStream);
             //serializableObject = (T) objectInputStream.readObject();
@@ -1515,7 +1515,7 @@ public static <T extends Serializable> ReadSerializableObjectResult readSerializ
     }
 
     /**
-     * Write the {@link String} {@code dataString} with a specific {@link Charset} to file at path.
+     * Write text {@code dataString} with a specific {@link Charset} to file at path.
      *
      * @param label The optional label for file to write. This can optionally be {@code null}.
      * @param filePath The {@code path} for file to write.
@@ -1525,11 +1525,11 @@ public static <T extends Serializable> ReadSerializableObjectResult readSerializ
      * @param append The {@code boolean} that decides if file should be appended to or not.
      * @return Returns the {@code error} if writing was not successful, otherwise {@code null}.
      */
-    public static Error writeStringToFile(String label, final String filePath, Charset charset, final String dataString, final boolean append) {
+    public static Error writeTextToFile(String label, final String filePath, Charset charset, final String dataString, final boolean append) {
         label = (label == null ? "" : label + " ");
         if (filePath == null || filePath.isEmpty()) return FunctionErrno.ERRNO_NULL_OR_EMPTY_PARAMETER.getError(label + "file path", "writeStringToFile");
 
-        Logger.logVerbose(LOG_TAG, Logger.getMultiLineLogStringEntry("Writing string to " + label + "file at path \"" + filePath + "\"", DataUtils.getTruncatedCommandOutput(dataString, Logger.LOGGER_ENTRY_MAX_SAFE_PAYLOAD, true, false, true), "-"));
+        Logger.logVerbose(LOG_TAG, Logger.getMultiLineLogStringEntry("Writing text to " + label + "file at path \"" + filePath + "\"", DataUtils.getTruncatedCommandOutput(dataString, Logger.LOGGER_ENTRY_MAX_SAFE_PAYLOAD, true, false, true), "-"));
 
         Error error;
 
@@ -1547,14 +1547,14 @@ public static Error writeStringToFile(String label, final String filePath, Chars
         FileOutputStream fileOutputStream = null;
         BufferedWriter bufferedWriter = null;
         try {
-            // Write string to file
+            // Write text to file
             fileOutputStream = new FileOutputStream(filePath, append);
             bufferedWriter = new BufferedWriter(new OutputStreamWriter(fileOutputStream, charset));
 
             bufferedWriter.write(dataString);
             bufferedWriter.flush();
         } catch (Exception e) {
-            return FileUtilsErrno.ERRNO_WRITING_STRING_TO_FILE_FAILED_WITH_EXCEPTION.getError(e, label + "file", filePath, e.getMessage());
+            return FileUtilsErrno.ERRNO_WRITING_TEXT_TO_FILE_FAILED_WITH_EXCEPTION.getError(e, label + "file", filePath, e.getMessage());
         } finally {
             closeCloseable(fileOutputStream);
             closeCloseable(bufferedWriter);
@@ -1586,7 +1586,7 @@ public static <T extends Serializable> Error writeSerializableObjectToFile(Strin
         FileOutputStream fileOutputStream = null;
         ObjectOutputStream objectOutputStream = null;
         try {
-            // Write object to file
+            // Write serializable object to file
             fileOutputStream = new FileOutputStream(filePath);
             objectOutputStream = new ObjectOutputStream(fileOutputStream);
 
diff --git a/termux-shared/src/main/java/com/termux/shared/file/tests/FileUtilsTests.java b/termux-shared/src/main/java/com/termux/shared/file/tests/FileUtilsTests.java
index 822053172d..06944505ce 100644
--- a/termux-shared/src/main/java/com/termux/shared/file/tests/FileUtilsTests.java
+++ b/termux-shared/src/main/java/com/termux/shared/file/tests/FileUtilsTests.java
@@ -158,18 +158,18 @@ private static void runTestsInner(@NonNull final String testRootDirectoryPath) t
 
         // Write "line1" to dir2/sub_reg1 regular file
         label = dir2__sub_reg1_label; path = dir2__sub_reg1_path;
-        error = FileUtils.writeStringToFile(label, path, Charset.defaultCharset(), "line1", false);
+        error = FileUtils.writeTextToFile(label, path, Charset.defaultCharset(), "line1", false);
         assertEqual("Failed to write string to " + label + " file with append mode false", null, error);
         if (!FileUtils.regularFileExists(path, false))
             throwException("The " + label + " file does not exist as expected after writing to it with append mode false");
 
         // Write "line2" to dir2/sub_reg1 regular file
-        error = FileUtils.writeStringToFile(label, path, Charset.defaultCharset(), "\nline2", true);
+        error = FileUtils.writeTextToFile(label, path, Charset.defaultCharset(), "\nline2", true);
         assertEqual("Failed to write string to " + label + " file with append mode true", null, error);
 
         // Read dir2/sub_reg1 regular file
         StringBuilder dataStringBuilder = new StringBuilder();
-        error = FileUtils.readStringFromFile(label, path, Charset.defaultCharset(), dataStringBuilder, false);
+        error = FileUtils.readTextFromFile(label, path, Charset.defaultCharset(), dataStringBuilder, false);
         assertEqual("Failed to read from " + label + " file", null, error);
         assertEqual("The data read from " + label + " file in not as expected", "line1\nline2", dataStringBuilder.toString());
 
diff --git a/termux-shared/src/main/java/com/termux/shared/interact/ShareUtils.java b/termux-shared/src/main/java/com/termux/shared/interact/ShareUtils.java
index 030ce47dba..ae510d31ce 100644
--- a/termux-shared/src/main/java/com/termux/shared/interact/ShareUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/interact/ShareUtils.java
@@ -141,7 +141,7 @@ else if (context instanceof Activity)
             return;
         }
 
-        Error error = FileUtils.writeStringToFile(label, filePath,
+        Error error = FileUtils.writeTextToFile(label, filePath,
             Charset.defaultCharset(), text, false);
         if (error != null) {
             Logger.logErrorExtended(LOG_TAG, error.toString());
diff --git a/termux-shared/src/main/java/com/termux/shared/models/errors/FileUtilsErrno.java b/termux-shared/src/main/java/com/termux/shared/models/errors/FileUtilsErrno.java
index 645740411a..cdf3c0f833 100644
--- a/termux-shared/src/main/java/com/termux/shared/models/errors/FileUtilsErrno.java
+++ b/termux-shared/src/main/java/com/termux/shared/models/errors/FileUtilsErrno.java
@@ -65,8 +65,8 @@ public class FileUtilsErrno extends Errno {
 
 
     /* Errors for file reading and writing (350-400) */
-    public static final Errno ERRNO_READING_STRING_FROM_FILE_FAILED_WITH_EXCEPTION = new Errno(TYPE, 350, "Reading string from %1$s at path \"%2$s\" failed.\nException: %3$s");
-    public static final Errno ERRNO_WRITING_STRING_TO_FILE_FAILED_WITH_EXCEPTION = new Errno(TYPE, 351, "Writing string to %1$s at path \"%2$s\" failed.\nException: %3$s");
+    public static final Errno ERRNO_READING_TEXT_FROM_FILE_FAILED_WITH_EXCEPTION = new Errno(TYPE, 350, "Reading text from %1$s at path \"%2$s\" failed.\nException: %3$s");
+    public static final Errno ERRNO_WRITING_TEXT_TO_FILE_FAILED_WITH_EXCEPTION = new Errno(TYPE, 351, "Writing text to %1$s at path \"%2$s\" failed.\nException: %3$s");
     public static final Errno ERRNO_UNSUPPORTED_CHARSET = new Errno(TYPE, 352, "Unsupported charset \"%1$s\"");
     public static final Errno ERRNO_CHECKING_IF_CHARSET_SUPPORTED_FAILED = new Errno(TYPE, 353, "Checking if charset \"%1$s\" is supported failed.\nException: %2$s");
     public static final Errno ERRNO_READING_SERIALIZABLE_OBJECT_TO_FILE_FAILED_WITH_EXCEPTION = new Errno(TYPE, 354, "Reading serializable object from %1$s at path \"%2$s\" failed.\nException: %3$s");
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/ResultSender.java b/termux-shared/src/main/java/com/termux/shared/shell/ResultSender.java
index be7db2ecfe..e77634c0e6 100644
--- a/termux-shared/src/main/java/com/termux/shared/shell/ResultSender.java
+++ b/termux-shared/src/main/java/com/termux/shared/shell/ResultSender.java
@@ -253,7 +253,7 @@ else if (resultDataStderr.isEmpty())
             // Write error or output to temp file
             // Check errCode file creation below for explanation for why temp file is used
             String temp_filename = resultConfig.resultFileBasename + "-" + AndroidUtils.getCurrentMilliSecondLocalTimeStamp();
-            error = FileUtils.writeStringToFile(temp_filename, resultConfig.resultDirectoryPath + "/" + temp_filename,
+            error = FileUtils.writeTextToFile(temp_filename, resultConfig.resultDirectoryPath + "/" + temp_filename,
                 null, error_or_output, false);
             if (error != null) {
                 return error;
@@ -283,7 +283,7 @@ else if (resultDataStderr.isEmpty())
             // Write stdout to file
             if (!resultDataStdout.isEmpty()) {
                 filename = RESULT_SENDER.RESULT_FILE_STDOUT_PREFIX + resultConfig.resultFilesSuffix;
-                error = FileUtils.writeStringToFile(filename, resultConfig.resultDirectoryPath + "/" + filename,
+                error = FileUtils.writeTextToFile(filename, resultConfig.resultDirectoryPath + "/" + filename,
                     null, resultDataStdout, false);
                 if (error != null) {
                     return error;
@@ -293,7 +293,7 @@ else if (resultDataStderr.isEmpty())
             // Write stderr to file
             if (!resultDataStderr.isEmpty()) {
                 filename = RESULT_SENDER.RESULT_FILE_STDERR_PREFIX + resultConfig.resultFilesSuffix;
-                error = FileUtils.writeStringToFile(filename, resultConfig.resultDirectoryPath + "/" + filename,
+                error = FileUtils.writeTextToFile(filename, resultConfig.resultDirectoryPath + "/" + filename,
                     null, resultDataStderr, false);
                 if (error != null) {
                     return error;
@@ -303,7 +303,7 @@ else if (resultDataStderr.isEmpty())
             // Write exitCode to file
             if (!resultDataExitCode.isEmpty()) {
                 filename = RESULT_SENDER.RESULT_FILE_EXIT_CODE_PREFIX + resultConfig.resultFilesSuffix;
-                error = FileUtils.writeStringToFile(filename, resultConfig.resultDirectoryPath + "/" + filename,
+                error = FileUtils.writeTextToFile(filename, resultConfig.resultDirectoryPath + "/" + filename,
                     null, resultDataExitCode, false);
                 if (error != null) {
                     return error;
@@ -313,7 +313,7 @@ else if (resultDataStderr.isEmpty())
             // Write errmsg to file
             if (resultData.isStateFailed() && !resultDataErrmsg.isEmpty()) {
                 filename = RESULT_SENDER.RESULT_FILE_ERRMSG_PREFIX + resultConfig.resultFilesSuffix;
-                error = FileUtils.writeStringToFile(filename, resultConfig.resultDirectoryPath + "/" + filename,
+                error = FileUtils.writeTextToFile(filename, resultConfig.resultDirectoryPath + "/" + filename,
                     null, resultDataErrmsg, false);
                 if (error != null) {
                     return error;
@@ -331,7 +331,7 @@ else if (resultDataStderr.isEmpty())
             // Write errCode to temp file
             String temp_filename = RESULT_SENDER.RESULT_FILE_ERR_PREFIX + "-" + AndroidUtils.getCurrentMilliSecondLocalTimeStamp();
             if (!resultConfig.resultFilesSuffix.isEmpty()) temp_filename = temp_filename + "-" + resultConfig.resultFilesSuffix;
-            error = FileUtils.writeStringToFile(temp_filename, resultConfig.resultDirectoryPath + "/" + temp_filename,
+            error = FileUtils.writeTextToFile(temp_filename, resultConfig.resultDirectoryPath + "/" + temp_filename,
                 null, String.valueOf(resultData.getErrCode()), false);
             if (error != null) {
                 return error;

From 549a772d453e51b31d3b6656dab0e99bde9afdc4 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Tue, 26 Oct 2021 00:46:54 +0500
Subject: [PATCH 629/912] Added: Add UriScheme and move UriUtils to
 com.termux.shared.net package

---
 .../com/termux/app/TermuxOpenReceiver.java    |  6 ++--
 .../java/com/termux/app/TermuxService.java    |  2 +-
 .../TermuxFileReceiverActivity.java           |  8 ++---
 .../termux/shared/models/net/UriScheme.java   | 28 +++++++++++++++
 .../termux/shared/{data => net}/UriUtils.java | 35 ++++++++++---------
 5 files changed, 54 insertions(+), 25 deletions(-)
 create mode 100644 termux-shared/src/main/java/com/termux/shared/models/net/UriScheme.java
 rename termux-shared/src/main/java/com/termux/shared/{data => net}/UriUtils.java (63%)

diff --git a/app/src/main/java/com/termux/app/TermuxOpenReceiver.java b/app/src/main/java/com/termux/app/TermuxOpenReceiver.java
index 7042ddd1b6..1e307cc96e 100644
--- a/app/src/main/java/com/termux/app/TermuxOpenReceiver.java
+++ b/app/src/main/java/com/termux/app/TermuxOpenReceiver.java
@@ -2,7 +2,6 @@
 
 import android.content.ActivityNotFoundException;
 import android.content.BroadcastReceiver;
-import android.content.ContentResolver;
 import android.content.ContentValues;
 import android.content.Context;
 import android.content.Intent;
@@ -16,8 +15,9 @@
 
 import com.termux.app.utils.PluginUtils;
 import com.termux.shared.data.IntentUtils;
-import com.termux.shared.data.UriUtils;
+import com.termux.shared.net.UriUtils;
 import com.termux.shared.logger.Logger;
+import com.termux.shared.models.net.UriScheme;
 import com.termux.shared.termux.TermuxConstants;
 
 import java.io.File;
@@ -55,7 +55,7 @@ public void onReceive(Context context, Intent intent) {
         }
 
         String scheme = data.getScheme();
-        if (scheme != null && !ContentResolver.SCHEME_FILE.equals(scheme)) {
+        if (scheme != null && !UriScheme.SCHEME_FILE.equals(scheme)) {
             Intent urlIntent = new Intent(intentAction, data);
             if (intentAction.equals(Intent.ACTION_SEND)) {
                 urlIntent.putExtra(Intent.EXTRA_TEXT, data.toString());
diff --git a/app/src/main/java/com/termux/app/TermuxService.java b/app/src/main/java/com/termux/app/TermuxService.java
index 141ebdaf62..74a7456206 100644
--- a/app/src/main/java/com/termux/app/TermuxService.java
+++ b/app/src/main/java/com/termux/app/TermuxService.java
@@ -26,7 +26,7 @@
 import com.termux.app.terminal.TermuxTerminalSessionClient;
 import com.termux.app.utils.PluginUtils;
 import com.termux.shared.data.IntentUtils;
-import com.termux.shared.data.UriUtils;
+import com.termux.shared.net.UriUtils;
 import com.termux.shared.models.errors.Errno;
 import com.termux.shared.shell.ShellUtils;
 import com.termux.shared.termux.shell.TermuxShellEnvironmentClient;
diff --git a/app/src/main/java/com/termux/filepicker/TermuxFileReceiverActivity.java b/app/src/main/java/com/termux/filepicker/TermuxFileReceiverActivity.java
index b9022a0eb5..adb09e47e7 100644
--- a/app/src/main/java/com/termux/filepicker/TermuxFileReceiverActivity.java
+++ b/app/src/main/java/com/termux/filepicker/TermuxFileReceiverActivity.java
@@ -1,7 +1,6 @@
 package com.termux.filepicker;
 
 import android.app.Activity;
-import android.content.ContentResolver;
 import android.content.Intent;
 import android.database.Cursor;
 import android.net.Uri;
@@ -13,8 +12,9 @@
 import com.termux.R;
 import com.termux.shared.data.DataUtils;
 import com.termux.shared.data.IntentUtils;
-import com.termux.shared.data.UriUtils;
+import com.termux.shared.net.UriUtils;
 import com.termux.shared.interact.MessageDialogUtils;
+import com.termux.shared.models.net.UriScheme;
 import com.termux.shared.termux.interact.TextInputDialogUtils;
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.termux.TermuxConstants.TERMUX_APP.TERMUX_SERVICE;
@@ -93,9 +93,9 @@ protected void onResume() {
                 return;
             }
 
-            if (ContentResolver.SCHEME_CONTENT.equals(scheme)) {
+            if (UriScheme.SCHEME_CONTENT.equals(scheme)) {
                 handleContentUri(dataUri, sharedTitle);
-            } else if (ContentResolver.SCHEME_FILE.equals(scheme)) {
+            } else if (UriScheme.SCHEME_FILE.equals(scheme)) {
                 Logger.logVerbose(LOG_TAG, "uri: \"" + dataUri + "\", path: \"" + dataUri.getPath() + "\", fragment: \"" + dataUri.getFragment() + "\"");
 
                 // Get full path including fragment (anything after last "#")
diff --git a/termux-shared/src/main/java/com/termux/shared/models/net/UriScheme.java b/termux-shared/src/main/java/com/termux/shared/models/net/UriScheme.java
new file mode 100644
index 0000000000..74ac2421bd
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/models/net/UriScheme.java
@@ -0,0 +1,28 @@
+package com.termux.shared.models.net;
+
+import android.net.Uri;
+
+/**
+ * The {@link Uri} schemes.
+ *
+ * https://www.iana.org/assignments/uri-schemes/uri-schemes.xhtml
+ * https://en.wikipedia.org/wiki/List_of_URI_schemes
+ */
+public class UriScheme {
+
+    /** Android app resource. */
+    public static final String SCHEME_ANDROID_RESOURCE = "android.resource";
+
+    /** Android content provider. https://www.iana.org/assignments/uri-schemes/prov/content. */
+    public static final String SCHEME_CONTENT = "content";
+
+    /** Filesystem or android app asset. https://www.rfc-editor.org/rfc/rfc8089.html. */
+    public static final String SCHEME_FILE = "file";
+
+    /* Hypertext Transfer Protocol. */
+    public static final String SCHEME_HTTP = "http";
+
+    /* Hypertext Transfer Protocol Secure. */
+    public static final String SCHEME_HTTPS = "https";
+
+}
diff --git a/termux-shared/src/main/java/com/termux/shared/data/UriUtils.java b/termux-shared/src/main/java/com/termux/shared/net/UriUtils.java
similarity index 63%
rename from termux-shared/src/main/java/com/termux/shared/data/UriUtils.java
rename to termux-shared/src/main/java/com/termux/shared/net/UriUtils.java
index 4149d45d04..b642c65c76 100644
--- a/termux-shared/src/main/java/com/termux/shared/data/UriUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/net/UriUtils.java
@@ -1,25 +1,26 @@
-package com.termux.shared.data;
+package com.termux.shared.net;
 
-import android.content.ContentResolver;
 import android.net.Uri;
 
 import androidx.annotation.NonNull;
 
+import com.termux.shared.data.DataUtils;
 import com.termux.shared.file.FileUtils;
+import com.termux.shared.models.net.UriScheme;
 
 public class UriUtils {
 
     /**
      * Get the full file path from a {@link Uri}.
      *
-     *  If the {@link Uri} was created from file path with {@link Uri#parse(String)}, like "am"
-     *  command "-d" option does, and the path contained a "#", then anything after it would become
-     *  the fragment and {@link Uri#getPath()} will only return the path before it, which would be
-     *  invalid. The fragment must be manually appended to the path to get the full path.
+     * If the {@link Uri} was created from file path with {@link Uri#parse(String)}, like "am"
+     * command "-d" option does, and the path contained a "#", then anything after it would become
+     * the fragment and {@link Uri#getPath()} will only return the path before it, which would be
+     * invalid. The fragment must be manually appended to the path to get the full path.
      *
-     *  If the {@link Uri} was created with {@link Uri.Builder} and path was set
-     *  with {@link Uri.Builder#path(String)}, then "#" will automatically be encoded to "%23"
-     *  and separate fragment will not exist.
+     * If the {@link Uri} was created with {@link Uri.Builder} and path was set
+     * with {@link Uri.Builder#path(String)}, then "#" will automatically be encoded to "%23"
+     * and separate fragment will not exist.
      *
      * @param uri The {@link Uri} to get basename from.
      * @return Returns the file path if found, otherwise {@code null}.
@@ -55,45 +56,45 @@ public static String getUriFileBasename(Uri uri, boolean withFragment) {
     }
 
     /**
-     * Get {@link ContentResolver#SCHEME_FILE} {@link Uri} for path.
+     * Get {@link UriScheme#SCHEME_FILE} {@link Uri} for path.
      *
      * @param path The path for the {@link Uri}.
      * @return Returns the {@link Uri}.
      */
     public static Uri getFileUri(@NonNull String path) {
-        return new Uri.Builder().scheme(ContentResolver.SCHEME_FILE).path(path).build();
+        return new Uri.Builder().scheme(UriScheme.SCHEME_FILE).path(path).build();
     }
 
     /**
-     * Get {@link ContentResolver#SCHEME_FILE} {@link Uri} for path.
+     * Get {@link UriScheme#SCHEME_FILE} {@link Uri} for path.
      *
      * @param authority The authority for the {@link Uri}.
      * @param path The path for the {@link Uri}.
      * @return Returns the {@link Uri}.
      */
     public static Uri getFileUri(@NonNull String authority, @NonNull String path) {
-        return new Uri.Builder().scheme(ContentResolver.SCHEME_FILE).authority(authority).path(path).build();
+        return new Uri.Builder().scheme(UriScheme.SCHEME_FILE).authority(authority).path(path).build();
     }
 
     /**
-     * Get {@link ContentResolver#SCHEME_CONTENT} {@link Uri} for path.
+     * Get {@link UriScheme#SCHEME_CONTENT} {@link Uri} for path.
      *
      * @param path The path for the {@link Uri}.
      * @return Returns the {@link Uri}.
      */
     public static Uri getContentUri(@NonNull String path) {
-        return new Uri.Builder().scheme(ContentResolver.SCHEME_CONTENT).path(path).build();
+        return new Uri.Builder().scheme(UriScheme.SCHEME_CONTENT).path(path).build();
     }
 
     /**
-     * Get {@link ContentResolver#SCHEME_CONTENT} {@link Uri} for path.
+     * Get {@link UriScheme#SCHEME_CONTENT} {@link Uri} for path.
      *
      * @param authority The authority for the {@link Uri}.
      * @param path The path for the {@link Uri}.
      * @return Returns the {@link Uri}.
      */
     public static Uri getContentUri(@NonNull String authority, @NonNull String path) {
-        return new Uri.Builder().scheme(ContentResolver.SCHEME_CONTENT).authority(authority).path(path).build();
+        return new Uri.Builder().scheme(UriScheme.SCHEME_CONTENT).authority(authority).path(path).build();
     }
 
 }

From 361bfb3961ccb54402253dc1ffc3f851c4139e65 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Tue, 26 Oct 2021 07:04:08 +0500
Subject: [PATCH 630/912] Changed!: Move to package-by-feature hierarchy for
 classes not using it since termux-shared is growing too big and layers are
 getting out of hand

---
 .../com/termux/app/RunCommandService.java     |  6 +-
 .../java/com/termux/app/TermuxActivity.java   |  2 +-
 .../java/com/termux/app/TermuxInstaller.java  |  4 +-
 .../com/termux/app/TermuxOpenReceiver.java    |  4 +-
 .../java/com/termux/app/TermuxService.java    | 12 +--
 .../app/activities/SettingsActivity.java      |  2 +-
 .../TermuxSessionsListViewController.java     |  2 +-
 .../terminal/TermuxTerminalSessionClient.java |  2 +-
 .../java/com/termux/app/utils/CrashUtils.java |  2 +-
 .../com/termux/app/utils/PluginUtils.java     | 14 ++--
 .../TermuxFileReceiverActivity.java           |  4 +-
 .../termux/shared/android/AndroidUtils.java   |  1 -
 .../{packages => android}/PackageUtils.java   |  2 +-
 .../PermissionUtils.java                      |  6 +-
 .../com/termux/shared/crash/CrashHandler.java |  2 +-
 .../shared/{models => }/errors/Errno.java     |  2 +-
 .../shared/{models => }/errors/Error.java     |  2 +-
 .../{models => }/errors/FunctionErrno.java    |  2 +-
 .../com/termux/shared/file/FileUtils.java     |  7 +-
 .../errors => file}/FileUtilsErrno.java       |  9 ++-
 .../shared/file/tests/FileUtilsTests.java     |  2 +-
 .../termux/shared/interact/ShareUtils.java    |  4 +-
 .../{models/net => net/uri}/UriScheme.java    |  2 +-
 .../termux/shared/net/{ => uri}/UriUtils.java |  3 +-
 .../termux/shared/net/{ => url}/UrlUtils.java |  2 +-
 .../command}/ExecutionCommand.java            | 11 ++-
 .../command/result}/ResultConfig.java         |  2 +-
 .../command/result}/ResultData.java           |  6 +-
 .../{ => command/result}/ResultSender.java    | 11 +--
 .../command/result}/ResultSenderErrno.java    |  4 +-
 .../{ => command/runner/app}/TermuxTask.java  | 13 +--
 .../termux/shared/termux/TermuxConstants.java | 80 +------------------
 .../com/termux/shared/termux/TermuxUtils.java |  8 +-
 .../shared/termux/file/TermuxFileUtils.java   |  8 +-
 .../TermuxAPIAppSharedPreferences.java        |  2 +-
 .../TermuxAppSharedPreferences.java           |  2 +-
 .../TermuxBootAppSharedPreferences.java       |  2 +-
 .../TermuxFloatAppSharedPreferences.java      |  2 +-
 .../TermuxStylingAppSharedPreferences.java    |  2 +-
 .../TermuxTaskerAppSharedPreferences.java     |  2 +-
 .../TermuxWidgetAppSharedPreferences.java     |  2 +-
 .../properties/TermuxPropertyConstants.java   |  2 +-
 .../shared/termux/shell/TermuxShellUtils.java |  4 +-
 .../runner/terminal}/TermuxSession.java       |  8 +-
 .../shared/{models => }/theme/NightMode.java  |  2 +-
 .../com/termux/shared/theme/ThemeUtils.java   |  2 -
 .../com/termux/shared/view/ActivityUtils.java |  4 +-
 47 files changed, 105 insertions(+), 174 deletions(-)
 rename termux-shared/src/main/java/com/termux/shared/{packages => android}/PackageUtils.java (99%)
 rename termux-shared/src/main/java/com/termux/shared/{packages => android}/PermissionUtils.java (99%)
 rename termux-shared/src/main/java/com/termux/shared/{models => }/errors/Errno.java (98%)
 rename termux-shared/src/main/java/com/termux/shared/{models => }/errors/Error.java (99%)
 rename termux-shared/src/main/java/com/termux/shared/{models => }/errors/FunctionErrno.java (96%)
 rename termux-shared/src/main/java/com/termux/shared/{models/errors => file}/FileUtilsErrno.java (95%)
 rename termux-shared/src/main/java/com/termux/shared/{models/net => net/uri}/UriScheme.java (95%)
 rename termux-shared/src/main/java/com/termux/shared/net/{ => uri}/UriUtils.java (97%)
 rename termux-shared/src/main/java/com/termux/shared/net/{ => url}/UrlUtils.java (98%)
 rename termux-shared/src/main/java/com/termux/shared/{models => shell/command}/ExecutionCommand.java (98%)
 rename termux-shared/src/main/java/com/termux/shared/{models => shell/command/result}/ResultConfig.java (99%)
 rename termux-shared/src/main/java/com/termux/shared/{models => shell/command/result}/ResultData.java (98%)
 rename termux-shared/src/main/java/com/termux/shared/shell/{ => command/result}/ResultSender.java (98%)
 rename termux-shared/src/main/java/com/termux/shared/{models/errors => shell/command/result}/ResultSenderErrno.java (92%)
 rename termux-shared/src/main/java/com/termux/shared/shell/{ => command/runner/app}/TermuxTask.java (97%)
 rename termux-shared/src/main/java/com/termux/shared/termux/shell/{ => command/runner/terminal}/TermuxSession.java (98%)
 rename termux-shared/src/main/java/com/termux/shared/{models => }/theme/NightMode.java (96%)

diff --git a/app/src/main/java/com/termux/app/RunCommandService.java b/app/src/main/java/com/termux/app/RunCommandService.java
index 08f7dd97a0..737a9d8c12 100644
--- a/app/src/main/java/com/termux/app/RunCommandService.java
+++ b/app/src/main/java/com/termux/app/RunCommandService.java
@@ -14,8 +14,8 @@
 import com.termux.shared.data.IntentUtils;
 import com.termux.shared.termux.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.errors.Errno;
+import com.termux.shared.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,7 +23,7 @@
 import com.termux.shared.logger.Logger;
 import com.termux.shared.notification.NotificationUtils;
 import com.termux.app.utils.PluginUtils;
-import com.termux.shared.models.ExecutionCommand;
+import com.termux.shared.shell.command.ExecutionCommand;
 
 /**
  * A service that receives {@link RUN_COMMAND_SERVICE#ACTION_RUN_COMMAND} intent from third party apps and
diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index bf5837ec96..31883f1960 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -34,7 +34,7 @@
 import com.termux.app.terminal.TermuxActivityRootView;
 import com.termux.shared.activities.ReportActivity;
 import com.termux.shared.data.IntentUtils;
-import com.termux.shared.packages.PermissionUtils;
+import com.termux.shared.android.PermissionUtils;
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.termux.TermuxConstants.TERMUX_APP.TERMUX_ACTIVITY;
 import com.termux.app.activities.HelpActivity;
diff --git a/app/src/main/java/com/termux/app/TermuxInstaller.java b/app/src/main/java/com/termux/app/TermuxInstaller.java
index 6b3b8f0a05..f31230aaf1 100644
--- a/app/src/main/java/com/termux/app/TermuxInstaller.java
+++ b/app/src/main/java/com/termux/app/TermuxInstaller.java
@@ -16,8 +16,8 @@
 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.errors.Error;
+import com.termux.shared.android.PackageUtils;
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.termux.TermuxUtils;
 
diff --git a/app/src/main/java/com/termux/app/TermuxOpenReceiver.java b/app/src/main/java/com/termux/app/TermuxOpenReceiver.java
index 1e307cc96e..9d3a01efa7 100644
--- a/app/src/main/java/com/termux/app/TermuxOpenReceiver.java
+++ b/app/src/main/java/com/termux/app/TermuxOpenReceiver.java
@@ -15,9 +15,9 @@
 
 import com.termux.app.utils.PluginUtils;
 import com.termux.shared.data.IntentUtils;
-import com.termux.shared.net.UriUtils;
+import com.termux.shared.net.uri.UriUtils;
 import com.termux.shared.logger.Logger;
-import com.termux.shared.models.net.UriScheme;
+import com.termux.shared.net.uri.UriScheme;
 import com.termux.shared.termux.TermuxConstants;
 
 import java.io.File;
diff --git a/app/src/main/java/com/termux/app/TermuxService.java b/app/src/main/java/com/termux/app/TermuxService.java
index 74a7456206..ee600a04d0 100644
--- a/app/src/main/java/com/termux/app/TermuxService.java
+++ b/app/src/main/java/com/termux/app/TermuxService.java
@@ -26,8 +26,8 @@
 import com.termux.app.terminal.TermuxTerminalSessionClient;
 import com.termux.app.utils.PluginUtils;
 import com.termux.shared.data.IntentUtils;
-import com.termux.shared.net.UriUtils;
-import com.termux.shared.models.errors.Errno;
+import com.termux.shared.net.uri.UriUtils;
+import com.termux.shared.errors.Errno;
 import com.termux.shared.shell.ShellUtils;
 import com.termux.shared.termux.shell.TermuxShellEnvironmentClient;
 import com.termux.shared.termux.shell.TermuxShellUtils;
@@ -35,14 +35,14 @@
 import com.termux.shared.termux.TermuxConstants.TERMUX_APP.TERMUX_ACTIVITY;
 import com.termux.shared.termux.TermuxConstants.TERMUX_APP.TERMUX_SERVICE;
 import com.termux.shared.termux.settings.preferences.TermuxAppSharedPreferences;
-import com.termux.shared.termux.shell.TermuxSession;
+import com.termux.shared.termux.shell.command.runner.terminal.TermuxSession;
 import com.termux.shared.termux.terminal.TermuxTerminalSessionClientBase;
 import com.termux.shared.logger.Logger;
 import com.termux.shared.notification.NotificationUtils;
-import com.termux.shared.packages.PermissionUtils;
+import com.termux.shared.android.PermissionUtils;
 import com.termux.shared.data.DataUtils;
-import com.termux.shared.models.ExecutionCommand;
-import com.termux.shared.shell.TermuxTask;
+import com.termux.shared.shell.command.ExecutionCommand;
+import com.termux.shared.shell.command.runner.app.TermuxTask;
 import com.termux.terminal.TerminalEmulator;
 import com.termux.terminal.TerminalSession;
 import com.termux.terminal.TerminalSessionClient;
diff --git a/app/src/main/java/com/termux/app/activities/SettingsActivity.java b/app/src/main/java/com/termux/app/activities/SettingsActivity.java
index 05b402c7cb..d0431bc740 100644
--- a/app/src/main/java/com/termux/app/activities/SettingsActivity.java
+++ b/app/src/main/java/com/termux/app/activities/SettingsActivity.java
@@ -16,7 +16,7 @@
 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.android.PackageUtils;
 import com.termux.shared.termux.settings.preferences.TermuxAPIAppSharedPreferences;
 import com.termux.shared.termux.settings.preferences.TermuxFloatAppSharedPreferences;
 import com.termux.shared.termux.settings.preferences.TermuxTaskerAppSharedPreferences;
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxSessionsListViewController.java b/app/src/main/java/com/termux/app/terminal/TermuxSessionsListViewController.java
index 5e10d66dc4..98a460e3bc 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxSessionsListViewController.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxSessionsListViewController.java
@@ -20,7 +20,7 @@
 
 import com.termux.R;
 import com.termux.app.TermuxActivity;
-import com.termux.shared.termux.shell.TermuxSession;
+import com.termux.shared.termux.shell.command.runner.terminal.TermuxSession;
 import com.termux.shared.theme.ThemeUtils;
 import com.termux.terminal.TerminalSession;
 
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java
index 5c83c66f8e..750b7264f4 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java
@@ -13,7 +13,7 @@
 import android.widget.ListView;
 
 import com.termux.R;
-import com.termux.shared.termux.shell.TermuxSession;
+import com.termux.shared.termux.shell.command.runner.terminal.TermuxSession;
 import com.termux.shared.termux.interact.TextInputDialogUtils;
 import com.termux.app.TermuxActivity;
 import com.termux.shared.termux.terminal.TermuxTerminalSessionClientBase;
diff --git a/app/src/main/java/com/termux/app/utils/CrashUtils.java b/app/src/main/java/com/termux/app/utils/CrashUtils.java
index 256515456e..b93e8237c2 100644
--- a/app/src/main/java/com/termux/app/utils/CrashUtils.java
+++ b/app/src/main/java/com/termux/app/utils/CrashUtils.java
@@ -11,7 +11,7 @@
 import com.termux.R;
 import com.termux.shared.activities.ReportActivity;
 import com.termux.shared.markdown.MarkdownUtils;
-import com.termux.shared.models.errors.Error;
+import com.termux.shared.errors.Error;
 import com.termux.shared.notification.NotificationUtils;
 import com.termux.shared.file.FileUtils;
 import com.termux.shared.models.ReportInfo;
diff --git a/app/src/main/java/com/termux/app/utils/PluginUtils.java b/app/src/main/java/com/termux/app/utils/PluginUtils.java
index 94591e6360..6d44557aa8 100644
--- a/app/src/main/java/com/termux/app/utils/PluginUtils.java
+++ b/app/src/main/java/com/termux/app/utils/PluginUtils.java
@@ -10,15 +10,15 @@
 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.termux.file.TermuxFileUtils;
+import com.termux.shared.shell.command.result.ResultConfig;
+import com.termux.shared.shell.command.result.ResultData;
+import com.termux.shared.errors.Errno;
+import com.termux.shared.errors.Error;
 import com.termux.shared.notification.NotificationUtils;
 import com.termux.shared.termux.notification.TermuxNotificationUtils;
 import com.termux.shared.termux.settings.preferences.TermuxPreferenceConstants;
-import com.termux.shared.shell.ResultSender;
+import com.termux.shared.shell.command.result.ResultSender;
 import com.termux.shared.shell.ShellUtils;
 import com.termux.shared.android.AndroidUtils;
 import com.termux.shared.termux.TermuxConstants;
@@ -29,7 +29,7 @@
 import com.termux.shared.settings.properties.SharedProperties;
 import com.termux.shared.models.ReportInfo;
 import com.termux.shared.termux.settings.properties.TermuxPropertyConstants;
-import com.termux.shared.models.ExecutionCommand;
+import com.termux.shared.shell.command.ExecutionCommand;
 import com.termux.app.models.UserAction;
 import com.termux.shared.data.DataUtils;
 import com.termux.shared.markdown.MarkdownUtils;
diff --git a/app/src/main/java/com/termux/filepicker/TermuxFileReceiverActivity.java b/app/src/main/java/com/termux/filepicker/TermuxFileReceiverActivity.java
index adb09e47e7..45c99e688d 100644
--- a/app/src/main/java/com/termux/filepicker/TermuxFileReceiverActivity.java
+++ b/app/src/main/java/com/termux/filepicker/TermuxFileReceiverActivity.java
@@ -12,9 +12,9 @@
 import com.termux.R;
 import com.termux.shared.data.DataUtils;
 import com.termux.shared.data.IntentUtils;
-import com.termux.shared.net.UriUtils;
+import com.termux.shared.net.uri.UriUtils;
 import com.termux.shared.interact.MessageDialogUtils;
-import com.termux.shared.models.net.UriScheme;
+import com.termux.shared.net.uri.UriScheme;
 import com.termux.shared.termux.interact.TextInputDialogUtils;
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.termux.TermuxConstants.TERMUX_APP.TERMUX_SERVICE;
diff --git a/termux-shared/src/main/java/com/termux/shared/android/AndroidUtils.java b/termux-shared/src/main/java/com/termux/shared/android/AndroidUtils.java
index b40d0cde86..6f2cadd185 100644
--- a/termux-shared/src/main/java/com/termux/shared/android/AndroidUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/android/AndroidUtils.java
@@ -11,7 +11,6 @@
 import com.google.common.base.Joiner;
 import com.termux.shared.logger.Logger;
 import com.termux.shared.markdown.MarkdownUtils;
-import com.termux.shared.packages.PackageUtils;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/termux-shared/src/main/java/com/termux/shared/packages/PackageUtils.java b/termux-shared/src/main/java/com/termux/shared/android/PackageUtils.java
similarity index 99%
rename from termux-shared/src/main/java/com/termux/shared/packages/PackageUtils.java
rename to termux-shared/src/main/java/com/termux/shared/android/PackageUtils.java
index e827bb090f..29126f5697 100644
--- a/termux-shared/src/main/java/com/termux/shared/packages/PackageUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/android/PackageUtils.java
@@ -1,4 +1,4 @@
-package com.termux.shared.packages;
+package com.termux.shared.android;
 
 import android.app.ActivityManager;
 import android.app.admin.DevicePolicyManager;
diff --git a/termux-shared/src/main/java/com/termux/shared/packages/PermissionUtils.java b/termux-shared/src/main/java/com/termux/shared/android/PermissionUtils.java
similarity index 99%
rename from termux-shared/src/main/java/com/termux/shared/packages/PermissionUtils.java
rename to termux-shared/src/main/java/com/termux/shared/android/PermissionUtils.java
index 0ab49d6426..355305fc78 100644
--- a/termux-shared/src/main/java/com/termux/shared/packages/PermissionUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/android/PermissionUtils.java
@@ -1,4 +1,4 @@
-package com.termux.shared.packages;
+package com.termux.shared.android;
 
 import android.Manifest;
 import android.annotation.SuppressLint;
@@ -21,8 +21,8 @@
 import com.termux.shared.R;
 import com.termux.shared.file.FileUtils;
 import com.termux.shared.logger.Logger;
-import com.termux.shared.models.errors.Error;
-import com.termux.shared.models.errors.FunctionErrno;
+import com.termux.shared.errors.Error;
+import com.termux.shared.errors.FunctionErrno;
 import com.termux.shared.view.ActivityUtils;
 
 import java.util.ArrayList;
diff --git a/termux-shared/src/main/java/com/termux/shared/crash/CrashHandler.java b/termux-shared/src/main/java/com/termux/shared/crash/CrashHandler.java
index 8b670c34c6..7e40c63a4a 100644
--- a/termux-shared/src/main/java/com/termux/shared/crash/CrashHandler.java
+++ b/termux-shared/src/main/java/com/termux/shared/crash/CrashHandler.java
@@ -7,7 +7,7 @@
 import com.termux.shared.file.FileUtils;
 import com.termux.shared.logger.Logger;
 import com.termux.shared.markdown.MarkdownUtils;
-import com.termux.shared.models.errors.Error;
+import com.termux.shared.errors.Error;
 import com.termux.shared.android.AndroidUtils;
 
 import java.nio.charset.Charset;
diff --git a/termux-shared/src/main/java/com/termux/shared/models/errors/Errno.java b/termux-shared/src/main/java/com/termux/shared/errors/Errno.java
similarity index 98%
rename from termux-shared/src/main/java/com/termux/shared/models/errors/Errno.java
rename to termux-shared/src/main/java/com/termux/shared/errors/Errno.java
index d330787c91..ae86091553 100644
--- a/termux-shared/src/main/java/com/termux/shared/models/errors/Errno.java
+++ b/termux-shared/src/main/java/com/termux/shared/errors/Errno.java
@@ -1,4 +1,4 @@
-package com.termux.shared.models.errors;
+package com.termux.shared.errors;
 
 import android.app.Activity;
 
diff --git a/termux-shared/src/main/java/com/termux/shared/models/errors/Error.java b/termux-shared/src/main/java/com/termux/shared/errors/Error.java
similarity index 99%
rename from termux-shared/src/main/java/com/termux/shared/models/errors/Error.java
rename to termux-shared/src/main/java/com/termux/shared/errors/Error.java
index 56a04e9703..6272b3e452 100644
--- a/termux-shared/src/main/java/com/termux/shared/models/errors/Error.java
+++ b/termux-shared/src/main/java/com/termux/shared/errors/Error.java
@@ -1,4 +1,4 @@
-package com.termux.shared.models.errors;
+package com.termux.shared.errors;
 
 import android.content.Context;
 
diff --git a/termux-shared/src/main/java/com/termux/shared/models/errors/FunctionErrno.java b/termux-shared/src/main/java/com/termux/shared/errors/FunctionErrno.java
similarity index 96%
rename from termux-shared/src/main/java/com/termux/shared/models/errors/FunctionErrno.java
rename to termux-shared/src/main/java/com/termux/shared/errors/FunctionErrno.java
index ff3759ccf4..533a9f5c11 100644
--- a/termux-shared/src/main/java/com/termux/shared/models/errors/FunctionErrno.java
+++ b/termux-shared/src/main/java/com/termux/shared/errors/FunctionErrno.java
@@ -1,4 +1,4 @@
-package com.termux.shared.models.errors;
+package com.termux.shared.errors;
 
 /** The {@link Class} that defines function error messages and codes. */
 public class FunctionErrno extends Errno {
diff --git a/termux-shared/src/main/java/com/termux/shared/file/FileUtils.java b/termux-shared/src/main/java/com/termux/shared/file/FileUtils.java
index e3688728c3..9a83c2fa23 100644
--- a/termux-shared/src/main/java/com/termux/shared/file/FileUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/file/FileUtils.java
@@ -10,10 +10,9 @@
 import com.termux.shared.file.filesystem.FileTypes;
 import com.termux.shared.data.DataUtils;
 import com.termux.shared.logger.Logger;
-import com.termux.shared.models.errors.Errno;
-import com.termux.shared.models.errors.Error;
-import com.termux.shared.models.errors.FileUtilsErrno;
-import com.termux.shared.models.errors.FunctionErrno;
+import com.termux.shared.errors.Errno;
+import com.termux.shared.errors.Error;
+import com.termux.shared.errors.FunctionErrno;
 
 import org.apache.commons.io.filefilter.AgeFileFilter;
 import org.apache.commons.io.filefilter.IOFileFilter;
diff --git a/termux-shared/src/main/java/com/termux/shared/models/errors/FileUtilsErrno.java b/termux-shared/src/main/java/com/termux/shared/file/FileUtilsErrno.java
similarity index 95%
rename from termux-shared/src/main/java/com/termux/shared/models/errors/FileUtilsErrno.java
rename to termux-shared/src/main/java/com/termux/shared/file/FileUtilsErrno.java
index cdf3c0f833..b39870b85a 100644
--- a/termux-shared/src/main/java/com/termux/shared/models/errors/FileUtilsErrno.java
+++ b/termux-shared/src/main/java/com/termux/shared/file/FileUtilsErrno.java
@@ -1,4 +1,6 @@
-package com.termux.shared.models.errors;
+package com.termux.shared.file;
+
+import com.termux.shared.errors.Errno;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -69,8 +71,9 @@ public class FileUtilsErrno extends Errno {
     public static final Errno ERRNO_WRITING_TEXT_TO_FILE_FAILED_WITH_EXCEPTION = new Errno(TYPE, 351, "Writing text to %1$s at path \"%2$s\" failed.\nException: %3$s");
     public static final Errno ERRNO_UNSUPPORTED_CHARSET = new Errno(TYPE, 352, "Unsupported charset \"%1$s\"");
     public static final Errno ERRNO_CHECKING_IF_CHARSET_SUPPORTED_FAILED = new Errno(TYPE, 353, "Checking if charset \"%1$s\" is supported failed.\nException: %2$s");
-    public static final Errno ERRNO_READING_SERIALIZABLE_OBJECT_TO_FILE_FAILED_WITH_EXCEPTION = new Errno(TYPE, 354, "Reading serializable object from %1$s at path \"%2$s\" failed.\nException: %3$s");
-    public static final Errno ERRNO_WRITING_SERIALIZABLE_OBJECT_TO_FILE_FAILED_WITH_EXCEPTION = new Errno(TYPE, 355, "Writing serializable object to %1$s at path \"%2$s\" failed.\nException: %3$s");
+    public static final Errno ERRNO_GET_CHARSET_FOR_NAME_FAILED = new Errno(TYPE, 354, "The \"%1$s\" charset is not supported.\nException: %2$s");
+    public static final Errno ERRNO_READING_SERIALIZABLE_OBJECT_TO_FILE_FAILED_WITH_EXCEPTION = new Errno(TYPE, 355, "Reading serializable object from %1$s at path \"%2$s\" failed.\nException: %3$s");
+    public static final Errno ERRNO_WRITING_SERIALIZABLE_OBJECT_TO_FILE_FAILED_WITH_EXCEPTION = new Errno(TYPE, 356, "Writing serializable object to %1$s at path \"%2$s\" failed.\nException: %3$s");
 
 
 
diff --git a/termux-shared/src/main/java/com/termux/shared/file/tests/FileUtilsTests.java b/termux-shared/src/main/java/com/termux/shared/file/tests/FileUtilsTests.java
index 06944505ce..927a20a885 100644
--- a/termux-shared/src/main/java/com/termux/shared/file/tests/FileUtilsTests.java
+++ b/termux-shared/src/main/java/com/termux/shared/file/tests/FileUtilsTests.java
@@ -6,7 +6,7 @@
 
 import com.termux.shared.file.FileUtils;
 import com.termux.shared.logger.Logger;
-import com.termux.shared.models.errors.Error;
+import com.termux.shared.errors.Error;
 
 import java.io.File;
 import java.nio.charset.Charset;
diff --git a/termux-shared/src/main/java/com/termux/shared/interact/ShareUtils.java b/termux-shared/src/main/java/com/termux/shared/interact/ShareUtils.java
index ae510d31ce..4faf3f310e 100644
--- a/termux-shared/src/main/java/com/termux/shared/interact/ShareUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/interact/ShareUtils.java
@@ -18,8 +18,8 @@
 import com.termux.shared.data.IntentUtils;
 import com.termux.shared.file.FileUtils;
 import com.termux.shared.logger.Logger;
-import com.termux.shared.models.errors.Error;
-import com.termux.shared.packages.PermissionUtils;
+import com.termux.shared.errors.Error;
+import com.termux.shared.android.PermissionUtils;
 
 import java.nio.charset.Charset;
 
diff --git a/termux-shared/src/main/java/com/termux/shared/models/net/UriScheme.java b/termux-shared/src/main/java/com/termux/shared/net/uri/UriScheme.java
similarity index 95%
rename from termux-shared/src/main/java/com/termux/shared/models/net/UriScheme.java
rename to termux-shared/src/main/java/com/termux/shared/net/uri/UriScheme.java
index 74ac2421bd..c32be0d5aa 100644
--- a/termux-shared/src/main/java/com/termux/shared/models/net/UriScheme.java
+++ b/termux-shared/src/main/java/com/termux/shared/net/uri/UriScheme.java
@@ -1,4 +1,4 @@
-package com.termux.shared.models.net;
+package com.termux.shared.net.uri;
 
 import android.net.Uri;
 
diff --git a/termux-shared/src/main/java/com/termux/shared/net/UriUtils.java b/termux-shared/src/main/java/com/termux/shared/net/uri/UriUtils.java
similarity index 97%
rename from termux-shared/src/main/java/com/termux/shared/net/UriUtils.java
rename to termux-shared/src/main/java/com/termux/shared/net/uri/UriUtils.java
index b642c65c76..29940452bb 100644
--- a/termux-shared/src/main/java/com/termux/shared/net/UriUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/net/uri/UriUtils.java
@@ -1,4 +1,4 @@
-package com.termux.shared.net;
+package com.termux.shared.net.uri;
 
 import android.net.Uri;
 
@@ -6,7 +6,6 @@
 
 import com.termux.shared.data.DataUtils;
 import com.termux.shared.file.FileUtils;
-import com.termux.shared.models.net.UriScheme;
 
 public class UriUtils {
 
diff --git a/termux-shared/src/main/java/com/termux/shared/net/UrlUtils.java b/termux-shared/src/main/java/com/termux/shared/net/url/UrlUtils.java
similarity index 98%
rename from termux-shared/src/main/java/com/termux/shared/net/UrlUtils.java
rename to termux-shared/src/main/java/com/termux/shared/net/url/UrlUtils.java
index 0e9101f3ac..63ca3a051b 100644
--- a/termux-shared/src/main/java/com/termux/shared/net/UrlUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/net/url/UrlUtils.java
@@ -1,4 +1,4 @@
-package com.termux.shared.net;
+package com.termux.shared.net.url;
 
 import androidx.annotation.Nullable;
 
diff --git a/termux-shared/src/main/java/com/termux/shared/models/ExecutionCommand.java b/termux-shared/src/main/java/com/termux/shared/shell/command/ExecutionCommand.java
similarity index 98%
rename from termux-shared/src/main/java/com/termux/shared/models/ExecutionCommand.java
rename to termux-shared/src/main/java/com/termux/shared/shell/command/ExecutionCommand.java
index b908e1d07f..1c1c53cd9a 100644
--- a/termux-shared/src/main/java/com/termux/shared/models/ExecutionCommand.java
+++ b/termux-shared/src/main/java/com/termux/shared/shell/command/ExecutionCommand.java
@@ -1,4 +1,4 @@
-package com.termux.shared.models;
+package com.termux.shared.shell.command;
 
 import android.content.Intent;
 import android.net.Uri;
@@ -6,10 +6,13 @@
 import androidx.annotation.NonNull;
 
 import com.termux.shared.data.IntentUtils;
-import com.termux.shared.models.errors.Error;
+import com.termux.shared.shell.command.result.ResultConfig;
+import com.termux.shared.shell.command.result.ResultData;
+import com.termux.shared.errors.Error;
 import com.termux.shared.logger.Logger;
 import com.termux.shared.markdown.MarkdownUtils;
 import com.termux.shared.data.DataUtils;
+import com.termux.shared.shell.command.runner.app.TermuxTask;
 
 import java.util.Collections;
 import java.util.List;
@@ -84,10 +87,10 @@ public int getValue() {
     public boolean isFailsafe;
 
     /**
-     * The {@link ExecutionCommand} custom log level for background {@link com.termux.shared.shell.TermuxTask}
+     * The {@link ExecutionCommand} custom log level for background {@link TermuxTask}
      * commands. By default, @link com.termux.shared.shell.StreamGobbler} only logs stdout and
      * stderr if {@link Logger} `CURRENT_LOG_LEVEL` is >= {@link Logger#LOG_LEVEL_VERBOSE} and
-     * {@link com.termux.shared.shell.TermuxTask} only logs stdin if `CURRENT_LOG_LEVEL` is >=
+     * {@link TermuxTask} only logs stdin if `CURRENT_LOG_LEVEL` is >=
      * {@link Logger#LOG_LEVEL_DEBUG}.
      */
     public Integer backgroundCustomLogLevel;
diff --git a/termux-shared/src/main/java/com/termux/shared/models/ResultConfig.java b/termux-shared/src/main/java/com/termux/shared/shell/command/result/ResultConfig.java
similarity index 99%
rename from termux-shared/src/main/java/com/termux/shared/models/ResultConfig.java
rename to termux-shared/src/main/java/com/termux/shared/shell/command/result/ResultConfig.java
index 77bdad7ff2..e3ab5cafc9 100644
--- a/termux-shared/src/main/java/com/termux/shared/models/ResultConfig.java
+++ b/termux-shared/src/main/java/com/termux/shared/shell/command/result/ResultConfig.java
@@ -1,4 +1,4 @@
-package com.termux.shared.models;
+package com.termux.shared.shell.command.result;
 
 import android.app.PendingIntent;
 
diff --git a/termux-shared/src/main/java/com/termux/shared/models/ResultData.java b/termux-shared/src/main/java/com/termux/shared/shell/command/result/ResultData.java
similarity index 98%
rename from termux-shared/src/main/java/com/termux/shared/models/ResultData.java
rename to termux-shared/src/main/java/com/termux/shared/shell/command/result/ResultData.java
index 2501653edb..3e42532089 100644
--- a/termux-shared/src/main/java/com/termux/shared/models/ResultData.java
+++ b/termux-shared/src/main/java/com/termux/shared/shell/command/result/ResultData.java
@@ -1,12 +1,12 @@
-package com.termux.shared.models;
+package com.termux.shared.shell.command.result;
 
 import androidx.annotation.NonNull;
 
 import com.termux.shared.data.DataUtils;
 import com.termux.shared.logger.Logger;
 import com.termux.shared.markdown.MarkdownUtils;
-import com.termux.shared.models.errors.Errno;
-import com.termux.shared.models.errors.Error;
+import com.termux.shared.errors.Errno;
+import com.termux.shared.errors.Error;
 
 import java.io.Serializable;
 import java.util.ArrayList;
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/ResultSender.java b/termux-shared/src/main/java/com/termux/shared/shell/command/result/ResultSender.java
similarity index 98%
rename from termux-shared/src/main/java/com/termux/shared/shell/ResultSender.java
rename to termux-shared/src/main/java/com/termux/shared/shell/command/result/ResultSender.java
index e77634c0e6..181afcaa25 100644
--- a/termux-shared/src/main/java/com/termux/shared/shell/ResultSender.java
+++ b/termux-shared/src/main/java/com/termux/shared/shell/command/result/ResultSender.java
@@ -1,4 +1,4 @@
-package com.termux.shared.shell;
+package com.termux.shared.shell.command.result;
 
 import android.app.Activity;
 import android.app.PendingIntent;
@@ -9,15 +9,12 @@
 import com.termux.shared.R;
 import com.termux.shared.data.DataUtils;
 import com.termux.shared.markdown.MarkdownUtils;
-import com.termux.shared.models.errors.Error;
+import com.termux.shared.errors.Error;
 import com.termux.shared.file.FileUtils;
 import com.termux.shared.logger.Logger;
-import com.termux.shared.models.ResultConfig;
-import com.termux.shared.models.ResultData;
-import com.termux.shared.models.errors.FunctionErrno;
-import com.termux.shared.models.errors.ResultSenderErrno;
+import com.termux.shared.errors.FunctionErrno;
 import com.termux.shared.android.AndroidUtils;
-import com.termux.shared.termux.TermuxConstants.RESULT_SENDER;
+import com.termux.shared.shell.command.ShellCommandConstants.RESULT_SENDER;
 
 public class ResultSender {
 
diff --git a/termux-shared/src/main/java/com/termux/shared/models/errors/ResultSenderErrno.java b/termux-shared/src/main/java/com/termux/shared/shell/command/result/ResultSenderErrno.java
similarity index 92%
rename from termux-shared/src/main/java/com/termux/shared/models/errors/ResultSenderErrno.java
rename to termux-shared/src/main/java/com/termux/shared/shell/command/result/ResultSenderErrno.java
index 1cb928184e..e21a146cd8 100644
--- a/termux-shared/src/main/java/com/termux/shared/models/errors/ResultSenderErrno.java
+++ b/termux-shared/src/main/java/com/termux/shared/shell/command/result/ResultSenderErrno.java
@@ -1,4 +1,6 @@
-package com.termux.shared.models.errors;
+package com.termux.shared.shell.command.result;
+
+import com.termux.shared.errors.Errno;
 
 /** The {@link Class} that defines ResultSender error messages and codes. */
 public class ResultSenderErrno extends Errno {
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/TermuxTask.java b/termux-shared/src/main/java/com/termux/shared/shell/command/runner/app/TermuxTask.java
similarity index 97%
rename from termux-shared/src/main/java/com/termux/shared/shell/TermuxTask.java
rename to termux-shared/src/main/java/com/termux/shared/shell/command/runner/app/TermuxTask.java
index da27e99666..ca31d9216f 100644
--- a/termux-shared/src/main/java/com/termux/shared/shell/TermuxTask.java
+++ b/termux-shared/src/main/java/com/termux/shared/shell/command/runner/app/TermuxTask.java
@@ -1,4 +1,4 @@
-package com.termux.shared.shell;
+package com.termux.shared.shell.command.runner.app;
 
 import android.content.Context;
 import android.system.ErrnoException;
@@ -9,11 +9,14 @@
 
 import com.termux.shared.R;
 import com.termux.shared.data.DataUtils;
-import com.termux.shared.models.ExecutionCommand;
-import com.termux.shared.models.ResultData;
-import com.termux.shared.models.errors.Errno;
+import com.termux.shared.shell.command.ExecutionCommand;
+import com.termux.shared.shell.command.result.ResultData;
+import com.termux.shared.errors.Errno;
 import com.termux.shared.logger.Logger;
-import com.termux.shared.models.ExecutionCommand.ExecutionState;
+import com.termux.shared.shell.command.ExecutionCommand.ExecutionState;
+import com.termux.shared.shell.ShellEnvironmentClient;
+import com.termux.shared.shell.ShellUtils;
+import com.termux.shared.shell.StreamGobbler;
 
 import java.io.DataOutputStream;
 import java.io.File;
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
index 14b6327865..ca61b0e5c8 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
@@ -2,17 +2,13 @@
 
 import android.annotation.SuppressLint;
 
-import com.termux.shared.models.ResultConfig;
-import com.termux.shared.models.errors.Errno;
-
 import java.io.File;
 import java.util.Arrays;
 import java.util.Formatter;
-import java.util.IllegalFormatException;
 import java.util.List;
 
 /*
- * Version: v0.33.0
+ * Version: v0.34.0
  * SPDX-License-Identifier: MIT
  *
  * Changelog
@@ -215,6 +211,9 @@
  *
  * - 0.33.0 (2021-10-08)
  *      - Added `TERMUX_PROPERTIES_FILE_PATHS_LIST` and `TERMUX_FLOAT_PROPERTIES_FILE_PATHS_LIST`.
+ *
+ * - 0.34.0 (2021-10-26)
+ *  - Move `RESULT_SENDER` to `com.termux.shared.shell.command.ShellCommandConstants`.
  */
 
 /**
@@ -1079,77 +1078,6 @@ public static final class RUN_COMMAND_SERVICE {
     }
 
 
-
-
-
-    /**
-     * Termux class to send back results of commands to their callers like plugin or 3rd party apps.
-     */
-    public static final class RESULT_SENDER {
-
-        /*
-         * The default `Formatter` format strings to use for `ResultConfig#resultFileBasename`
-         * if `ResultConfig#resultSingleFile` is `true`.
-         */
-
-        /** The {@link Formatter} format string for success if only `stdout` needs to be written to
-         * {@link ResultConfig#resultFileBasename} where `stdout` maps to `%1$s`.
-         * This is used when `err` equals {@link Errno#ERRNO_SUCCESS} (-1) and `stderr` is empty
-         * and `exit_code` equals `0` and {@link ResultConfig#resultFileOutputFormat} is not passed. */
-        public static final String FORMAT_SUCCESS_STDOUT = "%1$s%n";
-        /** The {@link Formatter} format string for success if `stdout` and `exit_code` need to be written to
-         * {@link ResultConfig#resultFileBasename} where `stdout` maps to `%1$s` and `exit_code` to `%2$s`.
-         * This is used when `err` equals {@link Errno#ERRNO_SUCCESS} (-1) and `stderr` is empty
-         * and `exit_code` does not equal `0` and {@link ResultConfig#resultFileOutputFormat} is not passed.
-         * The exit code will be placed in a markdown inline code. */
-        public static final String FORMAT_SUCCESS_STDOUT__EXIT_CODE = "%1$s%n%n%n%nexit_code=%2$s%n";
-        /** The {@link Formatter} format string for success if `stdout`, `stderr` and `exit_code` need to be
-         * written to {@link ResultConfig#resultFileBasename} where `stdout` maps to `%1$s`, `stderr`
-         * maps to `%2$s` and `exit_code` to `%3$s`.
-         * This is used when `err` equals {@link Errno#ERRNO_SUCCESS} (-1) and `stderr` is not empty
-         * and {@link ResultConfig#resultFileOutputFormat} is not passed.
-         * The stdout and stderr will be placed in a markdown code block. The exit code will be placed
-         * in a markdown inline code. The surrounding backticks will be 3 more than the consecutive
-         * backticks in any parameter itself for code blocks. */
-        public static final String FORMAT_SUCCESS_STDOUT__STDERR__EXIT_CODE = "stdout=%n%1$s%n%n%n%nstderr=%n%2$s%n%n%n%nexit_code=%3$s%n";
-        /** The {@link Formatter} format string for failure if `err`, `errmsg`(`error`), `stdout`,
-         * `stderr` and `exit_code` need to be written to {@link ResultConfig#resultFileBasename} where
-         * `err` maps to `%1$s`, `errmsg` maps to `%2$s`, `stdout` maps
-         * to `%3$s`, `stderr` to `%4$s` and `exit_code` maps to `%5$s`.
-         * Do not define an argument greater than `5`, like `%6$s` if you change this value since it will
-         * raise {@link IllegalFormatException}.
-         * This is used when `err` does not equal {@link Errno#ERRNO_SUCCESS} (-1) and
-         * {@link ResultConfig#resultFileErrorFormat} is not passed.
-         * The errmsg, stdout and stderr will be placed in a markdown code block. The err and exit code
-         * will be placed in a markdown inline code. The surrounding backticks will be 3 more than
-         * the consecutive backticks in any parameter itself for code blocks. The stdout, stderr
-         * and exit code may be empty without any surrounding backticks if not set. */
-        public static final String FORMAT_FAILED_ERR__ERRMSG__STDOUT__STDERR__EXIT_CODE = "err=%1$s%n%n%n%nerrmsg=%n%2$s%n%n%n%nstdout=%n%3$s%n%n%n%nstderr=%n%4$s%n%n%n%nexit_code=%5$s%n";
-
-
-
-        /*
-         * The default prefixes to use for result files under `ResultConfig#resultDirectoryPath`
-         * if `ResultConfig#resultSingleFile` is `false`.
-         */
-
-        /** The prefix for the err result file. */
-        public static final String RESULT_FILE_ERR_PREFIX = "err";
-        /** The prefix for the errmsg result file. */
-        public static final String RESULT_FILE_ERRMSG_PREFIX = "errmsg";
-        /** The prefix for the stdout result file. */
-        public static final String RESULT_FILE_STDOUT_PREFIX = "stdout";
-        /** The prefix for the stderr result file. */
-        public static final String RESULT_FILE_STDERR_PREFIX = "stderr";
-        /** The prefix for the exitCode result file. */
-        public static final String RESULT_FILE_EXIT_CODE_PREFIX = "exit_code";
-
-    }
-
-
-
-
-
     /**
      * Termux:API app constants.
      */
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
index b2e40b94aa..93a9fd1e44 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
@@ -17,11 +17,11 @@
 import com.termux.shared.termux.file.TermuxFileUtils;
 import com.termux.shared.logger.Logger;
 import com.termux.shared.markdown.MarkdownUtils;
-import com.termux.shared.models.ExecutionCommand;
-import com.termux.shared.models.errors.Error;
-import com.termux.shared.packages.PackageUtils;
+import com.termux.shared.shell.command.ExecutionCommand;
+import com.termux.shared.errors.Error;
+import com.termux.shared.android.PackageUtils;
 import com.termux.shared.termux.shell.TermuxShellEnvironmentClient;
-import com.termux.shared.shell.TermuxTask;
+import com.termux.shared.shell.command.runner.app.TermuxTask;
 
 import org.apache.commons.io.IOUtils;
 
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/file/TermuxFileUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/file/TermuxFileUtils.java
index 704c93e350..54aa28131f 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/file/TermuxFileUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/file/TermuxFileUtils.java
@@ -8,11 +8,11 @@
 import com.termux.shared.file.FileUtils;
 import com.termux.shared.logger.Logger;
 import com.termux.shared.markdown.MarkdownUtils;
-import com.termux.shared.models.ExecutionCommand;
-import com.termux.shared.models.errors.Error;
-import com.termux.shared.models.errors.FileUtilsErrno;
+import com.termux.shared.shell.command.ExecutionCommand;
+import com.termux.shared.errors.Error;
+import com.termux.shared.file.FileUtilsErrno;
 import com.termux.shared.termux.shell.TermuxShellEnvironmentClient;
-import com.termux.shared.shell.TermuxTask;
+import com.termux.shared.shell.command.runner.app.TermuxTask;
 import com.termux.shared.android.AndroidUtils;
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.termux.TermuxUtils;
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxAPIAppSharedPreferences.java b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxAPIAppSharedPreferences.java
index 1bc0171d36..c056c57bad 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxAPIAppSharedPreferences.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxAPIAppSharedPreferences.java
@@ -8,7 +8,7 @@
 import androidx.annotation.Nullable;
 
 import com.termux.shared.logger.Logger;
-import com.termux.shared.packages.PackageUtils;
+import com.termux.shared.android.PackageUtils;
 import com.termux.shared.settings.preferences.SharedPreferenceUtils;
 import com.termux.shared.termux.settings.preferences.TermuxPreferenceConstants.TERMUX_API_APP;
 import com.termux.shared.termux.TermuxConstants;
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxAppSharedPreferences.java b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxAppSharedPreferences.java
index b2f986ecad..95c358f7d4 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxAppSharedPreferences.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxAppSharedPreferences.java
@@ -8,7 +8,7 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import com.termux.shared.packages.PackageUtils;
+import com.termux.shared.android.PackageUtils;
 import com.termux.shared.settings.preferences.SharedPreferenceUtils;
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.logger.Logger;
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxBootAppSharedPreferences.java b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxBootAppSharedPreferences.java
index 85bd822da5..c5e3f43f7f 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxBootAppSharedPreferences.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxBootAppSharedPreferences.java
@@ -8,7 +8,7 @@
 import androidx.annotation.Nullable;
 
 import com.termux.shared.logger.Logger;
-import com.termux.shared.packages.PackageUtils;
+import com.termux.shared.android.PackageUtils;
 import com.termux.shared.settings.preferences.SharedPreferenceUtils;
 import com.termux.shared.termux.settings.preferences.TermuxPreferenceConstants.TERMUX_BOOT_APP;
 import com.termux.shared.termux.TermuxConstants;
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxFloatAppSharedPreferences.java b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxFloatAppSharedPreferences.java
index 0e0a8620ee..40e0316ec4 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxFloatAppSharedPreferences.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxFloatAppSharedPreferences.java
@@ -9,7 +9,7 @@
 
 import com.termux.shared.data.DataUtils;
 import com.termux.shared.logger.Logger;
-import com.termux.shared.packages.PackageUtils;
+import com.termux.shared.android.PackageUtils;
 import com.termux.shared.settings.preferences.SharedPreferenceUtils;
 import com.termux.shared.termux.settings.preferences.TermuxPreferenceConstants.TERMUX_FLOAT_APP;
 import com.termux.shared.termux.TermuxConstants;
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxStylingAppSharedPreferences.java b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxStylingAppSharedPreferences.java
index 10bbb67742..b9344393b2 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxStylingAppSharedPreferences.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxStylingAppSharedPreferences.java
@@ -8,7 +8,7 @@
 import androidx.annotation.Nullable;
 
 import com.termux.shared.logger.Logger;
-import com.termux.shared.packages.PackageUtils;
+import com.termux.shared.android.PackageUtils;
 import com.termux.shared.settings.preferences.SharedPreferenceUtils;
 import com.termux.shared.termux.settings.preferences.TermuxPreferenceConstants.TERMUX_STYLING_APP;
 import com.termux.shared.termux.TermuxConstants;
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxTaskerAppSharedPreferences.java b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxTaskerAppSharedPreferences.java
index 0945a33b38..509869b6ae 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxTaskerAppSharedPreferences.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxTaskerAppSharedPreferences.java
@@ -7,7 +7,7 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import com.termux.shared.packages.PackageUtils;
+import com.termux.shared.android.PackageUtils;
 import com.termux.shared.settings.preferences.SharedPreferenceUtils;
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.termux.settings.preferences.TermuxPreferenceConstants.TERMUX_TASKER_APP;
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxWidgetAppSharedPreferences.java b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxWidgetAppSharedPreferences.java
index a6e181cd78..0049c82ba7 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxWidgetAppSharedPreferences.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxWidgetAppSharedPreferences.java
@@ -8,7 +8,7 @@
 import androidx.annotation.Nullable;
 
 import com.termux.shared.logger.Logger;
-import com.termux.shared.packages.PackageUtils;
+import com.termux.shared.android.PackageUtils;
 import com.termux.shared.settings.preferences.SharedPreferenceUtils;
 import com.termux.shared.termux.settings.preferences.TermuxPreferenceConstants.TERMUX_WIDGET_APP;
 import com.termux.shared.termux.TermuxConstants;
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxPropertyConstants.java b/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxPropertyConstants.java
index a657613cf6..30febbd3ce 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxPropertyConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxPropertyConstants.java
@@ -1,7 +1,7 @@
 package com.termux.shared.termux.settings.properties;
 
 import com.google.common.collect.ImmutableBiMap;
-import com.termux.shared.models.theme.NightMode;
+import com.termux.shared.theme.NightMode;
 import com.termux.shared.file.FileUtils;
 import com.termux.shared.file.filesystem.FileType;
 import com.termux.shared.settings.properties.SharedProperties;
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/shell/TermuxShellUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/shell/TermuxShellUtils.java
index aad62427de..1058397785 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/shell/TermuxShellUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/shell/TermuxShellUtils.java
@@ -4,11 +4,11 @@
 
 import androidx.annotation.NonNull;
 
-import com.termux.shared.models.errors.Error;
+import com.termux.shared.errors.Error;
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.file.FileUtils;
 import com.termux.shared.logger.Logger;
-import com.termux.shared.packages.PackageUtils;
+import com.termux.shared.android.PackageUtils;
 import com.termux.shared.termux.TermuxUtils;
 
 import java.io.File;
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/shell/TermuxSession.java b/termux-shared/src/main/java/com/termux/shared/termux/shell/command/runner/terminal/TermuxSession.java
similarity index 98%
rename from termux-shared/src/main/java/com/termux/shared/termux/shell/TermuxSession.java
rename to termux-shared/src/main/java/com/termux/shared/termux/shell/command/runner/terminal/TermuxSession.java
index ce13ea87c0..76e62c7c84 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/shell/TermuxSession.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/shell/command/runner/terminal/TermuxSession.java
@@ -1,4 +1,4 @@
-package com.termux.shared.termux.shell;
+package com.termux.shared.termux.shell.command.runner.terminal;
 
 import android.content.Context;
 import android.system.OsConstants;
@@ -6,9 +6,9 @@
 import androidx.annotation.NonNull;
 
 import com.termux.shared.R;
-import com.termux.shared.models.ExecutionCommand;
-import com.termux.shared.models.ResultData;
-import com.termux.shared.models.errors.Errno;
+import com.termux.shared.shell.command.ExecutionCommand;
+import com.termux.shared.shell.command.result.ResultData;
+import com.termux.shared.errors.Errno;
 import com.termux.shared.logger.Logger;
 import com.termux.shared.shell.ShellEnvironmentClient;
 import com.termux.shared.shell.ShellUtils;
diff --git a/termux-shared/src/main/java/com/termux/shared/models/theme/NightMode.java b/termux-shared/src/main/java/com/termux/shared/theme/NightMode.java
similarity index 96%
rename from termux-shared/src/main/java/com/termux/shared/models/theme/NightMode.java
rename to termux-shared/src/main/java/com/termux/shared/theme/NightMode.java
index f37ac57fc0..8f4ff416cf 100644
--- a/termux-shared/src/main/java/com/termux/shared/models/theme/NightMode.java
+++ b/termux-shared/src/main/java/com/termux/shared/theme/NightMode.java
@@ -1,4 +1,4 @@
-package com.termux.shared.models.theme;
+package com.termux.shared.theme;
 
 import androidx.appcompat.app.AppCompatDelegate;
 
diff --git a/termux-shared/src/main/java/com/termux/shared/theme/ThemeUtils.java b/termux-shared/src/main/java/com/termux/shared/theme/ThemeUtils.java
index 0d73a7a90a..914aaf8d77 100644
--- a/termux-shared/src/main/java/com/termux/shared/theme/ThemeUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/theme/ThemeUtils.java
@@ -3,8 +3,6 @@
 import android.content.Context;
 import android.content.res.Configuration;
 
-import com.termux.shared.models.theme.NightMode;
-
 public class ThemeUtils {
 
     /**
diff --git a/termux-shared/src/main/java/com/termux/shared/view/ActivityUtils.java b/termux-shared/src/main/java/com/termux/shared/view/ActivityUtils.java
index 963d597020..36df09a4f8 100644
--- a/termux-shared/src/main/java/com/termux/shared/view/ActivityUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/view/ActivityUtils.java
@@ -11,8 +11,8 @@
 
 import com.termux.shared.R;
 import com.termux.shared.logger.Logger;
-import com.termux.shared.models.errors.Error;
-import com.termux.shared.models.errors.FunctionErrno;
+import com.termux.shared.errors.Error;
+import com.termux.shared.errors.FunctionErrno;
 
 
 public class ActivityUtils {

From 8e506859a6b164a180096fcb342b5075f2524dbc Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Tue, 26 Oct 2021 07:37:57 +0500
Subject: [PATCH 631/912] Changed!: Rename TermuxTask to AppShell since its not
 part of termux-app or com.termux.shared.termux package

---
 .../java/com/termux/app/TermuxService.java    |  28 ++---
 .../shell/command/ExecutionCommand.java       |   6 +-
 .../app/{TermuxTask.java => AppShell.java}    | 118 +++++++++---------
 .../com/termux/shared/termux/TermuxUtils.java |  10 +-
 .../shared/termux/file/TermuxFileUtils.java   |   6 +-
 termux-shared/src/main/res/values/strings.xml |   6 +-
 6 files changed, 87 insertions(+), 87 deletions(-)
 rename termux-shared/src/main/java/com/termux/shared/shell/command/runner/app/{TermuxTask.java => AppShell.java} (70%)

diff --git a/app/src/main/java/com/termux/app/TermuxService.java b/app/src/main/java/com/termux/app/TermuxService.java
index ee600a04d0..0cba527806 100644
--- a/app/src/main/java/com/termux/app/TermuxService.java
+++ b/app/src/main/java/com/termux/app/TermuxService.java
@@ -29,6 +29,7 @@
 import com.termux.shared.net.uri.UriUtils;
 import com.termux.shared.errors.Errno;
 import com.termux.shared.shell.ShellUtils;
+import com.termux.shared.shell.command.runner.app.AppShell;
 import com.termux.shared.termux.shell.TermuxShellEnvironmentClient;
 import com.termux.shared.termux.shell.TermuxShellUtils;
 import com.termux.shared.termux.TermuxConstants;
@@ -42,7 +43,6 @@
 import com.termux.shared.android.PermissionUtils;
 import com.termux.shared.data.DataUtils;
 import com.termux.shared.shell.command.ExecutionCommand;
-import com.termux.shared.shell.command.runner.app.TermuxTask;
 import com.termux.terminal.TerminalEmulator;
 import com.termux.terminal.TerminalSession;
 import com.termux.terminal.TerminalSessionClient;
@@ -51,7 +51,7 @@
 import java.util.List;
 
 /**
- * A service holding a list of {@link TermuxSession} in {@link #mTermuxSessions} and background {@link TermuxTask}
+ * A service holding a list of {@link TermuxSession} in {@link #mTermuxSessions} and background {@link AppShell}
  * in {@link #mTermuxTasks}, showing a foreground notification while running so that it is not terminated.
  * The user interacts with the session through {@link TermuxActivity}, but this service may outlive
  * the activity when the user or the system disposes of the activity. In that case the user may
@@ -63,7 +63,7 @@
  * Optionally may hold a wake and a wifi lock, in which case that is shown in the notification - see
  * {@link #buildNotification()}.
  */
-public final class TermuxService extends Service implements TermuxTask.TermuxTaskClient, TermuxSession.TermuxSessionClient {
+public final class TermuxService extends Service implements AppShell.AppShellClient, TermuxSession.TermuxSessionClient {
 
     private static int EXECUTION_ID = 1000;
 
@@ -87,7 +87,7 @@ class LocalBinder extends Binder {
     /**
      * The background TermuxTasks which this service manages.
      */
-    final List<TermuxTask> mTermuxTasks = new ArrayList<>();
+    final List<AppShell> mTermuxTasks = new ArrayList<>();
 
     /**
      * The pending plugin ExecutionCommands that have yet to be processed by this service.
@@ -263,7 +263,7 @@ private synchronized void killAllTermuxExecutionCommands() {
             termuxSessions.get(i).killIfExecuting(this, processResult);
         }
 
-        List<TermuxTask> termuxTasks = new ArrayList<>(mTermuxTasks);
+        List<AppShell> termuxTasks = new ArrayList<>(mTermuxTasks);
         for (int i = 0; i < termuxTasks.size(); i++) {
             ExecutionCommand executionCommand = termuxTasks.get(i).getExecutionCommand();
             if (executionCommand.isPluginExecutionCommandWithPendingResult())
@@ -403,24 +403,24 @@ private void actionServiceExecute(Intent intent) {
 
 
 
-    /** Execute a shell command in background {@link TermuxTask}. */
+    /** Execute a shell command in background TermuxTask. */
     private void executeTermuxTaskCommand(ExecutionCommand executionCommand) {
         if (executionCommand == null) return;
 
         Logger.logDebug(LOG_TAG, "Executing background \"" + executionCommand.getCommandIdAndLabelLogString() + "\" TermuxTask command");
 
-        TermuxTask newTermuxTask = createTermuxTask(executionCommand);
+        AppShell newTermuxTask = createTermuxTask(executionCommand);
     }
 
-    /** Create a {@link TermuxTask}. */
+    /** Create a TermuxTask. */
     @Nullable
-    public TermuxTask createTermuxTask(String executablePath, String[] arguments, String stdin, String workingDirectory) {
+    public AppShell createTermuxTask(String executablePath, String[] arguments, String stdin, String workingDirectory) {
         return createTermuxTask(new ExecutionCommand(getNextExecutionId(), executablePath, arguments, stdin, workingDirectory, true, false));
     }
 
-    /** Create a {@link TermuxTask}. */
+    /** Create a TermuxTask. */
     @Nullable
-    public synchronized TermuxTask createTermuxTask(ExecutionCommand executionCommand) {
+    public synchronized AppShell createTermuxTask(ExecutionCommand executionCommand) {
         if (executionCommand == null) return null;
 
         Logger.logDebug(LOG_TAG, "Creating \"" + executionCommand.getCommandIdAndLabelLogString() + "\" TermuxTask");
@@ -433,7 +433,7 @@ public synchronized TermuxTask createTermuxTask(ExecutionCommand executionComman
         if (Logger.getLogLevel() >= Logger.LOG_LEVEL_VERBOSE)
             Logger.logVerboseExtended(LOG_TAG, executionCommand.toString());
 
-        TermuxTask newTermuxTask = TermuxTask.execute(this, executionCommand, this, new TermuxShellEnvironmentClient(), false);
+        AppShell newTermuxTask = AppShell.execute(this, executionCommand, this, new TermuxShellEnvironmentClient(), 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
@@ -456,9 +456,9 @@ public synchronized TermuxTask createTermuxTask(ExecutionCommand executionComman
         return newTermuxTask;
     }
 
-    /** Callback received when a {@link TermuxTask} finishes. */
+    /** Callback received when a TermuxTask finishes. */
     @Override
-    public void onTermuxTaskExited(final TermuxTask termuxTask) {
+    public void onAppShellExited(final AppShell termuxTask) {
         mHandler.post(() -> {
             if (termuxTask != null) {
                 ExecutionCommand executionCommand = termuxTask.getExecutionCommand();
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/command/ExecutionCommand.java b/termux-shared/src/main/java/com/termux/shared/shell/command/ExecutionCommand.java
index 1c1c53cd9a..926d5bc117 100644
--- a/termux-shared/src/main/java/com/termux/shared/shell/command/ExecutionCommand.java
+++ b/termux-shared/src/main/java/com/termux/shared/shell/command/ExecutionCommand.java
@@ -12,7 +12,7 @@
 import com.termux.shared.logger.Logger;
 import com.termux.shared.markdown.MarkdownUtils;
 import com.termux.shared.data.DataUtils;
-import com.termux.shared.shell.command.runner.app.TermuxTask;
+import com.termux.shared.shell.command.runner.app.AppShell;
 
 import java.util.Collections;
 import java.util.List;
@@ -87,10 +87,10 @@ public int getValue() {
     public boolean isFailsafe;
 
     /**
-     * The {@link ExecutionCommand} custom log level for background {@link TermuxTask}
+     * The {@link ExecutionCommand} custom log level for background {@link AppShell}
      * commands. By default, @link com.termux.shared.shell.StreamGobbler} only logs stdout and
      * stderr if {@link Logger} `CURRENT_LOG_LEVEL` is >= {@link Logger#LOG_LEVEL_VERBOSE} and
-     * {@link TermuxTask} only logs stdin if `CURRENT_LOG_LEVEL` is >=
+     * {@link AppShell} only logs stdin if `CURRENT_LOG_LEVEL` is >=
      * {@link Logger#LOG_LEVEL_DEBUG}.
      */
     public Integer backgroundCustomLogLevel;
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/command/runner/app/TermuxTask.java b/termux-shared/src/main/java/com/termux/shared/shell/command/runner/app/AppShell.java
similarity index 70%
rename from termux-shared/src/main/java/com/termux/shared/shell/command/runner/app/TermuxTask.java
rename to termux-shared/src/main/java/com/termux/shared/shell/command/runner/app/AppShell.java
index ca31d9216f..c0078458bc 100644
--- a/termux-shared/src/main/java/com/termux/shared/shell/command/runner/app/TermuxTask.java
+++ b/termux-shared/src/main/java/com/termux/shared/shell/command/runner/app/AppShell.java
@@ -24,23 +24,23 @@
 import java.nio.charset.StandardCharsets;
 
 /**
- * A class that maintains info for background Termux tasks run with {@link Runtime#exec(String[], String[], File)}.
+ * A class that maintains info for background app shells run with {@link Runtime#exec(String[], String[], File)}.
  * It also provides a way to link each {@link Process} with the {@link ExecutionCommand}
- * that started it.
+ * that started it. The shell is run in the app user context.
  */
-public final class TermuxTask {
+public final class AppShell {
 
     private final Process mProcess;
     private final ExecutionCommand mExecutionCommand;
-    private final TermuxTaskClient mTermuxTaskClient;
+    private final AppShellClient mAppShellClient;
 
-    private static final String LOG_TAG = "TermuxTask";
+    private static final String LOG_TAG = "AppShell";
 
-    private TermuxTask(@NonNull final Process process, @NonNull final ExecutionCommand executionCommand,
-                       final TermuxTaskClient termuxTaskClient) {
+    private AppShell(@NonNull final Process process, @NonNull final ExecutionCommand executionCommand,
+                     final AppShellClient appShellClient) {
         this.mProcess = process;
         this.mExecutionCommand = executionCommand;
-        this.mTermuxTaskClient = termuxTaskClient;
+        this.mAppShellClient = appShellClient;
     }
 
     /**
@@ -52,23 +52,23 @@ private TermuxTask(@NonNull final Process process, @NonNull final ExecutionComma
      *
      * @param context The {@link Context} for operations.
      * @param executionCommand The {@link ExecutionCommand} containing the information for execution command.
-     * @param termuxTaskClient The {@link TermuxTaskClient} interface implementation.
-     *                           The {@link TermuxTaskClient#onTermuxTaskExited(TermuxTask)} will
+     * @param appShellClient The {@link AppShellClient} interface implementation.
+     *                           The {@link AppShellClient#onAppShellExited(AppShell)} will
      *                           be called regardless of {@code isSynchronous} value but not if
      *                           {@code null} is returned by this method. This can
      *                           optionally be {@code null}.
      * @param shellEnvironmentClient The {@link ShellEnvironmentClient} interface implementation.
      * @param isSynchronous If set to {@code true}, then the command will be executed in the
      *                      caller thread and results returned synchronously in the {@link ExecutionCommand}
-     *                      sub object of the {@link TermuxTask} returned.
+     *                      sub object of the {@link AppShell} returned.
      *                      If set to {@code false}, then a new thread is started run the commands
      *                      asynchronously in the background and control is returned to the caller thread.
-     * @return Returns the {@link TermuxTask}. This will be {@code null} if failed to start the execution command.
+     * @return Returns the {@link AppShell}. This will be {@code null} if failed to start the execution command.
      */
-    public static TermuxTask execute(@NonNull final Context context, @NonNull ExecutionCommand executionCommand,
-                                     final TermuxTaskClient termuxTaskClient,
-                                     @NonNull final ShellEnvironmentClient shellEnvironmentClient,
-                                     final boolean isSynchronous) {
+    public static AppShell execute(@NonNull final Context context, @NonNull ExecutionCommand executionCommand,
+                                   final AppShellClient appShellClient,
+                                   @NonNull final ShellEnvironmentClient shellEnvironmentClient,
+                                   final boolean isSynchronous) {
         if (executionCommand.workingDirectory == null || executionCommand.workingDirectory.isEmpty())
             executionCommand.workingDirectory = shellEnvironmentClient.getDefaultWorkingDirectoryPath();
         if (executionCommand.workingDirectory.isEmpty())
@@ -79,8 +79,8 @@ public static TermuxTask execute(@NonNull final Context context, @NonNull Execut
         final String[] commandArray = shellEnvironmentClient.setupProcessArgs(executionCommand.executable, executionCommand.arguments);
 
         if (!executionCommand.setState(ExecutionState.EXECUTING)) {
-            executionCommand.setStateFailed(Errno.ERRNO_FAILED.getCode(), context.getString(R.string.error_failed_to_execute_termux_task_command, executionCommand.getCommandIdAndLabelLogString()));
-            TermuxTask.processTermuxTaskResult(null, executionCommand);
+            executionCommand.setStateFailed(Errno.ERRNO_FAILED.getCode(), context.getString(R.string.error_failed_to_execute_app_shell_command, executionCommand.getCommandIdAndLabelLogString()));
+            AppShell.processAppShellResult(null, executionCommand);
             return null;
         }
 
@@ -98,16 +98,16 @@ public static TermuxTask execute(@NonNull final Context context, @NonNull Execut
         try {
             process = Runtime.getRuntime().exec(commandArray, env, new File(executionCommand.workingDirectory));
         } catch (IOException e) {
-            executionCommand.setStateFailed(Errno.ERRNO_FAILED.getCode(), context.getString(R.string.error_failed_to_execute_termux_task_command, executionCommand.getCommandIdAndLabelLogString()), e);
-            TermuxTask.processTermuxTaskResult(null, executionCommand);
+            executionCommand.setStateFailed(Errno.ERRNO_FAILED.getCode(), context.getString(R.string.error_failed_to_execute_app_shell_command, executionCommand.getCommandIdAndLabelLogString()), e);
+            AppShell.processAppShellResult(null, executionCommand);
             return null;
         }
 
-        final TermuxTask termuxTask = new TermuxTask(process, executionCommand, termuxTaskClient);
+        final AppShell appShell = new AppShell(process, executionCommand, appShellClient);
 
         if (isSynchronous) {
             try {
-                termuxTask.executeInner(context);
+                appShell.executeInner(context);
             } catch (IllegalThreadStateException | InterruptedException e) {
                 // TODO: Should either of these be handled or returned?
             }
@@ -116,7 +116,7 @@ public static TermuxTask execute(@NonNull final Context context, @NonNull Execut
                 @Override
                 public void run() {
                     try {
-                        termuxTask.executeInner(context);
+                        appShell.executeInner(context);
                     } catch (IllegalThreadStateException | InterruptedException e) {
                         // TODO: Should either of these be handled or returned?
                     }
@@ -124,22 +124,22 @@ public void run() {
             }.start();
         }
 
-        return termuxTask;
+        return appShell;
     }
 
     /**
      * Sets up stdout and stderr readers for the {@link #mProcess} and waits for the process to end.
      *
      * If the processes finishes, then sets {@link ResultData#stdout}, {@link ResultData#stderr}
-     * and {@link ResultData#exitCode} for the {@link #mExecutionCommand} of the {@code termuxTask}
-     * and then calls {@link #processTermuxTaskResult(TermuxTask, ExecutionCommand) to process the result}.
+     * and {@link ResultData#exitCode} for the {@link #mExecutionCommand} of the {@code appShell}
+     * and then calls {@link #processAppShellResult(AppShell, ExecutionCommand) to process the result}.
      *
      * @param context The {@link Context} for operations.
      */
     private void executeInner(@NonNull final Context context) throws IllegalThreadStateException, InterruptedException {
         final int pid = ShellUtils.getPid(mProcess);
 
-        Logger.logDebug(LOG_TAG, "Running \"" + mExecutionCommand.getCommandIdAndLabelLogString() + "\" TermuxTask with pid " + pid);
+        Logger.logDebug(LOG_TAG, "Running \"" + mExecutionCommand.getCommandIdAndLabelLogString() + "\" AppShell with pid " + pid);
 
         mExecutionCommand.resultData.exitCode = null;
 
@@ -168,9 +168,9 @@ private void executeInner(@NonNull final Context context) throws IllegalThreadSt
                 } else {
                     // other issues we don't know how to handle, leads to
                     // returning null
-                    mExecutionCommand.setStateFailed(Errno.ERRNO_FAILED.getCode(), context.getString(R.string.error_exception_received_while_executing_termux_task_command, mExecutionCommand.getCommandIdAndLabelLogString(), e.getMessage()), e);
+                    mExecutionCommand.setStateFailed(Errno.ERRNO_FAILED.getCode(), context.getString(R.string.error_exception_received_while_executing_app_shell_command, mExecutionCommand.getCommandIdAndLabelLogString(), e.getMessage()), e);
                     mExecutionCommand.resultData.exitCode = 1;
-                    TermuxTask.processTermuxTaskResult(this, null);
+                    AppShell.processAppShellResult(this, null);
                     kill();
                     return;
                 }
@@ -196,13 +196,13 @@ private void executeInner(@NonNull final Context context) throws IllegalThreadSt
 
         // Process result
         if (exitCode == 0)
-            Logger.logDebug(LOG_TAG, "The \"" + mExecutionCommand.getCommandIdAndLabelLogString() + "\" TermuxTask with pid " + pid + " exited normally");
+            Logger.logDebug(LOG_TAG, "The \"" + mExecutionCommand.getCommandIdAndLabelLogString() + "\" AppShell with pid " + pid + " exited normally");
         else
-            Logger.logDebug(LOG_TAG, "The \"" + mExecutionCommand.getCommandIdAndLabelLogString() + "\" TermuxTask with pid " + pid + " exited with code: " + exitCode);
+            Logger.logDebug(LOG_TAG, "The \"" + mExecutionCommand.getCommandIdAndLabelLogString() + "\" AppShell with pid " + pid + " exited with code: " + exitCode);
 
         // If the execution command has already failed, like SIGKILL was sent, then don't continue
         if (mExecutionCommand.isStateFailed()) {
-            Logger.logDebug(LOG_TAG, "Ignoring setting \"" + mExecutionCommand.getCommandIdAndLabelLogString() + "\" TermuxTask state to ExecutionState.EXECUTED and processing results since it has already failed");
+            Logger.logDebug(LOG_TAG, "Ignoring setting \"" + mExecutionCommand.getCommandIdAndLabelLogString() + "\" AppShell state to ExecutionState.EXECUTED and processing results since it has already failed");
             return;
         }
 
@@ -211,30 +211,30 @@ private void executeInner(@NonNull final Context context) throws IllegalThreadSt
         if (!mExecutionCommand.setState(ExecutionState.EXECUTED))
             return;
 
-        TermuxTask.processTermuxTaskResult(this, null);
+        AppShell.processAppShellResult(this, null);
     }
 
     /**
-     * Kill this {@link TermuxTask} by sending a {@link OsConstants#SIGILL} to its {@link #mProcess}
+     * Kill this {@link AppShell} by sending a {@link OsConstants#SIGILL} to its {@link #mProcess}
      * if its still executing.
      *
      * @param context The {@link Context} for operations.
-     * @param processResult If set to {@code true}, then the {@link #processTermuxTaskResult(TermuxTask, ExecutionCommand)}
+     * @param processResult If set to {@code true}, then the {@link #processAppShellResult(AppShell, ExecutionCommand)}
      *                      will be called to process the failure.
      */
     public void killIfExecuting(@NonNull final Context context, boolean processResult) {
         // If execution command has already finished executing, then no need to process results or send SIGKILL
         if (mExecutionCommand.hasExecuted()) {
-            Logger.logDebug(LOG_TAG, "Ignoring sending SIGKILL to \"" + mExecutionCommand.getCommandIdAndLabelLogString() + "\" TermuxTask since it has already finished executing");
+            Logger.logDebug(LOG_TAG, "Ignoring sending SIGKILL to \"" + mExecutionCommand.getCommandIdAndLabelLogString() + "\" AppShell since it has already finished executing");
             return;
         }
 
-        Logger.logDebug(LOG_TAG, "Send SIGKILL to \"" + mExecutionCommand.getCommandIdAndLabelLogString() + "\" TermuxTask");
+        Logger.logDebug(LOG_TAG, "Send SIGKILL to \"" + mExecutionCommand.getCommandIdAndLabelLogString() + "\" AppShell");
 
         if (mExecutionCommand.setStateFailed(Errno.ERRNO_FAILED.getCode(), context.getString(R.string.error_sending_sigkill_to_process))) {
             if (processResult) {
                 mExecutionCommand.resultData.exitCode = 137; // SIGKILL
-                TermuxTask.processTermuxTaskResult(this, null);
+                AppShell.processAppShellResult(this, null);
             }
         }
 
@@ -244,7 +244,7 @@ public void killIfExecuting(@NonNull final Context context, boolean processResul
     }
 
     /**
-     * Kill this {@link TermuxTask} by sending a {@link OsConstants#SIGILL} to its {@link #mProcess}.
+     * Kill this {@link AppShell} by sending a {@link OsConstants#SIGILL} to its {@link #mProcess}.
      */
     public void kill() {
         int pid = ShellUtils.getPid(mProcess);
@@ -252,43 +252,43 @@ public void kill() {
             // Send SIGKILL to process
             Os.kill(pid, OsConstants.SIGKILL);
         } catch (ErrnoException e) {
-            Logger.logWarn(LOG_TAG, "Failed to send SIGKILL to \"" + mExecutionCommand.getCommandIdAndLabelLogString() + "\" TermuxTask with pid " + pid + ": " + e.getMessage());
+            Logger.logWarn(LOG_TAG, "Failed to send SIGKILL to \"" + mExecutionCommand.getCommandIdAndLabelLogString() + "\" AppShell with pid " + pid + ": " + e.getMessage());
         }
     }
 
     /**
-     * Process the results of {@link TermuxTask} or {@link ExecutionCommand}.
+     * Process the results of {@link AppShell} or {@link ExecutionCommand}.
      *
-     * Only one of {@code termuxTask} and {@code executionCommand} must be set.
+     * Only one of {@code appShell} and {@code executionCommand} must be set.
      *
-     * If the {@code termuxTask} and its {@link #mTermuxTaskClient} are not {@code null},
-     * then the {@link TermuxTaskClient#onTermuxTaskExited(TermuxTask)} callback will be called.
+     * If the {@code appShell} and its {@link #mAppShellClient} are not {@code null},
+     * then the {@link AppShellClient#onAppShellExited(AppShell)} callback will be called.
      *
-     * @param termuxTask The {@link TermuxTask}, which should be set if
-     *                  {@link #execute(Context, ExecutionCommand, TermuxTaskClient, ShellEnvironmentClient, boolean)}
+     * @param appShell The {@link AppShell}, which should be set if
+     *                  {@link #execute(Context, ExecutionCommand, AppShellClient, ShellEnvironmentClient, boolean)}
      *                   successfully started the process.
      * @param executionCommand The {@link ExecutionCommand}, which should be set if
-     *                          {@link #execute(Context, ExecutionCommand, TermuxTaskClient, ShellEnvironmentClient, boolean)}
+     *                          {@link #execute(Context, ExecutionCommand, AppShellClient, ShellEnvironmentClient, boolean)}
      *                          failed to start the process.
      */
-    private static void processTermuxTaskResult(final TermuxTask termuxTask, ExecutionCommand executionCommand) {
-        if (termuxTask != null)
-            executionCommand = termuxTask.mExecutionCommand;
+    private static void processAppShellResult(final AppShell appShell, ExecutionCommand executionCommand) {
+        if (appShell != null)
+            executionCommand = appShell.mExecutionCommand;
 
         if (executionCommand == null) return;
 
         if (executionCommand.shouldNotProcessResults()) {
-            Logger.logDebug(LOG_TAG, "Ignoring duplicate call to process \"" + executionCommand.getCommandIdAndLabelLogString() + "\" TermuxTask result");
+            Logger.logDebug(LOG_TAG, "Ignoring duplicate call to process \"" + executionCommand.getCommandIdAndLabelLogString() + "\" AppShell result");
             return;
         }
 
-        Logger.logDebug(LOG_TAG, "Processing \"" + executionCommand.getCommandIdAndLabelLogString() + "\" TermuxTask result");
+        Logger.logDebug(LOG_TAG, "Processing \"" + executionCommand.getCommandIdAndLabelLogString() + "\" AppShell result");
 
-        if (termuxTask != null && termuxTask.mTermuxTaskClient != null) {
-            termuxTask.mTermuxTaskClient.onTermuxTaskExited(termuxTask);
+        if (appShell != null && appShell.mAppShellClient != null) {
+            appShell.mAppShellClient.onAppShellExited(appShell);
         } else {
             // If a callback is not set and execution command didn't fail, then we set success state now
-            // Otherwise, the callback host can set it himself when its done with the termuxTask
+            // Otherwise, the callback host can set it himself when its done with the appShell
             if (!executionCommand.isStateFailed())
                 executionCommand.setState(ExecutionCommand.ExecutionState.SUCCESS);
         }
@@ -304,14 +304,14 @@ public ExecutionCommand getExecutionCommand() {
 
 
 
-    public interface TermuxTaskClient {
+    public interface AppShellClient {
 
         /**
-         * Callback function for when {@link TermuxTask} exits.
+         * Callback function for when {@link AppShell} exits.
          *
-         * @param termuxTask The {@link TermuxTask} that exited.
+         * @param appShell The {@link AppShell} that exited.
          */
-        void onTermuxTaskExited(TermuxTask termuxTask);
+        void onAppShellExited(AppShell appShell);
 
     }
 
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
index 93a9fd1e44..2f2906be6b 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
@@ -14,6 +14,7 @@
 import com.termux.shared.android.AndroidUtils;
 import com.termux.shared.data.DataUtils;
 import com.termux.shared.file.FileUtils;
+import com.termux.shared.shell.command.runner.app.AppShell;
 import com.termux.shared.termux.file.TermuxFileUtils;
 import com.termux.shared.logger.Logger;
 import com.termux.shared.markdown.MarkdownUtils;
@@ -21,7 +22,6 @@
 import com.termux.shared.errors.Error;
 import com.termux.shared.android.PackageUtils;
 import com.termux.shared.termux.shell.TermuxShellEnvironmentClient;
-import com.termux.shared.shell.command.runner.app.TermuxTask;
 
 import org.apache.commons.io.IOUtils;
 
@@ -519,8 +519,8 @@ public static String geAPTInfoMarkdownString(@NonNull final Context context) {
         ExecutionCommand executionCommand = new ExecutionCommand(1, TermuxConstants.TERMUX_BIN_PREFIX_DIR_PATH + "/bash", null, aptInfoScript, null, true, false);
         executionCommand.commandLabel = "APT Info Command";
         executionCommand.backgroundCustomLogLevel = Logger.LOG_LEVEL_OFF;
-        TermuxTask termuxTask = TermuxTask.execute(context, executionCommand, null, new TermuxShellEnvironmentClient(), true);
-        if (termuxTask == null || !executionCommand.isSuccessful() || executionCommand.resultData.exitCode != 0) {
+        AppShell appShell = AppShell.execute(context, executionCommand, null, new TermuxShellEnvironmentClient(), true);
+        if (appShell == null || !executionCommand.isSuccessful() || executionCommand.resultData.exitCode != 0) {
             Logger.logErrorExtended(LOG_TAG, executionCommand.toString());
             return null;
         }
@@ -577,8 +577,8 @@ public static String getLogcatDumpMarkdownString(@NonNull final Context context)
         ExecutionCommand executionCommand = new ExecutionCommand(1, "/system/bin/sh", null, logcatScript + "\n", "/", true, true);
         executionCommand.commandLabel = "Logcat dump command";
         executionCommand.backgroundCustomLogLevel = Logger.LOG_LEVEL_OFF;
-        TermuxTask termuxTask = TermuxTask.execute(context, executionCommand, null, new TermuxShellEnvironmentClient(), true);
-        if (termuxTask == null || !executionCommand.isSuccessful()) {
+        AppShell appShell = AppShell.execute(context, executionCommand, null, new TermuxShellEnvironmentClient(), true);
+        if (appShell == null || !executionCommand.isSuccessful()) {
             Logger.logErrorExtended(LOG_TAG, executionCommand.toString());
             return null;
         }
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/file/TermuxFileUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/file/TermuxFileUtils.java
index 54aa28131f..a44c21a519 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/file/TermuxFileUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/file/TermuxFileUtils.java
@@ -12,7 +12,7 @@
 import com.termux.shared.errors.Error;
 import com.termux.shared.file.FileUtilsErrno;
 import com.termux.shared.termux.shell.TermuxShellEnvironmentClient;
-import com.termux.shared.shell.command.runner.app.TermuxTask;
+import com.termux.shared.shell.command.runner.app.AppShell;
 import com.termux.shared.android.AndroidUtils;
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.termux.TermuxUtils;
@@ -345,8 +345,8 @@ public static String getTermuxFilesStatMarkdownString(@NonNull final Context con
         ExecutionCommand executionCommand = new ExecutionCommand(1, "/system/bin/sh", null, statScript.toString() + "\n", "/", true, true);
         executionCommand.commandLabel = TermuxConstants.TERMUX_APP_NAME + " Files Stat Command";
         executionCommand.backgroundCustomLogLevel = Logger.LOG_LEVEL_OFF;
-        TermuxTask termuxTask = TermuxTask.execute(context, executionCommand, null, new TermuxShellEnvironmentClient(), true);
-        if (termuxTask == null || !executionCommand.isSuccessful()) {
+        AppShell appShell = AppShell.execute(context, executionCommand, null, new TermuxShellEnvironmentClient(), true);
+        if (appShell == null || !executionCommand.isSuccessful()) {
             Logger.logErrorExtended(LOG_TAG, executionCommand.toString());
             return null;
         }
diff --git a/termux-shared/src/main/res/values/strings.xml b/termux-shared/src/main/res/values/strings.xml
index b67468aac6..f0bc66d950 100644
--- a/termux-shared/src/main/res/values/strings.xml
+++ b/termux-shared/src/main/res/values/strings.xml
@@ -60,13 +60,13 @@
 
 
 
-    <!-- ShellUtils -->
+    <!-- Shell -->
     <string name="error_sending_sigkill_to_process">Sending SIGKILL to process on user request or because android is killing the execution service</string>
     <string name="error_execution_cancelled">Execution has been cancelled since execution service is being killed</string>
     <string name="error_failed_to_execute_termux_session_command">"Failed to execute \"%1$s\" termux session command"</string>
-    <string name="error_failed_to_execute_termux_task_command">"Failed to execute \"%1$s\" termux task command"</string>
+    <string name="error_failed_to_execute_app_shell_command">"Failed to execute \"%1$s\" app shell command"</string>
     <string name="error_exception_received_while_executing_termux_session_command">Exception received while to executing \"%1$s\" termux session command.\nException: %2$s</string>
-    <string name="error_exception_received_while_executing_termux_task_command">Exception received while to executing \"%1$s\" termux task command.\nException: %2$s"</string>
+    <string name="error_exception_received_while_executing_app_shell_command">Exception received while to executing \"%1$s\" app shell command.\nException: %2$s"</string>
 
 
 

From 6ff5572999b703a02df2962a513883fa8c799c93 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Tue, 26 Oct 2021 08:00:45 +0500
Subject: [PATCH 632/912] Changed!: Remove TermuxConstants reference from
 Logger and set DEFAULT_LOG_TAG at application startup

Plugin apps must do the same
---
 .../com/termux/app/TermuxApplication.java     | 15 ++++++++++-----
 .../java/com/termux/shared/logger/Logger.java | 19 +++++++++++++++++--
 .../termux/shared/shell/StreamGobbler.java    |  2 +-
 3 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxApplication.java b/app/src/main/java/com/termux/app/TermuxApplication.java
index 83a848618d..fbfc06baf0 100644
--- a/app/src/main/java/com/termux/app/TermuxApplication.java
+++ b/app/src/main/java/com/termux/app/TermuxApplication.java
@@ -1,7 +1,9 @@
 package com.termux.app;
 
 import android.app.Application;
+import android.content.Context;
 
+import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.termux.crash.TermuxCrashUtils;
 import com.termux.shared.termux.settings.preferences.TermuxAppSharedPreferences;
 import com.termux.shared.logger.Logger;
@@ -14,16 +16,19 @@ public void onCreate() {
         // Set crash handler for the app
         TermuxCrashUtils.setCrashHandler(this);
 
-        // Set log level for the app
-        setLogLevel();
+        // Set log config for the app
+        setLogConfig(getApplicationContext());
+
+        Logger.logDebug("Starting Application");
     }
 
-    private void setLogLevel() {
+    public static void setLogConfig(Context context) {
+        Logger.setDefaultLogTag(TermuxConstants.TERMUX_APP_NAME);
+
         // Load the log level from shared preferences and set it to the {@link Logger.CURRENT_LOG_LEVEL}
-        TermuxAppSharedPreferences preferences = TermuxAppSharedPreferences.build(getApplicationContext());
+        TermuxAppSharedPreferences preferences = TermuxAppSharedPreferences.build(context);
         if (preferences == null) return;
         preferences.setLogLevel(null, preferences.getLogLevel());
-        Logger.logDebug("Starting Application");
     }
 }
 
diff --git a/termux-shared/src/main/java/com/termux/shared/logger/Logger.java b/termux-shared/src/main/java/com/termux/shared/logger/Logger.java
index f6d386fc84..6f87538412 100644
--- a/termux-shared/src/main/java/com/termux/shared/logger/Logger.java
+++ b/termux-shared/src/main/java/com/termux/shared/logger/Logger.java
@@ -6,9 +6,10 @@
 import android.util.Log;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
+
 import com.termux.shared.R;
 import com.termux.shared.data.DataUtils;
-import com.termux.shared.termux.TermuxConstants;
 
 import java.io.IOException;
 import java.io.PrintWriter;
@@ -19,7 +20,7 @@
 
 public class Logger {
 
-    public static final String DEFAULT_LOG_TAG = TermuxConstants.TERMUX_APP_NAME;
+    private static String DEFAULT_LOG_TAG = "Logger";
 
     public static final int LOG_LEVEL_OFF = 0; // log nothing
     public static final int LOG_LEVEL_NORMAL = 1; // start logging error, warn and info messages and stacktraces
@@ -419,6 +420,20 @@ public static String getLogLevelLabel(final Context context, final int logLevel,
 
 
 
+    @NonNull
+    public static String getDefaultLogTag() {
+        return DEFAULT_LOG_TAG;
+    }
+
+    /**
+     * IllegalArgumentException will be thrown if tag.length() > 23 for Nougat (7.0) and prior releases.
+     * https://developer.android.com/reference/android/util/Log#isLoggable(java.lang.String,%20int) */
+    public static void setDefaultLogTag(@NonNull String defaultLogTag) {
+        DEFAULT_LOG_TAG = defaultLogTag.length() >= 23 ? defaultLogTag.substring(0, 22) : defaultLogTag;
+    }
+
+
+
     public static int getLogLevel() {
         return CURRENT_LOG_LEVEL;
     }
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/StreamGobbler.java b/termux-shared/src/main/java/com/termux/shared/shell/StreamGobbler.java
index aae4186549..04a5109da3 100644
--- a/termux-shared/src/main/java/com/termux/shared/shell/StreamGobbler.java
+++ b/termux-shared/src/main/java/com/termux/shared/shell/StreamGobbler.java
@@ -190,7 +190,7 @@ public StreamGobbler(@NonNull String shell, @NonNull InputStream inputStream,
 
     @Override
     public void run() {
-        String defaultLogTag = Logger.DEFAULT_LOG_TAG;
+        String defaultLogTag = Logger.getDefaultLogTag();
         boolean loggingEnabled = Logger.shouldEnableLoggingForCustomLogLevel(mLogLevel);
         if (loggingEnabled)
             Logger.logVerbose(LOG_TAG, "Using custom log level: " + mLogLevel + ", current log level: " + Logger.getLogLevel());

From 8c43b7f0a127d066af63f741b9c54c9a3391aad0 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Tue, 26 Oct 2021 08:28:25 +0500
Subject: [PATCH 633/912] Changed: Remove TermuxConstants reference from
 PackageUtils

---
 .../java/com/termux/shared/android/PackageUtils.java     | 9 ++++++---
 .../main/java/com/termux/shared/termux/TermuxUtils.java  | 6 +++++-
 .../preferences/TermuxAPIAppSharedPreferences.java       | 3 ++-
 .../settings/preferences/TermuxAppSharedPreferences.java | 3 ++-
 .../preferences/TermuxBootAppSharedPreferences.java      | 3 ++-
 .../preferences/TermuxFloatAppSharedPreferences.java     | 3 ++-
 .../preferences/TermuxStylingAppSharedPreferences.java   | 3 ++-
 .../preferences/TermuxTaskerAppSharedPreferences.java    | 3 ++-
 .../preferences/TermuxWidgetAppSharedPreferences.java    | 3 ++-
 9 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/android/PackageUtils.java b/termux-shared/src/main/java/com/termux/shared/android/PackageUtils.java
index 29126f5697..dae7b42b55 100644
--- a/termux-shared/src/main/java/com/termux/shared/android/PackageUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/android/PackageUtils.java
@@ -19,7 +19,6 @@
 import com.termux.shared.interact.MessageDialogUtils;
 import com.termux.shared.logger.Logger;
 import com.termux.shared.reflection.ReflectionUtils;
-import com.termux.shared.termux.TermuxConstants;
 
 import java.lang.reflect.Field;
 import java.security.MessageDigest;
@@ -53,15 +52,19 @@ public static Context getContextForPackage(@NonNull final Context context, Strin
      * @param packageName The package name whose {@link Context} to get.
      * @param exitAppOnError If {@code true} and failed to get package context, then a dialog will
      *                       be shown which when dismissed will exit the app.
+     * @param helpUrl The help user to add to {@link R.string#error_get_package_context_failed_help_url_message}.
      * @return Returns the {@link Context}. This will {@code null} if an exception is raised.
      */
     @Nullable
-    public static Context getContextForPackageOrExitApp(@NonNull Context context, String packageName, final boolean exitAppOnError) {
+    public static Context getContextForPackageOrExitApp(@NonNull Context context, String packageName,
+                                                        final boolean exitAppOnError, @Nullable String helpUrl) {
         Context packageContext = getContextForPackage(context, packageName);
 
         if (packageContext == null && exitAppOnError) {
             String errorMessage = context.getString(R.string.error_get_package_context_failed_message,
-                packageName, TermuxConstants.TERMUX_GITHUB_REPO_URL);
+                packageName);
+            if (!DataUtils.isNullOrEmpty(helpUrl))
+                errorMessage += "\n" + context.getString(R.string.error_get_package_context_failed_help_url_message, helpUrl);
             Logger.logError(LOG_TAG, errorMessage);
             MessageDialogUtils.exitAppWithErrorMessage(context,
                 context.getString(R.string.error_get_package_context_failed_title),
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
index 2f2906be6b..ce6ea6c974 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
@@ -117,7 +117,11 @@ public static Context getTermuxWidgetPackageContext(@NonNull Context context) {
         return PackageUtils.getContextForPackage(context, TermuxConstants.TERMUX_WIDGET_PACKAGE_NAME);
     }
 
-
+    /** Wrapper for {@link PackageUtils#getContextForPackageOrExitApp(Context, String, boolean, String)}. */
+    public static Context getContextForPackageOrExitApp(@NonNull Context context, String packageName,
+                                                        final boolean exitAppOnError) {
+        return PackageUtils.getContextForPackageOrExitApp(context, packageName, exitAppOnError, TermuxConstants.TERMUX_GITHUB_REPO_URL);
+    }
 
     /**
      * Check if Termux app is installed and enabled. This can be used by external apps that don't
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxAPIAppSharedPreferences.java b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxAPIAppSharedPreferences.java
index c056c57bad..e8f4505c4a 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxAPIAppSharedPreferences.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxAPIAppSharedPreferences.java
@@ -10,6 +10,7 @@
 import com.termux.shared.logger.Logger;
 import com.termux.shared.android.PackageUtils;
 import com.termux.shared.settings.preferences.SharedPreferenceUtils;
+import com.termux.shared.termux.TermuxUtils;
 import com.termux.shared.termux.settings.preferences.TermuxPreferenceConstants.TERMUX_API_APP;
 import com.termux.shared.termux.TermuxConstants;
 
@@ -54,7 +55,7 @@ public static TermuxAPIAppSharedPreferences build(@NonNull final Context context
      * @return Returns the {@link TermuxAPIAppSharedPreferences}. This will {@code null} if an exception is raised.
      */
     public static TermuxAPIAppSharedPreferences build(@NonNull final Context context, final boolean exitAppOnError) {
-        Context termuxTaskerPackageContext = PackageUtils.getContextForPackageOrExitApp(context, TermuxConstants.TERMUX_API_PACKAGE_NAME, exitAppOnError);
+        Context termuxTaskerPackageContext = TermuxUtils.getContextForPackageOrExitApp(context, TermuxConstants.TERMUX_API_PACKAGE_NAME, exitAppOnError);
         if (termuxTaskerPackageContext == null)
             return null;
         else
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxAppSharedPreferences.java b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxAppSharedPreferences.java
index 95c358f7d4..3e10ca70e4 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxAppSharedPreferences.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxAppSharedPreferences.java
@@ -13,6 +13,7 @@
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.logger.Logger;
 import com.termux.shared.data.DataUtils;
+import com.termux.shared.termux.TermuxUtils;
 import com.termux.shared.termux.settings.preferences.TermuxPreferenceConstants.TERMUX_APP;
 
 public class TermuxAppSharedPreferences {
@@ -59,7 +60,7 @@ public static TermuxAppSharedPreferences build(@NonNull final Context context) {
      * @return Returns the {@link TermuxAppSharedPreferences}. This will {@code null} if an exception is raised.
      */
     public static TermuxAppSharedPreferences build(@NonNull final Context context, final boolean exitAppOnError) {
-        Context termuxPackageContext = PackageUtils.getContextForPackageOrExitApp(context, TermuxConstants.TERMUX_PACKAGE_NAME, exitAppOnError);
+        Context termuxPackageContext = TermuxUtils.getContextForPackageOrExitApp(context, TermuxConstants.TERMUX_PACKAGE_NAME, exitAppOnError);
         if (termuxPackageContext == null)
             return null;
         else
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxBootAppSharedPreferences.java b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxBootAppSharedPreferences.java
index c5e3f43f7f..8fed86ba0a 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxBootAppSharedPreferences.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxBootAppSharedPreferences.java
@@ -10,6 +10,7 @@
 import com.termux.shared.logger.Logger;
 import com.termux.shared.android.PackageUtils;
 import com.termux.shared.settings.preferences.SharedPreferenceUtils;
+import com.termux.shared.termux.TermuxUtils;
 import com.termux.shared.termux.settings.preferences.TermuxPreferenceConstants.TERMUX_BOOT_APP;
 import com.termux.shared.termux.TermuxConstants;
 
@@ -54,7 +55,7 @@ public static TermuxBootAppSharedPreferences build(@NonNull final Context contex
      * @return Returns the {@link TermuxBootAppSharedPreferences}. This will {@code null} if an exception is raised.
      */
     public static TermuxBootAppSharedPreferences build(@NonNull final Context context, final boolean exitAppOnError) {
-        Context termuxTaskerPackageContext = PackageUtils.getContextForPackageOrExitApp(context, TermuxConstants.TERMUX_BOOT_PACKAGE_NAME, exitAppOnError);
+        Context termuxTaskerPackageContext = TermuxUtils.getContextForPackageOrExitApp(context, TermuxConstants.TERMUX_BOOT_PACKAGE_NAME, exitAppOnError);
         if (termuxTaskerPackageContext == null)
             return null;
         else
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxFloatAppSharedPreferences.java b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxFloatAppSharedPreferences.java
index 40e0316ec4..7810aa3a96 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxFloatAppSharedPreferences.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxFloatAppSharedPreferences.java
@@ -11,6 +11,7 @@
 import com.termux.shared.logger.Logger;
 import com.termux.shared.android.PackageUtils;
 import com.termux.shared.settings.preferences.SharedPreferenceUtils;
+import com.termux.shared.termux.TermuxUtils;
 import com.termux.shared.termux.settings.preferences.TermuxPreferenceConstants.TERMUX_FLOAT_APP;
 import com.termux.shared.termux.TermuxConstants;
 
@@ -60,7 +61,7 @@ public static TermuxFloatAppSharedPreferences build(@NonNull final Context conte
      * @return Returns the {@link TermuxFloatAppSharedPreferences}. This will {@code null} if an exception is raised.
      */
     public static TermuxFloatAppSharedPreferences build(@NonNull final Context context, final boolean exitAppOnError) {
-        Context termuxFloatPackageContext = PackageUtils.getContextForPackageOrExitApp(context, TermuxConstants.TERMUX_FLOAT_PACKAGE_NAME, exitAppOnError);
+        Context termuxFloatPackageContext = TermuxUtils.getContextForPackageOrExitApp(context, TermuxConstants.TERMUX_FLOAT_PACKAGE_NAME, exitAppOnError);
         if (termuxFloatPackageContext == null)
             return null;
         else
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxStylingAppSharedPreferences.java b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxStylingAppSharedPreferences.java
index b9344393b2..cd902635a8 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxStylingAppSharedPreferences.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxStylingAppSharedPreferences.java
@@ -10,6 +10,7 @@
 import com.termux.shared.logger.Logger;
 import com.termux.shared.android.PackageUtils;
 import com.termux.shared.settings.preferences.SharedPreferenceUtils;
+import com.termux.shared.termux.TermuxUtils;
 import com.termux.shared.termux.settings.preferences.TermuxPreferenceConstants.TERMUX_STYLING_APP;
 import com.termux.shared.termux.TermuxConstants;
 
@@ -54,7 +55,7 @@ public static TermuxStylingAppSharedPreferences build(@NonNull final Context con
      * @return Returns the {@link TermuxStylingAppSharedPreferences}. This will {@code null} if an exception is raised.
      */
     public static TermuxStylingAppSharedPreferences build(@NonNull final Context context, final boolean exitAppOnError) {
-        Context termuxTaskerPackageContext = PackageUtils.getContextForPackageOrExitApp(context, TermuxConstants.TERMUX_STYLING_PACKAGE_NAME, exitAppOnError);
+        Context termuxTaskerPackageContext = TermuxUtils.getContextForPackageOrExitApp(context, TermuxConstants.TERMUX_STYLING_PACKAGE_NAME, exitAppOnError);
         if (termuxTaskerPackageContext == null)
             return null;
         else
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxTaskerAppSharedPreferences.java b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxTaskerAppSharedPreferences.java
index 509869b6ae..e200adb2c7 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxTaskerAppSharedPreferences.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxTaskerAppSharedPreferences.java
@@ -10,6 +10,7 @@
 import com.termux.shared.android.PackageUtils;
 import com.termux.shared.settings.preferences.SharedPreferenceUtils;
 import com.termux.shared.termux.TermuxConstants;
+import com.termux.shared.termux.TermuxUtils;
 import com.termux.shared.termux.settings.preferences.TermuxPreferenceConstants.TERMUX_TASKER_APP;
 import com.termux.shared.logger.Logger;
 
@@ -54,7 +55,7 @@ public static TermuxTaskerAppSharedPreferences build(@NonNull final Context cont
      * @return Returns the {@link TermuxTaskerAppSharedPreferences}. This will {@code null} if an exception is raised.
      */
     public static  TermuxTaskerAppSharedPreferences build(@NonNull final Context context, final boolean exitAppOnError) {
-        Context termuxTaskerPackageContext = PackageUtils.getContextForPackageOrExitApp(context, TermuxConstants.TERMUX_TASKER_PACKAGE_NAME, exitAppOnError);
+        Context termuxTaskerPackageContext = TermuxUtils.getContextForPackageOrExitApp(context, TermuxConstants.TERMUX_TASKER_PACKAGE_NAME, exitAppOnError);
         if (termuxTaskerPackageContext == null)
             return null;
         else
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxWidgetAppSharedPreferences.java b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxWidgetAppSharedPreferences.java
index 0049c82ba7..3274f9d804 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxWidgetAppSharedPreferences.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxWidgetAppSharedPreferences.java
@@ -10,6 +10,7 @@
 import com.termux.shared.logger.Logger;
 import com.termux.shared.android.PackageUtils;
 import com.termux.shared.settings.preferences.SharedPreferenceUtils;
+import com.termux.shared.termux.TermuxUtils;
 import com.termux.shared.termux.settings.preferences.TermuxPreferenceConstants.TERMUX_WIDGET_APP;
 import com.termux.shared.termux.TermuxConstants;
 
@@ -56,7 +57,7 @@ public static TermuxWidgetAppSharedPreferences build(@NonNull final Context cont
      * @return Returns the {@link TermuxWidgetAppSharedPreferences}. This will {@code null} if an exception is raised.
      */
     public static TermuxWidgetAppSharedPreferences build(@NonNull final Context context, final boolean exitAppOnError) {
-        Context termuxTaskerPackageContext = PackageUtils.getContextForPackageOrExitApp(context, TermuxConstants.TERMUX_WIDGET_PACKAGE_NAME, exitAppOnError);
+        Context termuxTaskerPackageContext = TermuxUtils.getContextForPackageOrExitApp(context, TermuxConstants.TERMUX_WIDGET_PACKAGE_NAME, exitAppOnError);
         if (termuxTaskerPackageContext == null)
             return null;
         else

From b69d14119e34753d423a2189dcb040b9fea47657 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Fri, 29 Oct 2021 00:36:25 +0500
Subject: [PATCH 634/912] Changed: Return Error instead of boolean for
 ActivityUtils.startActivityForResult()

---
 .../{view => activity}/ActivityUtils.java     | 39 +++++++++----------
 .../shared/activity/ActivityUtilsErrno.java   | 19 +++++++++
 .../shared/android/PermissionUtils.java       | 20 +++++-----
 termux-shared/src/main/res/values/strings.xml |  6 ---
 4 files changed, 48 insertions(+), 36 deletions(-)
 rename termux-shared/src/main/java/com/termux/shared/{view => activity}/ActivityUtils.java (65%)
 create mode 100644 termux-shared/src/main/java/com/termux/shared/activity/ActivityUtilsErrno.java

diff --git a/termux-shared/src/main/java/com/termux/shared/view/ActivityUtils.java b/termux-shared/src/main/java/com/termux/shared/activity/ActivityUtils.java
similarity index 65%
rename from termux-shared/src/main/java/com/termux/shared/view/ActivityUtils.java
rename to termux-shared/src/main/java/com/termux/shared/activity/ActivityUtils.java
index 36df09a4f8..d6b0a8de79 100644
--- a/termux-shared/src/main/java/com/termux/shared/view/ActivityUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/activity/ActivityUtils.java
@@ -1,4 +1,4 @@
-package com.termux.shared.view;
+package com.termux.shared.activity;
 
 import android.app.Activity;
 import android.content.Context;
@@ -9,8 +9,6 @@
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 
-import com.termux.shared.R;
-import com.termux.shared.logger.Logger;
 import com.termux.shared.errors.Error;
 import com.termux.shared.errors.FunctionErrno;
 
@@ -22,14 +20,15 @@ public class ActivityUtils {
     /**
      * Wrapper for {@link #startActivityForResult(Context, int, Intent, boolean, boolean, ActivityResultLauncher)}.
      */
-    public static boolean startActivityForResult(Context context, int requestCode, @NonNull Intent intent) {
+    public static Error startActivityForResult(Context context, int requestCode, @NonNull Intent intent) {
         return startActivityForResult(context, requestCode, intent, true, true, null);
     }
 
     /**
      * Wrapper for {@link #startActivityForResult(Context, int, Intent, boolean, boolean, ActivityResultLauncher)}.
      */
-    public static boolean startActivityForResult(Context context, int requestCode, @NonNull Intent intent, boolean logErrorMessage, boolean showErrorMessage) {
+    public static Error startActivityForResult(Context context, int requestCode, @NonNull Intent intent,
+                                               boolean logErrorMessage, boolean showErrorMessage) {
         return startActivityForResult(context, requestCode, intent, logErrorMessage, showErrorMessage, null);
     }
 
@@ -50,10 +49,13 @@ public static boolean startActivityForResult(Context context, int requestCode, @
      *                               activity. If this is {@code null}, then
      *                               {@link Activity#startActivity(Intent)} will be used instead.
      *                               Note that later is deprecated.
-     * @return Returns {@code true} if starting activity was successful, otherwise {@code false}.
+     * @return Returns the {@code error} if starting activity was not successful, otherwise {@code null}.
+
      */
-    public static boolean startActivityForResult(@NonNull Context context, int requestCode, @NonNull Intent intent,
-                                                 boolean logErrorMessage, boolean showErrorMessage, @Nullable ActivityResultLauncher<Intent> activityResultLauncher) {
+    public static Error startActivityForResult(@NonNull Context context, int requestCode, @NonNull Intent intent,
+                                               boolean logErrorMessage, boolean showErrorMessage,
+                                               @Nullable ActivityResultLauncher<Intent> activityResultLauncher) {
+        Error error;
         try {
             if (activityResultLauncher != null) {
                 activityResultLauncher.launch(intent);
@@ -63,24 +65,21 @@ public static boolean startActivityForResult(@NonNull Context context, int reque
                 else if (context instanceof Activity)
                     ((Activity) context).startActivityForResult(intent, requestCode);
                 else {
+                    error = FunctionErrno.ERRNO_PARAMETER_NOT_INSTANCE_OF.getError("context", "startActivityForResult", "Activity or AppCompatActivity");
                     if (logErrorMessage)
-                        Error.logErrorAndShowToast(showErrorMessage ? context : null, LOG_TAG,
-                            FunctionErrno.ERRNO_PARAMETER_NOT_INSTANCE_OF.getError("context", "startActivityForResult", "Activity or AppCompatActivity"));
-                    return false;
+                        error.logErrorAndShowToast(showErrorMessage ? context : null, LOG_TAG);
+                    return error;
                 }
             }
         } catch (Exception e) {
-            if (logErrorMessage) {
-                String activityName = intent.getComponent() != null ? intent.getComponent().getShortClassName() : "Unknown";
-                String errmsg = context.getString(R.string.error_failed_to_start_activity_for_result, activityName);
-                Logger.logStackTraceWithMessage(LOG_TAG, errmsg, e);
-                if (showErrorMessage)
-                    Logger.showToast(context, errmsg + ": " + e.getMessage(), true);
-            }
-            return false;
+            String activityName = intent.getComponent() != null ? intent.getComponent().getClassName() : "Unknown";
+            error = ActivityUtilsErrno.ERRNO_START_ACTIVITY_FOR_RESULT_FAILED_WITH_EXCEPTION.getError(e, activityName, e.getMessage());
+            if (logErrorMessage)
+                error.logErrorAndShowToast(showErrorMessage ? context : null, LOG_TAG);
+            return error;
         }
 
-        return true;
+        return null;
     }
 
 }
diff --git a/termux-shared/src/main/java/com/termux/shared/activity/ActivityUtilsErrno.java b/termux-shared/src/main/java/com/termux/shared/activity/ActivityUtilsErrno.java
new file mode 100644
index 0000000000..ef44a314da
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/activity/ActivityUtilsErrno.java
@@ -0,0 +1,19 @@
+package com.termux.shared.activity;
+
+import com.termux.shared.errors.Errno;
+
+public class ActivityUtilsErrno extends Errno {
+
+    public static final String TYPE = "ActivityUtils Error";
+
+
+    /* Errors for starting activities (100-150) */
+    public static final Errno ERRNO_START_ACTIVITY_FAILED_WITH_EXCEPTION = new Errno(TYPE, 100, "Failed to start \"%1$s\" activity.\nException: %2$s");
+    public static final Errno ERRNO_START_ACTIVITY_FOR_RESULT_FAILED_WITH_EXCEPTION = new Errno(TYPE, 100, "Failed to start \"%1$s\" activity for result.\nException: %2$s");
+
+
+    ActivityUtilsErrno(final String type, final int code, final String message) {
+        super(type, code, message);
+    }
+
+}
diff --git a/termux-shared/src/main/java/com/termux/shared/android/PermissionUtils.java b/termux-shared/src/main/java/com/termux/shared/android/PermissionUtils.java
index 355305fc78..8e07509947 100644
--- a/termux-shared/src/main/java/com/termux/shared/android/PermissionUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/android/PermissionUtils.java
@@ -23,7 +23,7 @@
 import com.termux.shared.logger.Logger;
 import com.termux.shared.errors.Error;
 import com.termux.shared.errors.FunctionErrno;
-import com.termux.shared.view.ActivityUtils;
+import com.termux.shared.activity.ActivityUtils;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -331,24 +331,24 @@ public static boolean requestLegacyStorageExternalPermission(@NonNull Context co
      * {@link AppCompatActivity}.
      * @param requestCode The request code to use while asking for permission. It must be `>=0` or
      *                    will fail silently and will log an exception.
-     * @return Returns {@code true} if requesting the permission was successful, otherwise {@code false}.
+     * @return Returns the {@code error} if requesting the permission was not successful, otherwise {@code null}.
      */
-    public static boolean requestManageStorageExternalPermission(@NonNull Context context, int requestCode) {
+    public static Error requestManageStorageExternalPermission(@NonNull Context context, int requestCode) {
         Logger.logInfo(LOG_TAG, "Requesting manage external storage permission");
 
         Intent intent = new Intent(Settings.ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION);
         intent.addCategory("android.intent.category.DEFAULT");
         intent.setData(Uri.parse("package:" + context.getPackageName()));
-        boolean result = ActivityUtils.startActivityForResult(context, requestCode, intent);
+        Error error = ActivityUtils.startActivityForResult(context, requestCode, intent, true, false);
 
         // Use fallback if matching Activity did not exist for ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION.
-        if (!result) {
+        if (error != null) {
             intent = new Intent();
             intent.setAction(Settings.ACTION_MANAGE_ALL_FILES_ACCESS_PERMISSION);
             return ActivityUtils.startActivityForResult(context, requestCode, intent);
         }
 
-        return true;
+        return null;
     }
 
     /**
@@ -428,9 +428,9 @@ public static boolean checkDisplayOverOtherAppsPermission(@NonNull Context conte
      * {@link AppCompatActivity}.
      * @param requestCode The request code to use while asking for permission. It must be `>=0` or
      *                    will fail silently and will log an exception.
-     * @return Returns {@code true} if requesting the permission was successful, otherwise {@code false}.
+     * @return Returns the {@code error} if requesting the permission was not successful, otherwise {@code null}.
      */
-    public static boolean requestDisplayOverOtherAppsPermission(@NonNull Context context, int requestCode) {
+    public static Error requestDisplayOverOtherAppsPermission(@NonNull Context context, int requestCode) {
         Intent intent = new Intent(Settings.ACTION_MANAGE_OVERLAY_PERMISSION);
         intent.setData(Uri.parse("package:" + context.getPackageName()));
         return ActivityUtils.startActivityForResult(context, requestCode, intent);
@@ -483,10 +483,10 @@ public static boolean checkIfBatteryOptimizationsDisabled(@NonNull Context conte
      * {@link AppCompatActivity}.
      * @param requestCode The request code to use while asking for permission. It must be `>=0` or
      *                    will fail silently and will log an exception.
-     * @return Returns {@code true} if requesting the permission was successful, otherwise {@code false}.
+     * @return Returns the {@code error} if requesting the permission was not successful, otherwise {@code null}.
      */
     @SuppressLint("BatteryLife")
-    public static boolean requestDisableBatteryOptimizations(@NonNull Context context, int requestCode) {
+    public static Error requestDisableBatteryOptimizations(@NonNull Context context, int requestCode) {
         Intent intent = new Intent(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS);
         intent.setData(Uri.parse("package:" + context.getPackageName()));
         return ActivityUtils.startActivityForResult(context, requestCode, intent);
diff --git a/termux-shared/src/main/res/values/strings.xml b/termux-shared/src/main/res/values/strings.xml
index f0bc66d950..219b917713 100644
--- a/termux-shared/src/main/res/values/strings.xml
+++ b/termux-shared/src/main/res/values/strings.xml
@@ -18,12 +18,6 @@
 
 
 
-    <!-- ActivityUtils -->
-    <string name="error_failed_to_start_activity">Failed to start %1$s activity</string>
-    <string name="error_failed_to_start_activity_for_result">Failed to start %1$s activity for result</string>
-
-
-
     <!-- PackageUtils -->
     <string name="error_app_not_installed_or_disabled_warning">The %1$s (%2$s) app is not installed or is disabled."</string>
     <string name="error_get_package_context_failed_title">Failed To Get Package Context</string>

From f857bf2968910387a599b7da468b8bc9f3aa2261 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Fri, 29 Oct 2021 00:58:48 +0500
Subject: [PATCH 635/912] Added: Add ActivityUtils.startActivity() and catch
 uncaught exceptions in TermuxActivity

---
 .../java/com/termux/app/TermuxActivity.java   | 15 +++--
 .../termux/shared/activity/ActivityUtils.java | 62 +++++++++++++++++--
 .../shared/activity/ActivityUtilsErrno.java   |  3 +-
 3 files changed, 69 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index 31883f1960..9d930bc852 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -33,6 +33,7 @@
 import com.termux.R;
 import com.termux.app.terminal.TermuxActivityRootView;
 import com.termux.shared.activities.ReportActivity;
+import com.termux.shared.activity.ActivityUtils;
 import com.termux.shared.data.IntentUtils;
 import com.termux.shared.android.PermissionUtils;
 import com.termux.shared.termux.TermuxConstants;
@@ -524,7 +525,7 @@ private void saveTerminalToolbarTextInput(Bundle savedInstanceState) {
     private void setSettingsButtonView() {
         ImageButton settingsButton = findViewById(R.id.settings_button);
         settingsButton.setOnClickListener(v -> {
-            startActivity(new Intent(this, SettingsActivity.class));
+            ActivityUtils.startActivity(this, new Intent(this, SettingsActivity.class));
         });
     }
 
@@ -643,10 +644,10 @@ public boolean onContextItemSelected(MenuItem item) {
                 toggleKeepScreenOn();
                 return true;
             case CONTEXT_MENU_HELP_ID:
-                startActivity(new Intent(this, HelpActivity.class));
+                ActivityUtils.startActivity(this, new Intent(this, HelpActivity.class));
                 return true;
             case CONTEXT_MENU_SETTINGS_ID:
-                startActivity(new Intent(this, SettingsActivity.class));
+                ActivityUtils.startActivity(this, new Intent(this, SettingsActivity.class));
                 return true;
             case CONTEXT_MENU_REPORT_ID:
                 mTermuxTerminalViewClient.reportIssueFromTranscript();
@@ -689,7 +690,9 @@ private void showStylingDialog() {
             // The startActivity() call is not documented to throw IllegalArgumentException.
             // However, crash reporting shows that it sometimes does, so catch it here.
             new AlertDialog.Builder(this).setMessage(getString(R.string.error_styling_not_installed))
-                .setPositiveButton(R.string.action_styling_install, (dialog, which) -> startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(TermuxConstants.TERMUX_STYLING_FDROID_PACKAGE_URL)))).setNegativeButton(android.R.string.cancel, null).show();
+                .setPositiveButton(R.string.action_styling_install,
+                    (dialog, which) -> ActivityUtils.startActivity(this, new Intent(Intent.ACTION_VIEW, Uri.parse(TermuxConstants.TERMUX_STYLING_FDROID_PACKAGE_URL))))
+                .setNegativeButton(android.R.string.cancel, null).show();
         }
     }
     private void toggleKeepScreenOn() {
@@ -719,7 +722,7 @@ private void requestAutoFill() {
      * if targeting targetSdkVersion 30 (android 11) and running on sdk 30 (android 11) and higher.
      */
     public void requestStoragePermission(boolean isPermissionCallback) {
-         new Thread() {
+        new Thread() {
             @Override
             public void run() {
                 // Do not ask for permission again
@@ -934,7 +937,7 @@ private void reloadActivityStyling() {
 
 
     public static void startTermuxActivity(@NonNull final Context context) {
-        context.startActivity(newInstance(context));
+        ActivityUtils.startActivity(context, newInstance(context));
     }
 
     public static Intent newInstance(@NonNull final Context context) {
diff --git a/termux-shared/src/main/java/com/termux/shared/activity/ActivityUtils.java b/termux-shared/src/main/java/com/termux/shared/activity/ActivityUtils.java
index d6b0a8de79..89f2205e61 100644
--- a/termux-shared/src/main/java/com/termux/shared/activity/ActivityUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/activity/ActivityUtils.java
@@ -17,6 +17,51 @@ public class ActivityUtils {
 
     private static final String LOG_TAG = "ActivityUtils";
 
+    /**
+     * Wrapper for {@link #startActivity(Context, Intent, boolean, boolean)}.
+     */
+    public static Error startActivity(@NonNull Context context, @NonNull Intent intent) {
+        return startActivity(context, intent, true, true);
+    }
+
+    /**
+     * Start an {@link Activity}.
+     *
+     * @param context The context for operations.
+     * @param intent The {@link Intent} to send to start the activity.
+     * @param logErrorMessage If an error message should be logged if failed to start activity.
+     * @param showErrorMessage If an error message toast should be shown if failed to start activity
+     *                         in addition to logging a message. The {@code context} must not be
+     *                         {@code null}.
+     * @return Returns the {@code error} if starting activity was not successful, otherwise {@code null}.
+
+     */
+    public static Error startActivity(Context context, @NonNull Intent intent,
+                                      boolean logErrorMessage, boolean showErrorMessage) {
+        Error error;
+        String activityName = intent.getComponent() != null ? intent.getComponent().getClassName() : "Unknown";
+
+        if (context == null) {
+            error = ActivityUtilsErrno.ERRNO_STARTING_ACTIVITY_WITH_NULL_CONTEXT.getError(activityName);
+            if (logErrorMessage)
+                error.logErrorAndShowToast(null, LOG_TAG);
+            return error;
+        }
+
+        try {
+            context.startActivity(intent);
+        } catch (Exception e) {
+            error = ActivityUtilsErrno.ERRNO_START_ACTIVITY_FAILED_WITH_EXCEPTION.getError(e, activityName, e.getMessage());
+            if (logErrorMessage)
+                error.logErrorAndShowToast(showErrorMessage ? context : null, LOG_TAG);
+            return error;
+        }
+
+        return null;
+    }
+
+
+
     /**
      * Wrapper for {@link #startActivityForResult(Context, int, Intent, boolean, boolean, ActivityResultLauncher)}.
      */
@@ -44,22 +89,32 @@ public static Error startActivityForResult(Context context, int requestCode, @No
      * @param intent The {@link Intent} to send to start the activity.
      * @param logErrorMessage If an error message should be logged if failed to start activity.
      * @param showErrorMessage If an error message toast should be shown if failed to start activity
-     *                         in addition to logging a message.
+     *                         in addition to logging a message. The {@code context} must not be
+     *                         {@code null}.
      * @param activityResultLauncher The {@link ActivityResultLauncher<Intent>} to use for start the
      *                               activity. If this is {@code null}, then
-     *                               {@link Activity#startActivity(Intent)} will be used instead.
+     *                               {@link Activity#startActivityForResult(Intent, int)} will be
+     *                               used instead.
      *                               Note that later is deprecated.
      * @return Returns the {@code error} if starting activity was not successful, otherwise {@code null}.
 
      */
-    public static Error startActivityForResult(@NonNull Context context, int requestCode, @NonNull Intent intent,
+    public static Error startActivityForResult(Context context, int requestCode, @NonNull Intent intent,
                                                boolean logErrorMessage, boolean showErrorMessage,
                                                @Nullable ActivityResultLauncher<Intent> activityResultLauncher) {
         Error error;
+        String activityName = intent.getComponent() != null ? intent.getComponent().getClassName() : "Unknown";
         try {
             if (activityResultLauncher != null) {
                 activityResultLauncher.launch(intent);
             } else {
+                if (context == null) {
+                    error = ActivityUtilsErrno.ERRNO_STARTING_ACTIVITY_WITH_NULL_CONTEXT.getError(activityName);
+                    if (logErrorMessage)
+                        error.logErrorAndShowToast(null, LOG_TAG);
+                    return error;
+                }
+
                 if (context instanceof AppCompatActivity)
                     ((AppCompatActivity) context).startActivityForResult(intent, requestCode);
                 else if (context instanceof Activity)
@@ -72,7 +127,6 @@ else if (context instanceof Activity)
                 }
             }
         } catch (Exception e) {
-            String activityName = intent.getComponent() != null ? intent.getComponent().getClassName() : "Unknown";
             error = ActivityUtilsErrno.ERRNO_START_ACTIVITY_FOR_RESULT_FAILED_WITH_EXCEPTION.getError(e, activityName, e.getMessage());
             if (logErrorMessage)
                 error.logErrorAndShowToast(showErrorMessage ? context : null, LOG_TAG);
diff --git a/termux-shared/src/main/java/com/termux/shared/activity/ActivityUtilsErrno.java b/termux-shared/src/main/java/com/termux/shared/activity/ActivityUtilsErrno.java
index ef44a314da..3c77cba959 100644
--- a/termux-shared/src/main/java/com/termux/shared/activity/ActivityUtilsErrno.java
+++ b/termux-shared/src/main/java/com/termux/shared/activity/ActivityUtilsErrno.java
@@ -9,7 +9,8 @@ public class ActivityUtilsErrno extends Errno {
 
     /* Errors for starting activities (100-150) */
     public static final Errno ERRNO_START_ACTIVITY_FAILED_WITH_EXCEPTION = new Errno(TYPE, 100, "Failed to start \"%1$s\" activity.\nException: %2$s");
-    public static final Errno ERRNO_START_ACTIVITY_FOR_RESULT_FAILED_WITH_EXCEPTION = new Errno(TYPE, 100, "Failed to start \"%1$s\" activity for result.\nException: %2$s");
+    public static final Errno ERRNO_START_ACTIVITY_FOR_RESULT_FAILED_WITH_EXCEPTION = new Errno(TYPE, 101, "Failed to start \"%1$s\" activity for result.\nException: %2$s");
+    public static final Errno ERRNO_STARTING_ACTIVITY_WITH_NULL_CONTEXT = new Errno(TYPE, 102, "Cannot start \"%1$s\" activity with null Context");
 
 
     ActivityUtilsErrno(final String type, final int code, final String message) {

From 36e49707ecf3c442a9329b55545a9cfe7b1f5d5c Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Fri, 29 Oct 2021 01:55:27 +0500
Subject: [PATCH 636/912] Added: Add support to request Settings.ACTION*
 permissions to be requested via Service context

---
 .../shared/android/PermissionUtils.java       | 77 +++++++++++++++----
 1 file changed, 61 insertions(+), 16 deletions(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/android/PermissionUtils.java b/termux-shared/src/main/java/com/termux/shared/android/PermissionUtils.java
index 8e07509947..d2ca2289fe 100644
--- a/termux-shared/src/main/java/com/termux/shared/android/PermissionUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/android/PermissionUtils.java
@@ -3,6 +3,7 @@
 import android.Manifest;
 import android.annotation.SuppressLint;
 import android.app.Activity;
+import android.app.Service;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageInfo;
@@ -324,13 +325,20 @@ public static boolean requestLegacyStorageExternalPermission(@NonNull Context co
         return requestPermission(context, Manifest.permission.WRITE_EXTERNAL_STORAGE, requestCode);
     }
 
+    /** Wrapper for {@link #requestManageStorageExternalPermission(Context, int)}. */
+    public static Error requestManageStorageExternalPermission(@NonNull Context context) {
+        return requestManageStorageExternalPermission(context, -1);
+    }
+
     /**
      * Request user to grant {@link Manifest.permission#MANAGE_EXTERNAL_STORAGE} permission to the app.
      *
-     * @param context The context for operations. It must be an instance of {@link Activity} or
-     * {@link AppCompatActivity}.
-     * @param requestCode The request code to use while asking for permission. It must be `>=0` or
-     *                    will fail silently and will log an exception.
+     * @param context The context for operations, like an {@link Activity} or {@link Service} context.
+     *                It must be an instance of {@link Activity} or {@link AppCompatActivity} if
+     *                result is required via the Activity#onActivityResult() callback and
+     *                {@code requestCode} is `>=0`.
+     * @param requestCode The request code to use while asking for permission. It must be `>=0` if
+     *                    result it required.
      * @return Returns the {@code error} if requesting the permission was not successful, otherwise {@code null}.
      */
     public static Error requestManageStorageExternalPermission(@NonNull Context context, int requestCode) {
@@ -339,13 +347,22 @@ public static Error requestManageStorageExternalPermission(@NonNull Context cont
         Intent intent = new Intent(Settings.ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION);
         intent.addCategory("android.intent.category.DEFAULT");
         intent.setData(Uri.parse("package:" + context.getPackageName()));
-        Error error = ActivityUtils.startActivityForResult(context, requestCode, intent, true, false);
+        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+
+        Error error;
+        if (requestCode >=0)
+            error = ActivityUtils.startActivityForResult(context, requestCode, intent, true, false);
+        else
+            error = ActivityUtils.startActivity(context, intent, true, false);
 
         // Use fallback if matching Activity did not exist for ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION.
         if (error != null) {
             intent = new Intent();
             intent.setAction(Settings.ACTION_MANAGE_ALL_FILES_ACCESS_PERMISSION);
-            return ActivityUtils.startActivityForResult(context, requestCode, intent);
+            if (requestCode >=0)
+                return ActivityUtils.startActivityForResult(context, requestCode, intent);
+            else
+                return ActivityUtils.startActivity(context, intent);
         }
 
         return null;
@@ -421,19 +438,33 @@ public static boolean checkDisplayOverOtherAppsPermission(@NonNull Context conte
         return Settings.canDrawOverlays(context);
     }
 
+    /** Wrapper for {@link #requestDisplayOverOtherAppsPermission(Context, int)}. */
+    public static Error requestDisplayOverOtherAppsPermission(@NonNull Context context) {
+        return requestDisplayOverOtherAppsPermission(context, -1);
+    }
+
     /**
      * Request user to grant {@link Manifest.permission#SYSTEM_ALERT_WINDOW} permission to the app.
      *
-     * @param context The context for operations. It must be an instance of {@link Activity} or
-     * {@link AppCompatActivity}.
-     * @param requestCode The request code to use while asking for permission. It must be `>=0` or
-     *                    will fail silently and will log an exception.
+     * @param context The context for operations, like an {@link Activity} or {@link Service} context.
+     *                It must be an instance of {@link Activity} or {@link AppCompatActivity} if
+     *                result is required via the Activity#onActivityResult() callback and
+     *                {@code requestCode} is `>=0`.
+     * @param requestCode The request code to use while asking for permission. It must be `>=0` if
+     *                    result it required.
      * @return Returns the {@code error} if requesting the permission was not successful, otherwise {@code null}.
      */
     public static Error requestDisplayOverOtherAppsPermission(@NonNull Context context, int requestCode) {
+        Logger.logInfo(LOG_TAG, "Requesting display over apps permission");
+
         Intent intent = new Intent(Settings.ACTION_MANAGE_OVERLAY_PERMISSION);
         intent.setData(Uri.parse("package:" + context.getPackageName()));
-        return ActivityUtils.startActivityForResult(context, requestCode, intent);
+        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+
+        if (requestCode >=0)
+            return ActivityUtils.startActivityForResult(context, requestCode, intent);
+        else
+            return ActivityUtils.startActivity(context, intent);
     }
 
     /**
@@ -475,21 +506,35 @@ public static boolean checkIfBatteryOptimizationsDisabled(@NonNull Context conte
         return powerManager.isIgnoringBatteryOptimizations(context.getPackageName());
     }
 
+    /** Wrapper for {@link #requestDisableBatteryOptimizations(Context, int)}. */
+    public static Error requestDisableBatteryOptimizations(@NonNull Context context) {
+        return requestDisableBatteryOptimizations(context, -1);
+    }
+
     /**
      * Request user to grant {@link Manifest.permission#REQUEST_IGNORE_BATTERY_OPTIMIZATIONS}
      * permission to the app.
      *
-     * @param context The context for operations. It must be an instance of {@link Activity} or
-     * {@link AppCompatActivity}.
-     * @param requestCode The request code to use while asking for permission. It must be `>=0` or
-     *                    will fail silently and will log an exception.
+     * @param context The context for operations, like an {@link Activity} or {@link Service} context.
+     *                It must be an instance of {@link Activity} or {@link AppCompatActivity} if
+     *                result is required via the Activity#onActivityResult() callback and
+     *                {@code requestCode} is `>=0`.
+     * @param requestCode The request code to use while asking for permission. It must be `>=0` if
+     *                    result it required.
      * @return Returns the {@code error} if requesting the permission was not successful, otherwise {@code null}.
      */
     @SuppressLint("BatteryLife")
     public static Error requestDisableBatteryOptimizations(@NonNull Context context, int requestCode) {
+        Logger.logInfo(LOG_TAG, "Requesting to disable battery optimizations");
+
         Intent intent = new Intent(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS);
         intent.setData(Uri.parse("package:" + context.getPackageName()));
-        return ActivityUtils.startActivityForResult(context, requestCode, intent);
+        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+
+        if (requestCode >=0)
+            return ActivityUtils.startActivityForResult(context, requestCode, intent);
+        else
+            return ActivityUtils.startActivity(context, intent);
     }
 
 }

From 0a3efc537dc7d048f85dbcbbdf4720b378413860 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Fri, 29 Oct 2021 01:56:37 +0500
Subject: [PATCH 637/912] Changed: Use PermissionUtils to request disabling
 battery optimizations in TermuxService

---
 .../main/java/com/termux/app/TermuxService.java    | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxService.java b/app/src/main/java/com/termux/app/TermuxService.java
index 0cba527806..fae54a2270 100644
--- a/app/src/main/java/com/termux/app/TermuxService.java
+++ b/app/src/main/java/com/termux/app/TermuxService.java
@@ -302,18 +302,8 @@ private void actionAcquireWakeLock() {
         mWifiLock = wm.createWifiLock(WifiManager.WIFI_MODE_FULL_HIGH_PERF, TermuxConstants.TERMUX_APP_NAME.toLowerCase());
         mWifiLock.acquire();
 
-        String packageName = getPackageName();
-        if (!pm.isIgnoringBatteryOptimizations(packageName)) {
-            Intent whitelist = new Intent();
-            whitelist.setAction(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS);
-            whitelist.setData(Uri.parse("package:" + packageName));
-            whitelist.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-
-            try {
-                startActivity(whitelist);
-            } catch (ActivityNotFoundException e) {
-                Logger.logStackTraceWithMessage(LOG_TAG, "Failed to call ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS", e);
-            }
+        if (!PermissionUtils.checkIfBatteryOptimizationsDisabled(this)) {
+            PermissionUtils.requestDisableBatteryOptimizations(this);
         }
 
         updateNotification();

From 1b794b35181ca5c75fdbba4094a13eddd1848b2c Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sun, 31 Oct 2021 07:32:24 +0500
Subject: [PATCH 638/912] Fixed: Do not use colon character ":" in log tag
 since it is invalid and breaks logcat command filterspecs argument

---
 .../src/main/java/com/termux/shared/logger/Logger.java    | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/logger/Logger.java b/termux-shared/src/main/java/com/termux/shared/logger/Logger.java
index 6f87538412..0bf094f2e1 100644
--- a/termux-shared/src/main/java/com/termux/shared/logger/Logger.java
+++ b/termux-shared/src/main/java/com/termux/shared/logger/Logger.java
@@ -450,11 +450,17 @@ public static int setLogLevel(Context context, int logLevel) {
         return CURRENT_LOG_LEVEL;
     }
 
+    /** The colon character ":" must not exist inside the tag, otherwise the `logcat` command
+     * filterspecs arguments `<tag>[:priority]` will not work and will throw `Invalid filter expression`
+     * error.
+     * https://cs.android.com/android/platform/superproject/+/android-12.0.0_r4:system/logging/liblog/logprint.cpp;l=363
+     * https://cs.android.com/android/platform/superproject/+/android-12.0.0_r4:system/logging/logcat/logcat.cpp;l=884
+     * */
     public static String getFullTag(String tag) {
         if (DEFAULT_LOG_TAG.equals(tag))
             return tag;
         else
-            return DEFAULT_LOG_TAG + ":" + tag;
+            return DEFAULT_LOG_TAG + "." + tag;
     }
 
     public static boolean isLogLevelValid(Integer logLevel) {

From b79ed509f14ac963d0f881e0a2201f13d67f9931 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Fri, 12 Nov 2021 08:33:11 +0500
Subject: [PATCH 639/912] Changed: Store app wide night mode in
 NightMode.APP_NIGHT_MODE so that libraries can use it directly without having
 to load or get it from termux properties

---
 .../java/com/termux/app/TermuxActivity.java   | 14 ++++-
 .../com/termux/app/TermuxApplication.java     |  8 ++-
 .../TermuxSessionsListViewController.java     |  3 +-
 .../shared/termux/theme/TermuxThemeUtils.java | 25 ++++++++
 .../com/termux/shared/theme/NightMode.java    | 59 ++++++++++++++++---
 5 files changed, 96 insertions(+), 13 deletions(-)
 create mode 100644 termux-shared/src/main/java/com/termux/shared/termux/theme/TermuxThemeUtils.java

diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index 9d930bc852..7716af5265 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -50,6 +50,8 @@
 import com.termux.shared.termux.interact.TextInputDialogUtils;
 import com.termux.shared.logger.Logger;
 import com.termux.shared.termux.TermuxUtils;
+import com.termux.shared.termux.theme.TermuxThemeUtils;
+import com.termux.shared.theme.NightMode;
 import com.termux.shared.theme.ThemeUtils;
 import com.termux.shared.view.ViewUtils;
 import com.termux.terminal.TerminalSession;
@@ -408,7 +410,10 @@ public void onServiceDisconnected(ComponentName name) {
 
 
     private void setActivityTheme() {
-        if (ThemeUtils.shouldEnableDarkTheme(this, mProperties.getNightMode())) {
+        // Update NightMode.APP_NIGHT_MODE
+        TermuxThemeUtils.setAppNightMode(mProperties.getNightMode());
+
+        if (ThemeUtils.shouldEnableDarkTheme(this, NightMode.getAppNightMode().getName())) {
             this.setTheme(R.style.Theme_Termux_Black);
         } else {
             this.setTheme(R.style.Theme_Termux);
@@ -416,7 +421,7 @@ private void setActivityTheme() {
     }
 
     private void setDrawerTheme() {
-        if (ThemeUtils.shouldEnableDarkTheme(this, mProperties.getNightMode())) {
+        if (ThemeUtils.shouldEnableDarkTheme(this, NightMode.getAppNightMode().getName())) {
             findViewById(R.id.left_drawer).setBackgroundColor(ContextCompat.getColor(this,
                 android.R.color.background_dark));
             ((ImageButton) findViewById(R.id.settings_button)).setColorFilter(Color.WHITE);
@@ -904,13 +909,16 @@ public void onReceive(Context context, Intent intent) {
     }
 
     private void reloadActivityStyling() {
-        if (mProperties!= null) {
+        if (mProperties != null) {
             mProperties.loadTermuxPropertiesFromDisk();
 
             if (mExtraKeysView != null) {
                 mExtraKeysView.setButtonTextAllCaps(mProperties.shouldExtraKeysTextBeAllCaps());
                 mExtraKeysView.reload(mProperties.getExtraKeysInfo());
             }
+
+            // Update NightMode.APP_NIGHT_MODE
+            TermuxThemeUtils.setAppNightMode(mProperties.getNightMode());
         }
 
         setMargins();
diff --git a/app/src/main/java/com/termux/app/TermuxApplication.java b/app/src/main/java/com/termux/app/TermuxApplication.java
index fbfc06baf0..994168acad 100644
--- a/app/src/main/java/com/termux/app/TermuxApplication.java
+++ b/app/src/main/java/com/termux/app/TermuxApplication.java
@@ -7,19 +7,25 @@
 import com.termux.shared.termux.crash.TermuxCrashUtils;
 import com.termux.shared.termux.settings.preferences.TermuxAppSharedPreferences;
 import com.termux.shared.logger.Logger;
+import com.termux.shared.termux.theme.TermuxThemeUtils;
 
 
 public class TermuxApplication extends Application {
     public void onCreate() {
         super.onCreate();
 
+        Context context = getApplicationContext();
+
         // Set crash handler for the app
         TermuxCrashUtils.setCrashHandler(this);
 
         // Set log config for the app
-        setLogConfig(getApplicationContext());
+        setLogConfig(context);
 
         Logger.logDebug("Starting Application");
+
+        // Set NightMode.APP_NIGHT_MODE
+        TermuxThemeUtils.setAppNightMode(context);
     }
 
     public static void setLogConfig(Context context) {
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxSessionsListViewController.java b/app/src/main/java/com/termux/app/terminal/TermuxSessionsListViewController.java
index 98a460e3bc..bf914b977b 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxSessionsListViewController.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxSessionsListViewController.java
@@ -21,6 +21,7 @@
 import com.termux.R;
 import com.termux.app.TermuxActivity;
 import com.termux.shared.termux.shell.command.runner.terminal.TermuxSession;
+import com.termux.shared.theme.NightMode;
 import com.termux.shared.theme.ThemeUtils;
 import com.termux.terminal.TerminalSession;
 
@@ -56,7 +57,7 @@ public View getView(int position, View convertView, @NonNull ViewGroup parent) {
             return sessionRowView;
         }
 
-        boolean shouldEnableDarkTheme = ThemeUtils.shouldEnableDarkTheme(mActivity, mActivity.getProperties().getNightMode());
+        boolean shouldEnableDarkTheme = ThemeUtils.shouldEnableDarkTheme(mActivity, NightMode.getAppNightMode().getName());
 
         if (shouldEnableDarkTheme) {
             sessionTitleView.setBackground(
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/theme/TermuxThemeUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/theme/TermuxThemeUtils.java
new file mode 100644
index 0000000000..e347fb8d13
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/termux/theme/TermuxThemeUtils.java
@@ -0,0 +1,25 @@
+package com.termux.shared.termux.theme;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.termux.shared.termux.settings.properties.TermuxPropertyConstants;
+import com.termux.shared.termux.settings.properties.TermuxSharedProperties;
+import com.termux.shared.theme.NightMode;
+
+public class TermuxThemeUtils {
+
+    /** Get the {@link TermuxPropertyConstants#KEY_NIGHT_MODE} value from the properties file on disk
+     * and set it to app wide night mode value. */
+    public static void setAppNightMode(@NonNull Context context) {
+        NightMode.setAppNightMode(TermuxSharedProperties.getNightMode(context));
+    }
+
+    /** Set name as app wide night mode value. */
+    public static void setAppNightMode(@Nullable String name) {
+        NightMode.setAppNightMode(name);
+    }
+
+}
diff --git a/termux-shared/src/main/java/com/termux/shared/theme/NightMode.java b/termux-shared/src/main/java/com/termux/shared/theme/NightMode.java
index 8f4ff416cf..37e3076a22 100644
--- a/termux-shared/src/main/java/com/termux/shared/theme/NightMode.java
+++ b/termux-shared/src/main/java/com/termux/shared/theme/NightMode.java
@@ -1,7 +1,11 @@
 package com.termux.shared.theme;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatDelegate;
 
+import com.termux.shared.logger.Logger;
+
 /** The modes used by to decide night mode for themes. */
 public enum NightMode {
 
@@ -17,6 +21,11 @@ public enum NightMode {
      */
     SYSTEM("system", AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM);
 
+    /** The current app wide night mode used by various libraries. Defaults to {@link #SYSTEM}. */
+    private static NightMode APP_NIGHT_MODE;
+
+    private static final String LOG_TAG = "NightMode";
+
     private final String name;
     private final int mode;
 
@@ -33,16 +42,50 @@ public int getMode() {
         return mode;
     }
 
-    public static Integer modeOf(String name) {
-        if (TRUE.name.equals(name))
-            return TRUE.mode;
-        else if (FALSE.name.equals(name))
-            return FALSE.mode;
-        else if (SYSTEM.name.equals(name)) {
-            return SYSTEM.mode;
+
+    /** Get {@link NightMode} for {@code name} if found, otherwise {@code null}. */
+    @Nullable
+    public static NightMode modeOf(String name) {
+        for (NightMode v : NightMode.values()) {
+            if (v.name.equals(name)) {
+                return v;
+            }
+        }
+
+        return null;
+    }
+
+    /** Get {@link NightMode} for {@code name} if found, otherwise {@code def}. */
+    @NonNull
+    public static NightMode modeOf(@Nullable String name, @NonNull NightMode def) {
+        NightMode nightMode = modeOf(name);
+        return nightMode != null ? nightMode : def;
+    }
+
+
+    /** Set {@link #APP_NIGHT_MODE}. */
+    public static void setAppNightMode(@Nullable String name) {
+        if (name == null || name.isEmpty()) {
+            APP_NIGHT_MODE = SYSTEM;
         } else {
-            return null;
+            NightMode nightMode = NightMode.modeOf(name);
+            if (nightMode == null) {
+                Logger.logError(LOG_TAG, "Invalid APP_NIGHT_MODE \"" + name + "\"");
+                return;
+            }
+            APP_NIGHT_MODE = nightMode;
         }
+
+        Logger.logVerbose(LOG_TAG, "Set APP_NIGHT_MODE to \"" + APP_NIGHT_MODE.getName() + "\"");
+    }
+
+    /** Get {@link #APP_NIGHT_MODE}. */
+    @NonNull
+    public static NightMode getAppNightMode() {
+        if (APP_NIGHT_MODE == null)
+            APP_NIGHT_MODE =  SYSTEM;
+
+        return APP_NIGHT_MODE;
     }
 
 }

From 7a386a7f2a4d0d0600e1c026486a5f4d04b31803 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Mon, 15 Nov 2021 07:31:14 +0500
Subject: [PATCH 640/912] Fixed: Fix ArrayIndexOutOfBoundsException when
 setting zero width terminal character

java.lang.ArrayIndexOutOfBoundsException: length=64; index=-1
at com.termux.terminal.TerminalRow.setChar(TerminalRow.java:127)
at com.termux.terminal.TerminalBuffer.setChar(TerminalBuffer.java:413)
at com.termux.terminal.TerminalEmulator.emitCodePoint(TerminalEmulator.java:2329)
at com.termux.terminal.TerminalEmulator.processCodePoint(TerminalEmulator.java:617)
at com.termux.terminal.TerminalEmulator.processByte(TerminalEmulator.java:513)
at com.termux.terminal.TerminalEmulator.append(TerminalEmulator.java:480)
at com.termux.terminal.TerminalSession$MainThreadHandler.handleMessage(TerminalSession.java:339)
at android.os.Handler.dispatchMessage(Handler.java:110)
at android.os.Looper.loop(Looper.java:219)
at android.app.ActivityThread.main(ActivityThread.java:8349)
at java.lang.reflect.Method.invoke(Native Method)
at com.android.internal.os.RuntimeInit$MethodAndArgsCaller.run(RuntimeInit.java:513)
at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:1055)
---
 .../main/java/com/termux/terminal/TerminalBuffer.java    | 4 ++--
 .../main/java/com/termux/terminal/TerminalEmulator.java  | 9 ++++++++-
 .../src/main/java/com/termux/terminal/TerminalRow.java   | 3 +++
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/terminal-emulator/src/main/java/com/termux/terminal/TerminalBuffer.java b/terminal-emulator/src/main/java/com/termux/terminal/TerminalBuffer.java
index 4a74ee6f1d..df57bd3629 100644
--- a/terminal-emulator/src/main/java/com/termux/terminal/TerminalBuffer.java
+++ b/terminal-emulator/src/main/java/com/termux/terminal/TerminalBuffer.java
@@ -449,8 +449,8 @@ public TerminalRow allocateFullLineIfNecessary(int row) {
     }
 
     public void setChar(int column, int row, int codePoint, long style) {
-        if (row >= mScreenRows || column >= mColumns)
-            throw new IllegalArgumentException("row=" + row + ", column=" + column + ", mScreenRows=" + mScreenRows + ", mColumns=" + mColumns);
+        if (row  < 0 || row >= mScreenRows || column < 0 || column >= mColumns)
+            throw new IllegalArgumentException("TerminalBuffer.setChar(): row=" + row + ", column=" + column + ", mScreenRows=" + mScreenRows + ", mColumns=" + mColumns);
         row = externalToInternalRow(row);
         allocateFullLineIfNecessary(row).setChar(column, codePoint, style);
     }
diff --git a/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java b/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
index 8efb949bd2..975c1a5abb 100644
--- a/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
+++ b/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
@@ -2332,7 +2332,14 @@ private void emitCodePoint(int codePoint) {
         }
 
         int offsetDueToCombiningChar = ((displayWidth <= 0 && mCursorCol > 0 && !mAboutToAutoWrap) ? 1 : 0);
-        mScreen.setChar(mCursorCol - offsetDueToCombiningChar, mCursorRow, codePoint, getStyle());
+        int column = mCursorCol - offsetDueToCombiningChar;
+
+        // Fix TerminalRow.setChar() ArrayIndexOutOfBoundsException index=-1 exception reported
+        // The offsetDueToCombiningChar would never be 1 if mCursorCol was 0 to get column/index=-1,
+        // so was mCursorCol changed after the offsetDueToCombiningChar conditional by another thread?
+        // TODO: Check if there are thread synchronization issues with mCursorCol and mCursorRow, possibly causing others bugs too.
+        if (column < 0) column = 0;
+        mScreen.setChar(column, mCursorRow, codePoint, getStyle());
 
         if (autoWrap && displayWidth > 0)
             mAboutToAutoWrap = (mCursorCol == mRightMargin - displayWidth);
diff --git a/terminal-emulator/src/main/java/com/termux/terminal/TerminalRow.java b/terminal-emulator/src/main/java/com/termux/terminal/TerminalRow.java
index cefdd4f73f..cbeaf52243 100644
--- a/terminal-emulator/src/main/java/com/termux/terminal/TerminalRow.java
+++ b/terminal-emulator/src/main/java/com/termux/terminal/TerminalRow.java
@@ -124,6 +124,9 @@ public void clear(long style) {
 
     // https://github.com/steven676/Android-Terminal-Emulator/commit/9a47042620bec87617f0b4f5d50568535668fe26
     public void setChar(int columnToSet, int codePoint, long style) {
+        if (columnToSet  < 0 || columnToSet >= mStyle.length)
+            throw new IllegalArgumentException("TerminalRow.setChar(): columnToSet=" + columnToSet + ", codePoint=" + codePoint + ", style=" + style);
+
         mStyle[columnToSet] = style;
 
         final int newCodePointDisplayWidth = WcWidth.width(codePoint);

From d222102635404152da83d381c5450a84d6d37967 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Tue, 16 Nov 2021 03:44:31 +0500
Subject: [PATCH 641/912] Fixed: Catch rare RuntimeException while loading bell

java.lang.RuntimeException: Unable to resume activity {com.termux/com.termux.app.TermuxActivity}: android.content.res.Resources$NotFoundException: File res/raw/bell.ogg from drawable resource ID #0x7f0f0001
        at android.app.ActivityThread.performResumeActivity(ActivityThread.java:3480)
        at android.app.ActivityThread.handleResumeActivity(ActivityThread.java:3520)
        at android.app.ActivityThread$H.handleMessage(ActivityThread.java:1554)
        at android.os.Handler.dispatchMessage(Handler.java:102)
        at android.os.Looper.loop(Looper.java:154)
        at android.app.ActivityThread.main(ActivityThread.java:6247)
        at java.lang.reflect.Method.invoke(Native Method)
        at com.android.internal.os.ZygoteInit$MethodAndArgsCaller.run(ZygoteInit.java:872)
        at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:762)
        at de.robv.android.xposed.XposedBridge.main(XposedBridge.java:107)
     Caused by: android.content.res.Resources$NotFoundException: File res/raw/bell.ogg from drawable resource ID #0x7f0f0001
        at android.content.res.ResourcesImpl.openRawResourceFd(ResourcesImpl.java:308)
        at android.content.res.Resources.openRawResourceFd(Resources.java:1272)
        at android.media.SoundPool.load(SoundPool.java:247)
        at com.termux.app.terminal.TermuxTerminalSessionClient.getBellSoundPool(TermuxTerminalSessionClient.java:257)
        at com.termux.app.terminal.TermuxTerminalSessionClient.onResume(TermuxTerminalSessionClient.java:82)
        at com.termux.app.TermuxActivity.onResume(TermuxActivity.java:290)
        at android.app.Instrumentation.callActivityOnResume(Instrumentation.java:1270)
        at android.app.Activity.performResume(Activity.java:6861)
        at android.app.ActivityThread.performResumeActivity(ActivityThread.java:3457)
        at android.app.ActivityThread.handleResumeActivity(ActivityThread.java:3520)
        at android.app.ActivityThread$H.handleMessage(ActivityThread.java:1554)
        at android.os.Handler.dispatchMessage(Handler.java:102)
        at android.os.Looper.loop(Looper.java:154)
        at android.app.ActivityThread.main(ActivityThread.java:6247)
        at java.lang.reflect.Method.invoke(Native Method)
        at com.android.internal.os.ZygoteInit$MethodAndArgsCaller.run(ZygoteInit.java:872)
        at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:762)
        at de.robv.android.xposed.XposedBridge.main(XposedBridge.java:107)
     Caused by: java.io.FileNotFoundException: This file can not be opened as a file descriptor; it is probably compressed
        at android.content.res.AssetManager.openNonAssetFdNative(Native Method)
        at android.content.res.AssetManager.openNonAssetFd(AssetManager.java:467)
        at android.content.res.ResourcesImpl.openRawResourceFd(ResourcesImpl.java:306)
        at android.content.res.Resources.openRawResourceFd(Resources.java:1272)
        at android.media.SoundPool.load(SoundPool.java:247)
        at com.termux.app.terminal.TermuxTerminalSessionClient.getBellSoundPool(TermuxTerminalSessionClient.java:257)
        at com.termux.app.terminal.TermuxTerminalSessionClient.onResume(TermuxTerminalSessionClient.java:82)
        at com.termux.app.TermuxActivity.onResume(TermuxActivity.java:290)
        at android.app.Instrumentation.callActivityOnResume(Instrumentation.java:1270)
        at android.app.Activity.performResume(Activity.java:6861)
        at android.app.ActivityThread.performResumeActivity(ActivityThread.java:3457)
        at android.app.ActivityThread.handleResumeActivity(ActivityThread.java:3520)
        at android.app.ActivityThread$H.handleMessage(ActivityThread.java:1554)
        at android.os.Handler.dispatchMessage(Handler.java:102)
        at android.os.Looper.loop(Looper.java:154)
        at android.app.ActivityThread.main(ActivityThread.java:6247)
        at java.lang.reflect.Method.invoke(Native Method)
        at com.android.internal.os.ZygoteInit$MethodAndArgsCaller.run(ZygoteInit.java:872)
        at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:762)
        at de.robv.android.xposed.XposedBridge.main(XposedBridge.java:107)
---
 .../terminal/TermuxTerminalSessionClient.java | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java
index 750b7264f4..93689de295 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java
@@ -79,7 +79,7 @@ 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();
+        loadBellSoundPool();
     }
 
     /**
@@ -202,7 +202,9 @@ public void onBell(TerminalSession session) {
                 BellHandler.getInstance(mActivity).doBell();
                 break;
             case TermuxPropertyConstants.IVALUE_BELL_BEHAVIOUR_BEEP:
-                getBellSoundPool().play(mBellSoundId, 1.f, 1.f, 1, 0, 1.f);
+                loadBellSoundPool();
+                if (mBellSoundPool != null)
+                    mBellSoundPool.play(mBellSoundId, 1.f, 1.f, 1, 0, 1.f);
                 break;
             case TermuxPropertyConstants.IVALUE_BELL_BEHAVIOUR_IGNORE:
                 // Ignore the bell character.
@@ -247,17 +249,20 @@ public Integer getTerminalCursorStyle() {
 
 
 
-    /** Initialize and get mBellSoundPool */
-    private synchronized SoundPool getBellSoundPool() {
+    /** Load mBellSoundPool */
+    private synchronized void loadBellSoundPool() {
         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);
+            try {
+                mBellSoundId = mBellSoundPool.load(mActivity, R.raw.bell, 1);
+            } catch (Exception e){
+                // Catch java.lang.RuntimeException: Unable to resume activity {com.termux/com.termux.app.TermuxActivity}: android.content.res.Resources$NotFoundException: File res/raw/bell.ogg from drawable resource ID
+                Logger.logStackTraceWithMessage(LOG_TAG, "Failed to load bell sound pool", e);
+            }
         }
-
-        return mBellSoundPool;
     }
 
     /** Release mBellSoundPool resources */

From 006bfeac8d27e1f783ebd964675caabaec98182a Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Mon, 13 Dec 2021 11:46:04 +0500
Subject: [PATCH 642/912] Fixed: Fix termux background command logging at
 verbose level if CUSTOM_LOG_LEVEL was not passed

---
 .../src/main/java/com/termux/shared/logger/Logger.java        | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/logger/Logger.java b/termux-shared/src/main/java/com/termux/shared/logger/Logger.java
index 0bf094f2e1..e2573a8a3e 100644
--- a/termux-shared/src/main/java/com/termux/shared/logger/Logger.java
+++ b/termux-shared/src/main/java/com/termux/shared/logger/Logger.java
@@ -470,7 +470,9 @@ public static boolean isLogLevelValid(Integer logLevel) {
     /** Check if custom log level is valid and >= {@link #CURRENT_LOG_LEVEL}. If custom log level is
      * not valid then {@link #LOG_LEVEL_VERBOSE} must be >= {@link #CURRENT_LOG_LEVEL}. */
     public static boolean shouldEnableLoggingForCustomLogLevel(Integer customLogLevel) {
-        if (customLogLevel == null || CURRENT_LOG_LEVEL <= LOG_LEVEL_OFF || customLogLevel <= LOG_LEVEL_OFF) return false;
+        if (CURRENT_LOG_LEVEL <= LOG_LEVEL_OFF) return false;
+        if (customLogLevel == null) return CURRENT_LOG_LEVEL >= LOG_LEVEL_VERBOSE; // Use default app log level
+        if (customLogLevel <= LOG_LEVEL_OFF) return false;
         customLogLevel = Logger.isLogLevelValid(customLogLevel) ? customLogLevel: Logger.LOG_LEVEL_VERBOSE;
         return (customLogLevel >= CURRENT_LOG_LEVEL);
     }

From 3f84b5345f6be2d538d7c381e79f94145dc027dd Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Tue, 21 Dec 2021 14:17:01 +0500
Subject: [PATCH 643/912] Changed: Make ExtraKeysView private functions public
 and variables protected

---
 .../termux/extrakeys/ExtraKeysView.java       | 52 +++++++++----------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/termux/extrakeys/ExtraKeysView.java b/termux-shared/src/main/java/com/termux/shared/termux/extrakeys/ExtraKeysView.java
index c20edeb649..0685c8d2ca 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/extrakeys/ExtraKeysView.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/extrakeys/ExtraKeysView.java
@@ -134,15 +134,15 @@ public interface IExtraKeysView {
 
 
     /** The implementation of the {@link IExtraKeysView} that acts as a client for the {@link ExtraKeysView}. */
-    private IExtraKeysView mExtraKeysViewClient;
+    protected IExtraKeysView mExtraKeysViewClient;
 
     /** The map for the {@link SpecialButton} and their {@link SpecialButtonState}. Defaults to
      * the one returned by {@link #getDefaultSpecialButtons(ExtraKeysView)}. */
-    private Map<SpecialButton, SpecialButtonState> mSpecialButtons;
+    protected Map<SpecialButton, SpecialButtonState> mSpecialButtons;
 
     /** The keys for the {@link SpecialButton} added to {@link #mSpecialButtons}. This is automatically
      * set when the call to {@link #setSpecialButtons(Map)} is made. */
-    private Set<String> mSpecialButtonsKeys;
+    protected Set<String> mSpecialButtonsKeys;
 
 
     /**
@@ -151,22 +151,22 @@ public interface IExtraKeysView {
      * every {@link #mLongPressRepeatDelay} seconds after {@link #mLongPressTimeout} has passed.
      * The default keys are defined by {@link ExtraKeysConstants#PRIMARY_REPETITIVE_KEYS}.
      */
-    private List<String> mRepetitiveKeys;
+    protected List<String> mRepetitiveKeys;
 
 
     /** The text color for the extra keys button. Defaults to {@link #DEFAULT_BUTTON_TEXT_COLOR}. */
-    private int mButtonTextColor;
+    protected int mButtonTextColor;
     /** The text color for the extra keys button when its active.
      * Defaults to {@link #DEFAULT_BUTTON_ACTIVE_TEXT_COLOR}. */
-    private int mButtonActiveTextColor;
+    protected int mButtonActiveTextColor;
     /** The background color for the extra keys button. Defaults to {@link #DEFAULT_BUTTON_BACKGROUND_COLOR}. */
-    private int mButtonBackgroundColor;
+    protected int mButtonBackgroundColor;
     /** The background color for the extra keys button when its active. Defaults to
      * {@link #DEFAULT_BUTTON_ACTIVE_BACKGROUND_COLOR}. */
-    private int mButtonActiveBackgroundColor;
+    protected int mButtonActiveBackgroundColor;
 
     /** Defines whether text for the extra keys button should be all capitalized automatically. */
-    private boolean mButtonTextAllCaps = true;
+    protected boolean mButtonTextAllCaps = true;
 
 
     /**
@@ -176,7 +176,7 @@ public interface IExtraKeysView {
      * The duration must be in between {@link #MIN_LONG_PRESS_DURATION} and {@link #MAX_LONG_PRESS_DURATION},
      * otherwise {@link #FALLBACK_LONG_PRESS_DURATION} is used.
      */
-    private int mLongPressTimeout;
+    protected int mLongPressTimeout;
 
     /**
      * Defines the duration in milliseconds for the delay between trigger of each repeat of
@@ -184,17 +184,17 @@ public interface IExtraKeysView {
      * The duration must be in between {@link #MIN_LONG_PRESS__REPEAT_DELAY} and
      * {@link #MAX_LONG_PRESS__REPEAT_DELAY}, otherwise {@link #DEFAULT_LONG_PRESS_REPEAT_DELAY} is used.
      */
-    private int mLongPressRepeatDelay;
+    protected int mLongPressRepeatDelay;
 
 
     /** The popup window shown if {@link ExtraKeyButton#getPopup()} returns a {@code non-null} value
      * and a swipe up action is done on an extra key. */
-    private PopupWindow mPopupWindow;
+    protected PopupWindow mPopupWindow;
 
-    private ScheduledExecutorService mScheduledExecutor;
-    private Handler mHandler;
-    private SpecialButtonsLongHoldRunnable mSpecialButtonsLongHoldRunnable;
-    private int mLongPressCount;
+    protected ScheduledExecutorService mScheduledExecutor;
+    protected Handler mHandler;
+    protected SpecialButtonsLongHoldRunnable mSpecialButtonsLongHoldRunnable;
+    protected int mLongPressCount;
 
 
     public ExtraKeysView(Context context, AttributeSet attrs) {
@@ -465,12 +465,12 @@ public void reload(ExtraKeysInfo extraKeysInfo) {
 
 
 
-    private void onExtraKeyButtonClick(View view, ExtraKeyButton buttonInfo, Button button) {
+    public void onExtraKeyButtonClick(View view, ExtraKeyButton buttonInfo, MaterialButton button) {
         if (mExtraKeysViewClient != null)
             mExtraKeysViewClient.onExtraKeyButtonClick(view, buttonInfo, button);
     }
 
-    private void performExtraKeyButtonHapticFeedback(View view, ExtraKeyButton buttonInfo, Button button) {
+    public void performExtraKeyButtonHapticFeedback(View view, ExtraKeyButton buttonInfo, MaterialButton button) {
         if (mExtraKeysViewClient != null) {
             // If client handled the feedback, then just return
             if (mExtraKeysViewClient.performExtraKeyButtonHapticFeedback(view, buttonInfo, button))
@@ -493,7 +493,7 @@ private void performExtraKeyButtonHapticFeedback(View view, ExtraKeyButton butto
 
 
 
-    private void onAnyExtraKeyButtonClick(View view, @NonNull ExtraKeyButton buttonInfo, Button button) {
+    public void onAnyExtraKeyButtonClick(View view, @NonNull ExtraKeyButton buttonInfo, MaterialButton button) {
         if (isSpecialButton(buttonInfo)) {
             if (mLongPressCount > 0) return;
             SpecialButtonState state = mSpecialButtons.get(SpecialButton.valueOf(buttonInfo.getKey()));
@@ -509,7 +509,7 @@ private void onAnyExtraKeyButtonClick(View view, @NonNull ExtraKeyButton buttonI
     }
 
 
-    private void startScheduledExecutors(View view, ExtraKeyButton buttonInfo, Button button) {
+    public void startScheduledExecutors(View view, ExtraKeyButton buttonInfo, MaterialButton button) {
         stopScheduledExecutors();
         mLongPressCount = 0;
         if (mRepetitiveKeys.contains(buttonInfo.getKey())) {
@@ -534,7 +534,7 @@ private void startScheduledExecutors(View view, ExtraKeyButton buttonInfo, Butto
         }
     }
 
-    private void stopScheduledExecutors() {
+    public void stopScheduledExecutors() {
         if (mScheduledExecutor != null) {
             mScheduledExecutor.shutdownNow();
             mScheduledExecutor = null;
@@ -546,8 +546,8 @@ private void stopScheduledExecutors() {
         }
     }
 
-    private class SpecialButtonsLongHoldRunnable implements Runnable {
-        private final SpecialButtonState mState;
+    public class SpecialButtonsLongHoldRunnable implements Runnable {
+        public final SpecialButtonState mState;
 
         public SpecialButtonsLongHoldRunnable(SpecialButtonState state) {
             mState = state;
@@ -593,7 +593,7 @@ void showPopup(View view, ExtraKeyButton extraButton) {
         mPopupWindow.showAsDropDown(view, 0, -2 * height);
     }
 
-    private void dismissPopup() {
+    public void dismissPopup() {
         mPopupWindow.setContentView(null);
         mPopupWindow.dismiss();
         mPopupWindow = null;
@@ -631,7 +631,7 @@ public Boolean readSpecialButton(SpecialButton specialButton, boolean autoSetInA
         return true;
     }
 
-    private Button createSpecialButton(String buttonKey, boolean needUpdate) {
+    public Button createSpecialButton(String buttonKey, boolean needUpdate) {
         SpecialButtonState state = mSpecialButtons.get(SpecialButton.valueOf(buttonKey));
         if (state == null) return null;
         state.setIsCreated(true);
@@ -648,7 +648,7 @@ private Button createSpecialButton(String buttonKey, boolean needUpdate) {
     /**
      * General util function to compute the longest column length in a matrix.
      */
-    static int maximumLength(Object[][] matrix) {
+    public static int maximumLength(Object[][] matrix) {
         int m = 0;
         for (Object[] row : matrix)
             m = Math.max(m, row.length);

From c1a0d6deff053aea7e6bbc9db11d19fee645a207 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 6 Jan 2022 03:05:05 +0500
Subject: [PATCH 644/912] Changed: Rename ActivityUtilsErrno to ActivityErrno

---
 .../{ActivityUtilsErrno.java => ActivityErrno.java}    |  6 +++---
 .../java/com/termux/shared/activity/ActivityUtils.java | 10 ++++------
 2 files changed, 7 insertions(+), 9 deletions(-)
 rename termux-shared/src/main/java/com/termux/shared/activity/{ActivityUtilsErrno.java => ActivityErrno.java} (77%)

diff --git a/termux-shared/src/main/java/com/termux/shared/activity/ActivityUtilsErrno.java b/termux-shared/src/main/java/com/termux/shared/activity/ActivityErrno.java
similarity index 77%
rename from termux-shared/src/main/java/com/termux/shared/activity/ActivityUtilsErrno.java
rename to termux-shared/src/main/java/com/termux/shared/activity/ActivityErrno.java
index 3c77cba959..96a0e9ce05 100644
--- a/termux-shared/src/main/java/com/termux/shared/activity/ActivityUtilsErrno.java
+++ b/termux-shared/src/main/java/com/termux/shared/activity/ActivityErrno.java
@@ -2,9 +2,9 @@
 
 import com.termux.shared.errors.Errno;
 
-public class ActivityUtilsErrno extends Errno {
+public class ActivityErrno extends Errno {
 
-    public static final String TYPE = "ActivityUtils Error";
+    public static final String TYPE = "Activity Error";
 
 
     /* Errors for starting activities (100-150) */
@@ -13,7 +13,7 @@ public class ActivityUtilsErrno extends Errno {
     public static final Errno ERRNO_STARTING_ACTIVITY_WITH_NULL_CONTEXT = new Errno(TYPE, 102, "Cannot start \"%1$s\" activity with null Context");
 
 
-    ActivityUtilsErrno(final String type, final int code, final String message) {
+    ActivityErrno(final String type, final int code, final String message) {
         super(type, code, message);
     }
 
diff --git a/termux-shared/src/main/java/com/termux/shared/activity/ActivityUtils.java b/termux-shared/src/main/java/com/termux/shared/activity/ActivityUtils.java
index 89f2205e61..0ff28126aa 100644
--- a/termux-shared/src/main/java/com/termux/shared/activity/ActivityUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/activity/ActivityUtils.java
@@ -34,7 +34,6 @@ public static Error startActivity(@NonNull Context context, @NonNull Intent inte
      *                         in addition to logging a message. The {@code context} must not be
      *                         {@code null}.
      * @return Returns the {@code error} if starting activity was not successful, otherwise {@code null}.
-
      */
     public static Error startActivity(Context context, @NonNull Intent intent,
                                       boolean logErrorMessage, boolean showErrorMessage) {
@@ -42,7 +41,7 @@ public static Error startActivity(Context context, @NonNull Intent intent,
         String activityName = intent.getComponent() != null ? intent.getComponent().getClassName() : "Unknown";
 
         if (context == null) {
-            error = ActivityUtilsErrno.ERRNO_STARTING_ACTIVITY_WITH_NULL_CONTEXT.getError(activityName);
+            error = ActivityErrno.ERRNO_STARTING_ACTIVITY_WITH_NULL_CONTEXT.getError(activityName);
             if (logErrorMessage)
                 error.logErrorAndShowToast(null, LOG_TAG);
             return error;
@@ -51,7 +50,7 @@ public static Error startActivity(Context context, @NonNull Intent intent,
         try {
             context.startActivity(intent);
         } catch (Exception e) {
-            error = ActivityUtilsErrno.ERRNO_START_ACTIVITY_FAILED_WITH_EXCEPTION.getError(e, activityName, e.getMessage());
+            error = ActivityErrno.ERRNO_START_ACTIVITY_FAILED_WITH_EXCEPTION.getError(e, activityName, e.getMessage());
             if (logErrorMessage)
                 error.logErrorAndShowToast(showErrorMessage ? context : null, LOG_TAG);
             return error;
@@ -97,7 +96,6 @@ public static Error startActivityForResult(Context context, int requestCode, @No
      *                               used instead.
      *                               Note that later is deprecated.
      * @return Returns the {@code error} if starting activity was not successful, otherwise {@code null}.
-
      */
     public static Error startActivityForResult(Context context, int requestCode, @NonNull Intent intent,
                                                boolean logErrorMessage, boolean showErrorMessage,
@@ -109,7 +107,7 @@ public static Error startActivityForResult(Context context, int requestCode, @No
                 activityResultLauncher.launch(intent);
             } else {
                 if (context == null) {
-                    error = ActivityUtilsErrno.ERRNO_STARTING_ACTIVITY_WITH_NULL_CONTEXT.getError(activityName);
+                    error = ActivityErrno.ERRNO_STARTING_ACTIVITY_WITH_NULL_CONTEXT.getError(activityName);
                     if (logErrorMessage)
                         error.logErrorAndShowToast(null, LOG_TAG);
                     return error;
@@ -127,7 +125,7 @@ else if (context instanceof Activity)
                 }
             }
         } catch (Exception e) {
-            error = ActivityUtilsErrno.ERRNO_START_ACTIVITY_FOR_RESULT_FAILED_WITH_EXCEPTION.getError(e, activityName, e.getMessage());
+            error = ActivityErrno.ERRNO_START_ACTIVITY_FOR_RESULT_FAILED_WITH_EXCEPTION.getError(e, activityName, e.getMessage());
             if (logErrorMessage)
                 error.logErrorAndShowToast(showErrorMessage ? context : null, LOG_TAG);
             return error;

From bb1584decb366e8b6a97ae165d15dc90851e5906 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 6 Jan 2022 03:14:31 +0500
Subject: [PATCH 645/912] Fixed: Remove unused imports

---
 .../view/textselection/TextSelectionCursorController.java       | 2 --
 1 file changed, 2 deletions(-)

diff --git a/terminal-view/src/main/java/com/termux/view/textselection/TextSelectionCursorController.java b/terminal-view/src/main/java/com/termux/view/textselection/TextSelectionCursorController.java
index 09e9ba224c..2f64793a07 100644
--- a/terminal-view/src/main/java/com/termux/view/textselection/TextSelectionCursorController.java
+++ b/terminal-view/src/main/java/com/termux/view/textselection/TextSelectionCursorController.java
@@ -1,12 +1,10 @@
 package com.termux.view.textselection;
 
-import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
 import android.graphics.Rect;
 import android.text.TextUtils;
 import android.view.ActionMode;
-import android.view.InputDevice;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.MotionEvent;

From 5d202d082f6449a5015b10208cf0a2970ffef8d9 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 15 Jan 2022 00:44:12 +0500
Subject: [PATCH 646/912] Changed: Replace extra-keys Button with
 MaterialButton

---
 .../termux/extrakeys/ExtraKeysView.java       | 30 +++++++++----------
 .../termux/extrakeys/SpecialButtonState.java  |  4 +--
 .../termux/terminal/io/TerminalExtraKeys.java |  6 ++--
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/termux/extrakeys/ExtraKeysView.java b/termux-shared/src/main/java/com/termux/shared/termux/extrakeys/ExtraKeysView.java
index 0685c8d2ca..11d6b840bf 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/extrakeys/ExtraKeysView.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/extrakeys/ExtraKeysView.java
@@ -25,13 +25,13 @@
 import android.view.View;
 import android.view.ViewConfiguration;
 import android.view.ViewGroup;
-import android.widget.Button;
 import android.widget.GridLayout;
 import android.widget.PopupWindow;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import com.google.android.material.button.MaterialButton;
 import com.termux.shared.termux.terminal.io.TerminalExtraKeys;
 
 /**
@@ -86,23 +86,23 @@ public interface IExtraKeysView {
          * @param buttonInfo The {@link ExtraKeyButton} for the button that was clicked.
          *                   The button may be a {@link ExtraKeyButton#KEY_MACRO} set which can be
          *                   checked with a call to {@link ExtraKeyButton#isMacro()}.
-         * @param button The {@link Button} that was clicked.
+         * @param button The {@link MaterialButton} that was clicked.
          */
-        void onExtraKeyButtonClick(View view, ExtraKeyButton buttonInfo, Button button);
+        void onExtraKeyButtonClick(View view, ExtraKeyButton buttonInfo, MaterialButton button);
 
         /**
          * This is called by {@link ExtraKeysView} when a button is clicked so that the client
-         * can perform any hepatic feedback. This is only called in the {@link Button.OnClickListener}
+         * can perform any hepatic feedback. This is only called in the {@link MaterialButton.OnClickListener}
          * and not for every repeat. Its also called for {@link #mSpecialButtons}.
          *
          * @param view The view that was clicked.
          * @param buttonInfo The {@link ExtraKeyButton} for the button that was clicked.
-         * @param button The {@link Button} that was clicked.
+         * @param button The {@link MaterialButton} that was clicked.
          * @return Return {@code true} if the client handled the feedback, otherwise {@code false}
-         * so that {@link ExtraKeysView#performExtraKeyButtonHapticFeedback(View, ExtraKeyButton, Button)}
+         * so that {@link ExtraKeysView#performExtraKeyButtonHapticFeedback(View, ExtraKeyButton, MaterialButton)}
          * can handle it depending on system settings.
          */
-        boolean performExtraKeyButtonHapticFeedback(View view, ExtraKeyButton buttonInfo, Button button);
+        boolean performExtraKeyButtonHapticFeedback(View view, ExtraKeyButton buttonInfo, MaterialButton button);
 
     }
 
@@ -147,7 +147,7 @@ public interface IExtraKeysView {
 
     /**
      * The list of keys for which auto repeat of key should be triggered if its extra keys button
-     * is long pressed. This is done by calling {@link IExtraKeysView#onExtraKeyButtonClick(View, ExtraKeyButton, Button)}
+     * is long pressed. This is done by calling {@link IExtraKeysView#onExtraKeyButtonClick(View, ExtraKeyButton, MaterialButton)}
      * every {@link #mLongPressRepeatDelay} seconds after {@link #mLongPressTimeout} has passed.
      * The default keys are defined by {@link ExtraKeysConstants#PRIMARY_REPETITIVE_KEYS}.
      */
@@ -326,7 +326,7 @@ public void setLongPressTimeout(int longPressDuration) {
         if (longPressDuration >= MIN_LONG_PRESS_DURATION && longPressDuration <= MAX_LONG_PRESS_DURATION) {
             mLongPressTimeout = longPressDuration;
         } else {
-                mLongPressTimeout = FALLBACK_LONG_PRESS_DURATION;
+            mLongPressTimeout = FALLBACK_LONG_PRESS_DURATION;
         }
     }
 
@@ -382,12 +382,12 @@ public void reload(ExtraKeysInfo extraKeysInfo) {
             for (int col = 0; col < buttons[row].length; col++) {
                 final ExtraKeyButton buttonInfo = buttons[row][col];
 
-                Button button;
+                MaterialButton button;
                 if (isSpecialButton(buttonInfo)) {
                     button = createSpecialButton(buttonInfo.getKey(), true);
                     if (button == null) return;
                 } else {
-                    button = new Button(getContext(), null, android.R.attr.buttonBarButtonStyle);
+                    button = new MaterialButton(getContext(), null, android.R.attr.buttonBarButtonStyle);
                 }
 
                 button.setText(buttonInfo.getDisplay());
@@ -566,12 +566,12 @@ public void run() {
     void showPopup(View view, ExtraKeyButton extraButton) {
         int width = view.getMeasuredWidth();
         int height = view.getMeasuredHeight();
-        Button button;
+        MaterialButton button;
         if (isSpecialButton(extraButton)) {
             button = createSpecialButton(extraButton.getKey(), false);
             if (button == null) return;
         } else {
-            button = new Button(getContext(), null, android.R.attr.buttonBarButtonStyle);
+            button = new MaterialButton(getContext(), null, android.R.attr.buttonBarButtonStyle);
             button.setTextColor(mButtonTextColor);
         }
         button.setText(extraButton.getDisplay());
@@ -631,11 +631,11 @@ public Boolean readSpecialButton(SpecialButton specialButton, boolean autoSetInA
         return true;
     }
 
-    public Button createSpecialButton(String buttonKey, boolean needUpdate) {
+    public MaterialButton createSpecialButton(String buttonKey, boolean needUpdate) {
         SpecialButtonState state = mSpecialButtons.get(SpecialButton.valueOf(buttonKey));
         if (state == null) return null;
         state.setIsCreated(true);
-        Button button = new Button(getContext(), null, android.R.attr.buttonBarButtonStyle);
+        MaterialButton button = new MaterialButton(getContext(), null, android.R.attr.buttonBarButtonStyle);
         button.setTextColor(state.isActive ? mButtonActiveTextColor : mButtonTextColor);
         if (needUpdate) {
             state.buttons.add(button);
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/extrakeys/SpecialButtonState.java b/termux-shared/src/main/java/com/termux/shared/termux/extrakeys/SpecialButtonState.java
index 381e4c5147..3b68952966 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/extrakeys/SpecialButtonState.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/extrakeys/SpecialButtonState.java
@@ -1,6 +1,6 @@
 package com.termux.shared.termux.extrakeys;
 
-import android.widget.Button;
+import com.google.android.material.button.MaterialButton;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -16,7 +16,7 @@ public class SpecialButtonState {
      * state is read. */
     boolean isLocked = false;
 
-    List<Button> buttons = new ArrayList<>();
+    List<MaterialButton> buttons = new ArrayList<>();
 
     ExtraKeysView mExtraKeysView;
 
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/terminal/io/TerminalExtraKeys.java b/termux-shared/src/main/java/com/termux/shared/termux/terminal/io/TerminalExtraKeys.java
index f8d8cebaa2..05571f7a7d 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/terminal/io/TerminalExtraKeys.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/terminal/io/TerminalExtraKeys.java
@@ -2,10 +2,10 @@
 
 import android.view.KeyEvent;
 import android.view.View;
-import android.widget.Button;
 
 import androidx.annotation.NonNull;
 
+import com.google.android.material.button.MaterialButton;
 import com.termux.shared.termux.extrakeys.ExtraKeyButton;
 import com.termux.shared.termux.extrakeys.ExtraKeysView;
 import com.termux.shared.termux.extrakeys.SpecialButton;
@@ -23,7 +23,7 @@ public TerminalExtraKeys(@NonNull TerminalView terminalView) {
     }
 
     @Override
-    public void onExtraKeyButtonClick(View view, ExtraKeyButton buttonInfo, Button button) {
+    public void onExtraKeyButtonClick(View view, ExtraKeyButton buttonInfo, MaterialButton button) {
         if (buttonInfo.isMacro()) {
             String[] keys = buttonInfo.getKey().split(" ");
             boolean ctrlDown = false;
@@ -70,7 +70,7 @@ protected void onTerminalExtraKeyButtonClick(View view, String key, boolean ctrl
     }
 
     @Override
-    public boolean performExtraKeyButtonHapticFeedback(View view, ExtraKeyButton buttonInfo, Button button) {
+    public boolean performExtraKeyButtonHapticFeedback(View view, ExtraKeyButton buttonInfo, MaterialButton button) {
         return false;
     }
 

From 20a70b1a2249761841da0b23069e7cf8e4f41dd9 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 15 Jan 2022 00:50:39 +0500
Subject: [PATCH 647/912] Fixed: Add uncommitted string resource changes

---
 termux-shared/src/main/res/values/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/termux-shared/src/main/res/values/strings.xml b/termux-shared/src/main/res/values/strings.xml
index 219b917713..20aa4fd343 100644
--- a/termux-shared/src/main/res/values/strings.xml
+++ b/termux-shared/src/main/res/values/strings.xml
@@ -22,8 +22,8 @@
     <string name="error_app_not_installed_or_disabled_warning">The %1$s (%2$s) app is not installed or is disabled."</string>
     <string name="error_get_package_context_failed_title">Failed To Get Package Context</string>
     <string name="error_get_package_context_failed_message">Failed to get package context for the \"%1$s\" package.
-        This may be because the app package is not installed or it has different APK signature from the current app.
-        Check install instruction at %2$s for more details.</string>
+        This may be because the app package is not installed or it has different APK signature from the current app.</string>
+    <string name="error_get_package_context_failed_help_url_message">Check %1$s for more details.</string>
     <string name="error_get_component_state_failed">Failed to get %1$s/%2$s component state"</string>
     <string name="error_enable_component_failed">Failed to enable %1$s/%2$s component"</string>
     <string name="error_disable_component_failed">Failed to enable %1$s/%2$s component"</string>

From 998499d991c20a08551835c4dda42275aa01c39e Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 15 Jan 2022 01:10:45 +0500
Subject: [PATCH 648/912] Changed: Remove redundant double quotes from string
 resources

---
 termux-shared/src/main/res/values/strings.xml | 44 +++++++++----------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/termux-shared/src/main/res/values/strings.xml b/termux-shared/src/main/res/values/strings.xml
index 20aa4fd343..5a70aab4b8 100644
--- a/termux-shared/src/main/res/values/strings.xml
+++ b/termux-shared/src/main/res/values/strings.xml
@@ -19,14 +19,14 @@
 
 
     <!-- PackageUtils -->
-    <string name="error_app_not_installed_or_disabled_warning">The %1$s (%2$s) app is not installed or is disabled."</string>
+    <string name="error_app_not_installed_or_disabled_warning">The %1$s (%2$s) app is not installed or is disabled.</string>
     <string name="error_get_package_context_failed_title">Failed To Get Package Context</string>
     <string name="error_get_package_context_failed_message">Failed to get package context for the \"%1$s\" package.
         This may be because the app package is not installed or it has different APK signature from the current app.</string>
     <string name="error_get_package_context_failed_help_url_message">Check %1$s for more details.</string>
-    <string name="error_get_component_state_failed">Failed to get %1$s/%2$s component state"</string>
-    <string name="error_enable_component_failed">Failed to enable %1$s/%2$s component"</string>
-    <string name="error_disable_component_failed">Failed to enable %1$s/%2$s component"</string>
+    <string name="error_get_component_state_failed">Failed to get %1$s/%2$s component state</string>
+    <string name="error_enable_component_failed">Failed to enable %1$s/%2$s component</string>
+    <string name="error_disable_component_failed">Failed to enable %1$s/%2$s component</string>
 
 
 
@@ -35,7 +35,7 @@
     <string name="error_failed_to_request_permissions">Failed to request permissions with request code %1$d: %2$s</string>
     <string name="error_attempted_to_check_for_permissions_not_requested">Attempted to check for permissions that have not been requested in app manifest: %1$s</string>
     <string name="error_attempted_to_ask_for_permissions_not_requested">Attempted to ask for permissions that have not been requested in app manifest: %1$s</string>
-    <string name="error_has_not_requested_legacy_external_storage">The \"%1$s\" package is targeting targetSdkVersion %2$d and is running on android sdk %3$d but has not set requestLegacyExternalStorage to true in app manifest"</string>
+    <string name="error_has_not_requested_legacy_external_storage">The \"%1$s\" package is targeting targetSdkVersion %2$d and is running on android sdk %3$d but has not set requestLegacyExternalStorage to true in app manifest</string>
 
 
 
@@ -49,18 +49,18 @@
     <!-- ShareUtils -->
     <string name="title_share_with">Share With</string>
     <string name="title_open_url_with">Open URL With</string>
-    <string name="msg_storage_permission_not_granted">The storage permission not granted."</string>
-    <string name="msg_file_saved_successfully">The %1$s file saved successfully at \"%2$s\""</string>
+    <string name="msg_storage_permission_not_granted">The storage permission not granted.</string>
+    <string name="msg_file_saved_successfully">The %1$s file saved successfully at \"%2$s\"</string>
 
 
 
     <!-- Shell -->
     <string name="error_sending_sigkill_to_process">Sending SIGKILL to process on user request or because android is killing the execution service</string>
     <string name="error_execution_cancelled">Execution has been cancelled since execution service is being killed</string>
-    <string name="error_failed_to_execute_termux_session_command">"Failed to execute \"%1$s\" termux session command"</string>
-    <string name="error_failed_to_execute_app_shell_command">"Failed to execute \"%1$s\" app shell command"</string>
+    <string name="error_failed_to_execute_termux_session_command">Failed to execute \"%1$s\" termux session command</string>
+    <string name="error_failed_to_execute_app_shell_command">Failed to execute \"%1$s\" app shell command</string>
     <string name="error_exception_received_while_executing_termux_session_command">Exception received while to executing \"%1$s\" termux session command.\nException: %2$s</string>
-    <string name="error_exception_received_while_executing_app_shell_command">Exception received while to executing \"%1$s\" app shell command.\nException: %2$s"</string>
+    <string name="error_exception_received_while_executing_app_shell_command">Exception received while to executing \"%1$s\" app shell command.\nException: %2$s</string>
 
 
 
@@ -78,13 +78,13 @@
         on github or other official termux community forums **will likely be automatically closed/deleted** and may
         even result in **temporary or permanent** ban. Check %1$s/wiki/Hacking for details.</string>
 
-    <string name="msg_termux_app_required_by_app">The &TERMUX_APP_NAME; is required by the %1$s app to run termux commands."</string>
-    <string name="error_termux_app_package_context_not_accessible">The &TERMUX_APP_NAME; app (package context) is not accessible."</string>
+    <string name="msg_termux_app_required_by_app">The &TERMUX_APP_NAME; is required by the %1$s app to run termux commands.</string>
+    <string name="error_termux_app_package_context_not_accessible">The &TERMUX_APP_NAME; app (package context) is not accessible.</string>
     <string name="error_termux_prefix_dir_path_not_accessible">The &TERMUX_APP_NAME; app $PREFIX directory is not accessible by the %1$s app.
         This may be because you have not installed or setup &TERMUX_APP_NAME; app or
         &TERMUX_APP_NAME; app and %1$s app both have different APK signatures because you have managed to install both apps from different sources.
         It may also be because &TERMUX_APP_NAME; $PREFIX directory \"&TERMUX_PREFIX_DIR_PATH;\" does not exist or does not have read,
-        write and execute permissions."</string>
+        write and execute permissions.</string>
 
 
 
@@ -96,16 +96,16 @@
     <string name="action_cancel">Cancel</string>
     <string name="action_save_to_file">Save To File</string>
 
-    <string name="msg_storage_permission_granted_on_request">"The storage permission granted by user on request"</string>
-    <string name="msg_storage_permission_not_granted_on_request">"The storage permission not granted by user on request"</string>
+    <string name="msg_storage_permission_granted_on_request">The storage permission granted by user on request</string>
+    <string name="msg_storage_permission_not_granted_on_request">The storage permission not granted by user on request</string>
 
 
 
     <!-- Launcher Icons -->
     <string name="action_enable_launcher_icon">Enable Launcher Icon</string>
     <string name="action_disable_launcher_icon">Disable Launcher Icon</string>
-    <string name="msg_enabling_launcher_icon">Enabling %1$s app launcher icon"</string>
-    <string name="msg_disabling_launcher_icon">Disabling %1$s app launcher icon"</string>
+    <string name="msg_enabling_launcher_icon">Enabling %1$s app launcher icon</string>
+    <string name="msg_disabling_launcher_icon">Disabling %1$s app launcher icon</string>
     <string name="setting_launcher_icon_title">Launcher Icon Enabled</string>
     <string name="setting_launcher_icon_enabled_off">Launcher Icon will be disabled.</string>
     <string name="setting_launcher_icon_enabled_on">Launcher Icon will be enabled. (Default)</string>
@@ -114,11 +114,11 @@
 
     <!-- Log Level -->
     <string name="log_level_title">Log Level</string>
-    <string name="log_level_off">"Off"</string>
-    <string name="log_level_normal">"Normal"</string>
-    <string name="log_level_debug">"Debug"</string>
-    <string name="log_level_verbose">"Verbose"</string>
-    <string name="log_level_unknown">"*Unknown*"</string>
+    <string name="log_level_off">Off</string>
+    <string name="log_level_normal">Normal</string>
+    <string name="log_level_debug">Debug</string>
+    <string name="log_level_verbose">Verbose</string>
+    <string name="log_level_unknown">*Unknown*</string>
     <string name="log_level_value">Logcat log level set to \"%1$s\"</string>
 
 </resources>

From 0fa0738cf600a35f1dedd8e52eaacea3ab38bdd1 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 15 Jan 2022 01:56:53 +0500
Subject: [PATCH 649/912] Changed: Add uncommitted changes from 361bfb39

---
 .../shared/activities/ReportActivity.java     |  2 +-
 .../com/termux/shared/models/ReportInfo.java  |  2 +-
 .../shell/command/ShellCommandConstants.java  | 75 +++++++++++++++++++
 3 files changed, 77 insertions(+), 2 deletions(-)
 create mode 100644 termux-shared/src/main/java/com/termux/shared/shell/command/ShellCommandConstants.java

diff --git a/termux-shared/src/main/java/com/termux/shared/activities/ReportActivity.java b/termux-shared/src/main/java/com/termux/shared/activities/ReportActivity.java
index 95f5b338cb..9a80ebed13 100644
--- a/termux-shared/src/main/java/com/termux/shared/activities/ReportActivity.java
+++ b/termux-shared/src/main/java/com/termux/shared/activities/ReportActivity.java
@@ -21,7 +21,7 @@
 import com.termux.shared.file.FileUtils;
 import com.termux.shared.file.filesystem.FileType;
 import com.termux.shared.logger.Logger;
-import com.termux.shared.models.errors.Error;
+import com.termux.shared.errors.Error;
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.markdown.MarkdownUtils;
 import com.termux.shared.interact.ShareUtils;
diff --git a/termux-shared/src/main/java/com/termux/shared/models/ReportInfo.java b/termux-shared/src/main/java/com/termux/shared/models/ReportInfo.java
index 129fb337bd..0f70fb5623 100644
--- a/termux-shared/src/main/java/com/termux/shared/models/ReportInfo.java
+++ b/termux-shared/src/main/java/com/termux/shared/models/ReportInfo.java
@@ -1,7 +1,7 @@
 package com.termux.shared.models;
 
 import com.termux.shared.markdown.MarkdownUtils;
-import com.termux.shared.termux.AndroidUtils;
+import com.termux.shared.android.AndroidUtils;
 
 import java.io.Serializable;
 
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/command/ShellCommandConstants.java b/termux-shared/src/main/java/com/termux/shared/shell/command/ShellCommandConstants.java
new file mode 100644
index 0000000000..359cb4a9cf
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/shell/command/ShellCommandConstants.java
@@ -0,0 +1,75 @@
+package com.termux.shared.shell.command;
+
+import com.termux.shared.errors.Errno;
+import com.termux.shared.shell.command.result.ResultConfig;
+
+import java.util.Formatter;
+import java.util.IllegalFormatException;
+
+public class ShellCommandConstants {
+
+    /**
+     * Class to send back results of commands to their callers like plugin or 3rd party apps.
+     */
+    public static final class RESULT_SENDER {
+
+        /*
+         * The default `Formatter` format strings to use for `ResultConfig#resultFileBasename`
+         * if `ResultConfig#resultSingleFile` is `true`.
+         */
+
+        /** The {@link Formatter} format string for success if only `stdout` needs to be written to
+         * {@link ResultConfig#resultFileBasename} where `stdout` maps to `%1$s`.
+         * This is used when `err` equals {@link Errno#ERRNO_SUCCESS} (-1) and `stderr` is empty
+         * and `exit_code` equals `0` and {@link ResultConfig#resultFileOutputFormat} is not passed. */
+        public static final String FORMAT_SUCCESS_STDOUT = "%1$s%n";
+        /** The {@link Formatter} format string for success if `stdout` and `exit_code` need to be written to
+         * {@link ResultConfig#resultFileBasename} where `stdout` maps to `%1$s` and `exit_code` to `%2$s`.
+         * This is used when `err` equals {@link Errno#ERRNO_SUCCESS} (-1) and `stderr` is empty
+         * and `exit_code` does not equal `0` and {@link ResultConfig#resultFileOutputFormat} is not passed.
+         * The exit code will be placed in a markdown inline code. */
+        public static final String FORMAT_SUCCESS_STDOUT__EXIT_CODE = "%1$s%n%n%n%nexit_code=%2$s%n";
+        /** The {@link Formatter} format string for success if `stdout`, `stderr` and `exit_code` need to be
+         * written to {@link ResultConfig#resultFileBasename} where `stdout` maps to `%1$s`, `stderr`
+         * maps to `%2$s` and `exit_code` to `%3$s`.
+         * This is used when `err` equals {@link Errno#ERRNO_SUCCESS} (-1) and `stderr` is not empty
+         * and {@link ResultConfig#resultFileOutputFormat} is not passed.
+         * The stdout and stderr will be placed in a markdown code block. The exit code will be placed
+         * in a markdown inline code. The surrounding backticks will be 3 more than the consecutive
+         * backticks in any parameter itself for code blocks. */
+        public static final String FORMAT_SUCCESS_STDOUT__STDERR__EXIT_CODE = "stdout=%n%1$s%n%n%n%nstderr=%n%2$s%n%n%n%nexit_code=%3$s%n";
+        /** The {@link Formatter} format string for failure if `err`, `errmsg`(`error`), `stdout`,
+         * `stderr` and `exit_code` need to be written to {@link ResultConfig#resultFileBasename} where
+         * `err` maps to `%1$s`, `errmsg` maps to `%2$s`, `stdout` maps
+         * to `%3$s`, `stderr` to `%4$s` and `exit_code` maps to `%5$s`.
+         * Do not define an argument greater than `5`, like `%6$s` if you change this value since it will
+         * raise {@link IllegalFormatException}.
+         * This is used when `err` does not equal {@link Errno#ERRNO_SUCCESS} (-1) and
+         * {@link ResultConfig#resultFileErrorFormat} is not passed.
+         * The errmsg, stdout and stderr will be placed in a markdown code block. The err and exit code
+         * will be placed in a markdown inline code. The surrounding backticks will be 3 more than
+         * the consecutive backticks in any parameter itself for code blocks. The stdout, stderr
+         * and exit code may be empty without any surrounding backticks if not set. */
+        public static final String FORMAT_FAILED_ERR__ERRMSG__STDOUT__STDERR__EXIT_CODE = "err=%1$s%n%n%n%nerrmsg=%n%2$s%n%n%n%nstdout=%n%3$s%n%n%n%nstderr=%n%4$s%n%n%n%nexit_code=%5$s%n";
+
+
+
+        /*
+         * The default prefixes to use for result files under `ResultConfig#resultDirectoryPath`
+         * if `ResultConfig#resultSingleFile` is `false`.
+         */
+
+        /** The prefix for the err result file. */
+        public static final String RESULT_FILE_ERR_PREFIX = "err";
+        /** The prefix for the errmsg result file. */
+        public static final String RESULT_FILE_ERRMSG_PREFIX = "errmsg";
+        /** The prefix for the stdout result file. */
+        public static final String RESULT_FILE_STDOUT_PREFIX = "stdout";
+        /** The prefix for the stderr result file. */
+        public static final String RESULT_FILE_STDERR_PREFIX = "stderr";
+        /** The prefix for the exitCode result file. */
+        public static final String RESULT_FILE_EXIT_CODE_PREFIX = "exit_code";
+
+    }
+
+}

From 8e7e355fcb15b74581c3eb70cf2ffee4d3af6ed8 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 15 Jan 2022 02:14:10 +0500
Subject: [PATCH 650/912] Fixed: Add accidentally removed import in 5252fbbe

---
 app/src/main/java/com/termux/app/utils/PluginUtils.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/com/termux/app/utils/PluginUtils.java b/app/src/main/java/com/termux/app/utils/PluginUtils.java
index 6d44557aa8..2607d3c9d4 100644
--- a/app/src/main/java/com/termux/app/utils/PluginUtils.java
+++ b/app/src/main/java/com/termux/app/utils/PluginUtils.java
@@ -4,6 +4,7 @@
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.content.Context;
+import android.os.Environment;
 
 import androidx.annotation.Nullable;
 

From 1fb4fe25103f1302be49fb81908fb0fd9d703a50 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 22 Jan 2022 04:32:00 +0500
Subject: [PATCH 651/912] Fixed: Fix FileUtils labels

---
 .../com/termux/shared/file/FileUtils.java     | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/file/FileUtils.java b/termux-shared/src/main/java/com/termux/shared/file/FileUtils.java
index 9a83c2fa23..52ffcc6ca5 100644
--- a/termux-shared/src/main/java/com/termux/shared/file/FileUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/file/FileUtils.java
@@ -290,7 +290,7 @@ public static FileType getFileType(final String filePath, final boolean followLi
     public static Error validateRegularFileExistenceAndPermissions(String label, final String filePath, final String parentDirPath,
                                                                    final String permissionsToCheck, final boolean setPermissions, final boolean setMissingPermissionsOnly,
                                                                    final boolean ignoreErrorsIfPathIsUnderParentDirPath) {
-        label = (label == null ? "" : label + " ");
+        label = (label == null || label.isEmpty() ? "" : label + " ");
         if (filePath == null || filePath.isEmpty()) return FunctionErrno.ERRNO_NULL_OR_EMPTY_PARAMETER.getError(label + "regular file path", "validateRegularFileExistenceAndPermissions");
 
         try {
@@ -371,7 +371,7 @@ public static Error validateRegularFileExistenceAndPermissions(String label, fin
     public static Error validateDirectoryFileExistenceAndPermissions(String label, final String filePath, final String parentDirPath, final boolean createDirectoryIfMissing,
                                                                      final String permissionsToCheck, final boolean setPermissions, final boolean setMissingPermissionsOnly,
                                                                      final boolean ignoreErrorsIfPathIsInParentDirPath, final boolean ignoreIfNotExecutable) {
-        label = (label == null ? "" : label + " ");
+        label = (label == null || label.isEmpty() ? "" : label + " ");
         if (filePath == null || filePath.isEmpty()) return FunctionErrno.ERRNO_NULL_OR_EMPTY_PARAMETER.getError(label + "directory file path", "validateDirectoryExistenceAndPermissions");
 
         try {
@@ -485,7 +485,7 @@ public static Error createRegularFile(final String label, final String filePath)
      */
     public static Error createRegularFile(String label, final String filePath,
                                           final String permissionsToCheck, final boolean setPermissions, final boolean setMissingPermissionsOnly) {
-        label = (label == null ? "" : label + " ");
+        label = (label == null || label.isEmpty() ? "" : label + " ");
         if (filePath == null || filePath.isEmpty()) return FunctionErrno.ERRNO_NULL_OR_EMPTY_PARAMETER.getError(label + "file path", "createRegularFile");
 
         Error error;
@@ -662,7 +662,7 @@ public static Error createSymlinkFile(String label, final String targetFilePath,
      */
     public static Error createSymlinkFile(String label, final String targetFilePath, final String destFilePath,
                                           final boolean allowDangling, final boolean overwrite, final boolean overwriteOnlyIfDestIsASymlink) {
-        label = (label == null ? "" : label + " ");
+        label = (label == null || label.isEmpty() ? "" : label + " ");
         if (targetFilePath == null || targetFilePath.isEmpty()) return FunctionErrno.ERRNO_NULL_OR_EMPTY_PARAMETER.getError(label + "target file path", "createSymlinkFile");
         if (destFilePath == null || destFilePath.isEmpty()) return FunctionErrno.ERRNO_NULL_OR_EMPTY_PARAMETER.getError(label + "destination file path", "createSymlinkFile");
 
@@ -935,7 +935,7 @@ public static Error moveFile(final String label, final String srcFilePath, final
     public static Error copyOrMoveFile(String label, final String srcFilePath, final String destFilePath,
                                        final boolean moveFile, final boolean ignoreNonExistentSrcFile, int allowedFileTypeFlags,
                                        final boolean overwrite, final boolean overwriteOnlyIfDestSameFileTypeAsSrc) {
-        label = (label == null ? "" : label + " ");
+        label = (label == null || label.isEmpty() ? "" : label + " ");
         if (srcFilePath == null || srcFilePath.isEmpty()) return FunctionErrno.ERRNO_NULL_OR_EMPTY_PARAMETER.getError(label + "source file path", "copyOrMoveFile");
         if (destFilePath == null || destFilePath.isEmpty()) return FunctionErrno.ERRNO_NULL_OR_EMPTY_PARAMETER.getError(label + "destination file path", "copyOrMoveFile");
 
@@ -1150,7 +1150,7 @@ public static Error deleteFile(String label, final String filePath, final boolea
      * @return Returns the {@code error} if deletion was not successful, otherwise {@code null}.
      */
     public static Error deleteFile(String label, final String filePath, final boolean ignoreNonExistentFile, final boolean ignoreWrongFileType, int allowedFileTypeFlags) {
-        label = (label == null ? "" : label + " ");
+        label = (label == null || label.isEmpty() ? "" : label + " ");
         if (filePath == null || filePath.isEmpty()) return FunctionErrno.ERRNO_NULL_OR_EMPTY_PARAMETER.getError(label + "file path", "deleteFile");
 
         try {
@@ -1257,7 +1257,7 @@ public static Error clearDirectory(String filePath) {
      * @return Returns the {@code error} if clearing was not successful, otherwise {@code null}.
      */
     public static Error clearDirectory(String label, final String filePath) {
-        label = (label == null ? "" : label + " ");
+        label = (label == null || label.isEmpty() ? "" : label + " ");
         if (filePath == null || filePath.isEmpty()) return FunctionErrno.ERRNO_NULL_OR_EMPTY_PARAMETER.getError(label + "file path", "clearDirectory");
 
         Error error;
@@ -1320,7 +1320,7 @@ public static Error clearDirectory(String label, final String filePath) {
      * @return Returns the {@code error} if deleting was not successful, otherwise {@code null}.
      */
     public static Error deleteFilesOlderThanXDays(String label, final String filePath, final IOFileFilter dirFilter, int days, final boolean ignoreNonExistentFile, int allowedFileTypeFlags) {
-        label = (label == null ? "" : label + " ");
+        label = (label == null || label.isEmpty() ? "" : label + " ");
         if (filePath == null || filePath.isEmpty()) return FunctionErrno.ERRNO_NULL_OR_EMPTY_PARAMETER.getError(label + "file path", "deleteFilesOlderThanXDays");
         if (days < 0) return FunctionErrno.ERRNO_INVALID_PARAMETER.getError(label + "days", "deleteFilesOlderThanXDays", " It must be >= 0.");
 
@@ -1386,7 +1386,7 @@ public static Error deleteFilesOlderThanXDays(String label, final String filePat
      * @return Returns the {@code error} if reading was not successful, otherwise {@code null}.
      */
     public static Error readTextFromFile(String label, final String filePath, Charset charset, @NonNull final StringBuilder dataStringBuilder, final boolean ignoreNonExistentFile) {
-        label = (label == null ? "" : label + " ");
+        label = (label == null || label.isEmpty() ? "" : label + " ");
         if (filePath == null || filePath.isEmpty()) return FunctionErrno.ERRNO_NULL_OR_EMPTY_PARAMETER.getError(label + "file path", "readStringFromFile");
 
         Logger.logVerbose(LOG_TAG, "Reading text from " + label + "file at path \"" + filePath + "\"");
@@ -1467,7 +1467,7 @@ public static class ReadSerializableObjectResult {
      */
     @NonNull
     public static <T extends Serializable> ReadSerializableObjectResult readSerializableObjectFromFile(String label, final String filePath, Class<T> readObjectType, final boolean ignoreNonExistentFile) {
-        label = (label == null ? "" : label + " ");
+        label = (label == null || label.isEmpty() ? "" : label + " ");
         if (filePath == null || filePath.isEmpty()) return new ReadSerializableObjectResult(FunctionErrno.ERRNO_NULL_OR_EMPTY_PARAMETER.getError(label + "file path", "readSerializableObjectFromFile"), null);
 
         Logger.logVerbose(LOG_TAG, "Reading serializable object from " + label + "file at path \"" + filePath + "\"");
@@ -1525,7 +1525,7 @@ public static <T extends Serializable> ReadSerializableObjectResult readSerializ
      * @return Returns the {@code error} if writing was not successful, otherwise {@code null}.
      */
     public static Error writeTextToFile(String label, final String filePath, Charset charset, final String dataString, final boolean append) {
-        label = (label == null ? "" : label + " ");
+        label = (label == null || label.isEmpty() ? "" : label + " ");
         if (filePath == null || filePath.isEmpty()) return FunctionErrno.ERRNO_NULL_OR_EMPTY_PARAMETER.getError(label + "file path", "writeStringToFile");
 
         Logger.logVerbose(LOG_TAG, Logger.getMultiLineLogStringEntry("Writing text to " + label + "file at path \"" + filePath + "\"", DataUtils.getTruncatedCommandOutput(dataString, Logger.LOGGER_ENTRY_MAX_SAFE_PAYLOAD, true, false, true), "-"));
@@ -1571,7 +1571,7 @@ public static Error writeTextToFile(String label, final String filePath, Charset
      * @return Returns the {@code error} if writing was not successful, otherwise {@code null}.
      */
     public static <T extends Serializable> Error writeSerializableObjectToFile(String label, final String filePath, final T serializableObject) {
-        label = (label == null ? "" : label + " ");
+        label = (label == null || label.isEmpty() ? "" : label + " ");
         if (filePath == null || filePath.isEmpty()) return FunctionErrno.ERRNO_NULL_OR_EMPTY_PARAMETER.getError(label + "file path", "writeSerializableObjectToFile");
 
         Logger.logVerbose(LOG_TAG, "Writing serializable object to " + label + "file at path \"" + filePath + "\"");
@@ -1681,7 +1681,7 @@ public static void setFilePermissions(final String filePath, final String permis
      * @param permissionsToSet The 3 character string that contains the "r", "w", "x" or "-" in-order.
      */
     public static void setFilePermissions(String label, final String filePath, final String permissionsToSet) {
-        label = (label == null ? "" : label + " ");
+        label = (label == null || label.isEmpty() ? "" : label + " ");
         if (filePath == null || filePath.isEmpty()) return;
 
         if (!isValidPermissionString(permissionsToSet)) {
@@ -1752,7 +1752,7 @@ public static void setMissingFilePermissions(final String filePath, final String
      * @param permissionsToSet The 3 character string that contains the "r", "w", "x" or "-" in-order.
      */
     public static void setMissingFilePermissions(String label, final String filePath, final String permissionsToSet) {
-        label = (label == null ? "" : label + " ");
+        label = (label == null || label.isEmpty() ? "" : label + " ");
         if (filePath == null || filePath.isEmpty()) return;
 
         if (!isValidPermissionString(permissionsToSet)) {
@@ -1804,7 +1804,7 @@ public static Error checkMissingFilePermissions(final String filePath, final Str
      * @return Returns the {@code error} if validating permissions failed, otherwise {@code null}.
      */
     public static Error checkMissingFilePermissions(String label, final String filePath, final String permissionsToCheck, final boolean ignoreIfNotExecutable) {
-        label = (label == null ? "" : label + " ");
+        label = (label == null || label.isEmpty() ? "" : label + " ");
         if (filePath == null || filePath.isEmpty()) return FunctionErrno.ERRNO_NULL_OR_EMPTY_PARAMETER.getError(label + "file path", "checkMissingFilePermissions");
 
         if (!isValidPermissionString(permissionsToCheck)) {

From bf10c726613b6235a4da56409c34292964a59463 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 22 Jan 2022 04:46:24 +0500
Subject: [PATCH 652/912] Added: Add annotations and modifiers

---
 .../terminal/TermuxTerminalSessionClient.java   | 17 ++++++++++-------
 terminal-emulator/build.gradle                  |  1 +
 .../termux/terminal/TerminalSessionClient.java  | 17 ++++++++++-------
 .../java/com/termux/shared/errors/Errno.java    | 15 +++++++++------
 .../java/com/termux/shared/file/FileUtils.java  |  9 ++++++---
 .../com/termux/shared/file/FileUtilsErrno.java  |  2 +-
 .../shared/file/filesystem/FileTypes.java       |  1 +
 .../TermuxTerminalSessionClientBase.java        | 17 ++++++++++-------
 8 files changed, 48 insertions(+), 31 deletions(-)

diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java
index 93689de295..244c6278ee 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java
@@ -12,6 +12,9 @@
 import android.text.TextUtils;
 import android.widget.ListView;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import com.termux.R;
 import com.termux.shared.termux.shell.command.runner.terminal.TermuxSession;
 import com.termux.shared.termux.interact.TextInputDialogUtils;
@@ -108,14 +111,14 @@ public void onReload() {
 
 
     @Override
-    public void onTextChanged(TerminalSession changedSession) {
+    public void onTextChanged(@NonNull TerminalSession changedSession) {
         if (!mActivity.isVisible()) return;
 
         if (mActivity.getCurrentSession() == changedSession) mActivity.getTerminalView().onScreenUpdated();
     }
 
     @Override
-    public void onTitleChanged(TerminalSession updatedSession) {
+    public void onTitleChanged(@NonNull TerminalSession updatedSession) {
         if (!mActivity.isVisible()) return;
 
         if (updatedSession != mActivity.getCurrentSession()) {
@@ -129,7 +132,7 @@ public void onTitleChanged(TerminalSession updatedSession) {
     }
 
     @Override
-    public void onSessionFinished(final TerminalSession finishedSession) {
+    public void onSessionFinished(@NonNull TerminalSession finishedSession) {
         TermuxService service = mActivity.getTermuxService();
 
         if (service == null || service.wantsToStop()) {
@@ -174,7 +177,7 @@ public void onSessionFinished(final TerminalSession finishedSession) {
     }
 
     @Override
-    public void onCopyTextToClipboard(TerminalSession session, String text) {
+    public void onCopyTextToClipboard(@NonNull TerminalSession session, String text) {
         if (!mActivity.isVisible()) return;
 
         ClipboardManager clipboard = (ClipboardManager) mActivity.getSystemService(Context.CLIPBOARD_SERVICE);
@@ -182,7 +185,7 @@ public void onCopyTextToClipboard(TerminalSession session, String text) {
     }
 
     @Override
-    public void onPasteTextFromClipboard(TerminalSession session) {
+    public void onPasteTextFromClipboard(@Nullable TerminalSession session) {
         if (!mActivity.isVisible()) return;
 
         ClipboardManager clipboard = (ClipboardManager) mActivity.getSystemService(Context.CLIPBOARD_SERVICE);
@@ -194,7 +197,7 @@ public void onPasteTextFromClipboard(TerminalSession session) {
     }
 
     @Override
-    public void onBell(TerminalSession session) {
+    public void onBell(@NonNull TerminalSession session) {
         if (!mActivity.isVisible()) return;
 
         switch (mActivity.getProperties().getBellBehaviour()) {
@@ -213,7 +216,7 @@ public void onBell(TerminalSession session) {
     }
 
     @Override
-    public void onColorsChanged(TerminalSession changedSession) {
+    public void onColorsChanged(@NonNull TerminalSession changedSession) {
         if (mActivity.getCurrentSession() == changedSession)
             updateBackgroundColor();
     }
diff --git a/terminal-emulator/build.gradle b/terminal-emulator/build.gradle
index 71a9334810..f3d567b3dc 100644
--- a/terminal-emulator/build.gradle
+++ b/terminal-emulator/build.gradle
@@ -50,6 +50,7 @@ tasks.withType(Test) {
 }
 
 dependencies {
+    implementation 'androidx.annotation:annotation:1.3.0'
     testImplementation 'junit:junit:4.13.2'
 }
 
diff --git a/terminal-emulator/src/main/java/com/termux/terminal/TerminalSessionClient.java b/terminal-emulator/src/main/java/com/termux/terminal/TerminalSessionClient.java
index 0ffe8e431e..796c5b7335 100644
--- a/terminal-emulator/src/main/java/com/termux/terminal/TerminalSessionClient.java
+++ b/terminal-emulator/src/main/java/com/termux/terminal/TerminalSessionClient.java
@@ -1,5 +1,8 @@
 package com.termux.terminal;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 /**
  * The interface for communication between {@link TerminalSession} and its client. It is used to
  * send callbacks to the client when {@link TerminalSession} changes or for sending other
@@ -7,19 +10,19 @@
  */
 public interface TerminalSessionClient {
 
-    void onTextChanged(TerminalSession changedSession);
+    void onTextChanged(@NonNull TerminalSession changedSession);
 
-    void onTitleChanged(TerminalSession changedSession);
+    void onTitleChanged(@NonNull TerminalSession changedSession);
 
-    void onSessionFinished(TerminalSession finishedSession);
+    void onSessionFinished(@NonNull TerminalSession finishedSession);
 
-    void onCopyTextToClipboard(TerminalSession session, String text);
+    void onCopyTextToClipboard(@NonNull TerminalSession session, String text);
 
-    void onPasteTextFromClipboard(TerminalSession session);
+    void onPasteTextFromClipboard(@Nullable TerminalSession session);
 
-    void onBell(TerminalSession session);
+    void onBell(@NonNull TerminalSession session);
 
-    void onColorsChanged(TerminalSession session);
+    void onColorsChanged(@NonNull TerminalSession session);
 
     void onTerminalCursorStateChange(boolean state);
 
diff --git a/termux-shared/src/main/java/com/termux/shared/errors/Errno.java b/termux-shared/src/main/java/com/termux/shared/errors/Errno.java
index ae86091553..1ac9fd089b 100644
--- a/termux-shared/src/main/java/com/termux/shared/errors/Errno.java
+++ b/termux-shared/src/main/java/com/termux/shared/errors/Errno.java
@@ -25,7 +25,7 @@ public class Errno {
     public static final Errno ERRNO_FAILED = new Errno(TYPE, Activity.RESULT_FIRST_USER + 1, "Failed");
 
     /** The errno type. */
-    protected String type;
+    protected final String type;
     /** The errno code. */
     protected final int code;
     /** The errno message. */
@@ -34,7 +34,7 @@ public class Errno {
     private static final String LOG_TAG = "Errno";
 
 
-    public Errno(final String type, final int code, final String message) {
+    public Errno(@NonNull final String type, final int code, @NonNull final String message) {
         this.type = type;
         this.code = code;
         this.message = message;
@@ -47,18 +47,21 @@ public String toString() {
         return "type=" + type + ", code=" + code + ", message=\"" + message + "\"";
     }
 
-
+    @NonNull
     public String getType() {
         return type;
     }
 
+    public int getCode() {
+        return code;
+    }
+
+    @NonNull
     public String getMessage() {
         return message;
     }
 
-    public int getCode() {
-        return code;
-    }
+
 
     /**
      * Get the {@link Errno} of a specific type and code.
diff --git a/termux-shared/src/main/java/com/termux/shared/file/FileUtils.java b/termux-shared/src/main/java/com/termux/shared/file/FileUtils.java
index 52ffcc6ca5..0ca949ae2a 100644
--- a/termux-shared/src/main/java/com/termux/shared/file/FileUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/file/FileUtils.java
@@ -4,6 +4,7 @@
 import android.system.Os;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.google.common.io.RecursiveDeleteOption;
 import com.termux.shared.file.filesystem.FileType;
@@ -97,6 +98,7 @@ public static String getCanonicalPath(String path, final String prefixForNonAbso
      * @param path The {@code path} to convert.
      * @return Returns the {@code normalized path}.
      */
+    @Nullable
     public static String normalizePath(String path) {
         if (path == null) return null;
 
@@ -247,7 +249,7 @@ public static boolean fileExists(final String filePath, final boolean followLink
     }
 
     /**
-     * Checks the type of file that exists at {@code filePath}.
+     * Get the type of file that exists at {@code filePath}.
      *
      * This function is a wrapper for
      * {@link FileTypes#getFileType(String, boolean)}
@@ -260,6 +262,7 @@ public static boolean fileExists(final String filePath, final boolean followLink
      *                       returned.
      * @return Returns the {@link FileType} of file.
      */
+    @NonNull
     public static FileType getFileType(final String filePath, final boolean followLinks) {
         return FileTypes.getFileType(filePath, followLinks);
     }
@@ -1446,8 +1449,8 @@ public static Error readTextFromFile(String label, final String filePath, Charse
     }
 
     public static class ReadSerializableObjectResult {
-        public Error error;
-        public Serializable serializableObject;
+        public final Error error;
+        public final Serializable serializableObject;
 
         ReadSerializableObjectResult(Error error, Serializable serializableObject) {
             this.error = error;
diff --git a/termux-shared/src/main/java/com/termux/shared/file/FileUtilsErrno.java b/termux-shared/src/main/java/com/termux/shared/file/FileUtilsErrno.java
index b39870b85a..b7da663713 100644
--- a/termux-shared/src/main/java/com/termux/shared/file/FileUtilsErrno.java
+++ b/termux-shared/src/main/java/com/termux/shared/file/FileUtilsErrno.java
@@ -94,7 +94,7 @@ public class FileUtilsErrno extends Errno {
 
 
     /** Defines the {@link Errno} mapping to get a shorter version of {@link FileUtilsErrno}. */
-    public static Map<Errno, Errno> ERRNO_SHORT_MAPPING = new HashMap<Errno, Errno>() {{
+    public static final Map<Errno, Errno> ERRNO_SHORT_MAPPING = new HashMap<Errno, Errno>() {{
         put(ERRNO_FILE_NOT_FOUND_AT_PATH, ERRNO_FILE_NOT_FOUND_AT_PATH_SHORT);
 
         put(ERRNO_NON_REGULAR_FILE_FOUND, ERRNO_NON_REGULAR_FILE_FOUND_SHORT);
diff --git a/termux-shared/src/main/java/com/termux/shared/file/filesystem/FileTypes.java b/termux-shared/src/main/java/com/termux/shared/file/filesystem/FileTypes.java
index cf599cd2a5..c739392d97 100644
--- a/termux-shared/src/main/java/com/termux/shared/file/filesystem/FileTypes.java
+++ b/termux-shared/src/main/java/com/termux/shared/file/filesystem/FileTypes.java
@@ -82,6 +82,7 @@ public static String convertFileTypeFlagsToNamesString(int fileTypeFlags) {
      *                       returned.
      * @return Returns the {@link FileType} of file.
      */
+    @NonNull
     public static FileType getFileType(final String filePath, final boolean followLinks) {
         if (filePath == null || filePath.isEmpty()) return FileType.NO_EXIST;
 
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/terminal/TermuxTerminalSessionClientBase.java b/termux-shared/src/main/java/com/termux/shared/termux/terminal/TermuxTerminalSessionClientBase.java
index 6764d5a9b1..f79cf0fcc2 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/terminal/TermuxTerminalSessionClientBase.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/terminal/TermuxTerminalSessionClientBase.java
@@ -1,5 +1,8 @@
 package com.termux.shared.termux.terminal;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import com.termux.shared.logger.Logger;
 import com.termux.terminal.TerminalSession;
 import com.termux.terminal.TerminalSessionClient;
@@ -10,31 +13,31 @@ public TermuxTerminalSessionClientBase() {
     }
 
     @Override
-    public void onTextChanged(TerminalSession changedSession) {
+    public void onTextChanged(@NonNull TerminalSession changedSession) {
     }
 
     @Override
-    public void onTitleChanged(TerminalSession updatedSession) {
+    public void onTitleChanged(@NonNull TerminalSession updatedSession) {
     }
 
     @Override
-    public void onSessionFinished(final TerminalSession finishedSession) {
+    public void onSessionFinished(@NonNull TerminalSession finishedSession) {
     }
 
     @Override
-    public void onCopyTextToClipboard(TerminalSession session, String text) {
+    public void onCopyTextToClipboard(@NonNull TerminalSession session, String text) {
     }
 
     @Override
-    public void onPasteTextFromClipboard(TerminalSession session) {
+    public void onPasteTextFromClipboard(@Nullable TerminalSession session) {
     }
 
     @Override
-    public void onBell(TerminalSession session) {
+    public void onBell(@NonNull TerminalSession session) {
     }
 
     @Override
-    public void onColorsChanged(TerminalSession changedSession) {
+    public void onColorsChanged(@NonNull TerminalSession changedSession) {
     }
 
     @Override

From b45ff8a40787e5c66339d17f22c4192d8477c2a7 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 22 Jan 2022 05:03:16 +0500
Subject: [PATCH 653/912] Added: Store pid in ExecutionCommand for sessions and
 tasks

---
 .../java/com/termux/app/TermuxService.java    | 23 ++++++++++++++-----
 .../terminal/TermuxTerminalSessionClient.java | 11 +++++++++
 .../com/termux/terminal/TerminalSession.java  |  1 +
 .../terminal/TerminalSessionClient.java       |  2 ++
 .../shell/command/ExecutionCommand.java       | 11 +++++++++
 .../shell/command/runner/app/AppShell.java    | 12 +++++-----
 .../TermuxTerminalSessionClientBase.java      |  3 +++
 7 files changed, 51 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxService.java b/app/src/main/java/com/termux/app/TermuxService.java
index fae54a2270..b954c80a37 100644
--- a/app/src/main/java/com/termux/app/TermuxService.java
+++ b/app/src/main/java/com/termux/app/TermuxService.java
@@ -5,18 +5,15 @@
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.app.Service;
-import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.Resources;
-import android.net.Uri;
 import android.net.wifi.WifiManager;
 import android.os.Binder;
 import android.os.Build;
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.PowerManager;
-import android.provider.Settings;
 import android.widget.ArrayAdapter;
 
 import androidx.annotation.Nullable;
@@ -780,12 +777,12 @@ private synchronized void updateNotification() {
 
 
 
-    private void setCurrentStoredTerminalSession(TerminalSession session) {
-        if (session == null) return;
+    private void setCurrentStoredTerminalSession(TerminalSession terminalSession) {
+        if (terminalSession == null) return;
         // Make the newly created session the current one to be displayed
         TermuxAppSharedPreferences preferences = TermuxAppSharedPreferences.build(this);
         if (preferences == null) return;
-        preferences.setCurrentSession(session.mHandle);
+        preferences.setCurrentSession(terminalSession.mHandle);
     }
 
     public synchronized boolean isTermuxSessionsEmpty() {
@@ -808,11 +805,25 @@ public synchronized TermuxSession getTermuxSession(int index) {
             return null;
     }
 
+    @Nullable
+    public synchronized TermuxSession getTermuxSessionForTerminalSession(TerminalSession terminalSession) {
+        if (terminalSession == null) return null;
+
+        for (int i = 0; i < mTermuxSessions.size(); i++) {
+            if (mTermuxSessions.get(i).getTerminalSession().equals(terminalSession))
+                return mTermuxSessions.get(i);
+        }
+
+        return null;
+    }
+
     public synchronized TermuxSession getLastTermuxSession() {
         return mTermuxSessions.isEmpty() ? null : mTermuxSessions.get(mTermuxSessions.size() - 1);
     }
 
     public synchronized int getIndexOfSession(TerminalSession terminalSession) {
+        if (terminalSession == null) return -1;
+
         for (int i = 0; i < mTermuxSessions.size(); i++) {
             if (mTermuxSessions.get(i).getTerminalSession().equals(terminalSession))
                 return i;
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java
index 244c6278ee..c54c387021 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java
@@ -234,6 +234,17 @@ public void onTerminalCursorStateChange(boolean enabled) {
         mActivity.getTerminalView().setTerminalCursorBlinkerState(enabled, false);
     }
 
+    @Override
+    public void setTerminalShellPid(@NonNull TerminalSession terminalSession, int pid) {
+        TermuxService service = mActivity.getTermuxService();
+        if (service == null) return;
+
+        TermuxSession termuxSession = service.getTermuxSessionForTerminalSession(terminalSession);
+        if (termuxSession != null)
+            termuxSession.getExecutionCommand().mPid = pid;
+    }
+
+
     /**
      * Should be called when mActivity.onResetTerminalSession() is called
      */
diff --git a/terminal-emulator/src/main/java/com/termux/terminal/TerminalSession.java b/terminal-emulator/src/main/java/com/termux/terminal/TerminalSession.java
index b06f0dea80..c081108d8f 100644
--- a/terminal-emulator/src/main/java/com/termux/terminal/TerminalSession.java
+++ b/terminal-emulator/src/main/java/com/termux/terminal/TerminalSession.java
@@ -126,6 +126,7 @@ public void initializeEmulator(int columns, int rows) {
         int[] processId = new int[1];
         mTerminalFileDescriptor = JNI.createSubprocess(mShellPath, mCwd, mArgs, mEnv, processId, rows, columns);
         mShellPid = processId[0];
+        mClient.setTerminalShellPid(this, mShellPid);
 
         final FileDescriptor terminalFileDescriptorWrapped = wrapFileDescriptor(mTerminalFileDescriptor, mClient);
 
diff --git a/terminal-emulator/src/main/java/com/termux/terminal/TerminalSessionClient.java b/terminal-emulator/src/main/java/com/termux/terminal/TerminalSessionClient.java
index 796c5b7335..fbd8e5509a 100644
--- a/terminal-emulator/src/main/java/com/termux/terminal/TerminalSessionClient.java
+++ b/terminal-emulator/src/main/java/com/termux/terminal/TerminalSessionClient.java
@@ -26,6 +26,8 @@ public interface TerminalSessionClient {
 
     void onTerminalCursorStateChange(boolean state);
 
+    void setTerminalShellPid(@NonNull TerminalSession session, int pid);
+
 
 
     Integer getTerminalCursorStyle();
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/command/ExecutionCommand.java b/termux-shared/src/main/java/com/termux/shared/shell/command/ExecutionCommand.java
index 926d5bc117..4751aa854c 100644
--- a/termux-shared/src/main/java/com/termux/shared/shell/command/ExecutionCommand.java
+++ b/termux-shared/src/main/java/com/termux/shared/shell/command/ExecutionCommand.java
@@ -58,6 +58,8 @@ public int getValue() {
     /** The optional unique id for the {@link ExecutionCommand}. */
     public Integer id;
 
+    /** The process id of command. */
+    public int mPid = -1;
 
     /** The current state of the {@link ExecutionCommand}. */
     private ExecutionState currentState = ExecutionState.PRE_EXECUTION;
@@ -266,6 +268,9 @@ public static String getExecutionInputLogString(final ExecutionCommand execution
 
         logString.append(executionCommand.getCommandIdAndLabelLogString()).append(":");
 
+        if (executionCommand.mPid != -1)
+            logString.append("\n").append(executionCommand.getPidLogString());
+
         if (executionCommand.previousState != ExecutionState.PRE_EXECUTION)
             logString.append("\n").append(executionCommand.getPreviousStateLogString());
         logString.append("\n").append(executionCommand.getCurrentStateLogString());
@@ -358,6 +363,8 @@ public static String getExecutionCommandMarkdownString(final ExecutionCommand ex
 
         markdownString.append("## ").append(executionCommand.commandLabel).append("\n");
 
+        if (executionCommand.mPid != -1)
+            markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Pid", executionCommand.mPid, "-"));
 
         markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Previous State", executionCommand.previousState.getName(), "-"));
         markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Current State", executionCommand.currentState.getName(), "-"));
@@ -408,6 +415,10 @@ public String getIdLogString() {
             return "";
     }
 
+    public String getPidLogString() {
+        return "Pid: `" + mPid + "`";
+    }
+
     public String getCurrentStateLogString() {
         return "Current State: `" + currentState.getName() + "`";
     }
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/command/runner/app/AppShell.java b/termux-shared/src/main/java/com/termux/shared/shell/command/runner/app/AppShell.java
index c0078458bc..871e9888f8 100644
--- a/termux-shared/src/main/java/com/termux/shared/shell/command/runner/app/AppShell.java
+++ b/termux-shared/src/main/java/com/termux/shared/shell/command/runner/app/AppShell.java
@@ -137,16 +137,16 @@ public void run() {
      * @param context The {@link Context} for operations.
      */
     private void executeInner(@NonNull final Context context) throws IllegalThreadStateException, InterruptedException {
-        final int pid = ShellUtils.getPid(mProcess);
+        mExecutionCommand.mPid = ShellUtils.getPid(mProcess);
 
-        Logger.logDebug(LOG_TAG, "Running \"" + mExecutionCommand.getCommandIdAndLabelLogString() + "\" AppShell with pid " + pid);
+        Logger.logDebug(LOG_TAG, "Running \"" + mExecutionCommand.getCommandIdAndLabelLogString() + "\" AppShell with pid " + mExecutionCommand.mPid);
 
         mExecutionCommand.resultData.exitCode = null;
 
         // setup stdin, and stdout and stderr gobblers
         DataOutputStream STDIN = new DataOutputStream(mProcess.getOutputStream());
-        StreamGobbler STDOUT = new StreamGobbler(pid + "-stdout", mProcess.getInputStream(), mExecutionCommand.resultData.stdout, mExecutionCommand.backgroundCustomLogLevel);
-        StreamGobbler STDERR = new StreamGobbler(pid + "-stderr", mProcess.getErrorStream(), mExecutionCommand.resultData.stderr, mExecutionCommand.backgroundCustomLogLevel);
+        StreamGobbler STDOUT = new StreamGobbler(mExecutionCommand.mPid + "-stdout", mProcess.getInputStream(), mExecutionCommand.resultData.stdout, mExecutionCommand.backgroundCustomLogLevel);
+        StreamGobbler STDERR = new StreamGobbler(mExecutionCommand.mPid + "-stderr", mProcess.getErrorStream(), mExecutionCommand.resultData.stderr, mExecutionCommand.backgroundCustomLogLevel);
 
         // start gobbling
         STDOUT.start();
@@ -196,9 +196,9 @@ private void executeInner(@NonNull final Context context) throws IllegalThreadSt
 
         // Process result
         if (exitCode == 0)
-            Logger.logDebug(LOG_TAG, "The \"" + mExecutionCommand.getCommandIdAndLabelLogString() + "\" AppShell with pid " + pid + " exited normally");
+            Logger.logDebug(LOG_TAG, "The \"" + mExecutionCommand.getCommandIdAndLabelLogString() + "\" AppShell with pid " + mExecutionCommand.mPid + " exited normally");
         else
-            Logger.logDebug(LOG_TAG, "The \"" + mExecutionCommand.getCommandIdAndLabelLogString() + "\" AppShell with pid " + pid + " exited with code: " + exitCode);
+            Logger.logDebug(LOG_TAG, "The \"" + mExecutionCommand.getCommandIdAndLabelLogString() + "\" AppShell with pid " + mExecutionCommand.mPid + " exited with code: " + exitCode);
 
         // If the execution command has already failed, like SIGKILL was sent, then don't continue
         if (mExecutionCommand.isStateFailed()) {
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/terminal/TermuxTerminalSessionClientBase.java b/termux-shared/src/main/java/com/termux/shared/termux/terminal/TermuxTerminalSessionClientBase.java
index f79cf0fcc2..295a82752f 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/terminal/TermuxTerminalSessionClientBase.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/terminal/TermuxTerminalSessionClientBase.java
@@ -44,6 +44,9 @@ public void onColorsChanged(@NonNull TerminalSession changedSession) {
     public void onTerminalCursorStateChange(boolean state) {
     }
 
+    @Override
+    public void setTerminalShellPid(@NonNull TerminalSession session, int pid) {
+    }
 
 
     @Override

From 1f3d3616a4900d4f52d1db52c2d17518d9847602 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 22 Jan 2022 18:29:48 +0500
Subject: [PATCH 654/912] Fixed: Fix termux app restarting on samsung dex
 version < 3.0 when switching modes

---
 app/src/main/AndroidManifest.xml | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 988c0f4719..21f4cf7a4c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -183,13 +183,24 @@
         <meta-data
             android:name="android.max_aspect"
             android:value="10.0" />
+
+
+        <!-- https://developer.samsung.com/samsung-dex/modify-optimizing.html -->
+
+        <!-- Version < 3.0. DeX Mode and Screen Mirroring support -->
         <meta-data
-            android:name="com.sec.android.support.multiwindow"
+            android:name="com.samsung.android.keepalive.density"
             android:value="true" />
+
+        <!-- Version >= 3.0. DeX Dual Mode support -->
         <meta-data
             android:name="com.samsung.android.multidisplay.keep_process_alive"
             android:value="true" />
 
+        <meta-data
+            android:name="com.sec.android.support.multiwindow"
+            android:value="true" />
+
     </application>
 
 </manifest>

From 3898ebdc74663195738766c23bf4e4eee8b4a3b7 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 22 Jan 2022 18:44:56 +0500
Subject: [PATCH 655/912] Changed: Rename UriUtils getUriFilePath() to
 getUriFilePathWithFragment()

---
 .../main/java/com/termux/app/TermuxOpenReceiver.java  |  2 +-
 app/src/main/java/com/termux/app/TermuxService.java   |  4 ++--
 .../termux/filepicker/TermuxFileReceiverActivity.java |  2 +-
 .../main/java/com/termux/shared/net/uri/UriUtils.java | 11 +++++++----
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxOpenReceiver.java b/app/src/main/java/com/termux/app/TermuxOpenReceiver.java
index 9d3a01efa7..2868dabf94 100644
--- a/app/src/main/java/com/termux/app/TermuxOpenReceiver.java
+++ b/app/src/main/java/com/termux/app/TermuxOpenReceiver.java
@@ -73,7 +73,7 @@ public void onReceive(Context context, Intent intent) {
         }
 
         // Get full path including fragment (anything after last "#")
-        String filePath = UriUtils.getUriFilePath(data);
+        String filePath = UriUtils.getUriFilePathWithFragment(data);
 
         final File fileToShare = new File(filePath);
         if (!(fileToShare.isFile() && fileToShare.canRead())) {
diff --git a/app/src/main/java/com/termux/app/TermuxService.java b/app/src/main/java/com/termux/app/TermuxService.java
index b954c80a37..ecde6e38a3 100644
--- a/app/src/main/java/com/termux/app/TermuxService.java
+++ b/app/src/main/java/com/termux/app/TermuxService.java
@@ -351,11 +351,11 @@ private void actionServiceExecute(Intent intent) {
             Logger.logVerbose(LOG_TAG, "uri: \"" + executionCommand.executableUri + "\", path: \"" + executionCommand.executableUri.getPath() + "\", fragment: \"" + executionCommand.executableUri.getFragment() + "\"");
 
             // Get full path including fragment (anything after last "#")
-            executionCommand.executable = UriUtils.getUriFilePath(executionCommand.executableUri);
+            executionCommand.executable = UriUtils.getUriFilePathWithFragment(executionCommand.executableUri);
             executionCommand.arguments = IntentUtils.getStringArrayExtraIfSet(intent, TERMUX_SERVICE.EXTRA_ARGUMENTS, null);
             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.backgroundCustomLogLevel = IntentUtils.getIntegerExtraIfSet(intent, TERMUX_SERVICE.EXTRA_BACKGROUND_CUSTOM_LOG_LEVEL, null);
         }
 
         executionCommand.workingDirectory = IntentUtils.getStringExtraIfSet(intent, TERMUX_SERVICE.EXTRA_WORKDIR, null);
diff --git a/app/src/main/java/com/termux/filepicker/TermuxFileReceiverActivity.java b/app/src/main/java/com/termux/filepicker/TermuxFileReceiverActivity.java
index 45c99e688d..5370b81a73 100644
--- a/app/src/main/java/com/termux/filepicker/TermuxFileReceiverActivity.java
+++ b/app/src/main/java/com/termux/filepicker/TermuxFileReceiverActivity.java
@@ -99,7 +99,7 @@ protected void onResume() {
                 Logger.logVerbose(LOG_TAG, "uri: \"" + dataUri + "\", path: \"" + dataUri.getPath() + "\", fragment: \"" + dataUri.getFragment() + "\"");
 
                 // Get full path including fragment (anything after last "#")
-                String path = UriUtils.getUriFilePath(dataUri);
+                String path = UriUtils.getUriFilePathWithFragment(dataUri);
                 if (DataUtils.isNullOrEmpty(path)) {
                     showErrorDialogAndQuit("File path from data uri is null, empty or invalid.");
                     return;
diff --git a/termux-shared/src/main/java/com/termux/shared/net/uri/UriUtils.java b/termux-shared/src/main/java/com/termux/shared/net/uri/UriUtils.java
index 29940452bb..2254a92bdf 100644
--- a/termux-shared/src/main/java/com/termux/shared/net/uri/UriUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/net/uri/UriUtils.java
@@ -3,6 +3,7 @@
 import android.net.Uri;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.termux.shared.data.DataUtils;
 import com.termux.shared.file.FileUtils;
@@ -10,7 +11,7 @@
 public class UriUtils {
 
     /**
-     * Get the full file path from a {@link Uri}.
+     * Get the full file path from a {@link Uri} including the fragment.
      *
      * If the {@link Uri} was created from file path with {@link Uri#parse(String)}, like "am"
      * command "-d" option does, and the path contained a "#", then anything after it would become
@@ -21,10 +22,11 @@ public class UriUtils {
      * with {@link Uri.Builder#path(String)}, then "#" will automatically be encoded to "%23"
      * and separate fragment will not exist.
      *
-     * @param uri The {@link Uri} to get basename from.
+     * @param uri The {@link Uri} to get file path from.
      * @return Returns the file path if found, otherwise {@code null}.
      */
-    public static String getUriFilePath(Uri uri) {
+    @Nullable
+    public static String getUriFilePathWithFragment(Uri uri) {
         if (uri == null) return null;
         String path = uri.getPath();
         if (DataUtils.isNullOrEmpty(path)) return null;
@@ -40,12 +42,13 @@ public static String getUriFilePath(Uri uri) {
      * @param withFragment If the {@link Uri} fragment should be included in basename.
      * @return Returns the file basename if found, otherwise {@code null}.
      */
+    @Nullable
     public static String getUriFileBasename(Uri uri, boolean withFragment) {
         if (uri == null) return null;
 
         String path;
         if (withFragment) {
-            path = getUriFilePath(uri);
+            path = getUriFilePathWithFragment(uri);
         } else {
             path = uri.getPath();
             if (DataUtils.isNullOrEmpty(path)) return null;

From b435d948887e6417976039c9ce074d02280989b7 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 22 Jan 2022 18:48:39 +0500
Subject: [PATCH 656/912] Fixed: Do not open null or empty file paths passed to
 TermuxOpenReceiver

---
 app/src/main/java/com/termux/app/TermuxOpenReceiver.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/src/main/java/com/termux/app/TermuxOpenReceiver.java b/app/src/main/java/com/termux/app/TermuxOpenReceiver.java
index 2868dabf94..0c628403fb 100644
--- a/app/src/main/java/com/termux/app/TermuxOpenReceiver.java
+++ b/app/src/main/java/com/termux/app/TermuxOpenReceiver.java
@@ -14,6 +14,7 @@
 import android.webkit.MimeTypeMap;
 
 import com.termux.app.utils.PluginUtils;
+import com.termux.shared.data.DataUtils;
 import com.termux.shared.data.IntentUtils;
 import com.termux.shared.net.uri.UriUtils;
 import com.termux.shared.logger.Logger;
@@ -74,6 +75,10 @@ public void onReceive(Context context, Intent intent) {
 
         // Get full path including fragment (anything after last "#")
         String filePath = UriUtils.getUriFilePathWithFragment(data);
+        if (DataUtils.isNullOrEmpty(filePath)) {
+            Logger.logError(LOG_TAG, "filePath is null or empty");
+            return;
+        }
 
         final File fileToShare = new File(filePath);
         if (!(fileToShare.isFile() && fileToShare.canRead())) {

From a3cd058fb463562c8124084320b4a184cdf37c0e Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 22 Jan 2022 18:49:43 +0500
Subject: [PATCH 657/912] Update: Remove duplicate log tag prefix from
 TermuxOpenReceiver

---
 app/src/main/java/com/termux/app/TermuxOpenReceiver.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxOpenReceiver.java b/app/src/main/java/com/termux/app/TermuxOpenReceiver.java
index 0c628403fb..48f0607dc4 100644
--- a/app/src/main/java/com/termux/app/TermuxOpenReceiver.java
+++ b/app/src/main/java/com/termux/app/TermuxOpenReceiver.java
@@ -35,7 +35,7 @@ public class TermuxOpenReceiver extends BroadcastReceiver {
     public void onReceive(Context context, Intent intent) {
         final Uri data = intent.getData();
         if (data == null) {
-            Logger.logError(LOG_TAG, "termux-open: Called without intent data");
+            Logger.logError(LOG_TAG, "Called without intent data");
             return;
         }
 
@@ -68,7 +68,7 @@ public void onReceive(Context context, Intent intent) {
             try {
                 context.startActivity(urlIntent);
             } catch (ActivityNotFoundException e) {
-                Logger.logError(LOG_TAG, "termux-open: No app handles the url " + data);
+                Logger.logError(LOG_TAG, "No app handles the url " + data);
             }
             return;
         }
@@ -82,7 +82,7 @@ public void onReceive(Context context, Intent intent) {
 
         final File fileToShare = new File(filePath);
         if (!(fileToShare.isFile() && fileToShare.canRead())) {
-            Logger.logError(LOG_TAG, "termux-open: Not a readable file: '" + fileToShare.getAbsolutePath() + "'");
+            Logger.logError(LOG_TAG, "Not a readable file: '" + fileToShare.getAbsolutePath() + "'");
             return;
         }
 
@@ -120,7 +120,7 @@ public void onReceive(Context context, Intent intent) {
         try {
             context.startActivity(sendIntent);
         } catch (ActivityNotFoundException e) {
-            Logger.logError(LOG_TAG, "termux-open: No app handles the url " + data);
+            Logger.logError(LOG_TAG, "No app handles the url " + data);
         }
     }
 

From 6fea1fbddca58580e26fd5775089433b4f0996d7 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 22 Jan 2022 18:56:50 +0500
Subject: [PATCH 658/912] Changed: Change ShareUtils.openSystemAppChooser() to
 public

---
 .../src/main/java/com/termux/shared/interact/ShareUtils.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/interact/ShareUtils.java b/termux-shared/src/main/java/com/termux/shared/interact/ShareUtils.java
index 4faf3f310e..356a0f16f2 100644
--- a/termux-shared/src/main/java/com/termux/shared/interact/ShareUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/interact/ShareUtils.java
@@ -34,7 +34,7 @@ public class ShareUtils {
      * @param intent The intent that describes the choices that should be shown.
      * @param title The title for choose menu.
      */
-    private static void openSystemAppChooser(final Context context, final Intent intent, final String title) {
+    public static void openSystemAppChooser(final Context context, final Intent intent, final String title) {
         if (context == null) return;
 
         final Intent chooserIntent = new Intent(Intent.ACTION_CHOOSER);

From f3f434af92afd3845107139e8c267849bf6cd1d0 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 22 Jan 2022 19:01:42 +0500
Subject: [PATCH 659/912] Changed: Rename ShareUtils openURL() to openUrl()

---
 .../main/java/com/termux/app/activities/SettingsActivity.java | 2 +-
 .../com/termux/app/terminal/TermuxTerminalViewClient.java     | 4 ++--
 .../src/main/java/com/termux/shared/interact/ShareUtils.java  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/termux/app/activities/SettingsActivity.java b/app/src/main/java/com/termux/app/activities/SettingsActivity.java
index d0431bc740..6631f8d199 100644
--- a/app/src/main/java/com/termux/app/activities/SettingsActivity.java
+++ b/app/src/main/java/com/termux/app/activities/SettingsActivity.java
@@ -152,7 +152,7 @@ private void configureDonatePreference(@NonNull Context context) {
                 }
 
                 donatePreference.setOnPreferenceClickListener(preference -> {
-                    ShareUtils.openURL(context, TermuxConstants.TERMUX_DONATE_URL);
+                    ShareUtils.openUrl(context, TermuxConstants.TERMUX_DONATE_URL);
                     return true;
                 });
             }
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
index 248ae17e92..16cfeeb930 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
@@ -180,7 +180,7 @@ public void onSingleTapUp(MotionEvent e) {
 
             if (!urlSet.isEmpty()) {
                 String url = (String) urlSet.iterator().next();
-                ShareUtils.openURL(mActivity, url);
+                ShareUtils.openUrl(mActivity, url);
                 return;
             }
         }
@@ -685,7 +685,7 @@ public void showUrlSelection() {
             lv.setOnItemLongClickListener((parent, view, position, id) -> {
                 dialog.dismiss();
                 String url = (String) urls[position];
-                ShareUtils.openURL(mActivity, url);
+                ShareUtils.openUrl(mActivity, url);
                 return true;
             });
         });
diff --git a/termux-shared/src/main/java/com/termux/shared/interact/ShareUtils.java b/termux-shared/src/main/java/com/termux/shared/interact/ShareUtils.java
index 356a0f16f2..def8bfa8e1 100644
--- a/termux-shared/src/main/java/com/termux/shared/interact/ShareUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/interact/ShareUtils.java
@@ -92,7 +92,7 @@ public static void copyTextToClipboard(final Context context, final String text,
      * @param context The context for operations.
      * @param url The url to open.
      */
-    public static void openURL(final Context context, final String url) {
+    public static void openUrl(final Context context, final String url) {
         if (context == null || url == null || url.isEmpty()) return;
         Uri uri = Uri.parse(url);
         Intent intent = new Intent(Intent.ACTION_VIEW, uri);

From 6631599fb627a849e64e76693cb3b0eb775b1a87 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sun, 23 Jan 2022 00:18:33 +0500
Subject: [PATCH 660/912] Added: Add support for shared day/night theming
 across termux apps

With this commit, activities will automatically change theme between day/night if `night-mode` `termux.properties` is not set or is set to `system` without requiring app restart.

Dialog theming will be fully added in a later commit and may currently be in an inconsistent state or have crashes.

The `uiMode` has been removed from `configChanges` of `TermuxActivity`, this may cause termux app to restart if samsung DEX mode is changed, if it does, then users should report it so that it can be fixed by re-adding the value and ignoring the change inside `TermuxActivity.onConfigurationChanged()`. The docs don't state if its necessary. Check related pull request #1446.

Running `termux-reload-settings` will also restart `TermuxActivity`, the activity data should be preserved.
---
 app/build.gradle                              |   1 +
 app/src/main/AndroidManifest.xml              |  17 ++-
 .../java/com/termux/app/TermuxActivity.java   |  40 ++----
 .../termux/app/activities/HelpActivity.java   |   5 +-
 .../app/activities/SettingsActivity.java      |  14 +-
 .../TermuxFileReceiverActivity.java           |   4 +-
 app/src/main/res/layout/activity_settings.xml |   9 +-
 app/src/main/res/layout/activity_termux.xml   |  12 +-
 .../layout/item_terminal_sessions_list.xml    |   2 +-
 app/src/main/res/values-night/themes.xml      |  40 ++++++
 app/src/main/res/values/attrs.xml             |   5 +
 app/src/main/res/values/styles.xml            |  47 +------
 app/src/main/res/values/themes.xml            |  49 +++++++
 .../shared/activities/ReportActivity.java     |   4 +
 .../media/AppCompatActivityUtils.java         | 120 ++++++++++++++++++
 .../termux/shared/markdown/MarkdownUtils.java |  14 +-
 .../termux/extrakeys/ExtraKeysView.java       |  29 ++++-
 .../com/termux/shared/theme/NightMode.java    |   2 +-
 .../com/termux/shared/theme/ThemeUtils.java   |  55 ++++++++
 .../src/main/res/layout/activity_report.xml   |   4 +-
 .../src/main/res/layout/activity_text_io.xml  |   4 +-
 .../markdown_adapter_node_code_block.xml      |   2 +
 .../layout/markdown_adapter_node_default.xml  |   3 +-
 ...oolbar.xml => partial_primary_toolbar.xml} |   8 +-
 .../src/main/res/values-night/themes.xml      |  56 +++++++-
 termux-shared/src/main/res/values/attrs.xml   |   7 +
 termux-shared/src/main/res/values/colors.xml  |   5 +
 termux-shared/src/main/res/values/dimens.xml  |   3 +-
 termux-shared/src/main/res/values/styles.xml  |  67 ++++++++++
 termux-shared/src/main/res/values/themes.xml  |  94 +++++++++++---
 30 files changed, 584 insertions(+), 138 deletions(-)
 create mode 100644 app/src/main/res/values-night/themes.xml
 create mode 100644 app/src/main/res/values/attrs.xml
 create mode 100644 app/src/main/res/values/themes.xml
 create mode 100644 termux-shared/src/main/java/com/termux/shared/activity/media/AppCompatActivityUtils.java
 rename termux-shared/src/main/res/layout/{partial_toolbar.xml => partial_primary_toolbar.xml} (69%)
 create mode 100644 termux-shared/src/main/res/values/attrs.xml
 create mode 100644 termux-shared/src/main/res/values/styles.xml

diff --git a/app/build.gradle b/app/build.gradle
index df251f0c88..593e508d7f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -16,6 +16,7 @@ android {
         implementation "androidx.drawerlayout:drawerlayout:1.1.1"
         implementation "androidx.preference:preference:1.1.1"
         implementation "androidx.viewpager:viewpager:1.0.0"
+        implementation "com.google.android.material:material:1.4.0"
         implementation "com.google.guava:guava:24.1-jre"
         implementation "io.noties.markwon:core:$markwonVersion"
         implementation "io.noties.markwon:ext-strikethrough:$markwonVersion"
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 21f4cf7a4c..abb569b9b8 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -46,14 +46,15 @@
         android:requestLegacyExternalStorage="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="false"
-        android:theme="@style/Theme.Termux">
+        android:theme="@style/Theme.TermuxApp.DayNight.DarkActionBar">
 
         <activity
             android:name=".app.TermuxActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation"
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|keyboard|keyboardHidden|navigation"
             android:label="@string/application_name"
             android:launchMode="singleTask"
-            android:resizeableActivity="true">
+            android:resizeableActivity="true"
+            android:theme="@style/Theme.TermuxActivity.DayNight.NoActionBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -88,20 +89,18 @@
             android:exported="false"
             android:label="@string/application_name"
             android:parentActivityName=".app.TermuxActivity"
-            android:resizeableActivity="true"
-            android:theme="@android:style/Theme.Material.Light.DarkActionBar" />
+            android:resizeableActivity="true" />
 
         <activity
             android:name=".app.activities.SettingsActivity"
             android:exported="true"
             android:label="@string/title_activity_termux_settings"
-            android:theme="@style/Theme.AppCompat.Light.DarkActionBar" />
+            android:theme="@style/Theme.TermuxApp.DayNight.NoActionBar" />
 
         <activity
             android:name=".shared.activities.ReportActivity"
-            android:theme="@style/Theme.AppCompat.TermuxReportActivity"
-            android:documentLaunchMode="intoExisting"
-            />
+            android:theme="@style/Theme.MarkdownViewActivity.DayNight"
+            android:documentLaunchMode="intoExisting" />
 
         <activity
             android:name=".filepicker.TermuxFileReceiverActivity"
diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index 7716af5265..4f92ff76a1 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -1,7 +1,6 @@
 package com.termux.app;
 
 import android.annotation.SuppressLint;
-import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.ActivityNotFoundException;
 import android.content.BroadcastReceiver;
@@ -10,7 +9,6 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.ServiceConnection;
-import android.graphics.Color;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
@@ -34,6 +32,7 @@
 import com.termux.app.terminal.TermuxActivityRootView;
 import com.termux.shared.activities.ReportActivity;
 import com.termux.shared.activity.ActivityUtils;
+import com.termux.shared.activity.media.AppCompatActivityUtils;
 import com.termux.shared.data.IntentUtils;
 import com.termux.shared.android.PermissionUtils;
 import com.termux.shared.termux.TermuxConstants;
@@ -52,7 +51,6 @@
 import com.termux.shared.termux.TermuxUtils;
 import com.termux.shared.termux.theme.TermuxThemeUtils;
 import com.termux.shared.theme.NightMode;
-import com.termux.shared.theme.ThemeUtils;
 import com.termux.shared.view.ViewUtils;
 import com.termux.terminal.TerminalSession;
 import com.termux.terminal.TerminalSessionClient;
@@ -62,7 +60,7 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.core.content.ContextCompat;
+import androidx.appcompat.app.AppCompatActivity;
 import androidx.drawerlayout.widget.DrawerLayout;
 import androidx.viewpager.widget.ViewPager;
 
@@ -78,7 +76,7 @@
  * </ul>
  * about memory leaks.
  */
-public final class TermuxActivity extends Activity implements ServiceConnection {
+public final class TermuxActivity extends AppCompatActivity implements ServiceConnection {
 
     /**
      * The connection to the {@link TermuxService}. Requested in {@link #onCreate(Bundle)} with a call to
@@ -228,8 +226,6 @@ public void onCreate(Bundle savedInstanceState) {
             getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
         }
 
-        setDrawerTheme();
-
         setTermuxTerminalViewAndClients();
 
         setTerminalToolbarView(savedInstanceState);
@@ -340,6 +336,8 @@ public void onDestroy() {
 
     @Override
     public void onSaveInstanceState(@NonNull Bundle savedInstanceState) {
+        Logger.logVerbose(LOG_TAG, "onSaveInstanceState");
+
         super.onSaveInstanceState(savedInstanceState);
         saveTerminalToolbarTextInput(savedInstanceState);
     }
@@ -413,19 +411,10 @@ private void setActivityTheme() {
         // Update NightMode.APP_NIGHT_MODE
         TermuxThemeUtils.setAppNightMode(mProperties.getNightMode());
 
-        if (ThemeUtils.shouldEnableDarkTheme(this, NightMode.getAppNightMode().getName())) {
-            this.setTheme(R.style.Theme_Termux_Black);
-        } else {
-            this.setTheme(R.style.Theme_Termux);
-        }
-    }
-
-    private void setDrawerTheme() {
-        if (ThemeUtils.shouldEnableDarkTheme(this, NightMode.getAppNightMode().getName())) {
-            findViewById(R.id.left_drawer).setBackgroundColor(ContextCompat.getColor(this,
-                android.R.color.background_dark));
-            ((ImageButton) findViewById(R.id.settings_button)).setColorFilter(Color.WHITE);
-        }
+        // Set activity night mode. If NightMode.SYSTEM is set, then android will automatically
+        // trigger recreation of activity when uiMode/dark mode configuration is changed so that
+        // day or night theme takes affect.
+        AppCompatActivityUtils.setNightMode(this, NightMode.getAppNightMode().getName(), true);
     }
 
     private void setMargins() {
@@ -518,7 +507,7 @@ public void toggleTerminalToolbar() {
     private void saveTerminalToolbarTextInput(Bundle savedInstanceState) {
         if (savedInstanceState == null) return;
 
-        final EditText textInputView =  findViewById(R.id.terminal_toolbar_text_input);
+        final EditText textInputView = findViewById(R.id.terminal_toolbar_text_input);
         if (textInputView != null) {
             String textInput = textInputView.getText().toString();
             if (!textInput.isEmpty()) savedInstanceState.putString(ARG_TERMINAL_TOOLBAR_TEXT_INPUT, textInput);
@@ -934,12 +923,9 @@ private void reloadActivityStyling() {
             mTermuxService.setTerminalTranscriptRows();
 
         // To change the activity and drawer theme, activity needs to be recreated.
-        // But this will destroy the activity, and will call the onCreate() again.
-        // We need to investigate if enabling this is wise, since all stored variables and
-        // views will be destroyed and bindService() will be called again. Extra keys input
-        // text will we restored since that has already been implemented. Terminal sessions
-        // and transcripts are also already preserved. Theme does change properly too.
-        // TermuxActivity.this.recreate();
+        // It will destroy the activity, including all stored variables and views, and onCreate()
+        // will be called again. Extra keys input text, terminal sessions and transcripts will be preserved.
+        TermuxActivity.this.recreate();
     }
 
 
diff --git a/app/src/main/java/com/termux/app/activities/HelpActivity.java b/app/src/main/java/com/termux/app/activities/HelpActivity.java
index facbf36e5a..a2e4d6a985 100644
--- a/app/src/main/java/com/termux/app/activities/HelpActivity.java
+++ b/app/src/main/java/com/termux/app/activities/HelpActivity.java
@@ -1,6 +1,5 @@
 package com.termux.app.activities;
 
-import android.app.Activity;
 import android.content.ActivityNotFoundException;
 import android.content.Intent;
 import android.net.Uri;
@@ -12,10 +11,12 @@
 import android.widget.ProgressBar;
 import android.widget.RelativeLayout;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import com.termux.shared.termux.TermuxConstants;
 
 /** Basic embedded browser for viewing help pages. */
-public final class HelpActivity extends Activity {
+public final class HelpActivity extends AppCompatActivity {
 
     WebView mWebView;
 
diff --git a/app/src/main/java/com/termux/app/activities/SettingsActivity.java b/app/src/main/java/com/termux/app/activities/SettingsActivity.java
index 6631f8d199..2b6063d481 100644
--- a/app/src/main/java/com/termux/app/activities/SettingsActivity.java
+++ b/app/src/main/java/com/termux/app/activities/SettingsActivity.java
@@ -5,7 +5,6 @@
 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;
@@ -24,12 +23,17 @@
 import com.termux.shared.android.AndroidUtils;
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.termux.TermuxUtils;
+import com.termux.shared.activity.media.AppCompatActivityUtils;
+import com.termux.shared.theme.NightMode;
 
 public class SettingsActivity extends AppCompatActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+
+        AppCompatActivityUtils.setNightMode(this, NightMode.getAppNightMode().getName(), true);
+
         setContentView(R.layout.activity_settings);
         if (savedInstanceState == null) {
             getSupportFragmentManager()
@@ -37,11 +41,9 @@ protected void onCreate(Bundle savedInstanceState) {
                 .replace(R.id.settings, new RootPreferencesFragment())
                 .commit();
         }
-        ActionBar actionBar = getSupportActionBar();
-        if (actionBar != null) {
-            actionBar.setDisplayHomeAsUpEnabled(true);
-            actionBar.setDisplayShowHomeEnabled(true);
-        }
+
+        AppCompatActivityUtils.setToolbar(this, com.termux.shared.R.id.toolbar);
+        AppCompatActivityUtils.setShowBackButtonInActionBar(this, true);
     }
 
     @Override
diff --git a/app/src/main/java/com/termux/filepicker/TermuxFileReceiverActivity.java b/app/src/main/java/com/termux/filepicker/TermuxFileReceiverActivity.java
index 5370b81a73..019fb4a9d7 100644
--- a/app/src/main/java/com/termux/filepicker/TermuxFileReceiverActivity.java
+++ b/app/src/main/java/com/termux/filepicker/TermuxFileReceiverActivity.java
@@ -1,6 +1,5 @@
 package com.termux.filepicker;
 
-import android.app.Activity;
 import android.content.Intent;
 import android.database.Cursor;
 import android.net.Uri;
@@ -8,6 +7,7 @@
 import android.util.Patterns;
 
 import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 
 import com.termux.R;
 import com.termux.shared.data.DataUtils;
@@ -31,7 +31,7 @@
 import java.nio.charset.StandardCharsets;
 import java.util.regex.Pattern;
 
-public class TermuxFileReceiverActivity extends Activity {
+public class TermuxFileReceiverActivity extends AppCompatActivity {
 
     static final String TERMUX_RECEIVEDIR = TermuxConstants.TERMUX_FILES_DIR_PATH + "/home/downloads";
     static final String EDITOR_PROGRAM = TermuxConstants.TERMUX_HOME_DIR_PATH + "/bin/termux-file-editor";
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 7dc1a6c5a7..d3914191e7 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -1,9 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <include
+        layout="@layout/partial_primary_toolbar"
+        android:id="@+id/partial_primary_toolbar"/>
 
     <FrameLayout
         android:id="@+id/settings"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
+
 </LinearLayout>
diff --git a/app/src/main/res/layout/activity_termux.xml b/app/src/main/res/layout/activity_termux.xml
index 144e846c51..4bd61bab35 100644
--- a/app/src/main/res/layout/activity_termux.xml
+++ b/app/src/main/res/layout/activity_termux.xml
@@ -1,4 +1,5 @@
 <com.termux.app.terminal.TermuxActivityRootView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/activity_termux_root_view"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -36,12 +37,12 @@
                 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">
+                android:orientation="vertical"
+                android:background="?attr/termuxActivityDrawerBackground">
 
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -53,7 +54,8 @@
                         android:layout_height="40dp"
                         android:src="@drawable/ic_settings"
                         android:background="@null"
-                        android:contentDescription="@string/action_open_settings" />
+                        android:contentDescription="@string/action_open_settings"
+                        app:tint="?attr/termuxActivityDrawerImageTint" />
                 </LinearLayout>
 
                 <ListView
@@ -71,7 +73,7 @@
                     android:layout_height="wrap_content"
                     android:orientation="horizontal">
 
-                    <Button
+                    <com.google.android.material.button.MaterialButton
                         android:id="@+id/toggle_keyboard_button"
                         style="?android:attr/buttonBarButtonStyle"
                         android:layout_width="match_parent"
@@ -79,7 +81,7 @@
                         android:layout_weight="1"
                         android:text="@string/action_toggle_soft_keyboard" />
 
-                    <Button
+                    <com.google.android.material.button.MaterialButton
                         android:id="@+id/new_session_button"
                         style="?android:attr/buttonBarButtonStyle"
                         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/item_terminal_sessions_list.xml b/app/src/main/res/layout/item_terminal_sessions_list.xml
index cbeb5b4531..46cfeccb6f 100644
--- a/app/src/main/res/layout/item_terminal_sessions_list.xml
+++ b/app/src/main/res/layout/item_terminal_sessions_list.xml
@@ -1,4 +1,4 @@
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+<com.google.android.material.textview.MaterialTextView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/session_title"
     android:layout_width="fill_parent"
     android:layout_height="?android:attr/listPreferredItemHeight"
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
new file mode 100644
index 0000000000..3fe66c184f
--- /dev/null
+++ b/app/src/main/res/values-night/themes.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!--
+     https://material.io/develop/android/theming/dark
+    -->
+
+    <!-- TermuxActivity DayNight NoActionBar theme. -->
+    <!-- See https://developer.android.com/training/material/theme.html for how to customize the Material theme. -->
+    <!-- NOTE: Cannot use "Light." since it hides the terminal scrollbar on the default black background. -->
+    <style name="Theme.TermuxActivity.DayNight.NoActionBar" parent="Theme.TermuxApp.DayNight.NoActionBar">
+        <!-- Primary brand color. -->
+        <item name="colorPrimary">@color/black</item>
+        <item name="colorPrimaryVariant">@color/black</item>
+
+        <item name="android:windowBackground">@color/black</item>
+
+        <!-- Avoid action mode toolbar pushing down terminal content when
+             selecting text on pre-6.0 (non-floating toolbar). -->
+        <item name="android:windowActionModeOverlay">true</item>
+
+        <item name="android:windowTranslucentStatus">true</item>
+        <item name="android:windowTranslucentNavigation">true</item>
+
+        <!-- https://developer.android.com/training/tv/start/start.html#transition-color -->
+        <item name="android:windowAllowReturnTransitionOverlap">true</item>
+        <item name="android:windowAllowEnterTransitionOverlap">true</item>
+
+        <!-- Left drawer. -->
+        <item name="buttonBarButtonStyle">@style/TermuxActivity.Drawer.ButtonBarStyle.Dark</item>
+        <item name="termuxActivityDrawerBackground">@color/black</item>
+        <item name="termuxActivityDrawerImageTint">@color/white</item>
+
+        <!-- Extra keys colors. -->
+        <item name="extraKeysButtonTextColor">@color/white</item>
+        <item name="extraKeysButtonActiveTextColor">@color/red_400</item>
+        <item name="extraKeysButtonBackgroundColor">@color/black</item>
+        <item name="extraKeysButtonActiveBackgroundColor">@color/grey_500</item>
+    </style>
+
+</resources>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
new file mode 100644
index 0000000000..703734ecdc
--- /dev/null
+++ b/app/src/main/res/values/attrs.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <attr name="termuxActivityDrawerBackground" format="reference" />
+    <attr name="termuxActivityDrawerImageTint" format="reference" />
+</resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 8859b8c106..bfcfd47180 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,52 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <style name="Theme.Termux" parent="@android:style/Theme.Material.Light.NoActionBar">
-        <item name="android:statusBarColor">#000000</item>
-        <item name="android:colorPrimary">#FF000000</item>
-        <item name="android:windowBackground">@android:color/black</item>
-
-        <!-- Seen in buttons on left drawer: -->
+    <style name="TermuxAlertDialogStyle" parent="@android:style/Theme.Material.Light.Dialog.Alert">
+        <!-- Seen in buttons on alert dialog: -->
         <item name="android:colorAccent">#212121</item>
-        <item name="android:alertDialogTheme">@style/TermuxAlertDialogStyle</item>
-        <!-- Avoid action mode toolbar pushing down terminal content when
-             selecting text on pre-6.0 (non-floating toolbar). -->
-        <item name="android:windowActionModeOverlay">true</item>
-
-        <item name="android:windowTranslucentStatus">true</item>
-        <item name="android:windowTranslucentNavigation">true</item>
-
-        <!-- https://developer.android.com/training/tv/start/start.html#transition-color -->
-        <item name="android:windowAllowReturnTransitionOverlap">true</item>
-        <item name="android:windowAllowEnterTransitionOverlap">true</item>
     </style>
 
-
-    <!-- See https://developer.android.com/training/material/theme.html for how to customize the Material theme. -->
-    <!-- NOTE: Cannot use "Light." since it hides the terminal scrollbar on the default black background. -->
-    <style name="Theme.Termux.Black" parent="@android:style/Theme.Material.NoActionBar">
-        <item name="android:statusBarColor">#000000</item>
-        <item name="android:colorPrimary">#FF000000</item>
-        <item name="android:windowBackground">@android:color/black</item>
-
-        <!-- Seen in buttons on left drawer: -->
-        <item name="android:colorAccent">#FDFDFD</item>
-        <!-- Avoid action mode toolbar pushing down terminal content when
-             selecting text on pre-6.0 (non-floating toolbar). -->
-        <item name="android:windowActionModeOverlay">true</item>
-
-        <item name="android:windowTranslucentStatus">true</item>
-        <item name="android:windowTranslucentNavigation">true</item>
-
-        <!-- https://developer.android.com/training/tv/start/start.html#transition-color -->
-        <item name="android:windowAllowReturnTransitionOverlap">true</item>
-        <item name="android:windowAllowEnterTransitionOverlap">true</item>
+    <style name="TermuxActivity.Drawer.ButtonBarStyle.Light" parent="@style/Widget.MaterialComponents.Button.TextButton">
+        <item name="android:textColor">@color/black</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>
+    <style name="TermuxActivity.Drawer.ButtonBarStyle.Dark" parent="@style/Widget.MaterialComponents.Button.TextButton">
+        <item name="android:textColor">@color/white</item>
     </style>
 
 </resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
new file mode 100644
index 0000000000..71a8ae49d3
--- /dev/null
+++ b/app/src/main/res/values/themes.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!--
+     https://material.io/develop/android/theming/dark
+    -->
+
+    <!-- TermuxApp Light DarkActionBar theme. -->
+    <style name="Theme.TermuxApp.Light.DarkActionBar" parent="Theme.BaseActivity.Light.DarkActionBar"/>
+    <!-- TermuxApp Light NoActionBar theme. -->
+    <style name="Theme.TermuxApp.Light.NoActionBar" parent="Theme.BaseActivity.Light.NoActionBar"/>
+
+    <!-- TermuxApp DayNight DarkActionBar theme. -->
+    <style name="Theme.TermuxApp.DayNight.DarkActionBar" parent="Theme.BaseActivity.DayNight.DarkActionBar"/>
+    <!-- TermuxApp DayNight NoActionBar theme. -->
+    <style name="Theme.TermuxApp.DayNight.NoActionBar" parent="Theme.BaseActivity.DayNight.NoActionBar"/>
+
+
+    <!-- TermuxActivity DayNight NoActionBar theme. -->
+    <style name="Theme.TermuxActivity.DayNight.NoActionBar" parent="Theme.TermuxApp.DayNight.NoActionBar">
+        <!-- Primary brand color. -->
+        <item name="colorPrimary">@color/black</item>
+        <item name="colorPrimaryVariant">@color/black</item>
+
+        <item name="android:windowBackground">@color/black</item>
+
+        <!-- Avoid action mode toolbar pushing down terminal content when
+             selecting text on pre-6.0 (non-floating toolbar). -->
+        <item name="android:windowActionModeOverlay">true</item>
+
+        <item name="android:windowTranslucentStatus">true</item>
+        <item name="android:windowTranslucentNavigation">true</item>
+
+        <!-- https://developer.android.com/training/tv/start/start.html#transition-color -->
+        <item name="android:windowAllowReturnTransitionOverlap">true</item>
+        <item name="android:windowAllowEnterTransitionOverlap">true</item>
+
+        <!-- Left drawer. -->
+        <item name="buttonBarButtonStyle">@style/TermuxActivity.Drawer.ButtonBarStyle.Light</item>
+        <item name="termuxActivityDrawerBackground">@color/white</item>
+        <item name="termuxActivityDrawerImageTint">@color/black</item>
+
+        <!-- Extra keys colors. -->
+        <item name="extraKeysButtonTextColor">@color/white</item>
+        <item name="extraKeysButtonActiveTextColor">@color/red_400</item>
+        <item name="extraKeysButtonBackgroundColor">@color/black</item>
+        <item name="extraKeysButtonActiveBackgroundColor">@color/grey_500</item>
+    </style>
+
+</resources>
diff --git a/termux-shared/src/main/java/com/termux/shared/activities/ReportActivity.java b/termux-shared/src/main/java/com/termux/shared/activities/ReportActivity.java
index 9a80ebed13..083d517fde 100644
--- a/termux-shared/src/main/java/com/termux/shared/activities/ReportActivity.java
+++ b/termux-shared/src/main/java/com/termux/shared/activities/ReportActivity.java
@@ -17,6 +17,7 @@
 import android.view.MenuItem;
 
 import com.termux.shared.R;
+import com.termux.shared.activity.media.AppCompatActivityUtils;
 import com.termux.shared.data.DataUtils;
 import com.termux.shared.file.FileUtils;
 import com.termux.shared.file.filesystem.FileType;
@@ -26,6 +27,7 @@
 import com.termux.shared.markdown.MarkdownUtils;
 import com.termux.shared.interact.ShareUtils;
 import com.termux.shared.models.ReportInfo;
+import com.termux.shared.theme.NightMode;
 
 import org.commonmark.node.FencedCodeBlock;
 import org.jetbrains.annotations.NotNull;
@@ -72,6 +74,8 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         Logger.logVerbose(LOG_TAG, "onCreate");
 
+        AppCompatActivityUtils.setNightMode(this, NightMode.getAppNightMode().getName(), true);
+
         setContentView(R.layout.activity_report);
 
         Toolbar toolbar = findViewById(R.id.toolbar);
diff --git a/termux-shared/src/main/java/com/termux/shared/activity/media/AppCompatActivityUtils.java b/termux-shared/src/main/java/com/termux/shared/activity/media/AppCompatActivityUtils.java
new file mode 100644
index 0000000000..0666d58ee6
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/activity/media/AppCompatActivityUtils.java
@@ -0,0 +1,120 @@
+package com.termux.shared.activity.media;
+
+import androidx.annotation.IdRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.StyleRes;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatDelegate;
+import androidx.appcompat.widget.Toolbar;
+
+import com.termux.shared.logger.Logger;
+import com.termux.shared.theme.NightMode;
+
+public class AppCompatActivityUtils {
+
+    private static final String LOG_TAG = "AppCompatActivityUtils";
+
+
+    /** Set activity night mode.
+     *
+     * @param activity The host {@link AppCompatActivity}.
+     * @param name The {@link String} representing the name for a {@link NightMode}.
+     * @param local If set to {@code true}, then a call to {@link AppCompatDelegate#setLocalNightMode(int)}
+     *              will be made, otherwise to {@link AppCompatDelegate#setDefaultNightMode(int)}.
+     */
+    public static void setNightMode(AppCompatActivity activity, String name, boolean local) {
+        if (name == null) return;
+        NightMode nightMode = NightMode.modeOf(name);
+        if (nightMode != null) {
+            if (local) {
+                if (activity != null) {
+                    activity.getDelegate().setLocalNightMode(nightMode.getMode());
+                }
+            } else {
+                AppCompatDelegate.setDefaultNightMode(nightMode.getMode());
+            }
+        }
+
+    }
+
+    /** Set activity toolbar.
+     *
+     * @param activity The host {@link AppCompatActivity}.
+     * @param id The toolbar resource id.
+     */
+    public static void setToolbar(@NonNull AppCompatActivity activity, @IdRes int id) {
+        Toolbar toolbar = activity.findViewById(id);
+        if (toolbar != null)
+            activity.setSupportActionBar(toolbar);
+    }
+
+    /** Set activity toolbar title.
+     *
+     * @param activity The host {@link AppCompatActivity}.
+     * @param id The toolbar resource id.
+     * @param title The toolbar title {@link String}.
+     * @param titleAppearance The toolbar title TextAppearance resource id.
+     */
+    public static void setToolbarTitle(@NonNull AppCompatActivity activity, @IdRes int id,
+                                       String title, @StyleRes int titleAppearance) {
+        Toolbar toolbar = activity.findViewById(id);
+        if (toolbar != null) {
+            //toolbar.setTitle(title); // Does not work
+            final ActionBar actionBar = activity.getSupportActionBar();
+            if (actionBar != null)
+                actionBar.setTitle(title);
+
+            try {
+                if (titleAppearance != 0)
+                    toolbar.setTitleTextAppearance(activity, titleAppearance);
+            } catch (Exception e) {
+                Logger.logStackTraceWithMessage(LOG_TAG, "Failed to set toolbar title appearance to style resource id " + titleAppearance, e);
+            }
+
+
+        }
+    }
+
+    /** Set activity toolbar subtitle.
+     *
+     * @param activity The host {@link AppCompatActivity}.
+     * @param id The toolbar resource id.
+     * @param subtitle The toolbar subtitle {@link String}.
+     * @param subtitleAppearance The toolbar subtitle TextAppearance resource id.
+     */
+    public static void setToolbarSubtitle(@NonNull AppCompatActivity activity, @IdRes int id,
+                                          String subtitle, @StyleRes int subtitleAppearance) {
+        Toolbar toolbar = activity.findViewById(id);
+        if (toolbar != null) {
+            toolbar.setSubtitle(subtitle);
+            try {
+                if (subtitleAppearance != 0)
+                    toolbar.setSubtitleTextAppearance(activity, subtitleAppearance);
+            } catch (Exception e) {
+                Logger.logStackTraceWithMessage(LOG_TAG, "Failed to set toolbar subtitle appearance to style resource id " + subtitleAppearance, e);
+            }
+        }
+    }
+
+
+    /** Set whether back button should be shown in activity toolbar.
+     *
+     * @param activity The host {@link AppCompatActivity}.
+     * @param showBackButtonInActionBar Set to {@code true} to enable and {@code false} to disable.
+     */
+    public static void setShowBackButtonInActionBar(@NonNull AppCompatActivity activity,
+                                                    boolean showBackButtonInActionBar) {
+        final ActionBar actionBar = activity.getSupportActionBar();
+        if (actionBar != null) {
+            if (showBackButtonInActionBar) {
+                actionBar.setDisplayHomeAsUpEnabled(true);
+                actionBar.setDisplayShowHomeEnabled(true);
+            } else {
+                actionBar.setDisplayHomeAsUpEnabled(false);
+                actionBar.setDisplayShowHomeEnabled(false);
+            }
+        }
+    }
+
+}
diff --git a/termux-shared/src/main/java/com/termux/shared/markdown/MarkdownUtils.java b/termux-shared/src/main/java/com/termux/shared/markdown/MarkdownUtils.java
index 0fc4f15793..08d8c867ef 100644
--- a/termux-shared/src/main/java/com/termux/shared/markdown/MarkdownUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/markdown/MarkdownUtils.java
@@ -17,6 +17,7 @@
 
 import com.google.common.base.Strings;
 import com.termux.shared.R;
+import com.termux.shared.theme.ThemeUtils;
 
 import org.commonmark.ext.gfm.strikethrough.Strikethrough;
 import org.commonmark.node.BlockQuote;
@@ -152,11 +153,14 @@ public void configureVisitor(@NonNull MarkwonVisitor.Builder builder) {
 
                 @Override
                 public void configureSpansFactory(@NonNull MarkwonSpansFactory.Builder builder) {
-                    builder
-                        // set color for inline code
-                        .setFactory(Code.class, (configuration, props) -> new Object[]{
-                            new BackgroundColorSpan(ContextCompat.getColor(context, R.color.background_markdown_code_inline)),
-                        });
+                    // Do not change color for night themes
+                    if (!ThemeUtils.isNightModeEnabled(context)) {
+                        builder
+                            // set color for inline code
+                            .setFactory(Code.class, (configuration, props) -> new Object[]{
+                                new BackgroundColorSpan(ContextCompat.getColor(context, R.color.background_markdown_code_inline)),
+                            });
+                    }
                 }
             })
             .build();
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/extrakeys/ExtraKeysView.java b/termux-shared/src/main/java/com/termux/shared/termux/extrakeys/ExtraKeysView.java
index 11d6b840bf..cbd59b74f9 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/extrakeys/ExtraKeysView.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/extrakeys/ExtraKeysView.java
@@ -32,7 +32,9 @@
 import androidx.annotation.Nullable;
 
 import com.google.android.material.button.MaterialButton;
+import com.termux.shared.R;
 import com.termux.shared.termux.terminal.io.TerminalExtraKeys;
+import com.termux.shared.theme.ThemeUtils;
 
 /**
  * A {@link View} showing extra keys (such as Escape, Ctrl, Alt) not normally available on an Android soft
@@ -107,16 +109,26 @@ public interface IExtraKeysView {
     }
 
 
-    /** Defines the default value for {@link #mButtonTextColor}. */
+    /** Defines the default value for {@link #mButtonTextColor} defined by current theme. */
+    public static final int ATTR_BUTTON_TEXT_COLOR = R.attr.extraKeysButtonTextColor;
+    /** Defines the default value for {@link #mButtonActiveTextColor} defined by current theme. */
+    public static final int ATTR_BUTTON_ACTIVE_TEXT_COLOR = R.attr.extraKeysButtonActiveTextColor;
+    /** Defines the default value for {@link #mButtonBackgroundColor} defined by current theme. */
+    public static final int ATTR_BUTTON_BACKGROUND_COLOR = R.attr.extraKeysButtonBackgroundColor;
+    /** Defines the default value for {@link #mButtonActiveBackgroundColor} defined by current theme. */
+    public static final int ATTR_BUTTON_ACTIVE_BACKGROUND_COLOR = R.attr.extraKeysButtonActiveBackgroundColor;
+
+    /** Defines the default fallback value for {@link #mButtonTextColor} if {@link #ATTR_BUTTON_TEXT_COLOR} is undefined. */
     public static final int DEFAULT_BUTTON_TEXT_COLOR = 0xFFFFFFFF;
-    /** Defines the default value for {@link #mButtonActiveTextColor}. */
+    /** Defines the default fallback value for {@link #mButtonActiveTextColor} if {@link #ATTR_BUTTON_ACTIVE_TEXT_COLOR} is undefined. */
     public static final int DEFAULT_BUTTON_ACTIVE_TEXT_COLOR = 0xFF80DEEA;
-    /** Defines the default value for {@link #mButtonBackgroundColor}. */
+    /** Defines the default fallback value for {@link #mButtonBackgroundColor} if {@link #ATTR_BUTTON_BACKGROUND_COLOR} is undefined. */
     public static final int DEFAULT_BUTTON_BACKGROUND_COLOR = 0x00000000;
-    /** Defines the default value for {@link #mButtonActiveBackgroundColor}. */
+    /** Defines the default fallback value for {@link #mButtonActiveBackgroundColor} if {@link #ATTR_BUTTON_ACTIVE_BACKGROUND_COLOR} is undefined. */
     public static final int DEFAULT_BUTTON_ACTIVE_BACKGROUND_COLOR = 0xFF7F7F7F;
 
 
+
     /** Defines the minimum allowed duration in milliseconds for {@link #mLongPressTimeout}. */
     public static final int MIN_LONG_PRESS_DURATION = 200;
     /** Defines the maximum allowed duration in milliseconds for {@link #mLongPressTimeout}. */
@@ -202,8 +214,13 @@ public ExtraKeysView(Context context, AttributeSet attrs) {
 
         setRepetitiveKeys(ExtraKeysConstants.PRIMARY_REPETITIVE_KEYS);
         setSpecialButtons(getDefaultSpecialButtons(this));
-        setButtonColors(DEFAULT_BUTTON_TEXT_COLOR, DEFAULT_BUTTON_ACTIVE_TEXT_COLOR,
-                    DEFAULT_BUTTON_BACKGROUND_COLOR, DEFAULT_BUTTON_ACTIVE_BACKGROUND_COLOR);
+
+        setButtonColors(
+            ThemeUtils.getSystemAttrColor(context, ATTR_BUTTON_TEXT_COLOR, DEFAULT_BUTTON_TEXT_COLOR),
+            ThemeUtils.getSystemAttrColor(context, ATTR_BUTTON_ACTIVE_TEXT_COLOR, DEFAULT_BUTTON_ACTIVE_TEXT_COLOR),
+            ThemeUtils.getSystemAttrColor(context, ATTR_BUTTON_BACKGROUND_COLOR, DEFAULT_BUTTON_BACKGROUND_COLOR),
+            ThemeUtils.getSystemAttrColor(context, ATTR_BUTTON_ACTIVE_BACKGROUND_COLOR, DEFAULT_BUTTON_ACTIVE_BACKGROUND_COLOR));
+
         setLongPressTimeout(ViewConfiguration.getLongPressTimeout());
         setLongPressRepeatDelay(DEFAULT_LONG_PRESS_REPEAT_DELAY);
     }
diff --git a/termux-shared/src/main/java/com/termux/shared/theme/NightMode.java b/termux-shared/src/main/java/com/termux/shared/theme/NightMode.java
index 37e3076a22..22e45386b3 100644
--- a/termux-shared/src/main/java/com/termux/shared/theme/NightMode.java
+++ b/termux-shared/src/main/java/com/termux/shared/theme/NightMode.java
@@ -27,7 +27,7 @@ public enum NightMode {
     private static final String LOG_TAG = "NightMode";
 
     private final String name;
-    private final int mode;
+    private final @AppCompatDelegate.NightMode int mode;
 
     NightMode(final String name, int mode) {
         this.name = name;
diff --git a/termux-shared/src/main/java/com/termux/shared/theme/ThemeUtils.java b/termux-shared/src/main/java/com/termux/shared/theme/ThemeUtils.java
index 914aaf8d77..2b652026fb 100644
--- a/termux-shared/src/main/java/com/termux/shared/theme/ThemeUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/theme/ThemeUtils.java
@@ -1,10 +1,19 @@
 package com.termux.shared.theme;
 
+import android.app.Activity;
 import android.content.Context;
 import android.content.res.Configuration;
+import android.content.res.TypedArray;
+
+import androidx.appcompat.app.AppCompatActivity;
 
 public class ThemeUtils {
 
+    public static final int ATTR_TEXT_COLOR_PRIMARY = android.R.attr.textColorPrimary;
+    public static final int ATTR_TEXT_COLOR_SECONDARY = android.R.attr.textColorSecondary;
+    public static final int ATTR_TEXT_COLOR = android.R.attr.textColor;
+    public static final int ATTR_TEXT_COLOR_LINK = android.R.attr.textColorLink;
+
     /**
      * Will return true if system has enabled night mode.
      * https://developer.android.com/guide/topics/resources/providing-resources#NightQualifier
@@ -28,4 +37,50 @@ else if (NightMode.SYSTEM.getName().equals(name)) {
             return false;
         }
     }
+
+
+    /** Get {@link #ATTR_TEXT_COLOR_PRIMARY} value being used by current theme. */
+    public static int getTextColorPrimary(Context context) {
+        return getSystemAttrColor(context, ATTR_TEXT_COLOR_PRIMARY);
+    }
+
+    /** Get {@link #ATTR_TEXT_COLOR_SECONDARY} value being used by current theme. */
+    public static int getTextColorSecondary(Context context) {
+        return getSystemAttrColor(context, ATTR_TEXT_COLOR_SECONDARY);
+    }
+
+    /** Get {@link #ATTR_TEXT_COLOR} value being used by current theme. */
+    public static int getTextColor(Context context) {
+        return getSystemAttrColor(context, ATTR_TEXT_COLOR);
+    }
+
+    /** Get {@link #ATTR_TEXT_COLOR_LINK} value being used by current theme. */
+    public static int getTextColorLink(Context context) {
+        return getSystemAttrColor(context, ATTR_TEXT_COLOR_LINK);
+    }
+
+
+
+    /** Wrapper for {@link #getSystemAttrColor(Context, int, int)} with {@code def} value {@code 0}. */
+    public static int getSystemAttrColor(Context context, int attr) {
+        return getSystemAttrColor(context, attr, 0);
+    }
+
+    /**
+     * Get a values defined by the current heme listed in attrs.
+     *
+     * @param context The context for operations. It must be an instance of {@link Activity} or
+     *               {@link AppCompatActivity} or one with which a theme attribute can be got.
+     *                Do no use application context.
+     * @param attr The attr id.
+     * @param def The def value to return.
+     * @return Returns the {@code attr} value if found, otherwise {@code def}.
+     */
+    public static int getSystemAttrColor(Context context, int attr, int def) {
+        TypedArray typedArray = context.getTheme().obtainStyledAttributes(new int[] { attr });
+        int color = typedArray.getColor(0, def);
+        typedArray.recycle();
+        return color;
+    }
+
 }
diff --git a/termux-shared/src/main/res/layout/activity_report.xml b/termux-shared/src/main/res/layout/activity_report.xml
index a4e133bbbd..7df43a974c 100644
--- a/termux-shared/src/main/res/layout/activity_report.xml
+++ b/termux-shared/src/main/res/layout/activity_report.xml
@@ -5,8 +5,8 @@
     android:orientation="vertical">
 
     <include
-        layout="@layout/partial_toolbar"
-        android:id="@+id/partial_toolbar"/>
+        layout="@layout/partial_primary_toolbar"
+        android:id="@+id/partial_primary_toolbar"/>
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recycler_view"
diff --git a/termux-shared/src/main/res/layout/activity_text_io.xml b/termux-shared/src/main/res/layout/activity_text_io.xml
index 3754b9f5c3..de0f4fc869 100644
--- a/termux-shared/src/main/res/layout/activity_text_io.xml
+++ b/termux-shared/src/main/res/layout/activity_text_io.xml
@@ -5,8 +5,8 @@
     android:orientation="vertical">
 
     <include
-        layout="@layout/partial_toolbar"
-        android:id="@+id/partial_toolbar"/>
+        layout="@layout/partial_primary_toolbar"
+        android:id="@+id/partial_primary_toolbar"/>
 
     <TextView
         android:id="@+id/text_io_label"
diff --git a/termux-shared/src/main/res/layout/markdown_adapter_node_code_block.xml b/termux-shared/src/main/res/layout/markdown_adapter_node_code_block.xml
index a130c35c77..06105ff587 100644
--- a/termux-shared/src/main/res/layout/markdown_adapter_node_code_block.xml
+++ b/termux-shared/src/main/res/layout/markdown_adapter_node_code_block.xml
@@ -21,6 +21,8 @@
         android:paddingRight="16dip"
         android:paddingBottom="8dip"
         android:textAppearance="?android:attr/textAppearanceMedium"
+        android:textColor="?android:attr/textColorPrimary"
+        android:textColorLink="?android:attr/textColorLink"
         android:textSize="12sp" />
 
 </HorizontalScrollView>
diff --git a/termux-shared/src/main/res/layout/markdown_adapter_node_default.xml b/termux-shared/src/main/res/layout/markdown_adapter_node_default.xml
index 4466141976..37b5830002 100644
--- a/termux-shared/src/main/res/layout/markdown_adapter_node_default.xml
+++ b/termux-shared/src/main/res/layout/markdown_adapter_node_default.xml
@@ -11,5 +11,6 @@
     android:paddingTop="8dip"
     android:paddingBottom="8dip"
     android:textAppearance="?android:attr/textAppearanceMedium"
-    android:textColor="#000"
+    android:textColor="?android:attr/textColorPrimary"
+    android:textColorLink="?android:attr/textColorLink"
     android:textSize="12sp" />
diff --git a/termux-shared/src/main/res/layout/partial_toolbar.xml b/termux-shared/src/main/res/layout/partial_primary_toolbar.xml
similarity index 69%
rename from termux-shared/src/main/res/layout/partial_toolbar.xml
rename to termux-shared/src/main/res/layout/partial_primary_toolbar.xml
index 85bb19b1f4..a3f1be50d9 100644
--- a/termux-shared/src/main/res/layout/partial_toolbar.xml
+++ b/termux-shared/src/main/res/layout/partial_primary_toolbar.xml
@@ -13,10 +13,10 @@
         android:background="?attr/colorPrimaryDark"
         android:gravity="center_vertical"
         android:minHeight="?attr/actionBarSize"
-        android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
-        app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
-        app:titleTextAppearance="@style/Toolbar.Title">
-
+        android:theme="@style/ThemeOverlay.AppCompat.DayNight.ActionBar"
+        app:popupTheme="@style/ThemeOverlay.AppCompat.DayNight"
+        app:titleTextAppearance="@style/TextAppearance.Widget.BaseToolbar.Title"
+        app:subtitleTextAppearance="@style/TextAppearance.Widget.BaseToolbar.Subtitle">
     </androidx.appcompat.widget.Toolbar>
 
 </LinearLayout>
diff --git a/termux-shared/src/main/res/values-night/themes.xml b/termux-shared/src/main/res/values-night/themes.xml
index 53e78c09ba..92393cea8a 100755
--- a/termux-shared/src/main/res/values-night/themes.xml
+++ b/termux-shared/src/main/res/values-night/themes.xml
@@ -1,19 +1,65 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
-    <style name="Theme.MaterialComponents.DayNight.TermuxPrimaryActivity" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+    <!--
+     https://material.io/develop/android/theming/dark
+    -->
+
+    <!--
+     BaseActivity DayNight DarkActionBar theme.
+     https://github.com/material-components/material-components-android/blob/1.4.0/lib/java/com/google/android/material/theme/res/values/themes.xml#L27
+    -->
+    <style name="Theme.BaseActivity.DayNight.DarkActionBar" parent="Theme.MaterialComponents">
         <!-- Primary brand color. -->
         <item name="colorPrimary">@color/red_400</item>
         <item name="colorPrimaryVariant">@color/red_800</item>
         <item name="colorOnPrimary">@color/black</item>
 
         <!-- Secondary brand color. -->
-        <item name="colorSecondary">@color/grey_900</item>
-        <item name="colorSecondaryVariant">@color/black</item>
-        <item name="colorOnSecondary">@color/white</item>
+        <item name="colorSecondary">@color/grey_400</item>
+        <item name="colorSecondaryVariant">@color/grey_500</item>
+        <item name="colorOnSecondary">@color/black</item>
 
         <!-- Status bar color. -->
         <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
+        <item name="colorPrimaryDark" tools:targetApi="l">?attr/colorPrimary</item>
 
         <!-- Text color. -->
-        <item name="android:textColorLink">@color/grey_200</item>
+        <item name="android:textColorLink">@color/blue_link_dark</item>
+    </style>
+
+    <!-- BaseActivity DayNight NoActionBar theme. -->
+    <style name="Theme.BaseActivity.DayNight.NoActionBar" parent="Theme.BaseActivity.DayNight.DarkActionBar">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
     </style>
+
+
+
+
+
+    <!--
+      BaseDialog DayNight theme.
+      https://github.com/material-components/material-components-android/blob/1.4.0/lib/java/com/google/android/material/dialog/res/values/themes.xml#L70
+     -->
+    <style name="ThemeOverlay.BaseDialog.DayNight" parent="ThemeOverlay.MaterialComponents.MaterialAlertDialog">
+        <!-- Primary brand color. -->
+        <item name="colorPrimary">@color/red_400</item>
+        <item name="colorPrimaryVariant">@color/red_800</item>
+        <item name="colorOnPrimary">@color/black</item>
+
+        <!-- Secondary brand color. -->
+        <item name="colorSecondary">@color/grey_400</item>
+        <item name="colorSecondaryVariant">@color/grey_500</item>
+        <item name="colorOnSecondary">@color/black</item>
+
+        <!-- Surface color. -->
+        <item name="colorSurface">@color/design_dark_default_color_surface</item>
+        <item name="colorOnSurface">@color/design_dark_default_color_on_surface</item>
+
+        <!-- Dialog title panel style. -->
+        <item name="materialAlertDialogTitlePanelStyle">@style/BaseDialog.Title.Panel</item>
+
+        <!-- Dialog message text style. -->
+        <item name="materialAlertDialogBodyTextStyle">@style/BaseDialog.Message.Text.Dark</item>
+    </style>
+
 </resources>
diff --git a/termux-shared/src/main/res/values/attrs.xml b/termux-shared/src/main/res/values/attrs.xml
new file mode 100644
index 0000000000..83ac9a96e5
--- /dev/null
+++ b/termux-shared/src/main/res/values/attrs.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <attr name="extraKeysButtonTextColor" format="reference" />
+    <attr name="extraKeysButtonActiveTextColor" format="reference" />
+    <attr name="extraKeysButtonBackgroundColor" format="reference" />
+    <attr name="extraKeysButtonActiveBackgroundColor" format="reference" />
+</resources>
diff --git a/termux-shared/src/main/res/values/colors.xml b/termux-shared/src/main/res/values/colors.xml
index 4a013f7bc7..1e4c5aefc0 100644
--- a/termux-shared/src/main/res/values/colors.xml
+++ b/termux-shared/src/main/res/values/colors.xml
@@ -10,9 +10,14 @@
     <color name="red_800">#C4001D</color>
 
     <color name="grey_200">#EEEEEE</color>
+    <color name="grey_400">#BDBDBD</color>
+    <color name="grey_500">#9E9E9E</color>
     <color name="grey_800">#424242</color>
     <color name="grey_900">#212121</color>
 
     <color name="red_error">#DC143C</color>
     <color name="red_error_link">#FC143C</color>
+
+    <color name="blue_link_light">#0969DA</color>
+    <color name="blue_link_dark">#58A6FF</color>
 </resources>
diff --git a/termux-shared/src/main/res/values/dimens.xml b/termux-shared/src/main/res/values/dimens.xml
index e5167ac7d9..35a91fc314 100644
--- a/termux-shared/src/main/res/values/dimens.xml
+++ b/termux-shared/src/main/res/values/dimens.xml
@@ -4,7 +4,8 @@
     <dimen name="activity_horizontal_margin">16dp</dimen>
     <dimen name="activity_vertical_margin">16dp</dimen>
 
+    <dimen name="content_padding_half">4dip</dimen>
     <dimen name="content_padding">8dip</dimen>
     <dimen name="content_padding_double">16dip</dimen>
-    <dimen name="content_padding_half">4dip</dimen>
+    <dimen name="content_padding_triple">32dip</dimen>
 </resources>
diff --git a/termux-shared/src/main/res/values/styles.xml b/termux-shared/src/main/res/values/styles.xml
new file mode 100644
index 0000000000..19f5664fdd
--- /dev/null
+++ b/termux-shared/src/main/res/values/styles.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- BaseToolbar Title text appearance. -->
+    <style name="TextAppearance.Widget.BaseToolbar.Title" parent="TextAppearance.Widget.AppCompat.Toolbar.Title">
+        <item name="android:textSize">14sp</item>
+    </style>
+
+    <!-- BaseToolbar Subtitle text appearance. -->
+    <style name="TextAppearance.Widget.BaseToolbar.Subtitle" parent="TextAppearance.Widget.AppCompat.Toolbar.Subtitle">
+        <item name="android:textSize">12sp</item>
+    </style>
+
+
+
+
+
+    <!--
+     BaseDialog Title Panel materialAlertDialogTitlePanelStyle.
+     https://github.com/material-components/material-components-android/blob/1.4.0/lib/java/com/google/android/material/dialog/res/layout/mtrl_alert_dialog_title.xml#L29
+     https://github.com/material-components/material-components-android/blob/1.4.0/lib/java/com/google/android/material/dialog/res/values/themes.xml#L71
+    -->
+    <style name="BaseDialog.Title.Panel" parent="@style/MaterialAlertDialog.MaterialComponents.Title.Panel">
+        <!-- Title background. -->
+        <item name="android:background">@color/red_400</item>
+
+        <!-- Center Title. -->
+        <item name="android:paddingTop">14dp</item>
+        <item name="android:paddingBottom">14dp</item>
+    </style>
+
+
+    <!--
+     BaseDialog Message Text Light materialAlertDialogBodyTextStyle.
+     https://github.com/material-components/material-components-android/blob/1.4.0/lib/java/com/google/android/material/dialog/res/layout/mtrl_alert_dialog.xml#L59
+     https://github.com/material-components/material-components-android/blob/1.4.0/lib/java/com/google/android/material/dialog/res/values/themes_base.xml#L133
+    -->
+    <style name="BaseDialog.Message.Text.Light" parent="@style/MaterialAlertDialog.MaterialComponents.Body.Text">
+        <!-- Text color. -->
+        <item name="android:textColorPrimary">@color/black</item>
+        <item name="android:textColorLink">@color/blue_link_light</item>
+    </style>
+
+    <!--
+     BaseDialog Message Text Dark materialAlertDialogBodyTextStyle.
+     https://github.com/material-components/material-components-android/blob/1.4.0/lib/java/com/google/android/material/dialog/res/layout/mtrl_alert_dialog.xml#L59
+     https://github.com/material-components/material-components-android/blob/1.4.0/lib/java/com/google/android/material/dialog/res/values/themes_base.xml#L133
+    -->
+    <style name="BaseDialog.Message.Text.Dark" parent="@style/MaterialAlertDialog.MaterialComponents.Body.Text">
+        <!-- Text color. -->
+        <item name="android:textColorLink">@color/blue_link_light</item>
+    </style>
+
+
+
+
+
+    <!-- ViewDivider style. -->
+    <style name="ViewDivider">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">1dp</item>
+        <item name="android:layout_marginTop">@dimen/activity_vertical_margin</item>
+        <item name="android:layout_marginBottom">@dimen/activity_vertical_margin</item>
+        <item name="android:background">?android:attr/listDivider</item>
+    </style>
+
+</resources>
diff --git a/termux-shared/src/main/res/values/themes.xml b/termux-shared/src/main/res/values/themes.xml
index 41129c9287..66e54f21f5 100644
--- a/termux-shared/src/main/res/values/themes.xml
+++ b/termux-shared/src/main/res/values/themes.xml
@@ -1,6 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
-    <style name="Theme.MaterialComponents.DayNight.TermuxPrimaryActivity" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+    <!--
+     The light themes are only for day mode and must not be defined in night/theme.xml.
+     https://material.io/develop/android/theming/dark
+    -->
+
+    <!--
+      BaseActivity Light DarkActionBar theme.
+      https://github.com/material-components/material-components-android/blob/1.4.0/lib/java/com/google/android/material/theme/res/values/themes.xml#L33
+     -->
+    <style name="Theme.BaseActivity.Light.DarkActionBar" parent="Theme.MaterialComponents.Light.DarkActionBar">
         <!-- Primary brand color. -->
         <item name="colorPrimary">@color/red_400</item>
         <item name="colorPrimaryVariant">@color/red_800</item>
@@ -13,30 +22,81 @@
 
         <!-- Status bar color. -->
         <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
+        <item name="colorPrimaryDark" tools:targetApi="l">?attr/colorPrimary</item>
 
         <!-- Text color. -->
         <item name="android:textColorPrimary">@color/black</item>
-        <item name="android:textColorLink">@color/grey_800</item>
-        <item name="android:textColorSecondary">@color/white</item>
-    </style>
+        <item name="android:textColorLink">@color/blue_link_light</item>
 
-    <style name="Theme.AppCompat.TermuxReportActivity" parent="Theme.AppCompat.Light.NoActionBar">
-        <item name="colorPrimaryDark">#FF0000</item>
+        <!--
+         Dialog Themes.
+         These MUST be defined for the application `android:theme` so that if dialogs
+         are shown from non-activity context with TYPE_SYSTEM_ALERT, the correct dialog theme is
+         applied, otherwise exceptions like `UnsupportedOperationException: Failed to resolve attribute
+         at index... TypedValue` will be thrown, since ThemeOverlay would have all the activity
+         theme attributes defined.
+        -->
+        <item name="alertDialogTheme">@style/ThemeOverlay.BaseDialog.DayNight</item>
+        <item name="materialAlertDialogTheme">@style/ThemeOverlay.BaseDialog.DayNight</item>
     </style>
 
-    <style name="Theme.AppCompat.TermuxTextIOActivity" parent="Theme.AppCompat.Light.NoActionBar">
-        <item name="colorPrimaryDark">#FF0000</item>
+    <!-- BaseActivity Light NoActionBar theme. -->
+    <style name="Theme.BaseActivity.Light.NoActionBar" parent="Theme.BaseActivity.Light.DarkActionBar">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
     </style>
 
-    <style name="Toolbar.Title" parent="TextAppearance.Widget.AppCompat.Toolbar.Title">
-        <item name="android:textSize">14sp</item>
-    </style>
 
-    <style name="ViewDivider">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">1dp</item>
-        <item name="android:layout_marginTop">@dimen/activity_vertical_margin</item>
-        <item name="android:layout_marginBottom">@dimen/activity_vertical_margin</item>
-        <item name="android:background">?android:attr/listDivider</item>
+
+    <!-- BaseActivity DayNight DarkActionBar theme. -->
+    <style name="Theme.BaseActivity.DayNight.DarkActionBar" parent="Theme.BaseActivity.Light.DarkActionBar"/>
+    <!-- BaseActivity DayNight NoActionBar theme. -->
+    <style name="Theme.BaseActivity.DayNight.NoActionBar" parent="Theme.BaseActivity.Light.NoActionBar"/>
+
+
+
+    <!-- BaseActivity extended classes Day NoActionBar themes. -->
+    <style name="Theme.MediaViewActivity.Light" parent="Theme.BaseActivity.Light.NoActionBar"/>
+    <style name="Theme.MarkdownViewActivity.Light" parent="Theme.MediaViewActivity.Light"/>
+
+    <!-- BaseActivity extended classes DayNight NoActionBar themes. -->
+    <style name="Theme.MediaViewActivity.DayNight" parent="Theme.BaseActivity.DayNight.NoActionBar"/>
+    <style name="Theme.MarkdownViewActivity.DayNight" parent="Theme.MediaViewActivity.DayNight"/>
+
+
+
+
+
+    <!--
+      BaseDialog Light theme.
+      https://github.com/material-components/material-components-android/blob/1.4.0/lib/java/com/google/android/material/dialog/res/values/themes.xml#L70
+     -->
+    <style name="ThemeOverlay.BaseDialog.Light" parent="ThemeOverlay.MaterialComponents.MaterialAlertDialog">
+        <!-- Primary brand color. -->
+        <item name="colorPrimary">@color/red_400</item>
+        <item name="colorPrimaryVariant">@color/red_800</item>
+        <item name="colorOnPrimary">@color/white</item>
+
+        <!-- Secondary brand color. -->
+        <item name="colorSecondary">@color/grey_900</item>
+        <item name="colorSecondaryVariant">@color/black</item>
+        <item name="colorOnSecondary">@color/white</item>
+
+        <!-- Surface color. -->
+        <item name="colorSurface">@color/design_default_color_surface</item>
+        <item name="colorOnSurface">@color/design_default_color_on_surface</item>
+
+        <!-- Dialog title panel style. -->
+        <item name="materialAlertDialogTitlePanelStyle">@style/BaseDialog.Title.Panel</item>
+
+        <!-- Dialog message text style. -->
+        <item name="materialAlertDialogBodyTextStyle">@style/BaseDialog.Message.Text.Light</item>
     </style>
+
+    <!-- BaseDialog DayNight theme. -->
+    <style name="ThemeOverlay.BaseDialog.DayNight" parent="ThemeOverlay.BaseDialog.Light"/>
+
+    <!-- BaseDialog extended classes DayNight themes. -->
+    <style name="ThemeOverlay.MessageDialog.DayNight" parent="ThemeOverlay.BaseDialog.DayNight"/>
+
 </resources>

From 2452399a13051065f8c19e5b3c023320a4ebbeba Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sun, 23 Jan 2022 19:45:45 +0500
Subject: [PATCH 661/912] Added: Add explicit exported attribute for app
 components as required by Android 12

https://developer.android.com/about/versions/12/behavior-changes-12#exported
---
 app/src/main/AndroidManifest.xml | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index abb569b9b8..ca1b1e9941 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -50,6 +50,7 @@
 
         <activity
             android:name=".app.TermuxActivity"
+            android:exported="true"
             android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|keyboard|keyboardHidden|navigation"
             android:label="@string/application_name"
             android:launchMode="singleTask"
@@ -73,6 +74,7 @@
 
         <activity-alias
             android:name=".HomeActivity"
+            android:exported="true"
             android:targetActivity=".app.TermuxActivity">
 
             <!-- Launch activity automatically on boot on Android Things devices -->
@@ -105,6 +107,7 @@
         <activity
             android:name=".filepicker.TermuxFileReceiverActivity"
             android:excludeFromRecents="true"
+            android:exported="true"
             android:label="@string/application_name"
             android:noHistory="true"
             android:resizeableActivity="true"
@@ -158,9 +161,13 @@
             android:permission="${TERMUX_PACKAGE_NAME}.permission.RUN_COMMAND" />
 
 
-        <receiver android:name=".app.TermuxOpenReceiver" android:exported="false" />
+        <receiver
+            android:name=".app.TermuxOpenReceiver"
+            android:exported="false" />
 
-        <receiver android:name=".shared.activities.ReportActivity$ReportActivityBroadcastReceiver" android:exported="false" />
+        <receiver
+            android:name=".shared.activities.ReportActivity$ReportActivityBroadcastReceiver"
+            android:exported="false" />
 
 
         <service

From 81dd11315765814cc6b270f1126bd1565fa94f44 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Mon, 24 Jan 2022 23:39:06 +0500
Subject: [PATCH 662/912] Docs: Add notice that users should upgrade to
 v0.118.0 ASAP

---
 README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index c8597247de..8b95c1b054 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ Issue https://github.com/termux/termux-app/issues/1072 needs extra attention.
 
 ***
 
-### Contents
+## Contents
 - [Termux App and Plugins](#Termux-App-and-Plugins)
 - [Installation](#Installation)
 - [Uninstallation](#Uninstallation)
@@ -51,6 +51,8 @@ The core [Termux](https://github.com/termux/termux-app) app comes with the follo
 
 Latest version is `v0.118.0`.
 
+**NOTICE: It is highly recommended that you update to `v0.118.0` or higher for various bug fixes ASAP. Also reminding [again](https://www.reddit.com/r/termux/comments/pkujfa/important_deprecation_notice_for_google_play) to users who have installed termux apps from google playstore that playstore builds are [deprecated](#google-play-store-deprecated) and no longer supported. It is recommended that you shift to F-Droid or Github releases.**
+
 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.

From 4fd48a5aed2fa187352a64168e866db14490b44e Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Fri, 28 Jan 2022 02:03:37 +0500
Subject: [PATCH 663/912] Fixed: Fix termux session shortcuts not working after
 TermuxActivity recreation

The `List<KeyboardShortcut> mSessionShortcuts = new ArrayList<>()` declaration was causing shortcuts list to be of size 0 in `TermuxTerminalViewClient.onCodePoint()` after re-creation, which resulted in session shortcuts not working.
---
 .../app/settings/properties/TermuxAppSharedProperties.java | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/termux/app/settings/properties/TermuxAppSharedProperties.java b/app/src/main/java/com/termux/app/settings/properties/TermuxAppSharedProperties.java
index 3f7326af2e..737fdcf79f 100644
--- a/app/src/main/java/com/termux/app/settings/properties/TermuxAppSharedProperties.java
+++ b/app/src/main/java/com/termux/app/settings/properties/TermuxAppSharedProperties.java
@@ -22,7 +22,7 @@
 public class TermuxAppSharedProperties extends TermuxSharedProperties {
 
     private ExtraKeysInfo mExtraKeysInfo;
-    private List<KeyboardShortcut> mSessionShortcuts = new ArrayList<>();
+    private List<KeyboardShortcut> mSessionShortcuts;
 
     private static final String LOG_TAG = "TermuxAppSharedProperties";
 
@@ -80,10 +80,7 @@ private void setExtraKeys() {
      * Set the terminal sessions shortcuts.
      */
     private void setSessionShortcuts() {
-        if (mSessionShortcuts == null)
-            mSessionShortcuts = new ArrayList<>();
-        else
-            mSessionShortcuts.clear();
+        mSessionShortcuts = new ArrayList<>();
 
         // The {@link TermuxPropertyConstants#MAP_SESSION_SHORTCUTS} stores the session shortcut key and action pair
         for (Map.Entry<String, Integer> entry : TermuxPropertyConstants.MAP_SESSION_SHORTCUTS.entrySet()) {

From 172a75e5785a4e2f85d54a9c909c0293675366c8 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Fri, 28 Jan 2022 03:51:52 +0500
Subject: [PATCH 664/912] Changed: Do not recreate TermuxActivity enabled in
 6631599f when TermuxService starts a session

Activity will only be recreated when `termux-reload-settings` is run or `night-mode` config does not equal current system mode when TermuxActivity is initially started. Running `termux-reload-settings` can cause some problems if some variable whose state should be maintained or reset is not being done so correctly, like termux session shortcuts weren't before 4fd48a5a. It requires further testing and any bugs should be reported.
---
 .../main/java/com/termux/app/TermuxActivity.java    | 13 ++++++++-----
 app/src/main/java/com/termux/app/TermuxService.java |  4 +++-
 .../com/termux/shared/termux/TermuxConstants.java   |  8 +++++++-
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index 4f92ff76a1..5585f7d8c1 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -180,7 +180,6 @@ public final class TermuxActivity extends AppCompatActivity implements ServiceCo
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
-
         Logger.logDebug(LOG_TAG, "onCreate");
         isOnResumeAfterOnCreate = true;
 
@@ -846,9 +845,10 @@ public TermuxAppSharedProperties getProperties() {
 
 
 
-    public static void updateTermuxActivityStyling(Context context) {
+    public static void updateTermuxActivityStyling(Context context, boolean recreateActivity) {
         // Make sure that terminal styling is always applied.
         Intent stylingIntent = new Intent(TERMUX_ACTIVITY.ACTION_RELOAD_STYLE);
+        stylingIntent.putExtra(TERMUX_ACTIVITY.EXTRA_RECREATE_ACTIVITY, recreateActivity);
         context.sendBroadcast(stylingIntent);
     }
 
@@ -889,7 +889,7 @@ public void onReceive(Context context, Intent intent) {
                         return;
                     case TERMUX_ACTIVITY.ACTION_RELOAD_STYLE:
                         Logger.logDebug(LOG_TAG, "Received intent to reload styling");
-                        reloadActivityStyling();
+                        reloadActivityStyling(intent.getBooleanExtra(TERMUX_ACTIVITY.EXTRA_RECREATE_ACTIVITY, true));
                         return;
                     default:
                 }
@@ -897,7 +897,7 @@ public void onReceive(Context context, Intent intent) {
         }
     }
 
-    private void reloadActivityStyling() {
+    private void reloadActivityStyling(boolean recreateActivity) {
         if (mProperties != null) {
             mProperties.loadTermuxPropertiesFromDisk();
 
@@ -925,7 +925,10 @@ private void reloadActivityStyling() {
         // To change the activity and drawer theme, activity needs to be recreated.
         // It will destroy the activity, including all stored variables and views, and onCreate()
         // will be called again. Extra keys input text, terminal sessions and transcripts will be preserved.
-        TermuxActivity.this.recreate();
+        if (recreateActivity) {
+            Logger.logDebug(LOG_TAG, "Recreating activity");
+            TermuxActivity.this.recreate();
+        }
     }
 
 
diff --git a/app/src/main/java/com/termux/app/TermuxService.java b/app/src/main/java/com/termux/app/TermuxService.java
index ecde6e38a3..b7443560b7 100644
--- a/app/src/main/java/com/termux/app/TermuxService.java
+++ b/app/src/main/java/com/termux/app/TermuxService.java
@@ -540,7 +540,9 @@ public synchronized TermuxSession createTermuxSession(ExecutionCommand execution
             mTermuxTerminalSessionClient.termuxSessionListNotifyUpdated();
 
         updateNotification();
-        TermuxActivity.updateTermuxActivityStyling(this);
+
+        // No need to recreate the activity since it likely just started and theme should already have applied
+        TermuxActivity.updateTermuxActivityStyling(this, false);
 
         return newTermuxSession;
     }
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
index ca61b0e5c8..f799073b19 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
@@ -8,7 +8,7 @@
 import java.util.List;
 
 /*
- * Version: v0.34.0
+ * Version: v0.35.0
  * SPDX-License-Identifier: MIT
  *
  * Changelog
@@ -214,6 +214,9 @@
  *
  * - 0.34.0 (2021-10-26)
  *  - Move `RESULT_SENDER` to `com.termux.shared.shell.command.ShellCommandConstants`.
+ *
+ * - 0.35.0 (2022-01-28)
+ *  - Add `TERMUX_APP.TERMUX_ACTIVITY.EXTRA_RECREATE_ACTIVITY`.
  */
 
 /**
@@ -864,6 +867,9 @@ public static final class TERMUX_ACTIVITY {
             @Deprecated
             public static final String EXTRA_RELOAD_STYLE = TermuxConstants.TERMUX_PACKAGE_NAME + ".app.reload_style"; // Default: "com.termux.app.reload_style"
 
+            /**  Intent {@code boolean} extra for whether to recreate activity for the TERMUX_ACTIVITY.ACTION_RELOAD_STYLE intent. */
+            public static final String EXTRA_RECREATE_ACTIVITY = TERMUX_APP.TERMUX_ACTIVITY_NAME + ".EXTRA_RECREATE_ACTIVITY"; // Default: "com.termux.app.TermuxActivity.EXTRA_RECREATE_ACTIVITY"
+
         }
 
 

From 95d7a154a480aa6b13b3988e550d081bec301755 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Fri, 28 Jan 2022 04:23:59 +0500
Subject: [PATCH 665/912] Docs: Add notice that termux is broken on Android 12

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index 8b95c1b054..88576ec321 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,10 @@ Quick how-to about Termux package management is available at [Package Management
 
 ***
 
+**NOTICE: Termux is broken on Android 12.** Android OS will kill any (phantom) processes greater than 32 (limit is for all apps combined) and also kill any processes using excessive CPU. You may get `[Process completed (signal 9) - press Enter]` message in the terminal without actually exiting shell process yourself. Check related the issue #2366, [issue tracker](https://issuetracker.google.com/u/1/issues/205156966), [gist with details](https://gist.github.com/agnostic-apollo/dc7e47991c512755ff26bd2d31e72ca8) and [this TLDR comment](https://github.com/termux/termux-app/issues/2366#issuecomment-1009269410) on how to disable trimming of phantom processes. A proper docs page will be added later. An option to disable the killing should be available in Android 12L or 13, so upgrade at your own risk if you are on Android 11, specially if you are not rooted.
+
+***
+
 **@termux is looking for Termux Application maintainers for implementing new features, fixing bugs and reviewing pull requests since the current one (@fornwall) is inactive.**
 
 Issue https://github.com/termux/termux-app/issues/1072 needs extra attention.

From 9b5aad94168769b3fa747fab7eaa75e57f10fa6c Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Fri, 28 Jan 2022 18:06:05 +0500
Subject: [PATCH 666/912] Fixed: Fix AppShell failsafe env

---
 .../com/termux/shared/shell/command/runner/app/AppShell.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/shell/command/runner/app/AppShell.java b/termux-shared/src/main/java/com/termux/shared/shell/command/runner/app/AppShell.java
index 871e9888f8..d740a7e397 100644
--- a/termux-shared/src/main/java/com/termux/shared/shell/command/runner/app/AppShell.java
+++ b/termux-shared/src/main/java/com/termux/shared/shell/command/runner/app/AppShell.java
@@ -74,7 +74,7 @@ public static AppShell execute(@NonNull final Context context, @NonNull Executio
         if (executionCommand.workingDirectory.isEmpty())
             executionCommand.workingDirectory = "/";
 
-        String[] env = shellEnvironmentClient.buildEnvironment(context, false, executionCommand.workingDirectory);
+        String[] env = shellEnvironmentClient.buildEnvironment(context, executionCommand.isFailsafe, executionCommand.workingDirectory);
 
         final String[] commandArray = shellEnvironmentClient.setupProcessArgs(executionCommand.executable, executionCommand.arguments);
 

From 2a1c5a70da4739cf8284f4df7be720f24cafba8c Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 29 Jan 2022 02:39:17 +0500
Subject: [PATCH 667/912] Docs: Fix issue link

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 88576ec321..0d5ce3321a 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ Quick how-to about Termux package management is available at [Package Management
 
 ***
 
-**NOTICE: Termux is broken on Android 12.** Android OS will kill any (phantom) processes greater than 32 (limit is for all apps combined) and also kill any processes using excessive CPU. You may get `[Process completed (signal 9) - press Enter]` message in the terminal without actually exiting shell process yourself. Check related the issue #2366, [issue tracker](https://issuetracker.google.com/u/1/issues/205156966), [gist with details](https://gist.github.com/agnostic-apollo/dc7e47991c512755ff26bd2d31e72ca8) and [this TLDR comment](https://github.com/termux/termux-app/issues/2366#issuecomment-1009269410) on how to disable trimming of phantom processes. A proper docs page will be added later. An option to disable the killing should be available in Android 12L or 13, so upgrade at your own risk if you are on Android 11, specially if you are not rooted.
+**NOTICE: Termux is broken on Android 12.** Android OS will kill any (phantom) processes greater than 32 (limit is for all apps combined) and also kill any processes using excessive CPU. You may get `[Process completed (signal 9) - press Enter]` message in the terminal without actually exiting the shell process yourself. Check the related issue [#2366](https://github.com/termux/termux-app/issues/2366), [issue tracker](https://issuetracker.google.com/u/1/issues/205156966), [gist with details](https://gist.github.com/agnostic-apollo/dc7e47991c512755ff26bd2d31e72ca8) and [this TLDR comment](https://github.com/termux/termux-app/issues/2366#issuecomment-1009269410) on how to disable trimming of phantom processes. A proper docs page will be added later. An option to disable the killing should be available in Android 12L or 13, so upgrade at your own risk if you are on Android 11, specially if you are not rooted.
 
 ***
 

From a56ed5771d9d0d18b4b7b3b24e8027bc3e027880 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 5 Feb 2022 06:22:49 +0500
Subject: [PATCH 668/912] Fixed: Fix terminal sessions being re-added if "New
 Session" shortcut or termux-reload-settings was used

If TermuxActivity was recreated then the original intent was re-delivered, resulting in a new session being re-added each time.

Closes #2566
---
 .../java/com/termux/app/TermuxActivity.java   | 34 +++++++++++++++----
 .../terminal/TermuxTerminalViewClient.java    |  2 +-
 2 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index 5585f7d8c1..b0ae40b429 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -153,6 +153,13 @@ public final class TermuxActivity extends AppCompatActivity implements ServiceCo
      */
     private boolean isOnResumeAfterOnCreate = false;
 
+    /**
+     * If activity was restarted like due to call to {@link #recreate()} after receiving
+     * {@link TERMUX_ACTIVITY#ACTION_RELOAD_STYLE}, system dark night mode was changed or activity
+     * was killed by android.
+     */
+    private boolean mIsActivityRecreated = false;
+
     /**
      * The {@link TermuxActivity} is in an invalid state and must not be run.
      */
@@ -175,6 +182,7 @@ public final class TermuxActivity extends AppCompatActivity implements ServiceCo
     private static final int CONTEXT_MENU_REPORT_ID = 9;
 
     private static final String ARG_TERMINAL_TOOLBAR_TEXT_INPUT = "terminal_toolbar_text_input";
+    private static final String ARG_ACTIVITY_RECREATED = "activity_recreated";
 
     private static final String LOG_TAG = "TermuxActivity";
 
@@ -183,6 +191,9 @@ public void onCreate(Bundle savedInstanceState) {
         Logger.logDebug(LOG_TAG, "onCreate");
         isOnResumeAfterOnCreate = true;
 
+        if (savedInstanceState != null)
+            mIsActivityRecreated = savedInstanceState.getBoolean(ARG_ACTIVITY_RECREATED, false);
+
         // 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);
@@ -339,6 +350,7 @@ public void onSaveInstanceState(@NonNull Bundle savedInstanceState) {
 
         super.onSaveInstanceState(savedInstanceState);
         saveTerminalToolbarTextInput(savedInstanceState);
+        savedInstanceState.putBoolean(ARG_ACTIVITY_RECREATED, true);
     }
 
 
@@ -359,15 +371,17 @@ public void onServiceConnected(ComponentName componentName, IBinder service) {
 
         setTermuxSessionsListView();
 
+        final Intent intent = getIntent();
+        setIntent(null);
+
         if (mTermuxService.isTermuxSessionsEmpty()) {
             if (mIsVisible) {
                 TermuxInstaller.setupBootstrapIfNeeded(TermuxActivity.this, () -> {
                     if (mTermuxService == null) return; // Activity might have been destroyed.
                     try {
-                        Bundle bundle = getIntent().getExtras();
                         boolean launchFailsafe = false;
-                        if (bundle != null) {
-                            launchFailsafe = bundle.getBoolean(TERMUX_ACTIVITY.EXTRA_FAILSAFE_SESSION, false);
+                        if (intent != null && intent.getExtras() != null) {
+                            launchFailsafe = intent.getExtras().getBoolean(TERMUX_ACTIVITY.EXTRA_FAILSAFE_SESSION, false);
                         }
                         mTermuxTerminalSessionClient.addNewSession(launchFailsafe, null);
                     } catch (WindowManager.BadTokenException e) {
@@ -379,10 +393,12 @@ public void onServiceConnected(ComponentName componentName, IBinder service) {
                 finishActivityIfNotFinishing();
             }
         } else {
-            Intent i = getIntent();
-            if (i != null && Intent.ACTION_RUN.equals(i.getAction())) {
+            // If termux was started from launcher "New session" shortcut and activity is recreated,
+            // then the original intent will be re-delivered, resulting in a new session being re-added
+            // each time.
+            if (!mIsActivityRecreated && intent != null && Intent.ACTION_RUN.equals(intent.getAction())) {
                 // Android 7.1 app shortcut from res/xml/shortcuts.xml.
-                boolean isFailSafe = i.getBooleanExtra(TERMUX_ACTIVITY.EXTRA_FAILSAFE_SESSION, false);
+                boolean isFailSafe = intent.getBooleanExtra(TERMUX_ACTIVITY.EXTRA_FAILSAFE_SESSION, false);
                 mTermuxTerminalSessionClient.addNewSession(isFailSafe, null);
             } else {
                 mTermuxTerminalSessionClient.setCurrentSession(mTermuxTerminalSessionClient.getCurrentStoredSessionOrLast());
@@ -541,7 +557,7 @@ private void setToggleKeyboardView() {
         });
 
         findViewById(R.id.toggle_keyboard_button).setOnLongClickListener(v -> {
-            toggleTerminalToolbar();
+            //toggleTerminalToolbar();
             return true;
         });
     }
@@ -808,6 +824,10 @@ public boolean isOnResumeAfterOnCreate() {
         return isOnResumeAfterOnCreate;
     }
 
+    public boolean isActivityRecreated() {
+        return mIsActivityRecreated;
+    }
+
 
 
     public TermuxService getTermuxService() {
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
index 16cfeeb930..745abfa008 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
@@ -105,7 +105,7 @@ public void onStart() {
      */
     public void onResume() {
         // Show the soft keyboard if required
-        setSoftKeyboardState(true, false);
+        setSoftKeyboardState(true, mActivity.isActivityRecreated());
 
         mTerminalCursorBlinkerStateAlreadySet = false;
 

From 622ff4fad4e58713364523e0a2c50ce07a32211f Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 5 Feb 2022 06:26:23 +0500
Subject: [PATCH 669/912] Fixed: Fix issue where a colour tint/highlight would
 be added to the terminal on activity re-creation

The fix in c6b4114f was not working for it.
---
 .../com/termux/app/terminal/TermuxTerminalViewClient.java    | 3 ++-
 app/src/main/res/layout/activity_termux.xml                  | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
index 745abfa008..5bcd7ce0d6 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
@@ -538,7 +538,8 @@ public void setSoftKeyboardState(boolean isStartup, boolean isReloadTermuxProper
         // 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.
+        // theme. For android 8.+, the "defaultFocusHighlightEnabled" attribute is also set to false
+        // in TerminalView layout to fix the issue.
 
         // If soft keyboard is disabled by user for Termux (check function docs for Termux behaviour info)
         if (KeyboardUtils.shouldSoftKeyboardBeDisabled(mActivity,
diff --git a/app/src/main/res/layout/activity_termux.xml b/app/src/main/res/layout/activity_termux.xml
index 4bd61bab35..713e2b2c7e 100644
--- a/app/src/main/res/layout/activity_termux.xml
+++ b/app/src/main/res/layout/activity_termux.xml
@@ -1,5 +1,6 @@
 <com.termux.app.terminal.TermuxActivityRootView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/activity_termux_root_view"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -26,11 +27,13 @@
                 android:id="@+id/terminal_view"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
+                android:defaultFocusHighlightEnabled="false"
                 android:focusableInTouchMode="true"
                 android:scrollbarThumbVertical="@drawable/terminal_scroll_shape"
                 android:scrollbars="vertical"
                 android:importantForAutofill="no"
-                android:autofillHints="password" />
+                android:autofillHints="password"
+                tools:ignore="UnusedAttribute" />
 
             <LinearLayout
                 android:id="@+id/left_drawer"

From b8c3db0b6e950a15c075d974b1d0ef86ce1df08e Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 5 Feb 2022 06:28:22 +0500
Subject: [PATCH 670/912] Fixed: Change extra keys and terminal input view
 background to black

Required for day/night theming and should fix issues where both views were translucent with light terminal color themes.
---
 app/src/main/res/layout/activity_termux.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/layout/activity_termux.xml b/app/src/main/res/layout/activity_termux.xml
index 713e2b2c7e..484990ff24 100644
--- a/app/src/main/res/layout/activity_termux.xml
+++ b/app/src/main/res/layout/activity_termux.xml
@@ -101,7 +101,7 @@
             android:visibility="gone"
             android:layout_width="match_parent"
             android:layout_height="37.5dp"
-            android:background="@android:drawable/screen_background_dark_transparent"
+            android:background="@color/black"
             android:layout_alignParentBottom="true" />
 
     </RelativeLayout>

From 43858dfbb17d35e5c5d6a61e0049373a8c70b698 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 5 Feb 2022 06:30:48 +0500
Subject: [PATCH 671/912] Fixed: Rename TermuxActivity isOnResumeAfterOnCreate
 to mIsOnResumeAfterOnCreate as per variable naming convention

---
 app/src/main/java/com/termux/app/TermuxActivity.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index b0ae40b429..b802d82484 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -151,7 +151,7 @@ public final class TermuxActivity extends AppCompatActivity implements ServiceCo
     /**
      * If onResume() was called after onCreate().
      */
-    private boolean isOnResumeAfterOnCreate = false;
+    private boolean mIsOnResumeAfterOnCreate = false;
 
     /**
      * If activity was restarted like due to call to {@link #recreate()} after receiving
@@ -189,7 +189,7 @@ public final class TermuxActivity extends AppCompatActivity implements ServiceCo
     @Override
     public void onCreate(Bundle savedInstanceState) {
         Logger.logDebug(LOG_TAG, "onCreate");
-        isOnResumeAfterOnCreate = true;
+        mIsOnResumeAfterOnCreate = true;
 
         if (savedInstanceState != null)
             mIsActivityRecreated = savedInstanceState.getBoolean(ARG_ACTIVITY_RECREATED, false);
@@ -298,7 +298,7 @@ public void onResume() {
         if (mTermuxTerminalViewClient != null)
             mTermuxTerminalViewClient.onResume();
 
-        isOnResumeAfterOnCreate = false;
+        mIsOnResumeAfterOnCreate = false;
     }
 
     @Override
@@ -820,8 +820,8 @@ public boolean isVisible() {
         return mIsVisible;
     }
 
-    public boolean isOnResumeAfterOnCreate() {
-        return isOnResumeAfterOnCreate;
+    public boolean ismIsOnResumeAfterOnCreate() {
+        return mIsOnResumeAfterOnCreate;
     }
 
     public boolean isActivityRecreated() {

From c567cc3b926a41554e1730dc7200a678df5c12e6 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 5 Feb 2022 07:19:36 +0500
Subject: [PATCH 672/912] Fixed: Fix app crash if failed to start TermuxService
 while in background due to android bg restrictions

The crash happens due to android 8.0 background restrictions if TermuxActivity is not in foreground/whitelist and attempts to start TermuxService. With this commit, the app will not crash but will just exit with a toast message.

https://developer.android.com/about/versions/oreo/background#services

https://cs.android.com/android/platform/superproject/+/android-12.0.0_r4:frameworks/base/services/core/java/com/android/server/am/ActiveServices.java;l=722

java.lang.RuntimeException: Unable to start activity ComponentInfo{com.termux/com.termux.app.TermuxActivity}: java.lang.IllegalStateException: Not allowed to start service Intent { cmp=com.termux/.app.TermuxService }: app is in background uid UidRecord{533ae62 u0a187 TPSL idle procs:1 seq(0,0,0)}
 at android.app.ActivityThread.performLaunchActivity(ActivityThread.java:2947)
 at android.app.ActivityThread.handleLaunchActivity(ActivityThread.java:3082)
 at android.app.servertransaction.LaunchActivityItem.execute(LaunchActivityItem.java:78)
 at android.app.servertransaction.TransactionExecutor.executeCallbacks(TransactionExecutor.java:108)
 at android.app.servertransaction.TransactionExecutor.execute(TransactionExecutor.java:68)
 at android.app.ActivityThread$H.handleMessage(ActivityThread.java:1832)
 at android.os.Handler.dispatchMessage(Handler.java:106)
 at android.os.Looper.loop(Looper.java:201)
 at android.app.ActivityThread.main(ActivityThread.java:6821)
 at java.lang.reflect.Method.invoke(Native Method)
 at com.android.internal.os.RuntimeInit$MethodAndArgsCaller.run(RuntimeInit.java:547)
 at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:873)
Caused by: java.lang.IllegalStateException: Not allowed to start service Intent { cmp=com.termux/.app.TermuxService }: app is in background uid UidRecord{533ae62 u0a187 TPSL idle procs:1 seq(0,0,0)}
 at android.app.ContextImpl.startServiceCommon(ContextImpl.java:1587)
 at android.app.ContextImpl.startService(ContextImpl.java:1542)
 at android.content.ContextWrapper.startService(ContextWrapper.java:674)
 at com.termux.app.TermuxActivity.onCreate(TermuxActivity.java:242)
 at android.app.Activity.performCreate(Activity.java:7224)
 at android.app.Activity.performCreate(Activity.java:7213)
 at android.app.Instrumentation.callActivityOnCreate(Instrumentation.java:1272)
 at android.app.ActivityThread.performLaunchActivity(ActivityThread.java:2927)
 ... 11 more

Closes #2552
---
 .../java/com/termux/app/TermuxActivity.java   | 26 +++++++++++++------
 app/src/main/res/values/strings.xml           |  2 ++
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index b802d82484..9a24532480 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -248,14 +248,24 @@ public void onCreate(Bundle savedInstanceState) {
 
         registerForContextMenu(mTerminalView);
 
-        // Start the {@link TermuxService} and make it run regardless of who is bound to it
-        Intent serviceIntent = new Intent(this, TermuxService.class);
-        startService(serviceIntent);
-
-        // Attempt to bind to the service, this will call the {@link #onServiceConnected(ComponentName, IBinder)}
-        // callback if it succeeds.
-        if (!bindService(serviceIntent, this, 0))
-            throw new RuntimeException("bindService() failed");
+        try {
+            // Start the {@link TermuxService} and make it run regardless of who is bound to it
+            Intent serviceIntent = new Intent(this, TermuxService.class);
+            startService(serviceIntent);
+
+            // Attempt to bind to the service, this will call the {@link #onServiceConnected(ComponentName, IBinder)}
+            // callback if it succeeds.
+            if (!bindService(serviceIntent, this, 0))
+                throw new RuntimeException("bindService() failed");
+        } catch (Exception e) {
+            Logger.logStackTraceWithMessage(LOG_TAG,"TermuxActivity failed to start TermuxService", e);
+            Logger.showToast(this,
+                getString(e.getMessage() != null && e.getMessage().contains("app is in background") ?
+                    R.string.error_termux_service_start_failed_bg : R.string.error_termux_service_start_failed_general),
+                true);
+            mIsInvalidState = true;
+            return;
+        }
 
         // Send the {@link TermuxConstants#BROADCAST_TERMUX_OPENED} broadcast to notify apps that Termux
         // app has been opened.
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d5335bf0cb..5f23f4bbe1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -118,6 +118,8 @@
     <!-- 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>
+    <string name="error_termux_service_start_failed_general">Failed to start TermuxService. Check logcat for exception message.</string>
+    <string name="error_termux_service_start_failed_bg">Failed to start TermuxService while app is in background due to android bg restrictions.</string>
 
 
 

From f33758c7c05bede95e15fc9a7cc225b21d072113 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 5 Feb 2022 07:25:01 +0500
Subject: [PATCH 673/912] Fixed: Fix typo from 43858dfb

---
 app/src/main/java/com/termux/app/TermuxActivity.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index 9a24532480..1d756e18bf 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -830,7 +830,7 @@ public boolean isVisible() {
         return mIsVisible;
     }
 
-    public boolean ismIsOnResumeAfterOnCreate() {
+    public boolean isIsOnResumeAfterOnCreate() {
         return mIsOnResumeAfterOnCreate;
     }
 

From f8e7ada143bcec12424b17f9ffa87d5c7dcb4aa8 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 5 Feb 2022 07:28:43 +0500
Subject: [PATCH 674/912] Fixed: Fix typo from 43858dfb

---
 app/src/main/java/com/termux/app/TermuxActivity.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index 1d756e18bf..afcb668992 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -830,7 +830,7 @@ public boolean isVisible() {
         return mIsVisible;
     }
 
-    public boolean isIsOnResumeAfterOnCreate() {
+    public boolean isOnResumeAfterOnCreate() {
         return mIsOnResumeAfterOnCreate;
     }
 

From a01ff018b3c105d1c971ec312985a90239016451 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Tue, 8 Feb 2022 23:31:20 +0500
Subject: [PATCH 675/912] Docs: Update matrix invite links

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 0d5ce3321a..604f24bee5 100644
--- a/README.md
+++ b/README.md
@@ -148,8 +148,8 @@ All community links are available [here](https://wiki.termux.com/wiki/Community)
 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 User Matrix Channel](https://matrix.to/#/#termux_termux:gitter.im) ([Gitter](https://gitter.im/termux/termux))
+- [Termux Dev Matrix Channel](https://matrix.to/#/#termux_dev:gitter.im) ([Gitter](https://gitter.im/termux/dev))
 - [Termux Twitter](https://twitter.com/termux/)
 - [Termux Reports Email](mailto:termuxreports@groups.io)
 

From 280e28448858d421da5be781bce79535b226d285 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Tue, 8 Feb 2022 23:33:46 +0500
Subject: [PATCH 676/912] Docs: Add building bootstrap link

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 604f24bee5..8459e68790 100644
--- a/README.md
+++ b/README.md
@@ -257,6 +257,6 @@ The `versionName` in `build.gradle` files of Termux and its plugin apps must fol
 ## 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.
+- You also need to recompile bootstrap zip for the new package name. Check [building bootstrap](https://github.com/termux/termux-packages/wiki/For-maintainers#build-bootstrap-archives), [here](https://github.com/termux/termux-app/issues/1983) and [here](https://github.com/termux/termux-app/issues/2081#issuecomment-865280111).
 - 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.

From 68cdbd6ff46bda5673d4ebd72ca4c2d60e25b119 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sun, 13 Feb 2022 00:31:56 +0500
Subject: [PATCH 677/912] Added: Add support for getting feature flag values
 and show MONITOR_PHANTOM_PROCS value in about page

MONITOR_PHANTOM_PROCS will only be shown in Android 12+ devices and will be marked "<unsupported>" if its not supported in current android build. It will show in Termux Settings->About->Device Info->Software and in reports. Flag is available on Pixel Android 12L beta 3 and Android 13. Check FeatureFlagUtils for more details.

Getting supported feature flags and their values is done through reflection on android "android.util.FeatureFlagUtils" class and requires bypassing android hidden API restrictions.

Related issue #2366
https://issuetracker.google.com/u/1/issues/205156966#comment27
---
 .../termux/shared/android/AndroidUtils.java   |   4 +
 .../shared/android/FeatureFlagUtils.java      | 181 ++++++++++++++++++
 2 files changed, 185 insertions(+)
 create mode 100644 termux-shared/src/main/java/com/termux/shared/android/FeatureFlagUtils.java

diff --git a/termux-shared/src/main/java/com/termux/shared/android/AndroidUtils.java b/termux-shared/src/main/java/com/termux/shared/android/AndroidUtils.java
index 6f2cadd185..766ea34ef9 100644
--- a/termux-shared/src/main/java/com/termux/shared/android/AndroidUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/android/AndroidUtils.java
@@ -120,6 +120,10 @@ public static String getDeviceInfoMarkdownString(@NonNull final Context context)
         appendPropertyToMarkdown(markdownString, "TYPE", Build.TYPE);
         appendPropertyToMarkdown(markdownString, "TAGS", Build.TAGS);
 
+        // If on Android >= 12
+        if (Build.VERSION.SDK_INT > Build.VERSION_CODES.R)
+            appendPropertyToMarkdown(markdownString, "MONITOR_PHANTOM_PROCS", FeatureFlagUtils.getFeatureFlagValueString(context, FeatureFlagUtils.SETTINGS_ENABLE_MONITOR_PHANTOM_PROCS).getName());
+
         markdownString.append("\n\n### Hardware\n");
         appendPropertyToMarkdown(markdownString, "MANUFACTURER", Build.MANUFACTURER);
         appendPropertyToMarkdown(markdownString, "BRAND", Build.BRAND);
diff --git a/termux-shared/src/main/java/com/termux/shared/android/FeatureFlagUtils.java b/termux-shared/src/main/java/com/termux/shared/android/FeatureFlagUtils.java
new file mode 100644
index 0000000000..42c1b8017a
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/android/FeatureFlagUtils.java
@@ -0,0 +1,181 @@
+package com.termux.shared.android;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.termux.shared.logger.Logger;
+import com.termux.shared.reflection.ReflectionUtils;
+
+import java.lang.reflect.Method;
+import java.util.Map;
+
+/**
+ * Utils for Developer Options -> Feature Flags. The page won't show in user/production builds and
+ * is only shown in userdebug builds.
+ * https://cs.android.com/android/_/android/platform/frameworks/base/+/09dcdad5ebc159861920f090e07da60fac71ac0a:core/java/android/util/FeatureFlagUtils.java
+ * https://cs.android.com/android/platform/superproject/+/android-12.0.0_r31:packages/apps/Settings/src/com/android/settings/development/featureflags/FeatureFlagsPreferenceController.java;l=42
+ *
+ * The feature flags value can be modified in two ways.
+ *
+ * 1. sysprops with `setprop` command with root. Will be unset by default.
+ *  Set value: `setprop persist.sys.fflag.override.settings_enable_monitor_phantom_procs false`
+ *  Get value: `getprop persist.sys.fflag.override.settings_enable_monitor_phantom_procs`
+ *  Unset value: `setprop persist.sys.fflag.override.settings_enable_monitor_phantom_procs ""`
+ * Running `setprop` command requires root and even adb `shell` user cannot modify the values
+ * since selinux will not allow it by default. Some props like `settings_dynamic_system` can be
+ * set since they are exempted for `shell` in sepolicy.
+ *
+ * init: Unable to set property 'persist.sys.fflag.override.settings_enable_monitor_phantom_procs' from uid:2000 gid:2000 pid:9576: SELinux permission check failed
+ * [ 1034.877067] type=1107 audit(1644436809.637:34): uid=0 auid=4294967295 ses=4294967295 subj=u:r:init:s0 msg='avc: denied { set } for property=persist.sys.fflag.override.settings_enable_monitor_phantom_procs pid=9576 uid=2000 gid=2000 scontext=u:r:shell:s0 tcontext=u:object_r:system_prop:s0 tclass=property_service permissive=0'
+ *
+ * https://cs.android.com/android/platform/superproject/+/android-12.0.0_r4:system/sepolicy/private/property_contexts;l=71
+ * https://cs.android.com/android/platform/superproject/+/android-12.0.0_r4:system/sepolicy/private/shell.te;l=149
+ *
+ * 2. settings global list with adb or root. Will be unset by default. This takes precedence over
+ * sysprop value since `FeatureFlagUtils.isEnabled()`
+ * checks its value first. Override precedence: Settings.Global -> sys.fflag.override.* -> static list.
+ * Set value: `adb shell settings put global settings_enable_monitor_phantom_procs false`
+ * Get value: adb shell settings get global settings_enable_monitor_phantom_procs`
+ * Unset value: `adb shell settings delete global settings_enable_monitor_phantom_procs`
+ *
+ * https://cs.android.com/android/_/android/platform/frameworks/base/+/refs/tags/android-12.0.0_r31:core/java/android/util/FeatureFlagUtils.java;l=113
+ *
+ * The feature flag values can be modified in user builds with settings global list, but since the
+ * developer options feature flags page is not shown and considering that getprop values for features
+ * will be unset by default and settings global list will not be set either and there is no shell API,
+ * it will require an android app process to check if feature is supported on a device and what its
+ * default value is with reflection after bypassing hidden api restrictions since {@link #FEATURE_FLAGS_CLASS}
+ * is annotated as `@hide`.
+ */
+public class FeatureFlagUtils {
+
+    public enum FeatureFlagValue {
+
+        /** Unknown like due to exception raised while getting value. */
+        UNKNOWN("<unknown>"),
+
+        /** Flag is unsupported on current android build. */
+        UNSUPPORTED("<unsupported>"),
+
+        /** Flag is enabled. */
+        TRUE("true"),
+
+        /** Flag is not enabled. */
+        FALSE("false");
+
+        private final String name;
+
+        FeatureFlagValue(final String name) {
+            this.name = name;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+    }
+
+    public static final String FEATURE_FLAGS_CLASS = "android.util.FeatureFlagUtils";
+
+    /**
+     * If set to false, then will disable trimming of phantom process and processes using excessive
+     * CPU. Flag is available on Pixel Android 12L beta 3 and Android 13. Availability on other
+     * devices will depend on if other vendors merged the 09dcdad5 commit or not in their releases
+     * and if they actually want to support the flag.
+     *
+     * https://github.com/termux/termux-app/issues/2366
+     * https://issuetracker.google.com/u/1/issues/205156966#comment28
+     * https://cs.android.com/android/_/android/platform/frameworks/base/+/09dcdad5
+     * https://github.com/agnostic-apollo/Android-Docs/tree/master/ocs/apps/processes/phantom-cached-and-empty-processes.md
+     */
+    public static final String SETTINGS_ENABLE_MONITOR_PHANTOM_PROCS = "settings_enable_monitor_phantom_procs";
+
+    private static final String LOG_TAG = "FeatureFlagUtils";
+
+    /**
+     * Get all feature flags in their raw form.
+     */
+    @SuppressWarnings("unchecked")
+    public static Map<String, String> getAllFeatureFlags() {
+        ReflectionUtils.bypassHiddenAPIReflectionRestrictions();
+        try {
+            @SuppressLint("PrivateApi") Class<?> clazz = Class.forName(FEATURE_FLAGS_CLASS);
+            Method getAllFeatureFlagsMethod = ReflectionUtils.getDeclaredMethod(clazz, "getAllFeatureFlags");
+            if (getAllFeatureFlagsMethod == null) return null;
+            return (Map<String, String>) ReflectionUtils.invokeMethod(getAllFeatureFlagsMethod, null).value;
+        } catch (Exception e) {
+            // ClassCastException may be thrown
+            Logger.logStackTraceWithMessage(LOG_TAG, "Failed to get all feature flags", e);
+            return null;
+        }
+    }
+
+    /**
+     * Check if a feature flag exists.
+     *
+     * @return Returns {@code true} if flag exists, otherwise {@code false}. This will be
+     * {@code null} if an exception is raised.
+     */
+    @Nullable
+    public static Boolean featureFlagExists(@NonNull String feature) {
+        Map<String, String> featureFlags = getAllFeatureFlags();
+        if (featureFlags == null) return null;
+        return featureFlags.containsKey(feature);
+    }
+
+    /**
+     * Get {@link FeatureFlagValue} for a feature.
+     *
+     * @param context The {@link Context} for operations.
+     * @param feature The {@link String} name for feature.
+     * @return Returns {@link FeatureFlagValue}.
+     */
+    public static FeatureFlagValue getFeatureFlagValueString(@NonNull Context context, @NonNull String feature) {
+        Boolean featureFlagExists = featureFlagExists(feature);
+        if (featureFlagExists == null) {
+            Logger.logError(LOG_TAG, "Failed to get feature flags \"" + feature + "\" value");
+            return FeatureFlagValue.UNKNOWN;
+        } else if (!featureFlagExists) {
+            return FeatureFlagValue.UNSUPPORTED;
+        }
+
+        Boolean featureFlagValue = isFeatureEnabled(context, feature);
+        if (featureFlagValue == null) {
+            Logger.logError(LOG_TAG, "Failed to get feature flags \"" + feature + "\" value");
+            return FeatureFlagValue.UNKNOWN;
+        } else {
+            return featureFlagValue ? FeatureFlagValue.TRUE : FeatureFlagValue.FALSE;
+        }
+    }
+
+    /**
+     * Check if a feature flag exists.
+     *
+     * @param context The {@link Context} for operations.
+     * @param feature The {@link String} name for feature.
+     * @return Returns {@code true} if flag exists, otherwise {@code false}. This will be
+     * {@code null} if an exception is raised.
+     */
+    @Nullable
+    public static Boolean isFeatureEnabled(@NonNull Context context, @NonNull String feature) {
+        ReflectionUtils.bypassHiddenAPIReflectionRestrictions();
+        try {
+            @SuppressLint("PrivateApi") Class<?> clazz = Class.forName(FEATURE_FLAGS_CLASS);
+            Method isFeatureEnabledMethod = ReflectionUtils.getDeclaredMethod(clazz, "isEnabled", Context.class, String.class);
+            if (isFeatureEnabledMethod == null) {
+                Logger.logError(LOG_TAG, "Failed to check if feature flag \"" + feature + "\" is enabled");
+                return null;
+            }
+
+            return (boolean) ReflectionUtils.invokeMethod(isFeatureEnabledMethod, null, context, feature).value;
+        } catch (Exception e) {
+            // ClassCastException may be thrown
+            Logger.logStackTraceWithMessage(LOG_TAG, "Failed to check if feature flag \"" + feature + "\" is enabled", e);
+            return null;
+        }
+    }
+
+}

From 270e41fae51fc41e8dd043376339aa5a2da723cc Mon Sep 17 00:00:00 2001
From: Nickoriginal <nnikitovic694@gmail.com>
Date: Wed, 23 Feb 2022 11:10:58 +0200
Subject: [PATCH 678/912] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 8459e68790..046c17c622 100644
--- a/README.md
+++ b/README.md
@@ -120,7 +120,7 @@ If you plan on staying on Play Store sources in future as well, then you may wan
 
 - 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.
+- 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 shutdown](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>
 
 ##

From 6d944b5f7fc07339e5c864badae8ab7c99abef4a Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 9 Mar 2022 21:52:52 +0500
Subject: [PATCH 679/912] Changed: Use application context for SharedProperties

---
 .../com/termux/shared/settings/properties/SharedProperties.java | 2 +-
 .../termux/settings/properties/TermuxSharedProperties.java      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/settings/properties/SharedProperties.java b/termux-shared/src/main/java/com/termux/shared/settings/properties/SharedProperties.java
index 99d7dea5e6..0dee047037 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/properties/SharedProperties.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/properties/SharedProperties.java
@@ -91,7 +91,7 @@ public class SharedProperties {
      * @param sharedPropertiesParser The implementation of the {@link SharedPropertiesParser} interface.
      */
     public SharedProperties(@NonNull Context context, @Nullable File propertiesFile, Set<String> propertiesList, @NonNull SharedPropertiesParser sharedPropertiesParser) {
-        mContext = context;
+        mContext = context.getApplicationContext();
         mPropertiesFile = propertiesFile;
         mPropertiesList = propertiesList;
         mSharedPropertiesParser = sharedPropertiesParser;
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxSharedProperties.java b/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxSharedProperties.java
index f46de32cd0..bf1ac1e8eb 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxSharedProperties.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxSharedProperties.java
@@ -26,7 +26,7 @@ public abstract class TermuxSharedProperties {
 
     public TermuxSharedProperties(@NonNull Context context, @NonNull String label, File propertiesFile,
                                   @NonNull Set<String> propertiesList, @NonNull SharedPropertiesParser sharedPropertiesParser) {
-        mContext = context;
+        mContext = context.getApplicationContext();
         mLabel = label;
         mPropertiesFile = propertiesFile;
         mSharedProperties = new SharedProperties(context, mPropertiesFile, propertiesList, sharedPropertiesParser);

From 05283bd7745ee789b5468186a8d47e6c7700af6b Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 10 Mar 2022 02:26:59 +0500
Subject: [PATCH 680/912] Changed: Load termux.properties into a single static
 app wide TermuxAppSharedProperties class

The `TermuxAppSharedProperties.properties` will exist in `termux-shared` library and only the single static instance will be reloaded whenever needed, instead of different activities and services maintaining their own instances. The classes in `termux-shared` library will also get access to the properties for their own needs.

The night mode set in `TermuxApplication` and terminal rows set in `TermuxService` will no longer require loading props from disk.

Updating `allow-external-apps` value will now require restarting termux or running `termux-reload-settings` since value will no longer be loaded from disk every time.
---
 .../java/com/termux/app/TermuxActivity.java   |  47 ++++---
 .../com/termux/app/TermuxApplication.java     |   8 +-
 .../java/com/termux/app/TermuxService.java    |  29 ++---
 .../properties/TermuxAppSharedProperties.java | 116 ------------------
 .../terminal/TermuxTerminalSessionClient.java |   2 +-
 .../terminal/TermuxTerminalViewClient.java    |  38 +++++-
 .../terminal/io/TerminalToolbarViewPager.java |   5 +-
 .../terminal/io/TermuxTerminalExtraKeys.java  |  61 ++++++++-
 .../com/termux/app/utils/PluginUtils.java     |   8 +-
 .../properties/TermuxAppSharedProperties.java |  42 +++++++
 .../properties/TermuxPropertyConstants.java   |   2 +-
 .../properties/TermuxSharedProperties.java    |   4 +
 12 files changed, 200 insertions(+), 162 deletions(-)
 delete mode 100644 app/src/main/java/com/termux/app/settings/properties/TermuxAppSharedProperties.java
 create mode 100644 termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxAppSharedProperties.java

diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index afcb668992..af85b92ff1 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -30,6 +30,7 @@
 
 import com.termux.R;
 import com.termux.app.terminal.TermuxActivityRootView;
+import com.termux.app.terminal.io.TermuxTerminalExtraKeys;
 import com.termux.shared.activities.ReportActivity;
 import com.termux.shared.activity.ActivityUtils;
 import com.termux.shared.activity.media.AppCompatActivityUtils;
@@ -45,10 +46,10 @@
 import com.termux.app.terminal.TermuxTerminalSessionClient;
 import com.termux.app.terminal.TermuxTerminalViewClient;
 import com.termux.shared.termux.extrakeys.ExtraKeysView;
-import com.termux.app.settings.properties.TermuxAppSharedProperties;
 import com.termux.shared.termux.interact.TextInputDialogUtils;
 import com.termux.shared.logger.Logger;
 import com.termux.shared.termux.TermuxUtils;
+import com.termux.shared.termux.settings.properties.TermuxAppSharedProperties;
 import com.termux.shared.termux.theme.TermuxThemeUtils;
 import com.termux.shared.theme.NightMode;
 import com.termux.shared.view.ViewUtils;
@@ -108,7 +109,7 @@ public final class TermuxActivity extends AppCompatActivity implements ServiceCo
     private TermuxAppSharedPreferences mPreferences;
 
     /**
-     * Termux app shared properties manager, loaded from termux.properties
+     * Termux app SharedProperties loaded from termux.properties
      */
     private TermuxAppSharedProperties mProperties;
 
@@ -127,6 +128,11 @@ public final class TermuxActivity extends AppCompatActivity implements ServiceCo
      */
     ExtraKeysView mExtraKeysView;
 
+    /**
+     * The client for the {@link #mExtraKeysView}.
+     */
+    TermuxTerminalExtraKeys mTermuxTerminalExtraKeys;
+
     /**
      * The termux sessions list controller.
      */
@@ -201,8 +207,9 @@ public void onCreate(Bundle savedInstanceState) {
         // Delete ReportInfo serialized object files from cache older than 14 days
         ReportActivity.deleteReportInfoFilesOlderThanXDays(this, 14, false);
 
-        // Load termux shared properties
-        mProperties = new TermuxAppSharedProperties(this);
+        // Load Termux app SharedProperties from disk
+        mProperties = TermuxAppSharedProperties.getProperties();
+        reloadProperties();
 
         setActivityTheme();
 
@@ -374,7 +381,6 @@ public void onSaveInstanceState(@NonNull Bundle savedInstanceState) {
      */
     @Override
     public void onServiceConnected(ComponentName componentName, IBinder service) {
-
         Logger.logDebug(LOG_TAG, "onServiceConnected");
 
         mTermuxService = ((TermuxService.LocalBinder) service).service;
@@ -421,7 +427,6 @@ public void onServiceConnected(ComponentName componentName, IBinder service) {
 
     @Override
     public void onServiceDisconnected(ComponentName name) {
-
         Logger.logDebug(LOG_TAG, "onServiceDisconnected");
 
         // Respect being stopped from the {@link TermuxService} notification action.
@@ -432,6 +437,16 @@ public void onServiceDisconnected(ComponentName name) {
 
 
 
+
+    private void reloadProperties() {
+        mProperties.loadTermuxPropertiesFromDisk();
+
+        if (mTermuxTerminalViewClient != null)
+            mTermuxTerminalViewClient.onReloadProperties();
+    }
+
+
+
     private void setActivityTheme() {
         // Update NightMode.APP_NIGHT_MODE
         TermuxThemeUtils.setAppNightMode(mProperties.getNightMode());
@@ -489,6 +504,9 @@ private void setTermuxSessionsListView() {
 
 
     private void setTerminalToolbarView(Bundle savedInstanceState) {
+        mTermuxTerminalExtraKeys = new TermuxTerminalExtraKeys(this, mTerminalView,
+            mTermuxTerminalViewClient, mTermuxTerminalSessionClient);
+
         final ViewPager terminalToolbarViewPager = getTerminalToolbarViewPager();
         if (mPreferences.shouldShowTerminalToolbar()) terminalToolbarViewPager.setVisibility(View.VISIBLE);
 
@@ -511,7 +529,7 @@ private void setTerminalToolbarHeight() {
 
         ViewGroup.LayoutParams layoutParams = terminalToolbarViewPager.getLayoutParams();
         layoutParams.height = (int) Math.round(mTerminalToolbarDefaultHeight *
-            (mProperties.getExtraKeysInfo() == null ? 0 : mProperties.getExtraKeysInfo().getMatrix().length) *
+            (mTermuxTerminalExtraKeys.getExtraKeysInfo() == null ? 0 : mTermuxTerminalExtraKeys.getExtraKeysInfo().getMatrix().length) *
             mProperties.getTerminalToolbarHeightScaleFactor());
         terminalToolbarViewPager.setLayoutParams(layoutParams);
     }
@@ -800,6 +818,10 @@ public ExtraKeysView getExtraKeysView() {
         return mExtraKeysView;
     }
 
+    public TermuxTerminalExtraKeys getTermuxTerminalExtraKeys() {
+        return mTermuxTerminalExtraKeys;
+    }
+
     public void setExtraKeysView(ExtraKeysView extraKeysView) {
         mExtraKeysView = extraKeysView;
     }
@@ -929,11 +951,11 @@ public void onReceive(Context context, Intent intent) {
 
     private void reloadActivityStyling(boolean recreateActivity) {
         if (mProperties != null) {
-            mProperties.loadTermuxPropertiesFromDisk();
+            reloadProperties();
 
             if (mExtraKeysView != null) {
                 mExtraKeysView.setButtonTextAllCaps(mProperties.shouldExtraKeysTextBeAllCaps());
-                mExtraKeysView.reload(mProperties.getExtraKeysInfo());
+                mExtraKeysView.reload(mTermuxTerminalExtraKeys.getExtraKeysInfo());
             }
 
             // Update NightMode.APP_NIGHT_MODE
@@ -944,13 +966,10 @@ private void reloadActivityStyling(boolean recreateActivity) {
         setTerminalToolbarHeight();
 
         if (mTermuxTerminalSessionClient != null)
-            mTermuxTerminalSessionClient.onReload();
+            mTermuxTerminalSessionClient.onReloadActivityStyling();
 
         if (mTermuxTerminalViewClient != null)
-            mTermuxTerminalViewClient.onReload();
-
-        if (mTermuxService != null)
-            mTermuxService.setTerminalTranscriptRows();
+            mTermuxTerminalViewClient.onReloadActivityStyling();
 
         // To change the activity and drawer theme, activity needs to be recreated.
         // It will destroy the activity, including all stored variables and views, and onCreate()
diff --git a/app/src/main/java/com/termux/app/TermuxApplication.java b/app/src/main/java/com/termux/app/TermuxApplication.java
index 994168acad..3d438f71d0 100644
--- a/app/src/main/java/com/termux/app/TermuxApplication.java
+++ b/app/src/main/java/com/termux/app/TermuxApplication.java
@@ -7,10 +7,12 @@
 import com.termux.shared.termux.crash.TermuxCrashUtils;
 import com.termux.shared.termux.settings.preferences.TermuxAppSharedPreferences;
 import com.termux.shared.logger.Logger;
+import com.termux.shared.termux.settings.properties.TermuxAppSharedProperties;
 import com.termux.shared.termux.theme.TermuxThemeUtils;
 
 
 public class TermuxApplication extends Application {
+
     public void onCreate() {
         super.onCreate();
 
@@ -24,8 +26,11 @@ public void onCreate() {
 
         Logger.logDebug("Starting Application");
 
+        // Init app wide SharedProperties loaded from termux.properties
+        TermuxAppSharedProperties properties = TermuxAppSharedProperties.init(context);
+
         // Set NightMode.APP_NIGHT_MODE
-        TermuxThemeUtils.setAppNightMode(context);
+        TermuxThemeUtils.setAppNightMode(properties.getNightMode());
     }
 
     public static void setLogConfig(Context context) {
@@ -36,5 +41,6 @@ public static void setLogConfig(Context context) {
         if (preferences == null) return;
         preferences.setLogLevel(null, preferences.getLogLevel());
     }
+
 }
 
diff --git a/app/src/main/java/com/termux/app/TermuxService.java b/app/src/main/java/com/termux/app/TermuxService.java
index b7443560b7..a04d49a160 100644
--- a/app/src/main/java/com/termux/app/TermuxService.java
+++ b/app/src/main/java/com/termux/app/TermuxService.java
@@ -19,7 +19,6 @@
 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;
@@ -27,6 +26,7 @@
 import com.termux.shared.errors.Errno;
 import com.termux.shared.shell.ShellUtils;
 import com.termux.shared.shell.command.runner.app.AppShell;
+import com.termux.shared.termux.settings.properties.TermuxAppSharedProperties;
 import com.termux.shared.termux.shell.TermuxShellEnvironmentClient;
 import com.termux.shared.termux.shell.TermuxShellUtils;
 import com.termux.shared.termux.TermuxConstants;
@@ -102,6 +102,11 @@ class LocalBinder extends Binder {
      */
     final TermuxTerminalSessionClientBase mTermuxTerminalSessionClientBase = new TermuxTerminalSessionClientBase();
 
+    /**
+     * Termux app shared properties manager, loaded from termux.properties
+     */
+    private TermuxAppSharedProperties mProperties;
+
     /** The wake lock and wifi lock are always acquired and released together. */
     private PowerManager.WakeLock mWakeLock;
     private WifiManager.WifiLock mWifiLock;
@@ -109,13 +114,16 @@ class LocalBinder extends Binder {
     /** 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");
+
+        // Get Termux app SharedProperties without loading from disk since TermuxApplication handles
+        // load and TermuxActivity handles reloads
+        mProperties = TermuxAppSharedProperties.getProperties();
+
         runStartForeground();
     }
 
@@ -515,7 +523,7 @@ public synchronized TermuxSession createTermuxSession(ExecutionCommand execution
         // 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();
+        executionCommand.terminalTranscriptRows = mProperties.getTerminalTranscriptRows();
         TermuxSession newTermuxSession = TermuxSession.execute(this, executionCommand, getTermuxTerminalSessionClient(), this, new TermuxShellEnvironmentClient(), sessionName, executionCommand.isPluginExecutionCommand);
         if (newTermuxSession == null) {
             Logger.logError(LOG_TAG, "Failed to execute new TermuxSession command for:\n" + executionCommand.getCommandIdAndLabelLogString());
@@ -580,19 +588,6 @@ public void onTermuxSessionExited(final TermuxSession termuxSession) {
         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);
-    }
-
 
 
 
diff --git a/app/src/main/java/com/termux/app/settings/properties/TermuxAppSharedProperties.java b/app/src/main/java/com/termux/app/settings/properties/TermuxAppSharedProperties.java
deleted file mode 100644
index 737fdcf79f..0000000000
--- a/app/src/main/java/com/termux/app/settings/properties/TermuxAppSharedProperties.java
+++ /dev/null
@@ -1,116 +0,0 @@
-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.termux.extrakeys.ExtraKeysConstants;
-import com.termux.shared.termux.extrakeys.ExtraKeysConstants.EXTRA_KEY_DISPLAY_MAPS;
-import com.termux.shared.termux.extrakeys.ExtraKeysInfo;
-import com.termux.shared.logger.Logger;
-import com.termux.shared.termux.settings.properties.TermuxPropertyConstants;
-import com.termux.shared.termux.settings.properties.TermuxSharedProperties;
-import com.termux.shared.termux.TermuxConstants;
-
-import org.json.JSONException;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-public class TermuxAppSharedProperties extends TermuxSharedProperties {
-
-    private ExtraKeysInfo mExtraKeysInfo;
-    private List<KeyboardShortcut> mSessionShortcuts;
-
-    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());
-    }
-
-    /**
-     * Reload the termux properties from disk into an in-memory cache.
-     */
-    @Override
-    public void loadTermuxPropertiesFromDisk() {
-        super.loadTermuxPropertiesFromDisk();
-
-        setExtraKeys();
-        setSessionShortcuts();
-    }
-
-    /**
-     * Set the terminal extra keys and style.
-     */
-    private void setExtraKeys() {
-        mExtraKeysInfo = null;
-
-        try {
-            // The mMap stores the extra key and style string values while loading properties
-            // Check {@link #getExtraKeysInternalPropertyValueFromValue(String)} and
-            // {@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);
-        } 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);
-            } catch (JSONException e2) {
-                Logger.showToast(mContext, "Can't create default extra keys",true);
-                Logger.logStackTraceWithMessage(LOG_TAG, "Could create default extra keys: ", e);
-                mExtraKeysInfo = null;
-            }
-        }
-    }
-
-    /**
-     * Set the terminal sessions shortcuts.
-     */
-    private void setSessionShortcuts() {
-        mSessionShortcuts = new ArrayList<>();
-
-        // The {@link TermuxPropertyConstants#MAP_SESSION_SHORTCUTS} stores the session shortcut key and action pair
-        for (Map.Entry<String, Integer> entry : TermuxPropertyConstants.MAP_SESSION_SHORTCUTS.entrySet()) {
-            // The mMap stores the code points for the session shortcuts while loading properties
-            Integer codePoint = (Integer) getInternalPropertyValue(entry.getKey(), true);
-            // If codePoint is null, then session shortcut did not exist in properties or was invalid
-            // as parsed by {@link #getCodePointForSessionShortcuts(String,String)}
-            // If codePoint is not null, then get the action for the MAP_SESSION_SHORTCUTS key and
-            // add the code point to sessionShortcuts
-            if (codePoint != null)
-                mSessionShortcuts.add(new KeyboardShortcut(codePoint, entry.getValue()));
-        }
-    }
-
-    public List<KeyboardShortcut> getSessionShortcuts() {
-        return mSessionShortcuts;
-    }
-
-    public ExtraKeysInfo getExtraKeysInfo() {
-        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.getTermuxInternalPropertyValue(context,
-            TermuxPropertyConstants.KEY_TERMINAL_TRANSCRIPT_ROWS);
-    }
-
-}
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java
index c54c387021..e15b6e7d8d 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java
@@ -103,7 +103,7 @@ public void onStop() {
     /**
      * Should be called when mActivity.reloadActivityStyling() is called
      */
-    public void onReload() {
+    public void onReloadActivityStyling() {
         // Set terminal fonts and colors
         checkForFontAndColors();
     }
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
index 5bcd7ce0d6..1d293ca12a 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
@@ -44,10 +44,12 @@
 import com.termux.terminal.TerminalEmulator;
 import com.termux.terminal.TerminalSession;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Map;
 
 import androidx.drawerlayout.widget.DrawerLayout;
 
@@ -67,6 +69,8 @@ public class TermuxTerminalViewClient extends TermuxTerminalViewClientBase {
 
     private boolean mTerminalCursorBlinkerStateAlreadySet;
 
+    private List<KeyboardShortcut> mSessionShortcuts;
+
     private static final String LOG_TAG = "TermuxTerminalViewClient";
 
     public TermuxTerminalViewClient(TermuxActivity activity, TermuxTerminalSessionClient termuxTerminalSessionClient) {
@@ -82,6 +86,8 @@ public TermuxActivity getActivity() {
      * Should be called when mActivity.onCreate() is called
      */
     public void onCreate() {
+        onReloadProperties();
+
         mActivity.getTerminalView().setTextSize(mActivity.getPreferences().getFontSize());
         mActivity.getTerminalView().setKeepScreenOn(mActivity.getPreferences().shouldKeepScreenOn());
     }
@@ -127,10 +133,17 @@ public void onStop() {
         setTerminalCursorBlinkerState(false);
     }
 
+    /**
+     * Should be called when mActivity.reloadProperties() is called
+     */
+    public void onReloadProperties() {
+        setSessionShortcuts();
+    }
+
     /**
      * Should be called when mActivity.reloadActivityStyling() is called
      */
-    public void onReload() {
+    public void onReloadActivityStyling() {
         // Show the soft keyboard if required
         setSoftKeyboardState(false, true);
 
@@ -452,7 +465,7 @@ public boolean onCodePoint(final int codePoint, boolean ctrlDown, TerminalSessio
                 return true;
             }
 
-            List<KeyboardShortcut> shortcuts = mActivity.getProperties().getSessionShortcuts();
+            List<KeyboardShortcut> shortcuts = mSessionShortcuts;
             if (shortcuts != null && !shortcuts.isEmpty()) {
                 int codePointLowerCase = Character.toLowerCase(codePoint);
                 for (int i = shortcuts.size() - 1; i >= 0; i--) {
@@ -480,6 +493,27 @@ public boolean onCodePoint(final int codePoint, boolean ctrlDown, TerminalSessio
         return false;
     }
 
+    /**
+     * Set the terminal sessions shortcuts.
+     */
+    private void setSessionShortcuts() {
+        mSessionShortcuts = new ArrayList<>();
+
+        // The {@link TermuxPropertyConstants#MAP_SESSION_SHORTCUTS} stores the session shortcut key and action pair
+        for (Map.Entry<String, Integer> entry : TermuxPropertyConstants.MAP_SESSION_SHORTCUTS.entrySet()) {
+            // The mMap stores the code points for the session shortcuts while loading properties
+            Integer codePoint = (Integer) mActivity.getProperties().getInternalPropertyValue(entry.getKey(), true);
+            // If codePoint is null, then session shortcut did not exist in properties or was invalid
+            // as parsed by {@link #getCodePointForSessionShortcuts(String,String)}
+            // If codePoint is not null, then get the action for the MAP_SESSION_SHORTCUTS key and
+            // add the code point to sessionShortcuts
+            if (codePoint != null)
+                mSessionShortcuts.add(new KeyboardShortcut(codePoint, entry.getValue()));
+        }
+    }
+
+
+
 
 
     public void changeFontSize(boolean increase) {
diff --git a/app/src/main/java/com/termux/app/terminal/io/TerminalToolbarViewPager.java b/app/src/main/java/com/termux/app/terminal/io/TerminalToolbarViewPager.java
index 7a3f945ec0..ac1e2e4def 100644
--- a/app/src/main/java/com/termux/app/terminal/io/TerminalToolbarViewPager.java
+++ b/app/src/main/java/com/termux/app/terminal/io/TerminalToolbarViewPager.java
@@ -44,11 +44,10 @@ public Object instantiateItem(@NonNull ViewGroup collection, int position) {
             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.setExtraKeysViewClient(mActivity.getTermuxTerminalExtraKeys());
                 extraKeysView.setButtonTextAllCaps(mActivity.getProperties().shouldExtraKeysTextBeAllCaps());
                 mActivity.setExtraKeysView(extraKeysView);
-                extraKeysView.reload(mActivity.getProperties().getExtraKeysInfo());
+                extraKeysView.reload(mActivity.getTermuxTerminalExtraKeys().getExtraKeysInfo());
 
                 // apply extra keys fix if enabled in prefs
                 if (mActivity.getProperties().isUsingFullScreen() && mActivity.getProperties().isUsingFullScreenWorkAround()) {
diff --git a/app/src/main/java/com/termux/app/terminal/io/TermuxTerminalExtraKeys.java b/app/src/main/java/com/termux/app/terminal/io/TermuxTerminalExtraKeys.java
index 030f852f35..48cd6be28b 100644
--- a/app/src/main/java/com/termux/app/terminal/io/TermuxTerminalExtraKeys.java
+++ b/app/src/main/java/com/termux/app/terminal/io/TermuxTerminalExtraKeys.java
@@ -7,23 +7,78 @@
 import androidx.annotation.NonNull;
 import androidx.drawerlayout.widget.DrawerLayout;
 
+import com.termux.app.TermuxActivity;
 import com.termux.app.terminal.TermuxTerminalSessionClient;
 import com.termux.app.terminal.TermuxTerminalViewClient;
+import com.termux.shared.logger.Logger;
+import com.termux.shared.termux.extrakeys.ExtraKeysConstants;
+import com.termux.shared.termux.extrakeys.ExtraKeysInfo;
+import com.termux.shared.termux.settings.properties.TermuxPropertyConstants;
+import com.termux.shared.termux.settings.properties.TermuxSharedProperties;
 import com.termux.shared.termux.terminal.io.TerminalExtraKeys;
 import com.termux.view.TerminalView;
 
+import org.json.JSONException;
+
 public class TermuxTerminalExtraKeys extends TerminalExtraKeys {
 
+    private ExtraKeysInfo mExtraKeysInfo;
+
+    final TermuxActivity mActivity;
+    final TermuxTerminalViewClient mTermuxTerminalViewClient;
+    final TermuxTerminalSessionClient mTermuxTerminalSessionClient;
 
-    TermuxTerminalViewClient mTermuxTerminalViewClient;
-    TermuxTerminalSessionClient mTermuxTerminalSessionClient;
+    private static final String LOG_TAG = "TermuxTerminalExtraKeys";
 
-    public TermuxTerminalExtraKeys(@NonNull TerminalView terminalView,
+    public TermuxTerminalExtraKeys(TermuxActivity activity, @NonNull TerminalView terminalView,
                                    TermuxTerminalViewClient termuxTerminalViewClient,
                                    TermuxTerminalSessionClient termuxTerminalSessionClient) {
         super(terminalView);
+
+        mActivity = activity;
         mTermuxTerminalViewClient = termuxTerminalViewClient;
         mTermuxTerminalSessionClient = termuxTerminalSessionClient;
+
+        setExtraKeys();
+    }
+
+
+    /**
+     * Set the terminal extra keys and style.
+     */
+    private void setExtraKeys() {
+        mExtraKeysInfo = null;
+
+        try {
+            // The mMap stores the extra key and style string values while loading properties
+            // Check {@link #getExtraKeysInternalPropertyValueFromValue(String)} and
+            // {@link #getExtraKeysStyleInternalPropertyValueFromValue(String)}
+            String extrakeys = (String) mActivity.getProperties().getInternalPropertyValue(TermuxPropertyConstants.KEY_EXTRA_KEYS, true);
+            String extraKeysStyle = (String) mActivity.getProperties().getInternalPropertyValue(TermuxPropertyConstants.KEY_EXTRA_KEYS_STYLE, true);
+
+            ExtraKeysConstants.ExtraKeyDisplayMap extraKeyDisplayMap = ExtraKeysInfo.getCharDisplayMapForStyle(extraKeysStyle);
+            if (ExtraKeysConstants.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);
+        } catch (JSONException e) {
+            Logger.showToast(mActivity, "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);
+            } catch (JSONException e2) {
+                Logger.showToast(mActivity, "Can't create default extra keys",true);
+                Logger.logStackTraceWithMessage(LOG_TAG, "Could create default extra keys: ", e);
+                mExtraKeysInfo = null;
+            }
+        }
+    }
+
+    public ExtraKeysInfo getExtraKeysInfo() {
+        return mExtraKeysInfo;
     }
 
     @SuppressLint("RtlHardcoded")
diff --git a/app/src/main/java/com/termux/app/utils/PluginUtils.java b/app/src/main/java/com/termux/app/utils/PluginUtils.java
index 2607d3c9d4..37493d0125 100644
--- a/app/src/main/java/com/termux/app/utils/PluginUtils.java
+++ b/app/src/main/java/com/termux/app/utils/PluginUtils.java
@@ -27,9 +27,8 @@
 import com.termux.shared.logger.Logger;
 import com.termux.shared.termux.settings.preferences.TermuxAppSharedPreferences;
 import com.termux.shared.termux.settings.preferences.TermuxPreferenceConstants.TERMUX_APP;
-import com.termux.shared.settings.properties.SharedProperties;
 import com.termux.shared.models.ReportInfo;
-import com.termux.shared.termux.settings.properties.TermuxPropertyConstants;
+import com.termux.shared.termux.settings.properties.TermuxAppSharedProperties;
 import com.termux.shared.shell.command.ExecutionCommand;
 import com.termux.app.models.UserAction;
 import com.termux.shared.data.DataUtils;
@@ -366,8 +365,9 @@ public static void setupPluginCommandErrorsNotificationChannel(final Context con
      */
     public static String checkIfAllowExternalAppsPolicyIsViolated(final Context context, String apiName) {
         String errmsg = null;
-        if (!SharedProperties.isPropertyValueTrue(context, TermuxPropertyConstants.getTermuxPropertiesFile(),
-            TermuxConstants.PROP_ALLOW_EXTERNAL_APPS, true)) {
+
+        TermuxAppSharedProperties mProperties = TermuxAppSharedProperties.getProperties();
+        if (mProperties == null || !mProperties.shouldAllowExternalApps()) {
             errmsg = context.getString(R.string.error_allow_external_apps_ungranted, apiName,
                 TermuxFileUtils.getUnExpandedTermuxPath(TermuxConstants.TERMUX_PROPERTIES_PRIMARY_FILE_PATH));
         }
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxAppSharedProperties.java b/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxAppSharedProperties.java
new file mode 100644
index 0000000000..a0189c965e
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxAppSharedProperties.java
@@ -0,0 +1,42 @@
+package com.termux.shared.termux.settings.properties;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+
+import com.termux.shared.termux.TermuxConstants;
+
+public class TermuxAppSharedProperties extends TermuxSharedProperties {
+
+    private static TermuxAppSharedProperties properties;
+
+
+    private TermuxAppSharedProperties(@NonNull Context context) {
+        super(context, TermuxConstants.TERMUX_APP_NAME,
+            TermuxPropertyConstants.getTermuxPropertiesFile(), TermuxPropertyConstants.TERMUX_APP_PROPERTIES_LIST,
+            new TermuxSharedProperties.SharedPropertiesParserClient());
+    }
+
+    /**
+     * Initialize the {@link #properties} and load properties from disk.
+     *
+     * @param context The {@link Context} for operations.
+     * @return Returns the {@link TermuxAppSharedProperties}.
+     */
+    public static TermuxAppSharedProperties init(@NonNull Context context) {
+        if (properties == null)
+            properties = new TermuxAppSharedProperties(context);
+
+        return properties;
+    }
+
+    /**
+     * Get the {@link #properties}.
+     *
+     * @return Returns the {@link TermuxAppSharedProperties}.
+     */
+    public static TermuxAppSharedProperties getProperties() {
+        return properties;
+    }
+
+}
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxPropertyConstants.java b/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxPropertyConstants.java
index 30febbd3ce..8c30abc6d1 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxPropertyConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxPropertyConstants.java
@@ -355,7 +355,7 @@ public final class TermuxPropertyConstants {
     /** Defines the set for keys loaded by termux
      * Setting this to {@code null} will make {@link SharedProperties} throw an exception.
      * */
-    public static final Set<String> TERMUX_PROPERTIES_LIST = new HashSet<>(Arrays.asList(
+    public static final Set<String> TERMUX_APP_PROPERTIES_LIST = new HashSet<>(Arrays.asList(
         /* boolean */
         KEY_DISABLE_HARDWARE_KEYBOARD_SHORTCUTS,
         KEY_DISABLE_TERMINAL_SESSION_CHANGE_TOAST,
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxSharedProperties.java b/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxSharedProperties.java
index bf1ac1e8eb..3654301547 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxSharedProperties.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxSharedProperties.java
@@ -8,6 +8,7 @@
 import com.termux.shared.data.DataUtils;
 import com.termux.shared.settings.properties.SharedProperties;
 import com.termux.shared.settings.properties.SharedPropertiesParser;
+import com.termux.shared.termux.TermuxConstants;
 
 import java.io.File;
 import java.util.HashMap;
@@ -539,6 +540,9 @@ public static String getVolumeKeysBehaviourInternalPropertyValueFromValue(String
 
 
 
+    public boolean shouldAllowExternalApps() {
+        return (boolean) getInternalPropertyValue(TermuxConstants.PROP_ALLOW_EXTERNAL_APPS, true);
+    }
     public boolean areHardwareKeyboardShortcutsDisabled() {
         return (boolean) getInternalPropertyValue(TermuxPropertyConstants.KEY_DISABLE_HARDWARE_KEYBOARD_SHORTCUTS, true);
     }

From b94dc7eea93962f11b55cd9f5cb7aff715a1f4a6 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 10 Mar 2022 02:51:56 +0500
Subject: [PATCH 681/912] Changed|Deprecated: Move from shell command
 background mode to command runner

This starts the support for adb, root and other custom runners for shell commands. Previously only terminal and background tasks in app shells were supported.

`TERMUX_SERVICE.EXTRA_BACKGROUND` and `RUN_COMMAND_SERVICE.EXTRA_BACKGROUND` extras have been deprecated and instead respective `EXTRA_RUNNER` extra keys should be used. Currently supported extra values are `terminal-session` and `app-shell`. In future, `adb-shell` and `root-shell` are planned to be supported as well.
---
 .../com/termux/app/RunCommandService.java     | 15 +++-
 .../java/com/termux/app/TermuxService.java    | 40 +++++++----
 app/src/main/res/values/strings.xml           |  3 +
 .../shell/command/ExecutionCommand.java       | 71 ++++++++++++++++---
 .../termux/shared/termux/TermuxConstants.java | 11 ++-
 .../com/termux/shared/termux/TermuxUtils.java |  7 +-
 .../shared/termux/file/TermuxFileUtils.java   |  3 +-
 7 files changed, 121 insertions(+), 29 deletions(-)

diff --git a/app/src/main/java/com/termux/app/RunCommandService.java b/app/src/main/java/com/termux/app/RunCommandService.java
index 737a9d8c12..2091f92485 100644
--- a/app/src/main/java/com/termux/app/RunCommandService.java
+++ b/app/src/main/java/com/termux/app/RunCommandService.java
@@ -24,6 +24,7 @@
 import com.termux.shared.notification.NotificationUtils;
 import com.termux.app.utils.PluginUtils;
 import com.termux.shared.shell.command.ExecutionCommand;
+import com.termux.shared.shell.command.ExecutionCommand.Runner;
 
 /**
  * A service that receives {@link RUN_COMMAND_SERVICE#ACTION_RUN_COMMAND} intent from third party apps and
@@ -100,7 +101,17 @@ public int onStartCommand(Intent intent, int flags, int startId) {
 
         executionCommand.stdin = IntentUtils.getStringExtraIfSet(intent, RUN_COMMAND_SERVICE.EXTRA_STDIN, null);
         executionCommand.workingDirectory = IntentUtils.getStringExtraIfSet(intent, RUN_COMMAND_SERVICE.EXTRA_WORKDIR, null);
-        executionCommand.inBackground = intent.getBooleanExtra(RUN_COMMAND_SERVICE.EXTRA_BACKGROUND, false);
+
+        // If EXTRA_RUNNER is passed, use that, otherwise check EXTRA_BACKGROUND and default to Runner.TERMINAL_SESSION
+        executionCommand.runner = IntentUtils.getStringExtraIfSet(intent, RUN_COMMAND_SERVICE.EXTRA_RUNNER,
+            (intent.getBooleanExtra(RUN_COMMAND_SERVICE.EXTRA_BACKGROUND, false) ? Runner.APP_SHELL.getName() : Runner.TERMINAL_SESSION.getName()));
+        if (Runner.runnerOf(executionCommand.runner) == null) {
+            errmsg = this.getString(R.string.error_run_command_service_invalid_execution_command_runner, executionCommand.runner);
+            executionCommand.setStateFailed(Errno.ERRNO_FAILED.getCode(), errmsg);
+            PluginUtils.processPluginExecutionCommandError(this, LOG_TAG, executionCommand, false);
+            return stopService();
+        }
+
         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");
@@ -195,7 +206,7 @@ public int onStartCommand(Intent intent, int flags, int startId) {
         execIntent.putExtra(TERMUX_SERVICE.EXTRA_ARGUMENTS, executionCommand.arguments);
         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_RUNNER, executionCommand.runner);
         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);
diff --git a/app/src/main/java/com/termux/app/TermuxService.java b/app/src/main/java/com/termux/app/TermuxService.java
index a04d49a160..5caa3ebb91 100644
--- a/app/src/main/java/com/termux/app/TermuxService.java
+++ b/app/src/main/java/com/termux/app/TermuxService.java
@@ -40,6 +40,7 @@
 import com.termux.shared.android.PermissionUtils;
 import com.termux.shared.data.DataUtils;
 import com.termux.shared.shell.command.ExecutionCommand;
+import com.termux.shared.shell.command.ExecutionCommand.Runner;
 import com.termux.terminal.TerminalEmulator;
 import com.termux.terminal.TerminalSession;
 import com.termux.terminal.TerminalSessionClient;
@@ -353,7 +354,17 @@ private void actionServiceExecute(Intent intent) {
         ExecutionCommand executionCommand = new ExecutionCommand(getNextExecutionId());
 
         executionCommand.executableUri = intent.getData();
-        executionCommand.inBackground = intent.getBooleanExtra(TERMUX_SERVICE.EXTRA_BACKGROUND, false);
+        executionCommand.isPluginExecutionCommand = true;
+
+        // If EXTRA_RUNNER is passed, use that, otherwise check EXTRA_BACKGROUND and default to Runner.TERMINAL_SESSION
+        executionCommand.runner = IntentUtils.getStringExtraIfSet(intent, TERMUX_SERVICE.EXTRA_RUNNER,
+            (intent.getBooleanExtra(TERMUX_SERVICE.EXTRA_BACKGROUND, false) ? Runner.APP_SHELL.getName() : Runner.TERMINAL_SESSION.getName()));
+        if (Runner.runnerOf(executionCommand.runner) == null) {
+            String errmsg = this.getString(R.string.error_termux_service_invalid_execution_command_runner, executionCommand.runner);
+            executionCommand.setStateFailed(Errno.ERRNO_FAILED.getCode(), errmsg);
+            PluginUtils.processPluginExecutionCommandError(this, LOG_TAG, executionCommand, false);
+            return;
+        }
 
         if (executionCommand.executableUri != null) {
             Logger.logVerbose(LOG_TAG, "uri: \"" + executionCommand.executableUri + "\", path: \"" + executionCommand.executableUri.getPath() + "\", fragment: \"" + executionCommand.executableUri.getFragment() + "\"");
@@ -361,7 +372,7 @@ private void actionServiceExecute(Intent intent) {
             // Get full path including fragment (anything after last "#")
             executionCommand.executable = UriUtils.getUriFilePathWithFragment(executionCommand.executableUri);
             executionCommand.arguments = IntentUtils.getStringArrayExtraIfSet(intent, TERMUX_SERVICE.EXTRA_ARGUMENTS, null);
-            if (executionCommand.inBackground)
+            if (Runner.APP_SHELL.equalsRunner(executionCommand.runner))
                 executionCommand.stdin = IntentUtils.getStringExtraIfSet(intent, TERMUX_SERVICE.EXTRA_STDIN, null);
             executionCommand.backgroundCustomLogLevel = IntentUtils.getIntegerExtraIfSet(intent, TERMUX_SERVICE.EXTRA_BACKGROUND_CUSTOM_LOG_LEVEL, null);
         }
@@ -373,7 +384,6 @@ private void actionServiceExecute(Intent intent) {
         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.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) {
@@ -387,10 +397,14 @@ private void actionServiceExecute(Intent intent) {
         // Add the execution command to pending plugin execution commands list
         mPendingPluginExecutionCommands.add(executionCommand);
 
-        if (executionCommand.inBackground) {
-            executeTermuxTaskCommand(executionCommand);
-        } else {
-            executeTermuxSessionCommand(executionCommand);
+        if (Runner.APP_SHELL.equalsRunner(executionCommand.runner))
+                executeTermuxTaskCommand(executionCommand);
+        else if (Runner.TERMINAL_SESSION.equalsRunner(executionCommand.runner))
+                executeTermuxSessionCommand(executionCommand);
+        else {
+                String errmsg = this.getString(R.string.error_termux_service_unsupported_execution_command_runner, executionCommand.runner);
+                executionCommand.setStateFailed(Errno.ERRNO_FAILED.getCode(), errmsg);
+                PluginUtils.processPluginExecutionCommandError(this, LOG_TAG, executionCommand, false);
         }
     }
 
@@ -410,7 +424,7 @@ private void executeTermuxTaskCommand(ExecutionCommand executionCommand) {
     /** Create a TermuxTask. */
     @Nullable
     public AppShell createTermuxTask(String executablePath, String[] arguments, String stdin, String workingDirectory) {
-        return createTermuxTask(new ExecutionCommand(getNextExecutionId(), executablePath, arguments, stdin, workingDirectory, true, false));
+        return createTermuxTask(new ExecutionCommand(getNextExecutionId(), executablePath, arguments, stdin, workingDirectory, Runner.APP_SHELL.getName(), false));
     }
 
     /** Create a TermuxTask. */
@@ -420,8 +434,8 @@ public synchronized AppShell createTermuxTask(ExecutionCommand executionCommand)
 
         Logger.logDebug(LOG_TAG, "Creating \"" + executionCommand.getCommandIdAndLabelLogString() + "\" TermuxTask");
 
-        if (!executionCommand.inBackground) {
-            Logger.logDebug(LOG_TAG, "Ignoring a foreground execution command passed to createTermuxTask()");
+        if (!Runner.APP_SHELL.equalsRunner(executionCommand.runner)) {
+            Logger.logDebug(LOG_TAG, "Ignoring wrong runner \"" + executionCommand.runner + "\" command passed to createTermuxTask()");
             return null;
         }
 
@@ -502,7 +516,7 @@ private void executeTermuxSessionCommand(ExecutionCommand executionCommand) {
      */
     @Nullable
     public TermuxSession createTermuxSession(String executablePath, String[] arguments, String stdin, String workingDirectory, boolean isFailSafe, String sessionName) {
-        return createTermuxSession(new ExecutionCommand(getNextExecutionId(), executablePath, arguments, stdin, workingDirectory, false, isFailSafe), sessionName);
+        return createTermuxSession(new ExecutionCommand(getNextExecutionId(), executablePath, arguments, stdin, workingDirectory, Runner.TERMINAL_SESSION.getName(), isFailSafe), sessionName);
     }
 
     /** Create a {@link TermuxSession}. */
@@ -512,8 +526,8 @@ public synchronized TermuxSession createTermuxSession(ExecutionCommand execution
 
         Logger.logDebug(LOG_TAG, "Creating \"" + executionCommand.getCommandIdAndLabelLogString() + "\" TermuxSession");
 
-        if (executionCommand.inBackground) {
-            Logger.logDebug(LOG_TAG, "Ignoring a background execution command passed to createTermuxSession()");
+        if (!Runner.TERMINAL_SESSION.equalsRunner(executionCommand.runner)) {
+            Logger.logDebug(LOG_TAG, "Ignoring wrong runner \"" + executionCommand.runner + "\" command passed to createTermuxSession()");
             return null;
         }
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5f23f4bbe1..0a6c02dcaf 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -98,11 +98,14 @@
     <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>
+    <string name="error_termux_service_invalid_execution_command_runner">Invalid execution command runner to TermuxService: `%1$s`</string>
+    <string name="error_termux_service_unsupported_execution_command_runner">Unsupported execution command runner to TermuxService: `%1$s`</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_invalid_execution_command_runner">Invalid execution command runner 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_api_help">Visit %1$s for more info on RUN_COMMAND Intent usage.</string>
 
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/command/ExecutionCommand.java b/termux-shared/src/main/java/com/termux/shared/shell/command/ExecutionCommand.java
index 4751aa854c..90c1fba4bc 100644
--- a/termux-shared/src/main/java/com/termux/shared/shell/command/ExecutionCommand.java
+++ b/termux-shared/src/main/java/com/termux/shared/shell/command/ExecutionCommand.java
@@ -4,6 +4,7 @@
 import android.net.Uri;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.termux.shared.data.IntentUtils;
 import com.termux.shared.shell.command.result.ResultConfig;
@@ -13,6 +14,7 @@
 import com.termux.shared.markdown.MarkdownUtils;
 import com.termux.shared.data.DataUtils;
 import com.termux.shared.shell.command.runner.app.AppShell;
+import com.termux.terminal.TerminalSession;
 
 import java.util.Collections;
 import java.util.List;
@@ -52,8 +54,56 @@ public int getValue() {
             return value;
         }
 
+
     }
 
+    public enum Runner {
+
+        /** Run command in {@link TerminalSession}. */
+        TERMINAL_SESSION("terminal-session"),
+
+        /** Run command in {@link AppShell}. */
+        APP_SHELL("app-shell");
+
+        ///** Run command in {@link AdbShell}. */
+        //ADB_SHELL("adb-shell"),
+
+        ///** Run command in {@link RootShell}. */
+        //ROOT_SHELL("root-shell");
+
+        private final String name;
+
+        Runner(final String name) {
+            this.name = name;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public boolean equalsRunner(String runner) {
+            return runner != null && runner.equals(this.name);
+        }
+
+        /** Get {@link Runner} for {@code name} if found, otherwise {@code null}. */
+        @Nullable
+        public static Runner runnerOf(String name) {
+            for (Runner v : Runner.values()) {
+                if (v.name.equals(name)) {
+                    return v;
+                }
+            }
+            return null;
+        }
+
+        /** Get {@link Runner} for {@code name} if found, otherwise {@code def}. */
+        @NonNull
+        public static Runner runnerOf(@Nullable String name, @NonNull Runner def) {
+            Runner runner = runnerOf(name);
+            return runner != null ? runner : def;
+        }
+
+    }
 
     /** The optional unique id for the {@link ExecutionCommand}. */
     public Integer id;
@@ -83,8 +133,9 @@ public int getValue() {
     public Integer terminalTranscriptRows;
 
 
-    /** If the {@link ExecutionCommand} is a background or a foreground terminal session command. */
-    public boolean inBackground;
+    /** The {@link Runner} for the {@link ExecutionCommand}. */
+    public String runner;
+
     /** If the {@link ExecutionCommand} is meant to start a failsafe terminal session. */
     public boolean isFailsafe;
 
@@ -145,13 +196,13 @@ public ExecutionCommand(Integer id) {
         this.id = id;
     }
 
-    public ExecutionCommand(Integer id, String executable, String[] arguments, String stdin, String workingDirectory, boolean inBackground, boolean isFailsafe) {
+    public ExecutionCommand(Integer id, String executable, String[] arguments, String stdin, String workingDirectory, String runner, boolean isFailsafe) {
         this.id = id;
         this.executable = executable;
         this.arguments = arguments;
         this.stdin = stdin;
         this.workingDirectory = workingDirectory;
-        this.inBackground = inBackground;
+        this.runner = runner;
         this.isFailsafe = isFailsafe;
     }
 
@@ -278,10 +329,10 @@ public static String getExecutionInputLogString(final ExecutionCommand execution
         logString.append("\n").append(executionCommand.getExecutableLogString());
         logString.append("\n").append(executionCommand.getArgumentsLogString());
         logString.append("\n").append(executionCommand.getWorkingDirectoryLogString());
-        logString.append("\n").append(executionCommand.getInBackgroundLogString());
+        logString.append("\n").append(executionCommand.getRunnerLogString());
         logString.append("\n").append(executionCommand.getIsFailsafeLogString());
 
-        if (executionCommand.inBackground) {
+        if (Runner.APP_SHELL.equalsRunner(executionCommand.runner)) {
             if (logStdin && (!ignoreNull || !DataUtils.isNullOrEmpty(executionCommand.stdin)))
                 logString.append("\n").append(executionCommand.getStdinLogString());
 
@@ -372,10 +423,10 @@ public static String getExecutionCommandMarkdownString(final ExecutionCommand ex
         markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Executable", executionCommand.executable, "-"));
         markdownString.append("\n").append(getArgumentsMarkdownString(executionCommand.arguments));
         markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Working Directory", executionCommand.workingDirectory, "-"));
-        markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("inBackground", executionCommand.inBackground, "-"));
+        markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Runner", executionCommand.runner, "-"));
         markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("isFailsafe", executionCommand.isFailsafe, "-"));
 
-        if (executionCommand.inBackground) {
+        if (Runner.APP_SHELL.equalsRunner(executionCommand.runner)) {
             if (!DataUtils.isNullOrEmpty(executionCommand.stdin))
                 markdownString.append("\n").append(MarkdownUtils.getMultiLineMarkdownStringEntry("Stdin", executionCommand.stdin, "-"));
             if (executionCommand.backgroundCustomLogLevel != null)
@@ -450,8 +501,8 @@ public String getWorkingDirectoryLogString() {
         return "Working Directory: `" + workingDirectory + "`";
     }
 
-    public String getInBackgroundLogString() {
-        return "inBackground: `" + inBackground + "`";
+    public String getRunnerLogString() {
+        return Logger.getSingleLineLogStringEntry("Runner", runner, "-");
     }
 
     public String getIsFailsafeLogString() {
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
index f799073b19..31739de3c1 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
@@ -8,7 +8,7 @@
 import java.util.List;
 
 /*
- * Version: v0.35.0
+ * Version: v0.36.0
  * SPDX-License-Identifier: MIT
  *
  * Changelog
@@ -217,6 +217,9 @@
  *
  * - 0.35.0 (2022-01-28)
  *  - Add `TERMUX_APP.TERMUX_ACTIVITY.EXTRA_RECREATE_ACTIVITY`.
+ *
+ * - 0.36.0 (2022-03-10)
+ *      - Added `TERMUX_APP.TERMUX_SERVICE.EXTRA_RUNNER` and `TERMUX_APP.RUN_COMMAND_SERVICE.EXTRA_RUNNER`
  */
 
 /**
@@ -915,7 +918,10 @@ public static final class TERMUX_SERVICE {
             /** Intent {@code String} extra for command current working directory for the TERMUX_SERVICE.ACTION_SERVICE_EXECUTE intent */
             public static final String EXTRA_WORKDIR = TERMUX_PACKAGE_NAME + ".execute.cwd"; // Default: "com.termux.execute.cwd"
             /** Intent {@code boolean} extra for command background mode for the TERMUX_SERVICE.ACTION_SERVICE_EXECUTE intent */
+            @Deprecated
             public static final String EXTRA_BACKGROUND = TERMUX_PACKAGE_NAME + ".execute.background"; // Default: "com.termux.execute.background"
+            /** Intent {@code boolean} extra for command the {@link com.termux.shared.shell.command.ExecutionCommand.Runner} for the TERMUX_SERVICE.ACTION_SERVICE_EXECUTE intent */
+            public static final String EXTRA_RUNNER = TERMUX_PACKAGE_NAME + ".execute.runner"; // Default: "com.termux.execute.runner"
             /** Intent {@code String} extra for custom log level for background commands defined by {@link com.termux.shared.logger.Logger} for the TERMUX_SERVICE.ACTION_SERVICE_EXECUTE intent */
             public static final String EXTRA_BACKGROUND_CUSTOM_LOG_LEVEL = TERMUX_PACKAGE_NAME + ".execute.background_custom_log_level"; // Default: "com.termux.execute.background_custom_log_level"
             /** Intent {@code String} extra for session action for foreground commands for the TERMUX_SERVICE.ACTION_SERVICE_EXECUTE intent */
@@ -1045,7 +1051,10 @@ public static final class RUN_COMMAND_SERVICE {
             /** Intent {@code String} extra for current working directory of command for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent */
             public static final String EXTRA_WORKDIR = TERMUX_PACKAGE_NAME + ".RUN_COMMAND_WORKDIR"; // Default: "com.termux.RUN_COMMAND_WORKDIR"
             /** Intent {@code boolean} extra for whether to run command in background or foreground terminal session for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent */
+            @Deprecated
             public static final String EXTRA_BACKGROUND = TERMUX_PACKAGE_NAME + ".RUN_COMMAND_BACKGROUND"; // Default: "com.termux.RUN_COMMAND_BACKGROUND"
+            /** Intent {@code boolean} extra for command the {@link com.termux.shared.shell.command.ExecutionCommand.Runner} for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent */
+            public static final String EXTRA_RUNNER = TERMUX_PACKAGE_NAME + ".RUN_COMMAND_RUNNER"; // Default: "com.termux.RUN_COMMAND_RUNNER"
             /** Intent {@code String} extra for custom log level for background commands defined by {@link com.termux.shared.logger.Logger} for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent */
             public static final String EXTRA_BACKGROUND_CUSTOM_LOG_LEVEL = TERMUX_PACKAGE_NAME + ".RUN_COMMAND_BACKGROUND_CUSTOM_LOG_LEVEL"; // Default: "com.termux.RUN_COMMAND_BACKGROUND_CUSTOM_LOG_LEVEL"
             /** Intent {@code String} extra for session action of foreground commands for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent */
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
index ce6ea6c974..75d212bbe0 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
@@ -520,7 +520,9 @@ public static String geAPTInfoMarkdownString(@NonNull final Context context) {
 
         aptInfoScript = aptInfoScript.replaceAll(Pattern.quote("@TERMUX_PREFIX@"), TermuxConstants.TERMUX_PREFIX_DIR_PATH);
 
-        ExecutionCommand executionCommand = new ExecutionCommand(1, TermuxConstants.TERMUX_BIN_PREFIX_DIR_PATH + "/bash", null, aptInfoScript, null, true, false);
+        ExecutionCommand executionCommand = new ExecutionCommand(1,
+            TermuxConstants.TERMUX_BIN_PREFIX_DIR_PATH + "/bash", null, aptInfoScript,
+            null, ExecutionCommand.Runner.APP_SHELL.getName(), false);
         executionCommand.commandLabel = "APT Info Command";
         executionCommand.backgroundCustomLogLevel = Logger.LOG_LEVEL_OFF;
         AppShell appShell = AppShell.execute(context, executionCommand, null, new TermuxShellEnvironmentClient(), true);
@@ -578,7 +580,8 @@ public static String getLogcatDumpMarkdownString(@NonNull final Context context)
 
         // Run script
         // Logging must be disabled for output of logcat command itself in StreamGobbler
-        ExecutionCommand executionCommand = new ExecutionCommand(1, "/system/bin/sh", null, logcatScript + "\n", "/", true, true);
+        ExecutionCommand executionCommand = new ExecutionCommand(1, "/system/bin/sh",
+            null, logcatScript + "\n", "/", ExecutionCommand.Runner.APP_SHELL.getName(), true);
         executionCommand.commandLabel = "Logcat dump command";
         executionCommand.backgroundCustomLogLevel = Logger.LOG_LEVEL_OFF;
         AppShell appShell = AppShell.execute(context, executionCommand, null, new TermuxShellEnvironmentClient(), true);
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/file/TermuxFileUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/file/TermuxFileUtils.java
index a44c21a519..79770e790f 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/file/TermuxFileUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/file/TermuxFileUtils.java
@@ -342,7 +342,8 @@ public static String getTermuxFilesStatMarkdownString(@NonNull final Context con
             .append("/system/bin/grep -E '( /data )|( /data/data )|( /data/user/[0-9]+ )' /proc/self/mountinfo 2>&1 | /system/bin/grep -v '/data_mirror' 2>&1");
 
         // Run script
-        ExecutionCommand executionCommand = new ExecutionCommand(1, "/system/bin/sh", null, statScript.toString() + "\n", "/", true, true);
+        ExecutionCommand executionCommand = new ExecutionCommand(1, "/system/bin/sh", null,
+            statScript.toString() + "\n", "/", ExecutionCommand.Runner.APP_SHELL.getName(), true);
         executionCommand.commandLabel = TermuxConstants.TERMUX_APP_NAME + " Files Stat Command";
         executionCommand.backgroundCustomLogLevel = Logger.LOG_LEVEL_OFF;
         AppShell appShell = AppShell.execute(context, executionCommand, null, new TermuxShellEnvironmentClient(), true);

From c3ac30e2fb33cf26ad1ac736e0edd2b6905b9025 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Fri, 11 Mar 2022 20:16:50 +0500
Subject: [PATCH 682/912] Added: Add ic_info and ic_settings

---
 termux-shared/src/main/res/drawable/ic_info.xml     | 5 +++++
 termux-shared/src/main/res/drawable/ic_settings.xml | 5 +++++
 2 files changed, 10 insertions(+)
 create mode 100644 termux-shared/src/main/res/drawable/ic_info.xml
 create mode 100644 termux-shared/src/main/res/drawable/ic_settings.xml

diff --git a/termux-shared/src/main/res/drawable/ic_info.xml b/termux-shared/src/main/res/drawable/ic_info.xml
new file mode 100644
index 0000000000..654cfb396b
--- /dev/null
+++ b/termux-shared/src/main/res/drawable/ic_info.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-6h2v6zM13,9h-2L11,7h2v2z"/>
+</vector>
diff --git a/termux-shared/src/main/res/drawable/ic_settings.xml b/termux-shared/src/main/res/drawable/ic_settings.xml
new file mode 100644
index 0000000000..b240b83007
--- /dev/null
+++ b/termux-shared/src/main/res/drawable/ic_settings.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M19.14,12.94c0.04,-0.3 0.06,-0.61 0.06,-0.94c0,-0.32 -0.02,-0.64 -0.07,-0.94l2.03,-1.58c0.18,-0.14 0.23,-0.41 0.12,-0.61l-1.92,-3.32c-0.12,-0.22 -0.37,-0.29 -0.59,-0.22l-2.39,0.96c-0.5,-0.38 -1.03,-0.7 -1.62,-0.94L14.4,2.81c-0.04,-0.24 -0.24,-0.41 -0.48,-0.41h-3.84c-0.24,0 -0.43,0.17 -0.47,0.41L9.25,5.35C8.66,5.59 8.12,5.92 7.63,6.29L5.24,5.33c-0.22,-0.08 -0.47,0 -0.59,0.22L2.74,8.87C2.62,9.08 2.66,9.34 2.86,9.48l2.03,1.58C4.84,11.36 4.8,11.69 4.8,12s0.02,0.64 0.07,0.94l-2.03,1.58c-0.18,0.14 -0.23,0.41 -0.12,0.61l1.92,3.32c0.12,0.22 0.37,0.29 0.59,0.22l2.39,-0.96c0.5,0.38 1.03,0.7 1.62,0.94l0.36,2.54c0.05,0.24 0.24,0.41 0.48,0.41h3.84c0.24,0 0.44,-0.17 0.47,-0.41l0.36,-2.54c0.59,-0.24 1.13,-0.56 1.62,-0.94l2.39,0.96c0.22,0.08 0.47,0 0.59,-0.22l1.92,-3.32c0.12,-0.22 0.07,-0.47 -0.12,-0.61L19.14,12.94zM12,15.6c-1.98,0 -3.6,-1.62 -3.6,-3.6s1.62,-3.6 3.6,-3.6s3.6,1.62 3.6,3.6S13.98,15.6 12,15.6z"/>
+</vector>

From 760ae78affdf5f53cefffcad073bd535b17e5a55 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Fri, 11 Mar 2022 20:17:48 +0500
Subject: [PATCH 683/912] Docs: Add termux apps vulnerability disclosure post
 links to README

---
 README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 046c17c622..edef1d5e1f 100644
--- a/README.md
+++ b/README.md
@@ -55,7 +55,7 @@ The core [Termux](https://github.com/termux/termux-app) app comes with the follo
 
 Latest version is `v0.118.0`.
 
-**NOTICE: It is highly recommended that you update to `v0.118.0` or higher for various bug fixes ASAP. Also reminding [again](https://www.reddit.com/r/termux/comments/pkujfa/important_deprecation_notice_for_google_play) to users who have installed termux apps from google playstore that playstore builds are [deprecated](#google-play-store-deprecated) and no longer supported. It is recommended that you shift to F-Droid or Github releases.**
+**NOTICE: It is highly recommended that you update to `v0.118.0` or higher ASAP for various bug fixes, including a critical world-readable vulnerability reported at https://termux.github.io/general/2022/02/15/termux-apps-vulnerability-disclosures.html. Also reminding [again](https://www.reddit.com/r/termux/comments/pkujfa/important_deprecation_notice_for_google_play) to users who have installed termux apps from google playstore that playstore builds are [deprecated](#google-play-store-deprecated) and no longer supported. It is recommended that you shift to F-Droid or Github releases.**
 
 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).
 
@@ -110,6 +110,8 @@ If you plan on staying on Play Store sources in future as well, then you may wan
 <details>
 <summary></summary>
 
+- Play store apps have multiple critical vulnerabilities as reported at https://termux.github.io/general/2022/02/15/termux-apps-vulnerability-disclosures.html and since they cannot be updated with fixes, any users using older versions would be vulnerable.
+
 - 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).

From 792c33c9a561e10a283a00fedfa216845396765b Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Tue, 15 Mar 2022 14:22:29 +0500
Subject: [PATCH 684/912] Fixed: Fix `PermissionUtils.requestPermissions()` not
 requesting multiple permissions correctly

---
 .../java/com/termux/shared/android/PermissionUtils.java     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/android/PermissionUtils.java b/termux-shared/src/main/java/com/termux/shared/android/PermissionUtils.java
index d2ca2289fe..280136ab61 100644
--- a/termux-shared/src/main/java/com/termux/shared/android/PermissionUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/android/PermissionUtils.java
@@ -133,9 +133,9 @@ public static boolean requestPermissions(@NonNull Context context, @NonNull Stri
 
                 try {
                     if (context instanceof AppCompatActivity)
-                        ((AppCompatActivity) context).requestPermissions(new String[]{permission}, requestCode);
+                        ((AppCompatActivity) context).requestPermissions(permissions, requestCode);
                     else if (context instanceof Activity)
-                        ((Activity) context).requestPermissions(new String[]{permission}, requestCode);
+                        ((Activity) context).requestPermissions(permissions, requestCode);
                     else {
                         Error.logErrorAndShowToast(context, LOG_TAG,
                             FunctionErrno.ERRNO_PARAMETER_NOT_INSTANCE_OF.getError("context", "requestPermissions", "Activity or AppCompatActivity"));
@@ -147,6 +147,8 @@ else if (context instanceof Activity)
                     Logger.showToast(context, errmsg + "\n" + e.getMessage(), true);
                     return false;
                 }
+
+                break;
             }
         }
 

From 14c5fc7b1e6e23c1baca760f1982ea00010a2ac9 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Tue, 15 Mar 2022 14:43:26 +0500
Subject: [PATCH 685/912] Fixed: Suppress warnings for requiring android 11 to
 request `MANAGE_EXTERNAL_STORAGE` permission and call
 `Environment.isExternalStorageManager()`

---
 .../com/termux/shared/android/PermissionUtils.java    | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/android/PermissionUtils.java b/termux-shared/src/main/java/com/termux/shared/android/PermissionUtils.java
index 280136ab61..d4ad5b926c 100644
--- a/termux-shared/src/main/java/com/termux/shared/android/PermissionUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/android/PermissionUtils.java
@@ -15,6 +15,7 @@
 import android.provider.Settings;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.content.ContextCompat;
 
@@ -281,7 +282,7 @@ public static boolean checkAndRequestLegacyOrManageExternalStoragePermission(@No
         if (requestCode < 0)
             return false;
 
-        if (requestLegacyStoragePermission) {
+        if (requestLegacyStoragePermission || Build.VERSION.SDK_INT < Build.VERSION_CODES.R) {
             requestLegacyStorageExternalPermission(context, requestCode);
         } else {
             requestManageStorageExternalPermission(context, requestCode);
@@ -303,7 +304,7 @@ public static boolean checkAndRequestLegacyOrManageExternalStoragePermission(@No
      * @return Returns {@code true} if permission is granted, otherwise {@code false}.
      */
     public static boolean checkStoragePermission(@NonNull Context context, boolean checkLegacyStoragePermission) {
-        if (checkLegacyStoragePermission) {
+        if (checkLegacyStoragePermission || Build.VERSION.SDK_INT < Build.VERSION_CODES.R) {
             return checkPermissions(context,
                 new String[]{Manifest.permission.READ_EXTERNAL_STORAGE,
                     Manifest.permission.WRITE_EXTERNAL_STORAGE});
@@ -328,6 +329,7 @@ public static boolean requestLegacyStorageExternalPermission(@NonNull Context co
     }
 
     /** Wrapper for {@link #requestManageStorageExternalPermission(Context, int)}. */
+    @RequiresApi(api = Build.VERSION_CODES.R)
     public static Error requestManageStorageExternalPermission(@NonNull Context context) {
         return requestManageStorageExternalPermission(context, -1);
     }
@@ -343,6 +345,7 @@ public static Error requestManageStorageExternalPermission(@NonNull Context cont
      *                    result it required.
      * @return Returns the {@code error} if requesting the permission was not successful, otherwise {@code null}.
      */
+    @RequiresApi(api = Build.VERSION_CODES.R)
     public static Error requestManageStorageExternalPermission(@NonNull Context context, int requestCode) {
         Logger.logInfo(LOG_TAG, "Requesting manage external storage permission");
 
@@ -376,8 +379,8 @@ public static Error requestManageStorageExternalPermission(@NonNull Context cont
      * https://developer.android.com/training/data-storage/use-cases#opt-out-scoped-storage
      */
     public static boolean isLegacyExternalStoragePossible(@NonNull Context context) {
-        return !(PackageUtils.getTargetSDKForPackage(context) >= Build.VERSION_CODES.R &&
-            Build.VERSION.SDK_INT >= Build.VERSION_CODES.R);
+        return !(Build.VERSION.SDK_INT >= Build.VERSION_CODES.R &&
+            PackageUtils.getTargetSDKForPackage(context) >= Build.VERSION_CODES.R);
     }
 
     /**

From 021cb60e2348830410dd1273513a957477aa6a2e Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Tue, 15 Mar 2022 14:48:45 +0500
Subject: [PATCH 686/912] Added: Add `TERMUX_API_APT_*` constants

---
 .../com/termux/shared/termux/TermuxConstants.java | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
index 31739de3c1..b7d6541114 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
@@ -8,7 +8,7 @@
 import java.util.List;
 
 /*
- * Version: v0.36.0
+ * Version: v0.37.0
  * SPDX-License-Identifier: MIT
  *
  * Changelog
@@ -220,6 +220,9 @@
  *
  * - 0.36.0 (2022-03-10)
  *      - Added `TERMUX_APP.TERMUX_SERVICE.EXTRA_RUNNER` and `TERMUX_APP.RUN_COMMAND_SERVICE.EXTRA_RUNNER`
+ *
+ * - 0.37.0 (2022-03-15)
+ *  - Added `TERMUX_API_APT_*`.
  */
 
 /**
@@ -487,6 +490,16 @@ public final class TermuxConstants {
     public static final String TERMUX_X11_PACKAGES_GITHUB_ISSUES_REPO_URL = TERMUX_X11_PACKAGES_GITHUB_REPO_URL + "/issues"; // Default: "https://github.com/termux/x11-packages/issues"
 
 
+    /** Termux API apt package name */
+    public static final String TERMUX_API_APT_PACKAGE_NAME = "termux-api"; // Default: "termux-api"
+    /** Termux API apt Github repo name */
+    public static final String TERMUX_API_APT_GITHUB_REPO_NAME = "termux-api-package"; // Default: "termux-api-package"
+    /** Termux API apt Github repo url */
+    public static final String TERMUX_API_APT_GITHUB_REPO_URL = TERMUX_GITHUB_ORGANIZATION_URL + "/" + TERMUX_API_APT_GITHUB_REPO_NAME; // Default: "https://github.com/termux/termux-api-package"
+    /** Termux API apt Github issues repo url */
+    public static final String TERMUX_API_APT_GITHUB_ISSUES_REPO_URL = TERMUX_API_APT_GITHUB_REPO_URL + "/issues"; // Default: "https://github.com/termux/termux-api-package/issues"
+
+
 
 
 

From 9a65aa4589015854066569b486cbeb63f88dd201 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 16 Mar 2022 20:18:55 +0500
Subject: [PATCH 687/912] Fixed: Do not add double heading if
 callingPackageName passed to `TermuxUtils.getAppInfoMarkdownString()` is a
 plugin app

---
 .../src/main/java/com/termux/shared/termux/TermuxUtils.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
index 75d212bbe0..77c4d5f2e0 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
@@ -273,11 +273,11 @@ public static String getAppInfoMarkdownString(final Context currentPackageContex
             case TERMUX_AND_CALLING_PACKAGE:
                 appInfo.append(TermuxUtils.getAppInfoMarkdownString(currentPackageContext, false));
                 if (!DataUtils.isNullOrEmpty(callingPackageName)) {
-                    String callingPackageAppInfo;
+                    String callingPackageAppInfo = null;
                     if (TermuxConstants.TERMUX_PLUGIN_APP_PACKAGE_NAMES_LIST.contains(callingPackageName)) {
                         Context termuxPluginAppContext = PackageUtils.getContextForPackage(currentPackageContext, callingPackageName);
                         if (termuxPluginAppContext != null)
-                            callingPackageAppInfo = getAppInfoMarkdownString(termuxPluginAppContext, false);
+                            appInfo.append(getAppInfoMarkdownString(termuxPluginAppContext, false));
                         else
                             callingPackageAppInfo = AndroidUtils.getAppInfoMarkdownString(currentPackageContext, callingPackageName);
                     } else {

From 621545dd0a2cb692b2a596d9dcd1947890fd159d Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 16 Mar 2022 20:53:37 +0500
Subject: [PATCH 688/912] Added: Add support for getting termux app and plugin
 app info only in `TermuxUtils.getAppInfoMarkdownString()`

---
 .../src/main/java/com/termux/shared/termux/TermuxUtils.java  | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
index 77c4d5f2e0..333dc0fe3e 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
@@ -37,6 +37,8 @@ public class TermuxUtils {
     public enum AppInfoMode {
         /** Get info for Termux app only. */
         TERMUX_PACKAGE,
+        /** Get info for Termux app and plugin app if context is of plugin app. */
+        TERMUX_AND_PLUGIN_PACKAGE,
         /** Get info for Termux app and its plugins listed in {@link TermuxConstants#TERMUX_PLUGIN_APP_PACKAGE_NAMES_LIST}. */
         TERMUX_AND_PLUGIN_PACKAGES,
         /* Get info for all the Termux app plugins listed in {@link TermuxConstants#TERMUX_PLUGIN_APP_PACKAGE_NAMES_LIST}. */
@@ -259,6 +261,9 @@ public static String getAppInfoMarkdownString(final Context currentPackageContex
             case TERMUX_PACKAGE:
                 return getAppInfoMarkdownString(currentPackageContext, false);
 
+            case TERMUX_AND_PLUGIN_PACKAGE:
+                return getAppInfoMarkdownString(currentPackageContext, true);
+
             case TERMUX_AND_PLUGIN_PACKAGES:
                 appInfo.append(TermuxUtils.getAppInfoMarkdownString(currentPackageContext, false));
 

From 4b07e4f4c0a84f58d3fc1f25cdc1448e88c5655a Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 16 Mar 2022 20:59:48 +0500
Subject: [PATCH 689/912] Added: Add multi process support in
 `TermuxAppSharedPreferences` since plugin apps may need to read values
 modified by termux app process

---
 .../java/com/termux/app/TermuxService.java    |  2 +-
 .../termux/DebuggingPreferencesFragment.java  |  4 ++--
 .../com/termux/app/utils/PluginUtils.java     |  2 +-
 .../TermuxAppSharedPreferences.java           | 23 +++++++++++++++----
 4 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxService.java b/app/src/main/java/com/termux/app/TermuxService.java
index 5caa3ebb91..3e60a2c8a6 100644
--- a/app/src/main/java/com/termux/app/TermuxService.java
+++ b/app/src/main/java/com/termux/app/TermuxService.java
@@ -648,7 +648,7 @@ private void startTermuxActivity() {
         } else {
             TermuxAppSharedPreferences preferences = TermuxAppSharedPreferences.build(this);
             if (preferences == null) return;
-            if (preferences.arePluginErrorNotificationsEnabled())
+            if (preferences.arePluginErrorNotificationsEnabled(false))
                 Logger.showToast(this, this.getString(R.string.error_display_over_other_apps_permission_not_granted), true);
         }
     }
diff --git a/app/src/main/java/com/termux/app/fragments/settings/termux/DebuggingPreferencesFragment.java b/app/src/main/java/com/termux/app/fragments/settings/termux/DebuggingPreferencesFragment.java
index 059dccbea8..8afd568fdb 100644
--- a/app/src/main/java/com/termux/app/fragments/settings/termux/DebuggingPreferencesFragment.java
+++ b/app/src/main/java/com/termux/app/fragments/settings/termux/DebuggingPreferencesFragment.java
@@ -144,9 +144,9 @@ public boolean getBoolean(String key, boolean defValue) {
             case "terminal_view_key_logging_enabled":
                 return mPreferences.isTerminalViewKeyLoggingEnabled();
             case "plugin_error_notifications_enabled":
-                return mPreferences.arePluginErrorNotificationsEnabled();
+                return mPreferences.arePluginErrorNotificationsEnabled(false);
             case "crash_report_notifications_enabled":
-                return mPreferences.areCrashReportNotificationsEnabled();
+                return mPreferences.areCrashReportNotificationsEnabled(false);
             default:
                 return false;
         }
diff --git a/app/src/main/java/com/termux/app/utils/PluginUtils.java b/app/src/main/java/com/termux/app/utils/PluginUtils.java
index 37493d0125..a407747fb5 100644
--- a/app/src/main/java/com/termux/app/utils/PluginUtils.java
+++ b/app/src/main/java/com/termux/app/utils/PluginUtils.java
@@ -241,7 +241,7 @@ public static void sendPluginCommandErrorNotification(Context context, String lo
         if (preferences == null) return;
 
         // If user has disabled notifications for plugin commands, then just return
-        if (!preferences.arePluginErrorNotificationsEnabled() && !forceNotification)
+        if (!preferences.arePluginErrorNotificationsEnabled(true) && !forceNotification)
             return;
 
         logTag = DataUtils.getDefaultIfNull(logTag, LOG_TAG);
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxAppSharedPreferences.java b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxAppSharedPreferences.java
index 3e10ca70e4..876546a440 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxAppSharedPreferences.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxAppSharedPreferences.java
@@ -20,6 +20,7 @@ public class TermuxAppSharedPreferences {
 
     private final Context mContext;
     private final SharedPreferences mSharedPreferences;
+    private final SharedPreferences mMultiProcessSharedPreferences;
 
     private int MIN_FONTSIZE;
     private int MAX_FONTSIZE;
@@ -30,6 +31,8 @@ public class TermuxAppSharedPreferences {
     private TermuxAppSharedPreferences(@NonNull Context context) {
         mContext = context;
         mSharedPreferences = getPrivateSharedPreferences(mContext);
+        mMultiProcessSharedPreferences = getPrivateAndMultiProcessSharedPreferences(mContext);
+
 
         setFontVariables(context);
     }
@@ -73,6 +76,12 @@ private static SharedPreferences getPrivateSharedPreferences(Context context) {
     }
 
 
+    private static SharedPreferences getPrivateAndMultiProcessSharedPreferences(Context context) {
+        if (context == null) return null;
+        return SharedPreferenceUtils.getPrivateAndMultiProcessSharedPreferences(context, TermuxConstants.TERMUX_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION);
+    }
+
+
 
     public boolean shouldShowTerminalToolbar() {
         return SharedPreferenceUtils.getBoolean(mSharedPreferences, TERMUX_APP.KEY_SHOW_TERMINAL_TOOLBAR, TERMUX_APP.DEFAULT_VALUE_SHOW_TERMINAL_TOOLBAR);
@@ -218,8 +227,11 @@ public void setTerminalViewKeyLoggingEnabled(boolean value) {
 
 
 
-    public boolean arePluginErrorNotificationsEnabled() {
-        return SharedPreferenceUtils.getBoolean(mSharedPreferences, TERMUX_APP.KEY_PLUGIN_ERROR_NOTIFICATIONS_ENABLED, TERMUX_APP.DEFAULT_VALUE_PLUGIN_ERROR_NOTIFICATIONS_ENABLED);
+    public boolean arePluginErrorNotificationsEnabled(boolean readFromFile) {
+        if (readFromFile)
+            return SharedPreferenceUtils.getBoolean(mMultiProcessSharedPreferences, TERMUX_APP.KEY_PLUGIN_ERROR_NOTIFICATIONS_ENABLED, TERMUX_APP.DEFAULT_VALUE_PLUGIN_ERROR_NOTIFICATIONS_ENABLED);
+        else
+            return SharedPreferenceUtils.getBoolean(mSharedPreferences, TERMUX_APP.KEY_PLUGIN_ERROR_NOTIFICATIONS_ENABLED, TERMUX_APP.DEFAULT_VALUE_PLUGIN_ERROR_NOTIFICATIONS_ENABLED);
     }
 
     public void setPluginErrorNotificationsEnabled(boolean value) {
@@ -228,8 +240,11 @@ public void setPluginErrorNotificationsEnabled(boolean value) {
 
 
 
-    public boolean areCrashReportNotificationsEnabled() {
-        return SharedPreferenceUtils.getBoolean(mSharedPreferences, TERMUX_APP.KEY_CRASH_REPORT_NOTIFICATIONS_ENABLED, TERMUX_APP.DEFAULT_VALUE_CRASH_REPORT_NOTIFICATIONS_ENABLED);
+    public boolean areCrashReportNotificationsEnabled(boolean readFromFile) {
+        if (readFromFile)
+            return SharedPreferenceUtils.getBoolean(mMultiProcessSharedPreferences, TERMUX_APP.KEY_CRASH_REPORT_NOTIFICATIONS_ENABLED, TERMUX_APP.DEFAULT_VALUE_CRASH_REPORT_NOTIFICATIONS_ENABLED);
+       else
+            return SharedPreferenceUtils.getBoolean(mSharedPreferences, TERMUX_APP.KEY_CRASH_REPORT_NOTIFICATIONS_ENABLED, TERMUX_APP.DEFAULT_VALUE_CRASH_REPORT_NOTIFICATIONS_ENABLED);
     }
 
     public void setCrashReportNotificationsEnabled(boolean value) {

From 4dbfc1fac8aebe47a96a88bc03d2b5d1f4674155 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 16 Mar 2022 21:01:46 +0500
Subject: [PATCH 690/912] Added: Add support for `onPreLogCrash()` and
 `onPostLogCrash()` in `CrashHandler` so that `CrashHandlerClient` can decide
 which exceptions to log and add custom logic

---
 .../com/termux/shared/crash/CrashHandler.java | 43 +++++++++++++++++--
 1 file changed, 40 insertions(+), 3 deletions(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/crash/CrashHandler.java b/termux-shared/src/main/java/com/termux/shared/crash/CrashHandler.java
index 7e40c63a4a..79309f2487 100644
--- a/termux-shared/src/main/java/com/termux/shared/crash/CrashHandler.java
+++ b/termux-shared/src/main/java/com/termux/shared/crash/CrashHandler.java
@@ -30,7 +30,8 @@ private CrashHandler(@NonNull final Context context, @NonNull final CrashHandler
     }
 
     public void uncaughtException(@NonNull Thread thread, @NonNull Throwable throwable) {
-        logCrash(mContext, mCrashHandlerClient, thread, throwable);
+        Logger.logInfo(LOG_TAG, "uncaughtException() for " + thread +  ": " + throwable.getMessage());
+        logCrash(thread, throwable);
         defaultUEH.uncaughtException(thread, throwable);
     }
 
@@ -44,14 +45,30 @@ public static void setCrashHandler(@NonNull final Context context, @NonNull fina
     }
 
     /**
-     * Log a crash in the crash log file at {@code crashlogFilePath}.
+     * Log a crash in the crash log file at path returned by {@link CrashHandlerClient#getCrashLogFilePath(Context)}.
      *
      * @param context The {@link Context} for operations.
      * @param crashHandlerClient The {@link CrashHandlerClient} implementation.
      * @param thread The {@link Thread} in which the crash happened.
      * @param throwable The {@link Throwable} thrown for the crash.
      */
-    public static void logCrash(@NonNull final Context context, @NonNull final CrashHandlerClient crashHandlerClient, final Thread thread, final Throwable throwable) {
+    public static void logCrash(@NonNull Context context,
+                                @NonNull CrashHandlerClient crashHandlerClient,
+                                @NonNull Thread thread,  @NonNull Throwable throwable) {
+        Logger.logInfo(LOG_TAG, "logCrash() for " + thread +  ": " + throwable.getMessage());
+        new CrashHandler(context, crashHandlerClient).logCrash(thread, throwable);
+    }
+
+    public void logCrash(@NonNull Thread thread, @NonNull Throwable throwable) {
+        if (!mCrashHandlerClient.onPreLogCrash(mContext, thread, throwable)) {
+            logCrashToFile(mContext, mCrashHandlerClient, thread, throwable);
+            mCrashHandlerClient.onPostLogCrash(mContext, thread, throwable);
+        }
+    }
+
+    public void logCrashToFile(@NonNull Context context,
+                               @NonNull CrashHandlerClient crashHandlerClient,
+                               @NonNull Thread thread, @NonNull Throwable throwable) {
         StringBuilder reportString = new StringBuilder();
 
         reportString.append("## Crash Details\n");
@@ -79,6 +96,26 @@ public static void logCrash(@NonNull final Context context, @NonNull final Crash
 
     public interface CrashHandlerClient {
 
+        /**
+         * Called before {@link #logCrashToFile(Context, CrashHandlerClient, Thread, Throwable)} is called.
+         *
+         * @param context The {@link Context} passed to {@link CrashHandler#CrashHandler(Context, CrashHandlerClient)}.
+         * @param thread The {@link Thread} in which the crash happened.
+         * @param throwable The {@link Throwable} thrown for the crash.
+         * @return Should return {@code true} if crash has been handled and should not be logged,
+         * otherwise {@code false}.
+         */
+        boolean onPreLogCrash(Context context, Thread thread, Throwable throwable);
+
+        /**
+         * Called after {@link #logCrashToFile(Context, CrashHandlerClient, Thread, Throwable)} is called.
+         *
+         * @param context The {@link Context} passed to {@link CrashHandler#CrashHandler(Context, CrashHandlerClient)}.
+         * @param thread The {@link Thread} in which the crash happened.
+         * @param throwable The {@link Throwable} thrown for the crash.
+         */
+        void onPostLogCrash(Context context, Thread thread, Throwable throwable);
+
         /**
          * Get crash log file path.
          *

From 5f0053138131b0d500790c1075af97e45218fd2a Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 16 Mar 2022 21:13:41 +0500
Subject: [PATCH 691/912] Changed: Move `com.termux.app.utils.CrashUtils` to
 `com.termux.shared.termux.crash.TermuxCrashUtils` so that plugins trigger
 plugin notifications too

Calls to `notifyAppCrashFromCrashLogFile()` will now be synchronized as well.
---
 .../java/com/termux/app/TermuxActivity.java   |   9 +-
 .../java/com/termux/app/TermuxInstaller.java  |   8 +-
 .../com/termux/app/models/UserAction.java     |   1 -
 .../java/com/termux/app/utils/CrashUtils.java | 239 -------------
 .../shared/termux/crash/TermuxCrashUtils.java | 321 ++++++++++++++++++
 .../shared/termux/models/UserAction.java      |  17 +
 termux-shared/src/main/res/raw/keep.xml       |   3 +
 7 files changed, 350 insertions(+), 248 deletions(-)
 delete mode 100644 app/src/main/java/com/termux/app/utils/CrashUtils.java
 create mode 100644 termux-shared/src/main/java/com/termux/shared/termux/models/UserAction.java
 create mode 100644 termux-shared/src/main/res/raw/keep.xml

diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index af85b92ff1..5c8f2f7206 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -40,6 +40,7 @@
 import com.termux.shared.termux.TermuxConstants.TERMUX_APP.TERMUX_ACTIVITY;
 import com.termux.app.activities.HelpActivity;
 import com.termux.app.activities.SettingsActivity;
+import com.termux.shared.termux.crash.TermuxCrashUtils;
 import com.termux.shared.termux.settings.preferences.TermuxAppSharedPreferences;
 import com.termux.app.terminal.TermuxSessionsListViewController;
 import com.termux.app.terminal.io.TerminalToolbarViewPager;
@@ -55,7 +56,6 @@
 import com.termux.shared.view.ViewUtils;
 import com.termux.terminal.TerminalSession;
 import com.termux.terminal.TerminalSessionClient;
-import com.termux.app.utils.CrashUtils;
 import com.termux.view.TerminalView;
 import com.termux.view.TerminalViewClient;
 
@@ -199,10 +199,11 @@ public void onCreate(Bundle savedInstanceState) {
 
         if (savedInstanceState != null)
             mIsActivityRecreated = savedInstanceState.getBoolean(ARG_ACTIVITY_RECREATED, false);
-
-        // Check if a crash happened on last run of the app and show a
+        
+        // Check if a crash happened on last run of the app or if a plugin crashed and show a
         // notification with the crash details if it did
-        CrashUtils.notifyAppCrashOnLastRun(this, LOG_TAG);
+        TermuxCrashUtils.notifyAppCrashFromCrashLogFile(this, LOG_TAG);
+
 
         // Delete ReportInfo serialized object files from cache older than 14 days
         ReportActivity.deleteReportInfoFilesOlderThanXDays(this, 14, false);
diff --git a/app/src/main/java/com/termux/app/TermuxInstaller.java b/app/src/main/java/com/termux/app/TermuxInstaller.java
index f31230aaf1..47dcd28ece 100644
--- a/app/src/main/java/com/termux/app/TermuxInstaller.java
+++ b/app/src/main/java/com/termux/app/TermuxInstaller.java
@@ -10,8 +10,8 @@
 import android.view.WindowManager;
 
 import com.termux.R;
-import com.termux.app.utils.CrashUtils;
 import com.termux.shared.file.FileUtils;
+import com.termux.shared.termux.crash.TermuxCrashUtils;
 import com.termux.shared.termux.file.TermuxFileUtils;
 import com.termux.shared.interact.MessageDialogUtils;
 import com.termux.shared.logger.Logger;
@@ -256,7 +256,7 @@ private static void sendBootstrapCrashReportNotification(Activity activity, Stri
 
         // Add info of all install Termux plugin apps as well since their target sdk or installation
         // on external/portable sd card can affect Termux app files directory access or exec.
-        CrashUtils.sendCrashReportNotification(activity, LOG_TAG,
+        TermuxCrashUtils.sendCrashReportNotification(activity, LOG_TAG,
             title, null, "## " + title + "\n\n" + message + "\n\n" +
                 TermuxUtils.getTermuxDebugMarkdownString(activity),
             true, false, TermuxUtils.AppInfoMode.TERMUX_AND_PLUGIN_PACKAGES, true);
@@ -278,7 +278,7 @@ public void run() {
                     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, title, null,
+                        TermuxCrashUtils.sendCrashReportNotification(context, LOG_TAG, title, null,
                             "## " + title + "\n\n" + Error.getErrorMarkdownString(error),
                             true, false, TermuxUtils.AppInfoMode.TERMUX_PACKAGE, true);
                         return;
@@ -319,7 +319,7 @@ public void run() {
                 } 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, title, null,
+                    TermuxCrashUtils.sendCrashReportNotification(context, LOG_TAG, title, null,
                         "## " + title + "\n\n" + Logger.getStackTracesMarkdownString(null, Logger.getStackTracesStringArray(e)),
                         true, false, TermuxUtils.AppInfoMode.TERMUX_PACKAGE, true);
                 }
diff --git a/app/src/main/java/com/termux/app/models/UserAction.java b/app/src/main/java/com/termux/app/models/UserAction.java
index ee47605a07..d32005f2a7 100644
--- a/app/src/main/java/com/termux/app/models/UserAction.java
+++ b/app/src/main/java/com/termux/app/models/UserAction.java
@@ -3,7 +3,6 @@
 public enum UserAction {
 
     ABOUT("about"),
-    CRASH_REPORT("crash report"),
     PLUGIN_EXECUTION_COMMAND("plugin execution command"),
     REPORT_ISSUE_FROM_TRANSCRIPT("report issue from transcript");
 
diff --git a/app/src/main/java/com/termux/app/utils/CrashUtils.java b/app/src/main/java/com/termux/app/utils/CrashUtils.java
deleted file mode 100644
index b93e8237c2..0000000000
--- a/app/src/main/java/com/termux/app/utils/CrashUtils.java
+++ /dev/null
@@ -1,239 +0,0 @@
-package com.termux.app.utils;
-
-import android.app.Notification;
-import android.app.NotificationManager;
-import android.app.PendingIntent;
-import android.content.Context;
-import android.os.Environment;
-
-import androidx.annotation.Nullable;
-
-import com.termux.R;
-import com.termux.shared.activities.ReportActivity;
-import com.termux.shared.markdown.MarkdownUtils;
-import com.termux.shared.errors.Error;
-import com.termux.shared.notification.NotificationUtils;
-import com.termux.shared.file.FileUtils;
-import com.termux.shared.models.ReportInfo;
-import com.termux.app.models.UserAction;
-import com.termux.shared.termux.notification.TermuxNotificationUtils;
-import com.termux.shared.termux.settings.preferences.TermuxAppSharedPreferences;
-import com.termux.shared.termux.settings.preferences.TermuxPreferenceConstants;
-import com.termux.shared.data.DataUtils;
-import com.termux.shared.logger.Logger;
-import com.termux.shared.android.AndroidUtils;
-import com.termux.shared.termux.TermuxUtils;
-
-import com.termux.shared.termux.TermuxConstants;
-
-import java.nio.charset.Charset;
-
-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
-     * created by {@link com.termux.shared.crash.CrashHandler}.
-     *
-     * If the crash log file exists and is not empty and
-     * {@link TermuxPreferenceConstants.TERMUX_APP#KEY_CRASH_REPORT_NOTIFICATIONS_ENABLED} is
-     * enabled, then a notification will be shown for the crash on the
-     * {@link TermuxConstants#TERMUX_CRASH_REPORTS_NOTIFICATION_CHANNEL_NAME} channel, otherwise nothing will be done.
-     *
-     * After reading from the crash log file, it will be moved to {@link TermuxConstants#TERMUX_CRASH_LOG_BACKUP_FILE_PATH}.
-     *
-     * @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) {
-        if (context == null) return;
-
-        TermuxAppSharedPreferences preferences = TermuxAppSharedPreferences.build(context);
-        if (preferences == null) return;
-
-        // If user has disabled notifications for crashes
-        if (!preferences.areCrashReportNotificationsEnabled())
-            return;
-
-        new Thread() {
-            @Override
-            public void run() {
-                String logTag = DataUtils.getDefaultIfNull(logTagParam, LOG_TAG);
-
-                if (!FileUtils.regularFileExists(TermuxConstants.TERMUX_CRASH_LOG_FILE_PATH, false))
-                    return;
-
-                Error error;
-                StringBuilder reportStringBuilder = new StringBuilder();
-
-                // Read report string from crash log file
-                error = FileUtils.readTextFromFile("crash log", TermuxConstants.TERMUX_CRASH_LOG_FILE_PATH, Charset.defaultCharset(), reportStringBuilder, false);
-                if (error != null) {
-                    Logger.logErrorExtended(logTag, error.toString());
-                    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());
-                }
-
-                String reportString = reportStringBuilder.toString();
-
-                if (reportString.isEmpty())
-                    return;
-
-                Logger.logDebug(logTag, "A crash log file found at \"" + TermuxConstants.TERMUX_CRASH_LOG_FILE_PATH +  "\".");
-
-                sendCrashReportNotification(context, logTag, null, null, reportString, false, false, null, false);
-            }
-        }.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 title The title for the crash report and notification.
-     * @param notificationTextString The text of the notification.
-     * @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 showToast If set to {@code true}, then a toast will be shown for {@code notificationTextString}.
-     * @param appInfoMode The {@link TermuxUtils.AppInfoMode} to use to add app info to the message.
-     *                    Set to {@code null} if app info should not be appended to the message.
-     * @param addDeviceInfo If set to {@code true}, then device info should be appended to the message.
-     */
-    public static void sendCrashReportNotification(final Context context, String logTag,
-                                                   CharSequence title,
-                                                   String notificationTextString,
-                                                   String message, boolean forceNotification,
-                                                   boolean showToast,
-                                                   TermuxUtils.AppInfoMode appInfoMode,
-                                                   boolean addDeviceInfo) {
-        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);
-
-        if (showToast)
-            Logger.showToast(context, notificationTextString, true);
-
-        // Send a notification to show the crash log which when clicked will open the {@link ReportActivity}
-        // to show the details of the crash
-        if (title == null || title.toString().isEmpty())
-            title = TermuxConstants.TERMUX_APP_NAME + " Crash Report";
-
-        Logger.logDebug(logTag, "Sending \"" + title + "\" notification.");
-
-        StringBuilder reportString = new StringBuilder(message);
-
-        if (appInfoMode != null)
-            reportString.append("\n\n").append(TermuxUtils.getAppInfoMarkdownString(context, appInfoMode));
-
-        if (addDeviceInfo)
-            reportString.append("\n\n").append(AndroidUtils.getDeviceInfoMarkdownString(context));
-
-        String userActionName = UserAction.CRASH_REPORT.getName();
-
-        ReportInfo reportInfo = new ReportInfo(userActionName, logTag, title.toString());
-        reportInfo.setReportString(reportString.toString());
-        reportInfo.setReportStringSuffix("\n\n" + TermuxUtils.getReportIssueMarkdownString(context));
-        reportInfo.setAddReportInfoHeaderToMarkdown(true);
-        reportInfo.setReportSaveFileLabelAndPath(userActionName,
-            Environment.getExternalStorageDirectory() + "/" +
-                FileUtils.sanitizeFileName(TermuxConstants.TERMUX_APP_NAME + "-" + userActionName + ".log", true, true));
-
-        ReportActivity.NewInstanceResult result = ReportActivity.newInstance(context, reportInfo);
-        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);
-
-        // Use markdown in notification
-        CharSequence notificationTextCharSequence = MarkdownUtils.getSpannedMarkdownText(context, notificationTextString);
-        //CharSequence notificationTextCharSequence = notificationTextString;
-
-        // Build the notification
-        Notification.Builder builder = getCrashReportsNotificationBuilder(context, title,
-            notificationTextCharSequence, notificationTextCharSequence, 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}.
-     *
-     * @param context The {@link Context} for operations.
-     * @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 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) {
-
-        Notification.Builder builder =  NotificationUtils.geNotificationBuilder(context,
-            TermuxConstants.TERMUX_CRASH_REPORTS_NOTIFICATION_CHANNEL_ID, Notification.PRIORITY_HIGH,
-            title, notificationText, notificationBigText, contentIntent, deleteIntent, notificationMode);
-
-        if (builder == null)  return null;
-
-        // Enable timestamp
-        builder.setShowWhen(true);
-
-        // Set notification icon
-        builder.setSmallIcon(R.drawable.ic_error_notification);
-
-        // Set background color for small notification icon
-        builder.setColor(0xFF607D8B);
-
-        // Dismiss on click
-        builder.setAutoCancel(true);
-
-        return builder;
-    }
-
-    /**
-     * Setup the notification channel 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.
-     */
-    public static void setupCrashReportsNotificationChannel(final Context context) {
-        NotificationUtils.setupNotificationChannel(context, TermuxConstants.TERMUX_CRASH_REPORTS_NOTIFICATION_CHANNEL_ID,
-            TermuxConstants.TERMUX_CRASH_REPORTS_NOTIFICATION_CHANNEL_NAME, NotificationManager.IMPORTANCE_HIGH);
-    }
-
-}
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/crash/TermuxCrashUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/crash/TermuxCrashUtils.java
index e7bc71009d..69b8d40813 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/crash/TermuxCrashUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/crash/TermuxCrashUtils.java
@@ -1,12 +1,36 @@
 package com.termux.shared.termux.crash;
 
+import android.app.Notification;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
 import android.content.Context;
+import android.content.Intent;
+import android.graphics.drawable.Icon;
+import android.os.Environment;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
+import com.termux.shared.R;
+import com.termux.shared.activities.ReportActivity;
+import com.termux.shared.android.AndroidUtils;
 import com.termux.shared.crash.CrashHandler;
+import com.termux.shared.data.DataUtils;
+import com.termux.shared.errors.Error;
+import com.termux.shared.file.FileUtils;
+import com.termux.shared.logger.Logger;
+import com.termux.shared.markdown.MarkdownUtils;
+import com.termux.shared.models.ReportInfo;
+import com.termux.shared.notification.NotificationUtils;
 import com.termux.shared.termux.TermuxConstants;
+import com.termux.shared.termux.TermuxConstants.TERMUX_APP;
 import com.termux.shared.termux.TermuxUtils;
+import com.termux.shared.termux.models.UserAction;
+import com.termux.shared.termux.notification.TermuxNotificationUtils;
+import com.termux.shared.termux.settings.preferences.TermuxAppSharedPreferences;
+import com.termux.shared.termux.settings.preferences.TermuxPreferenceConstants;
+
+import java.nio.charset.Charset;
 
 public class TermuxCrashUtils implements CrashHandler.CrashHandlerClient {
 
@@ -29,4 +53,301 @@ public String getAppInfoMarkdownString(Context context) {
         return TermuxUtils.getAppInfoMarkdownString(context, true);
     }
 
+    /**
+     * Notify the user of an 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
+     * {@link TermuxPreferenceConstants.TERMUX_APP#KEY_CRASH_REPORT_NOTIFICATIONS_ENABLED} is
+     * enabled, then a notification will be shown for the crash on the
+     * {@link TermuxConstants#TERMUX_CRASH_REPORTS_NOTIFICATION_CHANNEL_NAME} channel, otherwise nothing will be done.
+     *
+     * After reading from the crash log file, it will be moved to {@link TermuxConstants#TERMUX_CRASH_LOG_BACKUP_FILE_PATH}.
+     *
+     * @param currentPackageContext The {@link Context} of current package.
+     * @param logTagParam The log tag to use for logging.
+     */
+    public static void notifyAppCrashFromCrashLogFile(final Context currentPackageContext, final String logTagParam) {
+        if (currentPackageContext == null) return;
+        String currentPackageName = currentPackageContext.getPackageName();
+
+        final Context context = TermuxUtils.getTermuxPackageContext(currentPackageContext);
+        if (context == null) {
+            Logger.logWarn(LOG_TAG, "Ignoring call to notifyAppCrash() since failed to get \"" + TermuxConstants.TERMUX_PACKAGE_NAME + "\" package context from \"" + currentPackageName + "\" context");
+            return;
+        }
+
+        TermuxAppSharedPreferences preferences = TermuxAppSharedPreferences.build(context);
+        if (preferences == null) return;
+
+        // If user has disabled notifications for crashes
+        if (!preferences.areCrashReportNotificationsEnabled(false))
+            return;
+
+        new Thread() {
+            @Override
+            public void run() {
+                notifyAppCrashFromCrashLogFileInner(context, logTagParam);
+            }
+        }.start();
+    }
+
+    private static synchronized void notifyAppCrashFromCrashLogFileInner(final Context context, final String logTagParam) {
+        String logTag = DataUtils.getDefaultIfNull(logTagParam, LOG_TAG);
+
+        if (!FileUtils.regularFileExists(TermuxConstants.TERMUX_CRASH_LOG_FILE_PATH, false))
+            return;
+
+        Error error;
+        StringBuilder reportStringBuilder = new StringBuilder();
+
+        // Read report string from crash log file
+        error = FileUtils.readTextFromFile("crash log", TermuxConstants.TERMUX_CRASH_LOG_FILE_PATH, Charset.defaultCharset(), reportStringBuilder, false);
+        if (error != null) {
+            Logger.logErrorExtended(logTag, error.toString());
+            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());
+        }
+
+        String reportString = reportStringBuilder.toString();
+
+        if (reportString.isEmpty())
+            return;
+
+        Logger.logDebug(logTag, "A crash log file found at \"" + TermuxConstants.TERMUX_CRASH_LOG_FILE_PATH +  "\".");
+
+        sendCrashReportNotification(context, logTag, null, null, reportString, false, false, null, false);
+    }
+
+
+
+
+    /**
+     * Send a crash report notification for {@link TermuxConstants#TERMUX_CRASH_REPORTS_NOTIFICATION_CHANNEL_ID}
+     * and {@link TermuxConstants#TERMUX_CRASH_REPORTS_NOTIFICATION_CHANNEL_NAME}.
+     *
+     * @param currentPackageContext The {@link Context} of current package.
+     * @param logTag The log tag to use for logging.
+     * @param title The title for the crash report and notification.
+     * @param message The message for the crash report.
+     * @param throwable The {@link Throwable} for the crash report.
+     */
+    public static void sendPluginCrashReportNotification(final Context currentPackageContext, String logTag,
+                                                         CharSequence title, String message, Throwable throwable) {
+        TermuxCrashUtils.sendPluginCrashReportNotification(currentPackageContext, logTag,
+            title, message,
+            MarkdownUtils.getMarkdownCodeForString(Logger.getMessageAndStackTraceString(message, throwable), true),
+            false, false, true);
+    }
+
+    /**
+     * Send a crash report notification for {@link TermuxConstants#TERMUX_CRASH_REPORTS_NOTIFICATION_CHANNEL_ID}
+     * and {@link TermuxConstants#TERMUX_CRASH_REPORTS_NOTIFICATION_CHANNEL_NAME}.
+     *
+     * @param currentPackageContext The {@link Context} of current package.
+     * @param logTag The log tag to use for logging.
+     * @param title The title for the crash report and notification.
+     * @param notificationTextString The text of the notification.
+     * @param message The message for the crash report.
+     */
+    public static void sendPluginCrashReportNotification(final Context currentPackageContext, String logTag,
+                                                         CharSequence title, String notificationTextString,
+                                                         String message) {
+        TermuxCrashUtils.sendPluginCrashReportNotification(currentPackageContext, logTag,
+            title, notificationTextString, message,
+            false, false, true);
+    }
+
+    /**
+     * Send a crash report notification for {@link TermuxConstants#TERMUX_CRASH_REPORTS_NOTIFICATION_CHANNEL_ID}
+     * and {@link TermuxConstants#TERMUX_CRASH_REPORTS_NOTIFICATION_CHANNEL_NAME}.
+     *
+     * @param currentPackageContext The {@link Context} of current package.
+     * @param logTag The log tag to use for logging.
+     * @param title The title for the crash report and notification.
+     * @param notificationTextString The text of the notification.
+     * @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 showToast If set to {@code true}, then a toast will be shown for {@code notificationTextString}.
+     * @param addDeviceInfo If set to {@code true}, then device info should be appended to the message.
+     */
+    public static void sendPluginCrashReportNotification(final Context currentPackageContext, String logTag,
+                                                         CharSequence title, String notificationTextString,
+                                                         String message, boolean forceNotification,
+                                                         boolean showToast,
+                                                         boolean addDeviceInfo) {
+        TermuxCrashUtils.sendCrashReportNotification(currentPackageContext, logTag,
+            title, notificationTextString, "## " + title + "\n\n" + message + "\n\n",
+            forceNotification, showToast, TermuxUtils.AppInfoMode.TERMUX_AND_PLUGIN_PACKAGE, addDeviceInfo);
+    }
+
+    /**
+     * Send a crash report notification for {@link TermuxConstants#TERMUX_CRASH_REPORTS_NOTIFICATION_CHANNEL_ID}
+     * and {@link TermuxConstants#TERMUX_CRASH_REPORTS_NOTIFICATION_CHANNEL_NAME}.
+     *
+     * @param currentPackageContext The {@link Context} of current package.
+     * @param logTag The log tag to use for logging.
+     * @param title The title for the crash report and notification.
+     * @param notificationTextString The text of the notification.
+     * @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 showToast If set to {@code true}, then a toast will be shown for {@code notificationTextString}.
+     * @param appInfoMode The {@link TermuxUtils.AppInfoMode} to use to add app info to the message.
+     *                    Set to {@code null} if app info should not be appended to the message.
+     * @param addDeviceInfo If set to {@code true}, then device info should be appended to the message.
+     */
+    public static void sendCrashReportNotification(final Context currentPackageContext, String logTag,
+                                                   CharSequence title,
+                                                   String notificationTextString,
+                                                   String message, boolean forceNotification,
+                                                   boolean showToast,
+                                                   TermuxUtils.AppInfoMode appInfoMode,
+                                                   boolean addDeviceInfo) {
+        // Note: Do not change currentPackageContext or termuxPackageContext passed to functions or things will break
+
+        if (currentPackageContext == null) return;
+        String currentPackageName = currentPackageContext.getPackageName();
+
+        final Context termuxPackageContext = TermuxUtils.getTermuxPackageContext(currentPackageContext);
+        if (termuxPackageContext == null) {
+            Logger.logWarn(LOG_TAG, "Ignoring call to sendCrashReportNotification() since failed to get \"" + TermuxConstants.TERMUX_PACKAGE_NAME + "\" package context from \"" + currentPackageName + "\" context");
+            return;
+        }
+
+        TermuxAppSharedPreferences preferences = TermuxAppSharedPreferences.build(termuxPackageContext);
+        if (preferences == null) return;
+
+        // If user has disabled notifications for crashes
+        if (!preferences.areCrashReportNotificationsEnabled(true) && !forceNotification)
+            return;
+
+        logTag = DataUtils.getDefaultIfNull(logTag, LOG_TAG);
+
+        if (showToast)
+            Logger.showToast(currentPackageContext, notificationTextString, true);
+
+        // Send a notification to show the crash log which when clicked will open the {@link ReportActivity}
+        // to show the details of the crash
+        if (title == null || title.toString().isEmpty())
+            title = TermuxConstants.TERMUX_APP_NAME + " Crash Report";
+
+        Logger.logDebug(logTag, "Sending \"" + title + "\" notification.");
+
+        StringBuilder reportString = new StringBuilder(message);
+
+        if (appInfoMode != null)
+            reportString.append("\n\n").append(TermuxUtils.getAppInfoMarkdownString(currentPackageContext, appInfoMode, currentPackageName));
+
+        if (addDeviceInfo)
+            reportString.append("\n\n").append(AndroidUtils.getDeviceInfoMarkdownString(currentPackageContext));
+
+        String userActionName = UserAction.CRASH_REPORT.getName();
+
+        ReportInfo reportInfo = new ReportInfo(userActionName, logTag, title.toString());
+        reportInfo.setReportString(reportString.toString());
+        reportInfo.setReportStringSuffix("\n\n" + TermuxUtils.getReportIssueMarkdownString(currentPackageContext));
+        reportInfo.setAddReportInfoHeaderToMarkdown(true);
+        reportInfo.setReportSaveFileLabelAndPath(userActionName,
+            Environment.getExternalStorageDirectory() + "/" +
+                FileUtils.sanitizeFileName(TermuxConstants.TERMUX_APP_NAME + "-" + userActionName + ".log", true, true));
+
+        ReportActivity.NewInstanceResult result = ReportActivity.newInstance(termuxPackageContext, reportInfo);
+        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(termuxPackageContext);
+
+        PendingIntent contentIntent = PendingIntent.getActivity(termuxPackageContext, nextNotificationId, result.contentIntent, PendingIntent.FLAG_UPDATE_CURRENT);
+
+        PendingIntent deleteIntent = null;
+        if (result.deleteIntent != null)
+            deleteIntent = PendingIntent.getBroadcast(termuxPackageContext, nextNotificationId, result.deleteIntent, PendingIntent.FLAG_UPDATE_CURRENT);
+
+        // Setup the notification channel if not already set up
+        setupCrashReportsNotificationChannel(termuxPackageContext);
+
+        // Use markdown in notification
+        CharSequence notificationTextCharSequence = MarkdownUtils.getSpannedMarkdownText(termuxPackageContext, notificationTextString);
+        //CharSequence notificationTextCharSequence = notificationTextString;
+
+        // Build the notification
+        Notification.Builder builder = getCrashReportsNotificationBuilder(currentPackageContext, termuxPackageContext,
+            title, notificationTextCharSequence, notificationTextCharSequence, contentIntent, deleteIntent,
+            NotificationUtils.NOTIFICATION_MODE_VIBRATE);
+        if (builder == null) return;
+
+        // Send the notification
+        NotificationManager notificationManager = NotificationUtils.getNotificationManager(termuxPackageContext);
+        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}.
+     *
+     * @param currentPackageContext The {@link Context} of current package.
+     * @param termuxPackageContext The {@link Context} of termux package.
+     * @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 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 currentPackageContext,
+                                                                          final Context termuxPackageContext,
+                                                                          final CharSequence title,
+                                                                          final CharSequence notificationText,
+                                                                          final CharSequence notificationBigText,
+                                                                          final PendingIntent contentIntent,
+                                                                          final PendingIntent deleteIntent,
+                                                                          final int notificationMode) {
+
+        Notification.Builder builder =  NotificationUtils.geNotificationBuilder(termuxPackageContext,
+            TermuxConstants.TERMUX_CRASH_REPORTS_NOTIFICATION_CHANNEL_ID, Notification.PRIORITY_HIGH,
+            title, notificationText, notificationBigText, contentIntent, deleteIntent, notificationMode);
+
+        if (builder == null)  return null;
+
+        // Enable timestamp
+        builder.setShowWhen(true);
+
+        // Set notification icon
+        builder.setSmallIcon(Icon.createWithResource(currentPackageContext, R.drawable.ic_error_notification));
+
+        // Set background color for small notification icon
+        builder.setColor(0xFF607D8B);
+
+        // Dismiss on click
+        builder.setAutoCancel(true);
+
+        return builder;
+    }
+
+    /**
+     * Setup the notification channel 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.
+     */
+    public static void setupCrashReportsNotificationChannel(final Context context) {
+        NotificationUtils.setupNotificationChannel(context, TermuxConstants.TERMUX_CRASH_REPORTS_NOTIFICATION_CHANNEL_ID,
+            TermuxConstants.TERMUX_CRASH_REPORTS_NOTIFICATION_CHANNEL_NAME, NotificationManager.IMPORTANCE_HIGH);
+    }
+
 }
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/models/UserAction.java b/termux-shared/src/main/java/com/termux/shared/termux/models/UserAction.java
new file mode 100644
index 0000000000..fe89d0f8ae
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/termux/models/UserAction.java
@@ -0,0 +1,17 @@
+package com.termux.shared.termux.models;
+
+public enum UserAction {
+
+    CRASH_REPORT("crash report");
+
+    private final String name;
+
+    UserAction(final String name) {
+        this.name = name;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+}
diff --git a/termux-shared/src/main/res/raw/keep.xml b/termux-shared/src/main/res/raw/keep.xml
new file mode 100644
index 0000000000..7b29406ce1
--- /dev/null
+++ b/termux-shared/src/main/res/raw/keep.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools"
+    tools:keep="@drawable/ic_error_notification"/>

From 477b36acd1a661df7d056a60c77583b36a10aba1 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 16 Mar 2022 21:19:52 +0500
Subject: [PATCH 692/912] Added: Add support for `ACTION_NOTIFY_APP_CRASH` in
 receiver registered by `TermuxActivity` to notify users of plugin app crashes

Once plugins integrate changes for `TermuxCrashUtils.onPostLogCrash()`, they will send the `ACTION_NOTIFY_APP_CRASH` broadcast when an uncaught exception is caught by `CrashHandler`. If `TermuxActivity` is in foreground, then it will receive the broadcast and notify user of the crash by reading it from the crash log file without the user having to restart termux app to be notified.
---
 .../java/com/termux/app/TermuxActivity.java   | 13 ++--
 .../termux/shared/termux/TermuxConstants.java | 13 +++-
 .../shared/termux/crash/TermuxCrashUtils.java | 60 ++++++++++++++++++-
 3 files changed, 78 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index 5c8f2f7206..acbe840c67 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -907,8 +907,9 @@ public static void updateTermuxActivityStyling(Context context, boolean recreate
 
     private void registerTermuxActivityBroadcastReceiver() {
         IntentFilter intentFilter = new IntentFilter();
-        intentFilter.addAction(TERMUX_ACTIVITY.ACTION_REQUEST_PERMISSIONS);
+        intentFilter.addAction(TERMUX_ACTIVITY.ACTION_NOTIFY_APP_CRASH);
         intentFilter.addAction(TERMUX_ACTIVITY.ACTION_RELOAD_STYLE);
+        intentFilter.addAction(TERMUX_ACTIVITY.ACTION_REQUEST_PERMISSIONS);
 
         registerReceiver(mTermuxActivityBroadcastReceiver, intentFilter);
     }
@@ -936,14 +937,18 @@ public void onReceive(Context context, Intent intent) {
                 fixTermuxActivityBroadcastReceieverIntent(intent);
 
                 switch (intent.getAction()) {
-                    case TERMUX_ACTIVITY.ACTION_REQUEST_PERMISSIONS:
-                        Logger.logDebug(LOG_TAG, "Received intent to request storage permissions");
-                        requestStoragePermission(false);
+                    case TERMUX_ACTIVITY.ACTION_NOTIFY_APP_CRASH:
+                        Logger.logDebug(LOG_TAG, "Received intent to notify app crash");
+                        TermuxCrashUtils.notifyAppCrashFromCrashLogFile(context, LOG_TAG);
                         return;
                     case TERMUX_ACTIVITY.ACTION_RELOAD_STYLE:
                         Logger.logDebug(LOG_TAG, "Received intent to reload styling");
                         reloadActivityStyling(intent.getBooleanExtra(TERMUX_ACTIVITY.EXTRA_RECREATE_ACTIVITY, true));
                         return;
+                    case TERMUX_ACTIVITY.ACTION_REQUEST_PERMISSIONS:
+                        Logger.logDebug(LOG_TAG, "Received intent to request storage permissions");
+                        requestStoragePermission(false);
+                        return;
                     default:
                 }
             }
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
index b7d6541114..3c5e0a8e91 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
@@ -8,7 +8,7 @@
 import java.util.List;
 
 /*
- * Version: v0.37.0
+ * Version: v0.38.0
  * SPDX-License-Identifier: MIT
  *
  * Changelog
@@ -223,6 +223,9 @@
  *
  * - 0.37.0 (2022-03-15)
  *  - Added `TERMUX_API_APT_*`.
+ *
+ * - 0.38.0 (2022-03-16)
+ *      - Added `TERMUX_APP.TERMUX_ACTIVITY.ACTION_NOTIFY_APP_CRASH`.
  */
 
 /**
@@ -874,8 +877,9 @@ public static final class TERMUX_ACTIVITY {
             public static final String EXTRA_FAILSAFE_SESSION = TermuxConstants.TERMUX_PACKAGE_NAME + ".app.failsafe_session"; // Default: "com.termux.app.failsafe_session"
 
 
-            /** Intent action to make termux request storage permissions */
-            public static final String ACTION_REQUEST_PERMISSIONS = TermuxConstants.TERMUX_PACKAGE_NAME + ".app.request_storage_permissions"; // Default: "com.termux.app.request_storage_permissions"
+            /** Intent action to make termux app notify user that a crash happened. */
+            public static final String ACTION_NOTIFY_APP_CRASH = TermuxConstants.TERMUX_PACKAGE_NAME + ".app.notify_app_crash"; // Default: "com.termux.app.notify_app_crash"
+
 
             /** Intent action to make termux reload its termux session styling */
             public static final String ACTION_RELOAD_STYLE = TermuxConstants.TERMUX_PACKAGE_NAME + ".app.reload_style"; // Default: "com.termux.app.reload_style"
@@ -886,6 +890,9 @@ public static final class TERMUX_ACTIVITY {
             /**  Intent {@code boolean} extra for whether to recreate activity for the TERMUX_ACTIVITY.ACTION_RELOAD_STYLE intent. */
             public static final String EXTRA_RECREATE_ACTIVITY = TERMUX_APP.TERMUX_ACTIVITY_NAME + ".EXTRA_RECREATE_ACTIVITY"; // Default: "com.termux.app.TermuxActivity.EXTRA_RECREATE_ACTIVITY"
 
+
+            /** Intent action to make termux request storage permissions */
+            public static final String ACTION_REQUEST_PERMISSIONS = TermuxConstants.TERMUX_PACKAGE_NAME + ".app.request_storage_permissions"; // Default: "com.termux.app.request_storage_permissions"
         }
 
 
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/crash/TermuxCrashUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/crash/TermuxCrashUtils.java
index 69b8d40813..748f569ae4 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/crash/TermuxCrashUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/crash/TermuxCrashUtils.java
@@ -34,12 +34,70 @@
 
 public class TermuxCrashUtils implements CrashHandler.CrashHandlerClient {
 
+    public enum TYPE {
+        UNCAUGHT_EXCEPTION,
+        CAUGHT_EXCEPTION;
+    }
+
+    private final TYPE mType;
+
+    private static final String LOG_TAG = "TermuxCrashUtils";
+
+    TermuxCrashUtils(TYPE type) {
+        mType = type;
+    }
+
     /**
      * Set default uncaught crash handler of current thread to {@link CrashHandler} for Termux app
      * and its plugin to log crashes at {@link TermuxConstants#TERMUX_CRASH_LOG_FILE_PATH}.
      */
     public static void setCrashHandler(@NonNull final Context context) {
-        CrashHandler.setCrashHandler(context, new TermuxCrashUtils());
+        CrashHandler.setCrashHandler(context, new TermuxCrashUtils(TYPE.UNCAUGHT_EXCEPTION));
+    }
+
+    /**
+     * Log a crash to {@link TermuxConstants#TERMUX_CRASH_LOG_FILE_PATH} and notify termux app
+     * by sending it the {@link TERMUX_APP.TERMUX_ACTIVITY#ACTION_NOTIFY_APP_CRASH} broadcast.
+     *
+     * @param context The {@link Context} for operations.
+     * @param throwable The {@link Throwable} thrown for the crash.
+     */
+    public static void logCrash(@NonNull final Context context, final Throwable throwable) {
+        if (throwable == null) return;
+        CrashHandler.logCrash(context, new TermuxCrashUtils(TYPE.CAUGHT_EXCEPTION), Thread.currentThread(), throwable);
+    }
+
+    @Override
+    public boolean onPreLogCrash(Context context, Thread thread, Throwable throwable) {
+        return false;
+    }
+
+    @Override
+    public void onPostLogCrash(final Context currentPackageContext, Thread thread, Throwable throwable) {
+        if (currentPackageContext == null) return;
+        String currentPackageName = currentPackageContext.getPackageName();
+
+        // Do not notify if is a non-termux app
+        final Context context = TermuxUtils.getTermuxPackageContext(currentPackageContext);
+        if (context == null) {
+            Logger.logWarn(LOG_TAG, "Ignoring call to onPostLogCrash() since failed to get \"" + TermuxConstants.TERMUX_PACKAGE_NAME + "\" package context from \"" + currentPackageName + "\" context");
+            return;
+        }
+
+        // If an uncaught exception, then do not notify since the termux app itself would be crashing
+        if (TYPE.UNCAUGHT_EXCEPTION.equals(mType) && TermuxConstants.TERMUX_PACKAGE_NAME.equals(currentPackageName))
+            return;
+
+        String message = TERMUX_APP.TERMUX_ACTIVITY_NAME + " that \"" + currentPackageName + "\" app crashed";
+
+       try {
+           Logger.logInfo(LOG_TAG, "Sending broadcast to notify " + message);
+            Intent intent = new Intent(TERMUX_APP.TERMUX_ACTIVITY.ACTION_NOTIFY_APP_CRASH);
+            intent.setPackage(TermuxConstants.TERMUX_PACKAGE_NAME);
+            context.sendBroadcast(intent);
+        } catch (Exception e) {
+            Logger.logStackTraceWithMessage(LOG_TAG,"Failed to notify " + message, e);
+        }
     }
 
     @NonNull

From cc58ddde31698ba68702d6f708eca5d557bed0ec Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 16 Mar 2022 21:22:38 +0500
Subject: [PATCH 693/912] Changed: Check crash log file whenever
 `TermuxActivity` is resumed instead of only on app startup

This adds onto 06dbfbdb since receiver would not be registered to receive `ACTION_NOTIFY_APP_CRASH` if `TermuxActivity` was not be in foreground
---
 app/src/main/java/com/termux/app/TermuxActivity.java | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index acbe840c67..3b0320f232 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -199,11 +199,6 @@ public void onCreate(Bundle savedInstanceState) {
 
         if (savedInstanceState != null)
             mIsActivityRecreated = savedInstanceState.getBoolean(ARG_ACTIVITY_RECREATED, false);
-        
-        // Check if a crash happened on last run of the app or if a plugin crashed and show a
-        // notification with the crash details if it did
-        TermuxCrashUtils.notifyAppCrashFromCrashLogFile(this, LOG_TAG);
-
 
         // Delete ReportInfo serialized object files from cache older than 14 days
         ReportActivity.deleteReportInfoFilesOlderThanXDays(this, 14, false);
@@ -316,6 +311,10 @@ public void onResume() {
         if (mTermuxTerminalViewClient != null)
             mTermuxTerminalViewClient.onResume();
 
+        // Check if a crash happened on last run of the app or if a plugin crashed and show a
+        // notification with the crash details if it did
+        TermuxCrashUtils.notifyAppCrashFromCrashLogFile(this, LOG_TAG);
+
         mIsOnResumeAfterOnCreate = false;
     }
 

From e0074f280f7d168071bba145384868101ca0a485 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 17 Mar 2022 02:30:41 +0500
Subject: [PATCH 694/912] Fixed: Fix typos

---
 .../java/com/termux/app/TermuxActivity.java   |  8 ++++----
 .../TermuxAPIAppSharedPreferences.java        | 19 +++++++++----------
 .../TermuxAppSharedPreferences.java           |  7 +++----
 .../TermuxBootAppSharedPreferences.java       | 19 +++++++++----------
 .../TermuxFloatAppSharedPreferences.java      |  7 +++----
 .../TermuxStylingAppSharedPreferences.java    | 19 +++++++++----------
 .../TermuxTaskerAppSharedPreferences.java     | 11 +++++------
 .../TermuxWidgetAppSharedPreferences.java     | 19 +++++++++----------
 .../properties/TermuxPropertyConstants.java   |  4 ++--
 .../properties/TermuxSharedProperties.java    | 12 ++++++------
 10 files changed, 59 insertions(+), 66 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index 3b0320f232..548566e269 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -336,7 +336,7 @@ protected void onStop() {
 
         removeTermuxActivityRootViewGlobalLayoutListener();
 
-        unregisterTermuxActivityBroadcastReceiever();
+        unregisterTermuxActivityBroadcastReceiver();
         getDrawer().closeDrawers();
     }
 
@@ -913,11 +913,11 @@ private void registerTermuxActivityBroadcastReceiver() {
         registerReceiver(mTermuxActivityBroadcastReceiver, intentFilter);
     }
 
-    private void unregisterTermuxActivityBroadcastReceiever() {
+    private void unregisterTermuxActivityBroadcastReceiver() {
         unregisterReceiver(mTermuxActivityBroadcastReceiver);
     }
 
-    private void fixTermuxActivityBroadcastReceieverIntent(Intent intent) {
+    private void fixTermuxActivityBroadcastReceiverIntent(Intent intent) {
         if (intent == null) return;
 
         String extraReloadStyle = intent.getStringExtra(TERMUX_ACTIVITY.EXTRA_RELOAD_STYLE);
@@ -933,7 +933,7 @@ public void onReceive(Context context, Intent intent) {
             if (intent == null) return;
 
             if (mIsVisible) {
-                fixTermuxActivityBroadcastReceieverIntent(intent);
+                fixTermuxActivityBroadcastReceiverIntent(intent);
 
                 switch (intent.getAction()) {
                     case TERMUX_ACTIVITY.ACTION_NOTIFY_APP_CRASH:
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxAPIAppSharedPreferences.java b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxAPIAppSharedPreferences.java
index e8f4505c4a..228f9cc4f3 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxAPIAppSharedPreferences.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxAPIAppSharedPreferences.java
@@ -1,6 +1,5 @@
 package com.termux.shared.termux.settings.preferences;
 
-import android.app.Activity;
 import android.content.Context;
 import android.content.SharedPreferences;
 
@@ -30,7 +29,7 @@ private TermuxAPIAppSharedPreferences(@NonNull Context context) {
     }
 
     /**
-     * Get the {@link Context} for a package name.
+     * Get {@link TermuxAPIAppSharedPreferences}.
      *
      * @param context The {@link Context} to use to get the {@link Context} of the
      *                {@link TermuxConstants#TERMUX_API_PACKAGE_NAME}.
@@ -38,28 +37,28 @@ private TermuxAPIAppSharedPreferences(@NonNull Context context) {
      */
     @Nullable
     public static TermuxAPIAppSharedPreferences build(@NonNull final Context context) {
-        Context termuxTaskerPackageContext = PackageUtils.getContextForPackage(context, TermuxConstants.TERMUX_API_PACKAGE_NAME);
-        if (termuxTaskerPackageContext == null)
+        Context termuxAPIPackageContext = PackageUtils.getContextForPackage(context, TermuxConstants.TERMUX_API_PACKAGE_NAME);
+        if (termuxAPIPackageContext == null)
             return null;
         else
-            return new TermuxAPIAppSharedPreferences(termuxTaskerPackageContext);
+            return new TermuxAPIAppSharedPreferences(termuxAPIPackageContext);
     }
 
     /**
-     * Get the {@link Context} for a package name.
+     * Get {@link TermuxAPIAppSharedPreferences}.
      *
-     * @param context The {@link Activity} to use to get the {@link Context} of the
+     * @param context The {@link Context} to use to get the {@link Context} of the
      *                {@link TermuxConstants#TERMUX_API_PACKAGE_NAME}.
      * @param exitAppOnError If {@code true} and failed to get package context, then a dialog will
      *                       be shown which when dismissed will exit the app.
      * @return Returns the {@link TermuxAPIAppSharedPreferences}. This will {@code null} if an exception is raised.
      */
     public static TermuxAPIAppSharedPreferences build(@NonNull final Context context, final boolean exitAppOnError) {
-        Context termuxTaskerPackageContext = TermuxUtils.getContextForPackageOrExitApp(context, TermuxConstants.TERMUX_API_PACKAGE_NAME, exitAppOnError);
-        if (termuxTaskerPackageContext == null)
+        Context termuxAPIPackageContext = TermuxUtils.getContextForPackageOrExitApp(context, TermuxConstants.TERMUX_API_PACKAGE_NAME, exitAppOnError);
+        if (termuxAPIPackageContext == null)
             return null;
         else
-            return new TermuxAPIAppSharedPreferences(termuxTaskerPackageContext);
+            return new TermuxAPIAppSharedPreferences(termuxAPIPackageContext);
     }
 
     private static SharedPreferences getPrivateSharedPreferences(Context context) {
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxAppSharedPreferences.java b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxAppSharedPreferences.java
index 876546a440..f0f3eba1f7 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxAppSharedPreferences.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxAppSharedPreferences.java
@@ -1,6 +1,5 @@
 package com.termux.shared.termux.settings.preferences;
 
-import android.app.Activity;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.util.TypedValue;
@@ -38,7 +37,7 @@ private TermuxAppSharedPreferences(@NonNull Context context) {
     }
 
     /**
-     * Get the {@link Context} for a package name.
+     * Get {@link TermuxAppSharedPreferences}.
      *
      * @param context The {@link Context} to use to get the {@link Context} of the
      *                {@link TermuxConstants#TERMUX_PACKAGE_NAME}.
@@ -54,9 +53,9 @@ public static TermuxAppSharedPreferences build(@NonNull final Context context) {
     }
 
     /**
-     * Get the {@link Context} for a package name.
+     * Get {@link TermuxAppSharedPreferences}.
      *
-     * @param context The {@link Activity} to use to get the {@link Context} of the
+     * @param context The {@link Context} to use to get the {@link Context} of the
      *                {@link TermuxConstants#TERMUX_PACKAGE_NAME}.
      * @param exitAppOnError If {@code true} and failed to get package context, then a dialog will
      *                       be shown which when dismissed will exit the app.
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxBootAppSharedPreferences.java b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxBootAppSharedPreferences.java
index 8fed86ba0a..49db9cef16 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxBootAppSharedPreferences.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxBootAppSharedPreferences.java
@@ -1,6 +1,5 @@
 package com.termux.shared.termux.settings.preferences;
 
-import android.app.Activity;
 import android.content.Context;
 import android.content.SharedPreferences;
 
@@ -30,7 +29,7 @@ private TermuxBootAppSharedPreferences(@NonNull Context context) {
     }
 
     /**
-     * Get the {@link Context} for a package name.
+     * Get {@link TermuxBootAppSharedPreferences}.
      *
      * @param context The {@link Context} to use to get the {@link Context} of the
      *                {@link TermuxConstants#TERMUX_BOOT_PACKAGE_NAME}.
@@ -38,28 +37,28 @@ private TermuxBootAppSharedPreferences(@NonNull Context context) {
      */
     @Nullable
     public static TermuxBootAppSharedPreferences build(@NonNull final Context context) {
-        Context termuxTaskerPackageContext = PackageUtils.getContextForPackage(context, TermuxConstants.TERMUX_BOOT_PACKAGE_NAME);
-        if (termuxTaskerPackageContext == null)
+        Context termuxBootPackageContext = PackageUtils.getContextForPackage(context, TermuxConstants.TERMUX_BOOT_PACKAGE_NAME);
+        if (termuxBootPackageContext == null)
             return null;
         else
-            return new TermuxBootAppSharedPreferences(termuxTaskerPackageContext);
+            return new TermuxBootAppSharedPreferences(termuxBootPackageContext);
     }
 
     /**
-     * Get the {@link Context} for a package name.
+     * Get {@link TermuxBootAppSharedPreferences}.
      *
-     * @param context The {@link Activity} to use to get the {@link Context} of the
+     * @param context The {@link Context} to use to get the {@link Context} of the
      *                {@link TermuxConstants#TERMUX_BOOT_PACKAGE_NAME}.
      * @param exitAppOnError If {@code true} and failed to get package context, then a dialog will
      *                       be shown which when dismissed will exit the app.
      * @return Returns the {@link TermuxBootAppSharedPreferences}. This will {@code null} if an exception is raised.
      */
     public static TermuxBootAppSharedPreferences build(@NonNull final Context context, final boolean exitAppOnError) {
-        Context termuxTaskerPackageContext = TermuxUtils.getContextForPackageOrExitApp(context, TermuxConstants.TERMUX_BOOT_PACKAGE_NAME, exitAppOnError);
-        if (termuxTaskerPackageContext == null)
+        Context termuxBootPackageContext = TermuxUtils.getContextForPackageOrExitApp(context, TermuxConstants.TERMUX_BOOT_PACKAGE_NAME, exitAppOnError);
+        if (termuxBootPackageContext == null)
             return null;
         else
-            return new TermuxBootAppSharedPreferences(termuxTaskerPackageContext);
+            return new TermuxBootAppSharedPreferences(termuxBootPackageContext);
     }
 
     private static SharedPreferences getPrivateSharedPreferences(Context context) {
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxFloatAppSharedPreferences.java b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxFloatAppSharedPreferences.java
index 7810aa3a96..4c0c7939d1 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxFloatAppSharedPreferences.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxFloatAppSharedPreferences.java
@@ -1,6 +1,5 @@
 package com.termux.shared.termux.settings.preferences;
 
-import android.app.Activity;
 import android.content.Context;
 import android.content.SharedPreferences;
 
@@ -36,7 +35,7 @@ private TermuxFloatAppSharedPreferences(@NonNull Context context) {
     }
 
     /**
-     * Get the {@link Context} for a package name.
+     * Get {@link TermuxFloatAppSharedPreferences}.
      *
      * @param context The {@link Context} to use to get the {@link Context} of the
      *                {@link TermuxConstants#TERMUX_FLOAT_PACKAGE_NAME}.
@@ -52,9 +51,9 @@ public static TermuxFloatAppSharedPreferences build(@NonNull final Context conte
     }
 
     /**
-     * Get the {@link Context} for a package name.
+     * Get {@link TermuxFloatAppSharedPreferences}.
      *
-     * @param context The {@link Activity} to use to get the {@link Context} of the
+     * @param context The {@link Context} to use to get the {@link Context} of the
      *                {@link TermuxConstants#TERMUX_FLOAT_PACKAGE_NAME}.
      * @param exitAppOnError If {@code true} and failed to get package context, then a dialog will
      *                       be shown which when dismissed will exit the app.
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxStylingAppSharedPreferences.java b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxStylingAppSharedPreferences.java
index cd902635a8..5e6b25a268 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxStylingAppSharedPreferences.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxStylingAppSharedPreferences.java
@@ -1,6 +1,5 @@
 package com.termux.shared.termux.settings.preferences;
 
-import android.app.Activity;
 import android.content.Context;
 import android.content.SharedPreferences;
 
@@ -30,7 +29,7 @@ private TermuxStylingAppSharedPreferences(@NonNull Context context) {
     }
 
     /**
-     * Get the {@link Context} for a package name.
+     * Get {@link TermuxStylingAppSharedPreferences}.
      *
      * @param context The {@link Context} to use to get the {@link Context} of the
      *                {@link TermuxConstants#TERMUX_STYLING_PACKAGE_NAME}.
@@ -38,28 +37,28 @@ private TermuxStylingAppSharedPreferences(@NonNull Context context) {
      */
     @Nullable
     public static TermuxStylingAppSharedPreferences build(@NonNull final Context context) {
-        Context termuxTaskerPackageContext = PackageUtils.getContextForPackage(context, TermuxConstants.TERMUX_STYLING_PACKAGE_NAME);
-        if (termuxTaskerPackageContext == null)
+        Context termuxStylingPackageContext = PackageUtils.getContextForPackage(context, TermuxConstants.TERMUX_STYLING_PACKAGE_NAME);
+        if (termuxStylingPackageContext == null)
             return null;
         else
-            return new TermuxStylingAppSharedPreferences(termuxTaskerPackageContext);
+            return new TermuxStylingAppSharedPreferences(termuxStylingPackageContext);
     }
 
     /**
-     * Get the {@link Context} for a package name.
+     * Get {@link TermuxStylingAppSharedPreferences}.
      *
-     * @param context The {@link Activity} to use to get the {@link Context} of the
+     * @param context The {@link Context} to use to get the {@link Context} of the
      *                {@link TermuxConstants#TERMUX_STYLING_PACKAGE_NAME}.
      * @param exitAppOnError If {@code true} and failed to get package context, then a dialog will
      *                       be shown which when dismissed will exit the app.
      * @return Returns the {@link TermuxStylingAppSharedPreferences}. This will {@code null} if an exception is raised.
      */
     public static TermuxStylingAppSharedPreferences build(@NonNull final Context context, final boolean exitAppOnError) {
-        Context termuxTaskerPackageContext = TermuxUtils.getContextForPackageOrExitApp(context, TermuxConstants.TERMUX_STYLING_PACKAGE_NAME, exitAppOnError);
-        if (termuxTaskerPackageContext == null)
+        Context termuxStylingPackageContext = TermuxUtils.getContextForPackageOrExitApp(context, TermuxConstants.TERMUX_STYLING_PACKAGE_NAME, exitAppOnError);
+        if (termuxStylingPackageContext == null)
             return null;
         else
-            return new TermuxStylingAppSharedPreferences(termuxTaskerPackageContext);
+            return new TermuxStylingAppSharedPreferences(termuxStylingPackageContext);
     }
 
     private static SharedPreferences getPrivateSharedPreferences(Context context) {
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxTaskerAppSharedPreferences.java b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxTaskerAppSharedPreferences.java
index e200adb2c7..b647f09661 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxTaskerAppSharedPreferences.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxTaskerAppSharedPreferences.java
@@ -1,6 +1,5 @@
 package com.termux.shared.termux.settings.preferences;
 
-import android.app.Activity;
 import android.content.Context;
 import android.content.SharedPreferences;
 
@@ -30,7 +29,7 @@ private  TermuxTaskerAppSharedPreferences(@NonNull Context context) {
     }
 
     /**
-     * Get the {@link Context} for a package name.
+     * Get {@link TermuxTaskerAppSharedPreferences}.
      *
      * @param context The {@link Context} to use to get the {@link Context} of the
      *                {@link TermuxConstants#TERMUX_TASKER_PACKAGE_NAME}.
@@ -42,13 +41,13 @@ public static TermuxTaskerAppSharedPreferences build(@NonNull final Context cont
         if (termuxTaskerPackageContext == null)
             return null;
         else
-            return new  TermuxTaskerAppSharedPreferences(termuxTaskerPackageContext);
+            return new TermuxTaskerAppSharedPreferences(termuxTaskerPackageContext);
     }
 
     /**
-     * Get the {@link Context} for a package name.
+     * Get {@link TermuxTaskerAppSharedPreferences}.
      *
-     * @param context The {@link Activity} to use to get the {@link Context} of the
+     * @param context The {@link Context} to use to get the {@link Context} of the
      *                {@link TermuxConstants#TERMUX_TASKER_PACKAGE_NAME}.
      * @param exitAppOnError If {@code true} and failed to get package context, then a dialog will
      *                       be shown which when dismissed will exit the app.
@@ -59,7 +58,7 @@ public static  TermuxTaskerAppSharedPreferences build(@NonNull final Context con
         if (termuxTaskerPackageContext == null)
             return null;
         else
-            return new  TermuxTaskerAppSharedPreferences(termuxTaskerPackageContext);
+            return new TermuxTaskerAppSharedPreferences(termuxTaskerPackageContext);
     }
 
     private static SharedPreferences getPrivateSharedPreferences(Context context) {
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxWidgetAppSharedPreferences.java b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxWidgetAppSharedPreferences.java
index 3274f9d804..301feec299 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxWidgetAppSharedPreferences.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxWidgetAppSharedPreferences.java
@@ -1,6 +1,5 @@
 package com.termux.shared.termux.settings.preferences;
 
-import android.app.Activity;
 import android.content.Context;
 import android.content.SharedPreferences;
 
@@ -32,7 +31,7 @@ private TermuxWidgetAppSharedPreferences(@NonNull Context context) {
     }
 
     /**
-     * Get the {@link Context} for a package name.
+     * Get {@link TermuxWidgetAppSharedPreferences}.
      *
      * @param context The {@link Context} to use to get the {@link Context} of the
      *                {@link TermuxConstants#TERMUX_WIDGET_PACKAGE_NAME}.
@@ -40,28 +39,28 @@ private TermuxWidgetAppSharedPreferences(@NonNull Context context) {
      */
     @Nullable
     public static TermuxWidgetAppSharedPreferences build(@NonNull final Context context) {
-        Context termuxTaskerPackageContext = PackageUtils.getContextForPackage(context, TermuxConstants.TERMUX_WIDGET_PACKAGE_NAME);
-        if (termuxTaskerPackageContext == null)
+        Context termuxWidgetPackageContext = PackageUtils.getContextForPackage(context, TermuxConstants.TERMUX_WIDGET_PACKAGE_NAME);
+        if (termuxWidgetPackageContext == null)
             return null;
         else
-            return new TermuxWidgetAppSharedPreferences(termuxTaskerPackageContext);
+            return new TermuxWidgetAppSharedPreferences(termuxWidgetPackageContext);
     }
 
     /**
-     * Get the {@link Context} for a package name.
+     * Get the {@link TermuxWidgetAppSharedPreferences}.
      *
-     * @param context The {@link Activity} to use to get the {@link Context} of the
+     * @param context The {@link Context} to use to get the {@link Context} of the
      *                {@link TermuxConstants#TERMUX_WIDGET_PACKAGE_NAME}.
      * @param exitAppOnError If {@code true} and failed to get package context, then a dialog will
      *                       be shown which when dismissed will exit the app.
      * @return Returns the {@link TermuxWidgetAppSharedPreferences}. This will {@code null} if an exception is raised.
      */
     public static TermuxWidgetAppSharedPreferences build(@NonNull final Context context, final boolean exitAppOnError) {
-        Context termuxTaskerPackageContext = TermuxUtils.getContextForPackageOrExitApp(context, TermuxConstants.TERMUX_WIDGET_PACKAGE_NAME, exitAppOnError);
-        if (termuxTaskerPackageContext == null)
+        Context termuxWidgetPackageContext = TermuxUtils.getContextForPackageOrExitApp(context, TermuxConstants.TERMUX_WIDGET_PACKAGE_NAME, exitAppOnError);
+        if (termuxWidgetPackageContext == null)
             return null;
         else
-            return new TermuxWidgetAppSharedPreferences(termuxTaskerPackageContext);
+            return new TermuxWidgetAppSharedPreferences(termuxWidgetPackageContext);
     }
 
     private static SharedPreferences getPrivateSharedPreferences(Context context) {
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxPropertyConstants.java b/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxPropertyConstants.java
index 8c30abc6d1..f7dc825e11 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxPropertyConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxPropertyConstants.java
@@ -203,13 +203,13 @@ public final class TermuxPropertyConstants {
     public static final String KEY_TERMINAL_MARGIN_HORIZONTAL =  "terminal-margin-horizontal"; // Default: "terminal-margin-horizontal"
     public static final int IVALUE_TERMINAL_MARGIN_HORIZONTAL_MIN = 0;
     public static final int IVALUE_TERMINAL_MARGIN_HORIZONTAL_MAX = 100;
-    public static final int DEFAULT_IVALUE_TERMINAL_HORIZONTAL_MARGIN = 3;
+    public static final int DEFAULT_IVALUE_TERMINAL_MARGIN_HORIZONTAL = 3;
 
     /** Defines the key for the terminal margin on top and bottom in dp units */
     public static final String KEY_TERMINAL_MARGIN_VERTICAL =  "terminal-margin-vertical"; // Default: "terminal-margin-vertical"
     public static final int IVALUE_TERMINAL_MARGIN_VERTICAL_MIN = 0;
     public static final int IVALUE_TERMINAL_MARGIN_VERTICAL_MAX = 100;
-    public static final int DEFAULT_IVALUE_TERMINAL_VERTICAL_MARGIN = 0;
+    public static final int DEFAULT_IVALUE_TERMINAL_MARGIN_VERTICAL = 0;
 
 
 
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxSharedProperties.java b/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxSharedProperties.java
index 3654301547..4297c532d6 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxSharedProperties.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxSharedProperties.java
@@ -354,15 +354,15 @@ public static int getTerminalCursorStyleInternalPropertyValueFromValue(String va
      * Returns the int for the value if its not null and is between
      * {@link TermuxPropertyConstants#IVALUE_TERMINAL_MARGIN_HORIZONTAL_MIN} and
      * {@link TermuxPropertyConstants#IVALUE_TERMINAL_MARGIN_HORIZONTAL_MAX},
-     * otherwise returns {@link TermuxPropertyConstants#DEFAULT_IVALUE_TERMINAL_HORIZONTAL_MARGIN}.
+     * otherwise returns {@link TermuxPropertyConstants#DEFAULT_IVALUE_TERMINAL_MARGIN_HORIZONTAL}.
      *
      * @param value The {@link String} value to convert.
      * @return Returns the internal value for value.
      */
     public static int getTerminalMarginHorizontalInternalPropertyValueFromValue(String value) {
         return SharedProperties.getDefaultIfNotInRange(TermuxPropertyConstants.KEY_TERMINAL_MARGIN_HORIZONTAL,
-            DataUtils.getIntFromString(value, TermuxPropertyConstants.DEFAULT_IVALUE_TERMINAL_HORIZONTAL_MARGIN),
-            TermuxPropertyConstants.DEFAULT_IVALUE_TERMINAL_HORIZONTAL_MARGIN,
+            DataUtils.getIntFromString(value, TermuxPropertyConstants.DEFAULT_IVALUE_TERMINAL_MARGIN_HORIZONTAL),
+            TermuxPropertyConstants.DEFAULT_IVALUE_TERMINAL_MARGIN_HORIZONTAL,
             TermuxPropertyConstants.IVALUE_TERMINAL_MARGIN_HORIZONTAL_MIN,
             TermuxPropertyConstants.IVALUE_TERMINAL_MARGIN_HORIZONTAL_MAX,
             true, true, LOG_TAG);
@@ -372,15 +372,15 @@ public static int getTerminalMarginHorizontalInternalPropertyValueFromValue(Stri
      * Returns the int for the value if its not null and is between
      * {@link TermuxPropertyConstants#IVALUE_TERMINAL_MARGIN_VERTICAL_MIN} and
      * {@link TermuxPropertyConstants#IVALUE_TERMINAL_MARGIN_VERTICAL_MAX},
-     * otherwise returns {@link TermuxPropertyConstants#DEFAULT_IVALUE_TERMINAL_VERTICAL_MARGIN}.
+     * otherwise returns {@link TermuxPropertyConstants#DEFAULT_IVALUE_TERMINAL_MARGIN_VERTICAL}.
      *
      * @param value The {@link String} value to convert.
      * @return Returns the internal value for value.
      */
     public static int getTerminalMarginVerticalInternalPropertyValueFromValue(String value) {
         return SharedProperties.getDefaultIfNotInRange(TermuxPropertyConstants.KEY_TERMINAL_MARGIN_VERTICAL,
-            DataUtils.getIntFromString(value, TermuxPropertyConstants.DEFAULT_IVALUE_TERMINAL_VERTICAL_MARGIN),
-            TermuxPropertyConstants.DEFAULT_IVALUE_TERMINAL_VERTICAL_MARGIN,
+            DataUtils.getIntFromString(value, TermuxPropertyConstants.DEFAULT_IVALUE_TERMINAL_MARGIN_VERTICAL),
+            TermuxPropertyConstants.DEFAULT_IVALUE_TERMINAL_MARGIN_VERTICAL,
             TermuxPropertyConstants.IVALUE_TERMINAL_MARGIN_VERTICAL_MIN,
             TermuxPropertyConstants.IVALUE_TERMINAL_MARGIN_VERTICAL_MAX,
             true, true, LOG_TAG);

From d25f7afd977dfc9ba455f9b30b3e62b62d489235 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 17 Mar 2022 02:50:37 +0500
Subject: [PATCH 695/912] Changed: Share terminal transcript with `ShareUtils`

---
 .../app/terminal/TermuxTerminalViewClient.java   | 16 ++++------------
 .../com/termux/shared/interact/ShareUtils.java   | 16 +++++++++++++++-
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
index 1d293ca12a..735c782d98 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
@@ -5,7 +5,6 @@
 import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
-import android.content.Intent;
 import android.media.AudioManager;
 import android.os.Environment;
 import android.text.TextUtils;
@@ -678,17 +677,10 @@ public void shareSessionTranscript() {
         String transcriptText = ShellUtils.getTerminalSessionTranscriptText(session, false, true);
         if (transcriptText == null) return;
 
-        try {
-            // See https://github.com/termux/termux-app/issues/1166.
-            Intent intent = new Intent(Intent.ACTION_SEND);
-            intent.setType("text/plain");
-            transcriptText = DataUtils.getTruncatedCommandOutput(transcriptText, DataUtils.TRANSACTION_SIZE_LIMIT_IN_BYTES, false, true, false).trim();
-            intent.putExtra(Intent.EXTRA_TEXT, transcriptText);
-            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);
-        }
+        // See https://github.com/termux/termux-app/issues/1166.
+        transcriptText = DataUtils.getTruncatedCommandOutput(transcriptText, DataUtils.TRANSACTION_SIZE_LIMIT_IN_BYTES, false, true, false).trim();
+        ShareUtils.shareText(mActivity, mActivity.getString(R.string.title_share_transcript),
+            transcriptText, mActivity.getString(R.string.title_share_transcript_with));
     }
 
     public void showUrlSelection() {
diff --git a/termux-shared/src/main/java/com/termux/shared/interact/ShareUtils.java b/termux-shared/src/main/java/com/termux/shared/interact/ShareUtils.java
index def8bfa8e1..c7793f75fb 100644
--- a/termux-shared/src/main/java/com/termux/shared/interact/ShareUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/interact/ShareUtils.java
@@ -23,6 +23,8 @@
 
 import java.nio.charset.Charset;
 
+import javax.annotation.Nullable;
+
 public class ShareUtils {
 
     private static final String LOG_TAG = "ShareUtils";
@@ -56,6 +58,18 @@ public static void openSystemAppChooser(final Context context, final Intent inte
      * @param text The text to share.
      */
     public static void shareText(final Context context, final String subject, final String text) {
+        shareText(context, subject, text, null);
+    }
+
+    /**
+     * Share text.
+     *
+     * @param context The context for operations.
+     * @param subject The subject for sharing.
+     * @param text The text to share.
+     * @param title The title for share menu.
+     */
+    public static void shareText(final Context context, final String subject, final String text, @Nullable final String title) {
         if (context == null || text == null) return;
 
         final Intent shareTextIntent = new Intent(Intent.ACTION_SEND);
@@ -63,7 +77,7 @@ public static void shareText(final Context context, final String subject, final
         shareTextIntent.putExtra(Intent.EXTRA_SUBJECT, subject);
         shareTextIntent.putExtra(Intent.EXTRA_TEXT, DataUtils.getTruncatedCommandOutput(text, DataUtils.TRANSACTION_SIZE_LIMIT_IN_BYTES, true, false, false));
 
-        openSystemAppChooser(context, shareTextIntent, context.getString(R.string.title_share_with));
+        openSystemAppChooser(context, shareTextIntent, DataUtils.isNullOrEmpty(title) ? context.getString(R.string.title_share_with) : title);
     }
 
     /**

From 26e0fa2b9e9c0e69d83844ab9cc0af22d9203037 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 17 Mar 2022 03:06:00 +0500
Subject: [PATCH 696/912] Changed: Use thread to setup settings components

Getting plugin contexts may be considered as too much work on main thread in certain situations resulting in android complaining that app is not responding
---
 .../termux/app/activities/SettingsActivity.java | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/termux/app/activities/SettingsActivity.java b/app/src/main/java/com/termux/app/activities/SettingsActivity.java
index 2b6063d481..8c871a449a 100644
--- a/app/src/main/java/com/termux/app/activities/SettingsActivity.java
+++ b/app/src/main/java/com/termux/app/activities/SettingsActivity.java
@@ -60,12 +60,17 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
 
             setPreferencesFromResource(R.xml.root_preferences, rootKey);
 
-            configureTermuxAPIPreference(context);
-            configureTermuxFloatPreference(context);
-            configureTermuxTaskerPreference(context);
-            configureTermuxWidgetPreference(context);
-            configureAboutPreference(context);
-            configureDonatePreference(context);
+            new Thread() {
+                @Override
+                public void run() {
+                    configureTermuxAPIPreference(context);
+                    configureTermuxFloatPreference(context);
+                    configureTermuxTaskerPreference(context);
+                    configureTermuxWidgetPreference(context);
+                    configureAboutPreference(context);
+                    configureDonatePreference(context);
+                }
+            }.start();
         }
 
         private void configureTermuxAPIPreference(@NonNull Context context) {

From 93d57f053bae24c2ea2627c2e113395529ffcb80 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 17 Mar 2022 03:37:28 +0500
Subject: [PATCH 697/912] Added: Add `~/storage` symlinks for `documents`,
 `podcasts` and `audiobooks`

The `audiobooks` symlink will only be made on Android `10+`

Closes #2648
---
 app/src/main/java/com/termux/app/TermuxInstaller.java | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/app/src/main/java/com/termux/app/TermuxInstaller.java b/app/src/main/java/com/termux/app/TermuxInstaller.java
index 47dcd28ece..d9980f6133 100644
--- a/app/src/main/java/com/termux/app/TermuxInstaller.java
+++ b/app/src/main/java/com/termux/app/TermuxInstaller.java
@@ -289,6 +289,9 @@ public void run() {
                     File sharedDir = Environment.getExternalStorageDirectory();
                     Os.symlink(sharedDir.getAbsolutePath(), new File(storageDir, "shared").getAbsolutePath());
 
+                    File documentsDir = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOCUMENTS);
+                    Os.symlink(documentsDir.getAbsolutePath(), new File(storageDir, "documents").getAbsolutePath());
+
                     File downloadsDir = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS);
                     Os.symlink(downloadsDir.getAbsolutePath(), new File(storageDir, "downloads").getAbsolutePath());
 
@@ -304,6 +307,14 @@ public void run() {
                     File moviesDir = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_MOVIES);
                     Os.symlink(moviesDir.getAbsolutePath(), new File(storageDir, "movies").getAbsolutePath());
 
+                    File podcastsDir = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PODCASTS);
+                    Os.symlink(podcastsDir.getAbsolutePath(), new File(storageDir, "podcasts").getAbsolutePath());
+
+                    if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.Q) {
+                        File audiobooksDir = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_AUDIOBOOKS);
+                        Os.symlink(audiobooksDir.getAbsolutePath(), new File(storageDir, "audiobooks").getAbsolutePath());
+                    }
+
                     final File[] dirs = context.getExternalFilesDirs(null);
                     if (dirs != null && dirs.length > 1) {
                         for (int i = 1; i < dirs.length; i++) {

From dd378738e31a3577c40cd81b727dd689b19f1796 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 17 Mar 2022 04:42:28 +0500
Subject: [PATCH 698/912] Fixed: Add `media-*` symlinks to `Android/media` for
 all storages and `external-0` symlink to `Android/media` of primary storage

The `~/external-0` and `~/media-0` should point to primary storage and `1+` to others, possibly portable sd cards.

Note that one can make portable sd card as primary storage as well instead of internal sd card with adoptable storage, which then links it to `/storage/emulated`, so the concept of `internal` and `external` sd card does not apply to primary storage for all cases.

https://android.stackexchange.com/questions/214233/how-to-free-internal-storage-by-moving-data-or-using-symlink-bind-mount-with-a/214706#214706

https://android.stackexchange.com/questions/217741/how-to-bind-mount-a-folder-inside-sdcard-with-correct-permissions/217936#217936

https://android.stackexchange.com/questions/205430/what-is-storage-emulated-0/205494#205494

https://source.android.com/devices/storage/adoptable

```
$ ls -l storage | cut -d ' ' -f 9-

audiobooks -> /storage/emulated/0/Audiobooks
dcim -> /storage/emulated/0/DCIM
documents -> /storage/emulated/0/Documents
downloads -> /storage/emulated/0/Download
external-0 -> /storage/emulated/0/Android/data/com.termux/files
external-1 -> /storage/XXXX-XXXX/Android/data/com.termux/files
media-0 -> /storage/emulated/0/Android/media/com.termux
media-1 -> /storage/XXXX-XXXX/Android/media/com.termux
movies -> /storage/emulated/0/Movies
music -> /storage/emulated/0/Music
pictures -> /storage/emulated/0/Pictures
podcasts -> /storage/emulated/0/Podcasts
shared -> /storage/emulated/0

```

Closes #2481
---
 .../java/com/termux/app/TermuxInstaller.java  | 27 ++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxInstaller.java b/app/src/main/java/com/termux/app/TermuxInstaller.java
index d9980f6133..c3d112adb2 100644
--- a/app/src/main/java/com/termux/app/TermuxInstaller.java
+++ b/app/src/main/java/com/termux/app/TermuxInstaller.java
@@ -286,6 +286,7 @@ public void run() {
 
                     Logger.logInfo(LOG_TAG, "Setting up storage symlinks at ~/storage/shared, ~/storage/downloads, ~/storage/dcim, ~/storage/pictures, ~/storage/music and ~/storage/movies for directories in \"" + Environment.getExternalStorageDirectory().getAbsolutePath() + "\".");
 
+                    // Get primary storage root "/storage/emulated/0" symlink
                     File sharedDir = Environment.getExternalStorageDirectory();
                     Os.symlink(sharedDir.getAbsolutePath(), new File(storageDir, "shared").getAbsolutePath());
 
@@ -315,9 +316,17 @@ public void run() {
                         Os.symlink(audiobooksDir.getAbsolutePath(), new File(storageDir, "audiobooks").getAbsolutePath());
                     }
 
-                    final File[] dirs = context.getExternalFilesDirs(null);
-                    if (dirs != null && dirs.length > 1) {
-                        for (int i = 1; i < dirs.length; i++) {
+                    // Dir 0 should ideally be for primary storage
+                    // https://cs.android.com/android/platform/superproject/+/android-12.0.0_r32:frameworks/base/core/java/android/app/ContextImpl.java;l=818
+                    // https://cs.android.com/android/platform/superproject/+/android-12.0.0_r32:frameworks/base/core/java/android/os/Environment.java;l=219
+                    // https://cs.android.com/android/platform/superproject/+/android-12.0.0_r32:frameworks/base/core/java/android/os/Environment.java;l=181
+                    // https://cs.android.com/android/platform/superproject/+/android-12.0.0_r32:frameworks/base/services/core/java/com/android/server/StorageManagerService.java;l=3796
+                    // https://cs.android.com/android/platform/superproject/+/android-7.0.0_r36:frameworks/base/services/core/java/com/android/server/MountService.java;l=3053
+
+                    // Create "Android/data/com.termux" symlinks
+                    File[] dirs = context.getExternalFilesDirs(null);
+                    if (dirs != null && dirs.length > 0) {
+                        for (int i = 0; i < dirs.length; i++) {
                             File dir = dirs[i];
                             if (dir == null) continue;
                             String symlinkName = "external-" + i;
@@ -326,6 +335,18 @@ public void run() {
                         }
                     }
 
+                    // Create "Android/media/com.termux" symlinks
+                    dirs = context.getExternalMediaDirs();
+                    if (dirs != null && dirs.length > 0) {
+                        for (int i = 0; i < dirs.length; i++) {
+                            File dir = dirs[i];
+                            if (dir == null) continue;
+                            String symlinkName = "media-" + i;
+                            Logger.logInfo(LOG_TAG, "Setting up storage symlinks at ~/storage/" + symlinkName + " for \"" + dir.getAbsolutePath() + "\".");
+                            Os.symlink(dir.getAbsolutePath(), new File(storageDir, symlinkName).getAbsolutePath());
+                        }
+                    }
+
                     Logger.logInfo(LOG_TAG, "Storage symlinks created successfully.");
                 } catch (Exception e) {
                     Logger.logErrorAndShowToast(context, LOG_TAG, e.getMessage());

From 25d21e9d2e94b87b62597b16636c489de98e922f Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 17 Mar 2022 05:19:10 +0500
Subject: [PATCH 699/912] Fixed: Fix wrong input type selected if toolbar is
 switched back to extra keys after tapping terminal if in text input mode

Closes #2503
---
 .../java/com/termux/app/terminal/TermuxTerminalViewClient.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
index 735c782d98..47e7debf44 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
@@ -222,7 +222,7 @@ public boolean shouldUseCtrlSpaceWorkaround() {
 
     @Override
     public boolean isTerminalViewSelected() {
-        return mActivity.getTerminalToolbarViewPager() == null || mActivity.isTerminalViewSelected();
+        return mActivity.getTerminalToolbarViewPager() == null || mActivity.isTerminalViewSelected() || mActivity.getTerminalView().hasFocus();
     }
 
 

From 5e820ad2491acac8b07cc662cb24012cf82f52da Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 17 Mar 2022 22:35:31 +0500
Subject: [PATCH 700/912] Added: Allow users to adjust `$TMPDIR` clear
 mechanism on termux exit

The `delete-tmpdir-files-older-than-x-days-on-exit` key can be used to adjust how many days old the access time should be of files that should be deleted from `$TMPDIR` on termux exit. The user can set an integer value between `-1` and `100000`. Set `-1` to delete no files, `0` to delete all files and `> 0` for `x` days. The default value is `3` days. So adding an entry like `delete-tmpdir-files-older-than-x-days-on-exit=10` to `termux.properties` file will make termux delete files older than `10` when termux is exited. After updating the value, either restart termux or run `termux-reload-settings` for changes to take effect.

Note that currently `> 0` will revert back to `0` since deletion is currently broken for empty sub directories and deletion needs to be done based on access time instead of modified time. It will need to be fixed in a later commit. Check `FileUtils.deleteFilesOlderThanXDays()`.

Related issue #2350
---
 .../com/termux/shared/file/FileUtils.java     |  4 +++
 .../properties/TermuxPropertyConstants.java   | 20 +++++++++++-
 .../properties/TermuxSharedProperties.java    | 24 ++++++++++++++
 .../shared/termux/shell/TermuxShellUtils.java | 32 +++++++++++++++++--
 4 files changed, 76 insertions(+), 4 deletions(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/file/FileUtils.java b/termux-shared/src/main/java/com/termux/shared/file/FileUtils.java
index 0ca949ae2a..512aca2f94 100644
--- a/termux-shared/src/main/java/com/termux/shared/file/FileUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/file/FileUtils.java
@@ -1352,6 +1352,10 @@ public static Error deleteFilesOlderThanXDays(String label, final String filePat
                 }
             }
 
+            // TODO: Use FileAttributes with support for atime (default), mtime, ctime. Add regex for ignoring file and dir absolute paths.
+            // FIXME: iterateFiles() does not return subdirectories even with TrueFileFilter for file and dir.
+            // FIXME: Empty directories remain
+
             // If directory exists, delete its contents
             Calendar calendar = Calendar.getInstance();
             calendar.add(Calendar.DATE, -(days));
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxPropertyConstants.java b/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxPropertyConstants.java
index f7dc825e11..34e3dfed5d 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxPropertyConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxPropertyConstants.java
@@ -17,7 +17,7 @@
 import java.util.Set;
 
 /*
- * Version: v0.16.0
+ * Version: v0.17.0
  * SPDX-License-Identifier: MIT
  *
  * Changelog
@@ -73,6 +73,9 @@
  *
  * - 0.16.0 (2021-10-21)
  *      - Add `KEY_NIGHT_MODE`.
+ *
+ * - 0.17.0 (2022-03-17)
+ *      - Add `KEY_DELETE_TMPDIR_FILES_OLDER_THAN_X_DAYS_ON_EXIT`.
  */
 
 /**
@@ -96,6 +99,7 @@ public final class TermuxPropertyConstants {
     public static final String KEY_DISABLE_HARDWARE_KEYBOARD_SHORTCUTS =  "disable-hardware-keyboard-shortcuts"; // Default: "disable-hardware-keyboard-shortcuts"
 
 
+
     /** Defines the key for whether a toast will be shown when user changes the terminal session */
     public static final String KEY_DISABLE_TERMINAL_SESSION_CHANGE_TOAST =  "disable-terminal-session-change-toast"; // Default: "disable-terminal-session-change-toast"
 
@@ -199,6 +203,19 @@ public final class TermuxPropertyConstants {
 
 
 
+
+    /**
+     * Defines the key for how many days old the access time should be of files that should be
+     * deleted from $TMPDIR on termux exit.
+     * `-1` for none, `0` for all and `> 0` for x days.
+     */
+    public static final String KEY_DELETE_TMPDIR_FILES_OLDER_THAN_X_DAYS_ON_EXIT =  "delete-tmpdir-files-older-than-x-days-on-exit"; // Default: "delete-tmpdir-files-older-than-x-days-on-exit"
+    public static final int IVALUE_DELETE_TMPDIR_FILES_OLDER_THAN_X_DAYS_ON_EXIT_MIN = -1;
+    public static final int IVALUE_DELETE_TMPDIR_FILES_OLDER_THAN_X_DAYS_ON_EXIT_MAX = 100000;
+    public static final int DEFAULT_IVALUE_DELETE_TMPDIR_FILES_OLDER_THAN_X_DAYS_ON_EXIT = 3;
+
+
+
     /** Defines the key for the terminal margin on left and right in dp units */
     public static final String KEY_TERMINAL_MARGIN_HORIZONTAL =  "terminal-margin-horizontal"; // Default: "terminal-margin-horizontal"
     public static final int IVALUE_TERMINAL_MARGIN_HORIZONTAL_MIN = 0;
@@ -370,6 +387,7 @@ public final class TermuxPropertyConstants {
 
         /* int */
         KEY_BELL_BEHAVIOUR,
+        KEY_DELETE_TMPDIR_FILES_OLDER_THAN_X_DAYS_ON_EXIT,
         KEY_TERMINAL_CURSOR_BLINK_RATE,
         KEY_TERMINAL_CURSOR_STYLE,
         KEY_TERMINAL_MARGIN_HORIZONTAL,
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxSharedProperties.java b/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxSharedProperties.java
index 4297c532d6..4b1b7bfd80 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxSharedProperties.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxSharedProperties.java
@@ -247,6 +247,8 @@ public static Object getInternalTermuxPropertyValueFromValue(Context context, St
             /* int */
             case TermuxPropertyConstants.KEY_BELL_BEHAVIOUR:
                 return (int) getBellBehaviourInternalPropertyValueFromValue(value);
+            case TermuxPropertyConstants.KEY_DELETE_TMPDIR_FILES_OLDER_THAN_X_DAYS_ON_EXIT:
+                return (int) getDeleteTMPDIRFilesOlderThanXDaysOnExitInternalPropertyValueFromValue(value);
             case TermuxPropertyConstants.KEY_TERMINAL_CURSOR_BLINK_RATE:
                 return (int) getTerminalCursorBlinkRateInternalPropertyValueFromValue(value);
             case TermuxPropertyConstants.KEY_TERMINAL_CURSOR_STYLE:
@@ -320,6 +322,24 @@ public static int getBellBehaviourInternalPropertyValueFromValue(String value) {
         return (int) SharedProperties.getDefaultIfNotInMap(TermuxPropertyConstants.KEY_BELL_BEHAVIOUR, TermuxPropertyConstants.MAP_BELL_BEHAVIOUR, SharedProperties.toLowerCase(value), TermuxPropertyConstants.DEFAULT_IVALUE_BELL_BEHAVIOUR, true, LOG_TAG);
     }
 
+    /**
+     * Returns the int for the value if its not null and is between
+     * {@link TermuxPropertyConstants#IVALUE_DELETE_TMPDIR_FILES_OLDER_THAN_X_DAYS_ON_EXIT_MIN} and
+     * {@link TermuxPropertyConstants#IVALUE_DELETE_TMPDIR_FILES_OLDER_THAN_X_DAYS_ON_EXIT_MAX},
+     * otherwise returns {@link TermuxPropertyConstants#DEFAULT_IVALUE_DELETE_TMPDIR_FILES_OLDER_THAN_X_DAYS_ON_EXIT}.
+     *
+     * @param value The {@link String} value to convert.
+     * @return Returns the internal value for value.
+     */
+    public static int getDeleteTMPDIRFilesOlderThanXDaysOnExitInternalPropertyValueFromValue(String value) {
+        return SharedProperties.getDefaultIfNotInRange(TermuxPropertyConstants.KEY_DELETE_TMPDIR_FILES_OLDER_THAN_X_DAYS_ON_EXIT,
+            DataUtils.getIntFromString(value, TermuxPropertyConstants.DEFAULT_IVALUE_DELETE_TMPDIR_FILES_OLDER_THAN_X_DAYS_ON_EXIT),
+            TermuxPropertyConstants.DEFAULT_IVALUE_DELETE_TMPDIR_FILES_OLDER_THAN_X_DAYS_ON_EXIT,
+            TermuxPropertyConstants.IVALUE_DELETE_TMPDIR_FILES_OLDER_THAN_X_DAYS_ON_EXIT_MIN,
+            TermuxPropertyConstants.IVALUE_DELETE_TMPDIR_FILES_OLDER_THAN_X_DAYS_ON_EXIT_MAX,
+            true, true, LOG_TAG);
+    }
+
     /**
      * Returns the int for the value if its not null and is between
      * {@link TermuxPropertyConstants#IVALUE_TERMINAL_CURSOR_BLINK_RATE_MIN} and
@@ -583,6 +603,10 @@ public int getBellBehaviour() {
         return (int) getInternalPropertyValue(TermuxPropertyConstants.KEY_BELL_BEHAVIOUR, true);
     }
 
+    public int getDeleteTMPDIRFilesOlderThanXDaysOnExit() {
+        return (int) getInternalPropertyValue(TermuxPropertyConstants.KEY_DELETE_TMPDIR_FILES_OLDER_THAN_X_DAYS_ON_EXIT, true);
+    }
+
     public int getTerminalCursorBlinkRate() {
         return (int) getInternalPropertyValue(TermuxPropertyConstants.KEY_TERMINAL_CURSOR_BLINK_RATE, true);
     }
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/shell/TermuxShellUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/shell/TermuxShellUtils.java
index 1058397785..f3771f43a6 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/shell/TermuxShellUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/shell/TermuxShellUtils.java
@@ -5,11 +5,15 @@
 import androidx.annotation.NonNull;
 
 import com.termux.shared.errors.Error;
+import com.termux.shared.file.filesystem.FileTypes;
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.file.FileUtils;
 import com.termux.shared.logger.Logger;
 import com.termux.shared.android.PackageUtils;
 import com.termux.shared.termux.TermuxUtils;
+import com.termux.shared.termux.settings.properties.TermuxAppSharedProperties;
+
+import org.apache.commons.io.filefilter.TrueFileFilter;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -27,6 +31,8 @@ public class TermuxShellUtils {
 
     public static String TERMUX_API_VERSION_NAME;
 
+    private static final String LOG_TAG = "TermuxShellUtils";
+
     public static String getDefaultWorkingDirectoryPath() {
         return TermuxConstants.TERMUX_HOME_DIR_PATH;
     }
@@ -159,9 +165,29 @@ public static void clearTermuxTMPDIR(boolean onlyIfExists) {
             return;
 
         Error error;
-        error = FileUtils.clearDirectory("$TMPDIR", FileUtils.getCanonicalPath(TermuxConstants.TERMUX_TMP_PREFIX_DIR_PATH, null));
-        if (error != null) {
-            Logger.logErrorExtended(error.toString());
+
+        TermuxAppSharedProperties properties = TermuxAppSharedProperties.getProperties();
+        int days = properties.getDeleteTMPDIRFilesOlderThanXDaysOnExit();
+
+        // Disable currently until FileUtils.deleteFilesOlderThanXDays() is fixed.
+        if (days > 0)
+            days = 0;
+
+        if (days < 0) {
+            Logger.logInfo(LOG_TAG, "Not clearing termux $TMPDIR");
+        } else if (days == 0) {
+            error = FileUtils.clearDirectory("$TMPDIR",
+                FileUtils.getCanonicalPath(TermuxConstants.TERMUX_TMP_PREFIX_DIR_PATH, null));
+            if (error != null) {
+                Logger.logErrorExtended(LOG_TAG, "Failed to clear termux $TMPDIR\n" + error);
+            }
+        } else {
+            error = FileUtils.deleteFilesOlderThanXDays("$TMPDIR",
+                FileUtils.getCanonicalPath(TermuxConstants.TERMUX_TMP_PREFIX_DIR_PATH, null),
+                TrueFileFilter.INSTANCE, days, true, FileTypes.FILE_TYPE_ANY_FLAGS);
+            if (error != null) {
+                Logger.logErrorExtended(LOG_TAG, "Failed to delete files from termux $TMPDIR older than " + days + " days\n" + error);
+            }
         }
     }
 

From caa13b70473da8dc5f32f97c740941fc147340a6 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Fri, 18 Mar 2022 06:31:43 +0500
Subject: [PATCH 701/912] Fixed: Fix pull request APKs commit hash

---
 .github/workflows/debug_build.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/debug_build.yml b/.github/workflows/debug_build.yml
index d22876ac49..2e81829374 100644
--- a/.github/workflows/debug_build.yml
+++ b/.github/workflows/debug_build.yml
@@ -21,6 +21,11 @@ jobs:
           exit_on_error() { echo "$1"; exit 1; }
 
           echo "Setting vars"
+
+          if [ "$GITHUB_EVENT_NAME" == "pull_request" ]; then
+              GITHUB_SHA="${{ github.event.pull_request.head.sha }}" # Do not use last merge commit set in GITHUB_SHA
+          fi
+
           # Set RELEASE_VERSION_NAME to "<CURRENT_VERSION_NAME>+<last_commit_hash>"
           CURRENT_VERSION_NAME_REGEX='\s+versionName "([^"]+)"$'
           CURRENT_VERSION_NAME="$(grep -m 1 -E "$CURRENT_VERSION_NAME_REGEX" ./app/build.gradle | sed -r "s/$CURRENT_VERSION_NAME_REGEX/\1/")"

From 87a79a9b24a7f9fa13ba6cb5d463dad8e4c8f1cb Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 30 Mar 2022 19:42:38 +0500
Subject: [PATCH 702/912] Added: Log intents received by  and

---
 app/src/main/java/com/termux/app/RunCommandService.java | 2 ++
 app/src/main/java/com/termux/app/TermuxService.java     | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/termux/app/RunCommandService.java b/app/src/main/java/com/termux/app/RunCommandService.java
index 2091f92485..108caa964f 100644
--- a/app/src/main/java/com/termux/app/RunCommandService.java
+++ b/app/src/main/java/com/termux/app/RunCommandService.java
@@ -63,6 +63,8 @@ public int onStartCommand(Intent intent, int flags, int startId) {
         // Run again in case service is already started and onCreate() is not called
         runStartForeground();
 
+        Logger.logVerboseExtended(LOG_TAG, "Intent Received:\n" + IntentUtils.getIntentString(intent));
+
         ExecutionCommand executionCommand = new ExecutionCommand();
         executionCommand.pluginAPIHelp = this.getString(R.string.error_run_command_service_api_help, RUN_COMMAND_SERVICE.RUN_COMMAND_API_HELP_URL);
 
diff --git a/app/src/main/java/com/termux/app/TermuxService.java b/app/src/main/java/com/termux/app/TermuxService.java
index 3e60a2c8a6..6f9cbb5922 100644
--- a/app/src/main/java/com/termux/app/TermuxService.java
+++ b/app/src/main/java/com/termux/app/TermuxService.java
@@ -136,7 +136,11 @@ public int onStartCommand(Intent intent, int flags, int startId) {
         // Run again in case service is already started and onCreate() is not called
         runStartForeground();
 
-        String action = intent.getAction();
+        String action = null;
+        if (intent != null) {
+            Logger.logVerboseExtended(LOG_TAG, "Intent Received:\n" + IntentUtils.getIntentString(intent));
+            action = intent.getAction();
+        }
 
         if (action != null) {
             switch (action) {

From ce12b8ad2d67052284b2e62287b20f28ff1249ed Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 30 Mar 2022 19:45:55 +0500
Subject: [PATCH 703/912] Fixed: Fix `Settings.ACTION_*` permission requests
 result callback

Adding `FLAG_ACTIVITY_NEW_TASK` will start permission activity in separate task and `onActivityResult()` will be called early in the calling activity without grant/not-grant result being actually set.
---
 .../main/java/com/termux/shared/android/PermissionUtils.java   | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/android/PermissionUtils.java b/termux-shared/src/main/java/com/termux/shared/android/PermissionUtils.java
index d4ad5b926c..ff19a1512a 100644
--- a/termux-shared/src/main/java/com/termux/shared/android/PermissionUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/android/PermissionUtils.java
@@ -352,7 +352,6 @@ public static Error requestManageStorageExternalPermission(@NonNull Context cont
         Intent intent = new Intent(Settings.ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION);
         intent.addCategory("android.intent.category.DEFAULT");
         intent.setData(Uri.parse("package:" + context.getPackageName()));
-        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
 
         Error error;
         if (requestCode >=0)
@@ -464,7 +463,6 @@ public static Error requestDisplayOverOtherAppsPermission(@NonNull Context conte
 
         Intent intent = new Intent(Settings.ACTION_MANAGE_OVERLAY_PERMISSION);
         intent.setData(Uri.parse("package:" + context.getPackageName()));
-        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
 
         if (requestCode >=0)
             return ActivityUtils.startActivityForResult(context, requestCode, intent);
@@ -534,7 +532,6 @@ public static Error requestDisableBatteryOptimizations(@NonNull Context context,
 
         Intent intent = new Intent(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS);
         intent.setData(Uri.parse("package:" + context.getPackageName()));
-        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
 
         if (requestCode >=0)
             return ActivityUtils.startActivityForResult(context, requestCode, intent);

From 8746db0d22e178a805531e03d6d1ddc884c6e434 Mon Sep 17 00:00:00 2001
From: Alan Christian <alancsystem@gmail.com>
Date: Sat, 2 Apr 2022 09:56:43 -0300
Subject: [PATCH 704/912] chore(gitignore): Remove unused ignore rules for
 crashlytics (#2683)

* Fix typo

* Remove crashlytics
---
 .gitignore | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index cb4634f567..6a9b993a2c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,9 +11,6 @@ release/
 .cxx
 *.zip
 
-# Crashlytics configuations
-com_crashlytics_export_strings.xml
-
 # Local configuration file (sdk path, etc)
 local.properties
 

From ee32ef0c7e74fd630d63876d9e422ba2a4502bb0 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Fri, 18 Mar 2022 05:07:46 +0500
Subject: [PATCH 705/912] Changed: Maintain terminal session name in
 `ExecutionCommand.sessionName` in addition to `TerminalSession.mSessionName`

---
 app/src/main/java/com/termux/app/TermuxService.java |  8 +++++---
 .../app/terminal/TermuxTerminalSessionClient.java   | 13 ++++++++++++-
 .../shared/shell/command/ExecutionCommand.java      | 12 +++++++++++-
 .../command/runner/terminal/TermuxSession.java      |  7 +++----
 4 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxService.java b/app/src/main/java/com/termux/app/TermuxService.java
index 6f9cbb5922..3720a64b68 100644
--- a/app/src/main/java/com/termux/app/TermuxService.java
+++ b/app/src/main/java/com/termux/app/TermuxService.java
@@ -520,12 +520,14 @@ private void executeTermuxSessionCommand(ExecutionCommand executionCommand) {
      */
     @Nullable
     public TermuxSession createTermuxSession(String executablePath, String[] arguments, String stdin, String workingDirectory, boolean isFailSafe, String sessionName) {
-        return createTermuxSession(new ExecutionCommand(getNextExecutionId(), executablePath, arguments, stdin, workingDirectory, Runner.TERMINAL_SESSION.getName(), isFailSafe), sessionName);
+        ExecutionCommand executionCommand = new ExecutionCommand(getNextExecutionId(), executablePath, arguments, stdin, workingDirectory, Runner.TERMINAL_SESSION.getName(), isFailSafe);
+        executionCommand.sessionName = sessionName;
+        return createTermuxSession(executionCommand);
     }
 
     /** Create a {@link TermuxSession}. */
     @Nullable
-    public synchronized TermuxSession createTermuxSession(ExecutionCommand executionCommand, String sessionName) {
+    public synchronized TermuxSession createTermuxSession(ExecutionCommand executionCommand) {
         if (executionCommand == null) return null;
 
         Logger.logDebug(LOG_TAG, "Creating \"" + executionCommand.getCommandIdAndLabelLogString() + "\" TermuxSession");
@@ -542,7 +544,7 @@ public synchronized TermuxSession createTermuxSession(ExecutionCommand execution
         // Otherwise if command was manually started by the user like by adding a new terminal session,
         // then no need to set stdout
         executionCommand.terminalTranscriptRows = mProperties.getTerminalTranscriptRows();
-        TermuxSession newTermuxSession = TermuxSession.execute(this, executionCommand, getTermuxTerminalSessionClient(), this, new TermuxShellEnvironmentClient(), sessionName, executionCommand.isPluginExecutionCommand);
+        TermuxSession newTermuxSession = TermuxSession.execute(this, executionCommand, getTermuxTerminalSessionClient(), this, new TermuxShellEnvironmentClient(), 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
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java
index e15b6e7d8d..070872d7d0 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java
@@ -345,11 +345,22 @@ 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 -> {
-            sessionToRename.mSessionName = text;
+            renameSession(sessionToRename, text);
             termuxSessionListNotifyUpdated();
         }, -1, null, -1, null, null);
     }
 
+    private void renameSession(TerminalSession sessionToRename, String text) {
+        if (sessionToRename == null) return;
+        sessionToRename.mSessionName = text;
+        TermuxService service = mActivity.getTermuxService();
+        if (service != null) {
+            TermuxSession termuxSession = service.getTermuxSessionForTerminalSession(sessionToRename);
+            if (termuxSession != null)
+                termuxSession.getExecutionCommand().sessionName = text;
+        }
+    }
+
     public void addNewSession(boolean isFailSafe, String sessionName) {
         TermuxService service = mActivity.getTermuxService();
         if (service == null) return;
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/command/ExecutionCommand.java b/termux-shared/src/main/java/com/termux/shared/shell/command/ExecutionCommand.java
index 90c1fba4bc..9e3d51cf8b 100644
--- a/termux-shared/src/main/java/com/termux/shared/shell/command/ExecutionCommand.java
+++ b/termux-shared/src/main/java/com/termux/shared/shell/command/ExecutionCommand.java
@@ -148,9 +148,12 @@ public static Runner runnerOf(@Nullable String name, @NonNull Runner def) {
      */
     public Integer backgroundCustomLogLevel;
 
-    /** The session action of foreground commands. */
+
+    /** The session action of {@link Runner#TERMINAL_SESSION} commands. */
     public String sessionAction;
 
+    /** The session name of {@link Runner#TERMINAL_SESSION} commands. */
+    public String sessionName;
 
     /** The command label for the {@link ExecutionCommand}. */
     public String commandLabel;
@@ -343,6 +346,9 @@ public static String getExecutionInputLogString(final ExecutionCommand execution
         if (!ignoreNull || executionCommand.sessionAction != null)
             logString.append("\n").append(executionCommand.getSessionActionLogString());
 
+        if (!ignoreNull || executionCommand.sessionName != null) {
+            logString.append("\n").append(executionCommand.getSessionNameLogString());
+        }
         if (!ignoreNull || executionCommand.commandIntent != null)
             logString.append("\n").append(executionCommand.getCommandIntentLogString());
 
@@ -434,6 +440,7 @@ public static String getExecutionCommandMarkdownString(final ExecutionCommand ex
         }
 
         markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Session Action", executionCommand.sessionAction, "-"));
+        markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Session Name", executionCommand.sessionName, "-"));
 
 
         markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("isPluginExecutionCommand", executionCommand.isPluginExecutionCommand, "-"));
@@ -524,6 +531,9 @@ public String getSessionActionLogString() {
         return Logger.getSingleLineLogStringEntry("Session Action", sessionAction, "-");
     }
 
+    public String getSessionNameLogString() {
+        return Logger.getSingleLineLogStringEntry("Session Name", sessionName, "-");
+    }
     public String getCommandDescriptionLogString() {
         return Logger.getSingleLineLogStringEntry("Command Description", commandDescription, "-");
     }
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/shell/command/runner/terminal/TermuxSession.java b/termux-shared/src/main/java/com/termux/shared/termux/shell/command/runner/terminal/TermuxSession.java
index 76e62c7c84..2cfeb45d58 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/shell/command/runner/terminal/TermuxSession.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/shell/command/runner/terminal/TermuxSession.java
@@ -54,7 +54,6 @@ private TermuxSession(@NonNull final TerminalSession terminalSession, @NonNull f
      * @param terminalSessionClient The {@link TerminalSessionClient} interface implementation.
      * @param termuxSessionClient The {@link TermuxSessionClient} interface implementation.
      * @param shellEnvironmentClient The {@link ShellEnvironmentClient} interface implementation.
-     * @param sessionName The optional {@link TerminalSession} name.
      * @param setStdoutOnExit If set to {@code true}, then the {@link ResultData#stdout}
      *                        available in the {@link TermuxSessionClient#onTermuxSessionExited(TermuxSession)}
      *                        callback will be set to the {@link TerminalSession} transcript. The session
@@ -67,7 +66,7 @@ private TermuxSession(@NonNull final TerminalSession terminalSession, @NonNull f
     public static TermuxSession execute(@NonNull final Context context, @NonNull ExecutionCommand executionCommand,
                                         @NonNull final TerminalSessionClient terminalSessionClient, final TermuxSessionClient termuxSessionClient,
                                         @NonNull final ShellEnvironmentClient shellEnvironmentClient,
-                                        final String sessionName, final boolean setStdoutOnExit) {
+                                        final boolean setStdoutOnExit) {
         if (executionCommand.workingDirectory == null || executionCommand.workingDirectory.isEmpty())
             executionCommand.workingDirectory = shellEnvironmentClient.getDefaultWorkingDirectoryPath();
         if (executionCommand.workingDirectory.isEmpty())
@@ -132,8 +131,8 @@ public static TermuxSession execute(@NonNull final Context context, @NonNull Exe
         Logger.logDebug(LOG_TAG, "Running \"" + executionCommand.getCommandIdAndLabelLogString() + "\" TermuxSession");
         TerminalSession terminalSession = new TerminalSession(executionCommand.executable, executionCommand.workingDirectory, executionCommand.arguments, environment, executionCommand.terminalTranscriptRows, terminalSessionClient);
 
-        if (sessionName != null) {
-            terminalSession.mSessionName = sessionName;
+        if (executionCommand.sessionName != null) {
+            terminalSession.mSessionName = executionCommand.sessionName;
         }
 
         return new TermuxSession(terminalSession, executionCommand, termuxSessionClient, setStdoutOnExit);

From 5794ab9a56f5a509f2c90ec2d96601254b680b8a Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Fri, 18 Mar 2022 05:53:35 +0500
Subject: [PATCH 706/912] Added|Changed: Add support to switch to existing
 session instead of creating duplicate session for `RUN_COMMAND` intent

This is done via addition of the `com.termux.RUN_COMMAND_SESSION_CREATE_MODE` extra, which currently supports two values.

- `always` to always create a new session every time.
- `no-session-with-name` to create a new session only if no existing session exits with the same terminal session name.

The terminal session name will equal executable basename by default and dashes `-` in the basename will no longer be replaced with spaces when session name as done previously. The `com.termux.RUN_COMMAND_SESSION_NAME` extra can be used to set custom session name.

Usage:

You can use this with `Termux:Tasker` or `Termux:Widget`.

For example for `Termux:Widget`

- Create a wrapper script at `~/.shortcuts/tasks/my-script.sh` with following contents under `tasks` directory so that it runs in background app shell instead of a terminal session. Do not use terminal session runner for wrapper script, since it will open two sessions everytime otherwise, first for wrapper script, then for actual target executable. There would also be conflicts if both wrapper script and target executable have the same basename and it would be incorrectly assumed that session is already running.
- Replace the `bash` executable with actual target executable that you want to run in the terminal session if its not already running.
- Optionally set custom session name. By default it will set to executable basename and not the wrapper script name. To set it to wrapper script name, you can pass `$(basename "$0")`.
- Launch the wrapper script with widget. On first launch, a new terminal session should open but on subsequent launches, same terminal session should open.

Note that you can also pass `com.termux.RUN_COMMAND_SESSION_ACTION` to modify session action behaviour. Check https://github.com/termux/termux-app/wiki/RUN_COMMAND-Intent#run_command-intent-command-extras.

```

am startservice --user 0 -n com.termux/com.termux.app.RunCommandService \
-a com.termux.RUN_COMMAND \
--es com.termux.RUN_COMMAND_PATH '/data/data/com.termux/files/usr/bin/bash' \
--es com.termux.RUN_COMMAND_SESSION_CREATE_MODE 'no-session-with-name' \
--es com.termux.RUN_COMMAND_SESSION_NAME "custom-name"
```
---
 .../com/termux/app/RunCommandService.java     |  4 ++
 .../java/com/termux/app/TermuxService.java    | 58 +++++++++++++++----
 app/src/main/res/values/strings.xml           |  2 +
 .../shell/command/ExecutionCommand.java       | 51 ++++++++++++++++
 .../termux/shared/termux/TermuxConstants.java | 41 +++++++++----
 5 files changed, 135 insertions(+), 21 deletions(-)

diff --git a/app/src/main/java/com/termux/app/RunCommandService.java b/app/src/main/java/com/termux/app/RunCommandService.java
index 108caa964f..4862a476a8 100644
--- a/app/src/main/java/com/termux/app/RunCommandService.java
+++ b/app/src/main/java/com/termux/app/RunCommandService.java
@@ -116,6 +116,8 @@ public int onStartCommand(Intent intent, int flags, int startId) {
 
         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.sessionName = IntentUtils.getStringExtraIfSet(intent, RUN_COMMAND_SERVICE.EXTRA_SESSION_NAME, null);
+        executionCommand.sessionCreateMode = IntentUtils.getStringExtraIfSet(intent, RUN_COMMAND_SERVICE.EXTRA_SESSION_CREATE_MODE, null);
         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);
@@ -211,6 +213,8 @@ public int onStartCommand(Intent intent, int flags, int startId) {
         execIntent.putExtra(TERMUX_SERVICE.EXTRA_RUNNER, executionCommand.runner);
         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_SESSION_NAME, executionCommand.sessionName);
+        execIntent.putExtra(TERMUX_SERVICE.EXTRA_SESSION_CREATE_MODE, executionCommand.sessionCreateMode);
         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);
diff --git a/app/src/main/java/com/termux/app/TermuxService.java b/app/src/main/java/com/termux/app/TermuxService.java
index 3720a64b68..52f0c6cd69 100644
--- a/app/src/main/java/com/termux/app/TermuxService.java
+++ b/app/src/main/java/com/termux/app/TermuxService.java
@@ -41,6 +41,7 @@
 import com.termux.shared.data.DataUtils;
 import com.termux.shared.shell.command.ExecutionCommand;
 import com.termux.shared.shell.command.ExecutionCommand.Runner;
+import com.termux.shared.shell.command.ExecutionCommand.SessionCreateMode;
 import com.termux.terminal.TerminalEmulator;
 import com.termux.terminal.TerminalSession;
 import com.termux.terminal.TerminalSessionClient;
@@ -384,6 +385,8 @@ private void actionServiceExecute(Intent intent) {
         executionCommand.workingDirectory = IntentUtils.getStringExtraIfSet(intent, TERMUX_SERVICE.EXTRA_WORKDIR, null);
         executionCommand.isFailsafe = intent.getBooleanExtra(TERMUX_ACTIVITY.EXTRA_FAILSAFE_SESSION, false);
         executionCommand.sessionAction = intent.getStringExtra(TERMUX_SERVICE.EXTRA_SESSION_ACTION);
+        executionCommand.sessionName = IntentUtils.getStringExtraIfSet(intent, TERMUX_SERVICE.EXTRA_SESSION_NAME, null);
+        executionCommand.sessionCreateMode = IntentUtils.getStringExtraIfSet(intent, TERMUX_SERVICE.EXTRA_SESSION_CREATE_MODE, null);
         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);
@@ -402,13 +405,13 @@ private void actionServiceExecute(Intent intent) {
         mPendingPluginExecutionCommands.add(executionCommand);
 
         if (Runner.APP_SHELL.equalsRunner(executionCommand.runner))
-                executeTermuxTaskCommand(executionCommand);
+            executeTermuxTaskCommand(executionCommand);
         else if (Runner.TERMINAL_SESSION.equalsRunner(executionCommand.runner))
-                executeTermuxSessionCommand(executionCommand);
+            executeTermuxSessionCommand(executionCommand);
         else {
-                String errmsg = this.getString(R.string.error_termux_service_unsupported_execution_command_runner, executionCommand.runner);
-                executionCommand.setStateFailed(Errno.ERRNO_FAILED.getCode(), errmsg);
-                PluginUtils.processPluginExecutionCommandError(this, LOG_TAG, executionCommand, false);
+            String errmsg = getString(R.string.error_termux_service_unsupported_execution_command_runner, executionCommand.runner);
+            executionCommand.setStateFailed(Errno.ERRNO_FAILED.getCode(), errmsg);
+            PluginUtils.processPluginExecutionCommandError(this, LOG_TAG, executionCommand, false);
         }
     }
 
@@ -497,16 +500,39 @@ public void onAppShellExited(final AppShell termuxTask) {
     private void executeTermuxSessionCommand(ExecutionCommand executionCommand) {
         if (executionCommand == null) return;
 
+        if (executionCommand.sessionCreateMode == null)
+            executionCommand.sessionCreateMode = SessionCreateMode.ALWAYS.getMode();
+
         Logger.logDebug(LOG_TAG, "Executing foreground \"" + executionCommand.getCommandIdAndLabelLogString() + "\" TermuxSession command");
 
-        String sessionName = null;
+        // Transform executable path to session name, e.g. "/bin/do-something.sh" => "do-something.sh".
+        if (executionCommand.sessionName == null && executionCommand.executable != null) {
+            executionCommand.sessionName = ShellUtils.getExecutableBasename(executionCommand.executable);
+        }
 
-        // Transform executable path to session name, e.g. "/bin/do-something.sh" => "do something.sh".
-        if (executionCommand.executable != null) {
-            sessionName = ShellUtils.getExecutableBasename(executionCommand.executable).replace('-', ' ');
+        TermuxSession newTermuxSession = null;
+        if (SessionCreateMode.ALWAYS.equalsMode(executionCommand.sessionCreateMode))
+            ; // Default
+        else if (SessionCreateMode.NO_SESSION_WITH_NAME.equalsMode(executionCommand.sessionCreateMode))
+            if (DataUtils.isNullOrEmpty(executionCommand.sessionName)) {
+                String errmsg = getString(R.string.error_termux_service_execution_command_session_name_unset, executionCommand.sessionCreateMode);
+                executionCommand.setStateFailed(Errno.ERRNO_FAILED.getCode(), errmsg);
+                PluginUtils.processPluginExecutionCommandError(this, LOG_TAG, executionCommand, false);
+                return;
+            } else {
+                newTermuxSession = getTermuxSessionForName(executionCommand.sessionName);
+                if (newTermuxSession != null)
+                    Logger.logInfo(LOG_TAG, "Existing session with \"" + executionCommand.sessionName + "\" session name found");
+            }
+        else {
+            String errmsg = getString(R.string.error_termux_service_unsupported_execution_command_session_create_mode, executionCommand.sessionCreateMode);
+            executionCommand.setStateFailed(Errno.ERRNO_FAILED.getCode(), errmsg);
+            PluginUtils.processPluginExecutionCommandError(this, LOG_TAG, executionCommand, false);
+            return;
         }
 
-        TermuxSession newTermuxSession = createTermuxSession(executionCommand, sessionName);
+        if (newTermuxSession == null)
+            newTermuxSession = createTermuxSession(executionCommand);
         if (newTermuxSession == null) return;
 
         handleSessionAction(DataUtils.getIntFromString(executionCommand.sessionAction,
@@ -858,6 +884,18 @@ public synchronized TerminalSession getTerminalSessionForHandle(String sessionHa
         return null;
     }
 
+    public synchronized TermuxSession getTermuxSessionForName(String name) {
+        if (DataUtils.isNullOrEmpty(name)) return null;
+        TermuxSession termuxSession;
+        for (int i = 0, len = mTermuxSessions.size(); i < len; i++) {
+            termuxSession = mTermuxSessions.get(i);
+            TerminalSession terminalSession = termuxSession.getTerminalSession();
+            if (terminalSession.mSessionName != null && terminalSession.mSessionName.equals(name))
+                return termuxSession;
+        }
+        return null;
+    }
+
 
 
     public static synchronized int getNextExecutionId() {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0a6c02dcaf..e49b4e8585 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -100,6 +100,8 @@
         Grants it from Settings -> Apps -> &TERMUX_APP_NAME; -> Advanced</string>
     <string name="error_termux_service_invalid_execution_command_runner">Invalid execution command runner to TermuxService: `%1$s`</string>
     <string name="error_termux_service_unsupported_execution_command_runner">Unsupported execution command runner to TermuxService: `%1$s`</string>
+    <string name="error_termux_service_unsupported_execution_command_session_create_mode">Unsupported execution command session create mode to TermuxService: `%1$s`</string>
+    <string name="error_termux_service_execution_command_session_name_unset">Session name not set but `%1$s` session create mode passed</string>
 
 
 
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/command/ExecutionCommand.java b/termux-shared/src/main/java/com/termux/shared/shell/command/ExecutionCommand.java
index 9e3d51cf8b..2ee38283e5 100644
--- a/termux-shared/src/main/java/com/termux/shared/shell/command/ExecutionCommand.java
+++ b/termux-shared/src/main/java/com/termux/shared/shell/command/ExecutionCommand.java
@@ -105,6 +105,41 @@ public static Runner runnerOf(@Nullable String name, @NonNull Runner def) {
 
     }
 
+    public enum SessionCreateMode {
+
+        /** Always create {@link TerminalSession}. */
+        ALWAYS("always"),
+
+        /** Create session only if no session with {@link #sessionName} found. */
+        NO_SESSION_WITH_NAME("no-session-with-name");
+
+        private final String mode;
+
+        SessionCreateMode(final String mode) {
+            this.mode = mode;
+        }
+
+        public String getMode() {
+            return mode;
+        }
+
+        public boolean equalsMode(String sessionCreateMode) {
+            return sessionCreateMode != null && sessionCreateMode.equals(this.mode);
+        }
+
+        /** Get {@link SessionCreateMode} for {@code mode} if found, otherwise {@code null}. */
+        @Nullable
+        public static SessionCreateMode modeOf(String mode) {
+            for (SessionCreateMode v : SessionCreateMode.values()) {
+                if (v.mode.equals(mode)) {
+                    return v;
+                }
+            }
+            return null;
+        }
+
+    }
+
     /** The optional unique id for the {@link ExecutionCommand}. */
     public Integer id;
 
@@ -155,6 +190,11 @@ public static Runner runnerOf(@Nullable String name, @NonNull Runner def) {
     /** The session name of {@link Runner#TERMINAL_SESSION} commands. */
     public String sessionName;
 
+    /** The {@link SessionCreateMode} of session for {@link Runner#TERMINAL_SESSION} commands. */
+    public String sessionCreateMode;
+
+
+
     /** The command label for the {@link ExecutionCommand}. */
     public String commandLabel;
     /** The markdown text for the command description for the {@link ExecutionCommand}. */
@@ -349,6 +389,11 @@ public static String getExecutionInputLogString(final ExecutionCommand execution
         if (!ignoreNull || executionCommand.sessionName != null) {
             logString.append("\n").append(executionCommand.getSessionNameLogString());
         }
+
+        if (!ignoreNull || executionCommand.sessionCreateMode != null) {
+            logString.append("\n").append(executionCommand.getSessionCreateModeLogString());
+        }
+
         if (!ignoreNull || executionCommand.commandIntent != null)
             logString.append("\n").append(executionCommand.getCommandIntentLogString());
 
@@ -441,6 +486,7 @@ public static String getExecutionCommandMarkdownString(final ExecutionCommand ex
 
         markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Session Action", executionCommand.sessionAction, "-"));
         markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Session Name", executionCommand.sessionName, "-"));
+        markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Session Create Mode", executionCommand.sessionCreateMode, "-"));
 
 
         markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("isPluginExecutionCommand", executionCommand.isPluginExecutionCommand, "-"));
@@ -534,6 +580,11 @@ public String getSessionActionLogString() {
     public String getSessionNameLogString() {
         return Logger.getSingleLineLogStringEntry("Session Name", sessionName, "-");
     }
+
+    public String getSessionCreateModeLogString() {
+        return Logger.getSingleLineLogStringEntry("Session Create Mode", sessionCreateMode, "-");
+    }
+
     public String getCommandDescriptionLogString() {
         return Logger.getSingleLineLogStringEntry("Command Description", commandDescription, "-");
     }
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
index 3c5e0a8e91..68ec885cc6 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
@@ -2,13 +2,16 @@
 
 import android.annotation.SuppressLint;
 
+import com.termux.shared.shell.command.ExecutionCommand;
+import com.termux.shared.shell.command.ExecutionCommand.Runner;
+
 import java.io.File;
 import java.util.Arrays;
 import java.util.Formatter;
 import java.util.List;
 
 /*
- * Version: v0.38.0
+ * Version: v0.39.0
  * SPDX-License-Identifier: MIT
  *
  * Changelog
@@ -226,6 +229,10 @@
  *
  * - 0.38.0 (2022-03-16)
  *      - Added `TERMUX_APP.TERMUX_ACTIVITY.ACTION_NOTIFY_APP_CRASH`.
+ *
+ * - 0.39.0 (2022-03-18)
+ *      - Added `TERMUX_APP.TERMUX_SERVICE.EXTRA_SESSION_NAME`, `TERMUX_APP.RUN_COMMAND_SERVICE.EXTRA_SESSION_NAME`,
+ *          `TERMUX_APP.TERMUX_SERVICE.EXTRA_SESSION_CREATE_MODE` and `TERMUX_APP.RUN_COMMAND_SERVICE.EXTRA_SESSION_CREATE_MODE`.
  */
 
 /**
@@ -937,15 +944,19 @@ public static final class TERMUX_SERVICE {
             public static final String EXTRA_STDIN = TERMUX_PACKAGE_NAME + ".execute.stdin"; // Default: "com.termux.execute.stdin"
             /** Intent {@code String} extra for command current working directory for the TERMUX_SERVICE.ACTION_SERVICE_EXECUTE intent */
             public static final String EXTRA_WORKDIR = TERMUX_PACKAGE_NAME + ".execute.cwd"; // Default: "com.termux.execute.cwd"
-            /** Intent {@code boolean} extra for command background mode for the TERMUX_SERVICE.ACTION_SERVICE_EXECUTE intent */
+            /** Intent {@code boolean} extra for whether to run command in background {@link Runner#APP_SHELL} or foreground {@link Runner#TERMINAL_SESSION} for the TERMUX_SERVICE.ACTION_SERVICE_EXECUTE intent */
             @Deprecated
             public static final String EXTRA_BACKGROUND = TERMUX_PACKAGE_NAME + ".execute.background"; // Default: "com.termux.execute.background"
-            /** Intent {@code boolean} extra for command the {@link com.termux.shared.shell.command.ExecutionCommand.Runner} for the TERMUX_SERVICE.ACTION_SERVICE_EXECUTE intent */
+            /** Intent {@code String} extra for command the {@link Runner} for the TERMUX_SERVICE.ACTION_SERVICE_EXECUTE intent */
             public static final String EXTRA_RUNNER = TERMUX_PACKAGE_NAME + ".execute.runner"; // Default: "com.termux.execute.runner"
             /** Intent {@code String} extra for custom log level for background commands defined by {@link com.termux.shared.logger.Logger} for the TERMUX_SERVICE.ACTION_SERVICE_EXECUTE intent */
             public static final String EXTRA_BACKGROUND_CUSTOM_LOG_LEVEL = TERMUX_PACKAGE_NAME + ".execute.background_custom_log_level"; // Default: "com.termux.execute.background_custom_log_level"
-            /** Intent {@code String} extra for session action for foreground commands for the TERMUX_SERVICE.ACTION_SERVICE_EXECUTE intent */
+            /** Intent {@code String} extra for session action for {@link Runner#TERMINAL_SESSION} commands for the TERMUX_SERVICE.ACTION_SERVICE_EXECUTE intent */
             public static final String EXTRA_SESSION_ACTION = TERMUX_PACKAGE_NAME + ".execute.session_action"; // Default: "com.termux.execute.session_action"
+            /** Intent {@code String} extra for session name for {@link Runner#TERMINAL_SESSION} commands for the TERMUX_SERVICE.ACTION_SERVICE_EXECUTE intent */
+            public static final String EXTRA_SESSION_NAME = TERMUX_PACKAGE_NAME + ".execute.session_name"; // Default: "com.termux.execute.session_name"
+            /** Intent {@code String} extra for the {@link ExecutionCommand.SessionCreateMode}  for the TERMUX_SERVICE.ACTION_SERVICE_EXECUTE intent. */
+            public static final String EXTRA_SESSION_CREATE_MODE = TERMUX_PACKAGE_NAME + ".execute.session_create_mode"; // Default: "com.termux.execute.session_create_mode"
             /** Intent {@code String} extra for label of the command for the TERMUX_SERVICE.ACTION_SERVICE_EXECUTE intent */
             public static final String EXTRA_COMMAND_LABEL = TERMUX_PACKAGE_NAME + ".execute.command_label"; // Default: "com.termux.execute.command_label"
             /** Intent markdown {@code String} extra for description of the command for the TERMUX_SERVICE.ACTION_SERVICE_EXECUTE intent */
@@ -981,20 +992,23 @@ public static final class TERMUX_SERVICE {
 
 
 
-            /** The value for {@link #EXTRA_SESSION_ACTION} extra that will set the new session as
+            /**
+             * The value for {@link #EXTRA_SESSION_ACTION} extra that will set the new session as
              * the current session and will start {@link TERMUX_ACTIVITY} if its not running to bring
              * the new session to foreground.
              */
             public static final int VALUE_EXTRA_SESSION_ACTION_SWITCH_TO_NEW_SESSION_AND_OPEN_ACTIVITY = 0;
 
-            /** The value for {@link #EXTRA_SESSION_ACTION} extra that will keep any existing session
+            /**
+             * The value for {@link #EXTRA_SESSION_ACTION} extra that will keep any existing session
              * as the current session and will start {@link TERMUX_ACTIVITY} if its not running to
              * bring the existing session to foreground. The new session will be added to the left
              * sidebar in the sessions list.
              */
             public static final int VALUE_EXTRA_SESSION_ACTION_KEEP_CURRENT_SESSION_AND_OPEN_ACTIVITY = 1;
 
-            /** The value for {@link #EXTRA_SESSION_ACTION} extra that will set the new session as
+            /**
+             * The value for {@link #EXTRA_SESSION_ACTION} extra that will set the new session as
              * the current session but will not start {@link TERMUX_ACTIVITY} if its not running
              * and session(s) will be seen in Termux notification and can be clicked to bring new
              * session to foreground. If the {@link TERMUX_ACTIVITY} is already running, then this
@@ -1002,7 +1016,8 @@ public static final class TERMUX_SERVICE {
              */
             public static final int VALUE_EXTRA_SESSION_ACTION_SWITCH_TO_NEW_SESSION_AND_DONT_OPEN_ACTIVITY = 2;
 
-            /** The value for {@link #EXTRA_SESSION_ACTION} extra that will keep any existing session
+            /**
+             * The value for {@link #EXTRA_SESSION_ACTION} extra that will keep any existing session
              * as the current session but will not start {@link TERMUX_ACTIVITY} if its not running
              * and session(s) will be seen in Termux notification and can be clicked to bring
              * existing session to foreground. If the {@link TERMUX_ACTIVITY} is already running,
@@ -1070,15 +1085,19 @@ public static final class RUN_COMMAND_SERVICE {
             public static final String EXTRA_STDIN = TERMUX_PACKAGE_NAME + ".RUN_COMMAND_STDIN"; // Default: "com.termux.RUN_COMMAND_STDIN"
             /** Intent {@code String} extra for current working directory of command for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent */
             public static final String EXTRA_WORKDIR = TERMUX_PACKAGE_NAME + ".RUN_COMMAND_WORKDIR"; // Default: "com.termux.RUN_COMMAND_WORKDIR"
-            /** Intent {@code boolean} extra for whether to run command in background or foreground terminal session for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent */
+            /** Intent {@code boolean} extra for whether to run command in background {@link Runner#APP_SHELL} or foreground {@link Runner#TERMINAL_SESSION} for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent */
             @Deprecated
             public static final String EXTRA_BACKGROUND = TERMUX_PACKAGE_NAME + ".RUN_COMMAND_BACKGROUND"; // Default: "com.termux.RUN_COMMAND_BACKGROUND"
-            /** Intent {@code boolean} extra for command the {@link com.termux.shared.shell.command.ExecutionCommand.Runner} for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent */
+            /** Intent {@code String} extra for command the {@link Runner} for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent */
             public static final String EXTRA_RUNNER = TERMUX_PACKAGE_NAME + ".RUN_COMMAND_RUNNER"; // Default: "com.termux.RUN_COMMAND_RUNNER"
             /** Intent {@code String} extra for custom log level for background commands defined by {@link com.termux.shared.logger.Logger} for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent */
             public static final String EXTRA_BACKGROUND_CUSTOM_LOG_LEVEL = TERMUX_PACKAGE_NAME + ".RUN_COMMAND_BACKGROUND_CUSTOM_LOG_LEVEL"; // Default: "com.termux.RUN_COMMAND_BACKGROUND_CUSTOM_LOG_LEVEL"
-            /** Intent {@code String} extra for session action of foreground commands for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent */
+            /** Intent {@code String} extra for session action of {@link Runner#TERMINAL_SESSION} commands for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent */
             public static final String EXTRA_SESSION_ACTION = TERMUX_PACKAGE_NAME + ".RUN_COMMAND_SESSION_ACTION"; // Default: "com.termux.RUN_COMMAND_SESSION_ACTION"
+            /** Intent {@code String} extra for session name of {@link Runner#TERMINAL_SESSION} commands for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent */
+            public static final String EXTRA_SESSION_NAME = TERMUX_PACKAGE_NAME + ".RUN_COMMAND_SESSION_NAME"; // Default: "com.termux.RUN_COMMAND_SESSION_NAME"
+            /** Intent {@code String} extra for the {@link ExecutionCommand.SessionCreateMode}  for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent. */
+            public static final String EXTRA_SESSION_CREATE_MODE = TERMUX_PACKAGE_NAME + ".RUN_COMMAND_SESSION_CREATE_MODE"; // Default: "com.termux.RUN_COMMAND_SESSION_CREATE_MODE"
             /** Intent {@code String} extra for label of the command for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent */
             public static final String EXTRA_COMMAND_LABEL = TERMUX_PACKAGE_NAME + ".RUN_COMMAND_COMMAND_LABEL"; // Default: "com.termux.RUN_COMMAND_COMMAND_LABEL"
             /** Intent markdown {@code String} extra for description of the command for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent */

From 9e06bfce1ff8f48c8fb16d4b0ce00674faf39471 Mon Sep 17 00:00:00 2001
From: Henrik Grimler <henrik@grimler.se>
Date: Thu, 21 Apr 2022 21:55:09 +0200
Subject: [PATCH 707/912] Changed: Bump bootstrap to v2022.04.21-r1

---
 app/build.gradle | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 593e508d7f..853435690d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -196,11 +196,11 @@ clean {
 
 task downloadBootstraps() {
     doLast {
-        def version = "2022.01.07-r1"
-        downloadBootstrap("aarch64", "0fe6d0159d12fcb8baf7750ce9072b9b36f742662b02ad4da145ab85873614cd", version)
-        downloadBootstrap("arm",     "0a6014e2ec3b7079524fee3caabd02be05bcb4add3c6cd9e5ad98408b428c717", version)
-        downloadBootstrap("i686",    "c55369a9af1316dc3d99457aa23cce64b29c1e60e375159352c0d4b9cfed4ac6", version)
-        downloadBootstrap("x86_64",  "e93a7c66d15edb7d1b5ceca906255c85ead35a8b6a52f93524e117cfb07e6778", version)
+        def version = "2022.04.21-r1"
+        downloadBootstrap("aarch64", "6ef5d51ebcc98cabec178de58b3846d192e3c47f1575f6319c0d55b4b2550ee8", version)
+        downloadBootstrap("arm",     "39f371b9b0892a5e263993eab8fc8d1f58020a7df78372d134184e8da3d5d18e", version)
+        downloadBootstrap("i686",    "2355c44da98c3990bce1fc527e36b9f9f913bb8d814d73601811fc62bb86d864", version)
+        downloadBootstrap("x86_64",  "21ced5aacde882999306a46f913191bbea134af38532fb85ef958f6822a8730c", version)
     }
 }
 

From e597ece75fd55075ed0b265202d4a9d8c41396cf Mon Sep 17 00:00:00 2001
From: tareksander <57038324+tareksander@users.noreply.github.com>
Date: Sat, 4 Dec 2021 16:26:40 +0100
Subject: [PATCH 708/912] Added: ArgumentTokenizer to com.termux.shared.shell

---
 .../shared/shell/ArgumentTokenizer.java       | 229 ++++++++++++++++++
 1 file changed, 229 insertions(+)
 create mode 100644 termux-shared/src/main/java/com/termux/shared/shell/ArgumentTokenizer.java

diff --git a/termux-shared/src/main/java/com/termux/shared/shell/ArgumentTokenizer.java b/termux-shared/src/main/java/com/termux/shared/shell/ArgumentTokenizer.java
new file mode 100644
index 0000000000..26af2e8322
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/shell/ArgumentTokenizer.java
@@ -0,0 +1,229 @@
+/*BEGIN_COPYRIGHT_BLOCK
+ *
+ * Copyright (c) 2001-2010, JavaPLT group at Rice University (drjava@rice.edu)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *    * Neither the names of DrJava, the JavaPLT group, Rice University, nor the
+ *      names of its contributors may be used to endorse or promote products
+ *      derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software is Open Source Initiative approved Open Source Software.
+ * Open Source Initative Approved is a trademark of the Open Source Initiative.
+ *
+ * This file is part of DrJava.  Download the current version of this project
+ * from http://www.drjava.org/ or http://sourceforge.net/projects/drjava/
+ *
+ * END_COPYRIGHT_BLOCK*/
+
+package com.termux.shared.shell;
+
+import java.util.List;
+import java.util.LinkedList;
+
+/**
+ * Utility class which can tokenize a String into a list of String arguments,
+ * with behavior similar to parsing command line arguments to a program.
+ * Quoted Strings are treated as single arguments, and escaped characters
+ * are translated so that the tokenized arguments have the same meaning.
+ * Since all methods are static, the class is declared abstract to prevent
+ * instantiation.
+ * @version $Id$
+ */
+public abstract class ArgumentTokenizer {
+    private static final int NO_TOKEN_STATE = 0;
+    private static final int NORMAL_TOKEN_STATE = 1;
+    private static final int SINGLE_QUOTE_STATE = 2;
+    private static final int DOUBLE_QUOTE_STATE = 3;
+
+    /** Tokenizes the given String into String tokens
+     * @param arguments A String containing one or more command-line style arguments to be tokenized.
+     * @return A list of parsed and properly escaped arguments.
+     */
+    public static List<String> tokenize(String arguments) {
+        return tokenize(arguments, false);
+    }
+
+    /** Tokenizes the given String into String tokens.
+     * @param arguments A String containing one or more command-line style arguments to be tokenized.
+     * @param stringify whether or not to include escape special characters
+     * @return A list of parsed and properly escaped arguments.
+     */
+    public static List<String> tokenize(String arguments, boolean stringify) {
+
+        LinkedList<String> argList = new LinkedList<String>();
+        StringBuilder currArg = new StringBuilder();
+        boolean escaped = false;
+        int state = NO_TOKEN_STATE;  // start in the NO_TOKEN_STATE
+        int len = arguments.length();
+
+        // Loop over each character in the string
+        for (int i = 0; i < len; i++) {
+            char c = arguments.charAt(i);
+            if (escaped) {
+                // Escaped state: just append the next character to the current arg.
+                escaped = false;
+                currArg.append(c);
+            }
+            else {
+                switch(state) {
+                    case SINGLE_QUOTE_STATE:
+                        if (c == '\'') {
+                            // Seen the close quote; continue this arg until whitespace is seen
+                            state = NORMAL_TOKEN_STATE;
+                        }
+                        else {
+                            currArg.append(c);
+                        }
+                        break;
+                    case DOUBLE_QUOTE_STATE:
+                        if (c == '"') {
+                            // Seen the close quote; continue this arg until whitespace is seen
+                            state = NORMAL_TOKEN_STATE;
+                        }
+                        else if (c == '\\') {
+                            // Look ahead, and only escape quotes or backslashes
+                            i++;
+                            char next = arguments.charAt(i);
+                            if (next == '"' || next == '\\') {
+                                currArg.append(next);
+                            }
+                            else {
+                                currArg.append(c);
+                                currArg.append(next);
+                            }
+                        }
+                        else {
+                            currArg.append(c);
+                        }
+                        break;
+//          case NORMAL_TOKEN_STATE:
+//            if (Character.isWhitespace(c)) {
+//              // Whitespace ends the token; start a new one
+//              argList.add(currArg.toString());
+//              currArg = new StringBuffer();
+//              state = NO_TOKEN_STATE;
+//            }
+//            else if (c == '\\') {
+//              // Backslash in a normal token: escape the next character
+//              escaped = true;
+//            }
+//            else if (c == '\'') {
+//              state = SINGLE_QUOTE_STATE;
+//            }
+//            else if (c == '"') {
+//              state = DOUBLE_QUOTE_STATE;
+//            }
+//            else {
+//              currArg.append(c);
+//            }
+//            break;
+                    case NO_TOKEN_STATE:
+                    case NORMAL_TOKEN_STATE:
+                        switch(c) {
+                            case '\\':
+                                escaped = true;
+                                state = NORMAL_TOKEN_STATE;
+                                break;
+                            case '\'':
+                                state = SINGLE_QUOTE_STATE;
+                                break;
+                            case '"':
+                                state = DOUBLE_QUOTE_STATE;
+                                break;
+                            default:
+                                if (!Character.isWhitespace(c)) {
+                                    currArg.append(c);
+                                    state = NORMAL_TOKEN_STATE;
+                                }
+                                else if (state == NORMAL_TOKEN_STATE) {
+                                    // Whitespace ends the token; start a new one
+                                    argList.add(currArg.toString());
+                                    currArg = new StringBuilder();
+                                    state = NO_TOKEN_STATE;
+                                }
+                        }
+                        break;
+                    default:
+                        throw new IllegalStateException("ArgumentTokenizer state " + state + " is invalid!");
+                }
+            }
+        }
+
+        // If we're still escaped, put in the backslash
+        if (escaped) {
+            currArg.append('\\');
+            argList.add(currArg.toString());
+        }
+        // Close the last argument if we haven't yet
+        else if (state != NO_TOKEN_STATE) {
+            argList.add(currArg.toString());
+        }
+        // Format each argument if we've been told to stringify them
+        if (stringify) {
+            for (int i = 0; i < argList.size(); i++) {
+                argList.set(i, "\"" + _escapeQuotesAndBackslashes(argList.get(i)) + "\"");
+            }
+        }
+        return argList;
+    }
+
+    /** Inserts backslashes before any occurrences of a backslash or
+     * quote in the given string.  Also converts any special characters
+     * appropriately.
+     */
+    protected static String _escapeQuotesAndBackslashes(String s) {
+        final StringBuilder buf = new StringBuilder(s);
+
+        // Walk backwards, looking for quotes or backslashes.
+        //  If we see any, insert an extra backslash into the buffer at
+        //  the same index.  (By walking backwards, the index into the buffer
+        //  will remain correct as we change the buffer.)
+        for (int i = s.length()-1; i >= 0; i--) {
+            char c = s.charAt(i);
+            if ((c == '\\') || (c == '"')) {
+                buf.insert(i, '\\');
+            }
+            // Replace any special characters with escaped versions
+            else if (c == '\n') {
+                buf.deleteCharAt(i);
+                buf.insert(i, "\\n");
+            }
+            else if (c == '\t') {
+                buf.deleteCharAt(i);
+                buf.insert(i, "\\t");
+            }
+            else if (c == '\r') {
+                buf.deleteCharAt(i);
+                buf.insert(i, "\\r");
+            }
+            else if (c == '\b') {
+                buf.deleteCharAt(i);
+                buf.insert(i, "\\b");
+            }
+            else if (c == '\f') {
+                buf.deleteCharAt(i);
+                buf.insert(i, "\\f");
+            }
+        }
+        return buf.toString();
+    }
+}

From 4aca16326c573ce1cd38700131c7f09ec9b77d00 Mon Sep 17 00:00:00 2001
From: tareksander <57038324+tareksander@users.noreply.github.com>
Date: Sat, 4 Dec 2021 19:28:32 +0100
Subject: [PATCH 709/912] Added: termux-am-library to integrate am with Termux.

---
 app/build.gradle                              |   4 +
 .../com/termux/app/TermuxApplication.java     |  17 ++
 .../shared/shell/LocalSocketListener.java     | 161 ++++++++++++++++++
 3 files changed, 182 insertions(+)
 create mode 100644 termux-shared/src/main/java/com/termux/shared/shell/LocalSocketListener.java

diff --git a/app/build.gradle b/app/build.gradle
index 853435690d..676d7a1732 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -25,6 +25,10 @@ android {
 
         implementation project(":terminal-view")
         implementation project(":termux-shared")
+
+
+        implementation 'com.github.tareksander:termux-am-library:main-SNAPSHOT'
+        
     }
 
     defaultConfig {
diff --git a/app/src/main/java/com/termux/app/TermuxApplication.java b/app/src/main/java/com/termux/app/TermuxApplication.java
index 3d438f71d0..1d0eed04f3 100644
--- a/app/src/main/java/com/termux/app/TermuxApplication.java
+++ b/app/src/main/java/com/termux/app/TermuxApplication.java
@@ -3,13 +3,16 @@
 import android.app.Application;
 import android.content.Context;
 
+import com.termux.am.Am;
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.termux.crash.TermuxCrashUtils;
 import com.termux.shared.termux.settings.preferences.TermuxAppSharedPreferences;
 import com.termux.shared.logger.Logger;
 import com.termux.shared.termux.settings.properties.TermuxAppSharedProperties;
 import com.termux.shared.termux.theme.TermuxThemeUtils;
+import com.termux.shared.shell.LocalSocketListener;
 
+import java.io.IOException;
 
 public class TermuxApplication extends Application {
 
@@ -31,6 +34,20 @@ public void onCreate() {
 
         // Set NightMode.APP_NIGHT_MODE
         TermuxThemeUtils.setAppNightMode(properties.getNightMode());
+
+        try {
+            new LocalSocketListener(this, (args, out, err) -> {
+                try {
+                    new Am(out, err, this).run(args);
+                    return 0;
+                } catch (Exception e) {
+                    return 1;
+                }
+            }, TermuxConstants.TERMUX_PACKAGE_NAME+"://call-am", 1000);
+        }
+        catch (IOException e) {
+            Logger.logDebug("TermuxApplication", "am socket already in use");
+        }
     }
 
     public static void setLogConfig(Context context) {
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/LocalSocketListener.java b/termux-shared/src/main/java/com/termux/shared/shell/LocalSocketListener.java
new file mode 100644
index 0000000000..3e58d3280f
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/shell/LocalSocketListener.java
@@ -0,0 +1,161 @@
+package com.termux.shared.shell;
+
+import android.app.Application;
+import android.net.LocalServerSocket;
+import android.net.LocalSocket;
+
+import androidx.annotation.NonNull;
+
+import com.termux.shared.logger.Logger;
+
+import java.io.BufferedWriter;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.PrintStream;
+
+public class LocalSocketListener
+{
+    public interface LocalSocketHandler {
+        int handle(String[] args, PrintStream out, PrintStream err);
+    }
+    
+    
+    private static final String LOG_TAG = "LocalSocketListener";
+    
+    private final Thread thread;
+    private final LocalServerSocket server;
+    private final int timeoutMillis;
+    
+    public LocalSocketListener(@NonNull Application a, @NonNull LocalSocketHandler h, String address, int timeoutMillis) throws IOException {
+        this.timeoutMillis = timeoutMillis;
+        server = new LocalServerSocket(address);
+        thread = new Thread(new LocalSocketListenerRunnable(a, h));
+        thread.setUncaughtExceptionHandler((t, e) -> Logger.logStackTraceWithMessage(LOG_TAG, "Uncaught exception in LocalSocketListenerRunnable", e));
+        thread.start();
+    }
+    
+    @SuppressWarnings("unused")
+    public void stop() {
+        try {
+            thread.interrupt();
+            server.close();
+        } catch (Exception ignored) {}
+    }
+    
+    private class LocalSocketListenerRunnable implements Runnable {
+        private final Application a;
+        private final TimeoutWatcher timeoutWatcher;
+        private final Thread timeoutWatcherThread;
+        private final LocalSocketHandler h;
+        public LocalSocketListenerRunnable(@NonNull Application a, @NonNull LocalSocketHandler h) {
+            this.a = a;
+            this.h = h;
+            timeoutWatcher = new TimeoutWatcher();
+            timeoutWatcherThread = new Thread(timeoutWatcher);
+            timeoutWatcherThread.start();
+        }
+        
+        // the socket timeout for LocalSocket doesn't seem to work, so close the socket if the timeout is over, so the processing Thread doesn't get blocked.
+        private class TimeoutWatcher implements Runnable {
+            private final Object lock = new Object();
+            private LocalSocket current = null;
+            @Override
+            public void run() {
+                while (! Thread.currentThread().isInterrupted()) {
+                    LocalSocket watch = current;
+                    synchronized (lock) {
+                        while (watch == null) {
+                            try {
+                                lock.wait();
+                            }
+                            catch (InterruptedException ignored) {
+                                Thread.currentThread().interrupt();
+                            }
+                            watch = current;
+                        }
+                    }
+                    try {
+                        //noinspection BusyWait
+                        Thread.sleep(timeoutMillis);
+                    }
+                    catch (InterruptedException e) {
+                        Thread.currentThread().interrupt();
+                    }
+                    try {
+                        watch.shutdownInput();
+                    } catch (Exception ignored) {}
+                    try {
+                        watch.shutdownOutput();
+                    } catch (Exception ignored) {}
+                    try {
+                        watch.close();
+                    } catch (Exception ignored) {}
+                }
+            }
+        }
+        
+        @Override
+        public void run() {
+            try {
+                while (! Thread.currentThread().isInterrupted()) {
+                    try (LocalSocket s = server.accept();
+                         OutputStream sockout = s.getOutputStream();
+                         InputStreamReader r = new InputStreamReader(s.getInputStream())) {
+                        timeoutWatcher.current = s;
+                        synchronized (timeoutWatcher.lock) {
+                            timeoutWatcher.lock.notifyAll();
+                        }
+                        // ensure only Termux programs can connect
+                        if (s.getPeerCredentials().getUid() != a.getApplicationInfo().uid) {
+                            Logger.logDebug(LOG_TAG, "A program with another UID tried to connect");
+                            continue;
+                        }
+                        StringBuilder b = new StringBuilder();
+                        int c;
+                        while ((c = r.read()) > 0) {
+                            b.append((char) c);
+                        }
+                        String outString;
+                        String errString;
+                        int ret;
+                        try (ByteArrayOutputStream out = new ByteArrayOutputStream();
+                             PrintStream outp = new PrintStream(out);
+                             ByteArrayOutputStream err = new ByteArrayOutputStream();
+                             PrintStream errp = new PrintStream(err)) {
+                            
+                            ret = h.handle(ArgumentTokenizer.tokenize(b.toString()).toArray(new String[0]), outp, errp);
+                            
+                            outp.flush();
+                            outString = out.toString("UTF-8");
+                            
+                            errp.flush();
+                            errString = err.toString("UTF-8");
+                        }
+                        try (BufferedWriter w = new BufferedWriter(new OutputStreamWriter(sockout))) {
+                            w.write(Integer.toString(ret));
+                            w.write('\0');
+                            w.write(outString);
+                            w.write('\0');
+                            w.write(errString);
+                            w.flush();
+                        }
+                    } catch (Exception e) {
+                        Logger.logStackTraceWithMessage(LOG_TAG, "Exception while handling connection", e);
+                    }
+                }
+            }
+            finally {
+                try {
+                    server.close();
+                } catch (Exception ignored) {}
+                if (timeoutWatcherThread.isAlive()) {
+                    timeoutWatcherThread.interrupt();
+                }
+            }
+            Logger.logDebug(LOG_TAG, "LocalSocketListenerRunnable returned");
+        }
+    }
+}

From f366db0cb328ce969d70301f5a98978a29302754 Mon Sep 17 00:00:00 2001
From: tareksander <57038324+tareksander@users.noreply.github.com>
Date: Mon, 6 Dec 2021 17:51:14 +0100
Subject: [PATCH 710/912] Added: LocalFilesystemSocket as an Interface to UNIX
 sockets in the filesystem. The UID of connecting programs is automatically
 checked against the processes UID and connections where the UID doesn't match
 are automatically rejected and logged. Changed: LocalSocketListener now uses
 sockets in the filesystem.

---
 .../com/termux/app/TermuxApplication.java     |  27 +-
 termux-shared/build.gradle                    |  10 +
 termux-shared/src/main/cpp/Android.mk         |   6 +
 .../src/main/cpp/local-filesystem-socket.cpp  | 196 +++++++++++++
 .../shared/shell/LocalFilesystemSocket.java   | 269 ++++++++++++++++++
 .../shared/shell/LocalSocketListener.java     |  91 ++----
 6 files changed, 517 insertions(+), 82 deletions(-)
 create mode 100644 termux-shared/src/main/cpp/Android.mk
 create mode 100644 termux-shared/src/main/cpp/local-filesystem-socket.cpp
 create mode 100644 termux-shared/src/main/java/com/termux/shared/shell/LocalFilesystemSocket.java

diff --git a/app/src/main/java/com/termux/app/TermuxApplication.java b/app/src/main/java/com/termux/app/TermuxApplication.java
index 1d0eed04f3..84dd0e6cec 100644
--- a/app/src/main/java/com/termux/app/TermuxApplication.java
+++ b/app/src/main/java/com/termux/app/TermuxApplication.java
@@ -4,15 +4,15 @@
 import android.content.Context;
 
 import com.termux.am.Am;
+import com.termux.shared.logger.Logger;
+import com.termux.shared.shell.LocalSocketListener;
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.termux.crash.TermuxCrashUtils;
 import com.termux.shared.termux.settings.preferences.TermuxAppSharedPreferences;
-import com.termux.shared.logger.Logger;
 import com.termux.shared.termux.settings.properties.TermuxAppSharedProperties;
 import com.termux.shared.termux.theme.TermuxThemeUtils;
-import com.termux.shared.shell.LocalSocketListener;
 
-import java.io.IOException;
+import java.io.File;
 
 public class TermuxApplication extends Application {
 
@@ -35,18 +35,15 @@ public void onCreate() {
         // Set NightMode.APP_NIGHT_MODE
         TermuxThemeUtils.setAppNightMode(properties.getNightMode());
 
-        try {
-            new LocalSocketListener(this, (args, out, err) -> {
-                try {
-                    new Am(out, err, this).run(args);
-                    return 0;
-                } catch (Exception e) {
-                    return 1;
-                }
-            }, TermuxConstants.TERMUX_PACKAGE_NAME+"://call-am", 1000);
-        }
-        catch (IOException e) {
-            Logger.logDebug("TermuxApplication", "am socket already in use");
+        if (LocalSocketListener.tryEstablishLocalSocketListener(this, (args, out, err) -> {
+            try {
+                new Am(out, err, this).run(args);
+                return 0;
+            } catch (Exception e) {
+                return 1;
+            }
+        }, new File(getFilesDir(), "am-socket").getAbsolutePath(), 100, 1000) == null) {
+            Logger.logWarn("TermuxApplication", "am socket cannot be created");
         }
     }
 
diff --git a/termux-shared/build.gradle b/termux-shared/build.gradle
index 4883864e6f..97f60d49e0 100644
--- a/termux-shared/build.gradle
+++ b/termux-shared/build.gradle
@@ -32,6 +32,11 @@ android {
         minSdkVersion project.properties.minSdkVersion.toInteger()
         targetSdkVersion project.properties.targetSdkVersion.toInteger()
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        externalNativeBuild {
+            ndkBuild {
+                cppFlags ''
+            }
+        }
     }
 
     buildTypes {
@@ -45,6 +50,11 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+    externalNativeBuild {
+        ndkBuild {
+            path file('src/main/cpp/Android.mk')
+        }
+    }
 }
 
 dependencies {
diff --git a/termux-shared/src/main/cpp/Android.mk b/termux-shared/src/main/cpp/Android.mk
new file mode 100644
index 0000000000..bc34d6ac95
--- /dev/null
+++ b/termux-shared/src/main/cpp/Android.mk
@@ -0,0 +1,6 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+LOCAL_LDLIBS := -llog
+LOCAL_MODULE := local-filesystem-socket
+LOCAL_SRC_FILES := local-filesystem-socket.cpp
+include $(BUILD_SHARED_LIBRARY)
diff --git a/termux-shared/src/main/cpp/local-filesystem-socket.cpp b/termux-shared/src/main/cpp/local-filesystem-socket.cpp
new file mode 100644
index 0000000000..eb0ca32b2c
--- /dev/null
+++ b/termux-shared/src/main/cpp/local-filesystem-socket.cpp
@@ -0,0 +1,196 @@
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <sys/ioctl.h>
+
+#include <ctime>
+#include <cstdio>
+#include <unistd.h>
+#include <cerrno>
+
+#include <jni.h>
+
+#include <android/log.h>
+
+
+
+
+
+int64_t millisecondtime(const struct timespec* const time) {
+    return (((int64_t)time->tv_sec)*1000)+(((int64_t)time->tv_nsec)/1000000);
+}
+
+
+
+/// Sets the timeout in microseconds
+void settimeout_micro(int fd, int timeout) {
+    struct timeval t = {};
+    t.tv_sec = 0;
+    t.tv_usec = timeout;
+    socklen_t len = sizeof(t);
+    setsockopt(fd, SOL_SOCKET, SO_SNDTIMEO, &t, len);
+    setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, &t, len);
+}
+
+/// Sets the timeout in milliseconds
+void settimeout(int fd, int timeout) {
+    settimeout_micro(fd, timeout*1000);
+}
+
+
+extern "C"
+JNIEXPORT jint JNICALL
+Java_com_termux_shared_shell_LocalFilesystemSocket_createserversocket(JNIEnv *env, jclass clazz, jbyteArray path, jint backlog) {
+    if (backlog < 1) {
+        return -1;
+    }
+    int fd = socket(AF_UNIX, SOCK_STREAM, 0);
+    if (fd == -1) {
+        return -1;
+    }
+    jbyte* p = env->GetByteArrayElements(path, nullptr);
+    if (p == nullptr) {
+        close(fd);
+        return -1;
+    }
+    int chars = env->GetArrayLength(path);
+    if (chars >= sizeof(struct sockaddr_un)-sizeof(sa_family_t)) {
+        env->ReleaseByteArrayElements(path, p, JNI_ABORT);
+        close(fd);
+        return -1;
+    }
+    struct sockaddr_un adr = {.sun_family = AF_UNIX};
+    memcpy(&adr.sun_path, p, chars);
+    if (bind(fd, reinterpret_cast<struct sockaddr*>(&adr), sizeof(adr)) == -1) {
+        env->ReleaseByteArrayElements(path, p, JNI_ABORT);
+        close(fd);
+        return -1;
+    }
+    if (listen(fd, backlog) == -1) {
+        env->ReleaseByteArrayElements(path, p, JNI_ABORT);
+        close(fd);
+        return -1;
+    }
+    return fd;
+}
+
+
+extern "C"
+JNIEXPORT void JNICALL
+Java_com_termux_shared_shell_LocalFilesystemSocket_closefd(JNIEnv *env, jclass clazz, jint fd) {
+    close(fd);
+}
+
+extern "C"
+JNIEXPORT jint JNICALL
+Java_com_termux_shared_shell_LocalFilesystemSocket_accept(JNIEnv *env, jclass clazz, jint fd) {
+    int c = accept(fd, nullptr, nullptr);
+    if (c == -1) {
+        return -1;
+    }
+    return c;
+}
+
+
+
+
+extern "C"
+JNIEXPORT jboolean JNICALL
+Java_com_termux_shared_shell_LocalFilesystemSocket_send(JNIEnv *env, jclass clazz, jbyteArray data, jint fd, jlong deadline) {
+    if (fd == -1) {
+        return false;
+    }
+    jbyte* d = env->GetByteArrayElements(data, nullptr);
+    if (d == nullptr) {
+        return false;
+    }
+    struct timespec time = {};
+    jbyte* current = d;
+    int bytes = env->GetArrayLength(data);
+    while (bytes > 0) {
+        if (clock_gettime(CLOCK_REALTIME, &time) != -1) {
+            if (millisecondtime(&time) > deadline) {
+                env->ReleaseByteArrayElements(data, d, JNI_ABORT);
+                return false;
+            }
+        } else {
+            __android_log_write(ANDROID_LOG_WARN, "LocalFilesystemSocket.send", "Could not get the current time, deadline will not work");
+        }
+        int ret = send(fd, current, bytes, MSG_NOSIGNAL);
+        if (ret == -1) {
+            __android_log_print(ANDROID_LOG_DEBUG, "LocalFilesystemSocket.send", "%s", strerror(errno));
+            env->ReleaseByteArrayElements(data, d, JNI_ABORT);
+            return false;
+        }
+        bytes -= ret;
+        current += ret;
+    }
+    env->ReleaseByteArrayElements(data, d, JNI_ABORT);
+    return true;
+}
+
+extern "C"
+JNIEXPORT jint JNICALL
+Java_com_termux_shared_shell_LocalFilesystemSocket_recv(JNIEnv *env, jclass clazz, jbyteArray data, jint fd, jlong deadline) {
+    if (fd == -1) {
+        return -1;
+    }
+    jbyte* d = env->GetByteArrayElements(data, nullptr);
+    if (d == nullptr) {
+        return -1;
+    }
+    struct timespec time = {};
+    jbyte* current = d;
+    int bytes = env->GetArrayLength(data);
+    int transferred = 0;
+    while (transferred < bytes) {
+        if (clock_gettime(CLOCK_REALTIME, &time) != -1) {
+            if (millisecondtime(&time) > deadline) {
+                env->ReleaseByteArrayElements(data, d, 0);
+                return -1;
+            }
+        } else {
+            __android_log_write(ANDROID_LOG_WARN, "LocalFilesystemSocket.recv", "Could not get the current time, deadline will not work");
+        }
+        int ret = read(fd, current, bytes);
+        if (ret == -1) {
+            env->ReleaseByteArrayElements(data, d, 0);
+            return -1;
+        }
+        // EOF, peer closed writing end
+        if (ret == 0) {
+            break;
+        }
+        transferred += ret;
+        current += ret;
+    }
+    env->ReleaseByteArrayElements(data, d, 0);
+    return transferred;
+}
+
+extern "C"
+JNIEXPORT void JNICALL
+Java_com_termux_shared_shell_LocalFilesystemSocket_settimeout(JNIEnv *env, jclass clazz, jint fd, jint timeout) {
+    settimeout(fd, timeout);
+}
+
+extern "C"
+JNIEXPORT jint JNICALL
+Java_com_termux_shared_shell_LocalFilesystemSocket_available(JNIEnv *env, jclass clazz, jint fd) {
+    int size = 0;
+    if (ioctl(fd, SIOCINQ, &size) == -1) {
+        return 0;
+    }
+    return size;
+}
+
+extern "C"
+JNIEXPORT jint JNICALL
+Java_com_termux_shared_shell_LocalFilesystemSocket_getpeeruid(JNIEnv *env, jclass clazz, jint fd) {
+    struct ucred cred = {};
+    socklen_t len = sizeof(cred);
+    if (getsockopt(fd, SOL_SOCKET, SO_PEERCRED, &cred, &len) == -1) {
+        return -1;
+    }
+    return cred.uid;
+}
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/LocalFilesystemSocket.java b/termux-shared/src/main/java/com/termux/shared/shell/LocalFilesystemSocket.java
new file mode 100644
index 0000000000..3a4db47cae
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/shell/LocalFilesystemSocket.java
@@ -0,0 +1,269 @@
+package com.termux.shared.shell;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+
+import com.termux.shared.logger.Logger;
+
+import java.io.Closeable;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
+
+public class LocalFilesystemSocket
+{
+    static {
+        System.loadLibrary("local-filesystem-socket");
+    }
+    
+    /**
+     * Creates as UNIX server socket at {@code path}, with a backlog of {@code backlog}.
+     * @return The file descriptor of the server socket or -1 if an error occurred.
+     */
+    private static native int createserversocket(@NonNull byte[] path, int backlog);
+    
+    /**
+     * Accepts a connection on the supplied server socket.
+     * @return The file descriptor of the connection socket or -1 in case of an error.
+     */
+    private static native int accept(int fd);
+    
+    private static native void closefd(int fd);
+    
+    
+    /**
+     * Returns the UID of the socket peer, or -1 in case of an error.
+     */
+    private static native int getpeeruid(int fd);
+    
+    
+    /**
+     * Sends {@code data} over the socket and decrements the timeout by the elapsed time. If the timeout hits or an error occurs, false is returned, true otherwise.
+     */
+    private static native boolean send(@NonNull byte[] data, int fd, long deadline);
+    
+    /**
+     * Receives data from the socket and decrements the timeout by the elapsed time. If the timeout hits or an error occurs, -1 is returned, otherwise the number of received bytes.
+     */
+    private static native int recv(@NonNull byte[] data, int fd, long deadline);
+    
+    /**
+     * Sets the send and receive timeout for the socket in milliseconds.
+     */
+    private static native void settimeout(int fd, int timeout);
+    
+    /**
+     * Gets the number of bytes available to read on the socket.
+     */
+    private static native int available(int fd);
+    
+    
+    
+    
+    static class Socket implements Closeable {
+        private int fd;
+        private long deadline = 0;
+        private final SocketOutputStream out = new SocketOutputStream();
+        private final SocketInputStream in = new SocketInputStream();
+        
+        class SocketInputStream extends InputStream {
+            private final byte[] readb = new byte[1];
+            
+            @Override
+            public int read() throws IOException {
+                int ret = recv(readb);
+                if (ret == -1) {
+                    throw new IOException("Could not read from socket");
+                }
+                if (ret == 0) {
+                    return -1;
+                }
+                return readb[0];
+            }
+    
+            @Override
+            public int read(byte[] b) throws IOException {
+                if (b == null) {
+                    throw new NullPointerException("Read buffer  can't be null");
+                }
+                int ret = recv(b);
+                if (ret == -1) {
+                    throw new IOException("Could not read from socket");
+                }
+                if (ret == 0) {
+                    return -1;
+                }
+                return ret;
+            }
+    
+            @Override
+            public int available() {
+                return Socket.this.available();
+            }
+        }
+        
+        class SocketOutputStream extends OutputStream {
+            private final byte[] writeb = new byte[1];
+            
+            @Override
+            public void write(int b) throws IOException {
+                writeb[0] = (byte) b;
+                if (! send(writeb)) {
+                    throw new IOException("Could not write to socket");
+                }
+            }
+    
+            @Override
+            public void write(byte[] b) throws IOException {
+                if (! send(b)) {
+                    throw new IOException("Could not write to socket");
+                }
+            }
+        }
+        
+        private Socket(int fd) {
+            this.fd = fd;
+        }
+    
+    
+        /**
+         * Sets the socket timeout, that makes a single send/recv error out if it triggers. For a deadline after which the socket should be finished see setDeadline()
+         */
+        public void setTimeout(int timeout) {
+            if (fd != -1) {
+                settimeout(fd, timeout);
+            }
+        }
+    
+    
+        /**
+         * Sets the deadline in unix milliseconds. When the deadline has elapsed and the socket timeout triggers, all reads and writes will error.
+         */
+        public void setDeadline(long deadline) {
+            this.deadline = deadline;
+        }
+        
+        public boolean send(@NonNull byte[] data) {
+            if (fd == -1) {
+                return false;
+            }
+            return LocalFilesystemSocket.send(data, fd, deadline);
+        }
+    
+        public int recv(@NonNull byte[] data) {
+            if (fd == -1) {
+                return -1;
+            }
+            return LocalFilesystemSocket.recv(data, fd, deadline);
+        }
+        
+        public int available() {
+            if (fd == -1 || System.currentTimeMillis() > deadline) {
+                return 0;
+            }
+            return LocalFilesystemSocket.available(fd);
+        }
+        
+        @Override
+        public void close() throws IOException {
+            if (fd != -1) {
+                closefd(fd);
+                fd = -1;
+            }
+        }
+    
+        /**
+         * Returns the UID of the socket peer, or -1 in case of an error.
+         */
+        public int getPeerUID() {
+            return getpeeruid(fd); 
+        }
+        
+        /**
+         * Returns an {@link OutputStream} for the socket. You don't need to close the stream, it's automatically closed when closing the socket.
+         */
+        public OutputStream getOutputStream() {
+            return out;
+        }
+    
+        /**
+         * Returns an {@link InputStream} for the socket. You don't need to close the stream, it's automatically closed when closing the socket.
+         */
+        public InputStream getInputStream() {
+            return  in;
+        }
+    }
+    
+    
+    static class ServerSocket implements Closeable
+    {
+        private final String path;
+        private final Context app;
+        private int fd;
+        
+        public ServerSocket(Context c, String path, int backlog) throws IOException {
+            app = c.getApplicationContext();
+            if (backlog <= 0) {
+                throw new IllegalArgumentException("Backlog has to be at least 1");
+            }
+            if (path == null) {
+                throw new IllegalArgumentException("path cannot be null");
+            }
+            this.path = path;
+            File f = new File(path);
+            File parent = f.getParentFile();
+            if (parent != null) {
+                parent.mkdirs();
+            }
+            f.delete();
+            fd = createserversocket(path.getBytes(StandardCharsets.UTF_8), backlog);
+            if (fd == -1) {
+                throw new IOException("Could not create UNIX server socket at \""+path+"\"");
+            }
+        }
+        
+        public ServerSocket(Context c, String path) throws IOException {
+            this(c, path, 50); // 50 is the default value for the Android LocalSocket implementation, so this should be good here, too
+        }
+        
+        public Socket accept() {
+            if (fd == -1) {
+                return null;
+            }
+            int c = -1;
+            while (true) {
+                while (c == -1) {
+                    c = LocalFilesystemSocket.accept(fd);
+                }
+                int peeruid = getpeeruid(c);
+                if (peeruid == -1) {
+                    Logger.logWarn("LocalFilesystemSocket.ServerSocket", "Could not verify peer uid, closing socket");
+                    closefd(c);
+                    c = -1;
+                    continue;
+                }
+                
+                if (peeruid == app.getApplicationInfo().uid) {
+                    // if the peer has the same uid, allow the connection
+                    break;
+                } else {
+                    Logger.logWarn("LocalFilesystemSocket.ServerSocket", "WARNING: An app with the uid of "+peeruid+" tried to connect to the socket at \""+path+"\", closing connection.");
+                    closefd(c);
+                    c = -1;
+                }
+            }
+            return new Socket(c);
+        }
+        
+        @Override
+        public void close() throws IOException {
+            if (fd != -1) {
+                closefd(fd);
+                fd = -1;
+            }
+        }
+    }
+}
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/LocalSocketListener.java b/termux-shared/src/main/java/com/termux/shared/shell/LocalSocketListener.java
index 3e58d3280f..551562f20c 100644
--- a/termux-shared/src/main/java/com/termux/shared/shell/LocalSocketListener.java
+++ b/termux-shared/src/main/java/com/termux/shared/shell/LocalSocketListener.java
@@ -1,8 +1,6 @@
 package com.termux.shared.shell;
 
 import android.app.Application;
-import android.net.LocalServerSocket;
-import android.net.LocalSocket;
 
 import androidx.annotation.NonNull;
 
@@ -22,21 +20,31 @@ public interface LocalSocketHandler {
         int handle(String[] args, PrintStream out, PrintStream err);
     }
     
-    
     private static final String LOG_TAG = "LocalSocketListener";
     
     private final Thread thread;
-    private final LocalServerSocket server;
+    private final LocalFilesystemSocket.ServerSocket server;
     private final int timeoutMillis;
+    private final int deadlineMillis;
+    
     
-    public LocalSocketListener(@NonNull Application a, @NonNull LocalSocketHandler h, String address, int timeoutMillis) throws IOException {
+    private LocalSocketListener(@NonNull Application a, @NonNull LocalSocketHandler h, @NonNull String path, int timeoutMillis, int deadlineMillis) throws IOException {
         this.timeoutMillis = timeoutMillis;
-        server = new LocalServerSocket(address);
-        thread = new Thread(new LocalSocketListenerRunnable(a, h));
+        this.deadlineMillis = deadlineMillis;
+        server = new LocalFilesystemSocket.ServerSocket(a, path);
+        thread = new Thread(new LocalSocketListenerRunnable(h));
         thread.setUncaughtExceptionHandler((t, e) -> Logger.logStackTraceWithMessage(LOG_TAG, "Uncaught exception in LocalSocketListenerRunnable", e));
         thread.start();
     }
     
+    public static LocalSocketListener tryEstablishLocalSocketListener(@NonNull Application a, @NonNull LocalSocketHandler h, @NonNull String address, int timeoutMillis, int deadlineMillis) {
+        try {
+            return new LocalSocketListener(a, h, address, timeoutMillis, deadlineMillis);
+        } catch (IOException e) {
+            return null;
+        }
+    }
+    
     @SuppressWarnings("unused")
     public void stop() {
         try {
@@ -46,78 +54,30 @@ public void stop() {
     }
     
     private class LocalSocketListenerRunnable implements Runnable {
-        private final Application a;
-        private final TimeoutWatcher timeoutWatcher;
-        private final Thread timeoutWatcherThread;
         private final LocalSocketHandler h;
-        public LocalSocketListenerRunnable(@NonNull Application a, @NonNull LocalSocketHandler h) {
-            this.a = a;
+        public LocalSocketListenerRunnable(@NonNull LocalSocketHandler h) {
             this.h = h;
-            timeoutWatcher = new TimeoutWatcher();
-            timeoutWatcherThread = new Thread(timeoutWatcher);
-            timeoutWatcherThread.start();
-        }
-        
-        // the socket timeout for LocalSocket doesn't seem to work, so close the socket if the timeout is over, so the processing Thread doesn't get blocked.
-        private class TimeoutWatcher implements Runnable {
-            private final Object lock = new Object();
-            private LocalSocket current = null;
-            @Override
-            public void run() {
-                while (! Thread.currentThread().isInterrupted()) {
-                    LocalSocket watch = current;
-                    synchronized (lock) {
-                        while (watch == null) {
-                            try {
-                                lock.wait();
-                            }
-                            catch (InterruptedException ignored) {
-                                Thread.currentThread().interrupt();
-                            }
-                            watch = current;
-                        }
-                    }
-                    try {
-                        //noinspection BusyWait
-                        Thread.sleep(timeoutMillis);
-                    }
-                    catch (InterruptedException e) {
-                        Thread.currentThread().interrupt();
-                    }
-                    try {
-                        watch.shutdownInput();
-                    } catch (Exception ignored) {}
-                    try {
-                        watch.shutdownOutput();
-                    } catch (Exception ignored) {}
-                    try {
-                        watch.close();
-                    } catch (Exception ignored) {}
-                }
-            }
         }
         
         @Override
         public void run() {
             try {
                 while (! Thread.currentThread().isInterrupted()) {
-                    try (LocalSocket s = server.accept();
+                    try (LocalFilesystemSocket.Socket s = server.accept();
                          OutputStream sockout = s.getOutputStream();
                          InputStreamReader r = new InputStreamReader(s.getInputStream())) {
-                        timeoutWatcher.current = s;
-                        synchronized (timeoutWatcher.lock) {
-                            timeoutWatcher.lock.notifyAll();
-                        }
-                        // ensure only Termux programs can connect
-                        if (s.getPeerCredentials().getUid() != a.getApplicationInfo().uid) {
-                            Logger.logDebug(LOG_TAG, "A program with another UID tried to connect");
-                            continue;
-                        }
+                        
+                        
+                        
+                        s.setTimeout(timeoutMillis);
+                        s.setDeadline(System.currentTimeMillis()+deadlineMillis);
+                        
                         StringBuilder b = new StringBuilder();
                         int c;
                         while ((c = r.read()) > 0) {
                             b.append((char) c);
                         }
+                        Logger.logDebug(LOG_TAG, b.toString());
                         String outString;
                         String errString;
                         int ret;
@@ -151,9 +111,6 @@ public void run() {
                 try {
                     server.close();
                 } catch (Exception ignored) {}
-                if (timeoutWatcherThread.isAlive()) {
-                    timeoutWatcherThread.interrupt();
-                }
             }
             Logger.logDebug(LOG_TAG, "LocalSocketListenerRunnable returned");
         }

From 33b88b5d4b9f671934f1aab07fe1543c61ab5319 Mon Sep 17 00:00:00 2001
From: tareksander <57038324+tareksander@users.noreply.github.com>
Date: Tue, 7 Dec 2021 00:06:05 +0100
Subject: [PATCH 711/912] Changed: Set termux-am-library to a tag instead of
 following the main branch.

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 676d7a1732..2e7c7a05ea 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -27,7 +27,7 @@ android {
         implementation project(":termux-shared")
 
 
-        implementation 'com.github.tareksander:termux-am-library:main-SNAPSHOT'
+        implementation 'com.github.tareksander:termux-am-library:1.0'
         
     }
 

From 3dee2eb486c7205222453adf2eb90a4147b732c5 Mon Sep 17 00:00:00 2001
From: tareksander <57038324+tareksander@users.noreply.github.com>
Date: Wed, 8 Dec 2021 10:29:13 +0100
Subject: [PATCH 712/912] Changed: Allow connections from root o sockets.

---
 .../src/main/cpp/local-filesystem-socket.cpp  |  1 +
 .../shared/shell/LocalFilesystemSocket.java   | 24 +++++++++++--------
 .../shared/shell/LocalSocketListener.java     |  1 -
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/termux-shared/src/main/cpp/local-filesystem-socket.cpp b/termux-shared/src/main/cpp/local-filesystem-socket.cpp
index eb0ca32b2c..4c5bc3e14a 100644
--- a/termux-shared/src/main/cpp/local-filesystem-socket.cpp
+++ b/termux-shared/src/main/cpp/local-filesystem-socket.cpp
@@ -188,6 +188,7 @@ extern "C"
 JNIEXPORT jint JNICALL
 Java_com_termux_shared_shell_LocalFilesystemSocket_getpeeruid(JNIEnv *env, jclass clazz, jint fd) {
     struct ucred cred = {};
+    cred.uid = 1; // initialize uid to 1 here because I'm paranoid and a failed getsockopt that somehow doesn't report as failed would report the uid of root
     socklen_t len = sizeof(cred);
     if (getsockopt(fd, SOL_SOCKET, SO_PEERCRED, &cred, &len) == -1) {
         return -1;
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/LocalFilesystemSocket.java b/termux-shared/src/main/java/com/termux/shared/shell/LocalFilesystemSocket.java
index 3a4db47cae..951e668c50 100644
--- a/termux-shared/src/main/java/com/termux/shared/shell/LocalFilesystemSocket.java
+++ b/termux-shared/src/main/java/com/termux/shared/shell/LocalFilesystemSocket.java
@@ -209,16 +209,20 @@ public ServerSocket(Context c, String path, int backlog) throws IOException {
             if (backlog <= 0) {
                 throw new IllegalArgumentException("Backlog has to be at least 1");
             }
-            if (path == null) {
-                throw new IllegalArgumentException("path cannot be null");
+            if (path == null || path.length() == 0) {
+                throw new IllegalArgumentException("path cannot be null or empty");
             }
             this.path = path;
-            File f = new File(path);
-            File parent = f.getParentFile();
-            if (parent != null) {
-                parent.mkdirs();
+            if (path.getBytes(StandardCharsets.UTF_8)[0] != 0) {
+                // not a socket in the abstract linux namespace, make sure the path is accessible and clear
+                File f = new File(path);
+                File parent = f.getParentFile();
+                if (parent != null) {
+                    parent.mkdirs();
+                }
+                f.delete();
             }
-            f.delete();
+    
             fd = createserversocket(path.getBytes(StandardCharsets.UTF_8), backlog);
             if (fd == -1) {
                 throw new IOException("Could not create UNIX server socket at \""+path+"\"");
@@ -245,9 +249,9 @@ public Socket accept() {
                     c = -1;
                     continue;
                 }
-                
-                if (peeruid == app.getApplicationInfo().uid) {
-                    // if the peer has the same uid, allow the connection
+    
+                // if the peer has the same uid or is root, allow the connection
+                if (peeruid == app.getApplicationInfo().uid || peeruid == 0) {
                     break;
                 } else {
                     Logger.logWarn("LocalFilesystemSocket.ServerSocket", "WARNING: An app with the uid of "+peeruid+" tried to connect to the socket at \""+path+"\", closing connection.");
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/LocalSocketListener.java b/termux-shared/src/main/java/com/termux/shared/shell/LocalSocketListener.java
index 551562f20c..19322bf3d6 100644
--- a/termux-shared/src/main/java/com/termux/shared/shell/LocalSocketListener.java
+++ b/termux-shared/src/main/java/com/termux/shared/shell/LocalSocketListener.java
@@ -77,7 +77,6 @@ public void run() {
                         while ((c = r.read()) > 0) {
                             b.append((char) c);
                         }
-                        Logger.logDebug(LOG_TAG, b.toString());
                         String outString;
                         String errString;
                         int ret;

From 2851175d8b980c3464f3adb4d06bf5a32768fcdd Mon Sep 17 00:00:00 2001
From: tareksander <57038324+tareksander@users.noreply.github.com>
Date: Wed, 8 Dec 2021 15:34:26 +0100
Subject: [PATCH 713/912] Changed: Moved the am socket to
 PREFIX/var/run/am-socket

---
 app/src/main/java/com/termux/app/TermuxApplication.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxApplication.java b/app/src/main/java/com/termux/app/TermuxApplication.java
index 84dd0e6cec..cb2bf1e81e 100644
--- a/app/src/main/java/com/termux/app/TermuxApplication.java
+++ b/app/src/main/java/com/termux/app/TermuxApplication.java
@@ -12,8 +12,6 @@
 import com.termux.shared.termux.settings.properties.TermuxAppSharedProperties;
 import com.termux.shared.termux.theme.TermuxThemeUtils;
 
-import java.io.File;
-
 public class TermuxApplication extends Application {
 
     public void onCreate() {
@@ -42,7 +40,7 @@ public void onCreate() {
             } catch (Exception e) {
                 return 1;
             }
-        }, new File(getFilesDir(), "am-socket").getAbsolutePath(), 100, 1000) == null) {
+        }, TermuxConstants.TERMUX_VAR_PREFIX_DIR_PATH+"/run/am-socket", 100, 1000) == null) {
             Logger.logWarn("TermuxApplication", "am socket cannot be created");
         }
     }

From b025872029d1848c9288cfddcf64a71e18f24efa Mon Sep 17 00:00:00 2001
From: tareksander <57038324+tareksander@users.noreply.github.com>
Date: Wed, 8 Dec 2021 21:15:07 +0100
Subject: [PATCH 714/912] Changed: Updated the termux-am-library dependency,
 because the repo is now part of the Termux github organization.

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 2e7c7a05ea..5811c7edb7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -27,7 +27,7 @@ android {
         implementation project(":termux-shared")
 
 
-        implementation 'com.github.tareksander:termux-am-library:1.0'
+        implementation 'com.github.termux:termux-am-library:1.0'
         
     }
 

From 007f9cd7f176f1e2d1ff64f533037777bbf1b760 Mon Sep 17 00:00:00 2001
From: tareksander <57038324+tareksander@users.noreply.github.com>
Date: Thu, 9 Dec 2021 15:52:47 +0100
Subject: [PATCH 715/912] Changed: Set socket dir to
 /data/data/com.termux/files/api/

Using the TermuxConstants.TERMUX_FILES_DIR variable to get full path
TermuxConstants.TERMUX_FILES_DIR_PATH/api/am-socket.
---
 app/src/main/java/com/termux/app/TermuxApplication.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/termux/app/TermuxApplication.java b/app/src/main/java/com/termux/app/TermuxApplication.java
index cb2bf1e81e..17f690a290 100644
--- a/app/src/main/java/com/termux/app/TermuxApplication.java
+++ b/app/src/main/java/com/termux/app/TermuxApplication.java
@@ -40,7 +40,7 @@ public void onCreate() {
             } catch (Exception e) {
                 return 1;
             }
-        }, TermuxConstants.TERMUX_VAR_PREFIX_DIR_PATH+"/run/am-socket", 100, 1000) == null) {
+        }, TermuxConstants.TERMUX_FILES_DIR_PATH+"/api/am-socket", 100, 1000) == null) {
             Logger.logWarn("TermuxApplication", "am socket cannot be created");
         }
     }

From cc981d8a0395e5b357f69cac94c049426f9b9364 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Fri, 8 Apr 2022 22:44:34 +0500
Subject: [PATCH 716/912] Changed: Move `com.termux.app.utils.PluginUtils` to
 `com.termux.shared.termux.plugins.TermuxPluginUtils`

This will allow plugins and `termux-shared` library to trigger plugin error notifications too and process plugin command results.
---
 .../com/termux/app/RunCommandService.java     |  16 +-
 .../com/termux/app/TermuxOpenReceiver.java    |   4 +-
 .../java/com/termux/app/TermuxService.java    |  20 +--
 .../com/termux/app/models/UserAction.java     |   1 -
 app/src/main/res/values/strings.xml           |   2 -
 .../shared/termux/models/UserAction.java      |   3 +-
 .../termux/plugins/TermuxPluginUtils.java     | 156 +++++++++++++-----
 termux-shared/src/main/res/values/strings.xml |   6 +
 8 files changed, 145 insertions(+), 63 deletions(-)
 rename app/src/main/java/com/termux/app/utils/PluginUtils.java => termux-shared/src/main/java/com/termux/shared/termux/plugins/TermuxPluginUtils.java (72%)

diff --git a/app/src/main/java/com/termux/app/RunCommandService.java b/app/src/main/java/com/termux/app/RunCommandService.java
index 4862a476a8..261729155c 100644
--- a/app/src/main/java/com/termux/app/RunCommandService.java
+++ b/app/src/main/java/com/termux/app/RunCommandService.java
@@ -12,6 +12,7 @@
 import com.termux.R;
 import com.termux.shared.data.DataUtils;
 import com.termux.shared.data.IntentUtils;
+import com.termux.shared.termux.plugins.TermuxPluginUtils;
 import com.termux.shared.termux.file.TermuxFileUtils;
 import com.termux.shared.file.filesystem.FileType;
 import com.termux.shared.errors.Errno;
@@ -22,7 +23,6 @@
 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.shell.command.ExecutionCommand;
 import com.termux.shared.shell.command.ExecutionCommand.Runner;
 
@@ -75,7 +75,7 @@ public int onStartCommand(Intent intent, int flags, int startId) {
         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);
-            PluginUtils.processPluginExecutionCommandError(this, LOG_TAG, executionCommand, false);
+            TermuxPluginUtils.processPluginExecutionCommandError(this, LOG_TAG, executionCommand, false);
             return stopService();
         }
 
@@ -110,7 +110,7 @@ public int onStartCommand(Intent intent, int flags, int startId) {
         if (Runner.runnerOf(executionCommand.runner) == null) {
             errmsg = this.getString(R.string.error_run_command_service_invalid_execution_command_runner, executionCommand.runner);
             executionCommand.setStateFailed(Errno.ERRNO_FAILED.getCode(), errmsg);
-            PluginUtils.processPluginExecutionCommandError(this, LOG_TAG, executionCommand, false);
+            TermuxPluginUtils.processPluginExecutionCommandError(this, LOG_TAG, executionCommand, false);
             return stopService();
         }
 
@@ -137,10 +137,10 @@ public int onStartCommand(Intent intent, int flags, int startId) {
         // 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 = TermuxPluginUtils.checkIfAllowExternalAppsPolicyIsViolated(this, LOG_TAG);
         if (errmsg != null) {
             executionCommand.setStateFailed(Errno.ERRNO_FAILED.getCode(), errmsg);
-            PluginUtils.processPluginExecutionCommandError(this, LOG_TAG, executionCommand, true);
+            TermuxPluginUtils.processPluginExecutionCommandError(this, LOG_TAG, executionCommand, true);
             return stopService();
         }
 
@@ -150,7 +150,7 @@ public int onStartCommand(Intent intent, int flags, int startId) {
         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);
-            PluginUtils.processPluginExecutionCommandError(this, LOG_TAG, executionCommand, false);
+            TermuxPluginUtils.processPluginExecutionCommandError(this, LOG_TAG, executionCommand, false);
             return stopService();
         }
 
@@ -164,7 +164,7 @@ public int onStartCommand(Intent intent, int flags, int startId) {
             false);
         if (error != null) {
             executionCommand.setStateFailed(error);
-            PluginUtils.processPluginExecutionCommandError(this, LOG_TAG, executionCommand, false);
+            TermuxPluginUtils.processPluginExecutionCommandError(this, LOG_TAG, executionCommand, false);
             return stopService();
         }
 
@@ -185,7 +185,7 @@ public int onStartCommand(Intent intent, int flags, int startId) {
                 false, true);
             if (error != null) {
                 executionCommand.setStateFailed(error);
-                PluginUtils.processPluginExecutionCommandError(this, LOG_TAG, executionCommand, false);
+                TermuxPluginUtils.processPluginExecutionCommandError(this, LOG_TAG, executionCommand, false);
                 return stopService();
             }
         }
diff --git a/app/src/main/java/com/termux/app/TermuxOpenReceiver.java b/app/src/main/java/com/termux/app/TermuxOpenReceiver.java
index 48f0607dc4..f8f21b5d32 100644
--- a/app/src/main/java/com/termux/app/TermuxOpenReceiver.java
+++ b/app/src/main/java/com/termux/app/TermuxOpenReceiver.java
@@ -13,7 +13,7 @@
 import android.provider.MediaStore;
 import android.webkit.MimeTypeMap;
 
-import com.termux.app.utils.PluginUtils;
+import com.termux.shared.termux.plugins.TermuxPluginUtils;
 import com.termux.shared.data.DataUtils;
 import com.termux.shared.data.IntentUtils;
 import com.termux.shared.net.uri.UriUtils;
@@ -204,7 +204,7 @@ public ParcelFileDescriptor openFile(@NonNull Uri uri, @NonNull String mode) thr
                 }
 
                 // If TermuxConstants.PROP_ALLOW_EXTERNAL_APPS property to not set to "true", then throw exception
-                String errmsg = PluginUtils.checkIfAllowExternalAppsPolicyIsViolated(getContext(), LOG_TAG);
+                String errmsg = TermuxPluginUtils.checkIfAllowExternalAppsPolicyIsViolated(getContext(), LOG_TAG);
                 if (errmsg != null) {
                     throw new IllegalArgumentException(errmsg);
                 }
diff --git a/app/src/main/java/com/termux/app/TermuxService.java b/app/src/main/java/com/termux/app/TermuxService.java
index 52f0c6cd69..0b7139350a 100644
--- a/app/src/main/java/com/termux/app/TermuxService.java
+++ b/app/src/main/java/com/termux/app/TermuxService.java
@@ -20,7 +20,7 @@
 
 import com.termux.R;
 import com.termux.app.terminal.TermuxTerminalSessionClient;
-import com.termux.app.utils.PluginUtils;
+import com.termux.shared.termux.plugins.TermuxPluginUtils;
 import com.termux.shared.data.IntentUtils;
 import com.termux.shared.net.uri.UriUtils;
 import com.termux.shared.errors.Errno;
@@ -286,7 +286,7 @@ private synchronized void killAllTermuxExecutionCommands() {
             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))) {
-                    PluginUtils.processPluginExecutionCommandResult(this, LOG_TAG, executionCommand);
+                    TermuxPluginUtils.processPluginExecutionCommandResult(this, LOG_TAG, executionCommand);
                 }
             }
         }
@@ -367,7 +367,7 @@ private void actionServiceExecute(Intent intent) {
         if (Runner.runnerOf(executionCommand.runner) == null) {
             String errmsg = this.getString(R.string.error_termux_service_invalid_execution_command_runner, executionCommand.runner);
             executionCommand.setStateFailed(Errno.ERRNO_FAILED.getCode(), errmsg);
-            PluginUtils.processPluginExecutionCommandError(this, LOG_TAG, executionCommand, false);
+            TermuxPluginUtils.processPluginExecutionCommandError(this, LOG_TAG, executionCommand, false);
             return;
         }
 
@@ -411,7 +411,7 @@ else if (Runner.TERMINAL_SESSION.equalsRunner(executionCommand.runner))
         else {
             String errmsg = getString(R.string.error_termux_service_unsupported_execution_command_runner, executionCommand.runner);
             executionCommand.setStateFailed(Errno.ERRNO_FAILED.getCode(), errmsg);
-            PluginUtils.processPluginExecutionCommandError(this, LOG_TAG, executionCommand, false);
+            TermuxPluginUtils.processPluginExecutionCommandError(this, LOG_TAG, executionCommand, false);
         }
     }
 
@@ -454,7 +454,7 @@ public synchronized AppShell createTermuxTask(ExecutionCommand executionCommand)
             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);
+                TermuxPluginUtils.processPluginExecutionCommandError(this, LOG_TAG, executionCommand, false);
             else
                 Logger.logErrorExtended(LOG_TAG, executionCommand.toString());
             return null;
@@ -483,7 +483,7 @@ public void onAppShellExited(final AppShell termuxTask) {
 
                 // If the execution command was started for a plugin, then process the results
                 if (executionCommand != null && executionCommand.isPluginExecutionCommand)
-                    PluginUtils.processPluginExecutionCommandResult(this, LOG_TAG, executionCommand);
+                    TermuxPluginUtils.processPluginExecutionCommandResult(this, LOG_TAG, executionCommand);
 
                 mTermuxTasks.remove(termuxTask);
             }
@@ -517,7 +517,7 @@ else if (SessionCreateMode.NO_SESSION_WITH_NAME.equalsMode(executionCommand.sess
             if (DataUtils.isNullOrEmpty(executionCommand.sessionName)) {
                 String errmsg = getString(R.string.error_termux_service_execution_command_session_name_unset, executionCommand.sessionCreateMode);
                 executionCommand.setStateFailed(Errno.ERRNO_FAILED.getCode(), errmsg);
-                PluginUtils.processPluginExecutionCommandError(this, LOG_TAG, executionCommand, false);
+                TermuxPluginUtils.processPluginExecutionCommandError(this, LOG_TAG, executionCommand, false);
                 return;
             } else {
                 newTermuxSession = getTermuxSessionForName(executionCommand.sessionName);
@@ -527,7 +527,7 @@ else if (SessionCreateMode.NO_SESSION_WITH_NAME.equalsMode(executionCommand.sess
         else {
             String errmsg = getString(R.string.error_termux_service_unsupported_execution_command_session_create_mode, executionCommand.sessionCreateMode);
             executionCommand.setStateFailed(Errno.ERRNO_FAILED.getCode(), errmsg);
-            PluginUtils.processPluginExecutionCommandError(this, LOG_TAG, executionCommand, false);
+            TermuxPluginUtils.processPluginExecutionCommandError(this, LOG_TAG, executionCommand, false);
             return;
         }
 
@@ -575,7 +575,7 @@ public synchronized TermuxSession createTermuxSession(ExecutionCommand execution
             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);
+                TermuxPluginUtils.processPluginExecutionCommandError(this, LOG_TAG, executionCommand, false);
             else
                 Logger.logErrorExtended(LOG_TAG, executionCommand.toString());
             return null;
@@ -621,7 +621,7 @@ public void onTermuxSessionExited(final TermuxSession termuxSession) {
 
             // If the execution command was started for a plugin, then process the results
             if (executionCommand != null && executionCommand.isPluginExecutionCommand)
-                PluginUtils.processPluginExecutionCommandResult(this, LOG_TAG, executionCommand);
+                TermuxPluginUtils.processPluginExecutionCommandResult(this, LOG_TAG, executionCommand);
 
             mTermuxSessions.remove(termuxSession);
 
diff --git a/app/src/main/java/com/termux/app/models/UserAction.java b/app/src/main/java/com/termux/app/models/UserAction.java
index d32005f2a7..1e82255e99 100644
--- a/app/src/main/java/com/termux/app/models/UserAction.java
+++ b/app/src/main/java/com/termux/app/models/UserAction.java
@@ -3,7 +3,6 @@
 public enum UserAction {
 
     ABOUT("about"),
-    PLUGIN_EXECUTION_COMMAND("plugin execution command"),
     REPORT_ISSUE_FROM_TRANSCRIPT("report issue from transcript");
 
     private final String name;
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e49b4e8585..acc0f44b0d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -121,8 +121,6 @@
 
 
     <!-- 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>
     <string name="error_termux_service_start_failed_general">Failed to start TermuxService. Check logcat for exception message.</string>
     <string name="error_termux_service_start_failed_bg">Failed to start TermuxService while app is in background due to android bg restrictions.</string>
 
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/models/UserAction.java b/termux-shared/src/main/java/com/termux/shared/termux/models/UserAction.java
index fe89d0f8ae..b7e1c56958 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/models/UserAction.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/models/UserAction.java
@@ -2,7 +2,8 @@
 
 public enum UserAction {
 
-    CRASH_REPORT("crash report");
+    CRASH_REPORT("crash report"),
+    PLUGIN_EXECUTION_COMMAND("plugin execution command");
 
     private final String name;
 
diff --git a/app/src/main/java/com/termux/app/utils/PluginUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/plugins/TermuxPluginUtils.java
similarity index 72%
rename from app/src/main/java/com/termux/app/utils/PluginUtils.java
rename to termux-shared/src/main/java/com/termux/shared/termux/plugins/TermuxPluginUtils.java
index a407747fb5..28904e9f63 100644
--- a/app/src/main/java/com/termux/app/utils/PluginUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/plugins/TermuxPluginUtils.java
@@ -1,14 +1,15 @@
-package com.termux.app.utils;
+package com.termux.shared.termux.plugins;
 
 import android.app.Notification;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.content.Context;
+import android.graphics.drawable.Icon;
 import android.os.Environment;
 
 import androidx.annotation.Nullable;
 
-import com.termux.R;
+import com.termux.shared.R;
 import com.termux.shared.activities.ReportActivity;
 import com.termux.shared.file.FileUtils;
 import com.termux.shared.termux.file.TermuxFileUtils;
@@ -17,6 +18,7 @@
 import com.termux.shared.errors.Errno;
 import com.termux.shared.errors.Error;
 import com.termux.shared.notification.NotificationUtils;
+import com.termux.shared.termux.models.UserAction;
 import com.termux.shared.termux.notification.TermuxNotificationUtils;
 import com.termux.shared.termux.settings.preferences.TermuxPreferenceConstants;
 import com.termux.shared.shell.command.result.ResultSender;
@@ -30,14 +32,13 @@
 import com.termux.shared.models.ReportInfo;
 import com.termux.shared.termux.settings.properties.TermuxAppSharedProperties;
 import com.termux.shared.shell.command.ExecutionCommand;
-import com.termux.app.models.UserAction;
 import com.termux.shared.data.DataUtils;
 import com.termux.shared.markdown.MarkdownUtils;
 import com.termux.shared.termux.TermuxUtils;
 
-public class PluginUtils {
+public class TermuxPluginUtils {
 
-    private static final String LOG_TAG = "PluginUtils";
+    private static final String LOG_TAG = "TermuxPluginUtils";
 
     /**
      * Process {@link ExecutionCommand} result.
@@ -92,9 +93,8 @@ public static void processPluginExecutionCommandResult(final Context context, St
                 sendPluginCommandErrorNotification(context, logTag, null,
                     ResultData.getErrorsListMinimalString(resultData),
                     ExecutionCommand.getExecutionCommandMarkdownString(executionCommand),
-                    false, true, TermuxUtils.AppInfoMode.TERMUX_AND_CALLING_PACKAGE,
-                    executionCommand.resultConfig.resultPendingIntent != null ? executionCommand.resultConfig.resultPendingIntent.getCreatorPackage(): null,
-                    true);
+                    false, true, TermuxUtils.AppInfoMode.TERMUX_AND_CALLING_PACKAGE,true,
+                    executionCommand.resultConfig.resultPendingIntent != null ? executionCommand.resultConfig.resultPendingIntent.getCreatorPackage(): null);
             }
 
         }
@@ -173,9 +173,8 @@ public static void processPluginExecutionCommandError(final Context context, Str
         sendPluginCommandErrorNotification(context, logTag, null,
             ResultData.getErrorsListMinimalString(resultData),
             ExecutionCommand.getExecutionCommandMarkdownString(executionCommand),
-            forceNotification, true, TermuxUtils.AppInfoMode.TERMUX_AND_CALLING_PACKAGE,
-            executionCommand.resultConfig.resultPendingIntent != null ? executionCommand.resultConfig.resultPendingIntent.getCreatorPackage(): null,
-            true);
+            forceNotification, true, TermuxUtils.AppInfoMode.TERMUX_AND_CALLING_PACKAGE, true,
+            executionCommand.resultConfig.resultPendingIntent != null ? executionCommand.resultConfig.resultPendingIntent.getCreatorPackage(): null);
     }
 
     /** Set variables which will be used by {@link ResultSender#sendCommandResultData(Context, String, String, ResultConfig, ResultData, boolean)}
@@ -208,11 +207,75 @@ public static void setPluginResultDirectoryVariables(ExecutionCommand executionC
 
 
 
+
     /**
-     * Send an error notification for {@link TermuxConstants#TERMUX_PLUGIN_COMMAND_ERRORS_NOTIFICATION_CHANNEL_ID}
+     * Send a plugin error report 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 currentPackageContext The {@link Context} of current package.
+     * @param logTag The log tag to use for logging.
+     * @param title The title for the error report and notification.
+     * @param message The message for the error report.
+     * @param throwable The {@link Throwable} for the error report.
+     */
+    public static void sendPluginCommandErrorNotification(final Context currentPackageContext, String logTag,
+                                                         CharSequence title, String message, Throwable throwable) {
+        sendPluginCommandErrorNotification(currentPackageContext, logTag,
+            title, message,
+            MarkdownUtils.getMarkdownCodeForString(Logger.getMessageAndStackTraceString(message, throwable), true),
+            false, false, true);
+    }
+
+    /**
+     * Send a plugin error report notification for {@link TermuxConstants#TERMUX_PLUGIN_COMMAND_ERRORS_NOTIFICATION_CHANNEL_ID}
+     * and {@link TermuxConstants#TERMUX_PLUGIN_COMMAND_ERRORS_NOTIFICATION_CHANNEL_NAME}.
+     *
+     * @param currentPackageContext The {@link Context} of current package.
+     * @param logTag The log tag to use for logging.
+     * @param title The title for the error report and notification.
+     * @param notificationTextString The text of the notification.
+     * @param message The message for the error report.
+     */
+    public static void sendPluginCommandErrorNotification(final Context currentPackageContext, String logTag,
+                                                         CharSequence title, String notificationTextString,
+                                                         String message) {
+        sendPluginCommandErrorNotification(currentPackageContext, logTag,
+            title, notificationTextString, message,
+            false, false, true);
+    }
+
+    /**
+     * Send a plugin error report notification for {@link TermuxConstants#TERMUX_PLUGIN_COMMAND_ERRORS_NOTIFICATION_CHANNEL_ID}
+     * and {@link TermuxConstants#TERMUX_PLUGIN_COMMAND_ERRORS_NOTIFICATION_CHANNEL_NAME}.
+     *
+     * @param currentPackageContext The {@link Context} of current package.
+     * @param logTag The log tag to use for logging.
+     * @param title The title for the error report and notification.
+     * @param notificationTextString The text of the notification.
+     * @param message The message for the error 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_PLUGIN_ERROR_NOTIFICATIONS_ENABLED}
+     *                          is {@code false}.
+     * @param showToast If set to {@code true}, then a toast will be shown for {@code notificationTextString}.
+     * @param addDeviceInfo If set to {@code true}, then device info should be appended to the message.
+     */
+    public static void sendPluginCommandErrorNotification(final Context currentPackageContext, String logTag,
+                                                         CharSequence title, String notificationTextString,
+                                                         String message, boolean forceNotification,
+                                                         boolean showToast,
+                                                         boolean addDeviceInfo) {
+        sendPluginCommandErrorNotification(currentPackageContext, logTag,
+            title, notificationTextString, "## " + title + "\n\n" + message + "\n\n",
+            forceNotification, showToast, TermuxUtils.AppInfoMode.TERMUX_AND_PLUGIN_PACKAGE, addDeviceInfo, null);
+    }
+
+    /**
+     * Send a plugin error notification for {@link TermuxConstants#TERMUX_PLUGIN_COMMAND_ERRORS_NOTIFICATION_CHANNEL_ID}
+     * and {@link TermuxConstants#TERMUX_PLUGIN_COMMAND_ERRORS_NOTIFICATION_CHANNEL_NAME}.
+     *
+     * @param currentPackageContext The {@link Context} of current package.
+     * @param logTag The log tag to use for logging.
      * @param title The title for the error report and notification.
      * @param notificationTextString The text of the notification.
      * @param message The message for the error report.
@@ -223,21 +286,30 @@ public static void setPluginResultDirectoryVariables(ExecutionCommand executionC
      * @param showToast If set to {@code true}, then a toast will be shown for {@code notificationTextString}.
      * @param appInfoMode The {@link TermuxUtils.AppInfoMode} to use to add app info to the message.
      *                    Set to {@code null} if app info should not be appended to the message.
+     * @param addDeviceInfo If set to {@code true}, then device info should be appended to the message.
      * @param callingPackageName The optional package name of the app for which the plugin command
      *                           was run.
-     * @param addDeviceInfo If set to {@code true}, then device info should be appended to the message.
      */
-    public static void sendPluginCommandErrorNotification(Context context, String logTag,
+    public static void sendPluginCommandErrorNotification(Context currentPackageContext, String logTag,
                                                           CharSequence title,
                                                           String notificationTextString,
                                                           String message, boolean forceNotification,
                                                           boolean showToast,
                                                           TermuxUtils.AppInfoMode appInfoMode,
-                                                          String callingPackageName,
-                                                          boolean addDeviceInfo) {
-        if (context == null) return;
+                                                          boolean addDeviceInfo,
+                                                          String callingPackageName) {
+        // Note: Do not change currentPackageContext or termuxPackageContext passed to functions or things will break
+
+        if (currentPackageContext == null) return;
+        String currentPackageName = currentPackageContext.getPackageName();
 
-        TermuxAppSharedPreferences preferences = TermuxAppSharedPreferences.build(context);
+        final Context termuxPackageContext = TermuxUtils.getTermuxPackageContext(currentPackageContext);
+        if (termuxPackageContext == null) {
+            Logger.logWarn(LOG_TAG, "Ignoring call to sendPluginCommandErrorNotification() since failed to get \"" + TermuxConstants.TERMUX_PACKAGE_NAME + "\" package context from \"" + currentPackageName + "\" context");
+            return;
+        }
+
+        TermuxAppSharedPreferences preferences = TermuxAppSharedPreferences.build(termuxPackageContext);
         if (preferences == null) return;
 
         // If user has disabled notifications for plugin commands, then just return
@@ -247,7 +319,7 @@ public static void sendPluginCommandErrorNotification(Context context, String lo
         logTag = DataUtils.getDefaultIfNull(logTag, LOG_TAG);
 
         if (showToast)
-            Logger.showToast(context, notificationTextString, true);
+            Logger.showToast(currentPackageContext, notificationTextString, true);
 
         // Send a notification to show the error which when clicked will open the ReportActivity
         // to show the details of the error
@@ -259,48 +331,49 @@ public static void sendPluginCommandErrorNotification(Context context, String lo
         StringBuilder reportString = new StringBuilder(message);
 
         if (appInfoMode != null)
-            reportString.append("\n\n").append(TermuxUtils.getAppInfoMarkdownString(context, appInfoMode, callingPackageName));
+            reportString.append("\n\n").append(TermuxUtils.getAppInfoMarkdownString(currentPackageContext, appInfoMode,
+                callingPackageName != null ? callingPackageName : currentPackageName));
 
         if (addDeviceInfo)
-            reportString.append("\n\n").append(AndroidUtils.getDeviceInfoMarkdownString(context));
+            reportString.append("\n\n").append(AndroidUtils.getDeviceInfoMarkdownString(currentPackageContext));
 
         String userActionName = UserAction.PLUGIN_EXECUTION_COMMAND.getName();
 
         ReportInfo reportInfo = new ReportInfo(userActionName, logTag, title.toString());
         reportInfo.setReportString(reportString.toString());
-        reportInfo.setReportStringSuffix("\n\n" + TermuxUtils.getReportIssueMarkdownString(context));
+        reportInfo.setReportStringSuffix("\n\n" + TermuxUtils.getReportIssueMarkdownString(currentPackageContext));
         reportInfo.setAddReportInfoHeaderToMarkdown(true);
         reportInfo.setReportSaveFileLabelAndPath(userActionName,
             Environment.getExternalStorageDirectory() + "/" +
                 FileUtils.sanitizeFileName(TermuxConstants.TERMUX_APP_NAME + "-" + userActionName + ".log", true, true));
 
-        ReportActivity.NewInstanceResult result = ReportActivity.newInstance(context, reportInfo);
+        ReportActivity.NewInstanceResult result = ReportActivity.newInstance(termuxPackageContext, reportInfo);
         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);
+        int nextNotificationId = TermuxNotificationUtils.getNextNotificationId(termuxPackageContext);
 
-        PendingIntent contentIntent = PendingIntent.getActivity(context, nextNotificationId, result.contentIntent, PendingIntent.FLAG_UPDATE_CURRENT);
+        PendingIntent contentIntent = PendingIntent.getActivity(termuxPackageContext, 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);
+            deleteIntent = PendingIntent.getBroadcast(termuxPackageContext, nextNotificationId, result.deleteIntent, PendingIntent.FLAG_UPDATE_CURRENT);
 
         // Setup the notification channel if not already set up
-        setupPluginCommandErrorsNotificationChannel(context);
+        setupPluginCommandErrorsNotificationChannel(termuxPackageContext);
 
         // Use markdown in notification
-        CharSequence notificationTextCharSequence = MarkdownUtils.getSpannedMarkdownText(context, notificationTextString);
+        CharSequence notificationTextCharSequence = MarkdownUtils.getSpannedMarkdownText(termuxPackageContext, notificationTextString);
         //CharSequence notificationTextCharSequence = notificationTextString;
 
         // Build the notification
-        Notification.Builder builder = getPluginCommandErrorsNotificationBuilder(context, title,
-            notificationTextCharSequence, notificationTextCharSequence, contentIntent, deleteIntent,
+        Notification.Builder builder = getPluginCommandErrorsNotificationBuilder(currentPackageContext, termuxPackageContext,
+            title, notificationTextCharSequence, notificationTextCharSequence, contentIntent, deleteIntent,
             NotificationUtils.NOTIFICATION_MODE_VIBRATE);
         if (builder == null) return;
 
         // Send the notification
-        NotificationManager notificationManager = NotificationUtils.getNotificationManager(context);
+        NotificationManager notificationManager = NotificationUtils.getNotificationManager(termuxPackageContext);
         if (notificationManager != null)
             notificationManager.notify(nextNotificationId, builder.build());
     }
@@ -309,7 +382,8 @@ public static void sendPluginCommandErrorNotification(Context context, String lo
      * Get {@link Notification.Builder} 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 currentPackageContext The {@link Context} of current package.
+     * @param termuxPackageContext The {@link Context} of termux package.
      * @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.
@@ -319,11 +393,15 @@ public static void sendPluginCommandErrorNotification(Context context, String lo
      * @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) {
-
-        Notification.Builder builder =  NotificationUtils.geNotificationBuilder(context,
+    public static Notification.Builder getPluginCommandErrorsNotificationBuilder(final Context currentPackageContext,
+                                                                                 final Context termuxPackageContext,
+                                                                                 final CharSequence title,
+                                                                                 final CharSequence notificationText,
+                                                                                 final CharSequence notificationBigText,
+                                                                                 final PendingIntent contentIntent,
+                                                                                 final PendingIntent deleteIntent,
+                                                                                 final int notificationMode) {
+        Notification.Builder builder =  NotificationUtils.geNotificationBuilder(termuxPackageContext,
             TermuxConstants.TERMUX_PLUGIN_COMMAND_ERRORS_NOTIFICATION_CHANNEL_ID, Notification.PRIORITY_HIGH,
             title, notificationText, notificationBigText, contentIntent, deleteIntent, notificationMode);
 
@@ -333,7 +411,7 @@ public static Notification.Builder getPluginCommandErrorsNotificationBuilder(
         builder.setShowWhen(true);
 
         // Set notification icon
-        builder.setSmallIcon(R.drawable.ic_error_notification);
+        builder.setSmallIcon(Icon.createWithResource(currentPackageContext, R.drawable.ic_error_notification));
 
         // Set background color for small notification icon
         builder.setColor(0xFF607D8B);
diff --git a/termux-shared/src/main/res/values/strings.xml b/termux-shared/src/main/res/values/strings.xml
index 5a70aab4b8..a0111fc3d1 100644
--- a/termux-shared/src/main/res/values/strings.xml
+++ b/termux-shared/src/main/res/values/strings.xml
@@ -39,6 +39,12 @@
 
 
 
+    <!-- TermuxPluginUtils -->
+    <string name="error_allow_external_apps_ungranted">%1$s requires `allow-external-apps`
+        property to be set to `true` in `%2$s` file.</string>
+
+
+
     <!-- ReportActivity -->
     <string name="title_report_text">Report Text</string>
     <string name="msg_report_truncated">**Report Truncated**\n\nReport is too large to view here.

From c095a6184bebc030e3deef9b20bff1ade2f14088 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Fri, 8 Apr 2022 22:45:10 +0500
Subject: [PATCH 717/912] Changed: Rename `TermuxCrashUtils`
 `sendPluginCrashReportNotification() to `sendCrashReportNotification()`

---
 .../shared/termux/crash/TermuxCrashUtils.java | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/termux/crash/TermuxCrashUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/crash/TermuxCrashUtils.java
index 748f569ae4..0742c70095 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/crash/TermuxCrashUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/crash/TermuxCrashUtils.java
@@ -196,9 +196,9 @@ private static synchronized void notifyAppCrashFromCrashLogFileInner(final Conte
      * @param message The message for the crash report.
      * @param throwable The {@link Throwable} for the crash report.
      */
-    public static void sendPluginCrashReportNotification(final Context currentPackageContext, String logTag,
-                                                         CharSequence title, String message, Throwable throwable) {
-        TermuxCrashUtils.sendPluginCrashReportNotification(currentPackageContext, logTag,
+    public static void sendCrashReportNotification(final Context currentPackageContext, String logTag,
+                                                   CharSequence title, String message, Throwable throwable) {
+        sendCrashReportNotification(currentPackageContext, logTag,
             title, message,
             MarkdownUtils.getMarkdownCodeForString(Logger.getMessageAndStackTraceString(message, throwable), true),
             false, false, true);
@@ -214,10 +214,10 @@ public static void sendPluginCrashReportNotification(final Context currentPackag
      * @param notificationTextString The text of the notification.
      * @param message The message for the crash report.
      */
-    public static void sendPluginCrashReportNotification(final Context currentPackageContext, String logTag,
-                                                         CharSequence title, String notificationTextString,
-                                                         String message) {
-        TermuxCrashUtils.sendPluginCrashReportNotification(currentPackageContext, logTag,
+    public static void sendCrashReportNotification(final Context currentPackageContext, String logTag,
+                                                   CharSequence title, String notificationTextString,
+                                                   String message) {
+        sendCrashReportNotification(currentPackageContext, logTag,
             title, notificationTextString, message,
             false, false, true);
     }
@@ -238,12 +238,12 @@ public static void sendPluginCrashReportNotification(final Context currentPackag
      * @param showToast If set to {@code true}, then a toast will be shown for {@code notificationTextString}.
      * @param addDeviceInfo If set to {@code true}, then device info should be appended to the message.
      */
-    public static void sendPluginCrashReportNotification(final Context currentPackageContext, String logTag,
-                                                         CharSequence title, String notificationTextString,
-                                                         String message, boolean forceNotification,
-                                                         boolean showToast,
-                                                         boolean addDeviceInfo) {
-        TermuxCrashUtils.sendCrashReportNotification(currentPackageContext, logTag,
+    public static void sendCrashReportNotification(final Context currentPackageContext, String logTag,
+                                                   CharSequence title, String notificationTextString,
+                                                   String message, boolean forceNotification,
+                                                   boolean showToast,
+                                                   boolean addDeviceInfo) {
+        sendCrashReportNotification(currentPackageContext, logTag,
             title, notificationTextString, "## " + title + "\n\n" + message + "\n\n",
             forceNotification, showToast, TermuxUtils.AppInfoMode.TERMUX_AND_PLUGIN_PACKAGE, addDeviceInfo);
     }

From 02ab8324e986c933992162c5b9a87ca3e0f9d860 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sun, 17 Apr 2022 05:43:24 +0500
Subject: [PATCH 718/912] Changed|Fixed: Do not add empty stacktraces entry to
 Error log and markdown String

---
 .../src/main/java/com/termux/shared/errors/Error.java        | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/errors/Error.java b/termux-shared/src/main/java/com/termux/shared/errors/Error.java
index 6272b3e452..be00e34ff7 100644
--- a/termux-shared/src/main/java/com/termux/shared/errors/Error.java
+++ b/termux-shared/src/main/java/com/termux/shared/errors/Error.java
@@ -209,7 +209,7 @@ public String getErrorLogString() {
 
         logString.append(getCodeString());
         logString.append("\n").append(getTypeAndMessageLogString());
-        if (this.throwablesList != null)
+        if (throwablesList != null && throwablesList.size() > 0)
             logString.append("\n").append(geStackTracesLogString());
 
         return logString.toString();
@@ -272,7 +272,8 @@ public String getErrorMarkdownString() {
         markdownString.append(MarkdownUtils.getSingleLineMarkdownStringEntry("Error Code", getCode(), "-"));
         markdownString.append("\n").append(MarkdownUtils.getMultiLineMarkdownStringEntry(
             (Errno.TYPE.equals(getType()) ? "Error Message" : "Error Message (" + getType() + ")"), message, "-"));
-        markdownString.append("\n\n").append(geStackTracesMarkdownString());
+        if (throwablesList != null && throwablesList.size() > 0)
+            markdownString.append("\n\n").append(geStackTracesMarkdownString());
 
         return markdownString.toString();
     }

From 5116d886c382f01b48e366b0430af76149ba7821 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sun, 17 Apr 2022 05:47:09 +0500
Subject: [PATCH 719/912] Changed: Add label parameter to `ExecutionCommand`
 `getArgumentsLogString()` and `getArgumentsMarkdownString()` functions for
 external usage

---
 .../shared/shell/command/ExecutionCommand.java       | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/shell/command/ExecutionCommand.java b/termux-shared/src/main/java/com/termux/shared/shell/command/ExecutionCommand.java
index 2ee38283e5..a579b313d4 100644
--- a/termux-shared/src/main/java/com/termux/shared/shell/command/ExecutionCommand.java
+++ b/termux-shared/src/main/java/com/termux/shared/shell/command/ExecutionCommand.java
@@ -472,7 +472,7 @@ public static String getExecutionCommandMarkdownString(final ExecutionCommand ex
         markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Current State", executionCommand.currentState.getName(), "-"));
 
         markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Executable", executionCommand.executable, "-"));
-        markdownString.append("\n").append(getArgumentsMarkdownString(executionCommand.arguments));
+        markdownString.append("\n").append(getArgumentsMarkdownString("Arguments", executionCommand.arguments));
         markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Working Directory", executionCommand.workingDirectory, "-"));
         markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Runner", executionCommand.runner, "-"));
         markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("isFailsafe", executionCommand.isFailsafe, "-"));
@@ -547,7 +547,7 @@ public String getExecutableLogString() {
     }
 
     public String getArgumentsLogString() {
-        return getArgumentsLogString(arguments);
+        return getArgumentsLogString("Arguments", arguments);
     }
 
     public String getWorkingDirectoryLogString() {
@@ -623,8 +623,8 @@ public String getIsPluginExecutionCommandLogString() {
      * @param argumentsArray The {@link String[]} argumentsArray to convert.
      * @return Returns the log friendly {@link String}.
      */
-    public static String getArgumentsLogString(final String[] argumentsArray) {
-        StringBuilder argumentsString = new StringBuilder("Arguments:");
+    public static String getArgumentsLogString(String label, final String[] argumentsArray) {
+        StringBuilder argumentsString = new StringBuilder(label + ":");
 
         if (argumentsArray != null && argumentsArray.length != 0) {
             argumentsString.append("\n```\n");
@@ -660,8 +660,8 @@ public static String getArgumentsLogString(final String[] argumentsArray) {
      * @param argumentsArray The {@link String[]} argumentsArray to convert.
      * @return Returns the markdown {@link String}.
      */
-    public static String getArgumentsMarkdownString(final String[] argumentsArray) {
-        StringBuilder argumentsString = new StringBuilder("**Arguments:**");
+    public static String getArgumentsMarkdownString(String label, final String[] argumentsArray) {
+        StringBuilder argumentsString = new StringBuilder("**" + label + ":**");
 
         if (argumentsArray != null && argumentsArray.length != 0) {
             argumentsString.append("\n");

From 6b60adc079f2cdf05c94df72299a1df41e4422c6 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sun, 17 Apr 2022 05:54:45 +0500
Subject: [PATCH 720/912] Fixed: Do not stop the app if
 `UncaughtExceptionHandler` implemented by `CrashHandler` receives an
 exception on a non main thread

Rename function that should be used by main thread of apps to `setDefaultCrashHandler()`.

Functions for other threads will be added in a later commit.
---
 .../com/termux/app/TermuxApplication.java     |  2 +-
 .../com/termux/shared/crash/CrashHandler.java | 34 +++++++++++--------
 .../shared/termux/crash/TermuxCrashUtils.java |  8 +++--
 3 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxApplication.java b/app/src/main/java/com/termux/app/TermuxApplication.java
index 17f690a290..bf0887582e 100644
--- a/app/src/main/java/com/termux/app/TermuxApplication.java
+++ b/app/src/main/java/com/termux/app/TermuxApplication.java
@@ -20,7 +20,7 @@ public void onCreate() {
         Context context = getApplicationContext();
 
         // Set crash handler for the app
-        TermuxCrashUtils.setCrashHandler(this);
+        TermuxCrashUtils.setDefaultCrashHandler(this);
 
         // Set log config for the app
         setLogConfig(context);
diff --git a/termux-shared/src/main/java/com/termux/shared/crash/CrashHandler.java b/termux-shared/src/main/java/com/termux/shared/crash/CrashHandler.java
index 79309f2487..44422afe86 100644
--- a/termux-shared/src/main/java/com/termux/shared/crash/CrashHandler.java
+++ b/termux-shared/src/main/java/com/termux/shared/crash/CrashHandler.java
@@ -19,28 +19,34 @@ public class CrashHandler implements Thread.UncaughtExceptionHandler {
 
     private final Context mContext;
     private final CrashHandlerClient mCrashHandlerClient;
-    private final Thread.UncaughtExceptionHandler defaultUEH;
+    private final Thread.UncaughtExceptionHandler mDefaultUEH;
+    private final boolean mIsDefaultHandler;
 
     private static final String LOG_TAG = "CrashUtils";
 
-    private CrashHandler(@NonNull final Context context, @NonNull final CrashHandlerClient crashHandlerClient) {
-        this.mContext = context;
-        this.mCrashHandlerClient = crashHandlerClient;
-        this.defaultUEH = Thread.getDefaultUncaughtExceptionHandler();
+    private CrashHandler(@NonNull final Context context, @NonNull final CrashHandlerClient crashHandlerClient,
+                         boolean isDefaultHandler) {
+        mContext = context;
+        mCrashHandlerClient = crashHandlerClient;
+        mDefaultUEH = Thread.getDefaultUncaughtExceptionHandler();
+        mIsDefaultHandler = isDefaultHandler;
     }
 
     public void uncaughtException(@NonNull Thread thread, @NonNull Throwable throwable) {
         Logger.logInfo(LOG_TAG, "uncaughtException() for " + thread +  ": " + throwable.getMessage());
         logCrash(thread, throwable);
-        defaultUEH.uncaughtException(thread, throwable);
+
+        // Don't stop the app if not on the main thread
+        if (mIsDefaultHandler)
+            mDefaultUEH.uncaughtException(thread, throwable);
     }
 
     /**
-     * Set default uncaught crash handler of current thread to {@link CrashHandler}.
+     * Set default uncaught crash handler for the app to {@link CrashHandler}.
      */
-    public static void setCrashHandler(@NonNull final Context context, @NonNull final CrashHandlerClient crashHandlerClient) {
+    public static void setDefaultCrashHandler(@NonNull final Context context, @NonNull final CrashHandlerClient crashHandlerClient) {
         if (!(Thread.getDefaultUncaughtExceptionHandler() instanceof CrashHandler)) {
-            Thread.setDefaultUncaughtExceptionHandler(new CrashHandler(context, crashHandlerClient));
+            Thread.setDefaultUncaughtExceptionHandler(new CrashHandler(context, crashHandlerClient, true));
         }
     }
 
@@ -56,7 +62,7 @@ public static void logCrash(@NonNull Context context,
                                 @NonNull CrashHandlerClient crashHandlerClient,
                                 @NonNull Thread thread,  @NonNull Throwable throwable) {
         Logger.logInfo(LOG_TAG, "logCrash() for " + thread +  ": " + throwable.getMessage());
-        new CrashHandler(context, crashHandlerClient).logCrash(thread, throwable);
+        new CrashHandler(context, crashHandlerClient, false).logCrash(thread, throwable);
     }
 
     public void logCrash(@NonNull Thread thread, @NonNull Throwable throwable) {
@@ -99,7 +105,7 @@ public interface CrashHandlerClient {
         /**
          * Called before {@link #logCrashToFile(Context, CrashHandlerClient, Thread, Throwable)} is called.
          *
-         * @param context The {@link Context} passed to {@link CrashHandler#CrashHandler(Context, CrashHandlerClient)}.
+         * @param context The {@link Context} passed to {@link CrashHandler#CrashHandler(Context, CrashHandlerClient, boolean)}.
          * @param thread The {@link Thread} in which the crash happened.
          * @param throwable The {@link Throwable} thrown for the crash.
          * @return Should return {@code true} if crash has been handled and should not be logged,
@@ -110,7 +116,7 @@ public interface CrashHandlerClient {
         /**
          * Called after {@link #logCrashToFile(Context, CrashHandlerClient, Thread, Throwable)} is called.
          *
-         * @param context The {@link Context} passed to {@link CrashHandler#CrashHandler(Context, CrashHandlerClient)}.
+         * @param context The {@link Context} passed to {@link CrashHandler#CrashHandler(Context, CrashHandlerClient, boolean)}.
          * @param thread The {@link Thread} in which the crash happened.
          * @param throwable The {@link Throwable} thrown for the crash.
          */
@@ -119,7 +125,7 @@ public interface CrashHandlerClient {
         /**
          * Get crash log file path.
          *
-         * @param context The {@link Context} passed to {@link CrashHandler#CrashHandler(Context, CrashHandlerClient)}.
+         * @param context The {@link Context} passed to {@link CrashHandler#CrashHandler(Context, CrashHandlerClient, boolean)}.
          * @return Should return the crash log file path.
          */
         @NonNull
@@ -128,7 +134,7 @@ public interface CrashHandlerClient {
         /**
          * Get app info markdown string to add to crash log.
          *
-         * @param context The {@link Context} passed to {@link CrashHandler#CrashHandler(Context, CrashHandlerClient)}.
+         * @param context The {@link Context} passed to {@link CrashHandler#CrashHandler(Context, CrashHandlerClient, boolean)}.
          * @return Should return app info markdown string.
          */
         String getAppInfoMarkdownString(Context context);
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/crash/TermuxCrashUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/crash/TermuxCrashUtils.java
index 0742c70095..5ac9225e3a 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/crash/TermuxCrashUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/crash/TermuxCrashUtils.java
@@ -48,8 +48,12 @@ public enum TYPE {
     }
 
     /**
-     * Set default uncaught crash handler of current thread to {@link CrashHandler} for Termux app
-     * and its plugin to log crashes at {@link TermuxConstants#TERMUX_CRASH_LOG_FILE_PATH}.
+     * Set default uncaught crash handler of the app to {@link CrashHandler} for Termux app
+     * and its plugins to log crashes at {@link TermuxConstants#TERMUX_CRASH_LOG_FILE_PATH}.
+     */
+    public static void setDefaultCrashHandler(@NonNull final Context context) {
+        CrashHandler.setDefaultCrashHandler(context, new TermuxCrashUtils(TYPE.UNCAUGHT_EXCEPTION));
+    }
      */
     public static void setCrashHandler(@NonNull final Context context) {
         CrashHandler.setCrashHandler(context, new TermuxCrashUtils(TYPE.UNCAUGHT_EXCEPTION));

From 9c7ec0cebdbfca985ba2f5d920f13268db4789b0 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sun, 17 Apr 2022 05:56:35 +0500
Subject: [PATCH 721/912] Added: Add functions that can be used by non main
 threads to set `CrashHandler` as the `UncaughtExceptionHandler`

---
 .../java/com/termux/shared/crash/CrashHandler.java | 14 ++++++++++++++
 .../shared/termux/crash/TermuxCrashUtils.java      | 14 +++++++++++++-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/crash/CrashHandler.java b/termux-shared/src/main/java/com/termux/shared/crash/CrashHandler.java
index 44422afe86..f67a761283 100644
--- a/termux-shared/src/main/java/com/termux/shared/crash/CrashHandler.java
+++ b/termux-shared/src/main/java/com/termux/shared/crash/CrashHandler.java
@@ -50,6 +50,20 @@ public static void setDefaultCrashHandler(@NonNull final Context context, @NonNu
         }
     }
 
+    /**
+     * Set uncaught crash handler of current non-main thread to {@link CrashHandler}.
+     */
+    public static void setCrashHandler(@NonNull final Context context, @NonNull final CrashHandlerClient crashHandlerClient) {
+        Thread.currentThread().setUncaughtExceptionHandler(new CrashHandler(context, crashHandlerClient, false));
+    }
+
+    /**
+     * Get {@link CrashHandler} instance that can be set as uncaught crash handler of a non-main thread.
+     */
+    public static CrashHandler getCrashHandler(@NonNull final Context context, @NonNull final CrashHandlerClient crashHandlerClient) {
+        return new CrashHandler(context, crashHandlerClient, false);
+    }
+
     /**
      * Log a crash in the crash log file at path returned by {@link CrashHandlerClient#getCrashLogFilePath(Context)}.
      *
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/crash/TermuxCrashUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/crash/TermuxCrashUtils.java
index 5ac9225e3a..5d551a9715 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/crash/TermuxCrashUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/crash/TermuxCrashUtils.java
@@ -54,9 +54,21 @@ public enum TYPE {
     public static void setDefaultCrashHandler(@NonNull final Context context) {
         CrashHandler.setDefaultCrashHandler(context, new TermuxCrashUtils(TYPE.UNCAUGHT_EXCEPTION));
     }
+
+    /**
+     * Set uncaught crash handler of current non-main thread to {@link CrashHandler} for Termux app
+     * and its plugins to log crashes at {@link TermuxConstants#TERMUX_CRASH_LOG_FILE_PATH}.
      */
     public static void setCrashHandler(@NonNull final Context context) {
-        CrashHandler.setCrashHandler(context, new TermuxCrashUtils(TYPE.UNCAUGHT_EXCEPTION));
+        CrashHandler.setCrashHandler(context, new TermuxCrashUtils(TYPE.CAUGHT_EXCEPTION));
+    }
+
+    /**
+     * Get {@link CrashHandler} for Termux app and its plugins that can be set as the uncaught
+     * crash handler of a non-main thread to log crashes at {@link TermuxConstants#TERMUX_CRASH_LOG_FILE_PATH}.
+     */
+    public static CrashHandler getCrashHandler(@NonNull final Context context) {
+        return CrashHandler.getCrashHandler(context, new TermuxCrashUtils(TYPE.CAUGHT_EXCEPTION));
     }
 
     /**

From 1b9ca91da5c454fdcfe0b6b706331ad4f750d255 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sun, 17 Apr 2022 06:14:10 +0500
Subject: [PATCH 722/912] Added: Add functions to `DataUtils` to get generic,
 space and tab indented strings

---
 .../com/termux/shared/data/DataUtils.java     | 49 +++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/termux-shared/src/main/java/com/termux/shared/data/DataUtils.java b/termux-shared/src/main/java/com/termux/shared/data/DataUtils.java
index 50f0e7ba23..f95f2b52f8 100644
--- a/termux-shared/src/main/java/com/termux/shared/data/DataUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/data/DataUtils.java
@@ -2,11 +2,15 @@
 
 import android.os.Bundle;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import com.google.common.base.Strings;
+
 import java.io.ByteArrayOutputStream;
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
+import java.util.Collections;
 
 public class DataUtils {
 
@@ -162,6 +166,51 @@ public static float rangedOrDefault(float value, float def, float min, float max
 
 
 
+    /**
+     * Add a space indent to a {@link String}. Each indent is 4 space characters long.
+     *
+     * @param string The {@link String} to add indent to.
+     * @param count The indent count.
+     * @return Returns the indented {@link String}.
+     */
+    public static String getSpaceIndentedString(String string, int count) {
+        if (string == null || string.isEmpty())
+            return string;
+        else
+            return getIndentedString(string, "    ", count);
+    }
+
+    /**
+     * Add a tab indent to a {@link String}. Each indent is 1 tab character long.
+     *
+     * @param string The {@link String} to add indent to.
+     * @param count The indent count.
+     * @return Returns the indented {@link String}.
+     */
+    public static String getTabIndentedString(String string, int count) {
+        if (string == null || string.isEmpty())
+            return string;
+        else
+            return getIndentedString(string, "\t", count);
+    }
+
+    /**
+     * Add an indent to a {@link String}.
+     *
+     * @param string The {@link String} to add indent to.
+     * @param indent The indent characters.
+     * @param count The indent count.
+     * @return Returns the indented {@link String}.
+     */
+    public static String getIndentedString(String string, @NonNull String indent, int count) {
+        if (string == null || string.isEmpty())
+            return string;
+        else
+            return string.replaceAll("(?m)^", Strings.repeat(indent, Math.max(count, 1)));
+    }
+
+
+
     /**
      * Get the object itself if it is not {@code null}, otherwise default.
      *

From 58c3d427e8153abd511b6e0ff167c614a491400e Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sun, 17 Apr 2022 06:16:41 +0500
Subject: [PATCH 723/912] Fixed: Log and add to Error the current file type in
 `FileUtils.deleteFile()` in addition to allowed file types

---
 .../src/main/java/com/termux/shared/file/FileUtils.java       | 4 ++--
 .../src/main/java/com/termux/shared/file/FileUtilsErrno.java  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/file/FileUtils.java b/termux-shared/src/main/java/com/termux/shared/file/FileUtils.java
index 512aca2f94..715d65f5e7 100644
--- a/termux-shared/src/main/java/com/termux/shared/file/FileUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/file/FileUtils.java
@@ -1178,12 +1178,12 @@ public static Error deleteFile(String label, final String filePath, final boolea
             if ((allowedFileTypeFlags & fileType.getValue()) <= 0) {
                 // If wrong file type is to be ignored
                 if (ignoreWrongFileType) {
-                    Logger.logVerbose(LOG_TAG, "Ignoring deletion of " + label + "file at path \"" + filePath + "\" not matching allowed file types: " + FileTypes.convertFileTypeFlagsToNamesString(allowedFileTypeFlags));
+                    Logger.logVerbose(LOG_TAG, "Ignoring deletion of " + label + "file at path \"" + filePath + "\" of type \"" + fileType.getName() + "\" not matching allowed file types: " + FileTypes.convertFileTypeFlagsToNamesString(allowedFileTypeFlags));
                     return null;
                 }
 
                 // Else return with error
-                return FileUtilsErrno.ERRNO_FILE_NOT_AN_ALLOWED_FILE_TYPE.getError(label + "file meant to be deleted", filePath, FileTypes.convertFileTypeFlagsToNamesString(allowedFileTypeFlags));
+                return FileUtilsErrno.ERRNO_FILE_NOT_AN_ALLOWED_FILE_TYPE.getError(label + "file meant to be deleted", filePath, fileType.getName(), FileTypes.convertFileTypeFlagsToNamesString(allowedFileTypeFlags));
             }
 
             Logger.logVerbose(LOG_TAG, "Deleting " + label + "file at path \"" + filePath + "\"");
diff --git a/termux-shared/src/main/java/com/termux/shared/file/FileUtilsErrno.java b/termux-shared/src/main/java/com/termux/shared/file/FileUtilsErrno.java
index b7da663713..4a0d73f442 100644
--- a/termux-shared/src/main/java/com/termux/shared/file/FileUtilsErrno.java
+++ b/termux-shared/src/main/java/com/termux/shared/file/FileUtilsErrno.java
@@ -33,7 +33,7 @@ public class FileUtilsErrno extends Errno {
     public static final Errno ERRNO_NON_SYMLINK_FILE_FOUND = new Errno(TYPE, 156, "Non-symlink file found at %1$s path \"%2$s\".");
     public static final Errno ERRNO_NON_SYMLINK_FILE_FOUND_SHORT = new Errno(TYPE, 157, "Non-symlink file found at %1$s path.");
 
-    public static final Errno ERRNO_FILE_NOT_AN_ALLOWED_FILE_TYPE = new Errno(TYPE, 158, "The %1$s found at path \"%2$s\" is not one of allowed file types \"%3$s\".");
+    public static final Errno ERRNO_FILE_NOT_AN_ALLOWED_FILE_TYPE = new Errno(TYPE, 158, "The %1$s found at path \"%2$s\" of type \"%3$s\" is not one of allowed file types \"%4$s\".");
 
     public static final Errno ERRNO_VALIDATE_FILE_EXISTENCE_AND_PERMISSIONS_FAILED_WITH_EXCEPTION = new Errno(TYPE, 159, "Validating file existence and permissions of %1$s at path \"%2$s\" failed.\nException: %3$s");
     public static final Errno ERRNO_VALIDATE_DIRECTORY_EXISTENCE_AND_PERMISSIONS_FAILED_WITH_EXCEPTION = new Errno(TYPE, 160, "Validating directory existence and permissions of %1$s at path \"%2$s\" failed.\nException: %3$s");

From c81d9c33463e2d8b0b23f3c1522414b2ac3d6315 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sun, 17 Apr 2022 06:18:14 +0500
Subject: [PATCH 724/912] Added: Add `FileType.SOCKET` support and add
 `FileUtils.deleteSocketFile()` function

---
 .../java/com/termux/shared/file/FileUtils.java  | 15 +++++++++++++++
 .../shared/file/filesystem/FileAttributes.java  |  4 ++++
 .../termux/shared/file/filesystem/FileType.java | 17 +++++++++--------
 .../shared/file/filesystem/FileTypes.java       |  2 ++
 .../shared/file/filesystem/UnixConstants.java   |  2 ++
 5 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/file/FileUtils.java b/termux-shared/src/main/java/com/termux/shared/file/FileUtils.java
index 715d65f5e7..f51de78283 100644
--- a/termux-shared/src/main/java/com/termux/shared/file/FileUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/file/FileUtils.java
@@ -1116,6 +1116,21 @@ public static Error deleteSymlinkFile(String label, final String filePath, final
         return deleteFile(label, filePath, ignoreNonExistentFile, false, FileType.SYMLINK.getValue());
     }
 
+    /**
+     * Delete socket file at path.
+     *
+     * This function is a wrapper for {@link #deleteFile(String, String, boolean, boolean, int)}.
+     *
+     * @param label The optional label for file to delete. This can optionally be {@code null}.
+     * @param filePath The {@code path} for file to delete.
+     * @param ignoreNonExistentFile The {@code boolean} that decides if it should be considered an
+     *                              error if file to deleted doesn't exist.
+     * @return Returns the {@code error} if deletion was not successful, otherwise {@code null}.
+     */
+    public static Error deleteSocketFile(String label, final String filePath, final boolean ignoreNonExistentFile) {
+        return deleteFile(label, filePath, ignoreNonExistentFile, false, FileType.SOCKET.getValue());
+    }
+
     /**
      * Delete regular, directory or symlink file at path.
      *
diff --git a/termux-shared/src/main/java/com/termux/shared/file/filesystem/FileAttributes.java b/termux-shared/src/main/java/com/termux/shared/file/filesystem/FileAttributes.java
index 5e847a1e9e..4565acc3da 100644
--- a/termux-shared/src/main/java/com/termux/shared/file/filesystem/FileAttributes.java
+++ b/termux-shared/src/main/java/com/termux/shared/file/filesystem/FileAttributes.java
@@ -202,6 +202,10 @@ public boolean isFifo() {
         return ((st_mode & UnixConstants.S_IFMT) == UnixConstants.S_IFIFO);
     }
 
+    public boolean isSocket() {
+        return ((st_mode & UnixConstants.S_IFMT) == UnixConstants.S_IFSOCK);
+    }
+
     public boolean isBlock() {
         return ((st_mode & UnixConstants.S_IFMT) == UnixConstants.S_IFBLK);
     }
diff --git a/termux-shared/src/main/java/com/termux/shared/file/filesystem/FileType.java b/termux-shared/src/main/java/com/termux/shared/file/filesystem/FileType.java
index 00ed06d62b..ff9418fc47 100644
--- a/termux-shared/src/main/java/com/termux/shared/file/filesystem/FileType.java
+++ b/termux-shared/src/main/java/com/termux/shared/file/filesystem/FileType.java
@@ -3,14 +3,15 @@
 /** The {@link Enum} that defines file types. */
 public enum FileType {
 
-    NO_EXIST("no exist", 0),    // 0000000
-    REGULAR("regular", 1),      // 0000001
-    DIRECTORY("directory", 2),  // 0000010
-    SYMLINK("symlink", 4),      // 0000100
-    CHARACTER("character", 8),  // 0001000
-    FIFO("fifo", 16),           // 0010000
-    BLOCK("block", 32),         // 0100000
-    UNKNOWN("unknown", 64);     // 1000000
+    NO_EXIST("no exist", 0),    // 00000000
+    REGULAR("regular", 1),      // 00000001
+    DIRECTORY("directory", 2),  // 00000010
+    SYMLINK("symlink", 4),      // 00000100
+    SOCKET("socket", 8),        // 00001000
+    CHARACTER("character", 16), // 00010000
+    FIFO("fifo", 32),           // 00100000
+    BLOCK("block", 64),         // 01000000
+    UNKNOWN("unknown", 128);    // 10000000
 
     private final String name;
     private final int value;
diff --git a/termux-shared/src/main/java/com/termux/shared/file/filesystem/FileTypes.java b/termux-shared/src/main/java/com/termux/shared/file/filesystem/FileTypes.java
index c739392d97..29f2b294de 100644
--- a/termux-shared/src/main/java/com/termux/shared/file/filesystem/FileTypes.java
+++ b/termux-shared/src/main/java/com/termux/shared/file/filesystem/FileTypes.java
@@ -104,6 +104,8 @@ else if (fileAttributes.isDirectory())
             return FileType.DIRECTORY;
         else if (fileAttributes.isSymbolicLink())
             return FileType.SYMLINK;
+        else if (fileAttributes.isSocket())
+            return FileType.SOCKET;
         else if (fileAttributes.isCharacter())
             return FileType.CHARACTER;
         else if (fileAttributes.isFifo())
diff --git a/termux-shared/src/main/java/com/termux/shared/file/filesystem/UnixConstants.java b/termux-shared/src/main/java/com/termux/shared/file/filesystem/UnixConstants.java
index 39e84eb674..72e7dc2ae9 100644
--- a/termux-shared/src/main/java/com/termux/shared/file/filesystem/UnixConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/file/filesystem/UnixConstants.java
@@ -88,6 +88,8 @@ private UnixConstants() { }
 
     static final int S_IFLNK = OsConstants.S_IFLNK;
 
+    static final int S_IFSOCK = OsConstants.S_IFSOCK;
+
     static final int S_IFCHR = OsConstants.S_IFCHR;
 
     static final int S_IFBLK = OsConstants.S_IFBLK;

From 89a08ff01a0397c5b025ec4ee9c350ec81c9c621 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sun, 17 Apr 2022 06:19:03 +0500
Subject: [PATCH 725/912] Fixed: Allow `Object` class object to be passed to
 `ReflectionUtils.invokeField()`

---
 .../main/java/com/termux/shared/reflection/ReflectionUtils.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/reflection/ReflectionUtils.java b/termux-shared/src/main/java/com/termux/shared/reflection/ReflectionUtils.java
index d4f2ac2876..fadcb7d986 100644
--- a/termux-shared/src/main/java/com/termux/shared/reflection/ReflectionUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/reflection/ReflectionUtils.java
@@ -86,7 +86,7 @@ public static class FieldInvokeResult {
      * {@link Object} value.
      */
     @NonNull
-    public static <T> FieldInvokeResult invokeField(@NonNull Class<T> clazz, @NonNull String fieldName, T object) {
+    public static <T> FieldInvokeResult invokeField(@NonNull Class<? extends T> clazz, @NonNull String fieldName, T object) {
         try {
             Field field = getDeclaredField(clazz, fieldName);
             if (field == null) return new FieldInvokeResult(false, null);

From 6bda7c4fc4d996e15998a70476cbcab5fa26d97b Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sun, 17 Apr 2022 06:30:17 +0500
Subject: [PATCH 726/912] Added|Changed: Add `Logger.logErrorPrivate*()`
 functions which do not log errors that may contain potentially private info
 unless log level is debug or higher

Execution commands and other errors that may contain potentially private info should not be logged unless user has explicitly allowed it since apps with `READ_LOGS` permission would be able to read the data. A notification for failed executions commands would still be shown if enabled and required.
---
 .../java/com/termux/app/TermuxService.java    | 12 ++++++----
 .../java/com/termux/shared/logger/Logger.java | 22 +++++++++++++++++++
 .../termux/plugins/TermuxPluginUtils.java     |  6 +++--
 3 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxService.java b/app/src/main/java/com/termux/app/TermuxService.java
index 0b7139350a..59005c0a9e 100644
--- a/app/src/main/java/com/termux/app/TermuxService.java
+++ b/app/src/main/java/com/termux/app/TermuxService.java
@@ -455,8 +455,10 @@ public synchronized AppShell createTermuxTask(ExecutionCommand executionCommand)
             // If the execution command was started for a plugin, then process the error
             if (executionCommand.isPluginExecutionCommand)
                 TermuxPluginUtils.processPluginExecutionCommandError(this, LOG_TAG, executionCommand, false);
-            else
-                Logger.logErrorExtended(LOG_TAG, executionCommand.toString());
+            else {
+                Logger.logError(LOG_TAG, "Set log level to debug or higher to see error in logs");
+                Logger.logErrorPrivateExtended(LOG_TAG, executionCommand.toString());
+            }
             return null;
         }
 
@@ -576,8 +578,10 @@ public synchronized TermuxSession createTermuxSession(ExecutionCommand execution
             // If the execution command was started for a plugin, then process the error
             if (executionCommand.isPluginExecutionCommand)
                 TermuxPluginUtils.processPluginExecutionCommandError(this, LOG_TAG, executionCommand, false);
-            else
-                Logger.logErrorExtended(LOG_TAG, executionCommand.toString());
+            else {
+                Logger.logError(LOG_TAG, "Set log level to debug or higher to see error in logs");
+                Logger.logErrorPrivateExtended(LOG_TAG, executionCommand.toString());
+            }
             return null;
         }
 
diff --git a/termux-shared/src/main/java/com/termux/shared/logger/Logger.java b/termux-shared/src/main/java/com/termux/shared/logger/Logger.java
index e2573a8a3e..e5075b1f91 100644
--- a/termux-shared/src/main/java/com/termux/shared/logger/Logger.java
+++ b/termux-shared/src/main/java/com/termux/shared/logger/Logger.java
@@ -120,6 +120,28 @@ public static void logErrorExtended(String message) {
 
 
 
+    public static void logErrorPrivate(String tag, String message) {
+        if (CURRENT_LOG_LEVEL >= LOG_LEVEL_DEBUG)
+            logMessage(Log.ERROR, tag, message);
+    }
+
+    public static void logErrorPrivate(String message) {
+        if (CURRENT_LOG_LEVEL >= LOG_LEVEL_DEBUG)
+            logMessage(Log.ERROR, DEFAULT_LOG_TAG, message);
+    }
+
+    public static void logErrorPrivateExtended(String tag, String message) {
+        if (CURRENT_LOG_LEVEL >= LOG_LEVEL_DEBUG)
+            logExtendedMessage(Log.ERROR, tag, message);
+    }
+
+    public static void logErrorPrivateExtended(String message) {
+        if (CURRENT_LOG_LEVEL >= LOG_LEVEL_DEBUG)
+            logExtendedMessage(Log.ERROR, DEFAULT_LOG_TAG, message);
+    }
+
+
+
     public static void logWarn(String tag, String message) {
         logMessage(Log.WARN, tag, message);
     }
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/plugins/TermuxPluginUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/plugins/TermuxPluginUtils.java
index 28904e9f63..ed2d9a2016 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/plugins/TermuxPluginUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/plugins/TermuxPluginUtils.java
@@ -144,7 +144,9 @@ public static void processPluginExecutionCommandError(final Context context, Str
         boolean isExecutionCommandLoggingEnabled = Logger.shouldEnableLoggingForCustomLogLevel(executionCommand.backgroundCustomLogLevel);
 
         // 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,
+        Logger.logError(logTag, "Processing plugin execution error for:\n" + executionCommand.getCommandIdAndLabelLogString());
+        Logger.logError(logTag, "Set log level to debug or higher to see error in logs");
+        Logger.logErrorPrivateExtended(logTag, ExecutionCommand.getExecutionOutputLogString(executionCommand, true,
             !isPluginExecutionCommandWithPendingResult, isExecutionCommandLoggingEnabled));
 
         // If execution command was started by a plugin which expects the result back
@@ -161,7 +163,7 @@ public static void processPluginExecutionCommandError(final Context context, Str
             if (error != null) {
                 // error will be added to existing Errors
                 resultData.setStateFailed(error);
-                Logger.logErrorExtended(logTag, ExecutionCommand.getExecutionOutputLogString(executionCommand, true, true, isExecutionCommandLoggingEnabled));
+                Logger.logErrorPrivateExtended(logTag, ExecutionCommand.getExecutionOutputLogString(executionCommand, true, true, isExecutionCommandLoggingEnabled));
                 forceNotification = true;
             }
 

From bcd8f4c419872d51f0ff67891110abb1844fd7c2 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sun, 17 Apr 2022 06:38:42 +0500
Subject: [PATCH 727/912] Added: Add `TERMUX_APPS_DIR_PATH` and
 `TERMUX_APP.APPS_DIR_PATH` and create them at application startup.

The termux files directory will also be checked and created if required at startup and code related to it will only be run if it is accessible. This can later also be used for init execution commands.

The `TERMUX_APP.APPS_DIR_PATH` will act as app specific directory for `termux-app` app related files. Other plugin apps will have their own directories under `TERMUX_APPS_DIR_PATH` if required.
---
 .../com/termux/app/TermuxApplication.java     | 19 +++++++++++++++++++
 .../termux/shared/termux/TermuxConstants.java | 18 +++++++++++++++---
 .../shared/termux/file/TermuxFileUtils.java   | 18 ++++++++++++++++++
 3 files changed, 52 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxApplication.java b/app/src/main/java/com/termux/app/TermuxApplication.java
index bf0887582e..d844c652bd 100644
--- a/app/src/main/java/com/termux/app/TermuxApplication.java
+++ b/app/src/main/java/com/termux/app/TermuxApplication.java
@@ -4,16 +4,20 @@
 import android.content.Context;
 
 import com.termux.am.Am;
+import com.termux.shared.errors.Error;
 import com.termux.shared.logger.Logger;
 import com.termux.shared.shell.LocalSocketListener;
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.termux.crash.TermuxCrashUtils;
+import com.termux.shared.termux.file.TermuxFileUtils;
 import com.termux.shared.termux.settings.preferences.TermuxAppSharedPreferences;
 import com.termux.shared.termux.settings.properties.TermuxAppSharedProperties;
 import com.termux.shared.termux.theme.TermuxThemeUtils;
 
 public class TermuxApplication extends Application {
 
+    private static final String LOG_TAG = "TermuxApplication";
+
     public void onCreate() {
         super.onCreate();
 
@@ -33,6 +37,21 @@ public void onCreate() {
         // Set NightMode.APP_NIGHT_MODE
         TermuxThemeUtils.setAppNightMode(properties.getNightMode());
 
+        // Check and create termux files directory. If failed to access it like in case of secondary
+        // user or external sd card installation, then don't run files directory related code
+        Error error = TermuxFileUtils.isTermuxFilesDirectoryAccessible(this, true, true);
+        if (error != null) {
+            Logger.logErrorExtended(LOG_TAG, "Termux files directory is not accessible\n" + error);
+        } else {
+            Logger.logInfo(LOG_TAG, "Termux files directory is accessible");
+
+            error = TermuxFileUtils.isAppsTermuxAppDirectoryAccessible(true, true);
+            if (error != null) {
+                Logger.logErrorExtended(LOG_TAG, "Create apps/termux-app directory failed\n" + error);
+                return;
+            }
+        }
+
         if (LocalSocketListener.tryEstablishLocalSocketListener(this, (args, out, err) -> {
             try {
                 new Am(out, err, this).run(args);
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
index 68ec885cc6..d400e69396 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
@@ -11,7 +11,7 @@
 import java.util.List;
 
 /*
- * Version: v0.39.0
+ * Version: v0.40.0
  * SPDX-License-Identifier: MIT
  *
  * Changelog
@@ -216,10 +216,10 @@
  *      - Added `TERMUX_PROPERTIES_FILE_PATHS_LIST` and `TERMUX_FLOAT_PROPERTIES_FILE_PATHS_LIST`.
  *
  * - 0.34.0 (2021-10-26)
- *  - Move `RESULT_SENDER` to `com.termux.shared.shell.command.ShellCommandConstants`.
+ *      - Move `RESULT_SENDER` to `com.termux.shared.shell.command.ShellCommandConstants`.
  *
  * - 0.35.0 (2022-01-28)
- *  - Add `TERMUX_APP.TERMUX_ACTIVITY.EXTRA_RECREATE_ACTIVITY`.
+ *      - Add `TERMUX_APP.TERMUX_ACTIVITY.EXTRA_RECREATE_ACTIVITY`.
  *
  * - 0.36.0 (2022-03-10)
  *      - Added `TERMUX_APP.TERMUX_SERVICE.EXTRA_RUNNER` and `TERMUX_APP.RUN_COMMAND_SERVICE.EXTRA_RUNNER`
@@ -233,6 +233,9 @@
  * - 0.39.0 (2022-03-18)
  *      - Added `TERMUX_APP.TERMUX_SERVICE.EXTRA_SESSION_NAME`, `TERMUX_APP.RUN_COMMAND_SERVICE.EXTRA_SESSION_NAME`,
  *          `TERMUX_APP.TERMUX_SERVICE.EXTRA_SESSION_CREATE_MODE` and `TERMUX_APP.RUN_COMMAND_SERVICE.EXTRA_SESSION_CREATE_MODE`.
+ *
+ * - 0.40.0 (2022-04-17)
+ *      - Added `TERMUX_APPS_DIR_PATH` and `TERMUX_APP.APPS_DIR_PATH`.
  */
 
 /**
@@ -657,6 +660,11 @@ public final class TermuxConstants {
 
 
 
+    /** Termux and plugin apps directory path */
+    public static final String TERMUX_APPS_DIR_PATH = TERMUX_FILES_DIR_PATH + "/apps"; // Default: "/data/data/com.termux/files/apps"
+    /** Termux and plugin apps directory */
+    public static final File TERMUX_APPS_DIR = new File(TERMUX_APPS_DIR_PATH);
+
 
 
     /*
@@ -872,6 +880,10 @@ public final class TermuxConstants {
      */
     public static final class TERMUX_APP {
 
+        /** Termux apps directory path */
+        public static final String APPS_DIR_PATH = TERMUX_APPS_DIR_PATH + "/termux-app"; // Default: "/data/data/com.termux/files/apps/termux-app"
+
+
         /** Termux app core activity name. */
         public static final String TERMUX_ACTIVITY_NAME = TERMUX_PACKAGE_NAME + ".app.TermuxActivity"; // Default: "com.termux.app.TermuxActivity"
 
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/file/TermuxFileUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/file/TermuxFileUtils.java
index 79770e790f..68c547dc25 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/file/TermuxFileUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/file/TermuxFileUtils.java
@@ -307,6 +307,24 @@ public static Error isTermuxPrefixStagingDirectoryAccessible(boolean createDirec
             false, false);
     }
 
+    /**
+     * Validate if {@link TermuxConstants.TERMUX_APP#APPS_DIR_PATH} exists and has
+     * {@link FileUtils#APP_WORKING_DIRECTORY_PERMISSIONS} permissions.
+     *
+     * @param createDirectoryIfMissing The {@code boolean} that decides if directory file
+     *                                 should be created if its missing.
+     * @param setMissingPermissions The {@code boolean} that decides if permissions are to be
+     *                              automatically set.
+     * @return Returns the {@code error} if path is not a directory file, failed to create it,
+     * or validating permissions failed, otherwise {@code null}.
+     */
+    public static Error isAppsTermuxAppDirectoryAccessible(boolean createDirectoryIfMissing, boolean setMissingPermissions) {
+        return FileUtils.validateDirectoryFileExistenceAndPermissions("apps/termux-app directory", TermuxConstants.TERMUX_APP.APPS_DIR_PATH,
+            null, createDirectoryIfMissing,
+            FileUtils.APP_WORKING_DIRECTORY_PERMISSIONS, setMissingPermissions, true,
+            false, false);
+    }
+
     /**
      * Get a markdown {@link String} for stat output for various Termux app files paths.
      *

From 69cc65c3acc523f6ff1e437b1bd26e1fdcb0abce Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sun, 17 Apr 2022 07:55:33 +0500
Subject: [PATCH 728/912] Added: Add functions to `UserUtils` to get user name
 for user id from `PackageManager` and `Libcore`

---
 .../com/termux/shared/android/UserUtils.java  | 143 ++++++++++++++++++
 1 file changed, 143 insertions(+)
 create mode 100644 termux-shared/src/main/java/com/termux/shared/android/UserUtils.java

diff --git a/termux-shared/src/main/java/com/termux/shared/android/UserUtils.java b/termux-shared/src/main/java/com/termux/shared/android/UserUtils.java
new file mode 100644
index 0000000000..f819de3f4e
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/android/UserUtils.java
@@ -0,0 +1,143 @@
+package com.termux.shared.android;
+
+import android.content.Context;
+import android.content.pm.PackageManager;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.termux.shared.logger.Logger;
+import com.termux.shared.reflection.ReflectionUtils;
+
+import java.lang.reflect.Method;
+
+public class UserUtils {
+
+    public static final String LOG_TAG = "UserUtils";
+
+    /**
+     * Get the user name for user id with a call to {@link #getNameForUidFromPackageManager(Context, int)}
+     * and if that fails, then a call to {@link #getNameForUidFromLibcore(int)}.
+     *
+     * @param context The {@link Context} for operations.
+     * @param uid The user id.
+     * @return Returns the user name if found, otherwise {@code null}.
+     */
+    @Nullable
+    public static String getNameForUid(@NonNull Context context, int uid) {
+        String name = getNameForUidFromPackageManager(context, uid);
+        if (name == null)
+            name = getNameForUidFromLibcore(uid);
+        return name;
+    }
+
+    /**
+     * Get the user name for user id with a call to {@link PackageManager#getNameForUid(int)}.
+     *
+     * This will not return user names for non app user id like for root user 0, use {@link #getNameForUidFromLibcore(int)}
+     * to get those.
+     *
+     * https://cs.android.com/android/platform/superproject/+/android-12.0.0_r32:frameworks/base/core/java/android/content/pm/PackageManager.java;l=5556
+     * https://cs.android.com/android/platform/superproject/+/android-12.0.0_r32:frameworks/base/core/java/android/app/ApplicationPackageManager.java;l=1028
+     * https://cs.android.com/android/platform/superproject/+/android-12.0.0_r32:frameworks/base/services/core/java/com/android/server/pm/PackageManagerService.java;l=10293
+     *
+     * @param context The {@link Context} for operations.
+     * @param uid The user id.
+     * @return Returns the user name if found, otherwise {@code null}.
+     */
+    @Nullable
+    public static String getNameForUidFromPackageManager(@NonNull Context context, int uid) {
+        if (uid < 0) return null;
+
+        try {
+            String name = context.getPackageManager().getNameForUid(uid);
+            if (name != null && name.endsWith(":" + uid))
+                name = name.replaceAll(":" + uid + "$", ""); // Remove ":<uid>" suffix
+            return name;
+        } catch (Exception e) {
+            Logger.logStackTraceWithMessage(LOG_TAG, "Failed to get name for uid \"" + uid + "\" from package manager", e);
+            return null;
+        }
+    }
+
+    /**
+     * Get the user name for user id with a call to `Libcore.os.getpwuid()`.
+     *
+     * This will return user names for non app user id like for root user 0 as well, but this call
+     * is expensive due to usage of reflection, and requires hidden API bypass, check
+     * {@link ReflectionUtils#bypassHiddenAPIReflectionRestrictions()} for details.
+     *
+     * `BlockGuardOs` implements the `Os` interface and its instance is stored in `Libcore` class static `os` field.
+     * The `getpwuid` method is implemented by `ForwardingOs`, which is the super class of `BlockGuardOs`.
+     * The `getpwuid` method returns `StructPasswd` object whose `pw_name` contains the user name for id.
+     *
+     * https://stackoverflow.com/a/28057167/14686958
+     * https://cs.android.com/android/platform/superproject/+/android-12.0.0_r32:libcore/luni/src/main/java/libcore/io/Libcore.java;l=39
+     * https://cs.android.com/android/platform/superproject/+/android-12.0.0_r32:libcore/luni/src/main/java/libcore/io/Os.java;l=279
+     * https://cs.android.com/android/platform/superproject/+/android-12.0.0_r32:libcore/luni/src/main/java/libcore/io/BlockGuardOs.java
+     * https://cs.android.com/android/platform/superproject/+/android-12.0.0_r32:libcore/luni/src/main/java/libcore/io/ForwardingOs.java;l=340
+     * https://cs.android.com/android/platform/superproject/+/android-12.0.0_r32:libcore/luni/src/main/java/android/system/StructPasswd.java
+     * https://cs.android.com/android/platform/superproject/+/android-12.0.0_r32:bionic/libc/bionic/grp_pwd.cpp;l=553
+     * https://cs.android.com/android/platform/superproject/+/android-12.0.0_r32:system/core/libcutils/include/private/android_filesystem_config.h;l=43
+     *
+     * @param uid The user id.
+     * @return Returns the user name if found, otherwise {@code null}.
+     */
+    @Nullable
+    public static String getNameForUidFromLibcore(int uid) {
+        if (uid < 0) return null;
+
+        ReflectionUtils.bypassHiddenAPIReflectionRestrictions();
+        try {
+            String libcoreClassName = "libcore.io.Libcore";
+            Class<?> clazz = Class.forName(libcoreClassName);
+            Object os; // libcore.io.BlockGuardOs
+            try {
+                os = ReflectionUtils.invokeField(Class.forName(libcoreClassName), "os", null).value;
+            } catch (Exception e) {
+                // ClassCastException may be thrown
+                Logger.logStackTraceWithMessage(LOG_TAG, "Failed to get \"os\" field value for " + libcoreClassName + " class", e);
+                return null;
+            }
+
+            if (os == null) {
+                Logger.logError(LOG_TAG, "Failed to get BlockGuardOs class obj from Libcore");
+                return null;
+            }
+
+            clazz = os.getClass().getSuperclass();  // libcore.io.ForwardingOs
+            if (clazz == null) {
+                Logger.logError(LOG_TAG, "Failed to find super class ForwardingOs from object of class " + os.getClass().getName());
+                return null;
+            }
+
+            Object structPasswd; // android.system.StructPasswd
+            try {
+                Method getpwuidMethod = ReflectionUtils.getDeclaredMethod(clazz, "getpwuid", int.class);
+                if (getpwuidMethod == null) return null;
+                structPasswd = ReflectionUtils.invokeMethod(getpwuidMethod, os, uid).value;
+            } catch (Exception e) {
+                Logger.logStackTraceWithMessage(LOG_TAG, "Failed to invoke getpwuid() method of " + clazz.getName() + " class", e);
+                return null;
+            }
+
+            if (structPasswd == null) {
+                Logger.logError(LOG_TAG, "Failed to get StructPasswd obj from call to ForwardingOs.getpwuid()");
+                return null;
+            }
+
+            try {
+                clazz = structPasswd.getClass();
+                return (String) ReflectionUtils.invokeField(clazz, "pw_name", structPasswd).value;
+            } catch (Exception e) {
+                // ClassCastException may be thrown
+                Logger.logStackTraceWithMessage(LOG_TAG, "Failed to get \"pw_name\" field value for " + clazz.getName() + " class", e);
+                return null;
+            }
+        } catch (Exception e) {
+            Logger.logStackTraceWithMessage(LOG_TAG, "Failed to get name for uid \"" + uid + "\" from Libcore", e);
+            return null;
+        }
+    }
+
+}

From 9a71074c7dcf800e36d86f4e2656ad919d5b61df Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sun, 17 Apr 2022 07:59:24 +0500
Subject: [PATCH 729/912] Added: Add function to `ProcessUtils` to get app
 process name for a pid from `ActivityManager`

---
 .../termux/shared/android/ProcessUtils.java   | 58 +++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 termux-shared/src/main/java/com/termux/shared/android/ProcessUtils.java

diff --git a/termux-shared/src/main/java/com/termux/shared/android/ProcessUtils.java b/termux-shared/src/main/java/com/termux/shared/android/ProcessUtils.java
new file mode 100644
index 0000000000..c6d182b06e
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/android/ProcessUtils.java
@@ -0,0 +1,58 @@
+package com.termux.shared.android;
+
+import android.app.ActivityManager;
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.termux.shared.logger.Logger;
+
+import java.util.List;
+
+public class ProcessUtils {
+
+    public static final String LOG_TAG = "ProcessUtils";
+
+    /**
+     * Get the app process name for a pid with a call to {@link ActivityManager#getRunningAppProcesses()}.
+     *
+     * This will not return child process names. Android did not keep track of them before android 12
+     * phantom process addition, but there is no API via IActivityManager to get them.
+     *
+     * To get process name for pids of own app's child processes, check `get_process_name_from_cmdline()`
+     * in `local-socket.cpp`.
+     *
+     * https://cs.android.com/android/platform/superproject/+/android-12.0.0_r32:frameworks/base/core/java/android/app/ActivityManager.java;l=3362
+     * https://cs.android.com/android/platform/superproject/+/android-12.0.0_r32:frameworks/base/services/core/java/com/android/server/am/ActivityManagerService.java;l=8434
+     * https://cs.android.com/android/_/android/platform/frameworks/base/+/refs/tags/android-12.0.0_r32:services/core/java/com/android/server/am/PhantomProcessList.java
+     * https://cs.android.com/android/_/android/platform/frameworks/base/+/refs/tags/android-12.0.0_r32:services/core/java/com/android/server/am/PhantomProcessRecord.java
+     *
+     * @param context The {@link Context} for operations.
+     * @param pid The pid of the process.
+     * @return Returns the app process name if found, otherwise {@code null}.
+     */
+    @Nullable
+    public static String getAppProcessNameForPid(@NonNull Context context, int pid) {
+        if (pid < 0) return null;
+
+        ActivityManager activityManager = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
+        if (activityManager == null) return null;
+        try {
+            List<ActivityManager.RunningAppProcessInfo> runningApps = activityManager.getRunningAppProcesses();
+            if (runningApps == null) {
+                return null;
+            }
+            for (ActivityManager.RunningAppProcessInfo procInfo : runningApps) {
+                if (procInfo.pid == pid) {
+                    return procInfo.processName;
+                }
+            }
+        } catch (Exception e) {
+            Logger.logStackTraceWithMessage(LOG_TAG, "Failed to get app process name for pid " + pid, e);
+        }
+
+        return null;
+    }
+
+}

From 5f8a9222014f2731b09b77208fa4d2632846221b Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sun, 17 Apr 2022 08:14:18 +0500
Subject: [PATCH 730/912] Added: Allow users to disable `termux-am` server

The user can add `run-termux-am-socket-server=false` entry to `termux.properties` file to disable the `termux-am` server to run at app startup which is connected to by `$PREFIX/bin/termux-am` from the `termux-am-socket` package. The default value is `true`. Changes require `termux-app` to be force stopped and restarted to provide consistent state for all termux sessions and tasks.

The prop will be used in a later commit.
---
 .../settings/properties/TermuxPropertyConstants.java   | 10 +++++++++-
 .../settings/properties/TermuxSharedProperties.java    |  4 ++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxPropertyConstants.java b/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxPropertyConstants.java
index 34e3dfed5d..643b1ddd5b 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxPropertyConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxPropertyConstants.java
@@ -1,6 +1,7 @@
 package com.termux.shared.termux.settings.properties;
 
 import com.google.common.collect.ImmutableBiMap;
+import com.termux.shared.termux.shell.am.TermuxAmSocketServer;
 import com.termux.shared.theme.NightMode;
 import com.termux.shared.file.FileUtils;
 import com.termux.shared.file.filesystem.FileType;
@@ -120,6 +121,11 @@ public final class TermuxPropertyConstants {
 
 
 
+    /** Defines the key for whether the {@link TermuxAmSocketServer} should be run at app startup */
+    public static final String KEY_RUN_TERMUX_AM_SOCKET_SERVER =  "run-termux-am-socket-server"; // Default: "run-termux-am-socket-server"
+
+
+
     /** Defines the key for whether url links in terminal transcript will automatically open on click or on tap */
     public static final String KEY_TERMINAL_ONCLICK_URL_OPEN =  "terminal-onclick-url-open"; // Default: "terminal-onclick-url-open"
 
@@ -379,6 +385,7 @@ public final class TermuxPropertyConstants {
         KEY_ENFORCE_CHAR_BASED_INPUT,
         KEY_EXTRA_KEYS_TEXT_ALL_CAPS,
         KEY_HIDE_SOFT_KEYBOARD_ON_STARTUP,
+        KEY_RUN_TERMUX_AM_SOCKET_SERVER,
         KEY_TERMINAL_ONCLICK_URL_OPEN,
         KEY_USE_CTRL_SPACE_WORKAROUND,
         KEY_USE_FULLSCREEN,
@@ -436,7 +443,8 @@ public final class TermuxPropertyConstants {
      * default: true
      */
     public static final Set<String> TERMUX_DEFAULT_TRUE_BOOLEAN_BEHAVIOUR_PROPERTIES_LIST = new HashSet<>(Arrays.asList(
-        KEY_EXTRA_KEYS_TEXT_ALL_CAPS
+        KEY_EXTRA_KEYS_TEXT_ALL_CAPS,
+        KEY_RUN_TERMUX_AM_SOCKET_SERVER
     ));
 
     /** Defines the set for keys loaded by termux that have default inverted boolean behaviour with false as default.
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxSharedProperties.java b/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxSharedProperties.java
index 4b1b7bfd80..ad863e9c66 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxSharedProperties.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxSharedProperties.java
@@ -583,6 +583,10 @@ public boolean shouldSoftKeyboardBeHiddenOnStartup() {
         return (boolean) getInternalPropertyValue(TermuxPropertyConstants.KEY_HIDE_SOFT_KEYBOARD_ON_STARTUP, true);
     }
 
+    public boolean shouldRunTermuxAmSocketServer() {
+        return (boolean) getInternalPropertyValue(TermuxPropertyConstants.KEY_RUN_TERMUX_AM_SOCKET_SERVER, true);
+    }
+
     public boolean shouldOpenTerminalTranscriptURLOnClick() {
         return (boolean) getInternalPropertyValue(TermuxPropertyConstants.KEY_TERMINAL_ONCLICK_URL_OPEN, true);
     }

From 2aa7f43d1c7739ab57fe50669f84588daf1602d7 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Mon, 18 Apr 2022 04:36:07 +0500
Subject: [PATCH 731/912] Added|Changed|Fixed: Refactor local socket server
 implementation and make client handling abstract

- Added `LocalSocketManager` to manage the server, `LocalServerSocket` to represent server socket, `LocalClientSocket` to represent client socket, `LocalSocketRunConfig` to store server run config and `ILocalSocketManager` as interface for the `LocalSocketManager` to handle callbacks from the server to handle clients.
- Added support to get full `PeerCred` for client socket, including `pid`, `pname`, `uid`, `uname`, `gid`, `gname` and `cmdline` instead of just `uid`. This should provide more info for error logs about which client failed or tried to connect in case of disallowed clients. Some data is filled in native code and some in java. Native support for added to get process name and `cmdline` of a process with a specific pid.
- Added `JniResult` to get results for JNI calls. Previously only an int was returned and incomplete errors logged. With `JniResult`, both `retval` and `errno` will be returned and full error messages in `errmsg`, including all `strerror()` output for `errno`s. This would provide more helpful info on errors.
- Added `Error` support via `LocalSocketErrno` which contains full error messages and stacktraces for all native and java calls, allowing much better error reporting to users and devs. The errors will be logged by `LocalSocketManagerClientBase` if log level is debug or higher since `PeerCred` `cmdline` may contain private info of users.
- Added support in java to check if socket path was an absolute path and not greater than `108` bytes, after canonicalizing it since otherwise it would result in creation of useless parent directories on failure.
- Added `readDataOnInputStream()` and `sendDataToOutputStream()` functions to `LocalClientSocket` so that server manager client can easily read and send data.

- Renamed the variables and functions as per convention, specially one letter variables. https://source.android.com/setup/contribute/code-style#follow-field-naming-conventions
- Rename `local-filesystem-socket` to `local-filesystem` since abstract namespace sockets can also be created.
- Previously, it was assumed that all local server would expect a shell command string that should be converted to command args with `ArgumentTokenizer` and then should be passed to `LocalSocketHandler.handle()` and then result sent back to client with exit code, stdout and stderr, but there could be any kind of servers in which behaviour is different. Such client handling should not be hard coded and the server manager client should handle the client themselves however they like, including closing the client socket. This will now be done with `ILocalSocketManager. onClientAccepted(LocalSocketManager, LocalClientSocket)`.

- Ensure app does not crash if `local-socket` library is not found or for any other exceptions in the server since anything running in the `Application` class is critical that it does not fail since user would not be able to recover from it, specially non rooted users without SAF support to disable the server with a prop.
- Make sure all reasonable JNI exceptions are caught instead of crashing the app.
- Fixed issue where client logic (`LocalSocketHandler.handle()` was being run in the same thread as the new client acceptable thread, basically blocking new clients until previous client's am command was fully processed. Now all client interface callbacks are started in new threads by `LocalSocketManager`.
- Fix bug where timeout would not be greater than `1000ms` due to only using `tv_usec` which caps at `999,999`.
---
 termux-shared/src/main/cpp/Android.mk         |   4 +-
 termux-shared/src/main/cpp/Application.mk     |   1 +
 .../src/main/cpp/local-filesystem-socket.cpp  | 197 ------
 termux-shared/src/main/cpp/local-socket.cpp   | 603 ++++++++++++++++++
 .../termux/shared/jni/models/JniResult.java   | 107 ++++
 .../net/socket/local/ILocalSocketManager.java |  72 +++
 .../net/socket/local/LocalClientSocket.java   | 483 ++++++++++++++
 .../net/socket/local/LocalServerSocket.java   | 303 +++++++++
 .../net/socket/local/LocalSocketErrno.java    |  43 ++
 .../net/socket/local/LocalSocketManager.java  | 448 +++++++++++++
 .../local/LocalSocketManagerClientBase.java   |  47 ++
 .../socket/local/LocalSocketRunConfig.java    | 265 ++++++++
 .../shared/net/socket/local/PeerCred.java     | 140 ++++
 .../shared/shell/LocalFilesystemSocket.java   | 273 --------
 .../shared/shell/LocalSocketListener.java     | 117 ----
 15 files changed, 2514 insertions(+), 589 deletions(-)
 create mode 100644 termux-shared/src/main/cpp/Application.mk
 delete mode 100644 termux-shared/src/main/cpp/local-filesystem-socket.cpp
 create mode 100644 termux-shared/src/main/cpp/local-socket.cpp
 create mode 100644 termux-shared/src/main/java/com/termux/shared/jni/models/JniResult.java
 create mode 100644 termux-shared/src/main/java/com/termux/shared/net/socket/local/ILocalSocketManager.java
 create mode 100644 termux-shared/src/main/java/com/termux/shared/net/socket/local/LocalClientSocket.java
 create mode 100644 termux-shared/src/main/java/com/termux/shared/net/socket/local/LocalServerSocket.java
 create mode 100644 termux-shared/src/main/java/com/termux/shared/net/socket/local/LocalSocketErrno.java
 create mode 100644 termux-shared/src/main/java/com/termux/shared/net/socket/local/LocalSocketManager.java
 create mode 100644 termux-shared/src/main/java/com/termux/shared/net/socket/local/LocalSocketManagerClientBase.java
 create mode 100644 termux-shared/src/main/java/com/termux/shared/net/socket/local/LocalSocketRunConfig.java
 create mode 100644 termux-shared/src/main/java/com/termux/shared/net/socket/local/PeerCred.java
 delete mode 100644 termux-shared/src/main/java/com/termux/shared/shell/LocalFilesystemSocket.java
 delete mode 100644 termux-shared/src/main/java/com/termux/shared/shell/LocalSocketListener.java

diff --git a/termux-shared/src/main/cpp/Android.mk b/termux-shared/src/main/cpp/Android.mk
index bc34d6ac95..abc213c379 100644
--- a/termux-shared/src/main/cpp/Android.mk
+++ b/termux-shared/src/main/cpp/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 LOCAL_LDLIBS := -llog
-LOCAL_MODULE := local-filesystem-socket
-LOCAL_SRC_FILES := local-filesystem-socket.cpp
+LOCAL_MODULE := local-socket
+LOCAL_SRC_FILES := local-socket.cpp
 include $(BUILD_SHARED_LIBRARY)
diff --git a/termux-shared/src/main/cpp/Application.mk b/termux-shared/src/main/cpp/Application.mk
new file mode 100644
index 0000000000..ce095350e6
--- /dev/null
+++ b/termux-shared/src/main/cpp/Application.mk
@@ -0,0 +1 @@
+APP_STL := c++_static
diff --git a/termux-shared/src/main/cpp/local-filesystem-socket.cpp b/termux-shared/src/main/cpp/local-filesystem-socket.cpp
deleted file mode 100644
index 4c5bc3e14a..0000000000
--- a/termux-shared/src/main/cpp/local-filesystem-socket.cpp
+++ /dev/null
@@ -1,197 +0,0 @@
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <sys/ioctl.h>
-
-#include <ctime>
-#include <cstdio>
-#include <unistd.h>
-#include <cerrno>
-
-#include <jni.h>
-
-#include <android/log.h>
-
-
-
-
-
-int64_t millisecondtime(const struct timespec* const time) {
-    return (((int64_t)time->tv_sec)*1000)+(((int64_t)time->tv_nsec)/1000000);
-}
-
-
-
-/// Sets the timeout in microseconds
-void settimeout_micro(int fd, int timeout) {
-    struct timeval t = {};
-    t.tv_sec = 0;
-    t.tv_usec = timeout;
-    socklen_t len = sizeof(t);
-    setsockopt(fd, SOL_SOCKET, SO_SNDTIMEO, &t, len);
-    setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, &t, len);
-}
-
-/// Sets the timeout in milliseconds
-void settimeout(int fd, int timeout) {
-    settimeout_micro(fd, timeout*1000);
-}
-
-
-extern "C"
-JNIEXPORT jint JNICALL
-Java_com_termux_shared_shell_LocalFilesystemSocket_createserversocket(JNIEnv *env, jclass clazz, jbyteArray path, jint backlog) {
-    if (backlog < 1) {
-        return -1;
-    }
-    int fd = socket(AF_UNIX, SOCK_STREAM, 0);
-    if (fd == -1) {
-        return -1;
-    }
-    jbyte* p = env->GetByteArrayElements(path, nullptr);
-    if (p == nullptr) {
-        close(fd);
-        return -1;
-    }
-    int chars = env->GetArrayLength(path);
-    if (chars >= sizeof(struct sockaddr_un)-sizeof(sa_family_t)) {
-        env->ReleaseByteArrayElements(path, p, JNI_ABORT);
-        close(fd);
-        return -1;
-    }
-    struct sockaddr_un adr = {.sun_family = AF_UNIX};
-    memcpy(&adr.sun_path, p, chars);
-    if (bind(fd, reinterpret_cast<struct sockaddr*>(&adr), sizeof(adr)) == -1) {
-        env->ReleaseByteArrayElements(path, p, JNI_ABORT);
-        close(fd);
-        return -1;
-    }
-    if (listen(fd, backlog) == -1) {
-        env->ReleaseByteArrayElements(path, p, JNI_ABORT);
-        close(fd);
-        return -1;
-    }
-    return fd;
-}
-
-
-extern "C"
-JNIEXPORT void JNICALL
-Java_com_termux_shared_shell_LocalFilesystemSocket_closefd(JNIEnv *env, jclass clazz, jint fd) {
-    close(fd);
-}
-
-extern "C"
-JNIEXPORT jint JNICALL
-Java_com_termux_shared_shell_LocalFilesystemSocket_accept(JNIEnv *env, jclass clazz, jint fd) {
-    int c = accept(fd, nullptr, nullptr);
-    if (c == -1) {
-        return -1;
-    }
-    return c;
-}
-
-
-
-
-extern "C"
-JNIEXPORT jboolean JNICALL
-Java_com_termux_shared_shell_LocalFilesystemSocket_send(JNIEnv *env, jclass clazz, jbyteArray data, jint fd, jlong deadline) {
-    if (fd == -1) {
-        return false;
-    }
-    jbyte* d = env->GetByteArrayElements(data, nullptr);
-    if (d == nullptr) {
-        return false;
-    }
-    struct timespec time = {};
-    jbyte* current = d;
-    int bytes = env->GetArrayLength(data);
-    while (bytes > 0) {
-        if (clock_gettime(CLOCK_REALTIME, &time) != -1) {
-            if (millisecondtime(&time) > deadline) {
-                env->ReleaseByteArrayElements(data, d, JNI_ABORT);
-                return false;
-            }
-        } else {
-            __android_log_write(ANDROID_LOG_WARN, "LocalFilesystemSocket.send", "Could not get the current time, deadline will not work");
-        }
-        int ret = send(fd, current, bytes, MSG_NOSIGNAL);
-        if (ret == -1) {
-            __android_log_print(ANDROID_LOG_DEBUG, "LocalFilesystemSocket.send", "%s", strerror(errno));
-            env->ReleaseByteArrayElements(data, d, JNI_ABORT);
-            return false;
-        }
-        bytes -= ret;
-        current += ret;
-    }
-    env->ReleaseByteArrayElements(data, d, JNI_ABORT);
-    return true;
-}
-
-extern "C"
-JNIEXPORT jint JNICALL
-Java_com_termux_shared_shell_LocalFilesystemSocket_recv(JNIEnv *env, jclass clazz, jbyteArray data, jint fd, jlong deadline) {
-    if (fd == -1) {
-        return -1;
-    }
-    jbyte* d = env->GetByteArrayElements(data, nullptr);
-    if (d == nullptr) {
-        return -1;
-    }
-    struct timespec time = {};
-    jbyte* current = d;
-    int bytes = env->GetArrayLength(data);
-    int transferred = 0;
-    while (transferred < bytes) {
-        if (clock_gettime(CLOCK_REALTIME, &time) != -1) {
-            if (millisecondtime(&time) > deadline) {
-                env->ReleaseByteArrayElements(data, d, 0);
-                return -1;
-            }
-        } else {
-            __android_log_write(ANDROID_LOG_WARN, "LocalFilesystemSocket.recv", "Could not get the current time, deadline will not work");
-        }
-        int ret = read(fd, current, bytes);
-        if (ret == -1) {
-            env->ReleaseByteArrayElements(data, d, 0);
-            return -1;
-        }
-        // EOF, peer closed writing end
-        if (ret == 0) {
-            break;
-        }
-        transferred += ret;
-        current += ret;
-    }
-    env->ReleaseByteArrayElements(data, d, 0);
-    return transferred;
-}
-
-extern "C"
-JNIEXPORT void JNICALL
-Java_com_termux_shared_shell_LocalFilesystemSocket_settimeout(JNIEnv *env, jclass clazz, jint fd, jint timeout) {
-    settimeout(fd, timeout);
-}
-
-extern "C"
-JNIEXPORT jint JNICALL
-Java_com_termux_shared_shell_LocalFilesystemSocket_available(JNIEnv *env, jclass clazz, jint fd) {
-    int size = 0;
-    if (ioctl(fd, SIOCINQ, &size) == -1) {
-        return 0;
-    }
-    return size;
-}
-
-extern "C"
-JNIEXPORT jint JNICALL
-Java_com_termux_shared_shell_LocalFilesystemSocket_getpeeruid(JNIEnv *env, jclass clazz, jint fd) {
-    struct ucred cred = {};
-    cred.uid = 1; // initialize uid to 1 here because I'm paranoid and a failed getsockopt that somehow doesn't report as failed would report the uid of root
-    socklen_t len = sizeof(cred);
-    if (getsockopt(fd, SOL_SOCKET, SO_PEERCRED, &cred, &len) == -1) {
-        return -1;
-    }
-    return cred.uid;
-}
diff --git a/termux-shared/src/main/cpp/local-socket.cpp b/termux-shared/src/main/cpp/local-socket.cpp
new file mode 100644
index 0000000000..6457aca8af
--- /dev/null
+++ b/termux-shared/src/main/cpp/local-socket.cpp
@@ -0,0 +1,603 @@
+#include <cstdio>
+#include <ctime>
+#include <cerrno>
+#include <jni.h>
+#include <sstream>
+#include <string>
+#include <unistd.h>
+
+#include <android/log.h>
+
+#include <sys/ioctl.h>
+#include <sys/socket.h>
+#include <sys/types.h>
+#include <sys/un.h>
+
+#define LOG_TAG "local-socket"
+#define JNI_EXCEPTION "jni-exception"
+
+using namespace std;
+
+
+/* Convert a jstring to a std:string. */
+string jstring_to_stdstr(JNIEnv *env, jstring jString) {
+    jclass stringClass = env->FindClass("java/lang/String");
+    jmethodID getBytes = env->GetMethodID(stringClass, "getBytes", "()[B");
+    jbyteArray jStringBytesArray = (jbyteArray) env->CallObjectMethod(jString, getBytes);
+    jsize length = env->GetArrayLength(jStringBytesArray);
+    jbyte* jStringBytes = env->GetByteArrayElements(jStringBytesArray, nullptr);
+    std::string stdString((char *)jStringBytes, length);
+    env->ReleaseByteArrayElements(jStringBytesArray, jStringBytes, JNI_ABORT);
+    return stdString;
+}
+
+/* Get characters before first occurrence of the delim in a std:string. */
+string get_string_till_first_delim(string str, char delim) {
+    if (!str.empty()) {
+        stringstream cmdline_args(str);
+        string tmp;
+        if (getline(cmdline_args, tmp, delim))
+            return tmp;
+    }
+    return "";
+}
+
+/* Replace `\0` values with spaces in a std:string. */
+string replace_null_with_space(string str) {
+    if (str.empty())
+        return "";
+
+    stringstream tokens(str);
+    string tmp;
+    string str_spaced;
+    while (getline(tokens, tmp, '\0')){
+        str_spaced.append(" " + tmp);
+    }
+
+    if (!str_spaced.empty()) {
+        if (str_spaced.front() == ' ')
+            str_spaced.erase(0, 1);
+    }
+
+    return str_spaced;
+}
+
+/* Get class name of a jclazz object with a call to `Class.getName()`. */
+string get_class_name(JNIEnv *env, jclass clazz) {
+    jclass classClass = env->FindClass("java/lang/Class");
+    jmethodID getName = env->GetMethodID(classClass, "getName", "()Ljava/lang/String;");
+    jstring className = (jstring) env->CallObjectMethod(clazz, getName);
+    return jstring_to_stdstr(env, className);
+}
+
+
+
+/*
+ * Get /proc/[pid]/cmdline for a process with pid.
+ *
+ * https://manpages.debian.org/testing/manpages/proc.5.en.html
+ */
+string get_process_cmdline(const pid_t pid) {
+    string cmdline;
+    char buf[BUFSIZ];
+    size_t len;
+    char procfile[BUFSIZ];
+    sprintf(procfile, "/proc/%d/cmdline", pid);
+    FILE *fp = fopen(procfile, "rb");
+    if (fp) {
+        while ((len = fread(buf, 1, sizeof(buf), fp)) > 0) {
+            cmdline.append(buf, len);
+        }
+        fclose(fp);
+    }
+
+    return cmdline;
+}
+
+/* Extract process name from /proc/[pid]/cmdline value of a process. */
+string get_process_name_from_cmdline(string cmdline) {
+    return get_string_till_first_delim(cmdline, '\0');
+}
+
+/* Replace `\0` values with spaces in /proc/[pid]/cmdline value of a process. */
+string get_process_cmdline_spaced(string cmdline) {
+    return replace_null_with_space(cmdline);
+}
+
+
+/* Send an ERROR log message to android logcat. */
+void log_error(string message) {
+    __android_log_write(ANDROID_LOG_ERROR, LOG_TAG, message.c_str());
+}
+
+/* Send an WARN log message to android logcat. */
+void log_warn(string message) {
+    __android_log_write(ANDROID_LOG_WARN, LOG_TAG, message.c_str());
+}
+
+/* Get "title: message" formatted string. */
+string get_title_and_message(JNIEnv *env, jstring title, string message) {
+    if (title)
+        message = jstring_to_stdstr(env, title) + ": " + message;
+    return message;
+}
+
+
+/* Convert timespec to milliseconds. */
+int64_t timespec_to_milliseconds(const struct timespec* const time) {
+    return (((int64_t)time->tv_sec) * 1000) + (((int64_t)time->tv_nsec)/1000000);
+}
+
+/* Convert milliseconds to timeval. */
+timeval milliseconds_to_timeval(int milliseconds) {
+    struct timeval tv = {};
+    tv.tv_sec = milliseconds / 1000;
+    tv.tv_usec = (milliseconds % 1000) * 1000;
+    return tv;
+}
+
+
+// Note: Exceptions thrown from JNI must be caught with Throwable class instead of Exception,
+// otherwise exception will be sent to UncaughtExceptionHandler of the thread.
+// Android studio complains that getJniResult functions always return nullptr since linter is broken
+// for jboolean and jobject if comparisons.
+bool checkJniException(JNIEnv *env) {
+    if (env->ExceptionCheck()) {
+        jthrowable throwable = env->ExceptionOccurred();
+        if (throwable != NULL) {
+            env->ExceptionClear();
+            env->Throw(throwable);
+            return true;
+        }
+    }
+
+    return false;
+}
+
+string getJniResultString(const int retvalParam, const int errnoParam,
+                          string errmsgParam, const int intDataParam) {
+    return "retval=" + to_string(retvalParam) + ", errno=" + to_string(errnoParam) +
+           ", errmsg=\"" + errmsgParam + "\"" + ", intData=" + to_string(intDataParam);
+}
+
+/* Get "com/termux/shared/jni/models/JniResult" object that can be returned as result for a JNI call. */
+jobject getJniResult(JNIEnv *env, jstring title, const int retvalParam, const int errnoParam,
+                     string errmsgParam, const int intDataParam) {
+    jclass clazz = env->FindClass("com/termux/shared/jni/models/JniResult");
+    if (checkJniException(env)) return NULL;
+    if (!clazz) {
+        log_error(get_title_and_message(env, title,
+                                        "Failed to find JniResult class to create object for " +
+                                        getJniResultString(retvalParam, errnoParam, errmsgParam, intDataParam)));
+        return NULL;
+    }
+
+    jmethodID constructor = env->GetMethodID(clazz, "<init>", "(IILjava/lang/String;I)V");
+    if (checkJniException(env)) return NULL;
+    if (!constructor) {
+        log_error(get_title_and_message(env, title,
+                                        "Failed to get constructor for JniResult class to create object for " +
+                                        getJniResultString(retvalParam, errnoParam, errmsgParam, intDataParam)));
+        return NULL;
+    }
+
+    if (!errmsgParam.empty())
+        errmsgParam = get_title_and_message(env, title, string(errmsgParam));
+
+    jobject obj = env->NewObject(clazz, constructor, retvalParam, errnoParam, env->NewStringUTF(errmsgParam.c_str()), intDataParam);
+    if (checkJniException(env)) return NULL;
+    if (obj == NULL) {
+        log_error(get_title_and_message(env, title,
+                                        "Failed to get JniResult object for " +
+                                        getJniResultString(retvalParam, errnoParam, errmsgParam, intDataParam)));
+        return NULL;
+    }
+
+    return obj;
+}
+
+
+jobject getJniResult(JNIEnv *env, jstring title, const int retvalParam, const int errnoParam) {
+    return getJniResult(env, title, retvalParam, errnoParam, strerror(errnoParam), 0);
+}
+
+jobject getJniResult(JNIEnv *env, jstring title, const int retvalParam, string errmsgPrefixParam) {
+    return getJniResult(env, title, retvalParam, 0, errmsgPrefixParam, 0);
+}
+
+jobject getJniResult(JNIEnv *env, jstring title, const int retvalParam, const int errnoParam, string errmsgPrefixParam) {
+    return getJniResult(env, title, retvalParam, errnoParam, errmsgPrefixParam + ": " + string(strerror(errnoParam)), 0);
+}
+
+jobject getJniResult(JNIEnv *env, jstring title, const int intDataParam) {
+    return getJniResult(env, title, 0, 0, "", intDataParam);
+}
+
+jobject getJniResult(JNIEnv *env, jstring title) {
+    return getJniResult(env, title, 0, 0, "", 0);
+}
+
+
+/* Set int fieldName field for clazz to value. */
+string setIntField(JNIEnv *env, jobject obj, jclass clazz, const string fieldName, const int value) {
+    jfieldID field = env->GetFieldID(clazz, fieldName.c_str(), "I");
+    if (checkJniException(env)) return JNI_EXCEPTION;
+    if (!field) {
+        return "Failed to get int \"" + string(fieldName) + "\" field of \"" +
+               get_class_name(env, clazz) + "\" class to set value \"" + to_string(value) + "\"";
+    }
+
+    env->SetIntField(obj, field, value);
+    if (checkJniException(env)) return JNI_EXCEPTION;
+
+    return "";
+}
+
+/* Set String fieldName field for clazz to value. */
+string setStringField(JNIEnv *env, jobject obj, jclass clazz, const string fieldName, const string value) {
+    jfieldID field = env->GetFieldID(clazz, fieldName.c_str(), "Ljava/lang/String;");
+    if (checkJniException(env)) return JNI_EXCEPTION;
+    if (!field) {
+        return "Failed to get String \"" + string(fieldName) + "\" field of \"" +
+               get_class_name(env, clazz) + "\" class to set value \"" + value + "\"";
+    }
+
+    env->SetObjectField(obj, field, env->NewStringUTF(value.c_str()));
+    if (checkJniException(env)) return JNI_EXCEPTION;
+
+    return "";
+}
+
+
+
+extern "C"
+JNIEXPORT jobject JNICALL
+Java_com_termux_shared_net_socket_local_LocalSocketManager_createServerSocketNative(JNIEnv *env, jclass clazz,
+                                                                                    jstring logTitle,
+                                                                                    jbyteArray pathArray,
+                                                                                    jint backlog) {
+    if (backlog < 1 || backlog > 500) {
+        return getJniResult(env, logTitle, -1, "createServerSocketNative(): Backlog \"" +
+                                               to_string(backlog) + "\" is not between 1-500");
+    }
+
+    // Create server socket
+    int fd = socket(AF_UNIX, SOCK_STREAM, 0);
+    if (fd == -1) {
+        return getJniResult(env, logTitle, -1, errno, "createServerSocketNative(): Create local socket failed");
+    }
+
+    jbyte* path = env->GetByteArrayElements(pathArray, nullptr);
+    if (checkJniException(env)) return NULL;
+    if (path == nullptr) {
+        close(fd);
+        return getJniResult(env, logTitle, -1, "createServerSocketNative(): Path passed is null");
+    }
+
+    // On Linux, sun_path is 108 bytes (UNIX_PATH_MAX) in size
+    int chars = env->GetArrayLength(pathArray);
+    if (checkJniException(env)) return NULL;
+    if (chars >= 108 || chars >= sizeof(struct sockaddr_un) - sizeof(sa_family_t)) {
+        env->ReleaseByteArrayElements(pathArray, path, JNI_ABORT);
+        if (checkJniException(env)) return NULL;
+        close(fd);
+        return getJniResult(env, logTitle, -1, "createServerSocketNative(): Path passed is too long");
+    }
+
+    struct sockaddr_un adr = {.sun_family = AF_UNIX};
+    memcpy(&adr.sun_path, path, chars);
+
+    // Bind path to server socket
+    if (::bind(fd, reinterpret_cast<struct sockaddr*>(&adr), sizeof(adr)) == -1) {
+        int errnoBackup = errno;
+        env->ReleaseByteArrayElements(pathArray, path, JNI_ABORT);
+        if (checkJniException(env)) return NULL;
+        close(fd);
+        return getJniResult(env, logTitle, -1, errnoBackup,
+                            "createServerSocketNative(): Bind to local socket at path \"" + string(adr.sun_path) + "\" with fd " + to_string(fd) + " failed");
+    }
+
+    // Start listening for client sockets on server socket
+    if (listen(fd, backlog) == -1) {
+        int errnoBackup = errno;
+        env->ReleaseByteArrayElements(pathArray, path, JNI_ABORT);
+        if (checkJniException(env)) return NULL;
+        close(fd);
+        return getJniResult(env, logTitle, -1, errnoBackup,
+                            "createServerSocketNative(): Listen on local socket at path \"" + string(adr.sun_path) + "\" with fd " + to_string(fd) + " failed");
+    }
+
+    env->ReleaseByteArrayElements(pathArray, path, JNI_ABORT);
+    if (checkJniException(env)) return NULL;
+
+    // Return success and server socket fd in JniResult.intData field
+    return getJniResult(env, logTitle, fd);
+}
+
+extern "C"
+JNIEXPORT jobject JNICALL
+Java_com_termux_shared_net_socket_local_LocalSocketManager_closeSocketNative(JNIEnv *env, jclass clazz,
+                                                                             jstring logTitle, jint fd) {
+    if (fd < 0) {
+        return getJniResult(env, logTitle, -1, "closeSocketNative(): Invalid fd \"" + to_string(fd) + "\" passed");
+    }
+
+    if (close(fd) == -1) {
+        return getJniResult(env, logTitle, -1, errno, "closeSocketNative(): Failed to close socket fd " + to_string(fd));
+    }
+
+    // Return success
+    return getJniResult(env, logTitle);
+}
+
+extern "C"
+JNIEXPORT jobject JNICALL
+Java_com_termux_shared_net_socket_local_LocalSocketManager_acceptNative(JNIEnv *env, jclass clazz,
+                                                                        jstring logTitle, jint fd) {
+    if (fd < 0) {
+        return getJniResult(env, logTitle, -1, "acceptNative(): Invalid fd \"" + to_string(fd) + "\" passed");
+    }
+
+    // Accept client socket
+    int clientFd = accept(fd, nullptr, nullptr);
+    if (clientFd == -1) {
+        return getJniResult(env, logTitle, -1, errno, "acceptNative(): Failed to accept client on fd " + to_string(fd));
+    }
+
+    // Return success and client socket fd in JniResult.intData field
+    return getJniResult(env, logTitle, clientFd);
+}
+
+extern "C"
+JNIEXPORT jobject JNICALL
+Java_com_termux_shared_net_socket_local_LocalSocketManager_readNative(JNIEnv *env, jclass clazz,
+                                                                      jstring logTitle,
+                                                                      jint fd, jbyteArray dataArray,
+                                                                      jlong deadline) {
+    if (fd < 0) {
+        return getJniResult(env, logTitle, -1, "readNative(): Invalid fd \"" + to_string(fd) + "\" passed");
+    }
+
+    jbyte* data = env->GetByteArrayElements(dataArray, nullptr);
+    if (checkJniException(env)) return NULL;
+    if (data == nullptr) {
+        return getJniResult(env, logTitle, -1, "readNative(): data passed is null");
+    }
+
+    struct timespec time = {};
+    jbyte* current = data;
+    int bytes = env->GetArrayLength(dataArray);
+    if (checkJniException(env)) return NULL;
+    int bytesRead = 0;
+    while (bytesRead < bytes) {
+        if (deadline > 0) {
+            if (clock_gettime(CLOCK_REALTIME, &time) != -1) {
+                // If current time is greater than the time defined in deadline
+                if (timespec_to_milliseconds(&time) > deadline) {
+                    env->ReleaseByteArrayElements(dataArray, data, 0);
+                    if (checkJniException(env)) return NULL;
+                    return getJniResult(env, logTitle, -1,
+                                        "readNative(): Deadline \"" + to_string(deadline) + "\" timeout");
+                }
+            } else {
+                log_warn(get_title_and_message(env, logTitle,
+                                               "readNative(): Deadline \"" + to_string(deadline) +
+                                               "\" timeout will not work since failed to get current time"));
+            }
+        }
+
+        // Read data from socket
+        int ret = read(fd, current, bytes);
+        if (ret == -1) {
+            int errnoBackup = errno;
+            env->ReleaseByteArrayElements(dataArray, data, 0);
+            if (checkJniException(env)) return NULL;
+            return getJniResult(env, logTitle, -1, errnoBackup, "readNative(): Failed to read on fd "  + to_string(fd));
+        }
+        // EOF, peer closed writing end
+        if (ret == 0) {
+            break;
+        }
+
+        bytesRead += ret;
+        current += ret;
+    }
+
+    env->ReleaseByteArrayElements(dataArray, data, 0);
+    if (checkJniException(env)) return NULL;
+
+    // Return success and bytes read in JniResult.intData field
+    return getJniResult(env, logTitle, bytesRead);
+}
+
+
+extern "C"
+JNIEXPORT jobject JNICALL
+Java_com_termux_shared_net_socket_local_LocalSocketManager_sendNative(JNIEnv *env, jclass clazz,
+                                                                      jstring logTitle,
+                                                                      jint fd, jbyteArray dataArray,
+                                                                      jlong deadline) {
+    if (fd < 0) {
+        return getJniResult(env, logTitle, -1, "sendNative(): Invalid fd \"" + to_string(fd) + "\" passed");
+    }
+
+    jbyte* data = env->GetByteArrayElements(dataArray, nullptr);
+    if (checkJniException(env)) return NULL;
+    if (data == nullptr) {
+        return getJniResult(env, logTitle, -1, "sendNative(): data passed is null");
+    }
+
+    struct timespec time = {};
+    jbyte* current = data;
+    int bytes = env->GetArrayLength(dataArray);
+    if (checkJniException(env)) return NULL;
+    while (bytes > 0) {
+        if (deadline > 0) {
+            if (clock_gettime(CLOCK_REALTIME, &time) != -1) {
+                // If current time is greater than the time defined in deadline
+                if (timespec_to_milliseconds(&time) > deadline) {
+                    env->ReleaseByteArrayElements(dataArray, data, JNI_ABORT);
+                    if (checkJniException(env)) return NULL;
+                    return getJniResult(env, logTitle, -1,
+                                        "sendNative(): Deadline \"" + to_string(deadline) + "\" timeout");
+                }
+            } else {
+                log_warn(get_title_and_message(env, logTitle,
+                                               "sendNative(): Deadline \"" + to_string(deadline) +
+                                               "\" timeout will not work since failed to get current time"));
+            }
+        }
+
+        // Send data to socket
+        int ret = send(fd, current, bytes, MSG_NOSIGNAL);
+        if (ret == -1) {
+            int errnoBackup = errno;
+            env->ReleaseByteArrayElements(dataArray, data, JNI_ABORT);
+            if (checkJniException(env)) return NULL;
+            return getJniResult(env, logTitle, -1, errnoBackup, "sendNative(): Failed to send on fd " + to_string(fd));
+        }
+
+        bytes -= ret;
+        current += ret;
+    }
+
+    env->ReleaseByteArrayElements(dataArray, data, JNI_ABORT);
+    if (checkJniException(env)) return NULL;
+
+    // Return success
+    return getJniResult(env, logTitle);
+}
+
+extern "C"
+JNIEXPORT jobject JNICALL
+Java_com_termux_shared_net_socket_local_LocalSocketManager_availableNative(JNIEnv *env, jclass clazz,
+                                                                           jstring logTitle, jint fd) {
+    if (fd < 0) {
+        return getJniResult(env, logTitle, -1, "availableNative(): Invalid fd \"" + to_string(fd) + "\" passed");
+    }
+
+    int available = 0;
+    if (ioctl(fd, SIOCINQ, &available) == -1) {
+        return getJniResult(env, logTitle, -1, errno,
+                            "availableNative(): Failed to get number of unread bytes in the receive buffer of fd " + to_string(fd));
+    }
+
+    // Return success and bytes available in JniResult.intData field
+    return getJniResult(env, logTitle, available);
+}
+
+/* Sets socket option timeout in milliseconds. */
+int set_socket_timeout(int fd, int option, int timeout) {
+    struct timeval tv = milliseconds_to_timeval(timeout);
+    socklen_t len = sizeof(tv);
+    return setsockopt(fd, SOL_SOCKET, option, &tv, len);
+}
+
+extern "C"
+JNIEXPORT jobject JNICALL
+Java_com_termux_shared_net_socket_local_LocalSocketManager_setSocketReadTimeoutNative(JNIEnv *env, jclass clazz,
+                                                                                      jstring logTitle,
+                                                                                      jint fd, jint timeout) {
+    if (fd < 0) {
+        return getJniResult(env, logTitle, -1, "setSocketReadTimeoutNative(): Invalid fd \"" + to_string(fd) + "\" passed");
+    }
+
+    if (set_socket_timeout(fd, SO_RCVTIMEO, timeout) == -1) {
+        return getJniResult(env, logTitle, -1, errno,
+                            "setSocketReadTimeoutNative(): Failed to set socket receiving (SO_RCVTIMEO) timeout for fd " + to_string(fd));
+    }
+
+    // Return success
+    return getJniResult(env, logTitle);
+}
+
+extern "C"
+JNIEXPORT jobject JNICALL
+Java_com_termux_shared_net_socket_local_LocalSocketManager_setSocketSendTimeoutNative(JNIEnv *env, jclass clazz,
+                                                                                      jstring logTitle,
+                                                                                      jint fd, jint timeout) {
+    if (fd < 0) {
+        return getJniResult(env, logTitle, -1, "setSocketSendTimeoutNative(): Invalid fd \"" +
+                                               to_string(fd) + "\" passed");
+    }
+
+    if (set_socket_timeout(fd, SO_SNDTIMEO, timeout) == -1) {
+        return getJniResult(env, logTitle, -1, errno,
+                            "setSocketSendTimeoutNative(): Failed to set socket sending (SO_SNDTIMEO) timeout for fd " + to_string(fd));
+    }
+
+    // Return success
+    return getJniResult(env, logTitle);
+}
+
+extern "C"
+JNIEXPORT jobject JNICALL
+Java_com_termux_shared_net_socket_local_LocalSocketManager_getPeerCredNative(JNIEnv *env, jclass clazz,
+                                                                             jstring logTitle,
+                                                                             jint fd, jobject peerCred) {
+    if (fd < 0) {
+        return getJniResult(env, logTitle, -1, "getPeerCredNative(): Invalid fd \"" + to_string(fd) + "\" passed");
+    }
+
+    if (peerCred == nullptr) {
+        return getJniResult(env, logTitle, -1, "getPeerCredNative(): peerCred passed is null");
+    }
+
+    // Initialize to -1 instead of 0 in case a failed getsockopt() call somehow doesn't report failure and returns the uid of root
+    struct ucred cred = {};
+    cred.pid = -1; cred.uid = -1; cred.gid = -1;
+
+    socklen_t len = sizeof(cred);
+
+    if (getsockopt(fd, SOL_SOCKET, SO_PEERCRED, &cred, &len) == -1) {
+        return getJniResult(env, logTitle, -1, errno, "getPeerCredNative(): Failed to get peer credentials for fd " + to_string(fd));
+    }
+
+    // Fill "com.termux.shared.net.socket.local.PeerCred" object.
+    // The pid, uid and gid will always be set based on ucred.
+    // The pname and cmdline will only be set if current process has access to "/proc/[pid]/cmdline"
+    // of peer process. Processes of other users/apps are not normally accessible.
+    jclass peerCredClazz = env->GetObjectClass(peerCred);
+    if (checkJniException(env)) return NULL;
+    if (!peerCredClazz) {
+        return getJniResult(env, logTitle, -1, errno, "getPeerCredNative(): Failed to get PeerCred class");
+    }
+
+    string error;
+
+    error = setIntField(env, peerCred, peerCredClazz, "pid", cred.pid);
+    if (!error.empty()) {
+        if (error == JNI_EXCEPTION) return NULL;
+        return getJniResult(env, logTitle, -1, "getPeerCredNative(): " + error);
+    }
+
+    error = setIntField(env, peerCred, peerCredClazz, "uid", cred.uid);
+    if (!error.empty()) {
+        if (error == JNI_EXCEPTION) return NULL;
+        return getJniResult(env, logTitle, -1, "getPeerCredNative(): " + error);
+    }
+
+    error = setIntField(env, peerCred, peerCredClazz, "gid", cred.gid);
+    if (!error.empty()) {
+        if (error == JNI_EXCEPTION) return NULL;
+        return getJniResult(env, logTitle, -1, "getPeerCredNative(): " + error);
+    }
+
+    string cmdline = get_process_cmdline(cred.pid);
+    if (!cmdline.empty()) {
+        error = setStringField(env, peerCred, peerCredClazz, "pname", get_process_name_from_cmdline(cmdline));
+        if (!error.empty()) {
+            if (error == JNI_EXCEPTION) return NULL;
+            return getJniResult(env, logTitle, -1, "getPeerCredNative(): " + error);
+        }
+
+        error = setStringField(env, peerCred, peerCredClazz, "cmdline", get_process_cmdline_spaced(cmdline));
+        if (!error.empty()) {
+            if (error == JNI_EXCEPTION) return NULL;
+            return getJniResult(env, logTitle, -1, "getPeerCredNative(): " + error);
+        }
+    }
+
+    // Return success since PeerCred was filled successfully
+    return getJniResult(env, logTitle);
+}
diff --git a/termux-shared/src/main/java/com/termux/shared/jni/models/JniResult.java b/termux-shared/src/main/java/com/termux/shared/jni/models/JniResult.java
new file mode 100644
index 0000000000..34c38a8feb
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/jni/models/JniResult.java
@@ -0,0 +1,107 @@
+package com.termux.shared.jni.models;
+
+import androidx.annotation.NonNull;
+
+import com.termux.shared.logger.Logger;
+
+/**
+ * A class that can be used to return result for JNI calls with support for multiple fields to easily
+ * return success and error states.
+ *
+ * https://docs.oracle.com/javase/7/docs/technotes/guides/jni/spec/functions.html
+ * https://developer.android.com/training/articles/perf-jni
+ */
+public class JniResult {
+
+    /**
+     * The return value for the JNI call.
+     * This should be 0 for success.
+     */
+    public int retval;
+
+    /**
+     * The errno value for any failed native system or library calls if {@link #retval} does not equal 0.
+     * This should be 0 if no errno was set.
+     *
+     * https://manpages.debian.org/testing/manpages-dev/errno.3.en.html
+     */
+    public int errno;
+
+    /**
+     * The error message for the failure if {@link #retval} does not equal 0.
+     * The message will contain errno message returned by strerror() if errno was set.
+     *
+     * https://manpages.debian.org/testing/manpages-dev/strerror.3.en.html
+     */
+    public String errmsg;
+
+    /**
+     * Optional additional int data that needs to be returned by JNI call, like bytes read on success.
+     */
+    public int intData;
+
+    /**
+     * Create an new instance of {@link JniResult}.
+     *
+     * @param retval The {@link #retval} value.
+     * @param errno The {@link #errno} value.
+     * @param errmsg The {@link #errmsg} value.
+     */
+    public JniResult(int retval, int errno, String errmsg) {
+        this.retval = retval;
+        this.errno = errno;
+        this.errmsg = errmsg;
+    }
+
+    /**
+     * Create an new instance of {@link JniResult}.
+     *
+     * @param retval The {@link #retval} value.
+     * @param errno The {@link #errno} value.
+     * @param errmsg The {@link #errmsg} value.
+     * @param intData The {@link #intData} value.
+     */
+    public JniResult(int retval, int errno, String errmsg, int intData) {
+        this(retval, errno, errmsg);
+        this.intData = intData;
+    }
+
+    /**
+     * Create an new instance of {@link JniResult} from a {@link Throwable} with {@link #retval} -1.
+     *
+     * @param message The error message.
+     * @param throwable The {@link Throwable} value.
+     */
+    public JniResult(String message, Throwable throwable) {
+        this(-1, 0, Logger.getMessageAndStackTraceString(message, throwable));
+    }
+
+    /**
+     * Get error {@link String} for {@link JniResult}.
+     *
+     * @param result The {@link JniResult} to get error from.
+     * @return Returns the error {@link String}.
+     */
+    @NonNull
+    public static String getErrorString(final JniResult result) {
+        if (result == null) return "null";
+        return result.getErrorString();
+    }
+
+    /** Get error {@link String} for {@link JniResult}. */
+    @NonNull
+    public String getErrorString() {
+        StringBuilder logString = new StringBuilder();
+
+        logString.append(Logger.getSingleLineLogStringEntry("Retval", retval, "-"));
+
+        if (errno != 0)
+            logString.append("\n").append(Logger.getSingleLineLogStringEntry("Errno", errno, "-"));
+
+        if (errmsg != null && !errmsg.isEmpty())
+            logString.append("\n").append(Logger.getMultiLineLogStringEntry("Errmsg", errmsg, "-"));
+
+        return logString.toString();
+    }
+
+}
diff --git a/termux-shared/src/main/java/com/termux/shared/net/socket/local/ILocalSocketManager.java b/termux-shared/src/main/java/com/termux/shared/net/socket/local/ILocalSocketManager.java
new file mode 100644
index 0000000000..a520254ed1
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/net/socket/local/ILocalSocketManager.java
@@ -0,0 +1,72 @@
+package com.termux.shared.net.socket.local;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.termux.shared.errors.Error;
+
+/**
+ * The interface for the {@link LocalSocketManager} for callbacks to manager client/server starter.
+ */
+public interface ILocalSocketManager {
+
+    /**
+     * This should return the {@link Thread.UncaughtExceptionHandler} that should be used for the
+     * client socket listener and client logic runner threads started for other interface methods.
+     *
+     * @param localSocketManager The {@link LocalSocketManager} for the server.
+     * @return Should return {@link Thread.UncaughtExceptionHandler} or {@code null}, if default
+     * handler should be used which just logs the exception.
+     */
+    @Nullable
+    Thread.UncaughtExceptionHandler getLocalSocketManagerClientThreadUEH(
+        @NonNull LocalSocketManager localSocketManager);
+
+    /**
+     * This is called if any error is raised by {@link LocalSocketManager}, {@link LocalServerSocket}
+     * or {@link LocalClientSocket}. The server will automatically close the client socket
+     * with a call to {@link LocalClientSocket#closeClientSocket(boolean)} if the error occurred due
+     * to the client.
+     *
+     * The {@link LocalClientSocket#getPeerCred()} can be used to get the {@link PeerCred} object
+     * containing info for the connected client/peer.
+     *
+     * @param localSocketManager The {@link LocalSocketManager} for the server.
+     * @param clientSocket The {@link LocalClientSocket} that connected. This will be {@code null}
+     *                     if error is not for a {@link LocalClientSocket}.
+     * @param error The {@link Error} auto generated that can be used for logging purposes.
+     */
+    void onError(@NonNull LocalSocketManager localSocketManager,
+                 @Nullable LocalClientSocket clientSocket, @NonNull Error error);
+
+    /**
+     * This is called if a {@link LocalServerSocket} connects to the server which **does not** have
+     * the server app's user id or root user id. The server will automatically close the client socket
+     * with a call to {@link LocalClientSocket#closeClientSocket(boolean)}.
+     *
+     * The {@link LocalClientSocket#getPeerCred()} can be used to get the {@link PeerCred} object
+     * containing info for the connected client/peer.
+     *
+     * @param localSocketManager The {@link LocalSocketManager} for the server.
+     * @param clientSocket The {@link LocalClientSocket} that connected.
+     * @param error The {@link Error} auto generated that can be used for logging purposes.
+     */
+    void onDisallowedClientConnected(@NonNull LocalSocketManager localSocketManager,
+                 @NonNull LocalClientSocket clientSocket, @NonNull Error error);
+
+    /**
+     * This is called if a {@link LocalServerSocket} connects to the server which has the
+     * the server app's user id or root user id. It is the responsibility of the interface
+     * implementation to close the client socket with a call to
+     * {@link LocalClientSocket#closeClientSocket(boolean)} once its done processing.
+     *
+     * The {@link LocalClientSocket#getPeerCred()} can be used to get the {@link PeerCred} object
+     * containing info for the connected client/peer.
+     *
+     * @param localSocketManager The {@link LocalSocketManager} for the server.
+     * @param clientSocket The {@link LocalClientSocket} that connected.
+     */
+    void onClientAccepted(@NonNull LocalSocketManager localSocketManager,
+                          @NonNull LocalClientSocket clientSocket);
+
+}
diff --git a/termux-shared/src/main/java/com/termux/shared/net/socket/local/LocalClientSocket.java b/termux-shared/src/main/java/com/termux/shared/net/socket/local/LocalClientSocket.java
new file mode 100644
index 0000000000..75a7e6a8c3
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/net/socket/local/LocalClientSocket.java
@@ -0,0 +1,483 @@
+package com.termux.shared.net.socket.local;
+
+import androidx.annotation.NonNull;
+
+import com.termux.shared.data.DataUtils;
+import com.termux.shared.errors.Error;
+import com.termux.shared.jni.models.JniResult;
+import com.termux.shared.logger.Logger;
+import com.termux.shared.markdown.MarkdownUtils;
+
+import java.io.BufferedWriter;
+import java.io.Closeable;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+
+/** The client socket for {@link LocalSocketManager}. */
+public class LocalClientSocket implements Closeable {
+
+    public static final String LOG_TAG = "LocalClientSocket";
+
+    /** The {@link LocalSocketManager} instance for the local socket. */
+    @NonNull protected final LocalSocketManager mLocalSocketManager;
+
+    /** The {@link LocalSocketRunConfig} containing run config for the {@link LocalClientSocket}. */
+    @NonNull protected final LocalSocketRunConfig mLocalSocketRunConfig;
+
+    /**
+     * The {@link LocalClientSocket} file descriptor.
+     * Value will be `>= 0` if socket has been connected and `-1` if closed.
+     */
+    protected int mFD;
+
+    /** The creation time of {@link LocalClientSocket}. This is also used for deadline. */
+    protected final long mCreationTime;
+
+    /** The {@link PeerCred} of the {@link LocalClientSocket} containing info of client/peer. */
+    @NonNull protected final PeerCred mPeerCred;
+
+    /** The {@link OutputStream} implementation for the {@link LocalClientSocket}. */
+    @NonNull protected final SocketOutputStream mOutputStream;
+
+    /** The {@link InputStream} implementation for the {@link LocalClientSocket}. */
+    @NonNull protected final SocketInputStream mInputStream;
+
+    /**
+     * Create an new instance of {@link LocalClientSocket}.
+     *
+     * @param localSocketManager The {@link #mLocalSocketManager} value.
+     * @param fd The {@link #mFD} value.
+     * @param peerCred The {@link #mPeerCred} value.
+     */
+    LocalClientSocket(@NonNull LocalSocketManager localSocketManager, int fd, @NonNull PeerCred peerCred) {
+        mLocalSocketManager = localSocketManager;
+        mLocalSocketRunConfig = localSocketManager.getLocalSocketRunConfig();
+        mCreationTime = System.currentTimeMillis();
+        mOutputStream = new SocketOutputStream();
+        mInputStream = new SocketInputStream();
+        mPeerCred = peerCred;
+
+        setFD(fd);
+        mPeerCred.fillPeerCred(localSocketManager.getContext());
+    }
+
+
+    /** Close client socket. */
+    public synchronized Error closeClientSocket(boolean logErrorMessage) {
+        try {
+            close();
+        } catch (IOException e) {
+            Error error = LocalSocketErrno.ERRNO_CLOSE_CLIENT_SOCKET_FAILED_WITH_EXCEPTION.getError(e, mLocalSocketRunConfig.getTitle(), e.getMessage());
+            if (logErrorMessage)
+                Logger.logErrorExtended(LOG_TAG, error.getErrorLogString());
+            return error;
+        }
+
+        return null;
+    }
+
+    /** Close client socket that exists at fd. */
+    public static void closeClientSocket(@NonNull LocalSocketManager localSocketManager, int fd) {
+        new LocalClientSocket(localSocketManager, fd, new PeerCred()).closeClientSocket(true);
+    }
+
+    /** Implementation for {@link Closeable#close()} to close client socket. */
+    @Override
+    public void close() throws IOException {
+        if (mFD >= 0) {
+            Logger.logVerbose(LOG_TAG, "Client socket close for \"" + mLocalSocketRunConfig.getTitle() + "\" server: " + getPeerCred().getMinimalString());
+            JniResult result = LocalSocketManager.closeSocket(mLocalSocketRunConfig.getLogTitle() + " (client)", mFD);
+            if (result == null || result.retval != 0) {
+                throw new IOException(JniResult.getErrorString(result));
+            }
+            // Update fd to signify that client socket has been closed
+            setFD(-1);
+        }
+    }
+
+
+    /**
+     * Attempts to read up to data buffer length bytes from file descriptor into the data buffer.
+     * On success, the number of bytes read is returned (zero indicates end of file) in bytesRead.
+     * It is not an error if bytesRead is smaller than the number of bytes requested; this may happen
+     * for example because fewer bytes are actually available right now (maybe because we were close
+     * to end-of-file, or because we are reading from a pipe), or because read() was interrupted by
+     * a signal.
+     *
+     * If while reading the {@link #mCreationTime} + the milliseconds returned by
+     * {@link LocalSocketRunConfig#getDeadline()} elapses but all the data has not been read, an
+     * error would be returned.
+     *
+     * This is a wrapper for {@link LocalSocketManager#read(String, int, byte[], long)}, which can
+     * be called instead if you want to get access to errno int value instead of {@link JniResult}
+     * error {@link String}.
+     *
+     * @param data The data buffer to read bytes into.
+     * @param bytesRead The actual bytes read.
+     * @return Returns the {@code error} if reading was not successful containing {@link JniResult}
+     * error {@link String}, otherwise {@code null}.
+     */
+    public Error read(@NonNull byte[] data, MutableInt bytesRead) {
+        bytesRead.value = 0;
+
+        if (mFD < 0) {
+            return LocalSocketErrno.ERRNO_USING_CLIENT_SOCKET_WITH_INVALID_FD.getError(mFD,
+                mLocalSocketRunConfig.getTitle());
+        }
+
+        JniResult result = LocalSocketManager.read(mLocalSocketRunConfig.getLogTitle() + " (client)",
+            mFD, data,
+            mLocalSocketRunConfig.getDeadline() > 0 ? mCreationTime + mLocalSocketRunConfig.getDeadline() : 0);
+        if (result == null || result.retval != 0) {
+            return LocalSocketErrno.ERRNO_READ_DATA_FROM_CLIENT_SOCKET_FAILED.getError(
+                mLocalSocketRunConfig.getTitle(), JniResult.getErrorString(result));
+        }
+
+        bytesRead.value = result.intData;
+        return null;
+    }
+
+    /**
+     * Attempts to send data buffer to the file descriptor.
+     *
+     * If while sending the {@link #mCreationTime} + the milliseconds returned by
+     * {@link LocalSocketRunConfig#getDeadline()} elapses but all the data has not been sent, an
+     * error would be returned.
+     *
+     * This is a wrapper for {@link LocalSocketManager#send(String, int, byte[], long)}, which can
+     * be called instead if you want to get access to errno int value instead of {@link JniResult}
+     * error {@link String}.
+     *
+     * @param data The data buffer containing bytes to send.
+     * @return Returns the {@code error} if sending was not successful containing {@link JniResult}
+     * error {@link String}, otherwise {@code null}.
+     */
+    public Error send(@NonNull byte[] data) {
+        if (mFD < 0) {
+            return LocalSocketErrno.ERRNO_USING_CLIENT_SOCKET_WITH_INVALID_FD.getError(mFD,
+                mLocalSocketRunConfig.getTitle());
+        }
+
+        JniResult result = LocalSocketManager.send(mLocalSocketRunConfig.getLogTitle() + " (client)",
+            mFD, data,
+            mLocalSocketRunConfig.getDeadline() > 0 ? mCreationTime + mLocalSocketRunConfig.getDeadline() : 0);
+        if (result == null || result.retval != 0) {
+            return LocalSocketErrno.ERRNO_SEND_DATA_TO_CLIENT_SOCKET_FAILED.getError(
+                mLocalSocketRunConfig.getTitle(), JniResult.getErrorString(result));
+        }
+
+        return null;
+    }
+
+    /**
+     * Attempts to read all the bytes available on {@link SocketInputStream} and appends them to
+     * {@code data} {@link StringBuilder}.
+     *
+     * This is a wrapper for {@link #read(byte[], MutableInt)} called via {@link SocketInputStream#read()}.
+     *
+     * @param data The data {@link StringBuilder} to append the bytes read into.
+     * @param closeStreamOnFinish If set to {@code true}, then underlying input stream will closed
+     *                            and further attempts to read from socket will fail.
+     * @return Returns the {@code error} if reading was not successful containing {@link JniResult}
+     * error {@link String}, otherwise {@code null}.
+     */
+    public Error readDataOnInputStream(@NonNull StringBuilder data, boolean closeStreamOnFinish) {
+        int c;
+        InputStreamReader inputStreamReader = getInputStreamReader();
+        try {
+            while ((c = inputStreamReader.read()) > 0) {
+                data.append((char) c);
+            }
+        } catch (IOException e) {
+            // The SocketInputStream.read() throws the Error message in an IOException,
+            // so just read the exception message and not the stack trace, otherwise it would result
+            // in a messy nested error message.
+            return LocalSocketErrno.ERRNO_READ_DATA_FROM_INPUT_STREAM_OF_CLIENT_SOCKET_FAILED_WITH_EXCEPTION.getError(
+                mLocalSocketRunConfig.getTitle(), DataUtils.getSpaceIndentedString(e.getMessage(), 1));
+        } catch (Exception e) {
+            return LocalSocketErrno.ERRNO_READ_DATA_FROM_INPUT_STREAM_OF_CLIENT_SOCKET_FAILED_WITH_EXCEPTION.getError(
+                e, mLocalSocketRunConfig.getTitle(), e.getMessage());
+        } finally {
+            if (closeStreamOnFinish) {
+                try { inputStreamReader.close();
+                } catch (IOException e) {
+                    // Ignore
+                }
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Attempts to send all the bytes passed to {@link SocketOutputStream} .
+     *
+     * This is a wrapper for {@link #send(byte[])} called via {@link SocketOutputStream#write(int)}.
+     *
+     * @param data The {@link String} bytes to send.
+     * @param closeStreamOnFinish If set to {@code true}, then underlying output stream will closed
+     *                            and further attempts to send to socket will fail.
+     * @return Returns the {@code error} if sending was not successful containing {@link JniResult}
+     * error {@link String}, otherwise {@code null}.
+     */
+    public Error sendDataToOutputStream(@NonNull String data, boolean closeStreamOnFinish) {
+
+        OutputStreamWriter outputStreamWriter = getOutputStreamWriter();
+
+        try (BufferedWriter byteStreamWriter = new BufferedWriter(outputStreamWriter)) {
+            byteStreamWriter.write(data);
+            byteStreamWriter.flush();
+        } catch (IOException e) {
+            // The SocketOutputStream.write() throws the Error message in an IOException,
+            // so just read the exception message and not the stack trace, otherwise it would result
+            // in a messy nested error message.
+            return LocalSocketErrno.ERRNO_SEND_DATA_TO_OUTPUT_STREAM_OF_CLIENT_SOCKET_FAILED_WITH_EXCEPTION.getError(
+                mLocalSocketRunConfig.getTitle(), DataUtils.getSpaceIndentedString(e.getMessage(), 1));
+        } catch (Exception e) {
+            return LocalSocketErrno.ERRNO_SEND_DATA_TO_OUTPUT_STREAM_OF_CLIENT_SOCKET_FAILED_WITH_EXCEPTION.getError(
+                e, mLocalSocketRunConfig.getTitle(), e.getMessage());
+        } finally {
+            if (closeStreamOnFinish) {
+                try {
+                    outputStreamWriter.close();
+                } catch (IOException e) {
+                    // Ignore
+                }
+            }
+        }
+
+        return null;
+    }
+
+    /** Wrapper for {@link #available(MutableInt, boolean)} that checks deadline. The
+     * {@link SocketInputStream} calls this. */
+    public Error available(MutableInt available) {
+        return available(available, true);
+    }
+
+    /**
+     * Get available bytes on {@link #mInputStream} and optionally check if value returned by
+     * {@link LocalSocketRunConfig#getDeadline()} has passed.
+     */
+    public Error available(MutableInt available, boolean checkDeadline) {
+        available.value = 0;
+
+        if (mFD < 0) {
+            return LocalSocketErrno.ERRNO_USING_CLIENT_SOCKET_WITH_INVALID_FD.getError(mFD,
+                mLocalSocketRunConfig.getTitle());
+        }
+
+        if (checkDeadline && mLocalSocketRunConfig.getDeadline() > 0 && System.currentTimeMillis() > (mCreationTime + mLocalSocketRunConfig.getDeadline())) {
+            return null;
+        }
+
+        JniResult result = LocalSocketManager.available(mLocalSocketRunConfig.getLogTitle() + " (client)", mLocalSocketRunConfig.getFD());
+        if (result == null || result.retval != 0) {
+            return LocalSocketErrno.ERRNO_CHECK_AVAILABLE_DATA_ON_CLIENT_SOCKET_FAILED.getError(
+                mLocalSocketRunConfig.getTitle(), JniResult.getErrorString(result));
+        }
+
+        available.value = result.intData;
+        return null;
+    }
+
+
+
+    /** Set {@link LocalClientSocket} receiving (SO_RCVTIMEO) timeout to value returned by {@link LocalSocketRunConfig#getReceiveTimeout()}. */
+    public Error setReadTimeout() {
+        if (mFD >= 0) {
+            JniResult result = LocalSocketManager.setSocketReadTimeout(mLocalSocketRunConfig.getLogTitle() + " (client)",
+                mFD, mLocalSocketRunConfig.getReceiveTimeout());
+            if (result == null || result.retval != 0) {
+                return LocalSocketErrno.ERRNO_SET_CLIENT_SOCKET_READ_TIMEOUT_FAILED.getError(
+                    mLocalSocketRunConfig.getTitle(), mLocalSocketRunConfig.getReceiveTimeout(), JniResult.getErrorString(result));
+            }
+        }
+        return null;
+    }
+
+    /** Set {@link LocalClientSocket} sending (SO_SNDTIMEO) timeout to value returned by {@link LocalSocketRunConfig#getSendTimeout()}. */
+    public Error setWriteTimeout() {
+        if (mFD >= 0) {
+            JniResult result = LocalSocketManager.setSocketSendTimeout(mLocalSocketRunConfig.getLogTitle() + " (client)",
+                mFD, mLocalSocketRunConfig.getSendTimeout());
+            if (result == null || result.retval != 0) {
+                return LocalSocketErrno.ERRNO_SET_CLIENT_SOCKET_SEND_TIMEOUT_FAILED.getError(
+                    mLocalSocketRunConfig.getTitle(), mLocalSocketRunConfig.getSendTimeout(), JniResult.getErrorString(result));
+            }
+        }
+        return null;
+    }
+
+
+
+    /** Get {@link #mFD} for the client socket. */
+    public int getFD() {
+        return mFD;
+    }
+
+    /** Set {@link #mFD}. Value must be greater than 0 or -1. */
+    private void setFD(int fd) {
+        if (fd >= 0)
+            mFD = fd;
+        else
+            mFD = -1;
+    }
+
+    /** Get {@link #mPeerCred} for the client socket. */
+    public PeerCred getPeerCred() {
+        return mPeerCred;
+    }
+
+    /** Get {@link #mCreationTime} for the client socket. */
+    public long getCreationTime() {
+        return mCreationTime;
+    }
+
+    /** Get {@link #mOutputStream} for the client socket. The stream will automatically close when client socket is closed. */
+    public OutputStream getOutputStream() {
+        return mOutputStream;
+    }
+
+    /** Get {@link OutputStreamWriter} for {@link #mOutputStream} for the client socket. The stream will automatically close when client socket is closed. */
+    @NonNull
+    public OutputStreamWriter getOutputStreamWriter() {
+        return new OutputStreamWriter(getOutputStream());
+    }
+
+    /** Get {@link #mInputStream} for the client socket. The stream will automatically close when client socket is closed. */
+    public InputStream getInputStream() {
+        return mInputStream;
+    }
+
+    /** Get {@link InputStreamReader} for {@link #mInputStream} for the client socket. The stream will automatically close when client socket is closed. */
+    @NonNull
+    public InputStreamReader getInputStreamReader() {
+        return new InputStreamReader(getInputStream());
+    }
+
+
+
+    /** Get a log {@link String} for the {@link LocalClientSocket}. */
+    @NonNull
+    public String getLogString() {
+        StringBuilder logString = new StringBuilder();
+
+        logString.append("Client Socket:");
+        logString.append("\n").append(Logger.getSingleLineLogStringEntry("FD", mFD, "-"));
+        logString.append("\n").append(Logger.getSingleLineLogStringEntry("Creation Time", mCreationTime, "-"));
+        logString.append("\n\n\n");
+
+        logString.append(mPeerCred.getLogString());
+
+        return logString.toString();
+    }
+
+    /** Get a markdown {@link String} for the {@link LocalClientSocket}. */
+    @NonNull
+    public String getMarkdownString() {
+        StringBuilder markdownString = new StringBuilder();
+
+        markdownString.append("## ").append("Client Socket");
+        markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("FD", mFD, "-"));
+        markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Creation Time", mCreationTime, "-"));
+        markdownString.append("\n\n\n");
+
+        markdownString.append(mPeerCred.getMarkdownString());
+
+        return markdownString.toString();
+    }
+
+
+
+
+
+    /** Wrapper class to allow pass by reference of int values. */
+    public static final class MutableInt {
+        public int value;
+
+        public MutableInt(int value) {
+            this.value = value;
+        }
+    }
+
+
+
+    /** The {@link InputStream} implementation for the {@link LocalClientSocket}. */
+    protected class SocketInputStream extends InputStream {
+        private final byte[] mBytes = new byte[1];
+
+        @Override
+        public int read() throws IOException {
+            MutableInt bytesRead = new MutableInt(0);
+            Error error = LocalClientSocket.this.read(mBytes, bytesRead);
+            if (error != null) {
+                throw new IOException(error.getErrorMarkdownString());
+            }
+
+            if (bytesRead.value == 0) {
+                return -1;
+            }
+
+            return mBytes[0];
+        }
+
+        @Override
+        public int read(byte[] bytes) throws IOException {
+            if (bytes == null) {
+                throw new NullPointerException("Read buffer can't be null");
+            }
+
+            MutableInt bytesRead = new MutableInt(0);
+            Error error = LocalClientSocket.this.read(bytes, bytesRead);
+            if (error != null) {
+                throw new IOException(error.getErrorMarkdownString());
+            }
+
+            if (bytesRead.value == 0) {
+                return -1;
+            }
+
+            return bytesRead.value;
+        }
+
+        @Override
+        public int available() throws IOException {
+            MutableInt available = new MutableInt(0);
+            Error error = LocalClientSocket.this.available(available);
+            if (error != null) {
+                throw new IOException(error.getErrorMarkdownString());
+            }
+            return available.value;
+        }
+    }
+
+
+
+    /** The {@link OutputStream} implementation for the {@link LocalClientSocket}. */
+    protected class SocketOutputStream extends OutputStream {
+        private final byte[] mBytes = new byte[1];
+
+        @Override
+        public void write(int b) throws IOException {
+            mBytes[0] = (byte) b;
+
+            Error error = LocalClientSocket.this.send(mBytes);
+            if (error != null) {
+                throw new IOException(error.getErrorMarkdownString());
+            }
+        }
+
+        @Override
+        public void write(byte[] bytes) throws IOException {
+            Error error = LocalClientSocket.this.send(bytes);
+            if (error != null) {
+                throw new IOException(error.getErrorMarkdownString());
+            }
+        }
+    }
+
+}
diff --git a/termux-shared/src/main/java/com/termux/shared/net/socket/local/LocalServerSocket.java b/termux-shared/src/main/java/com/termux/shared/net/socket/local/LocalServerSocket.java
new file mode 100644
index 0000000000..385c203465
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/net/socket/local/LocalServerSocket.java
@@ -0,0 +1,303 @@
+package com.termux.shared.net.socket.local;
+
+import androidx.annotation.NonNull;
+
+import com.termux.shared.errors.Error;
+import com.termux.shared.file.FileUtils;
+import com.termux.shared.jni.models.JniResult;
+import com.termux.shared.logger.Logger;
+
+import java.io.Closeable;
+import java.io.File;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+
+/** The server socket for {@link LocalSocketManager}. */
+public class LocalServerSocket implements Closeable {
+
+    public static final String LOG_TAG = "LocalServerSocket";
+
+    /** The {@link LocalSocketManager} instance for the local socket. */
+    @NonNull protected final LocalSocketManager mLocalSocketManager;
+
+    /** The {@link LocalSocketRunConfig} containing run config for the {@link LocalServerSocket}. */
+    @NonNull protected final LocalSocketRunConfig mLocalSocketRunConfig;
+
+    /** The {@link ILocalSocketManager} client for the {@link LocalSocketManager}. */
+    @NonNull protected final ILocalSocketManager mLocalSocketManagerClient;
+
+    /** The {@link ClientSocketListener} {@link Thread} for the {@link LocalServerSocket}. */
+    @NonNull protected final Thread mClientSocketListener;
+
+    /**
+     * The required permissions for server socket file parent directory.
+     * Creation of a new socket will fail if the server starter app process does not have
+     * write and search (execute) permission on the directory in which the socket is created.
+     */
+    public static final String SERVER_SOCKET_PARENT_DIRECTORY_PERMISSIONS = "rwx"; // Default: "rwx"
+
+    /**
+     * Create an new instance of {@link LocalServerSocket}.
+     *
+     * @param localSocketManager The {@link #mLocalSocketManager} value.
+     */
+    protected LocalServerSocket(@NonNull LocalSocketManager localSocketManager) {
+        mLocalSocketManager = localSocketManager;
+        mLocalSocketRunConfig = localSocketManager.getLocalSocketRunConfig();
+        mLocalSocketManagerClient = mLocalSocketRunConfig.getLocalSocketManagerClient();
+        mClientSocketListener = new Thread(new ClientSocketListener());
+    }
+
+    /** Start server by creating server socket. */
+    public synchronized Error start() {
+        Logger.logDebug(LOG_TAG, "start");
+
+        String path = mLocalSocketRunConfig.getPath();
+        if (path == null || path.isEmpty()) {
+            return LocalSocketErrno.ERRNO_SERVER_SOCKET_PATH_NULL_OR_EMPTY.getError(mLocalSocketRunConfig.getTitle());
+        }
+        if (!mLocalSocketRunConfig.isAbstractNamespaceSocket()) {
+            path = FileUtils.getCanonicalPath(path, null);
+        }
+
+        // On Linux, sun_path is 108 bytes (UNIX_PATH_MAX) in size, so do an early check here to
+        // prevent useless parent directory creation since createServerSocket() call will fail since
+        // there is a native check as well.
+        if (path.getBytes(StandardCharsets.UTF_8).length > 108) {
+            return LocalSocketErrno.ERRNO_SERVER_SOCKET_PATH_TOO_LONG.getError(mLocalSocketRunConfig.getTitle(), path);
+        }
+
+        int backlog = mLocalSocketRunConfig.getBacklog();
+        if (backlog <= 0) {
+            return LocalSocketErrno.ERRNO_SERVER_SOCKET_BACKLOG_INVALID.getError(mLocalSocketRunConfig.getTitle(), backlog);
+        }
+
+        Error error;
+
+        // If server socket is not in abstract namespace
+        if (!mLocalSocketRunConfig.isAbstractNamespaceSocket()) {
+            if (!path.startsWith("/"))
+                return LocalSocketErrno.ERRNO_SERVER_SOCKET_PATH_NOT_ABSOLUTE.getError(mLocalSocketRunConfig.getTitle(), path);
+
+            // Create the server socket file parent directory and set SERVER_SOCKET_PARENT_DIRECTORY_PERMISSIONS if missing
+            String socketParentPath = new File(path).getParent();
+            error = FileUtils.validateDirectoryFileExistenceAndPermissions(mLocalSocketRunConfig.getTitle() + " server socket file parent",
+                socketParentPath,
+                null, true,
+                SERVER_SOCKET_PARENT_DIRECTORY_PERMISSIONS, true, true,
+                false, false);
+            if (error != null)
+                return error;
+
+
+            // Delete the server socket file to stop any existing servers and for bind() to succeed
+            error = deleteServerSocketFile();
+            if (error != null)
+                return error;
+        }
+
+        // Create the server socket
+        JniResult result = LocalSocketManager.createServerSocket(mLocalSocketRunConfig.getLogTitle() + " (server)",
+            path.getBytes(StandardCharsets.UTF_8), backlog);
+        if (result == null || result.retval != 0) {
+            return LocalSocketErrno.ERRNO_CREATE_SERVER_SOCKET_FAILED.getError(mLocalSocketRunConfig.getTitle(), JniResult.getErrorString(result));
+        }
+
+        int fd = result.intData;
+        if (fd < 0) {
+            return LocalSocketErrno.ERRNO_SERVER_SOCKET_FD_INVALID.getError(fd, mLocalSocketRunConfig.getTitle());
+        }
+
+        // Update fd to signify that server socket has been created successfully
+        mLocalSocketRunConfig.setFD(fd);
+
+        mClientSocketListener.setUncaughtExceptionHandler(mLocalSocketManager.getLocalSocketManagerClientThreadUEH());
+
+        try {
+            // Start listening to server clients
+            mClientSocketListener.start();
+        } catch (Exception e) {
+            Logger.logStackTraceWithMessage(LOG_TAG, "mClientSocketListener start failed", e);
+        }
+
+        return null;
+    }
+
+    /** Stop server. */
+    public synchronized Error stop() {
+        Logger.logDebug(LOG_TAG, "stop");
+
+        try {
+            // Stop the LocalClientSocket listener.
+            mClientSocketListener.interrupt();
+        } catch (Exception ignored) {}
+
+        Error error = closeServerSocket(false);
+        if (error != null)
+            return error;
+
+        return deleteServerSocketFile();
+    }
+
+    /** Close server socket. */
+    public synchronized Error closeServerSocket(boolean logErrorMessage) {
+        Logger.logDebug(LOG_TAG, "closeServerSocket");
+
+        try {
+            close();
+        } catch (IOException e) {
+            Error error = LocalSocketErrno.ERRNO_CLOSE_SERVER_SOCKET_FAILED_WITH_EXCEPTION.getError(e, mLocalSocketRunConfig.getTitle(), e.getMessage());
+            if (logErrorMessage)
+                Logger.logErrorExtended(LOG_TAG, error.getErrorLogString());
+            return error;
+        }
+
+        return null;
+    }
+
+    /** Implementation for {@link Closeable#close()} to close server socket. */
+    @Override
+    public synchronized void close() throws IOException {
+        Logger.logDebug(LOG_TAG, "close");
+
+        int fd = mLocalSocketRunConfig.getFD();
+
+        if (fd >= 0) {
+            JniResult result = LocalSocketManager.closeSocket(mLocalSocketRunConfig.getLogTitle() + " (server)", fd);
+            if (result == null || result.retval != 0) {
+                throw new IOException(JniResult.getErrorString(result));
+            }
+            // Update fd to signify that server socket has been closed
+            mLocalSocketRunConfig.setFD(-1);
+        }
+    }
+
+    /**
+     * Delete server socket file if not an abstract namespace socket. This will cause any existing
+     * running server to stop.
+     */
+    private Error deleteServerSocketFile() {
+        if (!mLocalSocketRunConfig.isAbstractNamespaceSocket())
+            return FileUtils.deleteSocketFile(mLocalSocketRunConfig.getTitle() + " server socket file", mLocalSocketRunConfig.getPath(), true);
+        else
+            return null;
+    }
+
+    /** Listen and accept new {@link LocalClientSocket}. */
+    public LocalClientSocket accept() {
+        Logger.logVerbose(LOG_TAG, "accept");
+
+        int clientFD;
+        while (true) {
+            // If server socket closed
+            int fd = mLocalSocketRunConfig.getFD();
+            if (fd < 0) {
+                return null;
+            }
+
+            JniResult result = LocalSocketManager.accept(mLocalSocketRunConfig.getLogTitle() + " (client)", fd);
+            if (result == null || result.retval != 0) {
+                mLocalSocketManager.onError(
+                    LocalSocketErrno.ERRNO_ACCEPT_CLIENT_SOCKET_FAILED.getError(mLocalSocketRunConfig.getTitle(), JniResult.getErrorString(result)));
+                continue;
+            }
+
+            clientFD = result.intData;
+            if (clientFD < 0) {
+                mLocalSocketManager.onError(
+                    LocalSocketErrno.ERRNO_CLIENT_SOCKET_FD_INVALID.getError(clientFD, mLocalSocketRunConfig.getTitle()));
+                continue;
+            }
+
+            PeerCred peerCred = new PeerCred();
+            result = LocalSocketManager.getPeerCred(mLocalSocketRunConfig.getLogTitle() + " (client)", clientFD, peerCred);
+            if (result == null || result.retval != 0) {
+                mLocalSocketManager.onError(
+                    LocalSocketErrno.ERRNO_GET_CLIENT_SOCKET_PEER_UID_FAILED.getError(mLocalSocketRunConfig.getTitle(), JniResult.getErrorString(result)));
+                LocalClientSocket.closeClientSocket(mLocalSocketManager, clientFD);
+                continue;
+            }
+
+            int peerUid = peerCred.uid;
+            if (peerUid < 0) {
+                mLocalSocketManager.onError(
+                    LocalSocketErrno.ERRNO_CLIENT_SOCKET_PEER_UID_INVALID.getError(peerUid, mLocalSocketRunConfig.getTitle()));
+                LocalClientSocket.closeClientSocket(mLocalSocketManager, clientFD);
+                continue;
+            }
+
+            LocalClientSocket clientSocket =  new LocalClientSocket(mLocalSocketManager, clientFD, peerCred);
+            Logger.logVerbose(LOG_TAG, "Client socket accept for \"" + mLocalSocketRunConfig.getTitle() + "\" server\n" + clientSocket.getLogString());
+
+            // Only allow connection if the peer has the same uid as server app's user id or root user id
+            if (peerUid != mLocalSocketManager.getContext().getApplicationInfo().uid && peerUid != 0) {
+                mLocalSocketManager.onDisallowedClientConnected(clientSocket,
+                    LocalSocketErrno.ERRNO_CLIENT_SOCKET_PEER_UID_DISALLOWED.getError(clientSocket.getPeerCred().getMinimalString(),
+                        mLocalSocketManager.getLocalSocketRunConfig().getTitle()));
+                clientSocket.closeClientSocket(true);
+                continue;
+            }
+
+            return clientSocket;
+        }
+    }
+
+
+
+
+    /** The {@link LocalClientSocket} listener {@link java.lang.Runnable} for {@link LocalServerSocket}. */
+    protected class ClientSocketListener implements Runnable {
+
+        @Override
+        public void run() {
+            try {
+                Logger.logVerbose(LOG_TAG, "ClientSocketListener start");
+
+                while (!Thread.currentThread().isInterrupted()) {
+                    LocalClientSocket clientSocket = null;
+                    try {
+                        // Listen for new client socket connections
+                        clientSocket = null;
+                        clientSocket = accept();
+                        // If server socket is closed, then stop listener thread.
+                        if (clientSocket == null)
+                            break;
+
+                        Error error;
+
+                        error = clientSocket.setReadTimeout();
+                        if (error != null) {
+                            mLocalSocketManager.onError(clientSocket, error);
+                            clientSocket.closeClientSocket(true);
+                            continue;
+                        }
+
+                        error = clientSocket.setWriteTimeout();
+                        if (error != null) {
+                            mLocalSocketManager.onError(clientSocket, error);
+                            clientSocket.closeClientSocket(true);
+                            continue;
+                        }
+
+                        // Start new thread for client logic and pass control to ILocalSocketManager implementation
+                        mLocalSocketManager.onClientAccepted(clientSocket);
+                    } catch (Throwable t) {
+                        mLocalSocketManager.onError(clientSocket,
+                            LocalSocketErrno.ERRNO_CLIENT_SOCKET_LISTENER_FAILED_WITH_EXCEPTION.getError(t, mLocalSocketRunConfig.getTitle(), t.getMessage()));
+                        if (clientSocket != null)
+                            clientSocket.closeClientSocket(true);
+                    }
+                }
+            } catch (Exception ignored) {
+            } finally {
+                try {
+                    close();
+                } catch (Exception ignored) {}
+            }
+
+            Logger.logVerbose(LOG_TAG, "ClientSocketListener end");
+        }
+
+    }
+
+}
diff --git a/termux-shared/src/main/java/com/termux/shared/net/socket/local/LocalSocketErrno.java b/termux-shared/src/main/java/com/termux/shared/net/socket/local/LocalSocketErrno.java
new file mode 100644
index 0000000000..251f5c67e9
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/net/socket/local/LocalSocketErrno.java
@@ -0,0 +1,43 @@
+package com.termux.shared.net.socket.local;
+
+import com.termux.shared.errors.Errno;
+
+public class LocalSocketErrno extends Errno {
+
+    public static final String TYPE = "LocalSocket Error";
+
+
+    /** Errors for {@link LocalSocketManager} (100-150) */
+    public static final Errno ERRNO_START_LOCAL_SOCKET_LIB_LOAD_FAILED_WITH_EXCEPTION = new Errno(TYPE, 100, "Failed to load \"%1$s\" library.\nException: %2$s");
+
+    /** Errors for {@link LocalServerSocket} (150-200) */
+    public static final Errno ERRNO_SERVER_SOCKET_PATH_NULL_OR_EMPTY = new Errno(TYPE, 150, "The \"%1$s\" server socket path is null or empty.");
+    public static final Errno ERRNO_SERVER_SOCKET_PATH_TOO_LONG = new Errno(TYPE, 151, "The \"%1$s\" server socket path \"%2$s\" is greater than 108 bytes.");
+    public static final Errno ERRNO_SERVER_SOCKET_PATH_NOT_ABSOLUTE = new Errno(TYPE, 152, "The \"%1$s\" server socket path \"%2$s\" is not an absolute file path.");
+    public static final Errno ERRNO_SERVER_SOCKET_BACKLOG_INVALID = new Errno(TYPE, 153, "The \"%1$s\" server socket backlog \"%2$s\" is not greater than 0.");
+    public static final Errno ERRNO_CREATE_SERVER_SOCKET_FAILED = new Errno(TYPE, 154, "Create \"%1$s\" server socket failed.\n%2$s");
+    public static final Errno ERRNO_SERVER_SOCKET_FD_INVALID = new Errno(TYPE, 155, "Invalid file descriptor \"%1$s\" returned when creating \"%2$s\" server socket.");
+    public static final Errno ERRNO_ACCEPT_CLIENT_SOCKET_FAILED = new Errno(TYPE, 156, "Accepting client socket for \"%1$s\" server failed.\n%2$s");
+    public static final Errno ERRNO_CLIENT_SOCKET_FD_INVALID = new Errno(TYPE, 157, "Invalid file descriptor \"%1$s\" returned when accept new client for \"%2$s\" server.");
+    public static final Errno ERRNO_GET_CLIENT_SOCKET_PEER_UID_FAILED = new Errno(TYPE, 158, "Getting peer uid for client socket for \"%1$s\" server failed.\n%2$s");
+    public static final Errno ERRNO_CLIENT_SOCKET_PEER_UID_INVALID = new Errno(TYPE, 158, "Invalid peer uid \"%1$s\" returned for new client for \"%2$s\" server.");
+    public static final Errno ERRNO_CLIENT_SOCKET_PEER_UID_DISALLOWED = new Errno(TYPE, 160, "Disallowed peer %1$s tried to connect with \"%2$s\" server.");
+    public static final Errno ERRNO_CLOSE_SERVER_SOCKET_FAILED_WITH_EXCEPTION = new Errno(TYPE, 161, "Close \"%1$s\" server socket failed.\nException: %2$s");
+    public static final Errno ERRNO_CLIENT_SOCKET_LISTENER_FAILED_WITH_EXCEPTION = new Errno(TYPE, 162, "Exception in client socket listener for \"%1$s\" server.\nException: %2$s");
+
+    /** Errors for {@link LocalClientSocket} (200-250) */
+    public static final Errno ERRNO_SET_CLIENT_SOCKET_READ_TIMEOUT_FAILED = new Errno(TYPE, 200, "Set \"%1$s\" client socket read (SO_RCVTIMEO) timeout to \"%2$s\" failed.\n%3$s");
+    public static final Errno ERRNO_SET_CLIENT_SOCKET_SEND_TIMEOUT_FAILED = new Errno(TYPE, 201, "Set \"%1$s\" client socket send (SO_SNDTIMEO) timeout \"%2$s\" failed.\n%3$s");
+    public static final Errno ERRNO_READ_DATA_FROM_CLIENT_SOCKET_FAILED = new Errno(TYPE, 202, "Read data from \"%1$s\" client socket failed.\n%2$s");
+    public static final Errno ERRNO_READ_DATA_FROM_INPUT_STREAM_OF_CLIENT_SOCKET_FAILED_WITH_EXCEPTION = new Errno(TYPE, 203, "Read data from \"%1$s\" client socket input stream failed.\n%2$s");
+    public static final Errno ERRNO_SEND_DATA_TO_CLIENT_SOCKET_FAILED = new Errno(TYPE, 204, "Send data to \"%1$s\" client socket failed.\n%2$s");
+    public static final Errno ERRNO_SEND_DATA_TO_OUTPUT_STREAM_OF_CLIENT_SOCKET_FAILED_WITH_EXCEPTION = new Errno(TYPE, 205, "Send data to \"%1$s\" client socket output stream failed.\n%2$s");
+    public static final Errno ERRNO_CHECK_AVAILABLE_DATA_ON_CLIENT_SOCKET_FAILED = new Errno(TYPE, 206, "Check available data on \"%1$s\" client socket failed.\n%2$s");
+    public static final Errno ERRNO_CLOSE_CLIENT_SOCKET_FAILED_WITH_EXCEPTION = new Errno(TYPE, 207, "Close \"%1$s\" client socket failed.\n%2$s");
+    public static final Errno ERRNO_USING_CLIENT_SOCKET_WITH_INVALID_FD = new Errno(TYPE, 208, "Trying to use client socket with invalid file descriptor \"%1$s\" for \"%2$s\" server.");
+
+    LocalSocketErrno(final String type, final int code, final String message) {
+        super(type, code, message);
+    }
+
+}
diff --git a/termux-shared/src/main/java/com/termux/shared/net/socket/local/LocalSocketManager.java b/termux-shared/src/main/java/com/termux/shared/net/socket/local/LocalSocketManager.java
new file mode 100644
index 0000000000..0b7c3dc936
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/net/socket/local/LocalSocketManager.java
@@ -0,0 +1,448 @@
+package com.termux.shared.net.socket.local;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.termux.shared.errors.Error;
+import com.termux.shared.jni.models.JniResult;
+import com.termux.shared.logger.Logger;
+
+/**
+ * Manager for an AF_UNIX/SOCK_STREAM local server.
+ *
+ * Usage:
+ * 1. Implement the {@link ILocalSocketManager} that will receive call backs from the server including
+ *    when client connects via {@link ILocalSocketManager#onClientAccepted(LocalSocketManager, LocalClientSocket)}.
+ *    Optionally extend the {@link LocalSocketManagerClientBase} class that provides base implementation.
+ * 2. Create a {@link LocalSocketRunConfig} instance with the run config of the server.
+ * 3. Create a {@link LocalSocketManager} instance and call {@link #start()}.
+ * 4. Stop server if needed with a call to {@link #stop()}.
+ */
+public class LocalSocketManager {
+
+    public static final String LOG_TAG = "LocalSocketManager";
+
+    /** The native JNI local socket library. */
+    protected static String LOCAL_SOCKET_LIBRARY = "local-socket";
+
+    /** Whether {@link #LOCAL_SOCKET_LIBRARY} has been loaded or not. */
+    protected static boolean localSocketLibraryLoaded;
+
+    /** The {@link Context} that may needed for various operations. */
+    @NonNull protected final Context mContext;
+
+    /** The {@link LocalSocketRunConfig} containing run config for the {@link LocalSocketManager}. */
+    @NonNull protected final LocalSocketRunConfig mLocalSocketRunConfig;
+
+    /** The {@link LocalServerSocket} for the {@link LocalSocketManager}. */
+    @NonNull protected final LocalServerSocket mServerSocket;
+
+    /** The {@link ILocalSocketManager} client for the {@link LocalSocketManager}. */
+    @NonNull protected final ILocalSocketManager mLocalSocketManagerClient;
+
+    /** The {@link Thread.UncaughtExceptionHandler} used for client thread started by {@link LocalSocketManager}. */
+    @NonNull protected final Thread.UncaughtExceptionHandler mLocalSocketManagerClientThreadUEH;
+
+    /** Whether the {@link LocalServerSocket} managed by {@link LocalSocketManager} in running or not. */
+    protected boolean mIsRunning;
+
+
+    /**
+     * Create an new instance of {@link LocalSocketManager}.
+     *
+     * @param context The {@link #mContext} value.
+     * @param localSocketRunConfig The {@link #mLocalSocketRunConfig} value.
+     */
+    public LocalSocketManager(@NonNull Context context, @NonNull LocalSocketRunConfig localSocketRunConfig) {
+        mContext = context.getApplicationContext();
+        mLocalSocketRunConfig = localSocketRunConfig;
+        mServerSocket = new LocalServerSocket(this);
+        mLocalSocketManagerClient = mLocalSocketRunConfig.getLocalSocketManagerClient();
+        mLocalSocketManagerClientThreadUEH = getLocalSocketManagerClientThreadUEHOrDefault();
+        mIsRunning = false;
+    }
+
+    /**
+     * Create the {@link LocalServerSocket} and start listening for new {@link LocalClientSocket}.
+     */
+    public synchronized Error start() {
+        Logger.logDebugExtended(LOG_TAG, "start\n" + mLocalSocketRunConfig);
+
+        if (!localSocketLibraryLoaded) {
+            try {
+                Logger.logDebug(LOG_TAG, "Loading \"" + LOCAL_SOCKET_LIBRARY + "\" library");
+                System.loadLibrary(LOCAL_SOCKET_LIBRARY);
+                localSocketLibraryLoaded = true;
+            } catch (Exception e) {
+                return LocalSocketErrno.ERRNO_START_LOCAL_SOCKET_LIB_LOAD_FAILED_WITH_EXCEPTION.getError(e, LOCAL_SOCKET_LIBRARY,  e.getMessage());
+            }
+        }
+
+        mIsRunning = true;
+        return mServerSocket.start();
+    }
+
+    /**
+     * Stop the {@link LocalServerSocket} and stop listening for new {@link LocalClientSocket}.
+     */
+    public synchronized Error stop() {
+        if (mIsRunning) {
+            Logger.logDebugExtended(LOG_TAG, "stop\n" + mLocalSocketRunConfig);
+            mIsRunning = false;
+            return mServerSocket.stop();
+        }
+        return null;
+    }
+
+
+
+
+    /*
+     Note: Exceptions thrown from JNI must be caught with Throwable class instead of Exception,
+     otherwise exception will be sent to UncaughtExceptionHandler of the thread.
+    */
+
+    /**
+     * Creates an AF_UNIX/SOCK_STREAM local server socket at {@code path}, with the specified backlog.
+     *
+     * @param serverTitle The server title used for logging and errors.
+     * @param path The path at which to create the socket.
+     *             For a filesystem socket, this must be an absolute path to the socket file.
+     *             For an abstract namespace socket, the first byte must be a null `\0` character.
+     *             Max allowed length is 108 bytes as per sun_path size (UNIX_PATH_MAX) on Linux.
+     * @param backlog The maximum length to which the queue of pending connections for the socket
+     *                may grow. This value may be ignored or may not have one-to-one mapping
+     *                in kernel implementation. Value must be greater than 0.
+     * @return Returns the {@link JniResult}. If server creation was successful, then
+     * {@link JniResult#retval} will be 0 and {@link JniResult#intData} will contain the server socket
+     * fd.
+     */
+    @Nullable
+    public static JniResult createServerSocket(@NonNull String serverTitle, @NonNull byte[] path, int backlog) {
+        try {
+            return createServerSocketNative(serverTitle, path, backlog);
+        } catch (Throwable t) {
+            String message = "Exception in createServerSocketNative()";
+            Logger.logStackTraceWithMessage(LOG_TAG, message, t);
+            return new JniResult(message, t);
+        }
+    }
+
+    /**
+     * Closes the socket with fd.
+     *
+     * @param serverTitle The server title used for logging and errors.
+     * @param fd The socket fd.
+     * @return Returns the {@link JniResult}. If closing socket was successful, then
+     * {@link JniResult#retval} will be 0.
+     */
+    @Nullable
+    public static JniResult closeSocket(@NonNull String serverTitle, int fd) {
+        try {
+            return closeSocketNative(serverTitle, fd);
+        } catch (Throwable t) {
+            String message = "Exception in closeSocketNative()";
+            Logger.logStackTraceWithMessage(LOG_TAG, message, t);
+            return new JniResult(message, t);
+        }
+    }
+
+    /**
+     * Accepts a connection on the supplied server socket fd.
+     *
+     * @param serverTitle The server title used for logging and errors.
+     * @param fd The server socket fd.
+     * @return Returns the {@link JniResult}. If accepting socket was successful, then
+     * {@link JniResult#retval} will be 0 and {@link JniResult#intData} will contain the client socket
+     * fd.
+     */
+    @Nullable
+    public static JniResult accept(@NonNull String serverTitle, int fd) {
+        try {
+            return acceptNative(serverTitle, fd);
+        } catch (Throwable t) {
+            String message = "Exception in acceptNative()";
+            Logger.logStackTraceWithMessage(LOG_TAG, message, t);
+            return new JniResult(message, t);
+        }
+    }
+
+    /**
+     * Attempts to read up to data buffer length bytes from file descriptor fd into the data buffer.
+     * On success, the number of bytes read is returned (zero indicates end of file).
+     * It is not an error if bytes read is smaller than the number of bytes requested; this may happen
+     * for example because fewer bytes are actually available right now (maybe because we were close
+     * to end-of-file, or because we are reading from a pipe), or because read() was interrupted by
+     * a signal. On error, the {@link JniResult#errno} and {@link JniResult#errmsg} will be set.
+     *
+     * If while reading the deadline elapses but all the data has not been read, the call will fail.
+     *
+     * @param serverTitle The server title used for logging and errors.
+     * @param fd The socket fd.
+     * @param data The data buffer to read bytes into.
+     * @param deadline The deadline milliseconds since epoch.
+     * @return Returns the {@link JniResult}. If reading was successful, then {@link JniResult#retval}
+     * will be 0 and {@link JniResult#intData} will contain the bytes read.
+     */
+    @Nullable
+    public static JniResult read(@NonNull String serverTitle, int fd, @NonNull byte[] data, long deadline) {
+        try {
+            return readNative(serverTitle, fd, data, deadline);
+        } catch (Throwable t) {
+            String message = "Exception in readNative()";
+            Logger.logStackTraceWithMessage(LOG_TAG, message, t);
+            return new JniResult(message, t);
+        }
+    }
+
+    /**
+     * Attempts to send data buffer to the file descriptor. On error, the {@link JniResult#errno} and
+     * {@link JniResult#errmsg} will be set.
+     *
+     * If while sending the deadline elapses but all the data has not been sent, the call will fail.
+     *
+     * @param serverTitle The server title used for logging and errors.
+     * @param fd The socket fd.
+     * @param data The data buffer containing bytes to send.
+     * @param deadline The deadline milliseconds since epoch.
+     * @return Returns the {@link JniResult}. If sending was successful, then {@link JniResult#retval}
+     * will be 0.
+     */
+    @Nullable
+    public static JniResult send(@NonNull String serverTitle, int fd, @NonNull byte[] data, long deadline) {
+        try {
+            return sendNative(serverTitle, fd, data, deadline);
+        } catch (Throwable t) {
+            String message = "Exception in sendNative()";
+            Logger.logStackTraceWithMessage(LOG_TAG, message, t);
+            return new JniResult(message, t);
+        }
+    }
+
+    /**
+     * Gets the number of bytes available to read on the socket.
+     *
+     * @param serverTitle The server title used for logging and errors.
+     * @param fd The socket fd.
+     * @return Returns the {@link JniResult}. If checking availability was successful, then
+     * {@link JniResult#retval} will be 0 and {@link JniResult#intData} will contain the bytes available.
+     */
+    @Nullable
+    public static JniResult available(@NonNull String serverTitle, int fd) {
+        try {
+            return availableNative(serverTitle, fd);
+        } catch (Throwable t) {
+            String message = "Exception in availableNative()";
+            Logger.logStackTraceWithMessage(LOG_TAG, message, t);
+            return new JniResult(message, t);
+        }
+    }
+
+    /**
+     * Set receiving (SO_RCVTIMEO) timeout in milliseconds for socket.
+     *
+     * @param serverTitle The server title used for logging and errors.
+     * @param fd The socket fd.
+     * @param timeout The timeout value in milliseconds.
+     * @return Returns the {@link JniResult}. If setting timeout was successful, then
+     * {@link JniResult#retval} will be 0.
+     */
+    @Nullable
+    public static JniResult setSocketReadTimeout(@NonNull String serverTitle, int fd, int timeout) {
+        try {
+            return setSocketReadTimeoutNative(serverTitle, fd, timeout);
+        } catch (Throwable t) {
+            String message = "Exception in setSocketReadTimeoutNative()";
+            Logger.logStackTraceWithMessage(LOG_TAG, message, t);
+            return new JniResult(message, t);
+        }
+    }
+
+    /**
+     * Set sending (SO_SNDTIMEO) timeout in milliseconds for fd.
+     *
+     * @param serverTitle The server title used for logging and errors.
+     * @param fd The socket fd.
+     * @param timeout The timeout value in milliseconds.
+     * @return Returns the {@link JniResult}. If setting timeout was successful, then
+     * {@link JniResult#retval} will be 0.
+     */
+    @Nullable
+    public static JniResult setSocketSendTimeout(@NonNull String serverTitle, int fd, int timeout) {
+        try {
+            return setSocketSendTimeoutNative(serverTitle, fd, timeout);
+        } catch (Throwable t) {
+            String message = "Exception in setSocketSendTimeoutNative()";
+            Logger.logStackTraceWithMessage(LOG_TAG, message, t);
+            return new JniResult(message, t);
+        }
+    }
+
+    /**
+     * Get the {@link PeerCred} for the socket.
+     *
+     * @param serverTitle The server title used for logging and errors.
+     * @param fd The socket fd.
+     * @param peerCred The {@link PeerCred} object that should be filled.
+     * @return Returns the {@link JniResult}. If setting timeout was successful, then
+     * {@link JniResult#retval} will be 0.
+     */
+    @Nullable
+    public static JniResult getPeerCred(@NonNull String serverTitle, int fd, PeerCred peerCred) {
+        try {
+            return getPeerCredNative(serverTitle, fd, peerCred);
+        } catch (Throwable t) {
+            String message = "Exception in getPeerCredNative()";
+            Logger.logStackTraceWithMessage(LOG_TAG, message, t);
+            return new JniResult(message, t);
+        }
+    }
+
+
+
+    /** Wrapper for {@link #onError(LocalClientSocket, Error)} for {@code null} {@link LocalClientSocket}. */
+    public void onError(@NonNull Error error) {
+        onError(null, error);
+    }
+
+    /** Wrapper to call {@link ILocalSocketManager#onError(LocalSocketManager, LocalClientSocket, Error)} in a new thread. */
+    public void onError(@Nullable LocalClientSocket clientSocket, @NonNull Error error) {
+        startLocalSocketManagerClientThread(() ->
+            mLocalSocketManagerClient.onError(this, clientSocket, error));
+    }
+
+    /** Wrapper to call {@link ILocalSocketManager#onDisallowedClientConnected(LocalSocketManager, LocalClientSocket, Error)} in a new thread. */
+    public void onDisallowedClientConnected(@NonNull LocalClientSocket clientSocket, @NonNull Error error) {
+        startLocalSocketManagerClientThread(() ->
+            mLocalSocketManagerClient.onDisallowedClientConnected(this, clientSocket, error));
+    }
+
+    /** Wrapper to call {@link ILocalSocketManager#onClientAccepted(LocalSocketManager, LocalClientSocket)} in a new thread. */
+    public void onClientAccepted(@NonNull LocalClientSocket clientSocket) {
+        startLocalSocketManagerClientThread(() ->
+            mLocalSocketManagerClient.onClientAccepted(this, clientSocket));
+    }
+
+    /** All client accept logic must be run on separate threads so that incoming client acceptance is not blocked. */
+    public void startLocalSocketManagerClientThread(@NonNull Runnable runnable) {
+        Thread thread = new Thread(runnable);
+        thread.setUncaughtExceptionHandler(getLocalSocketManagerClientThreadUEH());
+        try {
+            thread.start();
+        } catch (Exception e) {
+            Logger.logStackTraceWithMessage(LOG_TAG, "LocalSocketManagerClientThread start failed", e);
+        }
+    }
+
+
+
+    /** Get {@link #mContext}. */
+    public Context getContext() {
+        return mContext;
+    }
+
+    /** Get {@link #mLocalSocketRunConfig}. */
+    public LocalSocketRunConfig getLocalSocketRunConfig() {
+        return mLocalSocketRunConfig;
+    }
+
+    /** Get {@link #mLocalSocketManagerClient}. */
+    public ILocalSocketManager getLocalSocketManagerClient() {
+        return mLocalSocketManagerClient;
+    }
+
+    /** Get {@link #mServerSocket}. */
+    public LocalServerSocket getServerSocket() {
+        return mServerSocket;
+    }
+
+    /** Get {@link #mLocalSocketManagerClientThreadUEH}. */
+    public Thread.UncaughtExceptionHandler getLocalSocketManagerClientThreadUEH() {
+        return mLocalSocketManagerClientThreadUEH;
+    }
+
+    /**
+     * Get {@link Thread.UncaughtExceptionHandler} returned by call to
+     * {@link ILocalSocketManager#getLocalSocketManagerClientThreadUEH(LocalSocketManager)}
+     * or the default handler that just logs the exception.
+     */
+    protected Thread.UncaughtExceptionHandler getLocalSocketManagerClientThreadUEHOrDefault() {
+        Thread.UncaughtExceptionHandler uncaughtExceptionHandler =
+            mLocalSocketManagerClient.getLocalSocketManagerClientThreadUEH(this);
+        if (uncaughtExceptionHandler == null)
+            uncaughtExceptionHandler = (t, e) ->
+                Logger.logStackTraceWithMessage(LOG_TAG, "Uncaught exception for " + t + " in " + mLocalSocketRunConfig.getTitle() + " server", e);
+        return uncaughtExceptionHandler;
+    }
+
+    /** Get {@link #mIsRunning}. */
+    public boolean isRunning() {
+        return mIsRunning;
+    }
+
+
+
+    /** Get an error log {@link String} for the {@link LocalSocketManager}. */
+    public static String getErrorLogString(@NonNull Error error,
+                                           @NonNull LocalSocketRunConfig localSocketRunConfig,
+                                           @Nullable LocalClientSocket clientSocket) {
+        StringBuilder logString = new StringBuilder();
+
+        logString.append(localSocketRunConfig.getTitle()).append(" Socket Server Error:\n");
+        logString.append(error.getErrorLogString());
+        logString.append("\n\n\n");
+
+        logString.append(localSocketRunConfig.getLogString());
+
+        if (clientSocket != null) {
+            logString.append("\n\n\n");
+            logString.append(clientSocket.getLogString());
+        }
+
+        return logString.toString();
+    }
+
+    /** Get an error markdown {@link String} for the {@link LocalSocketManager}. */
+    public static String getErrorMarkdownString(@NonNull Error error,
+                                                @NonNull LocalSocketRunConfig localSocketRunConfig,
+                                                @Nullable LocalClientSocket clientSocket) {
+        StringBuilder markdownString = new StringBuilder();
+
+        markdownString.append(error.getErrorMarkdownString());
+        markdownString.append("\n##\n\n\n");
+
+        markdownString.append(localSocketRunConfig.getMarkdownString());
+
+        if (clientSocket != null) {
+            markdownString.append("\n\n\n");
+            markdownString.append(clientSocket.getMarkdownString());
+        }
+
+        return markdownString.toString();
+    }
+
+
+
+
+
+    @Nullable private static native JniResult createServerSocketNative(@NonNull String serverTitle, @NonNull byte[] path, int backlog);
+
+    @Nullable private static native JniResult closeSocketNative(@NonNull String serverTitle, int fd);
+
+    @Nullable private static native JniResult acceptNative(@NonNull String serverTitle, int fd);
+
+    @Nullable private static native JniResult readNative(@NonNull String serverTitle, int fd, @NonNull byte[] data, long deadline);
+
+    @Nullable private static native JniResult sendNative(@NonNull String serverTitle, int fd, @NonNull byte[] data, long deadline);
+
+    @Nullable private static native JniResult availableNative(@NonNull String serverTitle, int fd);
+
+    private static native JniResult setSocketReadTimeoutNative(@NonNull String serverTitle, int fd, int timeout);
+
+    @Nullable private static native JniResult setSocketSendTimeoutNative(@NonNull String serverTitle, int fd, int timeout);
+
+    @Nullable private static native JniResult getPeerCredNative(@NonNull String serverTitle, int fd, PeerCred peerCred);
+
+}
diff --git a/termux-shared/src/main/java/com/termux/shared/net/socket/local/LocalSocketManagerClientBase.java b/termux-shared/src/main/java/com/termux/shared/net/socket/local/LocalSocketManagerClientBase.java
new file mode 100644
index 0000000000..4d7657c452
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/net/socket/local/LocalSocketManagerClientBase.java
@@ -0,0 +1,47 @@
+package com.termux.shared.net.socket.local;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.termux.shared.errors.Error;
+import com.termux.shared.logger.Logger;
+
+/** Base helper implementation for {@link ILocalSocketManager}. */
+public abstract class LocalSocketManagerClientBase implements ILocalSocketManager {
+
+    @Nullable
+    @Override
+    public Thread.UncaughtExceptionHandler getLocalSocketManagerClientThreadUEH(
+        @NonNull LocalSocketManager localSocketManager) {
+        return null;
+    }
+
+    @Override
+    public void onError(@NonNull LocalSocketManager localSocketManager,
+                        @Nullable LocalClientSocket clientSocket, @NonNull Error error) {
+        // Only log if log level is debug or higher since PeerCred.cmdline may contain private info
+        Logger.logErrorPrivate(getLogTag(), "onError");
+        Logger.logErrorPrivateExtended(getLogTag(), LocalSocketManager.getErrorLogString(error,
+            localSocketManager.getLocalSocketRunConfig(), clientSocket));
+    }
+
+    @Override
+    public void onDisallowedClientConnected(@NonNull LocalSocketManager localSocketManager,
+                                            @NonNull LocalClientSocket clientSocket, @NonNull Error error) {
+        Logger.logWarn(getLogTag(), "onDisallowedClientConnected");
+        Logger.logWarnExtended(getLogTag(), LocalSocketManager.getErrorLogString(error,
+            localSocketManager.getLocalSocketRunConfig(), clientSocket));
+    }
+
+    @Override
+    public void onClientAccepted(@NonNull LocalSocketManager localSocketManager,
+                                 @NonNull LocalClientSocket clientSocket) {
+        // Just close socket and let child class handle any required communication
+        clientSocket.closeClientSocket(true);
+    }
+
+
+
+    protected abstract String getLogTag();
+
+}
diff --git a/termux-shared/src/main/java/com/termux/shared/net/socket/local/LocalSocketRunConfig.java b/termux-shared/src/main/java/com/termux/shared/net/socket/local/LocalSocketRunConfig.java
new file mode 100644
index 0000000000..53ef895720
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/net/socket/local/LocalSocketRunConfig.java
@@ -0,0 +1,265 @@
+package com.termux.shared.net.socket.local;
+
+import androidx.annotation.NonNull;
+
+import com.termux.shared.file.FileUtils;
+import com.termux.shared.logger.Logger;
+import com.termux.shared.markdown.MarkdownUtils;
+
+import java.io.Serializable;
+import java.nio.charset.StandardCharsets;
+
+
+/**
+ * Run config for {@link LocalSocketManager}.
+ */
+public class LocalSocketRunConfig implements Serializable {
+
+    /** The {@link LocalSocketManager} title. */
+    private final String mTitle;
+
+    /**
+     * The {@link LocalServerSocket} path.
+     *
+     * For a filesystem socket, this must be an absolute path to the socket file. Creation of a new
+     * socket will fail if the server starter app process does not have write and search (execute)
+     * permission on the directory in which the socket is created. The client process must have write
+     * permission on the socket to connect to it. Other app will not be able to connect to socket
+     * if its created in private app data directory.
+     *
+     * For an abstract namespace socket, the first byte must be a null `\0` character. Note that on
+     * Android 9+, if server app is using `targetSdkVersion` `28`, then other apps will not be able
+     * to connect to it due to selinux restrictions.
+     * > Per-app SELinux domains
+     * > Apps that target Android 9 or higher cannot share data with other apps using world-accessible
+     * Unix permissions. This change improves the integrity of the Android Application Sandbox,
+     * particularly the requirement that an app's private data is accessible only by that app.
+     * https://developer.android.com/about/versions/pie/android-9.0-changes-28
+     * https://github.com/android/ndk/issues/1469
+     * https://stackoverflow.com/questions/63806516/avc-denied-connectto-when-using-uds-on-android-10
+     *
+     * Max allowed length is 108 bytes as per sun_path size (UNIX_PATH_MAX) on Linux.
+     */
+    private final String mPath;
+
+    /** If abstract namespace {@link LocalServerSocket} instead of filesystem. */
+    protected final boolean mAbstractNamespaceSocket;
+
+    /** The {@link ILocalSocketManager} client for the {@link LocalSocketManager}. */
+    private final ILocalSocketManager mLocalSocketManagerClient;
+
+    /**
+     * The {@link LocalServerSocket} file descriptor.
+     * Value will be `>= 0` if socket has been created successfully and `-1` if not created or closed.
+     */
+    private int mFD = -1;
+
+    /**
+     * The {@link LocalClientSocket} receiving (SO_RCVTIMEO) timeout in milliseconds.
+     *
+     * https://manpages.debian.org/testing/manpages/socket.7.en.html
+     * https://cs.android.com/android/platform/superproject/+/android-12.0.0_r32:frameworks/base/services/core/java/com/android/server/am/NativeCrashListener.java;l=55
+     * Defaults to {@link #DEFAULT_RECEIVE_TIMEOUT}.
+     */
+    private Integer mReceiveTimeout;
+    public static final int DEFAULT_RECEIVE_TIMEOUT = 10000;
+
+    /**
+     * The {@link LocalClientSocket} sending (SO_SNDTIMEO) timeout in milliseconds.
+     *
+     * https://manpages.debian.org/testing/manpages/socket.7.en.html
+     * https://cs.android.com/android/platform/superproject/+/android-12.0.0_r32:frameworks/base/services/core/java/com/android/server/am/NativeCrashListener.java;l=55
+     * Defaults to {@link #DEFAULT_SEND_TIMEOUT}.
+     */
+    private Integer mSendTimeout;
+    public static final int DEFAULT_SEND_TIMEOUT = 10000;
+
+    /**
+     * The {@link LocalClientSocket} deadline in milliseconds. When the deadline has elapsed after
+     * creation time of client socket, all reads and writes will error out. Set to 0, for no
+     * deadline.
+     * Defaults to {@link #DEFAULT_DEADLINE}.
+     */
+    private Long mDeadline;
+    public static final int DEFAULT_DEADLINE = 0;
+
+    /**
+     * The {@link LocalServerSocket} backlog for the maximum length to which the queue of pending connections
+     * for the socket may grow. This value may be ignored or may not have one-to-one mapping
+     * in kernel implementation. Value must be greater than 0.
+     *
+     * https://cs.android.com/android/platform/superproject/+/android-12.0.0_r32:frameworks/base/core/java/android/net/LocalSocketManager.java;l=31
+     * Defaults to {@link #DEFAULT_BACKLOG}.
+     */
+    private Integer mBacklog;
+    public static final int DEFAULT_BACKLOG = 50;
+
+
+    /**
+     * Create an new instance of {@link LocalSocketRunConfig}.
+     *
+     * @param title The {@link #mTitle} value.
+     * @param path The {@link #mPath} value.
+     * @param localSocketManagerClient The {@link #mLocalSocketManagerClient} value.
+     */
+    public LocalSocketRunConfig(@NonNull String title, @NonNull String path, @NonNull ILocalSocketManager localSocketManagerClient) {
+        mTitle = title;
+        mLocalSocketManagerClient = localSocketManagerClient;
+        mAbstractNamespaceSocket = path.getBytes(StandardCharsets.UTF_8)[0] == 0;
+
+        if (mAbstractNamespaceSocket)
+            mPath = path;
+        else
+            mPath = FileUtils.getCanonicalPath(path, null);
+    }
+
+
+
+    /** Get {@link #mTitle}. */
+    public String getTitle() {
+        return mTitle;
+    }
+
+    /** Get log title that should be used for {@link LocalSocketManager}. */
+    public String getLogTitle() {
+        return Logger.getDefaultLogTag() + "." + mTitle;
+    }
+
+    /** Get {@link #mPath}. */
+    public String getPath() {
+        return mPath;
+    }
+
+    /** Get {@link #mAbstractNamespaceSocket}. */
+    public boolean isAbstractNamespaceSocket() {
+        return mAbstractNamespaceSocket;
+    }
+
+    /** Get {@link #mLocalSocketManagerClient}. */
+    public ILocalSocketManager getLocalSocketManagerClient() {
+        return mLocalSocketManagerClient;
+    }
+
+    /** Get {@link #mFD}. */
+    public Integer getFD() {
+        return mFD;
+    }
+
+    /** Set {@link #mFD}. Value must be greater than 0 or -1. */
+    public void setFD(int fd) {
+        if (fd >= 0)
+            mFD = fd;
+        else
+            mFD = -1;
+    }
+
+    /** Get {@link #mReceiveTimeout} if set, otherwise {@link #DEFAULT_RECEIVE_TIMEOUT}. */
+    public Integer getReceiveTimeout() {
+        return mReceiveTimeout != null ? mReceiveTimeout : DEFAULT_RECEIVE_TIMEOUT;
+    }
+
+    /** Set {@link #mReceiveTimeout}. */
+    public void setReceiveTimeout(Integer receiveTimeout) {
+        mReceiveTimeout = receiveTimeout;
+    }
+
+    /** Get {@link #mSendTimeout} if set, otherwise {@link #DEFAULT_SEND_TIMEOUT}. */
+    public Integer getSendTimeout() {
+        return mSendTimeout != null ? mSendTimeout : DEFAULT_SEND_TIMEOUT;
+    }
+
+    /** Set {@link #mSendTimeout}. */
+    public void setSendTimeout(Integer sendTimeout) {
+        mSendTimeout = sendTimeout;
+    }
+
+    /** Get {@link #mDeadline} if set, otherwise {@link #DEFAULT_DEADLINE}. */
+    public Long getDeadline() {
+        return mDeadline != null ? mDeadline : DEFAULT_DEADLINE;
+    }
+
+    /** Set {@link #mDeadline}. */
+    public void setDeadline(Long deadline) {
+        mDeadline = deadline;
+    }
+
+    /** Get {@link #mBacklog} if set, otherwise {@link #DEFAULT_BACKLOG}. */
+    public Integer getBacklog() {
+        return mBacklog != null ? mBacklog : DEFAULT_BACKLOG;
+    }
+
+    /** Set {@link #mBacklog}. Value must be greater than 0. */
+    public void setBacklog(Integer backlog) {
+        if (backlog > 0)
+            mBacklog = backlog;
+    }
+
+
+    /**
+     * Get a log {@link String} for {@link LocalSocketRunConfig}.
+     *
+     * @param config The {@link LocalSocketRunConfig} to get info of.
+     * @return Returns the log {@link String}.
+     */
+    @NonNull
+    public static String getRunConfigLogString(final LocalSocketRunConfig config) {
+        if (config == null) return "null";
+        return config.getLogString();
+    }
+
+    /** Get a log {@link String} for the {@link LocalSocketRunConfig}. */
+    @NonNull
+    public String getLogString() {
+        StringBuilder logString = new StringBuilder();
+
+        logString.append(mTitle).append(" Socket Server Run Config:");
+        logString.append("\n").append(Logger.getSingleLineLogStringEntry("Path", mPath, "-"));
+        logString.append("\n").append(Logger.getSingleLineLogStringEntry("AbstractNamespaceSocket", mAbstractNamespaceSocket, "-"));
+        logString.append("\n").append(Logger.getSingleLineLogStringEntry("LocalSocketManagerClient", mLocalSocketManagerClient.getClass().getName(), "-"));
+        logString.append("\n").append(Logger.getSingleLineLogStringEntry("FD", mFD, "-"));
+        logString.append("\n").append(Logger.getSingleLineLogStringEntry("ReceiveTimeout", getReceiveTimeout(), "-"));
+        logString.append("\n").append(Logger.getSingleLineLogStringEntry("SendTimeout", getSendTimeout(), "-"));
+        logString.append("\n").append(Logger.getSingleLineLogStringEntry("Deadline", getDeadline(), "-"));
+        logString.append("\n").append(Logger.getSingleLineLogStringEntry("Backlog", getBacklog(), "-"));
+
+        return logString.toString();
+    }
+
+    /**
+     * Get a markdown {@link String} for {@link LocalSocketRunConfig}.
+     *
+     * @param config The {@link LocalSocketRunConfig} to get info of.
+     * @return Returns the markdown {@link String}.
+     */
+    public static String getRunConfigMarkdownString(final LocalSocketRunConfig config) {
+        if (config == null) return "null";
+        return config.getMarkdownString();
+    }
+
+    /** Get a markdown {@link String} for the {@link LocalSocketRunConfig}. */
+    @NonNull
+    public String getMarkdownString() {
+        StringBuilder markdownString = new StringBuilder();
+
+        markdownString.append("## ").append(mTitle).append(" Socket Server Run Config");
+        markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Path", mPath, "-"));
+        markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("AbstractNamespaceSocket", mAbstractNamespaceSocket, "-"));
+        markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("LocalSocketManagerClient", mLocalSocketManagerClient.getClass().getName(), "-"));
+        markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("FD", mFD, "-"));
+        markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("ReceiveTimeout", getReceiveTimeout(), "-"));
+        markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("SendTimeout", getSendTimeout(), "-"));
+        markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Deadline", getDeadline(), "-"));
+        markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Backlog", getBacklog(), "-"));
+
+        return markdownString.toString();
+    }
+
+
+
+    @NonNull
+    @Override
+    public String toString() {
+        return getLogString();
+    }
+
+}
diff --git a/termux-shared/src/main/java/com/termux/shared/net/socket/local/PeerCred.java b/termux-shared/src/main/java/com/termux/shared/net/socket/local/PeerCred.java
new file mode 100644
index 0000000000..8adab1f7e1
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/net/socket/local/PeerCred.java
@@ -0,0 +1,140 @@
+package com.termux.shared.net.socket.local;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+
+import com.termux.shared.android.ProcessUtils;
+import com.termux.shared.android.UserUtils;
+import com.termux.shared.logger.Logger;
+import com.termux.shared.markdown.MarkdownUtils;
+
+/** The {@link PeerCred} of the {@link LocalClientSocket} containing info of client/peer. */
+public class PeerCred {
+
+    public static final String LOG_TAG = "PeerCred";
+
+    /** Process Id. */
+    public int pid;
+    /** Process Name. */
+    public String pname;
+
+    /** User Id. */
+    public int uid;
+    /** User name. */
+    public String uname;
+
+    /** Group Id. */
+    public int gid;
+    /** Group name. */
+    public String gname;
+
+    /** Command line that started the process. */
+    public String cmdline;
+
+    PeerCred() {
+        // Initialize to -1 instead of 0 in case a failed getPeerCred()/getsockopt() call somehow doesn't report failure and returns the uid of root
+        pid = -1; uid = -1; gid = -1;
+    }
+
+    /** Set data that was not set by JNI. */
+    public void fillPeerCred(@NonNull Context context) {
+        fillUnameAndGname(context);
+        fillPname(context);
+    }
+
+    /** Set {@link #uname} and {@link #gname} if not set. */
+    public void fillUnameAndGname(@NonNull Context context) {
+       uname = UserUtils.getNameForUid(context, uid);
+
+       if (gid != uid)
+           gname = UserUtils.getNameForUid(context, gid);
+       else
+           gname = uname;
+    }
+
+    /** Set {@link #pname} if not set. */
+    public void fillPname(@NonNull Context context) {
+        // If jni did not set process name since it wouldn't be able to access /proc/<pid> of other
+        // users/apps, then try to see if any app has that pid, but this wouldn't check child
+        // processes of the app.
+        if (pid > 0 && pname == null)
+            pname = ProcessUtils.getAppProcessNameForPid(context, pid);
+    }
+
+    /**
+     * Get a log {@link String} for {@link PeerCred}.
+     *
+     * @param peerCred The {@link PeerCred} to get info of.
+     * @return Returns the log {@link String}.
+     */
+    @NonNull
+    public static String getPeerCredLogString(final PeerCred peerCred) {
+        if (peerCred == null) return "null";
+        return peerCred.getLogString();
+    }
+
+    /** Get a log {@link String} for the {@link PeerCred}. */
+    @NonNull
+    public String getLogString() {
+        StringBuilder logString = new StringBuilder();
+
+        logString.append("Peer Cred:");
+        logString.append("\n").append(Logger.getSingleLineLogStringEntry("Process", getProcessString(), "-"));
+        logString.append("\n").append(Logger.getSingleLineLogStringEntry("User", getUserString(), "-"));
+        logString.append("\n").append(Logger.getSingleLineLogStringEntry("Group", getGroupString(), "-"));
+
+        if (cmdline != null)
+            logString.append("\n").append(Logger.getMultiLineLogStringEntry("Cmdline", cmdline, "-"));
+
+        return logString.toString();
+    }
+
+    /**
+     * Get a markdown {@link String} for {@link PeerCred}.
+     *
+     * @param peerCred The {@link PeerCred} to get info of.
+     * @return Returns the markdown {@link String}.
+     */
+    public static String getPeerCredMarkdownString(final PeerCred peerCred) {
+        if (peerCred == null) return "null";
+        return peerCred.getMarkdownString();
+    }
+
+    /** Get a markdown {@link String} for the {@link PeerCred}. */
+    @NonNull
+    public String getMarkdownString() {
+        StringBuilder markdownString = new StringBuilder();
+
+        markdownString.append("## ").append("Peer Cred");
+        markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Process", getProcessString(), "-"));
+        markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("User", getUserString(), "-"));
+        markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Group", getGroupString(), "-"));
+
+        if (cmdline != null)
+            markdownString.append("\n").append(MarkdownUtils.getMultiLineMarkdownStringEntry("Cmdline", cmdline, "-"));
+
+        return markdownString.toString();
+    }
+
+    @NonNull
+    public String getMinimalString() {
+        return "process=" + getProcessString() + ", user=" + getUserString() + ", group=" + getGroupString();
+    }
+
+    @NonNull
+    public String getProcessString() {
+        return pname != null && !pname.isEmpty() ? pid + " (" + pname + ")" : String.valueOf(pid);
+    }
+
+    @NonNull
+    public String getUserString() {
+        return uname != null ? uid + " (" + uname + ")" : String.valueOf(uid);
+    }
+
+    @NonNull
+    public String getGroupString() {
+        return gname != null ? gid + " (" + gname + ")" : String.valueOf(gid);
+    }
+
+}
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/LocalFilesystemSocket.java b/termux-shared/src/main/java/com/termux/shared/shell/LocalFilesystemSocket.java
deleted file mode 100644
index 951e668c50..0000000000
--- a/termux-shared/src/main/java/com/termux/shared/shell/LocalFilesystemSocket.java
+++ /dev/null
@@ -1,273 +0,0 @@
-package com.termux.shared.shell;
-
-import android.content.Context;
-
-import androidx.annotation.NonNull;
-
-import com.termux.shared.logger.Logger;
-
-import java.io.Closeable;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.nio.charset.StandardCharsets;
-
-public class LocalFilesystemSocket
-{
-    static {
-        System.loadLibrary("local-filesystem-socket");
-    }
-    
-    /**
-     * Creates as UNIX server socket at {@code path}, with a backlog of {@code backlog}.
-     * @return The file descriptor of the server socket or -1 if an error occurred.
-     */
-    private static native int createserversocket(@NonNull byte[] path, int backlog);
-    
-    /**
-     * Accepts a connection on the supplied server socket.
-     * @return The file descriptor of the connection socket or -1 in case of an error.
-     */
-    private static native int accept(int fd);
-    
-    private static native void closefd(int fd);
-    
-    
-    /**
-     * Returns the UID of the socket peer, or -1 in case of an error.
-     */
-    private static native int getpeeruid(int fd);
-    
-    
-    /**
-     * Sends {@code data} over the socket and decrements the timeout by the elapsed time. If the timeout hits or an error occurs, false is returned, true otherwise.
-     */
-    private static native boolean send(@NonNull byte[] data, int fd, long deadline);
-    
-    /**
-     * Receives data from the socket and decrements the timeout by the elapsed time. If the timeout hits or an error occurs, -1 is returned, otherwise the number of received bytes.
-     */
-    private static native int recv(@NonNull byte[] data, int fd, long deadline);
-    
-    /**
-     * Sets the send and receive timeout for the socket in milliseconds.
-     */
-    private static native void settimeout(int fd, int timeout);
-    
-    /**
-     * Gets the number of bytes available to read on the socket.
-     */
-    private static native int available(int fd);
-    
-    
-    
-    
-    static class Socket implements Closeable {
-        private int fd;
-        private long deadline = 0;
-        private final SocketOutputStream out = new SocketOutputStream();
-        private final SocketInputStream in = new SocketInputStream();
-        
-        class SocketInputStream extends InputStream {
-            private final byte[] readb = new byte[1];
-            
-            @Override
-            public int read() throws IOException {
-                int ret = recv(readb);
-                if (ret == -1) {
-                    throw new IOException("Could not read from socket");
-                }
-                if (ret == 0) {
-                    return -1;
-                }
-                return readb[0];
-            }
-    
-            @Override
-            public int read(byte[] b) throws IOException {
-                if (b == null) {
-                    throw new NullPointerException("Read buffer  can't be null");
-                }
-                int ret = recv(b);
-                if (ret == -1) {
-                    throw new IOException("Could not read from socket");
-                }
-                if (ret == 0) {
-                    return -1;
-                }
-                return ret;
-            }
-    
-            @Override
-            public int available() {
-                return Socket.this.available();
-            }
-        }
-        
-        class SocketOutputStream extends OutputStream {
-            private final byte[] writeb = new byte[1];
-            
-            @Override
-            public void write(int b) throws IOException {
-                writeb[0] = (byte) b;
-                if (! send(writeb)) {
-                    throw new IOException("Could not write to socket");
-                }
-            }
-    
-            @Override
-            public void write(byte[] b) throws IOException {
-                if (! send(b)) {
-                    throw new IOException("Could not write to socket");
-                }
-            }
-        }
-        
-        private Socket(int fd) {
-            this.fd = fd;
-        }
-    
-    
-        /**
-         * Sets the socket timeout, that makes a single send/recv error out if it triggers. For a deadline after which the socket should be finished see setDeadline()
-         */
-        public void setTimeout(int timeout) {
-            if (fd != -1) {
-                settimeout(fd, timeout);
-            }
-        }
-    
-    
-        /**
-         * Sets the deadline in unix milliseconds. When the deadline has elapsed and the socket timeout triggers, all reads and writes will error.
-         */
-        public void setDeadline(long deadline) {
-            this.deadline = deadline;
-        }
-        
-        public boolean send(@NonNull byte[] data) {
-            if (fd == -1) {
-                return false;
-            }
-            return LocalFilesystemSocket.send(data, fd, deadline);
-        }
-    
-        public int recv(@NonNull byte[] data) {
-            if (fd == -1) {
-                return -1;
-            }
-            return LocalFilesystemSocket.recv(data, fd, deadline);
-        }
-        
-        public int available() {
-            if (fd == -1 || System.currentTimeMillis() > deadline) {
-                return 0;
-            }
-            return LocalFilesystemSocket.available(fd);
-        }
-        
-        @Override
-        public void close() throws IOException {
-            if (fd != -1) {
-                closefd(fd);
-                fd = -1;
-            }
-        }
-    
-        /**
-         * Returns the UID of the socket peer, or -1 in case of an error.
-         */
-        public int getPeerUID() {
-            return getpeeruid(fd); 
-        }
-        
-        /**
-         * Returns an {@link OutputStream} for the socket. You don't need to close the stream, it's automatically closed when closing the socket.
-         */
-        public OutputStream getOutputStream() {
-            return out;
-        }
-    
-        /**
-         * Returns an {@link InputStream} for the socket. You don't need to close the stream, it's automatically closed when closing the socket.
-         */
-        public InputStream getInputStream() {
-            return  in;
-        }
-    }
-    
-    
-    static class ServerSocket implements Closeable
-    {
-        private final String path;
-        private final Context app;
-        private int fd;
-        
-        public ServerSocket(Context c, String path, int backlog) throws IOException {
-            app = c.getApplicationContext();
-            if (backlog <= 0) {
-                throw new IllegalArgumentException("Backlog has to be at least 1");
-            }
-            if (path == null || path.length() == 0) {
-                throw new IllegalArgumentException("path cannot be null or empty");
-            }
-            this.path = path;
-            if (path.getBytes(StandardCharsets.UTF_8)[0] != 0) {
-                // not a socket in the abstract linux namespace, make sure the path is accessible and clear
-                File f = new File(path);
-                File parent = f.getParentFile();
-                if (parent != null) {
-                    parent.mkdirs();
-                }
-                f.delete();
-            }
-    
-            fd = createserversocket(path.getBytes(StandardCharsets.UTF_8), backlog);
-            if (fd == -1) {
-                throw new IOException("Could not create UNIX server socket at \""+path+"\"");
-            }
-        }
-        
-        public ServerSocket(Context c, String path) throws IOException {
-            this(c, path, 50); // 50 is the default value for the Android LocalSocket implementation, so this should be good here, too
-        }
-        
-        public Socket accept() {
-            if (fd == -1) {
-                return null;
-            }
-            int c = -1;
-            while (true) {
-                while (c == -1) {
-                    c = LocalFilesystemSocket.accept(fd);
-                }
-                int peeruid = getpeeruid(c);
-                if (peeruid == -1) {
-                    Logger.logWarn("LocalFilesystemSocket.ServerSocket", "Could not verify peer uid, closing socket");
-                    closefd(c);
-                    c = -1;
-                    continue;
-                }
-    
-                // if the peer has the same uid or is root, allow the connection
-                if (peeruid == app.getApplicationInfo().uid || peeruid == 0) {
-                    break;
-                } else {
-                    Logger.logWarn("LocalFilesystemSocket.ServerSocket", "WARNING: An app with the uid of "+peeruid+" tried to connect to the socket at \""+path+"\", closing connection.");
-                    closefd(c);
-                    c = -1;
-                }
-            }
-            return new Socket(c);
-        }
-        
-        @Override
-        public void close() throws IOException {
-            if (fd != -1) {
-                closefd(fd);
-                fd = -1;
-            }
-        }
-    }
-}
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/LocalSocketListener.java b/termux-shared/src/main/java/com/termux/shared/shell/LocalSocketListener.java
deleted file mode 100644
index 19322bf3d6..0000000000
--- a/termux-shared/src/main/java/com/termux/shared/shell/LocalSocketListener.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package com.termux.shared.shell;
-
-import android.app.Application;
-
-import androidx.annotation.NonNull;
-
-import com.termux.shared.logger.Logger;
-
-import java.io.BufferedWriter;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.PrintStream;
-
-public class LocalSocketListener
-{
-    public interface LocalSocketHandler {
-        int handle(String[] args, PrintStream out, PrintStream err);
-    }
-    
-    private static final String LOG_TAG = "LocalSocketListener";
-    
-    private final Thread thread;
-    private final LocalFilesystemSocket.ServerSocket server;
-    private final int timeoutMillis;
-    private final int deadlineMillis;
-    
-    
-    private LocalSocketListener(@NonNull Application a, @NonNull LocalSocketHandler h, @NonNull String path, int timeoutMillis, int deadlineMillis) throws IOException {
-        this.timeoutMillis = timeoutMillis;
-        this.deadlineMillis = deadlineMillis;
-        server = new LocalFilesystemSocket.ServerSocket(a, path);
-        thread = new Thread(new LocalSocketListenerRunnable(h));
-        thread.setUncaughtExceptionHandler((t, e) -> Logger.logStackTraceWithMessage(LOG_TAG, "Uncaught exception in LocalSocketListenerRunnable", e));
-        thread.start();
-    }
-    
-    public static LocalSocketListener tryEstablishLocalSocketListener(@NonNull Application a, @NonNull LocalSocketHandler h, @NonNull String address, int timeoutMillis, int deadlineMillis) {
-        try {
-            return new LocalSocketListener(a, h, address, timeoutMillis, deadlineMillis);
-        } catch (IOException e) {
-            return null;
-        }
-    }
-    
-    @SuppressWarnings("unused")
-    public void stop() {
-        try {
-            thread.interrupt();
-            server.close();
-        } catch (Exception ignored) {}
-    }
-    
-    private class LocalSocketListenerRunnable implements Runnable {
-        private final LocalSocketHandler h;
-        public LocalSocketListenerRunnable(@NonNull LocalSocketHandler h) {
-            this.h = h;
-        }
-        
-        @Override
-        public void run() {
-            try {
-                while (! Thread.currentThread().isInterrupted()) {
-                    try (LocalFilesystemSocket.Socket s = server.accept();
-                         OutputStream sockout = s.getOutputStream();
-                         InputStreamReader r = new InputStreamReader(s.getInputStream())) {
-                        
-                        
-                        
-                        s.setTimeout(timeoutMillis);
-                        s.setDeadline(System.currentTimeMillis()+deadlineMillis);
-                        
-                        StringBuilder b = new StringBuilder();
-                        int c;
-                        while ((c = r.read()) > 0) {
-                            b.append((char) c);
-                        }
-                        String outString;
-                        String errString;
-                        int ret;
-                        try (ByteArrayOutputStream out = new ByteArrayOutputStream();
-                             PrintStream outp = new PrintStream(out);
-                             ByteArrayOutputStream err = new ByteArrayOutputStream();
-                             PrintStream errp = new PrintStream(err)) {
-                            
-                            ret = h.handle(ArgumentTokenizer.tokenize(b.toString()).toArray(new String[0]), outp, errp);
-                            
-                            outp.flush();
-                            outString = out.toString("UTF-8");
-                            
-                            errp.flush();
-                            errString = err.toString("UTF-8");
-                        }
-                        try (BufferedWriter w = new BufferedWriter(new OutputStreamWriter(sockout))) {
-                            w.write(Integer.toString(ret));
-                            w.write('\0');
-                            w.write(outString);
-                            w.write('\0');
-                            w.write(errString);
-                            w.flush();
-                        }
-                    } catch (Exception e) {
-                        Logger.logStackTraceWithMessage(LOG_TAG, "Exception while handling connection", e);
-                    }
-                }
-            }
-            finally {
-                try {
-                    server.close();
-                } catch (Exception ignored) {}
-            }
-            Logger.logDebug(LOG_TAG, "LocalSocketListenerRunnable returned");
-        }
-    }
-}

From 53f26c9659df2919522c42f2b1c4c5c29de07e2f Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Mon, 18 Apr 2022 04:49:47 +0500
Subject: [PATCH 732/912] Changed: Refactor am socket server

The `AmSocketServer` now handles the entire logic for processing of am commands sent by clients and its results. This can be used by other apps as well to run their own am servers. The server started by `termux-app` will be managed by `TermuxAmSocketServer`. Read their javadocs for details.

The extended implementation `TermuxAmSocketServerClient` of `AmSocketServer.AmSocketServerClient`/`ILocalSocketManager` will also send a plugin error notification for all errors to the user instead of just logging to logcat since users are not very good at checking those, this should save dev time debugging problems. We may need to ignore notifications for some errors like broken pipe, based on their `Error` objects if they are normally expected, this requires further investigation.

The `TERMUX_APP_AM_SOCKET_SERVER_ENABLED` env variable will also be exported for all shell sessions and tasks for whether the server was successfully started on app startup. The user can disable the server by adding "run-termux-am-socket-server=false" to the "~/.termux/termux.properties" as implemented in 5f8a9222. The env variable will be checked by `$PREFIX/bin/termux-am` before attempting to connect.

The new path for the server socket is `/data/data/com.termux/files/apps/termux-app/termux-am/am.sock` as per `TERMUX_APP.APPS_DIR_PATH` added in bcd8f4c4.
---
 app/build.gradle                              |   4 -
 .../com/termux/app/TermuxApplication.java     |  15 +-
 termux-shared/build.gradle                    |   2 +
 .../shared/shell/am/AmSocketServer.java       | 239 ++++++++++++++++++
 .../shared/shell/am/AmSocketServerErrno.java  |  18 ++
 .../termux/shared/termux/TermuxConstants.java |   8 +-
 .../shared/termux/shell/TermuxShellUtils.java |   4 +
 .../termux/shell/am/TermuxAmSocketServer.java | 210 +++++++++++++++
 8 files changed, 482 insertions(+), 18 deletions(-)
 create mode 100644 termux-shared/src/main/java/com/termux/shared/shell/am/AmSocketServer.java
 create mode 100644 termux-shared/src/main/java/com/termux/shared/shell/am/AmSocketServerErrno.java
 create mode 100644 termux-shared/src/main/java/com/termux/shared/termux/shell/am/TermuxAmSocketServer.java

diff --git a/app/build.gradle b/app/build.gradle
index 5811c7edb7..853435690d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -25,10 +25,6 @@ android {
 
         implementation project(":terminal-view")
         implementation project(":termux-shared")
-
-
-        implementation 'com.github.termux:termux-am-library:1.0'
-        
     }
 
     defaultConfig {
diff --git a/app/src/main/java/com/termux/app/TermuxApplication.java b/app/src/main/java/com/termux/app/TermuxApplication.java
index d844c652bd..78a4bf520b 100644
--- a/app/src/main/java/com/termux/app/TermuxApplication.java
+++ b/app/src/main/java/com/termux/app/TermuxApplication.java
@@ -3,15 +3,14 @@
 import android.app.Application;
 import android.content.Context;
 
-import com.termux.am.Am;
 import com.termux.shared.errors.Error;
 import com.termux.shared.logger.Logger;
-import com.termux.shared.shell.LocalSocketListener;
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.termux.crash.TermuxCrashUtils;
 import com.termux.shared.termux.file.TermuxFileUtils;
 import com.termux.shared.termux.settings.preferences.TermuxAppSharedPreferences;
 import com.termux.shared.termux.settings.properties.TermuxAppSharedProperties;
+import com.termux.shared.termux.shell.am.TermuxAmSocketServer;
 import com.termux.shared.termux.theme.TermuxThemeUtils;
 
 public class TermuxApplication extends Application {
@@ -50,17 +49,8 @@ public void onCreate() {
                 Logger.logErrorExtended(LOG_TAG, "Create apps/termux-app directory failed\n" + error);
                 return;
             }
-        }
 
-        if (LocalSocketListener.tryEstablishLocalSocketListener(this, (args, out, err) -> {
-            try {
-                new Am(out, err, this).run(args);
-                return 0;
-            } catch (Exception e) {
-                return 1;
-            }
-        }, TermuxConstants.TERMUX_FILES_DIR_PATH+"/api/am-socket", 100, 1000) == null) {
-            Logger.logWarn("TermuxApplication", "am socket cannot be created");
+            TermuxAmSocketServer.setupTermuxAmSocketServer(context);
         }
     }
 
@@ -74,4 +64,3 @@ public static void setLogConfig(Context context) {
     }
 
 }
-
diff --git a/termux-shared/build.gradle b/termux-shared/build.gradle
index 97f60d49e0..0f3f6cf99a 100644
--- a/termux-shared/build.gradle
+++ b/termux-shared/build.gradle
@@ -26,6 +26,8 @@ android {
         implementation "commons-io:commons-io:2.5"
 
         implementation project(":terminal-view")
+
+        implementation 'com.github.termux:termux-am-library:1.0'
     }
 
     defaultConfig {
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/am/AmSocketServer.java b/termux-shared/src/main/java/com/termux/shared/shell/am/AmSocketServer.java
new file mode 100644
index 0000000000..f94e345311
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/shell/am/AmSocketServer.java
@@ -0,0 +1,239 @@
+package com.termux.shared.shell.am;
+
+import android.app.Application;
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.termux.am.Am;
+import com.termux.shared.errors.Error;
+import com.termux.shared.logger.Logger;
+import com.termux.shared.net.socket.local.ILocalSocketManager;
+import com.termux.shared.net.socket.local.LocalClientSocket;
+import com.termux.shared.net.socket.local.LocalServerSocket;
+import com.termux.shared.net.socket.local.LocalSocketManager;
+import com.termux.shared.net.socket.local.LocalSocketManagerClientBase;
+import com.termux.shared.net.socket.local.LocalSocketRunConfig;
+import com.termux.shared.shell.ArgumentTokenizer;
+import com.termux.shared.shell.command.ExecutionCommand;
+
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * A AF_UNIX/SOCK_STREAM local server managed with {@link LocalSocketManager} whose
+ * {@link LocalServerSocket} receives android activity manager (am) commands from {@link LocalClientSocket}
+ * and runs them with termux-am-library. It would normally only allow processes belonging to the
+ * server app's user and root user to connect to it.
+ *
+ * The client must send the am command as a string without the initial "am" arg on its output stream
+ * and then wait for the result on its input stream. The result of the execution or error is sent
+ * back in the format `exit_code\0stdout\0stderr\0` where `\0` represents a null character.
+ * Check termux/termux-am-socket for implementation of a native c client.
+ *
+ * Usage:
+ * 1. Optionally extend {@link AmSocketServerClient}, the implementation for
+ *    {@link ILocalSocketManager} that will receive call backs from the server including
+ *    when client connects via {@link ILocalSocketManager#onClientAccepted(LocalSocketManager, LocalClientSocket)}.
+ * 2. Create a {@link LocalSocketRunConfig} instance with the run config of the am server. It would
+ *    be better to use a filesystem socket instead of abstract namespace socket for security reasons.
+ * 3. Call {@link #start(Context, LocalSocketRunConfig)} to start the server and store the {@link LocalSocketManager}
+ *    instance returned.
+ * 4. Stop server if needed with a call to {@link LocalSocketManager#stop()} on the
+ *    {@link LocalSocketManager} instance returned by start call.
+ *
+ * https://github.com/termux/termux-am-library/blob/main/termux-am-library/src/main/java/com/termux/am/Am.java
+ * https://github.com/termux/termux-am-socket
+ * https://developer.android.com/studio/command-line/adb#am
+ * https://cs.android.com/android/platform/superproject/+/android-12.0.0_r32:frameworks/base/services/core/java/com/android/server/am/ActivityManagerShellCommand.java
+ */
+public class AmSocketServer {
+
+    public static final String LOG_TAG = "AmSocketServer";
+
+    /**
+     * Create the {@link AmSocketServer} {@link LocalServerSocket} and start listening for new {@link LocalClientSocket}.
+     *
+     * @param context The {@link Context} for {@link LocalSocketManager}.
+     * @param localSocketRunConfig The {@link LocalSocketRunConfig} for {@link LocalSocketManager}.
+     */
+    public static synchronized LocalSocketManager start(@NonNull Context context,
+                                                        @NonNull LocalSocketRunConfig localSocketRunConfig) {
+        LocalSocketManager localSocketManager = new LocalSocketManager(context, localSocketRunConfig);
+        Error error = localSocketManager.start();
+        if (error != null) {
+            localSocketManager.onError(error);
+            return null;
+        }
+
+        return localSocketManager;
+    }
+
+    public static void processAmClient(@NonNull LocalSocketManager localSocketManager,
+                                       @NonNull LocalClientSocket clientSocket) {
+        Error error;
+
+        // Read amCommandString client sent and close input stream
+        StringBuilder data = new StringBuilder();
+        error = clientSocket.readDataOnInputStream(data, true);
+        if (error != null) {
+            sendResultToClient(localSocketManager, clientSocket, 1, null, error.toString());
+            return;
+        }
+
+        String amCommandString = data.toString();
+
+        Logger.logVerbose(LOG_TAG, "am command received from peer " + clientSocket.getPeerCred().getMinimalString() +
+            "\nam command: `" + amCommandString + "`");
+
+        // Parse am command string and convert it to a list of arguments
+        List<String> amCommandList = new ArrayList<>();
+        error = parseAmCommand(amCommandString, amCommandList);
+        if (error != null) {
+            sendResultToClient(localSocketManager, clientSocket, 1, null, error.toString());
+            return;
+        }
+
+        String[] amCommandArray = amCommandList.toArray(new String[0]);
+
+        Logger.logDebug(LOG_TAG, "am command received from peer " + clientSocket.getPeerCred().getMinimalString() +
+            "\n" + ExecutionCommand.getArgumentsLogString("am command", amCommandArray));
+
+        // Run am command and send its result to the client
+        StringBuilder stdout = new StringBuilder();
+        StringBuilder stderr = new StringBuilder();
+        error = runAmCommand(localSocketManager.getContext(), amCommandArray, stdout, stderr);
+        if (error != null) {
+            sendResultToClient(localSocketManager, clientSocket, 1, stdout.toString(),
+                !stderr.toString().isEmpty() ? stderr + "\n\n" + error : error.toString());
+        }
+
+        sendResultToClient(localSocketManager, clientSocket, 0, stdout.toString(), stderr.toString());
+    }
+
+    /**
+     * Send result to {@link LocalClientSocket} that requested the am command to be run.
+     *
+     * @param localSocketManager The {@link LocalSocketManager} instance for the local socket.
+     * @param clientSocket The {@link LocalClientSocket} to which the result is to be sent.
+     * @param exitCode The exit code value to send.
+     * @param stdout The stdout value to send.
+     * @param stderr The stderr value to send.
+     */
+    public static void sendResultToClient(@NonNull LocalSocketManager localSocketManager,
+                                          @NonNull LocalClientSocket clientSocket,
+                                          int exitCode,
+                                          @Nullable String stdout, @Nullable String stderr) {
+        StringBuilder result = new StringBuilder();
+        result.append(sanitizeExitCode(clientSocket, exitCode));
+        result.append('\0');
+        result.append(stdout != null ? stdout : "");
+        result.append('\0');
+        result.append(stderr != null ? stderr : "");
+
+        // Send result to client and close output stream
+        Error error = clientSocket.sendDataToOutputStream(result.toString(), true);
+        if (error != null) {
+            localSocketManager.onError(clientSocket, error);
+        }
+    }
+
+    /**
+     * Sanitize exitCode to between 0-255, otherwise it may be considered invalid.
+     * Out of bound exit codes would return with exit code `44` `Channel number out of range` in shell.
+     *
+     * @param clientSocket The {@link LocalClientSocket} to which the exit code will be sent.
+     * @param exitCode The current exit code.
+     * @return Returns the sanitized exit code.
+     */
+    public static int sanitizeExitCode(@NonNull LocalClientSocket clientSocket, int exitCode) {
+        if (exitCode < 0 || exitCode > 255) {
+            Logger.logWarn(LOG_TAG, "Ignoring invalid peer "  + clientSocket.getPeerCred().getMinimalString() + " result value \"" + exitCode + "\" and force setting it to \"" + 1 + "\"");
+            exitCode = 1;
+        }
+
+        return exitCode;
+    }
+
+
+    /**
+     * Parse amCommandString into a list of arguments like normally done on shells like bourne shell.
+     * Arguments are split on whitespaces unless quoted with single or double quotes.
+     * Double quotes and backslashes can be escaped with backslashes in arguments surrounded.
+     * Double quotes and backslashes can be escaped with backslashes in arguments surrounded with
+     * double quotes.
+     *
+     * @param amCommandString The am command {@link String}.
+     * @param amCommandList The {@link List<String>} to set list of arguments in.
+     * @return Returns the {@code error} if parsing am command failed, otherwise {@code null}.
+     */
+    public static Error parseAmCommand(String amCommandString, List<String> amCommandList) {
+
+        if (amCommandString == null || amCommandString.isEmpty()) {
+            return null;
+        }
+
+        try {
+            amCommandList.addAll(ArgumentTokenizer.tokenize(amCommandString));
+        } catch (Exception e) {
+            return AmSocketServerErrno.ERRNO_PARSE_AM_COMMAND_FAILED_WITH_EXCEPTION.getError(e, amCommandString, e.getMessage());
+        }
+
+        return null;
+    }
+
+    /**
+     * Call termux-am-library to run the am command.
+     *
+     * @param context The {@link Context} to run am command with.
+     * @param amCommandArray The am command array.
+     * @param stdout The {@link StringBuilder} to set stdout in that is returned by the am command.
+     * @param stderr The {@link StringBuilder} to set stderr in that is returned by the am command.
+     * @return Returns the {@code error} if am command failed, otherwise {@code null}.
+     */
+    public static Error runAmCommand(@NonNull Context context,
+                                     String[] amCommandArray,
+                                     @NonNull StringBuilder stdout, @NonNull StringBuilder stderr) {
+        try (ByteArrayOutputStream stdoutByteStream = new ByteArrayOutputStream();
+             PrintStream stdoutPrintStream = new PrintStream(stdoutByteStream);
+             ByteArrayOutputStream stderrByteStream = new ByteArrayOutputStream();
+             PrintStream stderrPrintStream = new PrintStream(stderrByteStream)) {
+
+            new Am(stdoutPrintStream, stderrPrintStream, (Application) context.getApplicationContext()).run(amCommandArray);
+
+            // Set stdout to value set by am command in stdoutPrintStream
+            stdoutPrintStream.flush();
+            stdout.append(stdoutByteStream.toString(StandardCharsets.UTF_8.name()));
+
+            // Set stderr to value set by am command in stderrPrintStream
+            stderrPrintStream.flush();
+            stderr.append(stderrByteStream.toString(StandardCharsets.UTF_8.name()));
+        } catch (Exception e) {
+            return AmSocketServerErrno.ERRNO_RUN_AM_COMMAND_FAILED_WITH_EXCEPTION.getError(e, Arrays.toString(amCommandArray), e.getMessage());
+        }
+
+        return null;
+    }
+
+
+
+
+
+    /** Implementation for {@link ILocalSocketManager} for {@link AmSocketServer}. */
+    public abstract static class AmSocketServerClient extends LocalSocketManagerClientBase {
+
+        @Override
+        public void onClientAccepted(@NonNull LocalSocketManager localSocketManager,
+                                     @NonNull LocalClientSocket clientSocket) {
+            AmSocketServer.processAmClient(localSocketManager, clientSocket);
+            super.onClientAccepted(localSocketManager, clientSocket);
+        }
+
+    }
+
+}
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/am/AmSocketServerErrno.java b/termux-shared/src/main/java/com/termux/shared/shell/am/AmSocketServerErrno.java
new file mode 100644
index 0000000000..74b26528dc
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/shell/am/AmSocketServerErrno.java
@@ -0,0 +1,18 @@
+package com.termux.shared.shell.am;
+
+import com.termux.shared.errors.Errno;
+
+public class AmSocketServerErrno extends Errno {
+
+    public static final String TYPE = "AmSocketServer Error";
+
+
+    /** Errors for {@link AmSocketServer} (100-150) */
+    public static final Errno ERRNO_PARSE_AM_COMMAND_FAILED_WITH_EXCEPTION = new Errno(TYPE, 100, "Parse am command `%1$s` failed.\nException: %2$s");
+    public static final Errno ERRNO_RUN_AM_COMMAND_FAILED_WITH_EXCEPTION = new Errno(TYPE, 101, "Run am command `%1$s` failed.\nException: %2$s");
+
+    AmSocketServerErrno(final String type, final int code, final String message) {
+        super(type, code, message);
+    }
+
+}
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
index d400e69396..3a33eb52ea 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
@@ -11,7 +11,7 @@
 import java.util.List;
 
 /*
- * Version: v0.40.0
+ * Version: v0.41.0
  * SPDX-License-Identifier: MIT
  *
  * Changelog
@@ -236,6 +236,9 @@
  *
  * - 0.40.0 (2022-04-17)
  *      - Added `TERMUX_APPS_DIR_PATH` and `TERMUX_APP.APPS_DIR_PATH`.
+ *
+ * - 0.41.0 (2022-04-17)
+ *      - Added `TERMUX_APP.TERMUX_AM_SOCKET_FILE_PATH`.
  */
 
 /**
@@ -883,6 +886,9 @@ public static final class TERMUX_APP {
         /** Termux apps directory path */
         public static final String APPS_DIR_PATH = TERMUX_APPS_DIR_PATH + "/termux-app"; // Default: "/data/data/com.termux/files/apps/termux-app"
 
+        /** termux-am socket file path */
+        public static final String TERMUX_AM_SOCKET_FILE_PATH = APPS_DIR_PATH + "/termux-am/am.sock"; // Default: "/data/data/com.termux/files/apps/termux-app/termux-am/am.sock"
+
 
         /** Termux app core activity name. */
         public static final String TERMUX_ACTIVITY_NAME = TERMUX_PACKAGE_NAME + ".app.TermuxActivity"; // Default: "com.termux.app.TermuxActivity"
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/shell/TermuxShellUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/shell/TermuxShellUtils.java
index f3771f43a6..8ac6d2586f 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/shell/TermuxShellUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/shell/TermuxShellUtils.java
@@ -28,9 +28,11 @@ public class TermuxShellUtils {
     public static String TERMUX_IS_DEBUGGABLE_BUILD;
     public static String TERMUX_APP_PID;
     public static String TERMUX_APK_RELEASE;
+    public static Boolean TERMUX_APP_AM_SOCKET_SERVER_ENABLED;
 
     public static String TERMUX_API_VERSION_NAME;
 
+
     private static final String LOG_TAG = "TermuxShellUtils";
 
     public static String getDefaultWorkingDirectoryPath() {
@@ -59,6 +61,8 @@ public static String[] buildEnvironment(Context currentPackageContext, boolean i
             environment.add("TERMUX_APP_PID=" + TERMUX_APP_PID);
         if (TERMUX_APK_RELEASE != null)
             environment.add("TERMUX_APK_RELEASE=" + TERMUX_APK_RELEASE);
+        if (TERMUX_APP_AM_SOCKET_SERVER_ENABLED != null)
+            environment.add("TERMUX_APP_AM_SOCKET_SERVER_ENABLED=" + TERMUX_APP_AM_SOCKET_SERVER_ENABLED);
 
         if (TERMUX_API_VERSION_NAME != null)
             environment.add("TERMUX_API_VERSION=" + TERMUX_API_VERSION_NAME);
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/shell/am/TermuxAmSocketServer.java b/termux-shared/src/main/java/com/termux/shared/termux/shell/am/TermuxAmSocketServer.java
new file mode 100644
index 0000000000..32116b3083
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/termux/shell/am/TermuxAmSocketServer.java
@@ -0,0 +1,210 @@
+package com.termux.shared.termux.shell.am;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.termux.shared.errors.Error;
+import com.termux.shared.logger.Logger;
+import com.termux.shared.net.socket.local.LocalClientSocket;
+import com.termux.shared.net.socket.local.LocalServerSocket;
+import com.termux.shared.net.socket.local.LocalSocketManager;
+import com.termux.shared.net.socket.local.LocalSocketManagerClientBase;
+import com.termux.shared.net.socket.local.LocalSocketRunConfig;
+import com.termux.shared.shell.am.AmSocketServer;
+import com.termux.shared.termux.TermuxConstants;
+import com.termux.shared.termux.crash.TermuxCrashUtils;
+import com.termux.shared.termux.plugins.TermuxPluginUtils;
+import com.termux.shared.termux.settings.properties.TermuxAppSharedProperties;
+import com.termux.shared.termux.settings.properties.TermuxPropertyConstants;
+import com.termux.shared.termux.shell.TermuxShellUtils;
+
+/**
+ * A wrapper for {@link AmSocketServer} for termux-app usage.
+ *
+ * The static {@link #termuxAmSocketServer} variable stores the {@link LocalSocketManager} for the
+ * {@link AmSocketServer}.
+ *
+ * The {@link TermuxAmSocketServerClient} extends the {@link AmSocketServer.AmSocketServerClient}
+ * class to also show plugin error notifications for errors and disallowed client connections in
+ * addition to logging the messages to logcat, which are only logged by {@link LocalSocketManagerClientBase}
+ * if log level is debug or higher for privacy issues.
+ *
+ * It uses a filesystem socket server with the socket file at
+ * {@link TermuxConstants.TERMUX_APP#TERMUX_AM_SOCKET_FILE_PATH}. It would normally only allow
+ * processes belonging to the termux user and root user to connect to it. If commands are sent by the
+ * root user, then the am commands executed will be run as the termux user and its permissions,
+ * capabilities and selinux context instead of root.
+ *
+ * The `$PREFIX/bin/termux-am` client connects to the server via `$PREFIX/bin/termux-am-socket` to
+ * run the am commands. It provides similar functionality to "$PREFIX/bin/am"
+ * (and "/system/bin/am"), but should be faster since it does not require starting a dalvik vm for
+ * every command as done by "am" via termux/TermuxAm.
+ *
+ * The server is started by termux-app Application class but is not started if
+ * {@link TermuxPropertyConstants#KEY_RUN_TERMUX_AM_SOCKET_SERVER} is `false` which can be done by
+ * adding the prop with value "false" to the "~/.termux/termux.properties" file. Changes
+ * require termux-app to be force stopped and restarted.
+ *
+ * The current state of the server can be checked with the
+ * {@link TermuxShellUtils#TERMUX_APP_AM_SOCKET_SERVER_ENABLED} env variable, which is exported
+ * for all shell sessions and tasks.
+ *
+ * https://github.com/termux/termux-am-socket
+ * https://github.com/termux/TermuxAm
+ */
+public class TermuxAmSocketServer {
+
+    public static final String LOG_TAG = "TermuxAmSocketServer";
+
+    public static final String TITLE = "TermuxAm";
+
+    /** The static instance for the {@link TermuxAmSocketServer} {@link LocalSocketManager}. */
+    private static LocalSocketManager termuxAmSocketServer;
+
+    /**
+     * Setup the {@link AmSocketServer} {@link LocalServerSocket} and start listening for
+     * new {@link LocalClientSocket} if enabled.
+     *
+     * @param context The {@link Context} for {@link LocalSocketManager}.
+     */
+    public static void setupTermuxAmSocketServer(@NonNull Context context) {
+        // Start termux-am-socket server if enabled by user
+        boolean enabled = false;
+        if (TermuxAppSharedProperties.getProperties().shouldRunTermuxAmSocketServer()) {
+            Logger.logDebug(LOG_TAG, "Starting " + TITLE + " socket server since its enabled");
+            start(context);
+            if (termuxAmSocketServer != null && termuxAmSocketServer.isRunning()) {
+                enabled = true;
+                Logger.logDebug(LOG_TAG, TITLE + " socket server successfully started");
+            }
+        } else {
+            Logger.logDebug(LOG_TAG, "Not starting " + TITLE + " socket server since its not enabled");
+        }
+
+        // Once termux-app has started, the server state must not be changed since the variable is
+        // exported in shell sessions and tasks and if state is changed, then env of older shells will
+        // retain invalid value. User should force stop the app to update state after changing prop.
+        TermuxShellUtils.TERMUX_APP_AM_SOCKET_SERVER_ENABLED = enabled;
+    }
+
+    /**
+     * Create the {@link AmSocketServer} {@link LocalServerSocket} and start listening for new {@link LocalClientSocket}.
+     */
+    public static synchronized void start(@NonNull Context context) {
+        stop();
+
+        LocalSocketRunConfig localSocketRunConfig = new LocalSocketRunConfig(TITLE,
+            TermuxConstants.TERMUX_APP.TERMUX_AM_SOCKET_FILE_PATH, new TermuxAmSocketServerClient());
+
+        termuxAmSocketServer = AmSocketServer.start(context, localSocketRunConfig);
+    }
+
+    /**
+     * Stop the {@link AmSocketServer} {@link LocalServerSocket} and stop listening for new {@link LocalClientSocket}.
+     */
+    public static synchronized void stop() {
+        if (termuxAmSocketServer != null) {
+            Error error = termuxAmSocketServer.stop();
+            if (error != null) {
+                termuxAmSocketServer.onError(error);
+            }
+            termuxAmSocketServer = null;
+        }
+    }
+    
+    /**
+     * Update the state of the {@link AmSocketServer} {@link LocalServerSocket} depending on current
+     * value of {@link TermuxPropertyConstants#KEY_RUN_TERMUX_AM_SOCKET_SERVER}.
+     */
+    public static synchronized void updateState(@NonNull Context context) {
+        TermuxAppSharedProperties properties = TermuxAppSharedProperties.getProperties();
+        if (properties.shouldRunTermuxAmSocketServer()) {
+            if (termuxAmSocketServer == null) {
+                Logger.logDebug(LOG_TAG, "updateState: Starting " + TITLE + " socket server");
+                start(context);
+            }
+        } else {
+            if (termuxAmSocketServer != null) {
+                Logger.logDebug(LOG_TAG, "updateState: Disabling " + TITLE + " socket server");
+                stop();
+            }
+        }
+    }
+    
+    /**
+     * Get {@link #termuxAmSocketServer}.
+     */
+    public static synchronized LocalSocketManager getTermuxAmSocketServer() {
+        return termuxAmSocketServer;
+    }
+
+    /**
+     * Show an error notification on the {@link TermuxConstants#TERMUX_PLUGIN_COMMAND_ERRORS_NOTIFICATION_CHANNEL_ID}
+     * {@link TermuxConstants#TERMUX_PLUGIN_COMMAND_ERRORS_NOTIFICATION_CHANNEL_NAME} with a call
+     * to {@link TermuxPluginUtils#sendPluginCommandErrorNotification(Context, String, CharSequence, String, String)}.
+     *
+     * @param context The {@link Context} to send the notification with.
+     * @param error The {@link Error} generated.
+     * @param localSocketRunConfig The {@link LocalSocketRunConfig} for {@link LocalSocketManager}.
+     * @param clientSocket The optional {@link LocalClientSocket} for which the error was generated.
+     */
+    public static synchronized void showErrorNotification(@NonNull Context context, @NonNull Error error,
+                                                          @NonNull LocalSocketRunConfig localSocketRunConfig,
+                                                          @Nullable LocalClientSocket clientSocket) {
+        TermuxPluginUtils.sendPluginCommandErrorNotification(context, LOG_TAG,
+            localSocketRunConfig.getTitle() + " Socket Server Error", error.getMinimalErrorString(),
+            LocalSocketManager.getErrorMarkdownString(error, localSocketRunConfig, clientSocket));
+    }
+
+
+
+
+
+    /** Enhanced implementation for {@link AmSocketServer.AmSocketServerClient} for {@link TermuxAmSocketServer}. */
+    public static class TermuxAmSocketServerClient extends AmSocketServer.AmSocketServerClient {
+
+        public static final String LOG_TAG = "TermuxAmSocketServerClient";
+
+        @Nullable
+        @Override
+        public Thread.UncaughtExceptionHandler getLocalSocketManagerClientThreadUEH(
+            @NonNull LocalSocketManager localSocketManager) {
+            // Use termux crash handler for socket listener thread just like used for main app process thread.
+            return TermuxCrashUtils.getCrashHandler(localSocketManager.getContext());
+        }
+
+        @Override
+        public void onError(@NonNull LocalSocketManager localSocketManager,
+                            @Nullable LocalClientSocket clientSocket, @NonNull Error error) {
+            // Don't show notification if server is not running since errors may be triggered
+            // when server is stopped and server and client sockets are closed.
+            if (localSocketManager.isRunning()) {
+                TermuxAmSocketServer.showErrorNotification(localSocketManager.getContext(), error,
+                    localSocketManager.getLocalSocketRunConfig(), clientSocket);
+            }
+
+            // But log the exception
+            super.onError(localSocketManager, clientSocket, error);
+        }
+
+        @Override
+        public void onDisallowedClientConnected(@NonNull LocalSocketManager localSocketManager,
+                                                @NonNull LocalClientSocket clientSocket, @NonNull Error error) {
+            // Always show notification and log error regardless of if server is running or not
+            TermuxAmSocketServer.showErrorNotification(localSocketManager.getContext(), error,
+                localSocketManager.getLocalSocketRunConfig(), clientSocket);
+            super.onDisallowedClientConnected(localSocketManager, clientSocket, error);
+        }
+
+
+
+        @Override
+        protected String getLogTag() {
+            return LOG_TAG;
+        }
+
+    }
+
+}

From 7f7d889dd0fa53cd35408a09b9c5686f3602d152 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 20 Apr 2022 02:08:58 +0500
Subject: [PATCH 733/912] Fixed: Fix proguard removing JNI used methods for
 release builds

```
Exception in createServerSocketNative():
java.lang.NoSuchMethodError: no non-static method "Lcom/termux/shared/jni/models/JniResult;.<init>(IILjava/lang/String;I)V"
	at com.termux.shared.net.socket.local.LocalSocketManager.createServerSocketNative(Native Method)
	at com.termux.shared.net.socket.local.LocalSocketManager.createServerSocket(LocalSocketManager.java:125)
	at com.termux.shared.net.socket.local.LocalServerSocket.start(LocalServerSocket.java:100)
	at com.termux.shared.net.socket.local.LocalSocketManager.start(LocalSocketManager.java:84)
	at com.termux.shared.shell.am.AmSocketServer.start(AmSocketServer.java:68)
	at com.termux.shared.termux.shell.am.TermuxAmSocketServer.start(TermuxAmSocketServer.java:101)
	at com.termux.shared.termux.shell.am.TermuxAmSocketServer.setupTermuxAmSocketServer(TermuxAmSocketServer.java:77)
	at com.termux.app.TermuxApplication.onCreate(TermuxApplication.java:53)
	at android.app.Instrumentation.callApplicationOnCreate(Instrumentation.java:1192)
	at android.app.ActivityThread.handleBindApplication(ActivityThread.java:6719)
	at android.app.ActivityThread.access$1300(ActivityThread.java:237)
	at android.app.ActivityThread$H.handleMessage(ActivityThread.java:1913)
	at android.os.Handler.dispatchMessage(Handler.java:106)
	at android.os.Looper.loop(Looper.java:223)
	at android.app.ActivityThread.main(ActivityThread.java:7664)
	at java.lang.reflect.Method.invoke(Native Method)
	at com.android.internal.os.RuntimeInit$MethodAndArgsCaller.run(RuntimeInit.java:592)
	at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:947)
```
---
 .../src/main/java/com/termux/shared/jni/models/JniResult.java   | 2 ++
 .../main/java/com/termux/shared/net/socket/local/PeerCred.java  | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/termux-shared/src/main/java/com/termux/shared/jni/models/JniResult.java b/termux-shared/src/main/java/com/termux/shared/jni/models/JniResult.java
index 34c38a8feb..3621f9f3a6 100644
--- a/termux-shared/src/main/java/com/termux/shared/jni/models/JniResult.java
+++ b/termux-shared/src/main/java/com/termux/shared/jni/models/JniResult.java
@@ -1,5 +1,6 @@
 package com.termux.shared.jni.models;
 
+import androidx.annotation.Keep;
 import androidx.annotation.NonNull;
 
 import com.termux.shared.logger.Logger;
@@ -11,6 +12,7 @@
  * https://docs.oracle.com/javase/7/docs/technotes/guides/jni/spec/functions.html
  * https://developer.android.com/training/articles/perf-jni
  */
+@Keep
 public class JniResult {
 
     /**
diff --git a/termux-shared/src/main/java/com/termux/shared/net/socket/local/PeerCred.java b/termux-shared/src/main/java/com/termux/shared/net/socket/local/PeerCred.java
index 8adab1f7e1..6674eee0f7 100644
--- a/termux-shared/src/main/java/com/termux/shared/net/socket/local/PeerCred.java
+++ b/termux-shared/src/main/java/com/termux/shared/net/socket/local/PeerCred.java
@@ -2,6 +2,7 @@
 
 import android.content.Context;
 
+import androidx.annotation.Keep;
 import androidx.annotation.NonNull;
 
 import com.termux.shared.android.ProcessUtils;
@@ -10,6 +11,7 @@
 import com.termux.shared.markdown.MarkdownUtils;
 
 /** The {@link PeerCred} of the {@link LocalClientSocket} containing info of client/peer. */
+@Keep
 public class PeerCred {
 
     public static final String LOG_TAG = "PeerCred";

From 4b3b1a5b6a39bd390b430722e523dd623b2ad1ae Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 23 Apr 2022 01:49:36 +0500
Subject: [PATCH 734/912] Changed: Bump bootstrap to v2022.04.22-r1

---
 app/build.gradle | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 853435690d..a4fe8b3153 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -196,11 +196,11 @@ clean {
 
 task downloadBootstraps() {
     doLast {
-        def version = "2022.04.21-r1"
-        downloadBootstrap("aarch64", "6ef5d51ebcc98cabec178de58b3846d192e3c47f1575f6319c0d55b4b2550ee8", version)
-        downloadBootstrap("arm",     "39f371b9b0892a5e263993eab8fc8d1f58020a7df78372d134184e8da3d5d18e", version)
-        downloadBootstrap("i686",    "2355c44da98c3990bce1fc527e36b9f9f913bb8d814d73601811fc62bb86d864", version)
-        downloadBootstrap("x86_64",  "21ced5aacde882999306a46f913191bbea134af38532fb85ef958f6822a8730c", version)
+        def version = "2022.04.22-r1"
+        downloadBootstrap("aarch64", "ec8a6043644594fc24681cffaf9c7b32f5bc68df7491c5df9a060e40e1934c70", version)
+        downloadBootstrap("arm",     "f8ec9505081b81da0ee66413762c52e6cb4a6ebd7be1a2a5ddee8953e0795dc9", version)
+        downloadBootstrap("i686",    "0491f12ed84a5ef3c28bd742311fed9f176e32100a2c6bbdb017df8f48044484", version)
+        downloadBootstrap("x86_64",  "94073a0e136bf5a9c05c1997a55dc261248f4ccb8bffaa9a950a132529cd1529", version)
     }
 }
 

From b950efec27e71455c9e2c594c7ee45999927ed0b Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 28 Apr 2022 09:33:20 +0500
Subject: [PATCH 735/912] Added: Add support for `TERMUX_APP_PACKAGE_MANAGER`
 and `TERMUX_APP_PACKAGE_VARIANT` to build APKs with different package manager
 configurations

The `TermuxBootstrap` class has been added that defines the `PackageManager` and `PackageVariant` classes for the supported package manager configurations for the app. The variant is defined by the `project.ext.packageVariant` value in the `app/build.gradle` and its value is used by the `build.gradle` to pack its respective bootstrap zips in the app APK at build time and the value is used to set `TermuxBootstrap.TERMUX_APP_PACKAGE_MANAGER` and `TermuxBootstrap.TERMUX_APP_PACKAGE_VARIANT` static values that are used at runtime by the app to run variant specific code. The manager is automatically extracted from the variant as the substring before first dash `-`.

The default variant is `apt-android-7` and it can either be replaced in `app/build.gradle` manually or the `TERMUX_PACKAGE_VARIANT` env variable can be exported in which the build command is run.

The `TERMUX_APP_PACKAGE_MANAGER` and `TERMUX_APP_PACKAGE_VARIANT` environmental variables will be exported by the app and they will also be added in Termux app info in about page and reports, allowing users and devs to know which variant is currently installed.

Bootstrap of a different variant must not be manually installed by the user after app installation by replacing `$PREFIX` since app code is dependant on the variant used to build the APK.

Currently, `apt-android-7` and `apt-android-5` variants will be built for by the workflows but they will fail for `apt-android-5` since `build.gradle` support is currently not enabled and will be enabled by a pull request that adds support for Android 5. The workflow needs to try to build the `apt-android-5` variant so that pull request builds are generated.
---
 .../attach_debug_apks_to_release.yml          |  22 ++-
 .github/workflows/debug_build.yml             |  22 ++-
 app/build.gradle                              |  33 +++-
 .../com/termux/app/TermuxApplication.java     |   5 +
 .../terminal/TermuxTerminalViewClient.java    |   9 +-
 .../termux/shared/termux/TermuxBootstrap.java | 174 ++++++++++++++++++
 .../com/termux/shared/termux/TermuxUtils.java |   5 +
 .../shared/termux/shell/TermuxShellUtils.java |   5 +
 8 files changed, 250 insertions(+), 25 deletions(-)
 create mode 100644 termux-shared/src/main/java/com/termux/shared/termux/TermuxBootstrap.java

diff --git a/.github/workflows/attach_debug_apks_to_release.yml b/.github/workflows/attach_debug_apks_to_release.yml
index c27cbf23e9..5c95e788ba 100644
--- a/.github/workflows/attach_debug_apks_to_release.yml
+++ b/.github/workflows/attach_debug_apks_to_release.yml
@@ -8,8 +8,13 @@ on:
 jobs:
   attach-apks:
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        package_variant: [ apt-android-7, apt-android-5 ]
     env:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
     steps:
       - name: Clone repository
         uses: actions/checkout@v2
@@ -18,6 +23,8 @@ jobs:
 
       - name: Build and attach APKs to release
         shell: bash {0}
+        env:
+          PACKAGE_VARIANT: ${{ matrix.package_variant }}
         run: |
           exit_on_error() {
               echo "$1"
@@ -34,13 +41,14 @@ jobs:
           fi
 
           APK_DIR_PATH="./app/build/outputs/apk/debug"
-          APK_VERSION_TAG="$RELEASE_VERSION_NAME+github-debug"
+          APK_VERSION_TAG="$RELEASE_VERSION_NAME+${{ env.PACKAGE_VARIANT }}-github-debug"
           APK_BASENAME_PREFIX="termux-app_$APK_VERSION_TAG"
 
-          echo "Building APKs for '$RELEASE_VERSION_NAME' release"
+          echo "Building APKs for 'APK_VERSION_TAG' release"
           export TERMUX_APK_VERSION_TAG="$APK_VERSION_TAG" # Used by app/build.gradle
+          export TERMUX_PACKAGE_VARIANT="${{ env.PACKAGE_VARIANT }}" # Used by app/build.gradle
           if ! ./gradlew assembleDebug; then
-            exit_on_error "Build failed for '$RELEASE_VERSION_NAME' release."
+            exit_on_error "Build failed for '$APK_VERSION_TAG' release."
           fi
 
           echo "Validating APKs"
@@ -58,8 +66,8 @@ jobs:
             "${APK_BASENAME_PREFIX}_armeabi-v7a.apk" \
             "${APK_BASENAME_PREFIX}_x86_64.apk" \
             "${APK_BASENAME_PREFIX}_x86.apk" \
-            > sha256sums); then
-            exit_on_error "Generate sha25sums failed for '$RELEASE_VERSION_NAME' release."
+            > "${APK_BASENAME_PREFIX}_sha256sums"); then
+            exit_on_error "Generate sha25sums failed for '$APK_VERSION_TAG' release."
           fi
 
           echo "Attaching APKs to github release"
@@ -70,7 +78,7 @@ jobs:
           -a "$APK_DIR_PATH/${APK_BASENAME_PREFIX}_armeabi-v7a.apk" \
           -a "$APK_DIR_PATH/${APK_BASENAME_PREFIX}_x86_64.apk" \
           -a "$APK_DIR_PATH/${APK_BASENAME_PREFIX}_x86.apk" \
-          -a "$APK_DIR_PATH/sha256sums" \
+          -a "$APK_DIR_PATH/${APK_BASENAME_PREFIX}_sha256sums" \
           "$RELEASE_VERSION_NAME"; then
-            exit_on_error "Attach APKs to release failed for '$RELEASE_VERSION_NAME' release."
+            exit_on_error "Attach APKs to release failed for '$APK_VERSION_TAG' release."
           fi
diff --git a/.github/workflows/debug_build.yml b/.github/workflows/debug_build.yml
index 2e81829374..efd08e8de7 100644
--- a/.github/workflows/debug_build.yml
+++ b/.github/workflows/debug_build.yml
@@ -11,12 +11,19 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        package_variant: [ apt-android-7, apt-android-5 ]
+
     steps:
       - name: Clone repository
         uses: actions/checkout@v2
 
       - name: Build APKs
         shell: bash {0}
+        env:
+          PACKAGE_VARIANT: ${{ matrix.package_variant }}
         run: |
           exit_on_error() { echo "$1"; exit 1; }
 
@@ -35,7 +42,7 @@ jobs:
           fi
 
           APK_DIR_PATH="./app/build/outputs/apk/debug"
-          APK_VERSION_TAG="$RELEASE_VERSION_NAME-github-debug" # Note the "-", GITHUB_SHA will already have "+" before it
+          APK_VERSION_TAG="$RELEASE_VERSION_NAME-${{ env.PACKAGE_VARIANT }}-github-debug" # Note the "-", GITHUB_SHA will already have "+" before it
           APK_BASENAME_PREFIX="termux-app_$APK_VERSION_TAG"
 
           # Used by attachment steps later
@@ -43,11 +50,12 @@ jobs:
           echo "APK_VERSION_TAG=$APK_VERSION_TAG" >> $GITHUB_ENV
           echo "APK_BASENAME_PREFIX=$APK_BASENAME_PREFIX" >> $GITHUB_ENV
 
-          echo "Building APKs for '$RELEASE_VERSION_NAME' build"
+          echo "Building APKs for 'APK_VERSION_TAG' build"
           export TERMUX_APP_VERSION_NAME="${RELEASE_VERSION_NAME/v/}" # Used by app/build.gradle
           export TERMUX_APK_VERSION_TAG="$APK_VERSION_TAG" # Used by app/build.gradle
+          export TERMUX_PACKAGE_VARIANT="${{ env.PACKAGE_VARIANT }}" # Used by app/build.gradle
           if ! ./gradlew assembleDebug; then
-            exit_on_error "Build failed for '$RELEASE_VERSION_NAME' build."
+            exit_on_error "Build failed for '$APK_VERSION_TAG' build."
           fi
 
           echo "Validating APKs"
@@ -65,8 +73,8 @@ jobs:
             "${APK_BASENAME_PREFIX}_armeabi-v7a.apk" \
             "${APK_BASENAME_PREFIX}_x86_64.apk" \
             "${APK_BASENAME_PREFIX}_x86.apk" \
-            > sha256sums); then
-            exit_on_error "Generate sha25sums failed for '$RELEASE_VERSION_NAME' release."
+            > "${APK_BASENAME_PREFIX}_sha256sums"); then
+            exit_on_error "Generate sha25sums failed for '$APK_VERSION_TAG' release."
           fi
 
       - name: Attach universal APK file
@@ -112,7 +120,7 @@ jobs:
       - name: Attach sha256sums file
         uses: actions/upload-artifact@v2
         with:
-          name: sha256sums
+          name: ${{ env.APK_BASENAME_PREFIX }}_sha256sums
           path: |
-            ${{ env.APK_DIR_PATH }}/sha256sums
+            ${{ env.APK_DIR_PATH }}/${{ env.APK_BASENAME_PREFIX }}_sha256sums
             ${{ env.APK_DIR_PATH }}/output-metadata.json
diff --git a/app/build.gradle b/app/build.gradle
index a4fe8b3153..628dae01f5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,6 +2,16 @@ plugins {
     id "com.android.application"
 }
 
+ext {
+    // The packageVariant defines the bootstrap variant that will be included in the app APK.
+    // This must be supported by com.termux.shared.termux.TermuxBootstrap.PackageVariant or app will
+    // crash at startup.
+    // Bootstrap of a different variant must not be manually installed by the user after app installation
+    // by replacing $PREFIX since app code is dependant on the variant used to build the APK.
+    // Currently supported values are: [ "apt-android-7" ]
+    packageVariant = System.getenv("TERMUX_PACKAGE_VARIANT") ?: "apt-android-7" // Default: "apt-android-7"
+}
+
 android {
     compileSdkVersion project.properties.compileSdkVersion.toInteger()
     ndkVersion = System.getenv("JITPACK_NDK_VERSION") ?: project.properties.ndkVersion
@@ -37,6 +47,8 @@ android {
         if (appVersionName) versionName = appVersionName
         validateVersionName(versionName)
 
+        buildConfigField "String", "TERMUX_PACKAGE_VARIANT", "\"" + project.ext.packageVariant + "\"" // Used by TermuxApplication class
+
         manifestPlaceholders.TERMUX_PACKAGE_NAME = "com.termux"
         manifestPlaceholders.TERMUX_APP_NAME = "Termux"
         manifestPlaceholders.TERMUX_API_APP_NAME = "Termux:API"
@@ -115,10 +127,10 @@ android {
         variant.outputs.all { output ->
             if (variant.buildType.name == "debug") {
                 def abi = output.getFilter(com.android.build.OutputFile.ABI)
-                outputFileName = new File("termux-app_" + (apkVersionTag ? apkVersionTag : "debug") + "_" + (abi ? abi : "universal") + ".apk")
+                outputFileName = new File("termux-app_" + (apkVersionTag ? apkVersionTag : project.ext.packageVariant + "-" + "debug") + "_" + (abi ? abi : "universal") + ".apk")
             } else if (variant.buildType.name == "release") {
                 def abi = output.getFilter(com.android.build.OutputFile.ABI)
-                outputFileName = new File("termux-app_" + (apkVersionTag ? apkVersionTag : "release") + "_" + (abi ? abi : "universal") + ".apk")
+                outputFileName = new File("termux-app_" + (apkVersionTag ? apkVersionTag : project.ext.packageVariant + "-" + "release") + "_" + (abi ? abi : "universal") + ".apk")
             }
         }
     }
@@ -161,7 +173,7 @@ def downloadBootstrap(String arch, String expectedChecksum, String version) {
         if (checksum == expectedChecksum) {
             return
         } else {
-            logger.quiet("Deleting old local file with wrong hash: " + localUrl)
+            logger.quiet("Deleting old local file with wrong hash: " + localUrl + ": expected: " + expectedChecksum + ", actual: " + checksum)
             file.delete()
         }
     }
@@ -196,11 +208,16 @@ clean {
 
 task downloadBootstraps() {
     doLast {
-        def version = "2022.04.22-r1"
-        downloadBootstrap("aarch64", "ec8a6043644594fc24681cffaf9c7b32f5bc68df7491c5df9a060e40e1934c70", version)
-        downloadBootstrap("arm",     "f8ec9505081b81da0ee66413762c52e6cb4a6ebd7be1a2a5ddee8953e0795dc9", version)
-        downloadBootstrap("i686",    "0491f12ed84a5ef3c28bd742311fed9f176e32100a2c6bbdb017df8f48044484", version)
-        downloadBootstrap("x86_64",  "94073a0e136bf5a9c05c1997a55dc261248f4ccb8bffaa9a950a132529cd1529", version)
+        def packageVariant = project.ext.packageVariant
+        if (packageVariant == "apt-android-7") {
+            def version = "2022.04.22-r1" + "+" + packageVariant
+            downloadBootstrap("aarch64", "ec8a6043644594fc24681cffaf9c7b32f5bc68df7491c5df9a060e40e1934c70", version)
+            downloadBootstrap("arm", "f8ec9505081b81da0ee66413762c52e6cb4a6ebd7be1a2a5ddee8953e0795dc9", version)
+            downloadBootstrap("i686", "0491f12ed84a5ef3c28bd742311fed9f176e32100a2c6bbdb017df8f48044484", version)
+            downloadBootstrap("x86_64", "94073a0e136bf5a9c05c1997a55dc261248f4ccb8bffaa9a950a132529cd1529", version)
+        } else {
+            throw new GradleException("Unsupported TERMUX_PACKAGE_VARIANT \"" + packageVariant + "\"")
+        }
     }
 }
 
diff --git a/app/src/main/java/com/termux/app/TermuxApplication.java b/app/src/main/java/com/termux/app/TermuxApplication.java
index 78a4bf520b..1d7925f78a 100644
--- a/app/src/main/java/com/termux/app/TermuxApplication.java
+++ b/app/src/main/java/com/termux/app/TermuxApplication.java
@@ -3,8 +3,10 @@
 import android.app.Application;
 import android.content.Context;
 
+import com.termux.BuildConfig;
 import com.termux.shared.errors.Error;
 import com.termux.shared.logger.Logger;
+import com.termux.shared.termux.TermuxBootstrap;
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.termux.crash.TermuxCrashUtils;
 import com.termux.shared.termux.file.TermuxFileUtils;
@@ -30,6 +32,9 @@ public void onCreate() {
 
         Logger.logDebug("Starting Application");
 
+        // Set TermuxBootstrap.TERMUX_APP_PACKAGE_MANAGER and TermuxBootstrap.TERMUX_APP_PACKAGE_VARIANT
+        TermuxBootstrap.setTermuxPackageManagerAndVariant(BuildConfig.TERMUX_PACKAGE_VARIANT);
+
         // Init app wide SharedProperties loaded from termux.properties
         TermuxAppSharedProperties properties = TermuxAppSharedProperties.init(context);
 
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
index 47e7debf44..1a3a8c3d8c 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
@@ -23,6 +23,7 @@
 import com.termux.shared.interact.MessageDialogUtils;
 import com.termux.shared.interact.ShareUtils;
 import com.termux.shared.shell.ShellUtils;
+import com.termux.shared.termux.TermuxBootstrap;
 import com.termux.shared.termux.terminal.TermuxTerminalViewClientBase;
 import com.termux.shared.termux.extrakeys.SpecialButton;
 import com.termux.shared.android.AndroidUtils;
@@ -756,9 +757,11 @@ public void run() {
 
                 reportString.append("\n\n").append(AndroidUtils.getDeviceInfoMarkdownString(mActivity));
 
-                String termuxAptInfo = TermuxUtils.geAPTInfoMarkdownString(mActivity);
-                if (termuxAptInfo != null)
-                    reportString.append("\n\n").append(termuxAptInfo);
+                if (TermuxBootstrap.isAppPackageManagerAPT()) {
+                    String termuxAptInfo = TermuxUtils.geAPTInfoMarkdownString(mActivity);
+                    if (termuxAptInfo != null)
+                        reportString.append("\n\n").append(termuxAptInfo);
+                }
 
                 if (addTermuxDebugInfo) {
                     String termuxDebugInfo = TermuxUtils.getTermuxDebugMarkdownString(mActivity);
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/TermuxBootstrap.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxBootstrap.java
new file mode 100644
index 0000000000..7480dcff85
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxBootstrap.java
@@ -0,0 +1,174 @@
+package com.termux.shared.termux;
+
+import androidx.annotation.Nullable;
+
+import com.termux.shared.logger.Logger;
+
+public class TermuxBootstrap {
+
+    private static final String LOG_TAG = "TermuxBootstrap";
+
+    /** The {@link PackageManager} for the bootstrap in the app APK added in app/build.gradle. */
+    public static PackageManager TERMUX_APP_PACKAGE_MANAGER;
+
+    /** The {@link PackageVariant} for the bootstrap in the app APK added in app/build.gradle. */
+    public static PackageVariant TERMUX_APP_PACKAGE_VARIANT;
+
+    /** Set name as app wide night mode value. */
+    public static void setTermuxPackageManagerAndVariant(@Nullable String packageVariantName) {
+        TERMUX_APP_PACKAGE_VARIANT = PackageVariant.variantOf(packageVariantName);
+        if (TERMUX_APP_PACKAGE_VARIANT == null) {
+            throw new RuntimeException("Unsupported TERMUX_APP_PACKAGE_VARIANT \"" + packageVariantName + "\"");
+        }
+
+        Logger.logVerbose(LOG_TAG, "Set TERMUX_APP_PACKAGE_VARIANT to \"" + TERMUX_APP_PACKAGE_VARIANT + "\"");
+
+        // Set packageManagerName to substring before first dash "-" in packageVariantName
+        int index = packageVariantName.indexOf('-');
+        String packageManagerName = (index == -1) ? null : packageVariantName.substring(0, index);
+        TERMUX_APP_PACKAGE_MANAGER = PackageManager.managerOf(packageManagerName);
+        if (TERMUX_APP_PACKAGE_MANAGER == null) {
+            throw new RuntimeException("Unsupported TERMUX_APP_PACKAGE_MANAGER \"" + packageManagerName + "\" with variant \"" + packageVariantName + "\"");
+        }
+
+        Logger.logVerbose(LOG_TAG, "Set TERMUX_APP_PACKAGE_MANAGER to \"" + TERMUX_APP_PACKAGE_MANAGER + "\"");
+    }
+
+
+
+    /** Is {@link PackageManager#APT} set as {@link #TERMUX_APP_PACKAGE_MANAGER}. */
+    public static boolean isAppPackageManagerAPT() {
+        return PackageManager.APT.equals(TERMUX_APP_PACKAGE_MANAGER);
+    }
+
+    ///** Is {@link PackageManager#TAPM} set as {@link #TERMUX_APP_PACKAGE_MANAGER}. */
+    //public static boolean isAppPackageManagerTAPM() {
+    //    return PackageManager.TAPM.equals(TERMUX_APP_PACKAGE_MANAGER);
+    //}
+
+    ///** Is {@link PackageManager#PACMAN} set as {@link #TERMUX_APP_PACKAGE_MANAGER}. */
+    //public static boolean isAppPackageManagerPACMAN() {
+    //    return PackageManager.PACMAN.equals(TERMUX_APP_PACKAGE_MANAGER);
+    //}
+
+
+
+    /** Is {@link PackageVariant#APT_ANDROID_7} set as {@link #TERMUX_APP_PACKAGE_VARIANT}. */
+    public static boolean isAppPackageVariantAPTAndroid7() {
+        return PackageVariant.APT_ANDROID_7.equals(TERMUX_APP_PACKAGE_VARIANT);
+    }
+
+    ///** Is {@link PackageVariant#APT_ANDROID_5} set as {@link #TERMUX_APP_PACKAGE_VARIANT}. */
+    //public static boolean isAppPackageVariantAPTAndroid5() {
+    //    return PackageVariant.APT_ANDROID_5.equals(TERMUX_APP_PACKAGE_VARIANT);
+    //}
+
+    ///** Is {@link PackageVariant#TAPM_ANDROID_7} set as {@link #TERMUX_APP_PACKAGE_VARIANT}. */
+    //public static boolean isAppPackageVariantTAPMAndroid7() {
+    //    return PackageVariant.TAPM_ANDROID_7.equals(TERMUX_APP_PACKAGE_VARIANT);
+    //}
+
+    ///** Is {@link PackageVariant#PACMAN_ANDROID_7} set as {@link #TERMUX_APP_PACKAGE_VARIANT}. */
+    //public static boolean isAppPackageVariantTPACMANAndroid7() {
+    //    return PackageVariant.PACMAN_ANDROID_7.equals(TERMUX_APP_PACKAGE_VARIANT);
+    //}
+
+
+
+    /** Termux package manager. */
+    public enum PackageManager {
+
+        /**
+         * Advanced Package Tool (APT) for managing debian deb package files.
+         * https://wiki.debian.org/Apt
+         * https://wiki.debian.org/deb
+         */
+        APT("apt");
+
+        ///**
+        // * Termux Android Package Manager (TAPM) for managing termux apk package files.
+        // * https://en.wikipedia.org/wiki/Apk_(file_format)
+        // */
+        //TAPM("tapm");
+
+        ///**
+        // * Package Manager (PACMAN) for managing arch linux pkg.tar package files.
+        // * https://wiki.archlinux.org/title/pacman
+        // * https://en.wikipedia.org/wiki/Arch_Linux#Pacman
+        // */
+        //PACMAN("pacman");
+
+        private final String name;
+
+        PackageManager(final String name) {
+            this.name = name;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public boolean equalsManager(String manager) {
+            return manager != null && manager.equals(this.name);
+        }
+
+        /** Get {@link PackageManager} for {@code name} if found, otherwise {@code null}. */
+        @Nullable
+        public static PackageManager managerOf(String name) {
+            if (name == null || name.isEmpty()) return null;
+            for (PackageManager v : PackageManager.values()) {
+                if (v.name.equals(name)) {
+                    return v;
+                }
+            }
+            return null;
+        }
+
+    }
+
+
+
+    /** Termux package variant. The substring before first dash "-" must match one of the {@link PackageManager}. */
+    public enum PackageVariant {
+
+        /** {@link PackageManager#APT} variant for Android 7+. */
+        APT_ANDROID_7("apt-android-7");
+
+        ///** {@link PackageManager#APT} variant for Android 5+. */
+        //APT_ANDROID_5("apt-android-5");
+
+        ///** {@link PackageManager#TAPM} variant for Android 7+. */
+        //TAPM_ANDROID_7("tapm-android-7");
+
+        ///** {@link PackageManager#PACMAN} variant for Android 7+. */
+        //PACMAN_ANDROID_7("pacman-android-7");
+
+        private final String name;
+
+        PackageVariant(final String name) {
+            this.name = name;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public boolean equalsVariant(String variant) {
+            return variant != null && variant.equals(this.name);
+        }
+
+        /** Get {@link PackageVariant} for {@code name} if found, otherwise {@code null}. */
+        @Nullable
+        public static PackageVariant variantOf(String name) {
+            if (name == null || name.isEmpty()) return null;
+            for (PackageVariant v : PackageVariant.values()) {
+                if (v.name.equals(name)) {
+                    return v;
+                }
+            }
+            return null;
+        }
+
+    }
+
+}
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
index 333dc0fe3e..b5fdf91217 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
@@ -397,6 +397,11 @@ public static String getAppInfoMarkdownStringInner(@NonNull final Context contex
 
         markdownString.append((AndroidUtils.getAppInfoMarkdownString(context)));
 
+        if (context.getPackageName().equals(TermuxConstants.TERMUX_PACKAGE_NAME)) {
+            AndroidUtils.appendPropertyToMarkdown(markdownString, "TERMUX_APP_PACKAGE_MANAGER", TermuxBootstrap.TERMUX_APP_PACKAGE_MANAGER);
+            AndroidUtils.appendPropertyToMarkdown(markdownString, "TERMUX_APP_PACKAGE_VARIANT", TermuxBootstrap.TERMUX_APP_PACKAGE_VARIANT);
+        }
+
         Error error;
         error = TermuxFileUtils.isTermuxFilesDirectoryAccessible(context, true, true);
         if (error != null) {
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/shell/TermuxShellUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/shell/TermuxShellUtils.java
index 8ac6d2586f..d20208b54f 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/shell/TermuxShellUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/shell/TermuxShellUtils.java
@@ -6,6 +6,7 @@
 
 import com.termux.shared.errors.Error;
 import com.termux.shared.file.filesystem.FileTypes;
+import com.termux.shared.termux.TermuxBootstrap;
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.file.FileUtils;
 import com.termux.shared.logger.Logger;
@@ -61,6 +62,10 @@ public static String[] buildEnvironment(Context currentPackageContext, boolean i
             environment.add("TERMUX_APP_PID=" + TERMUX_APP_PID);
         if (TERMUX_APK_RELEASE != null)
             environment.add("TERMUX_APK_RELEASE=" + TERMUX_APK_RELEASE);
+        if (TermuxBootstrap.TERMUX_APP_PACKAGE_MANAGER != null)
+            environment.add("TERMUX_APP_PACKAGE_MANAGER=" + TermuxBootstrap.TERMUX_APP_PACKAGE_MANAGER.getName());
+        if (TermuxBootstrap.TERMUX_APP_PACKAGE_VARIANT != null)
+            environment.add("TERMUX_APP_PACKAGE_VARIANT=" + TermuxBootstrap.TERMUX_APP_PACKAGE_VARIANT.getName());
         if (TERMUX_APP_AM_SOCKET_SERVER_ENABLED != null)
             environment.add("TERMUX_APP_AM_SOCKET_SERVER_ENABLED=" + TERMUX_APP_AM_SOCKET_SERVER_ENABLED);
 

From 0b4f4561323616b4b99867e6b0ebcccf94c47f69 Mon Sep 17 00:00:00 2001
From: Henrik Grimler <henrik@grimler.se>
Date: Mon, 23 May 2022 21:59:23 +0200
Subject: [PATCH 736/912] Changed: Write only our open collective to
 FUNDING.yml

Promote https://opencollective.com/termux instead of the old donation
channels that we have no control over.
---
 .github/FUNDING.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
index 7871554d6e..35f0f86845 100644
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,2 +1 @@
-patreon: termux
-custom: https://paypal.me/fornwall
+open_collective: termux

From 6213b7f7828b41ad2036431d53bf1994c770750c Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Tue, 26 Apr 2022 01:49:11 +0500
Subject: [PATCH 737/912] Changed: Use double quotes instead of single quotes
 for all gradle dependencies

---
 build.gradle                   |  2 +-
 terminal-emulator/build.gradle |  4 ++--
 terminal-view/build.gradle     |  2 +-
 termux-shared/build.gradle     | 10 +++++-----
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/build.gradle b/build.gradle
index aa0981015d..80ddd4bde1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.2'
+        classpath "com.android.tools.build:gradle:4.2.2"
     }
 }
 
diff --git a/terminal-emulator/build.gradle b/terminal-emulator/build.gradle
index f3d567b3dc..afc57e9f7e 100644
--- a/terminal-emulator/build.gradle
+++ b/terminal-emulator/build.gradle
@@ -50,8 +50,8 @@ tasks.withType(Test) {
 }
 
 dependencies {
-    implementation 'androidx.annotation:annotation:1.3.0'
-    testImplementation 'junit:junit:4.13.2'
+    implementation "androidx.annotation:annotation:1.3.0"
+    testImplementation "junit:junit:4.13.2"
 }
 
 task sourceJar(type: Jar) {
diff --git a/terminal-view/build.gradle b/terminal-view/build.gradle
index 1504f68856..d603da2880 100644
--- a/terminal-view/build.gradle
+++ b/terminal-view/build.gradle
@@ -29,7 +29,7 @@ android {
 }
 
 dependencies {
-    testImplementation 'junit:junit:4.13.2'
+    testImplementation "junit:junit:4.13.2"
 }
 
 task sourceJar(type: Jar) {
diff --git a/termux-shared/build.gradle b/termux-shared/build.gradle
index 0f3f6cf99a..6284782019 100644
--- a/termux-shared/build.gradle
+++ b/termux-shared/build.gradle
@@ -5,16 +5,16 @@ android {
     compileSdkVersion project.properties.compileSdkVersion.toInteger()
 
     dependencies {
-        implementation 'androidx.appcompat:appcompat:1.3.1'
+        implementation "androidx.appcompat:appcompat:1.3.1"
         implementation "androidx.annotation:annotation:1.3.0"
         implementation "androidx.core:core:1.6.0"
-        implementation 'com.google.android.material:material:1.4.0'
+        implementation "com.google.android.material:material:1.4.0"
         implementation "com.google.guava:guava:24.1-jre"
         implementation "io.noties.markwon:core:$markwonVersion"
         implementation "io.noties.markwon:ext-strikethrough:$markwonVersion"
         implementation "io.noties.markwon:linkify:$markwonVersion"
         implementation "io.noties.markwon:recycler:$markwonVersion"
-        implementation 'org.lsposed.hiddenapibypass:hiddenapibypass:2.0'
+        implementation "org.lsposed.hiddenapibypass:hiddenapibypass:2.0"
 
         // Do not increment version higher than 1.0.0-alpha09 since it will break ViewUtils and needs to be looked into
         // noinspection GradleDependency
@@ -61,8 +61,8 @@ android {
 
 dependencies {
     testImplementation "junit:junit:4.13.2"
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+    androidTestImplementation "androidx.test.ext:junit:1.1.3"
+    androidTestImplementation "androidx.test.espresso:espresso-core:3.4.0"
 }
 
 task sourceJar(type: Jar) {

From 623aaebb4a730289d61c02c8898d24e839427138 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Tue, 26 Apr 2022 02:00:26 +0500
Subject: [PATCH 738/912] Changed: Bump down `minSdkVersion` from `24` to `21`
 to restart supporting android 5/6 for the time being

Compatibility fixes will come in later commits.
---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index c8f9ae0514..fc751ab345 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -15,7 +15,7 @@
 org.gradle.jvmargs=-Xmx2048M
 android.useAndroidX=true
 
-minSdkVersion=24
+minSdkVersion=21
 targetSdkVersion=28
 ndkVersion=22.1.7171670
 compileSdkVersion=30

From 9143ebdc22752c8a3ea79503a3b76f603c8f8812 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Tue, 26 Apr 2022 02:02:26 +0500
Subject: [PATCH 739/912] Changed: Enable desugaring support to enable support
 for new language APIs like Java 8 on old android versions

https://developer.android.com/studio/write/java8-support
---
 app/build.gradle           | 4 ++++
 termux-shared/build.gradle | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/app/build.gradle b/app/build.gradle
index 628dae01f5..e613395c02 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -97,6 +97,9 @@ android {
     }
 
     compileOptions {
+        // Flag to enable support for the new language APIs
+        coreLibraryDesugaringEnabled true
+
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
@@ -140,6 +143,7 @@ android {
 dependencies {
     testImplementation "junit:junit:4.13.2"
     testImplementation "org.robolectric:robolectric:4.4"
+    coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:1.1.5"
 }
 
 task versionName {
diff --git a/termux-shared/build.gradle b/termux-shared/build.gradle
index 6284782019..573f547cd7 100644
--- a/termux-shared/build.gradle
+++ b/termux-shared/build.gradle
@@ -49,6 +49,9 @@ android {
     }
 
     compileOptions {
+        // Flag to enable support for the new language APIs
+        coreLibraryDesugaringEnabled true
+
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
@@ -63,6 +66,7 @@ dependencies {
     testImplementation "junit:junit:4.13.2"
     androidTestImplementation "androidx.test.ext:junit:1.1.3"
     androidTestImplementation "androidx.test.espresso:espresso-core:3.4.0"
+    coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:1.1.5"
 }
 
 task sourceJar(type: Jar) {

From a1719d91b3ef32218a0ac6553c659f3e1baab4da Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Tue, 26 Apr 2022 02:03:14 +0500
Subject: [PATCH 740/912] Changed: Bump `termux-am-library` to 2.0.0 that uses
 `minSdkVersion` `21`

---
 termux-shared/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/termux-shared/build.gradle b/termux-shared/build.gradle
index 573f547cd7..d44a8e4573 100644
--- a/termux-shared/build.gradle
+++ b/termux-shared/build.gradle
@@ -27,7 +27,7 @@ android {
 
         implementation project(":terminal-view")
 
-        implementation 'com.github.termux:termux-am-library:1.0'
+        implementation "com.termux:termux-am-library:v2.0.0"
     }
 
     defaultConfig {

From 14e9a8b6fc10379819f7e3406692151dc8759e59 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Tue, 26 Apr 2022 02:04:49 +0500
Subject: [PATCH 741/912] Changed: Use float dp parameter instead of int for
 `ViewUtils.dpToPx()` to not lose precision

---
 .../src/main/java/com/termux/shared/view/ViewUtils.java  | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/view/ViewUtils.java b/termux-shared/src/main/java/com/termux/shared/view/ViewUtils.java
index e0d87345c4..d7b521981e 100644
--- a/termux-shared/src/main/java/com/termux/shared/view/ViewUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/view/ViewUtils.java
@@ -216,15 +216,18 @@ public static Activity getActivity(Context context) {
         return null;
     }
 
+
     /** Convert value in device independent pixels (dp) to pixels (px) units. */
-    public static int dpToPx(Context context, int dp) {
-        return (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp, context.getResources().getDisplayMetrics());
+    public static float dpToPx(Context context, float dp) {
+        return TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp, context.getResources().getDisplayMetrics());
+    }
     }
 
 
     public static void setLayoutMarginsInDp(@NonNull View view, int left, int top, int right, int bottom) {
         Context context = view.getContext();
-        setLayoutMarginsInPixels(view, dpToPx(context, left), dpToPx(context, top), dpToPx(context, right), dpToPx(context, bottom));
+        setLayoutMarginsInPixels(view, (int) dpToPx(context, left), (int) dpToPx(context, top),
+            (int) dpToPx(context, right), (int) dpToPx(context, bottom));
     }
 
     public static void setLayoutMarginsInPixels(@NonNull View view, int left, int top, int right, int bottom) {

From fa829623a886319b8b8aa360efde6c348279d02e Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Tue, 26 Apr 2022 02:05:22 +0500
Subject: [PATCH 742/912] Added: Add `ViewUtils.pxToDp()`

---
 .../src/main/java/com/termux/shared/view/ViewUtils.java       | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/termux-shared/src/main/java/com/termux/shared/view/ViewUtils.java b/termux-shared/src/main/java/com/termux/shared/view/ViewUtils.java
index d7b521981e..d85b82909b 100644
--- a/termux-shared/src/main/java/com/termux/shared/view/ViewUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/view/ViewUtils.java
@@ -221,6 +221,10 @@ public static Activity getActivity(Context context) {
     public static float dpToPx(Context context, float dp) {
         return TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp, context.getResources().getDisplayMetrics());
     }
+
+    /** Convert value in pixels (px) to device independent pixels (dp) units. */
+    public static float pxToDp(Context context, float px) {
+        return px / context.getResources().getDisplayMetrics().density;
     }
 
 

From 677a5800424be462a369622b823e75a88b35a40d Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Tue, 26 Apr 2022 02:31:21 +0500
Subject: [PATCH 743/912] Changed: Add general compatibility fixes for
 `minSdkVerion` `21`

---
 app/src/main/AndroidManifest.xml              | 12 ++-
 .../java/com/termux/app/TermuxInstaller.java  |  3 +-
 .../java/com/termux/view/TerminalView.java    |  5 +-
 .../support/PopupWindowCompatGingerbread.java | 75 +++++++++++++++++++
 .../TextSelectionCursorController.java        |  7 ++
 .../TextSelectionHandleView.java              | 13 +++-
 .../termux/shared/android/AndroidUtils.java   |  9 ++-
 .../termux/shared/android/PackageUtils.java   |  4 +
 .../shared/android/PermissionUtils.java       | 24 +++++-
 .../shared/file/filesystem/UnixConstants.java |  9 ++-
 .../termux/shared/interact/ShareUtils.java    |  3 +-
 .../termux/extrakeys/SpecialButtonState.java  |  4 +-
 .../termux/terminal/io/TerminalExtraKeys.java | 14 +++-
 .../com/termux/shared/view/KeyboardUtils.java |  3 +
 .../com/termux/shared/view/ViewUtils.java     |  8 +-
 15 files changed, 168 insertions(+), 25 deletions(-)
 create mode 100644 terminal-view/src/main/java/com/termux/view/support/PopupWindowCompatGingerbread.java

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ca1b1e9941..4a2bc2f895 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -46,7 +46,8 @@
         android:requestLegacyExternalStorage="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="false"
-        android:theme="@style/Theme.TermuxApp.DayNight.DarkActionBar">
+        android:theme="@style/Theme.TermuxApp.DayNight.DarkActionBar"
+        tools:targetApi="m">
 
         <activity
             android:name=".app.TermuxActivity"
@@ -55,7 +56,8 @@
             android:label="@string/application_name"
             android:launchMode="singleTask"
             android:resizeableActivity="true"
-            android:theme="@style/Theme.TermuxActivity.DayNight.NoActionBar">
+            android:theme="@style/Theme.TermuxActivity.DayNight.NoActionBar"
+            tools:targetApi="n">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -91,7 +93,8 @@
             android:exported="false"
             android:label="@string/application_name"
             android:parentActivityName=".app.TermuxActivity"
-            android:resizeableActivity="true" />
+            android:resizeableActivity="true"
+            tools:targetApi="n" />
 
         <activity
             android:name=".app.activities.SettingsActivity"
@@ -111,7 +114,8 @@
             android:label="@string/application_name"
             android:noHistory="true"
             android:resizeableActivity="true"
-            android:taskAffinity="${TERMUX_PACKAGE_NAME}.filereceiver">
+            android:taskAffinity="${TERMUX_PACKAGE_NAME}.filereceiver"
+            tools:targetApi="n">
 
             <!-- Accept multiple file types when sending. -->
             <intent-filter>
diff --git a/app/src/main/java/com/termux/app/TermuxInstaller.java b/app/src/main/java/com/termux/app/TermuxInstaller.java
index c3d112adb2..15f48bfd80 100644
--- a/app/src/main/java/com/termux/app/TermuxInstaller.java
+++ b/app/src/main/java/com/termux/app/TermuxInstaller.java
@@ -4,6 +4,7 @@
 import android.app.AlertDialog;
 import android.app.ProgressDialog;
 import android.content.Context;
+import android.os.Build;
 import android.os.Environment;
 import android.system.Os;
 import android.util.Pair;
@@ -71,7 +72,7 @@ static void setupBootstrapIfNeeded(final Activity activity, final Runnable whenD
 
         // 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)) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && !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);
             Logger.logError(LOG_TAG, bootstrapErrorMessage);
diff --git a/terminal-view/src/main/java/com/termux/view/TerminalView.java b/terminal-view/src/main/java/com/termux/view/TerminalView.java
index 2b56d66ea6..b76ea85844 100644
--- a/terminal-view/src/main/java/com/termux/view/TerminalView.java
+++ b/terminal-view/src/main/java/com/termux/view/TerminalView.java
@@ -1245,6 +1245,7 @@ protected void onDetachedFromWindow() {
      * Define functions required for long hold toolbar.
      */
     private final Runnable mShowFloatingToolbar = new Runnable() {
+        @RequiresApi(api = Build.VERSION_CODES.M)
         @Override
         public void run() {
             if (getTextSelectionActionMode() != null) {
@@ -1253,6 +1254,7 @@ public void run() {
         }
     };
 
+    @RequiresApi(api = Build.VERSION_CODES.M)
     private void showFloatingToolbar() {
         if (getTextSelectionActionMode() != null) {
             int delay = ViewConfiguration.getDoubleTapTimeout();
@@ -1260,6 +1262,7 @@ private void showFloatingToolbar() {
         }
     }
 
+    @RequiresApi(api = Build.VERSION_CODES.M)
     void hideFloatingToolbar() {
         if (getTextSelectionActionMode() != null) {
             removeCallbacks(mShowFloatingToolbar);
@@ -1268,7 +1271,7 @@ void hideFloatingToolbar() {
     }
 
     public void updateFloatingToolbarVisibility(MotionEvent event) {
-        if (getTextSelectionActionMode() != null) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && getTextSelectionActionMode() != null) {
             switch (event.getActionMasked()) {
                 case MotionEvent.ACTION_MOVE:
                     hideFloatingToolbar();
diff --git a/terminal-view/src/main/java/com/termux/view/support/PopupWindowCompatGingerbread.java b/terminal-view/src/main/java/com/termux/view/support/PopupWindowCompatGingerbread.java
new file mode 100644
index 0000000000..24a1797c5e
--- /dev/null
+++ b/terminal-view/src/main/java/com/termux/view/support/PopupWindowCompatGingerbread.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+package com.termux.view.support;
+
+import android.util.Log;
+import android.widget.PopupWindow;
+
+import java.lang.reflect.Method;
+
+/**
+ * Implementation of PopupWindow compatibility that can call Gingerbread APIs.
+ * https://chromium.googlesource.com/android_tools/+/HEAD/sdk/extras/android/support/v4/src/gingerbread/android/support/v4/widget/PopupWindowCompatGingerbread.java
+ */
+public class PopupWindowCompatGingerbread {
+
+    private static Method sSetWindowLayoutTypeMethod;
+    private static boolean sSetWindowLayoutTypeMethodAttempted;
+    private static Method sGetWindowLayoutTypeMethod;
+    private static boolean sGetWindowLayoutTypeMethodAttempted;
+
+    public static void setWindowLayoutType(PopupWindow popupWindow, int layoutType) {
+        if (!sSetWindowLayoutTypeMethodAttempted) {
+            try {
+                sSetWindowLayoutTypeMethod = PopupWindow.class.getDeclaredMethod(
+                    "setWindowLayoutType", int.class);
+                sSetWindowLayoutTypeMethod.setAccessible(true);
+            } catch (Exception e) {
+                // Reflection method fetch failed. Oh well.
+            }
+            sSetWindowLayoutTypeMethodAttempted = true;
+        }
+        if (sSetWindowLayoutTypeMethod != null) {
+            try {
+                sSetWindowLayoutTypeMethod.invoke(popupWindow, layoutType);
+            } catch (Exception e) {
+                // Reflection call failed. Oh well.
+            }
+        }
+    }
+
+    public static int getWindowLayoutType(PopupWindow popupWindow) {
+        if (!sGetWindowLayoutTypeMethodAttempted) {
+            try {
+                sGetWindowLayoutTypeMethod = PopupWindow.class.getDeclaredMethod(
+                    "getWindowLayoutType");
+                sGetWindowLayoutTypeMethod.setAccessible(true);
+            } catch (Exception e) {
+                // Reflection method fetch failed. Oh well.
+            }
+            sGetWindowLayoutTypeMethodAttempted = true;
+        }
+        if (sGetWindowLayoutTypeMethod != null) {
+            try {
+                return (Integer) sGetWindowLayoutTypeMethod.invoke(popupWindow);
+            } catch (Exception e) {
+                // Reflection call failed. Oh well.
+            }
+        }
+        return 0;
+    }
+
+}
diff --git a/terminal-view/src/main/java/com/termux/view/textselection/TextSelectionCursorController.java b/terminal-view/src/main/java/com/termux/view/textselection/TextSelectionCursorController.java
index 2f64793a07..c08dca4470 100644
--- a/terminal-view/src/main/java/com/termux/view/textselection/TextSelectionCursorController.java
+++ b/terminal-view/src/main/java/com/termux/view/textselection/TextSelectionCursorController.java
@@ -3,6 +3,7 @@
 import android.content.ClipboardManager;
 import android.content.Context;
 import android.graphics.Rect;
+import android.os.Build;
 import android.text.TextUtils;
 import android.view.ActionMode;
 import android.view.Menu;
@@ -153,6 +154,12 @@ public void onDestroyActionMode(ActionMode mode) {
 
         };
 
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
+            mActionMode = terminalView.startActionMode(callback);
+            return;
+        }
+
+        //noinspection NewApi
         mActionMode = terminalView.startActionMode(new ActionMode.Callback2() {
             @Override
             public boolean onCreateActionMode(ActionMode mode, Menu menu) {
diff --git a/terminal-view/src/main/java/com/termux/view/textselection/TextSelectionHandleView.java b/terminal-view/src/main/java/com/termux/view/textselection/TextSelectionHandleView.java
index 4f39e723ba..b3caca6720 100644
--- a/terminal-view/src/main/java/com/termux/view/textselection/TextSelectionHandleView.java
+++ b/terminal-view/src/main/java/com/termux/view/textselection/TextSelectionHandleView.java
@@ -4,6 +4,7 @@
 import android.graphics.Canvas;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
+import android.os.Build;
 import android.os.SystemClock;
 import android.view.MotionEvent;
 import android.view.View;
@@ -14,6 +15,7 @@
 
 import com.termux.view.R;
 import com.termux.view.TerminalView;
+import com.termux.view.support.PopupWindowCompatGingerbread;
 
 @SuppressLint("ViewConstructor")
 public class TextSelectionHandleView extends View {
@@ -68,13 +70,18 @@ private void initHandle() {
             android.R.attr.textSelectHandleWindowStyle);
         mHandle.setSplitTouchEnabled(true);
         mHandle.setClippingEnabled(false);
-        mHandle.setWindowLayoutType(WindowManager.LayoutParams.TYPE_APPLICATION_SUB_PANEL);
         mHandle.setWidth(ViewGroup.LayoutParams.WRAP_CONTENT);
         mHandle.setHeight(ViewGroup.LayoutParams.WRAP_CONTENT);
         mHandle.setBackgroundDrawable(null);
         mHandle.setAnimationStyle(0);
-        mHandle.setEnterTransition(null);
-        mHandle.setExitTransition(null);
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            mHandle.setWindowLayoutType(WindowManager.LayoutParams.TYPE_APPLICATION_SUB_PANEL);
+            mHandle.setEnterTransition(null);
+            mHandle.setExitTransition(null);
+        } else {
+            PopupWindowCompatGingerbread.setWindowLayoutType(mHandle, WindowManager.LayoutParams.TYPE_APPLICATION_SUB_PANEL);
+        }
         mHandle.setContentView(this);
     }
 
diff --git a/termux-shared/src/main/java/com/termux/shared/android/AndroidUtils.java b/termux-shared/src/main/java/com/termux/shared/android/AndroidUtils.java
index 766ea34ef9..4ddcc3fbbc 100644
--- a/termux-shared/src/main/java/com/termux/shared/android/AndroidUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/android/AndroidUtils.java
@@ -48,9 +48,12 @@ public static String getAppInfoMarkdownString(@NonNull final Context context) {
             !filesDir.equals("/data/data/" + context.getPackageName() + "/files"))
             AndroidUtils.appendPropertyToMarkdown(markdownString,"FILES_DIR", filesDir);
 
-        Long userId = PackageUtils.getUserIdForPackage(context);
-        if (userId == null || userId != 0)
-            AndroidUtils.appendPropertyToMarkdown(markdownString,"USER_ID", userId);
+
+        if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.N ) {
+            Long userId = PackageUtils.getUserIdForPackage(context);
+            if (userId == null || userId != 0)
+                AndroidUtils.appendPropertyToMarkdown(markdownString, "USER_ID", userId);
+        }
 
         AndroidUtils.appendPropertyToMarkdownIfSet(markdownString,"PROFILE_OWNER", PackageUtils.getProfileOwnerPackageNameForUser(context));
 
diff --git a/termux-shared/src/main/java/com/termux/shared/android/PackageUtils.java b/termux-shared/src/main/java/com/termux/shared/android/PackageUtils.java
index dae7b42b55..4447a9218b 100644
--- a/termux-shared/src/main/java/com/termux/shared/android/PackageUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/android/PackageUtils.java
@@ -8,11 +8,13 @@
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
+import android.os.Build;
 import android.os.UserHandle;
 import android.os.UserManager;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
 
 import com.termux.shared.R;
 import com.termux.shared.data.DataUtils;
@@ -507,6 +509,7 @@ public static String getSigningCertificateSHA256DigestForPackage(@NonNull final
      * @param context The {@link Context} for the package.
      * @return Returns the serial number. This will be {@code null} if failed to get it.
      */
+    @RequiresApi(api = Build.VERSION_CODES.N)
     @Nullable
     public static Long getUserIdForPackage(@NonNull Context context) {
         UserManager userManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
@@ -521,6 +524,7 @@ public static Long getUserIdForPackage(@NonNull Context context) {
      * @param context The {@link Context} for operations.
      * @return Returns {@code true} if the current user is the primary user, otherwise [@code false}.
      */
+    @RequiresApi(api = Build.VERSION_CODES.N)
     public static boolean isCurrentUserThePrimaryUser(@NonNull Context context) {
         Long userId = getUserIdForPackage(context);
         return userId != null && userId == 0;
diff --git a/termux-shared/src/main/java/com/termux/shared/android/PermissionUtils.java b/termux-shared/src/main/java/com/termux/shared/android/PermissionUtils.java
index ff19a1512a..60aeed077f 100644
--- a/termux-shared/src/main/java/com/termux/shared/android/PermissionUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/android/PermissionUtils.java
@@ -93,6 +93,7 @@ public static boolean checkPermissions(@NonNull Context context, @NonNull String
      *                    will fail silently and will log an exception.
      * @return Returns {@code true} if requesting the permission was successful, otherwise {@code false}.
      */
+    @RequiresApi(api = Build.VERSION_CODES.M)
     public static boolean requestPermission(@NonNull Context context, @NonNull String permission,
                                             int requestCode) {
         return requestPermissions(context, new String[]{permission}, requestCode);
@@ -116,6 +117,7 @@ public static boolean requestPermission(@NonNull Context context, @NonNull Strin
      *                    will fail silently and will log an exception.
      * @return Returns {@code true} if requesting the permissions was successful, otherwise {@code false}.
      */
+    @RequiresApi(api = Build.VERSION_CODES.M)
     public static boolean requestPermissions(@NonNull Context context, @NonNull String[] permissions,
                                              int requestCode) {
         List<String> permissionsNotRequested = getPermissionsNotRequested(context, permissions);
@@ -274,12 +276,13 @@ public static boolean checkAndRequestLegacyOrManageExternalStoragePermission(@No
             return true;
         }
 
+
         errmsg = context.getString(R.string.msg_storage_permission_not_granted);
         Logger.logError(LOG_TAG, errmsg);
         if (showErrorMessage)
             Logger.showToast(context, errmsg, false);
 
-        if (requestCode < 0)
+        if (requestCode < 0 || Build.VERSION.SDK_INT < Build.VERSION_CODES.M)
             return false;
 
         if (requestLegacyStoragePermission || Build.VERSION.SDK_INT < Build.VERSION_CODES.R) {
@@ -323,6 +326,7 @@ public static boolean checkStoragePermission(@NonNull Context context, boolean c
      *                    will fail silently and will log an exception.
      * @return Returns {@code true} if requesting the permission was successful, otherwise {@code false}.
      */
+    @RequiresApi(api = Build.VERSION_CODES.M)
     public static boolean requestLegacyStorageExternalPermission(@NonNull Context context, int requestCode) {
         Logger.logInfo(LOG_TAG, "Requesting legacy external storage permission");
         return requestPermission(context, Manifest.permission.WRITE_EXTERNAL_STORAGE, requestCode);
@@ -439,7 +443,10 @@ public static boolean hasRequestedLegacyExternalStorage(@NonNull Context context
      * @return Returns {@code true} if permission is granted, otherwise {@code false}.
      */
     public static boolean checkDisplayOverOtherAppsPermission(@NonNull Context context) {
-        return Settings.canDrawOverlays(context);
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M)
+            return Settings.canDrawOverlays(context);
+        else
+            return true;
     }
 
     /** Wrapper for {@link #requestDisplayOverOtherAppsPermission(Context, int)}. */
@@ -461,6 +468,9 @@ public static Error requestDisplayOverOtherAppsPermission(@NonNull Context conte
     public static Error requestDisplayOverOtherAppsPermission(@NonNull Context context, int requestCode) {
         Logger.logInfo(LOG_TAG, "Requesting display over apps permission");
 
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M)
+            return null;
+
         Intent intent = new Intent(Settings.ACTION_MANAGE_OVERLAY_PERMISSION);
         intent.setData(Uri.parse("package:" + context.getPackageName()));
 
@@ -505,8 +515,11 @@ public static boolean validateDisplayOverOtherAppsPermissionForPostAndroid10(@No
      * @return Returns {@code true} if permission is granted, otherwise {@code false}.
      */
     public static boolean checkIfBatteryOptimizationsDisabled(@NonNull Context context) {
-        PowerManager powerManager = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
-        return powerManager.isIgnoringBatteryOptimizations(context.getPackageName());
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            PowerManager powerManager = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
+            return powerManager.isIgnoringBatteryOptimizations(context.getPackageName());
+        } else
+            return true;
     }
 
     /** Wrapper for {@link #requestDisableBatteryOptimizations(Context, int)}. */
@@ -530,6 +543,9 @@ public static Error requestDisableBatteryOptimizations(@NonNull Context context)
     public static Error requestDisableBatteryOptimizations(@NonNull Context context, int requestCode) {
         Logger.logInfo(LOG_TAG, "Requesting to disable battery optimizations");
 
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M)
+            return null;
+
         Intent intent = new Intent(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS);
         intent.setData(Uri.parse("package:" + context.getPackageName()));
 
diff --git a/termux-shared/src/main/java/com/termux/shared/file/filesystem/UnixConstants.java b/termux-shared/src/main/java/com/termux/shared/file/filesystem/UnixConstants.java
index 72e7dc2ae9..9659be7e7b 100644
--- a/termux-shared/src/main/java/com/termux/shared/file/filesystem/UnixConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/file/filesystem/UnixConstants.java
@@ -32,8 +32,11 @@
 // Those constants are initialized by native code to ensure correctness on different architectures.
 // AT_SYMLINK_NOFOLLOW (used by fstatat) and AT_REMOVEDIR (used by unlinkat) as of July 2018 do not
 // have equivalents in android.system.OsConstants so left unchanged.
+import android.os.Build;
 import android.system.OsConstants;
 
+import androidx.annotation.RequiresApi;
+
 /**
  * https://cs.android.com/android/platform/superproject/+/android-11.0.0_r3:libcore/ojluni/src/main/java/sun/nio/fs/UnixConstants.java
  */
@@ -56,7 +59,11 @@ private UnixConstants() { }
 
     static final int O_SYNC = OsConstants.O_SYNC;
 
-    static final int O_DSYNC = OsConstants.O_DSYNC;
+    // Crash on Android 5.
+    // No static field O_DSYNC of type I in class Landroid/system/OsConstants; or its superclasses
+    // (declaration of 'android.system.OsConstants' appears in /system/framework/core-libart.jar)
+    //@RequiresApi(Build.VERSION_CODES.O_MR1)
+    //static final int O_DSYNC = OsConstants.O_DSYNC;
 
     static final int O_NOFOLLOW = OsConstants.O_NOFOLLOW;
 
diff --git a/termux-shared/src/main/java/com/termux/shared/interact/ShareUtils.java b/termux-shared/src/main/java/com/termux/shared/interact/ShareUtils.java
index c7793f75fb..4d17af86f6 100644
--- a/termux-shared/src/main/java/com/termux/shared/interact/ShareUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/interact/ShareUtils.java
@@ -8,6 +8,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Environment;
 
 import androidx.appcompat.app.AppCompatActivity;
@@ -145,7 +146,7 @@ public static void saveTextToFile(final Context context, final String label, fin
             !PermissionUtils.checkPermission(context, Manifest.permission.WRITE_EXTERNAL_STORAGE)) {
             Logger.logErrorAndShowToast(context, LOG_TAG, context.getString(R.string.msg_storage_permission_not_granted));
 
-            if (storagePermissionRequestCode >= 0) {
+            if (storagePermissionRequestCode >= 0 && Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
                 if (context instanceof AppCompatActivity)
                     PermissionUtils.requestPermission(((AppCompatActivity) context), Manifest.permission.WRITE_EXTERNAL_STORAGE, storagePermissionRequestCode);
                 else if (context instanceof Activity)
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/extrakeys/SpecialButtonState.java b/termux-shared/src/main/java/com/termux/shared/termux/extrakeys/SpecialButtonState.java
index 3b68952966..606dcc4f5e 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/extrakeys/SpecialButtonState.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/extrakeys/SpecialButtonState.java
@@ -38,7 +38,9 @@ public void setIsCreated(boolean value) {
     /** Set {@link #isActive}. */
     public void setIsActive(boolean value) {
         isActive = value;
-        buttons.forEach(button -> button.setTextColor(value ? mExtraKeysView.getButtonActiveTextColor() : mExtraKeysView.getButtonTextColor()));
+        for (MaterialButton button : buttons) {
+            button.setTextColor(value ? mExtraKeysView.getButtonActiveTextColor() : mExtraKeysView.getButtonTextColor());
+        }
     }
 
     /** Set {@link #isLocked}. */
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/terminal/io/TerminalExtraKeys.java b/termux-shared/src/main/java/com/termux/shared/termux/terminal/io/TerminalExtraKeys.java
index 05571f7a7d..44eb5b02f0 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/terminal/io/TerminalExtraKeys.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/terminal/io/TerminalExtraKeys.java
@@ -1,5 +1,6 @@
 package com.termux.shared.termux.terminal.io;
 
+import android.os.Build;
 import android.view.KeyEvent;
 import android.view.View;
 
@@ -9,6 +10,7 @@
 import com.termux.shared.termux.extrakeys.ExtraKeyButton;
 import com.termux.shared.termux.extrakeys.ExtraKeysView;
 import com.termux.shared.termux.extrakeys.SpecialButton;
+import com.termux.terminal.TerminalSession;
 import com.termux.view.TerminalView;
 
 import static com.termux.shared.termux.extrakeys.ExtraKeysConstants.PRIMARY_KEY_CODES_FOR_STRINGS;
@@ -63,9 +65,15 @@ protected void onTerminalExtraKeyButtonClick(View view, String key, boolean ctrl
             mTerminalView.onKeyDown(keyCode, keyEvent);
         } else {
             // not a control char
-            key.codePoints().forEach(codePoint -> {
-                mTerminalView.inputCodePoint(codePoint, ctrlDown, altDown);
-            });
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                key.codePoints().forEach(codePoint -> {
+                    mTerminalView.inputCodePoint(codePoint, ctrlDown, altDown);
+                });
+            } else {
+                TerminalSession session = mTerminalView.getCurrentSession();
+                if (session != null && key.length() > 0)
+                    session.write(key);
+            }
         }
     }
 
diff --git a/termux-shared/src/main/java/com/termux/shared/view/KeyboardUtils.java b/termux-shared/src/main/java/com/termux/shared/view/KeyboardUtils.java
index eee44ec23d..5df35d2b09 100644
--- a/termux-shared/src/main/java/com/termux/shared/view/KeyboardUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/view/KeyboardUtils.java
@@ -4,12 +4,14 @@
 import android.content.Context;
 import android.content.res.Configuration;
 import android.inputmethodservice.InputMethodService;
+import android.os.Build;
 import android.view.View;
 import android.view.WindowInsets;
 import android.view.WindowManager;
 import android.view.inputmethod.InputMethodManager;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
 import androidx.core.view.WindowInsetsCompat;
 
 import com.termux.shared.logger.Logger;
@@ -118,6 +120,7 @@ public static void setSoftInputModeAdjustResize(final Activity activity) {
      * @param activity The Activity of the root view for which the visibility should be checked.
      * @return Returns {@code true} if soft keyboard is visible, otherwise {@code false}.
      */
+    @RequiresApi(api = Build.VERSION_CODES.M)
     public static boolean isSoftKeyboardVisible(final Activity activity) {
         if (activity != null && activity.getWindow() != null) {
             WindowInsets insets = activity.getWindow().getDecorView().getRootWindowInsets();
diff --git a/termux-shared/src/main/java/com/termux/shared/view/ViewUtils.java b/termux-shared/src/main/java/com/termux/shared/view/ViewUtils.java
index d85b82909b..2f62d74d3c 100644
--- a/termux-shared/src/main/java/com/termux/shared/view/ViewUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/view/ViewUtils.java
@@ -6,12 +6,14 @@
 import android.content.res.Configuration;
 import android.graphics.Point;
 import android.graphics.Rect;
+import android.os.Build;
 import android.util.TypedValue;
 import android.view.View;
 import android.view.ViewGroup;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatActivity;
 
 import com.termux.shared.logger.Logger;
@@ -77,13 +79,13 @@ public static Rect[] getWindowAndViewRects(View view, int statusBarHeight) {
         boolean isInMultiWindowMode = false;
         Context context = view.getContext();
         if (context instanceof AppCompatActivity) {
-            androidx.appcompat.app.ActionBar actionBar = ((AppCompatActivity) context).getSupportActionBar();
+            ActionBar actionBar = ((AppCompatActivity) context).getSupportActionBar();
             if (actionBar != null) actionBarHeight = actionBar.getHeight();
-            isInMultiWindowMode = ((AppCompatActivity) context).isInMultiWindowMode();
+            isInMultiWindowMode = (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) && ((AppCompatActivity) context).isInMultiWindowMode();
         } else if (context instanceof Activity) {
             android.app.ActionBar actionBar = ((Activity) context).getActionBar();
             if (actionBar != null) actionBarHeight = actionBar.getHeight();
-            isInMultiWindowMode = ((Activity) context).isInMultiWindowMode();
+            isInMultiWindowMode = (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) && ((Activity) context).isInMultiWindowMode();
         }
 
         int displayOrientation = getDisplayOrientation(context);

From 55dcd09a096931833337336355e38da053442524 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Tue, 26 Apr 2022 02:33:21 +0500
Subject: [PATCH 744/912] Fixed: Fixed extra keys not showing properly on
 Android 5

Related issue #739
---
 app/src/main/java/com/termux/app/TermuxActivity.java | 10 +++++++---
 .../app/terminal/io/TerminalToolbarViewPager.java    |  3 ++-
 .../shared/termux/extrakeys/ExtraKeysView.java       | 12 +++++++++---
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index 548566e269..47fe2363f6 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -173,7 +173,7 @@ public final class TermuxActivity extends AppCompatActivity implements ServiceCo
 
     private int mNavBarHeight;
 
-    private int mTerminalToolbarDefaultHeight;
+    private float mTerminalToolbarDefaultHeight;
 
 
     private static final int CONTEXT_MENU_SELECT_URL_ID = 0;
@@ -528,7 +528,7 @@ private void setTerminalToolbarHeight() {
         if (terminalToolbarViewPager == null) return;
 
         ViewGroup.LayoutParams layoutParams = terminalToolbarViewPager.getLayoutParams();
-        layoutParams.height = (int) Math.round(mTerminalToolbarDefaultHeight *
+        layoutParams.height = Math.round(mTerminalToolbarDefaultHeight *
             (mTermuxTerminalExtraKeys.getExtraKeysInfo() == null ? 0 : mTermuxTerminalExtraKeys.getExtraKeysInfo().getMatrix().length) *
             mProperties.getTerminalToolbarHeightScaleFactor());
         terminalToolbarViewPager.setLayoutParams(layoutParams);
@@ -835,6 +835,10 @@ public ViewPager getTerminalToolbarViewPager() {
         return (ViewPager) findViewById(R.id.terminal_toolbar_view_pager);
     }
 
+    public float getTerminalToolbarDefaultHeight() {
+        return mTerminalToolbarDefaultHeight;
+    }
+
     public boolean isTerminalViewSelected() {
         return getTerminalToolbarViewPager().getCurrentItem() == 0;
     }
@@ -960,7 +964,7 @@ private void reloadActivityStyling(boolean recreateActivity) {
 
             if (mExtraKeysView != null) {
                 mExtraKeysView.setButtonTextAllCaps(mProperties.shouldExtraKeysTextBeAllCaps());
-                mExtraKeysView.reload(mTermuxTerminalExtraKeys.getExtraKeysInfo());
+                mExtraKeysView.reload(mTermuxTerminalExtraKeys.getExtraKeysInfo(), mTerminalToolbarDefaultHeight);
             }
 
             // Update NightMode.APP_NIGHT_MODE
diff --git a/app/src/main/java/com/termux/app/terminal/io/TerminalToolbarViewPager.java b/app/src/main/java/com/termux/app/terminal/io/TerminalToolbarViewPager.java
index ac1e2e4def..a526570b09 100644
--- a/app/src/main/java/com/termux/app/terminal/io/TerminalToolbarViewPager.java
+++ b/app/src/main/java/com/termux/app/terminal/io/TerminalToolbarViewPager.java
@@ -47,7 +47,8 @@ public Object instantiateItem(@NonNull ViewGroup collection, int position) {
                 extraKeysView.setExtraKeysViewClient(mActivity.getTermuxTerminalExtraKeys());
                 extraKeysView.setButtonTextAllCaps(mActivity.getProperties().shouldExtraKeysTextBeAllCaps());
                 mActivity.setExtraKeysView(extraKeysView);
-                extraKeysView.reload(mActivity.getTermuxTerminalExtraKeys().getExtraKeysInfo());
+                extraKeysView.reload(mActivity.getTermuxTerminalExtraKeys().getExtraKeysInfo(),
+                    mActivity.getTerminalToolbarDefaultHeight());
 
                 // apply extra keys fix if enabled in prefs
                 if (mActivity.getProperties().isUsingFullScreen() && mActivity.getProperties().isUsingFullScreenWorkAround()) {
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/extrakeys/ExtraKeysView.java b/termux-shared/src/main/java/com/termux/shared/termux/extrakeys/ExtraKeysView.java
index cbd59b74f9..4fbbf1e171 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/extrakeys/ExtraKeysView.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/extrakeys/ExtraKeysView.java
@@ -60,7 +60,7 @@
  * in {@link ExtraKeysView#ExtraKeysView(Context, AttributeSet)} by calling the respective functions.
  * If you extend {@link ExtraKeysView}, you can also set them in the constructor, but do call super().
  *
- * After this you will have to make a call to {@link ExtraKeysView#reload(ExtraKeysInfo) and pass
+ * After this you will have to make a call to {@link ExtraKeysView#reload(ExtraKeysInfo, float) and pass
  * it the {@link ExtraKeysInfo} to load and display the extra keys. Read its class javadocs for more
  * info on how to create it.
  *
@@ -379,9 +379,11 @@ public Map<SpecialButton, SpecialButtonState> getDefaultSpecialButtons(ExtraKeys
      * Reload this instance of {@link ExtraKeysView} with the info passed in {@code extraKeysInfo}.
      *
      * @param extraKeysInfo The {@link ExtraKeysInfo} that defines the necessary info for the extra keys.
+     * @param heightPx The height in pixels of the parent surrounding the {@link ExtraKeysView}. It must
+     *                 be a single child.
      */
     @SuppressLint("ClickableViewAccessibility")
-    public void reload(ExtraKeysInfo extraKeysInfo) {
+    public void reload(ExtraKeysInfo extraKeysInfo, float heightPx) {
         if (extraKeysInfo == null)
             return;
 
@@ -469,7 +471,11 @@ public void reload(ExtraKeysInfo extraKeysInfo) {
 
                 LayoutParams param = new GridLayout.LayoutParams();
                 param.width = 0;
-                param.height = 0;
+                if(Build.VERSION.SDK_INT == Build.VERSION_CODES.LOLLIPOP) {
+                   param.height = (int)(heightPx + 0.5);
+                } else {
+                    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);

From c549988434d532caf2e3f471fb783cd48bc1b730 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Tue, 26 Apr 2022 02:33:51 +0500
Subject: [PATCH 745/912] Fixed: Fix broken javadocs links

---
 .../com/termux/shared/termux/extrakeys/ExtraKeysInfo.java     | 3 ++-
 .../termux/shell/command/runner/terminal/TermuxSession.java   | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/termux/extrakeys/ExtraKeysInfo.java b/termux-shared/src/main/java/com/termux/shared/termux/extrakeys/ExtraKeysInfo.java
index 9140c13edd..2f5bb4a7b0 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/extrakeys/ExtraKeysInfo.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/extrakeys/ExtraKeysInfo.java
@@ -5,6 +5,7 @@
 
 import androidx.annotation.NonNull;
 
+import com.google.android.material.button.MaterialButton;
 import com.termux.shared.termux.extrakeys.ExtraKeysConstants.EXTRA_KEY_DISPLAY_MAPS;
 import com.termux.shared.termux.terminal.io.TerminalExtraKeys;
 
@@ -68,7 +69,7 @@
  *
  * Its up to the {@link ExtraKeysView.IExtraKeysView} client on how to handle individual key values
  * of an {@link ExtraKeyButton}. They are sent as is via
- * {@link ExtraKeysView.IExtraKeysView#onExtraKeyButtonClick(View, ExtraKeyButton, Button)}. The
+ * {@link ExtraKeysView.IExtraKeysView#onExtraKeyButtonClick(View, ExtraKeyButton, MaterialButton)}. The
  * {@link TerminalExtraKeys} which is an implementation of the interface,
  * checks if the key is one of {@link ExtraKeysConstants#PRIMARY_KEY_CODES_FOR_STRINGS} and generates
  * a {@link android.view.KeyEvent} for it, and if its not, then converts the key to code points by
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/shell/command/runner/terminal/TermuxSession.java b/termux-shared/src/main/java/com/termux/shared/termux/shell/command/runner/terminal/TermuxSession.java
index 2cfeb45d58..7f365c9968 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/shell/command/runner/terminal/TermuxSession.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/shell/command/runner/terminal/TermuxSession.java
@@ -217,10 +217,10 @@ public void killIfExecuting(@NonNull final Context context, boolean processResul
      * callback will be called.
      *
      * @param termuxSession The {@link TermuxSession}, which should be set if
-     *                  {@link #execute(Context, ExecutionCommand, TerminalSessionClient, TermuxSessionClient, ShellEnvironmentClient, String, boolean)}
+     *                  {@link #execute(Context, ExecutionCommand, TerminalSessionClient, TermuxSessionClient, ShellEnvironmentClient, boolean)}
      *                   successfully started the process.
      * @param executionCommand The {@link ExecutionCommand}, which should be set if
-     *                          {@link #execute(Context, ExecutionCommand, TerminalSessionClient, TermuxSessionClient, ShellEnvironmentClient, String, boolean)}
+     *                          {@link #execute(Context, ExecutionCommand, TerminalSessionClient, TermuxSessionClient, ShellEnvironmentClient, boolean)}
      *                          failed to start the process.
      */
     private static void processTermuxSessionResult(final TermuxSession termuxSession, ExecutionCommand executionCommand) {

From 4e08f76fd20a9d514c41e1888525b0ef661765fa Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Tue, 26 Apr 2022 02:35:43 +0500
Subject: [PATCH 746/912] Changed: Export correct PATH and also export
 LD_LIBRARY_PATH for Android 5/6 since packages won't use DT_RUNPATH

---
 .../com/termux/shared/termux/shell/TermuxShellUtils.java | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/termux/shell/TermuxShellUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/shell/TermuxShellUtils.java
index d20208b54f..dde43e9581 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/shell/TermuxShellUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/shell/TermuxShellUtils.java
@@ -1,9 +1,11 @@
 package com.termux.shared.termux.shell;
 
 import android.content.Context;
+import android.os.Build;
 
 import androidx.annotation.NonNull;
 
+import com.termux.shared.BuildConfig;
 import com.termux.shared.errors.Error;
 import com.termux.shared.file.filesystem.FileTypes;
 import com.termux.shared.termux.TermuxBootstrap;
@@ -95,9 +97,14 @@ public static String[] buildEnvironment(Context currentPackageContext, boolean i
             environment.add("PATH= " + System.getenv("PATH"));
         } else {
             environment.add("LANG=en_US.UTF-8");
-            environment.add("PATH=" + TermuxConstants.TERMUX_BIN_PREFIX_DIR_PATH);
             environment.add("PWD=" + workingDirectory);
             environment.add("TMPDIR=" + TermuxConstants.TERMUX_TMP_PREFIX_DIR_PATH);
+            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
+                environment.add("PATH=" + TermuxConstants.TERMUX_BIN_PREFIX_DIR_PATH + ":" + TermuxConstants.TERMUX_BIN_PREFIX_DIR_PATH + "/applets");
+                environment.add("LD_LIBRARY_PATH=" + TermuxConstants.TERMUX_LIB_PREFIX_DIR_PATH);
+            } else {
+                environment.add("PATH=" + TermuxConstants.TERMUX_BIN_PREFIX_DIR_PATH);
+            }
         }
 
         return environment.toArray(new String[0]);

From ab9b620c880f362fe27bcfb611d5eb929be4e635 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Tue, 26 Apr 2022 02:36:45 +0500
Subject: [PATCH 747/912] Added: Add ResourceUtils to get resource ids from
 names

This will mainly be used later when MediaViewer gets added.
---
 .../android/resource/ResourceUtils.java       | 136 ++++++++++++++++++
 1 file changed, 136 insertions(+)
 create mode 100644 termux-shared/src/main/java/com/termux/shared/android/resource/ResourceUtils.java

diff --git a/termux-shared/src/main/java/com/termux/shared/android/resource/ResourceUtils.java b/termux-shared/src/main/java/com/termux/shared/android/resource/ResourceUtils.java
new file mode 100644
index 0000000000..67cfb662de
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/android/resource/ResourceUtils.java
@@ -0,0 +1,136 @@
+package com.termux.shared.android.resource;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.termux.shared.data.DataUtils;
+import com.termux.shared.logger.Logger;
+
+public class ResourceUtils {
+
+    public static final String RES_TYPE_COLOR = "color";
+    public static final String RES_TYPE_DRAWABLE = "drawable";
+    public static final String RES_TYPE_ID = "id";
+    public static final String RES_TYPE_LAYOUT = "layout";
+    public static final String RES_TYPE_STRING = "string";
+    public static final String RES_TYPE_STYLE = "style";
+
+
+    private static final String LOG_TAG = "ResourceUtils";
+
+
+    /** Wrapper for {@link #getResourceId(Context, String, String, String, boolean)} without {@code defPackage}. */
+    @Nullable
+    public static Integer getResourceId(@NonNull Context context, String name,
+                                        @Nullable String defType,
+                                        boolean logErrorMessage) {
+        return getResourceId(context, name, defType, null, logErrorMessage);
+    }
+
+    /**
+     * Get resource identifier for the given resource name. A fully qualified resource name is of
+     * the form "package:type/entry".  The first two components (package and type) are optional if
+     * defType and defPackage, respectively, are specified here.
+     *
+     * @param context The {@link Context} for operations.
+     * @param name The name of the desired resource.
+     * @param defType Optional default resource type to find, if "type/" is not included in the name.
+     *                Can be null to require an explicit type.
+     * @param defPackage Optional default package to find, if "package:" is not included in the name.
+     *                   Can be null to require an explicit package.
+     * @param logErrorMessage If an error message should be logged if failed to find resource.
+     * @return Returns the resource identifier if found. Otherwise {@code null} if an exception was
+     * raised or resource was not found.
+     */
+    @Nullable
+    public static Integer getResourceId(@NonNull Context context, String name,
+                                        @Nullable String defType, @Nullable String defPackage,
+                                        boolean logErrorMessage) {
+        if (DataUtils.isNullOrEmpty(name)) return null;
+
+        Integer resourceId = null;
+        try {
+            resourceId = context.getResources().getIdentifier(name, defType, defPackage);
+            if (resourceId == 0) resourceId = null;
+        } catch (Exception e) {
+            // Ignore
+        }
+
+        if (resourceId == null && logErrorMessage) {
+            Logger.logError(LOG_TAG, "Resource id not found. name: \"" + name + "\", type: \"" + defType+ "\", package: \"" + defPackage + "\", component \"" + context.getClass().getName() + "\"");
+        }
+
+        return resourceId;
+    }
+
+
+
+    /**
+     * Get resource identifier for the given {@link #RES_TYPE_COLOR} resource name.
+     *
+     * This is a wrapper for {@link #getResourceId(Context, String, String, String, boolean)}.
+     */
+    @Nullable
+    public static Integer getColorResourceId(@NonNull Context context, String name,
+                                             @Nullable String defPackage, boolean logErrorMessage) {
+        return getResourceId(context, name, RES_TYPE_COLOR, defPackage, logErrorMessage);
+    }
+
+    /**
+     * Get resource identifier for the given {@link #RES_TYPE_DRAWABLE} resource name.
+     *
+     * This is a wrapper for {@link #getResourceId(Context, String, String, String, boolean)}.
+     */
+    @Nullable
+    public static Integer getDrawableResourceId(@NonNull Context context, String name,
+                                                @Nullable String defPackage, boolean logErrorMessage) {
+        return getResourceId(context, name, RES_TYPE_DRAWABLE, defPackage, logErrorMessage);
+    }
+
+    /**
+     * Get resource identifier for the given {@link #RES_TYPE_ID} resource name.
+     *
+     * This is a wrapper for {@link #getResourceId(Context, String, String, String, boolean)}.
+     */
+    @Nullable
+    public static Integer getIdResourceId(@NonNull Context context, String name,
+                                          @Nullable String defPackage, boolean logErrorMessage) {
+        return getResourceId(context, name, RES_TYPE_ID, defPackage, logErrorMessage);
+    }
+
+    /**
+     * Get resource identifier for the given {@link #RES_TYPE_LAYOUT} resource name.
+     *
+     * This is a wrapper for {@link #getResourceId(Context, String, String, String, boolean)}.
+     */
+    @Nullable
+    public static Integer getLayoutResourceId(@NonNull Context context, String name,
+                                              @Nullable String defPackage, boolean logErrorMessage) {
+        return getResourceId(context, name, RES_TYPE_LAYOUT, defPackage, logErrorMessage);
+    }
+
+    /**
+     * Get resource identifier for the given {@link #RES_TYPE_STRING} resource name.
+     *
+     * This is a wrapper for {@link #getResourceId(Context, String, String, String, boolean)}.
+     */
+    @Nullable
+    public static Integer getStringResourceId(@NonNull Context context, String name,
+                                              @Nullable String defPackage, boolean logErrorMessage) {
+        return getResourceId(context, name, RES_TYPE_STRING, defPackage, logErrorMessage);
+    }
+
+    /**
+     * Get resource identifier for the given {@link #RES_TYPE_STYLE} resource name.
+     *
+     * This is a wrapper for {@link #getResourceId(Context, String, String, String, boolean)}.
+     */
+    @Nullable
+    public static Integer getStyleResourceId(@NonNull Context context, String name,
+                                             @Nullable String defPackage, boolean logErrorMessage) {
+        return getResourceId(context, name, RES_TYPE_STYLE, defPackage, logErrorMessage);
+    }
+
+}

From 5290ce1f7745a4c47f88f22b4fb19de2acc10988 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Tue, 26 Apr 2022 02:40:12 +0500
Subject: [PATCH 748/912] Added|Fixed: Add
 `TermuxNotificationUtils.getTermuxOrPluginAppNotificationBuilder()` helper
 function and fix notification icon drawable resource id issue on Android 5

---
 .../notification/NotificationUtils.java       |  2 +
 .../shared/termux/crash/TermuxCrashUtils.java | 22 +-----
 .../notification/TermuxNotificationUtils.java | 71 +++++++++++++++++++
 .../termux/plugins/TermuxPluginUtils.java     | 20 +-----
 4 files changed, 77 insertions(+), 38 deletions(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/notification/NotificationUtils.java b/termux-shared/src/main/java/com/termux/shared/notification/NotificationUtils.java
index 25597a2037..e21a83f401 100644
--- a/termux-shared/src/main/java/com/termux/shared/notification/NotificationUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/notification/NotificationUtils.java
@@ -51,6 +51,8 @@ public static NotificationManager getNotificationManager(final Context context)
      *
      * @param context The {@link Context} for operations.
      * @param title The title for the notification.
+     * @param channelId The channel id for the notification.
+     * @param priority The priority 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.
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/crash/TermuxCrashUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/crash/TermuxCrashUtils.java
index 5d551a9715..a34557077a 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/crash/TermuxCrashUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/crash/TermuxCrashUtils.java
@@ -5,13 +5,11 @@
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
-import android.graphics.drawable.Icon;
 import android.os.Environment;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import com.termux.shared.R;
 import com.termux.shared.activities.ReportActivity;
 import com.termux.shared.android.AndroidUtils;
 import com.termux.shared.crash.CrashHandler;
@@ -391,26 +389,10 @@ public static Notification.Builder getCrashReportsNotificationBuilder(final Cont
                                                                           final PendingIntent contentIntent,
                                                                           final PendingIntent deleteIntent,
                                                                           final int notificationMode) {
-
-        Notification.Builder builder =  NotificationUtils.geNotificationBuilder(termuxPackageContext,
+        return TermuxNotificationUtils.getTermuxOrPluginAppNotificationBuilder(
+            currentPackageContext, termuxPackageContext,
             TermuxConstants.TERMUX_CRASH_REPORTS_NOTIFICATION_CHANNEL_ID, Notification.PRIORITY_HIGH,
             title, notificationText, notificationBigText, contentIntent, deleteIntent, notificationMode);
-
-        if (builder == null)  return null;
-
-        // Enable timestamp
-        builder.setShowWhen(true);
-
-        // Set notification icon
-        builder.setSmallIcon(Icon.createWithResource(currentPackageContext, R.drawable.ic_error_notification));
-
-        // Set background color for small notification icon
-        builder.setColor(0xFF607D8B);
-
-        // Dismiss on click
-        builder.setAutoCancel(true);
-
-        return builder;
     }
 
     /**
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/notification/TermuxNotificationUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/notification/TermuxNotificationUtils.java
index eb0b50626d..19c7c02b7d 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/notification/TermuxNotificationUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/notification/TermuxNotificationUtils.java
@@ -1,7 +1,16 @@
 package com.termux.shared.termux.notification;
 
+import android.app.Notification;
+import android.app.PendingIntent;
 import android.content.Context;
+import android.graphics.drawable.Icon;
+import android.os.Build;
 
+import androidx.annotation.Nullable;
+
+import com.termux.shared.R;
+import com.termux.shared.android.resource.ResourceUtils;
+import com.termux.shared.notification.NotificationUtils;
 import com.termux.shared.termux.settings.preferences.TermuxAppSharedPreferences;
 import com.termux.shared.termux.settings.preferences.TermuxPreferenceConstants;
 import com.termux.shared.termux.TermuxConstants;
@@ -35,4 +44,66 @@ public synchronized static int getNextNotificationId(final Context context) {
         preferences.setLastNotificationId(nextNotificationId);
         return nextNotificationId;
     }
+
+    /**
+     * Get {@link Notification.Builder} for termux app or its plugin.
+     *
+     * @param currentPackageContext The {@link Context} of current package.
+     * @param termuxPackageContext The {@link Context} of termux package.
+     * @param channelId The channel id for the notification.
+     * @param priority The priority for the notification.
+     * @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 notificationMode The notification mode. It must be one of {@code NotificationUtils.NOTIFICATION_MODE_*}.
+     * @return Returns the {@link Notification.Builder}.
+     */
+    @Nullable
+    public static Notification.Builder getTermuxOrPluginAppNotificationBuilder(final Context currentPackageContext,
+                                                                                 final Context termuxPackageContext,
+                                                                                 final String channelId,
+                                                                                 final int priority,
+                                                                                 final CharSequence title,
+                                                                                 final CharSequence notificationText,
+                                                                                 final CharSequence notificationBigText,
+                                                                                 final PendingIntent contentIntent,
+                                                                                 final PendingIntent deleteIntent,
+                                                                                 final int notificationMode) {
+        Notification.Builder builder =  NotificationUtils.geNotificationBuilder(termuxPackageContext,
+            channelId, priority,
+            title, notificationText, notificationBigText, contentIntent, deleteIntent, notificationMode);
+
+        if (builder == null)  return null;
+
+        // Enable timestamp
+        builder.setShowWhen(true);
+
+        // Set notification icon
+        // If a notification is to be shown by a termux plugin app, then we can't use the drawable
+        // resource id for the plugin app with setSmallIcon(@DrawableRes int icon) since notification
+        // is shown with termuxPackageContext and termux-app package would have a different id and
+        // when android tries to load the drawable an exception would be thrown and notification will
+        // not be thrown.
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            // Set Icon instead of drawable resource id
+            builder.setSmallIcon(Icon.createWithResource(currentPackageContext, R.drawable.ic_error_notification));
+        } else {
+            // Set drawable resource id used by termux-app package
+            Integer iconResId = ResourceUtils.getDrawableResourceId(termuxPackageContext, "ic_error_notification",
+                termuxPackageContext.getPackageName(), true);
+            if (iconResId != null)
+                builder.setSmallIcon(iconResId);
+        }
+
+        // Set background color for small notification icon
+        builder.setColor(0xFF607D8B);
+
+        // Dismiss on click
+        builder.setAutoCancel(true);
+
+        return builder;
+    }
+
 }
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/plugins/TermuxPluginUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/plugins/TermuxPluginUtils.java
index ed2d9a2016..1ab482e521 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/plugins/TermuxPluginUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/plugins/TermuxPluginUtils.java
@@ -4,7 +4,6 @@
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.content.Context;
-import android.graphics.drawable.Icon;
 import android.os.Environment;
 
 import androidx.annotation.Nullable;
@@ -403,25 +402,10 @@ public static Notification.Builder getPluginCommandErrorsNotificationBuilder(fin
                                                                                  final PendingIntent contentIntent,
                                                                                  final PendingIntent deleteIntent,
                                                                                  final int notificationMode) {
-        Notification.Builder builder =  NotificationUtils.geNotificationBuilder(termuxPackageContext,
+        return TermuxNotificationUtils.getTermuxOrPluginAppNotificationBuilder(
+            currentPackageContext, termuxPackageContext,
             TermuxConstants.TERMUX_PLUGIN_COMMAND_ERRORS_NOTIFICATION_CHANNEL_ID, Notification.PRIORITY_HIGH,
             title, notificationText, notificationBigText, contentIntent, deleteIntent, notificationMode);
-
-        if (builder == null)  return null;
-
-        // Enable timestamp
-        builder.setShowWhen(true);
-
-        // Set notification icon
-        builder.setSmallIcon(Icon.createWithResource(currentPackageContext, R.drawable.ic_error_notification));
-
-        // Set background color for small notification icon
-        builder.setColor(0xFF607D8B);
-
-        // Dismiss on click
-        builder.setAutoCancel(true);
-
-        return builder;
     }
 
     /**

From 007bef81321fd9659b816fe674166f1a9ffd5f12 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Tue, 26 Apr 2022 03:28:20 +0500
Subject: [PATCH 749/912] Added: Add message to bootstrap error if user
 installed termux on portable/external/removable sd card since its not
 supported on some devices

---
 .../main/java/com/termux/app/TermuxInstaller.java    | 12 ++++++++++--
 app/src/main/res/values/strings.xml                  |  6 +++++-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxInstaller.java b/app/src/main/java/com/termux/app/TermuxInstaller.java
index 15f48bfd80..504b515f77 100644
--- a/app/src/main/java/com/termux/app/TermuxInstaller.java
+++ b/app/src/main/java/com/termux/app/TermuxInstaller.java
@@ -73,7 +73,8 @@ static void setupBootstrapIfNeeded(final Activity activity, final Runnable whenD
         // Termux can only be run as the primary user (device owner) since only that
         // account has the expected file system paths. Verify that:
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && !PackageUtils.isCurrentUserThePrimaryUser(activity)) {
-            bootstrapErrorMessage = activity.getString(R.string.bootstrap_error_not_primary_user_message, MarkdownUtils.getMarkdownCodeForString(TERMUX_PREFIX_DIR_PATH, false));
+            bootstrapErrorMessage = activity.getString(R.string.bootstrap_error_not_primary_user_message,
+                MarkdownUtils.getMarkdownCodeForString(TERMUX_PREFIX_DIR_PATH, false));
             Logger.logError(LOG_TAG, "isFilesDirectoryAccessible: " + isFilesDirectoryAccessible);
             Logger.logError(LOG_TAG, bootstrapErrorMessage);
             sendBootstrapCrashReportNotification(activity, bootstrapErrorMessage);
@@ -84,7 +85,14 @@ static void setupBootstrapIfNeeded(final Activity activity, final Runnable whenD
         }
 
         if (!isFilesDirectoryAccessible) {
-            bootstrapErrorMessage = Error.getMinimalErrorString(filesDirectoryAccessibleError) + "\nTERMUX_FILES_DIR: " + MarkdownUtils.getMarkdownCodeForString(TermuxConstants.TERMUX_FILES_DIR_PATH, false);
+            bootstrapErrorMessage = Error.getMinimalErrorString(filesDirectoryAccessibleError);
+            //noinspection SdCardPath
+            if (PackageUtils.isAppInstalledOnExternalStorage(activity) &&
+                !TermuxConstants.TERMUX_FILES_DIR_PATH.equals(activity.getFilesDir().getAbsolutePath().replaceAll("^/data/user/0/", "/data/data/"))) {
+                bootstrapErrorMessage += "\n\n" + activity.getString(R.string.bootstrap_error_installed_on_portable_sd,
+                    MarkdownUtils.getMarkdownCodeForString(TERMUX_PREFIX_DIR_PATH, false));
+            }
+
             Logger.logError(LOG_TAG, bootstrapErrorMessage);
             sendBootstrapCrashReportNotification(activity, bootstrapErrorMessage);
             MessageDialogUtils.showMessage(activity,
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index acc0f44b0d..e7e0da60e4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -33,7 +33,11 @@
     <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>
+        under any path other than:\n%1$s.</string>
+    <string name="bootstrap_error_installed_on_portable_sd">&TERMUX_APP_NAME; cannot be installed on
+        portable/external/removable sd card on your device.
+        \nBootstrap binaries compiled for &TERMUX_APP_NAME; have hardcoded $PREFIX path and cannot be installed
+        under any path other than:\n%1$s.</string>
 
 
 

From 7677633e8f5b7845fced2831144a733b43f4ff0b Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 28 Apr 2022 10:21:59 +0500
Subject: [PATCH 750/912] Fixed: Catch `UnsatisfiedLinkError` for
 `local-socket` library

---
 .../termux/shared/net/socket/local/LocalSocketManager.java  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/net/socket/local/LocalSocketManager.java b/termux-shared/src/main/java/com/termux/shared/net/socket/local/LocalSocketManager.java
index 0b7c3dc936..3cd959c34c 100644
--- a/termux-shared/src/main/java/com/termux/shared/net/socket/local/LocalSocketManager.java
+++ b/termux-shared/src/main/java/com/termux/shared/net/socket/local/LocalSocketManager.java
@@ -75,8 +75,10 @@ public synchronized Error start() {
                 Logger.logDebug(LOG_TAG, "Loading \"" + LOCAL_SOCKET_LIBRARY + "\" library");
                 System.loadLibrary(LOCAL_SOCKET_LIBRARY);
                 localSocketLibraryLoaded = true;
-            } catch (Exception e) {
-                return LocalSocketErrno.ERRNO_START_LOCAL_SOCKET_LIB_LOAD_FAILED_WITH_EXCEPTION.getError(e, LOCAL_SOCKET_LIBRARY,  e.getMessage());
+            } catch (Throwable t) {
+                Error error = LocalSocketErrno.ERRNO_START_LOCAL_SOCKET_LIB_LOAD_FAILED_WITH_EXCEPTION.getError(t, LOCAL_SOCKET_LIBRARY,  t.getMessage());
+                Logger.logErrorExtended(LOG_TAG, error.getErrorLogString());
+                return error;
             }
         }
 

From 18a1a33e83f637a091e32275d83a558fd0c39468 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 28 Apr 2022 10:22:38 +0500
Subject: [PATCH 751/912] Added: Enable `TERMUX_PACKAGE_VARIANT`
 `apt-android-5` builds

---
 app/build.gradle                                   |  8 +++++++-
 .../com/termux/shared/termux/TermuxBootstrap.java  | 14 +++++++-------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index e613395c02..62a3c7e550 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@ ext {
     // crash at startup.
     // Bootstrap of a different variant must not be manually installed by the user after app installation
     // by replacing $PREFIX since app code is dependant on the variant used to build the APK.
-    // Currently supported values are: [ "apt-android-7" ]
+    // Currently supported values are: [ "apt-android-7" "apt-android-5" ]
     packageVariant = System.getenv("TERMUX_PACKAGE_VARIANT") ?: "apt-android-7" // Default: "apt-android-7"
 }
 
@@ -219,6 +219,12 @@ task downloadBootstraps() {
             downloadBootstrap("arm", "f8ec9505081b81da0ee66413762c52e6cb4a6ebd7be1a2a5ddee8953e0795dc9", version)
             downloadBootstrap("i686", "0491f12ed84a5ef3c28bd742311fed9f176e32100a2c6bbdb017df8f48044484", version)
             downloadBootstrap("x86_64", "94073a0e136bf5a9c05c1997a55dc261248f4ccb8bffaa9a950a132529cd1529", version)
+        } else if (packageVariant == "apt-android-5") {
+            def version = "2022.04.25-r1" + "+" + packageVariant
+            downloadBootstrap("aarch64", "66eac22c1626cfa8c37f0d30e5cc987bf5e01356ef8c883a12d9b65c93b60e64", version)
+            downloadBootstrap("arm", "84637d87f176bd647c9e05b161ae4de3611773871727b11405076a54cbf43467", version)
+            downloadBootstrap("i686", "20d7c399bfba5de95309838effb782a2b16e9eff4f72a55150617ee513e25fea", version)
+            downloadBootstrap("x86_64", "ae35f4d17027df562e241835299d7e711944825f10c1c2d9c5eb91d5e247daba", version)
         } else {
             throw new GradleException("Unsupported TERMUX_PACKAGE_VARIANT \"" + packageVariant + "\"")
         }
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/TermuxBootstrap.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxBootstrap.java
index 7480dcff85..50ccef15d1 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/TermuxBootstrap.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxBootstrap.java
@@ -58,10 +58,10 @@ public static boolean isAppPackageVariantAPTAndroid7() {
         return PackageVariant.APT_ANDROID_7.equals(TERMUX_APP_PACKAGE_VARIANT);
     }
 
-    ///** Is {@link PackageVariant#APT_ANDROID_5} set as {@link #TERMUX_APP_PACKAGE_VARIANT}. */
-    //public static boolean isAppPackageVariantAPTAndroid5() {
-    //    return PackageVariant.APT_ANDROID_5.equals(TERMUX_APP_PACKAGE_VARIANT);
-    //}
+    /** Is {@link PackageVariant#APT_ANDROID_5} set as {@link #TERMUX_APP_PACKAGE_VARIANT}. */
+    public static boolean isAppPackageVariantAPTAndroid5() {
+        return PackageVariant.APT_ANDROID_5.equals(TERMUX_APP_PACKAGE_VARIANT);
+    }
 
     ///** Is {@link PackageVariant#TAPM_ANDROID_7} set as {@link #TERMUX_APP_PACKAGE_VARIANT}. */
     //public static boolean isAppPackageVariantTAPMAndroid7() {
@@ -132,10 +132,10 @@ public static PackageManager managerOf(String name) {
     public enum PackageVariant {
 
         /** {@link PackageManager#APT} variant for Android 7+. */
-        APT_ANDROID_7("apt-android-7");
+        APT_ANDROID_7("apt-android-7"),
 
-        ///** {@link PackageManager#APT} variant for Android 5+. */
-        //APT_ANDROID_5("apt-android-5");
+        /** {@link PackageManager#APT} variant for Android 5+. */
+        APT_ANDROID_5("apt-android-5");
 
         ///** {@link PackageManager#TAPM} variant for Android 7+. */
         //TAPM_ANDROID_7("tapm-android-7");

From 4d084c02e7d889f8bc8678c5b7439e0a037de02b Mon Sep 17 00:00:00 2001
From: Henrik Grimler <henrik@grimler.se>
Date: Thu, 28 Apr 2022 21:54:18 +0200
Subject: [PATCH 752/912] Changed: Bump android-5 bootstraps to v2022.04.28-r6

---
 app/build.gradle | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 62a3c7e550..5b21def075 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -220,11 +220,11 @@ task downloadBootstraps() {
             downloadBootstrap("i686", "0491f12ed84a5ef3c28bd742311fed9f176e32100a2c6bbdb017df8f48044484", version)
             downloadBootstrap("x86_64", "94073a0e136bf5a9c05c1997a55dc261248f4ccb8bffaa9a950a132529cd1529", version)
         } else if (packageVariant == "apt-android-5") {
-            def version = "2022.04.25-r1" + "+" + packageVariant
-            downloadBootstrap("aarch64", "66eac22c1626cfa8c37f0d30e5cc987bf5e01356ef8c883a12d9b65c93b60e64", version)
-            downloadBootstrap("arm", "84637d87f176bd647c9e05b161ae4de3611773871727b11405076a54cbf43467", version)
-            downloadBootstrap("i686", "20d7c399bfba5de95309838effb782a2b16e9eff4f72a55150617ee513e25fea", version)
-            downloadBootstrap("x86_64", "ae35f4d17027df562e241835299d7e711944825f10c1c2d9c5eb91d5e247daba", version)
+            def version = "2022.04.28-r6" + "+" + packageVariant
+            downloadBootstrap("aarch64", "913609d439415c828c5640be1b0561467e539cb1c7080662decaaca2fb4820e7", version)
+            downloadBootstrap("arm", "26bfb45304c946170db69108e5eb6e3641aad751406ce106c80df80cad2eccf8", version)
+            downloadBootstrap("i686", "46dcfeb5eef67ba765498db9fe4c50dc4690805139aa0dd141a9d8ee0693cd27", version)
+            downloadBootstrap("x86_64", "615b590679ee6cd885b7fd2ff9473c845e920f9b422f790bb158c63fe42b8481", version)
         } else {
             throw new GradleException("Unsupported TERMUX_PACKAGE_VARIANT \"" + packageVariant + "\"")
         }

From 899ef71e17f496fffb680d51ed5834ff0c1157f5 Mon Sep 17 00:00:00 2001
From: Henrik Grimler <henrik@grimler.se>
Date: Thu, 28 Apr 2022 22:44:07 +0200
Subject: [PATCH 753/912] Changed: Bump android-7 bootstraps to v2022.04.28-r5

---
 app/build.gradle | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 5b21def075..1071633d04 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -214,11 +214,11 @@ task downloadBootstraps() {
     doLast {
         def packageVariant = project.ext.packageVariant
         if (packageVariant == "apt-android-7") {
-            def version = "2022.04.22-r1" + "+" + packageVariant
-            downloadBootstrap("aarch64", "ec8a6043644594fc24681cffaf9c7b32f5bc68df7491c5df9a060e40e1934c70", version)
-            downloadBootstrap("arm", "f8ec9505081b81da0ee66413762c52e6cb4a6ebd7be1a2a5ddee8953e0795dc9", version)
-            downloadBootstrap("i686", "0491f12ed84a5ef3c28bd742311fed9f176e32100a2c6bbdb017df8f48044484", version)
-            downloadBootstrap("x86_64", "94073a0e136bf5a9c05c1997a55dc261248f4ccb8bffaa9a950a132529cd1529", version)
+            def version = "2022.04.28-r5" + "+" + packageVariant
+            downloadBootstrap("aarch64", "4a51a7eb209fe82efc24d52e3cccc13165f27377290687cb82038cbd8e948430", version)
+            downloadBootstrap("arm", "6459a786acbae50d4c8a36fa1c3de6a4dd2d482572f6d54f73274709bd627325", version)
+            downloadBootstrap("i686", "919d212b2f19e08600938db4079e794e947365022dbfd50ac342c50fcedcd7be", version)
+            downloadBootstrap("x86_64", "61b02fdc03ea4f5d9da8d8cf018013fdc6659e6da6cbf44e9b24d1c623580b89", version)
         } else if (packageVariant == "apt-android-5") {
             def version = "2022.04.28-r6" + "+" + packageVariant
             downloadBootstrap("aarch64", "913609d439415c828c5640be1b0561467e539cb1c7080662decaaca2fb4820e7", version)

From 7b222ba3921faaecd315955883b9634c9893c543 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Fri, 29 Apr 2022 04:26:17 +0500
Subject: [PATCH 754/912] Changed: Export correct PATH and also export
 LD_LIBRARY_PATH for `apt-android-5` variant instead of on Android 5/6

Overrides 4e08f76f
---
 .../java/com/termux/shared/termux/shell/TermuxShellUtils.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/termux/shell/TermuxShellUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/shell/TermuxShellUtils.java
index dde43e9581..35a0be275d 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/shell/TermuxShellUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/shell/TermuxShellUtils.java
@@ -1,11 +1,9 @@
 package com.termux.shared.termux.shell;
 
 import android.content.Context;
-import android.os.Build;
 
 import androidx.annotation.NonNull;
 
-import com.termux.shared.BuildConfig;
 import com.termux.shared.errors.Error;
 import com.termux.shared.file.filesystem.FileTypes;
 import com.termux.shared.termux.TermuxBootstrap;
@@ -99,7 +97,7 @@ public static String[] buildEnvironment(Context currentPackageContext, boolean i
             environment.add("LANG=en_US.UTF-8");
             environment.add("PWD=" + workingDirectory);
             environment.add("TMPDIR=" + TermuxConstants.TERMUX_TMP_PREFIX_DIR_PATH);
-            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
+            if (TermuxBootstrap.isAppPackageVariantAPTAndroid5()) {
                 environment.add("PATH=" + TermuxConstants.TERMUX_BIN_PREFIX_DIR_PATH + ":" + TermuxConstants.TERMUX_BIN_PREFIX_DIR_PATH + "/applets");
                 environment.add("LD_LIBRARY_PATH=" + TermuxConstants.TERMUX_LIB_PREFIX_DIR_PATH);
             } else {

From b04f209f17403b5764cbbba246bdea9a6de09efe Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Fri, 29 Apr 2022 18:07:57 +0500
Subject: [PATCH 755/912] Added: Add TERMUX_DEVS key SHA-256 digest to official
 signing keys list

---
 .../com/termux/shared/termux/TermuxConstants.java     | 11 ++++++++++-
 .../java/com/termux/shared/termux/TermuxUtils.java    |  2 ++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
index 3a33eb52ea..c6d1ad807b 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
@@ -11,7 +11,7 @@
 import java.util.List;
 
 /*
- * Version: v0.41.0
+ * Version: v0.42.0
  * SPDX-License-Identifier: MIT
  *
  * Changelog
@@ -239,6 +239,9 @@
  *
  * - 0.41.0 (2022-04-17)
  *      - Added `TERMUX_APP.TERMUX_AM_SOCKET_FILE_PATH`.
+ *
+ * - 0.42.0 (2022-04-29)
+ *      - Added `APK_RELEASE_TERMUX_DEVS` and `APK_RELEASE_TERMUX_DEVS_SIGNING_CERTIFICATE_SHA256_DIGEST`.
  */
 
 /**
@@ -450,6 +453,12 @@ public final class TermuxConstants {
     /** Google Play Store APK release signing certificate SHA-256 digest */
     public static final String APK_RELEASE_GOOGLE_PLAYSTORE_SIGNING_CERTIFICATE_SHA256_DIGEST = "738F0A30A04D3C8A1BE304AF18D0779BCF3EA88FB60808F657A3521861C2EBF9"; // Default: "738F0A30A04D3C8A1BE304AF18D0779BCF3EA88FB60808F657A3521861C2EBF9"
 
+    /** Termux Devs APK release */
+    public static final String APK_RELEASE_TERMUX_DEVS = "Termux Devs"; // Default: "Termux Devs"
+
+    /** Termux Devs APK release signing certificate SHA-256 digest */
+    public static final String APK_RELEASE_TERMUX_DEVS_SIGNING_CERTIFICATE_SHA256_DIGEST = "F7A038EB551F1BE8FDF388686B784ABAB4552A5D82DF423E3D8F1B5CBE1C69AE"; // Default: "F7A038EB551F1BE8FDF388686B784ABAB4552A5D82DF423E3D8F1B5CBE1C69AE"
+
 
 
 
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
index b5fdf91217..cd6bb8d30e 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
@@ -634,6 +634,8 @@ public static String getAPKRelease(String signingCertificateSHA256Digest) {
                 return TermuxConstants.APK_RELEASE_GITHUB;
             case TermuxConstants.APK_RELEASE_GOOGLE_PLAYSTORE_SIGNING_CERTIFICATE_SHA256_DIGEST:
                 return TermuxConstants.APK_RELEASE_GOOGLE_PLAYSTORE;
+            case TermuxConstants.APK_RELEASE_TERMUX_DEVS_SIGNING_CERTIFICATE_SHA256_DIGEST:
+                return TermuxConstants.APK_RELEASE_TERMUX_DEVS;
             default:
                 return "Unknown";
         }

From 30cb848639487cc5129b21b3e44d92025e452348 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sun, 29 May 2022 06:54:01 +0500
Subject: [PATCH 756/912] Fixed: Do not setup plugin and crash notification
 channel on API `< 24` since NotificationManager.IMPORTANCE_HIGH requires API
 24

---
 .../java/com/termux/shared/termux/crash/TermuxCrashUtils.java   | 2 ++
 .../com/termux/shared/termux/plugins/TermuxPluginUtils.java     | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/termux-shared/src/main/java/com/termux/shared/termux/crash/TermuxCrashUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/crash/TermuxCrashUtils.java
index a34557077a..8117af025f 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/crash/TermuxCrashUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/crash/TermuxCrashUtils.java
@@ -5,6 +5,7 @@
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
+import android.os.Build;
 import android.os.Environment;
 
 import androidx.annotation.NonNull;
@@ -402,6 +403,7 @@ public static Notification.Builder getCrashReportsNotificationBuilder(final Cont
      * @param context The {@link Context} for operations.
      */
     public static void setupCrashReportsNotificationChannel(final Context context) {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) return;
         NotificationUtils.setupNotificationChannel(context, TermuxConstants.TERMUX_CRASH_REPORTS_NOTIFICATION_CHANNEL_ID,
             TermuxConstants.TERMUX_CRASH_REPORTS_NOTIFICATION_CHANNEL_NAME, NotificationManager.IMPORTANCE_HIGH);
     }
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/plugins/TermuxPluginUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/plugins/TermuxPluginUtils.java
index 1ab482e521..6be7c050aa 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/plugins/TermuxPluginUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/plugins/TermuxPluginUtils.java
@@ -4,6 +4,7 @@
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.content.Context;
+import android.os.Build;
 import android.os.Environment;
 
 import androidx.annotation.Nullable;
@@ -415,6 +416,7 @@ public static Notification.Builder getPluginCommandErrorsNotificationBuilder(fin
      * @param context The {@link Context} for operations.
      */
     public static void setupPluginCommandErrorsNotificationChannel(final Context context) {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) return;
         NotificationUtils.setupNotificationChannel(context, TermuxConstants.TERMUX_PLUGIN_COMMAND_ERRORS_NOTIFICATION_CHANNEL_ID,
             TermuxConstants.TERMUX_PLUGIN_COMMAND_ERRORS_NOTIFICATION_CHANNEL_NAME, NotificationManager.IMPORTANCE_HIGH);
     }

From a50387b553afc96173e0eddaa5b37f1e18a24431 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sun, 29 May 2022 07:25:08 +0500
Subject: [PATCH 757/912] Changed: Change termux support email from
 termuxreports@groups.io to support@termux.dev

---
 README.md                                                | 2 +-
 .../java/com/termux/shared/termux/TermuxConstants.java   | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index edef1d5e1f..926fcef715 100644
--- a/README.md
+++ b/README.md
@@ -153,7 +153,7 @@ The main ones are the following.
 - [Termux User Matrix Channel](https://matrix.to/#/#termux_termux:gitter.im) ([Gitter](https://gitter.im/termux/termux))
 - [Termux Dev Matrix Channel](https://matrix.to/#/#termux_dev:gitter.im) ([Gitter](https://gitter.im/termux/dev))
 - [Termux Twitter](https://twitter.com/termux/)
-- [Termux Reports Email](mailto:termuxreports@groups.io)
+- [Termux Support Email](mailto:support@termux.dev)
 
 ### Wikis
 
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
index c6d1ad807b..cf9433a4a3 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
@@ -11,7 +11,7 @@
 import java.util.List;
 
 /*
- * Version: v0.42.0
+ * Version: v0.43.0
  * SPDX-License-Identifier: MIT
  *
  * Changelog
@@ -242,6 +242,9 @@
  *
  * - 0.42.0 (2022-04-29)
  *      - Added `APK_RELEASE_TERMUX_DEVS` and `APK_RELEASE_TERMUX_DEVS_SIGNING_CERTIFICATE_SHA256_DIGEST`.
+ *
+ * - 0.43.0 (2022-05-29)
+ *      - Changed `TERMUX_SUPPORT_EMAIL_URL` to support@termux.dev.
  */
 
 /**
@@ -546,10 +549,10 @@ public final class TermuxConstants {
 
 
     /** Termux support email url */
-    public static final String TERMUX_SUPPORT_EMAIL_URL = "termuxreports@groups.io"; // Default: "termuxreports@groups.io"
+    public static final String TERMUX_SUPPORT_EMAIL_URL = "support@termux.dev"; // Default: "support@termux.dev"
 
     /** Termux support email mailto url */
-    public static final String TERMUX_SUPPORT_EMAIL_MAILTO_URL = "mailto:" + TERMUX_SUPPORT_EMAIL_URL; // Default: "mailto:termuxreports@groups.io"
+    public static final String TERMUX_SUPPORT_EMAIL_MAILTO_URL = "mailto:" + TERMUX_SUPPORT_EMAIL_URL; // Default: "mailto:support@termux.dev"
 
 
     /** Termux Reddit subreddit */

From 37f08c4fccb79c9e8e911af9407168b566e890d9 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sun, 29 May 2022 07:26:53 +0500
Subject: [PATCH 758/912] Fixed: Fix `Settings.ACTION_*` permission requests
 for non-activity contexts

This was caused by ce12b8ad

Closes #2769
---
 .../termux/shared/android/PermissionUtils.java    | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/termux-shared/src/main/java/com/termux/shared/android/PermissionUtils.java b/termux-shared/src/main/java/com/termux/shared/android/PermissionUtils.java
index 60aeed077f..4a15649df0 100644
--- a/termux-shared/src/main/java/com/termux/shared/android/PermissionUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/android/PermissionUtils.java
@@ -357,6 +357,11 @@ public static Error requestManageStorageExternalPermission(@NonNull Context cont
         intent.addCategory("android.intent.category.DEFAULT");
         intent.setData(Uri.parse("package:" + context.getPackageName()));
 
+        // Flag must not be passed for activity contexts, otherwise onActivityResult() will not be called with permission grant result.
+        // Flag must be passed for non-activity contexts like services, otherwise "Calling startActivity() from outside of an Activity context requires the FLAG_ACTIVITY_NEW_TASK flag" exception will be raised.
+        if (!(context instanceof Activity))
+            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+
         Error error;
         if (requestCode >=0)
             error = ActivityUtils.startActivityForResult(context, requestCode, intent, true, false);
@@ -474,6 +479,11 @@ public static Error requestDisplayOverOtherAppsPermission(@NonNull Context conte
         Intent intent = new Intent(Settings.ACTION_MANAGE_OVERLAY_PERMISSION);
         intent.setData(Uri.parse("package:" + context.getPackageName()));
 
+        // Flag must not be passed for activity contexts, otherwise onActivityResult() will not be called with permission grant result.
+        // Flag must be passed for non-activity contexts like services, otherwise "Calling startActivity() from outside of an Activity context requires the FLAG_ACTIVITY_NEW_TASK flag" exception will be raised.
+        if (!(context instanceof Activity))
+            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+
         if (requestCode >=0)
             return ActivityUtils.startActivityForResult(context, requestCode, intent);
         else
@@ -549,6 +559,11 @@ public static Error requestDisableBatteryOptimizations(@NonNull Context context,
         Intent intent = new Intent(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS);
         intent.setData(Uri.parse("package:" + context.getPackageName()));
 
+        // Flag must not be passed for activity contexts, otherwise onActivityResult() will not be called with permission grant result.
+        // Flag must be passed for non-activity contexts like services, otherwise "Calling startActivity() from outside of an Activity context requires the FLAG_ACTIVITY_NEW_TASK flag" exception will be raised.
+        if (!(context instanceof Activity))
+            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+
         if (requestCode >=0)
             return ActivityUtils.startActivityForResult(context, requestCode, intent);
         else

From c1c46dfcfcff6fe2a21232d4fa2d0092c93e6cc1 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sun, 29 May 2022 08:28:20 +0500
Subject: [PATCH 759/912] Changed: Change `TERMUX_APP.APPS_DIR_PATH` basename
 from `termux-app` to `com.termux`

The apps directory will now use the unique package name of apps for basename that can be automatically generated instead of having to be hardcoded.

`termux-am-socket` will be upgraded to `v1.4.0` for respective change.
---
 .../java/com/termux/shared/termux/TermuxConstants.java   | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
index cf9433a4a3..75c91b6c18 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
@@ -11,7 +11,7 @@
 import java.util.List;
 
 /*
- * Version: v0.43.0
+ * Version: v0.44.0
  * SPDX-License-Identifier: MIT
  *
  * Changelog
@@ -245,6 +245,9 @@
  *
  * - 0.43.0 (2022-05-29)
  *      - Changed `TERMUX_SUPPORT_EMAIL_URL` to support@termux.dev.
+ *
+ * - 0.44.0 (2022-05-29)
+ *      - Changed `TERMUX_APP.APPS_DIR_PATH` basename from `termux-app` to `com.termux`.
  */
 
 /**
@@ -896,10 +899,10 @@ public final class TermuxConstants {
     public static final class TERMUX_APP {
 
         /** Termux apps directory path */
-        public static final String APPS_DIR_PATH = TERMUX_APPS_DIR_PATH + "/termux-app"; // Default: "/data/data/com.termux/files/apps/termux-app"
+        public static final String APPS_DIR_PATH = TERMUX_APPS_DIR_PATH + "/" + TERMUX_PACKAGE_NAME; // Default: "/data/data/com.termux/files/apps/com.termux"
 
         /** termux-am socket file path */
-        public static final String TERMUX_AM_SOCKET_FILE_PATH = APPS_DIR_PATH + "/termux-am/am.sock"; // Default: "/data/data/com.termux/files/apps/termux-app/termux-am/am.sock"
+        public static final String TERMUX_AM_SOCKET_FILE_PATH = APPS_DIR_PATH + "/termux-am/am.sock"; // Default: "/data/data/com.termux/files/apps/com.termux/termux-am/am.sock"
 
 
         /** Termux app core activity name. */

From 231ecff5f0837d1aa2831039b64afd07915e1cab Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sun, 29 May 2022 22:44:57 +0500
Subject: [PATCH 760/912] Changed: Do not modify code points for virtual or
 soft keyboard events

Closes #2799
---
 .../java/com/termux/view/TerminalView.java    | 45 +++++++++++--------
 .../termux/terminal/io/TerminalExtraKeys.java |  2 +-
 2 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/terminal-view/src/main/java/com/termux/view/TerminalView.java b/terminal-view/src/main/java/com/termux/view/TerminalView.java
index b76ea85844..2bed7cabd4 100644
--- a/terminal-view/src/main/java/com/termux/view/TerminalView.java
+++ b/terminal-view/src/main/java/com/termux/view/TerminalView.java
@@ -83,6 +83,12 @@ public final class TerminalView extends View {
 
     private final boolean mAccessibilityEnabled;
 
+    /** The {@link KeyEvent} is generated from a virtual keyboard, like manually with the {@link KeyEvent#KeyEvent(int, int)} constructor. */
+    public final static int KEY_EVENT_SOURCE_VIRTUAL_KEYBOARD = KeyCharacterMap.VIRTUAL_KEYBOARD; // -1
+
+    /** The {@link KeyEvent} is generated from a non-physical device, like if 0 value is returned by {@link KeyEvent#getDeviceId()}. */
+    public final static int KEY_EVENT_SOURCE_SOFT_KEYBOARD = 0;
+
     private static final String LOG_TAG = "TerminalView";
 
     public TerminalView(Context context, AttributeSet attributes) { // NO_UCD (unused code)
@@ -380,7 +386,7 @@ void sendTextToTerminal(CharSequence text) {
                         }
                     }
 
-                    inputCodePoint(codePoint, ctrlHeld, false);
+                    inputCodePoint(KEY_EVENT_SOURCE_SOFT_KEYBOARD, codePoint, ctrlHeld, false);
                 }
             }
 
@@ -755,7 +761,7 @@ public boolean onKeyDown(int keyCode, KeyEvent event) {
         if ((result & KeyCharacterMap.COMBINING_ACCENT) != 0) {
             // If entered combining accent previously, write it out:
             if (mCombiningAccent != 0)
-                inputCodePoint(mCombiningAccent, controlDown, leftAltDown);
+                inputCodePoint(event.getDeviceId(), mCombiningAccent, controlDown, leftAltDown);
             mCombiningAccent = result & KeyCharacterMap.COMBINING_ACCENT_MASK;
         } else {
             if (mCombiningAccent != 0) {
@@ -763,7 +769,7 @@ public boolean onKeyDown(int keyCode, KeyEvent event) {
                 if (combinedChar > 0) result = combinedChar;
                 mCombiningAccent = 0;
             }
-            inputCodePoint(result, controlDown, leftAltDown);
+            inputCodePoint(event.getDeviceId(), result, controlDown, leftAltDown);
         }
 
         if (mCombiningAccent != oldCombiningAccent) invalidate();
@@ -771,9 +777,9 @@ public boolean onKeyDown(int keyCode, KeyEvent event) {
         return true;
     }
 
-    public void inputCodePoint(int codePoint, boolean controlDownFromEvent, boolean leftAltDownFromEvent) {
+    public void inputCodePoint(int eventSource, int codePoint, boolean controlDownFromEvent, boolean leftAltDownFromEvent) {
         if (TERMINAL_VIEW_KEY_LOGGING_ENABLED) {
-            mClient.logInfo(LOG_TAG, "inputCodePoint(codePoint=" + codePoint + ", controlDownFromEvent=" + controlDownFromEvent + ", leftAltDownFromEvent="
+            mClient.logInfo(LOG_TAG, "inputCodePoint(eventSource=" + eventSource + ", codePoint=" + codePoint + ", controlDownFromEvent=" + controlDownFromEvent + ", leftAltDownFromEvent="
                 + leftAltDownFromEvent + ")");
         }
 
@@ -813,19 +819,22 @@ public void inputCodePoint(int codePoint, boolean controlDownFromEvent, boolean
         }
 
         if (codePoint > -1) {
-            // Work around bluetooth keyboards sending funny unicode characters instead
-            // of the more normal ones from ASCII that terminal programs expect - the
-            // desire to input the original characters should be low.
-            switch (codePoint) {
-                case 0x02DC: // SMALL TILDE.
-                    codePoint = 0x007E; // TILDE (~).
-                    break;
-                case 0x02CB: // MODIFIER LETTER GRAVE ACCENT.
-                    codePoint = 0x0060; // GRAVE ACCENT (`).
-                    break;
-                case 0x02C6: // MODIFIER LETTER CIRCUMFLEX ACCENT.
-                    codePoint = 0x005E; // CIRCUMFLEX ACCENT (^).
-                    break;
+            // If not virtual or soft keyboard.
+            if (eventSource > KEY_EVENT_SOURCE_SOFT_KEYBOARD) {
+                // Work around bluetooth keyboards sending funny unicode characters instead
+                // of the more normal ones from ASCII that terminal programs expect - the
+                // desire to input the original characters should be low.
+                switch (codePoint) {
+                    case 0x02DC: // SMALL TILDE.
+                        codePoint = 0x007E; // TILDE (~).
+                        break;
+                    case 0x02CB: // MODIFIER LETTER GRAVE ACCENT.
+                        codePoint = 0x0060; // GRAVE ACCENT (`).
+                        break;
+                    case 0x02C6: // MODIFIER LETTER CIRCUMFLEX ACCENT.
+                        codePoint = 0x005E; // CIRCUMFLEX ACCENT (^).
+                        break;
+                }
             }
 
             // If left alt, send escape before the code point to make e.g. Alt+B and Alt+F work in readline:
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/terminal/io/TerminalExtraKeys.java b/termux-shared/src/main/java/com/termux/shared/termux/terminal/io/TerminalExtraKeys.java
index 44eb5b02f0..8aa77772f8 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/terminal/io/TerminalExtraKeys.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/terminal/io/TerminalExtraKeys.java
@@ -67,7 +67,7 @@ protected void onTerminalExtraKeyButtonClick(View view, String key, boolean ctrl
             // not a control char
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
                 key.codePoints().forEach(codePoint -> {
-                    mTerminalView.inputCodePoint(codePoint, ctrlDown, altDown);
+                    mTerminalView.inputCodePoint(TerminalView.KEY_EVENT_SOURCE_VIRTUAL_KEYBOARD, codePoint, ctrlDown, altDown);
                 });
             } else {
                 TerminalSession session = mTerminalView.getCurrentSession();

From 980bf8f0ae8c88658660cf0fd8ce01babb2712f5 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 1 Jun 2022 00:06:05 +0500
Subject: [PATCH 761/912] Added: Add support to get termux app package context
 with code classloader for plugin usage

---
 .../termux/shared/android/PackageUtils.java   | 19 ++++++++++++++++---
 .../com/termux/shared/termux/TermuxUtils.java | 14 +++++++++++++-
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/android/PackageUtils.java b/termux-shared/src/main/java/com/termux/shared/android/PackageUtils.java
index 4447a9218b..ded3c01fee 100644
--- a/termux-shared/src/main/java/com/termux/shared/android/PackageUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/android/PackageUtils.java
@@ -31,7 +31,7 @@ public class PackageUtils {
     private static final String LOG_TAG = "PackageUtils";
 
     /**
-     * Get the {@link Context} for the package name.
+     * Get the {@link Context} for the package name with {@link Context#CONTEXT_RESTRICTED} flags.
      *
      * @param context The {@link Context} to use to get the {@link Context} of the {@code packageName}.
      * @param packageName The package name whose {@link Context} to get.
@@ -39,10 +39,23 @@ public class PackageUtils {
      */
     @Nullable
     public static Context getContextForPackage(@NonNull final Context context, String packageName) {
+       return getContextForPackage(context, packageName, Context.CONTEXT_RESTRICTED);
+    }
+
+    /**
+     * Get the {@link Context} for the package name.
+     *
+     * @param context The {@link Context} to use to get the {@link Context} of the {@code packageName}.
+     * @param packageName The package name whose {@link Context} to get.
+     * @param flags The flags for {@link Context} type.
+     * @return Returns the {@link Context}. This will {@code null} if an exception is raised.
+     */
+    @Nullable
+    public static Context getContextForPackage(@NonNull final Context context, String packageName, int flags) {
         try {
-            return context.createPackageContext(packageName, Context.CONTEXT_RESTRICTED);
+            return context.createPackageContext(packageName, flags);
         } catch (Exception e) {
-            Logger.logVerbose(LOG_TAG, "Failed to get \"" + packageName + "\" package context: " + e.getMessage());
+            Logger.logVerbose(LOG_TAG, "Failed to get \"" + packageName + "\" package context with flags " + flags + ": " + e.getMessage());
             return null;
         }
     }
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
index cd6bb8d30e..cc60b1cfb9 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
@@ -50,7 +50,8 @@ public enum AppInfoMode {
     private static final String LOG_TAG = "TermuxUtils";
 
     /**
-     * Get the {@link Context} for {@link TermuxConstants#TERMUX_PACKAGE_NAME} package.
+     * Get the {@link Context} for {@link TermuxConstants#TERMUX_PACKAGE_NAME} package with the
+     * {@link Context#CONTEXT_RESTRICTED} flag.
      *
      * @param context The {@link Context} to use to get the {@link Context} of the package.
      * @return Returns the {@link Context}. This will {@code null} if an exception is raised.
@@ -59,6 +60,17 @@ public static Context getTermuxPackageContext(@NonNull Context context) {
         return PackageUtils.getContextForPackage(context, TermuxConstants.TERMUX_PACKAGE_NAME);
     }
 
+    /**
+     * Get the {@link Context} for {@link TermuxConstants#TERMUX_PACKAGE_NAME} package with the
+     * {@link Context#CONTEXT_INCLUDE_CODE} flag.
+     *
+     * @param context The {@link Context} to use to get the {@link Context} of the package.
+     * @return Returns the {@link Context}. This will {@code null} if an exception is raised.
+     */
+    public static Context getTermuxPackageContextWithCode(@NonNull Context context) {
+        return PackageUtils.getContextForPackage(context, TermuxConstants.TERMUX_PACKAGE_NAME, Context.CONTEXT_INCLUDE_CODE);
+    }
+
     /**
      * Get the {@link Context} for {@link TermuxConstants#TERMUX_API_PACKAGE_NAME} package.
      *

From 46cfea09ec2409526269b4744a7d699d66527205 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 1 Jun 2022 00:09:10 +0500
Subject: [PATCH 762/912] Added: Add support for plugin apps to set
 TERMUX_APP_PACKAGE_VARIANT and TERMUX_APP_PACKAGE_MANAGER from Termux app APK
 BuildConfig.TERMUX_PACKAGE_VARIANT

---
 .../shared/reflection/ReflectionUtils.java    |  2 +
 .../termux/shared/termux/TermuxBootstrap.java | 47 +++++++++++++++-
 .../termux/shared/termux/TermuxConstants.java |  8 ++-
 .../com/termux/shared/termux/TermuxUtils.java | 55 +++++++++++++++++++
 4 files changed, 110 insertions(+), 2 deletions(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/reflection/ReflectionUtils.java b/termux-shared/src/main/java/com/termux/shared/reflection/ReflectionUtils.java
index fadcb7d986..10886a4164 100644
--- a/termux-shared/src/main/java/com/termux/shared/reflection/ReflectionUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/reflection/ReflectionUtils.java
@@ -77,6 +77,8 @@ public static class FieldInvokeResult {
     /**
      * Get a value for a {@link Field} of an object for the specified class.
      *
+     * Trying to access {@code null} fields will result in {@link NoSuchFieldException}.
+     *
      * @param clazz The {@link Class} to which the object belongs to.
      * @param fieldName The name of the {@link Field}.
      * @param object The {@link Object} instance from which to get the field value.
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/TermuxBootstrap.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxBootstrap.java
index 50ccef15d1..add3f0401c 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/TermuxBootstrap.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxBootstrap.java
@@ -1,20 +1,29 @@
 package com.termux.shared.termux;
 
+import android.content.Context;
+
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import com.termux.shared.logger.Logger;
+import com.termux.shared.termux.TermuxConstants.TERMUX_APP;
 
 public class TermuxBootstrap {
 
     private static final String LOG_TAG = "TermuxBootstrap";
 
+    /** The field name used by Termux app to store package variant in
+     * {@link TERMUX_APP#BUILD_CONFIG_CLASS_NAME} class. */
+    public static final String BUILD_CONFIG_FIELD_TERMUX_PACKAGE_VARIANT = "TERMUX_PACKAGE_VARIANT";
+
+
     /** The {@link PackageManager} for the bootstrap in the app APK added in app/build.gradle. */
     public static PackageManager TERMUX_APP_PACKAGE_MANAGER;
 
     /** The {@link PackageVariant} for the bootstrap in the app APK added in app/build.gradle. */
     public static PackageVariant TERMUX_APP_PACKAGE_VARIANT;
 
-    /** Set name as app wide night mode value. */
+    /** Set {@link #TERMUX_APP_PACKAGE_VARIANT} and {@link #TERMUX_APP_PACKAGE_MANAGER} from {@code packageVariantName} passed. */
     public static void setTermuxPackageManagerAndVariant(@Nullable String packageVariantName) {
         TERMUX_APP_PACKAGE_VARIANT = PackageVariant.variantOf(packageVariantName);
         if (TERMUX_APP_PACKAGE_VARIANT == null) {
@@ -34,6 +43,42 @@ public static void setTermuxPackageManagerAndVariant(@Nullable String packageVar
         Logger.logVerbose(LOG_TAG, "Set TERMUX_APP_PACKAGE_MANAGER to \"" + TERMUX_APP_PACKAGE_MANAGER + "\"");
     }
 
+    /**
+     * Set {@link #TERMUX_APP_PACKAGE_VARIANT} and {@link #TERMUX_APP_PACKAGE_MANAGER} with the
+     * {@link #BUILD_CONFIG_FIELD_TERMUX_PACKAGE_VARIANT} field value from the
+     * {@link TERMUX_APP#BUILD_CONFIG_CLASS_NAME} class of the Termux app APK installed on the device.
+     * This can only be used by apps that share `sharedUserId` with the Termux app and can be used
+     * by plugin apps.
+     *
+     * @param currentPackageContext The context of current package.
+     */
+    public static void setTermuxPackageManagerAndVariantFromTermuxApp(@NonNull Context currentPackageContext) {
+        String packageVariantName = getTermuxAppBuildConfigPackageVariantFromTermuxApp(currentPackageContext);
+        if (packageVariantName != null) {
+            TermuxBootstrap.setTermuxPackageManagerAndVariant(packageVariantName);
+        } else {
+            Logger.logError(LOG_TAG, "Failed to set TERMUX_APP_PACKAGE_VARIANT and TERMUX_APP_PACKAGE_MANAGER from the termux app");
+        }
+    }
+
+    /**
+     * Get {@link #BUILD_CONFIG_FIELD_TERMUX_PACKAGE_VARIANT} field value from the
+     * {@link TERMUX_APP#BUILD_CONFIG_CLASS_NAME} class of the Termux app APK installed on the device.
+     * This can only be used by apps that share `sharedUserId` with the Termux app.
+     *
+     * @param currentPackageContext The context of current package.
+     * @return Returns the field value, otherwise {@code null} if an exception was raised or failed
+     * to get termux app package context.
+     */
+    public static String getTermuxAppBuildConfigPackageVariantFromTermuxApp(@NonNull Context currentPackageContext) {
+        try {
+            return (String) TermuxUtils.getTermuxAppAPKBuildConfigClassField(currentPackageContext, BUILD_CONFIG_FIELD_TERMUX_PACKAGE_VARIANT);
+        } catch (Exception e) {
+            Logger.logStackTraceWithMessage(LOG_TAG, "Failed to get \"" + BUILD_CONFIG_FIELD_TERMUX_PACKAGE_VARIANT + "\" value from \"" + TERMUX_APP.BUILD_CONFIG_CLASS_NAME + "\" class", e);
+            return null;
+        }
+    }
+
 
 
     /** Is {@link PackageManager#APT} set as {@link #TERMUX_APP_PACKAGE_MANAGER}. */
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
index 75c91b6c18..ab142bf778 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
@@ -11,7 +11,7 @@
 import java.util.List;
 
 /*
- * Version: v0.44.0
+ * Version: v0.45.0
  * SPDX-License-Identifier: MIT
  *
  * Changelog
@@ -248,6 +248,9 @@
  *
  * - 0.44.0 (2022-05-29)
  *      - Changed `TERMUX_APP.APPS_DIR_PATH` basename from `termux-app` to `com.termux`.
+ *
+ * - 0.45.0 (2022-06-01)
+ *      - Added `TERMUX_APP.BUILD_CONFIG_CLASS_NAME`.
  */
 
 /**
@@ -904,6 +907,9 @@ public static final class TERMUX_APP {
         /** termux-am socket file path */
         public static final String TERMUX_AM_SOCKET_FILE_PATH = APPS_DIR_PATH + "/termux-am/am.sock"; // Default: "/data/data/com.termux/files/apps/com.termux/termux-am/am.sock"
 
+        /** Termux app BuildConfig class name */
+        public static final String BUILD_CONFIG_CLASS_NAME = TERMUX_PACKAGE_NAME + ".BuildConfig"; // Default: "com.termux.BuildConfig"
+
 
         /** Termux app core activity name. */
         public static final String TERMUX_ACTIVITY_NAME = TERMUX_PACKAGE_NAME + ".app.TermuxActivity"; // Default: "com.termux.app.TermuxActivity"
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
index cc60b1cfb9..42208ac131 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
@@ -14,6 +14,7 @@
 import com.termux.shared.android.AndroidUtils;
 import com.termux.shared.data.DataUtils;
 import com.termux.shared.file.FileUtils;
+import com.termux.shared.reflection.ReflectionUtils;
 import com.termux.shared.shell.command.runner.app.AppShell;
 import com.termux.shared.termux.file.TermuxFileUtils;
 import com.termux.shared.logger.Logger;
@@ -21,6 +22,7 @@
 import com.termux.shared.shell.command.ExecutionCommand;
 import com.termux.shared.errors.Error;
 import com.termux.shared.android.PackageUtils;
+import com.termux.shared.termux.TermuxConstants.TERMUX_APP;
 import com.termux.shared.termux.shell.TermuxShellEnvironmentClient;
 
 import org.apache.commons.io.IOUtils;
@@ -218,6 +220,59 @@ public static String isTermuxAppAccessible(@NonNull final Context currentPackage
 
 
 
+    /**
+     * Get a field value from the {@link TERMUX_APP#BUILD_CONFIG_CLASS_NAME} class of the Termux app
+     * APK installed on the device.
+     * This can only be used by apps that share `sharedUserId` with the Termux app.
+     *
+     * This is a wrapper for {@link #getTermuxAppAPKClassField(Context, String, String)}.
+     *
+     * @param currentPackageContext The context of current package.
+     * @param fieldName The name of the field to get.
+     * @return Returns the field value, otherwise {@code null} if an exception was raised or failed
+     * to get termux app package context.
+     */
+    public static Object getTermuxAppAPKBuildConfigClassField(@NonNull Context currentPackageContext,
+                                                              @NonNull String fieldName) {
+        return getTermuxAppAPKClassField(currentPackageContext, TERMUX_APP.BUILD_CONFIG_CLASS_NAME, fieldName);
+    }
+
+    /**
+     * Get a field value from a class of the Termux app APK installed on the device.
+     * This can only be used by apps that share `sharedUserId` with the Termux app.
+     *
+     * This is done by getting first getting termux app package context and then getting in class
+     * loader (instead of current app's) that contains termux app class info, and then using that to
+     * load the required class and then getting required field from it.
+     *
+     * Note that the value returned is from the APK file and not the current value loaded in Termux
+     * app process, so only default values will be returned.
+     *
+     * Trying to access {@code null} fields will result in {@link NoSuchFieldException}.
+     *
+     * @param currentPackageContext The context of current package.
+     * @param clazzName The name of the class from which to get the field.
+     * @param fieldName The name of the field to get.
+     * @return Returns the field value, otherwise {@code null} if an exception was raised or failed
+     * to get termux app package context.
+     */
+    public static Object getTermuxAppAPKClassField(@NonNull Context currentPackageContext,
+                                                   @NonNull String clazzName, @NonNull String fieldName) {
+        try {
+            Context termuxPackageContext = TermuxUtils.getTermuxPackageContextWithCode(currentPackageContext);
+            if (termuxPackageContext == null)
+                return null;
+
+            Class<?> clazz = termuxPackageContext.getClassLoader().loadClass(clazzName);
+            return ReflectionUtils.invokeField(clazz, fieldName, null).value;
+        } catch (Exception e) {
+            Logger.logStackTraceWithMessage(LOG_TAG, "Failed to get \"" + fieldName + "\" value from \"" + clazzName + "\" class", e);
+            return null;
+        }
+    }
+
+
+
     /**
      * Send the {@link TermuxConstants#BROADCAST_TERMUX_OPENED} broadcast to notify apps that Termux
      * app has been opened.

From d287734abae95107e73c763ccbd807315ca9a9c0 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Fri, 3 Jun 2022 12:09:11 +0500
Subject: [PATCH 763/912] Added|Changed!: Rename `SESSION_NAME` and
 `SESSION_CREATE_MODE` to `SHELL_NAME` and `SHELL_CREATE_MODE` and add support
 for `ShellCreateMode` to `AppShells`

Renamed extras `TERMUX_APP.TERMUX_SERVICE.EXTRA_SESSION_NAME` to `*.EXTRA_SHELL_NAME`, `TERMUX_APP.RUN_COMMAND_SERVICE.EXTRA_SESSION_NAME` to `*.EXTRA_SHELL_NAME`, `TERMUX_APP.TERMUX_SERVICE.EXTRA_SESSION_CREATE_MODE` to `*.EXTRA_SHELL_CREATE_MODE` and `TERMUX_APP.RUN_COMMAND_SERVICE.EXTRA_SESSION_CREATE_MODE` to `*.EXTRA_SHELL_CREATE_MODE`.

Renamed `enum` class `SessionCreateMode` to `ShellCreateMode`, `sessionName` field to `shellName`, `sessionCreateMode` to `shellCreateMode` in `ExecutionCommand`.

The `TermuxService` `AppShells`/`TermuxTasks` will now consider `ShellCreateMode` as well before starting tasks as done for `TermuxSessions` via 5794ab9a

New task command to not create new foreground session and switch to existing session if one already exits with `shellName` is

```
am startservice --user 0 -n com.termux/com.termux.app.RunCommandService \
-a com.termux.RUN_COMMAND \
--es com.termux.RUN_COMMAND_PATH '/data/data/com.termux/files/usr/bin/bash' \
--es com.termux.RUN_COMMAND_SHELL_CREATE_MODE 'no-shell-with-name' \
--es com.termux.RUN_COMMAND_SHELL_NAME "custom-name"
```

New task command to not create new background task if one already exits with `shellName` is

```
am startservice --user 0 -n com.termux/com.termux.app.RunCommandService \
-a com.termux.RUN_COMMAND \
--es com.termux.RUN_COMMAND_PATH '/data/data/com.termux/files/usr/bin/top' \
--esa com.termux.RUN_COMMAND_ARGUMENTS '-n,5' \
--es com.termux.RUN_COMMAND_SHELL_CREATE_MODE 'no-shell-with-name' \
--es com.termux.RUN_COMMAND_SHELL_NAME "custom-name" \
--es com.termux.RUN_COMMAND_RUNNER "app-shell"
```
---
 .../com/termux/app/RunCommandService.java     |   8 +-
 .../java/com/termux/app/TermuxService.java    | 102 ++++++++++++------
 .../terminal/TermuxTerminalSessionClient.java |   2 +-
 app/src/main/res/values/strings.xml           |   4 +-
 .../shell/command/ExecutionCommand.java       |  44 ++++----
 .../shell/command/runner/app/AppShell.java    |  12 ++-
 .../termux/shared/termux/TermuxConstants.java |  24 +++--
 .../termux/plugins/TermuxPluginUtils.java     |  27 ++++-
 .../runner/terminal/TermuxSession.java        |   4 +-
 9 files changed, 149 insertions(+), 78 deletions(-)

diff --git a/app/src/main/java/com/termux/app/RunCommandService.java b/app/src/main/java/com/termux/app/RunCommandService.java
index 261729155c..635f281058 100644
--- a/app/src/main/java/com/termux/app/RunCommandService.java
+++ b/app/src/main/java/com/termux/app/RunCommandService.java
@@ -116,8 +116,8 @@ public int onStartCommand(Intent intent, int flags, int startId) {
 
         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.sessionName = IntentUtils.getStringExtraIfSet(intent, RUN_COMMAND_SERVICE.EXTRA_SESSION_NAME, null);
-        executionCommand.sessionCreateMode = IntentUtils.getStringExtraIfSet(intent, RUN_COMMAND_SERVICE.EXTRA_SESSION_CREATE_MODE, null);
+        executionCommand.shellName = IntentUtils.getStringExtraIfSet(intent, RUN_COMMAND_SERVICE.EXTRA_SHELL_NAME, null);
+        executionCommand.shellCreateMode = IntentUtils.getStringExtraIfSet(intent, RUN_COMMAND_SERVICE.EXTRA_SHELL_CREATE_MODE, null);
         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);
@@ -213,8 +213,8 @@ public int onStartCommand(Intent intent, int flags, int startId) {
         execIntent.putExtra(TERMUX_SERVICE.EXTRA_RUNNER, executionCommand.runner);
         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_SESSION_NAME, executionCommand.sessionName);
-        execIntent.putExtra(TERMUX_SERVICE.EXTRA_SESSION_CREATE_MODE, executionCommand.sessionCreateMode);
+        execIntent.putExtra(TERMUX_SERVICE.EXTRA_SHELL_NAME, executionCommand.shellName);
+        execIntent.putExtra(TERMUX_SERVICE.EXTRA_SHELL_CREATE_MODE, executionCommand.shellCreateMode);
         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);
diff --git a/app/src/main/java/com/termux/app/TermuxService.java b/app/src/main/java/com/termux/app/TermuxService.java
index 59005c0a9e..7f10c6c8cf 100644
--- a/app/src/main/java/com/termux/app/TermuxService.java
+++ b/app/src/main/java/com/termux/app/TermuxService.java
@@ -16,6 +16,7 @@
 import android.os.PowerManager;
 import android.widget.ArrayAdapter;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import com.termux.R;
@@ -41,7 +42,7 @@
 import com.termux.shared.data.DataUtils;
 import com.termux.shared.shell.command.ExecutionCommand;
 import com.termux.shared.shell.command.ExecutionCommand.Runner;
-import com.termux.shared.shell.command.ExecutionCommand.SessionCreateMode;
+import com.termux.shared.shell.command.ExecutionCommand.ShellCreateMode;
 import com.termux.terminal.TerminalEmulator;
 import com.termux.terminal.TerminalSession;
 import com.termux.terminal.TerminalSessionClient;
@@ -385,8 +386,8 @@ private void actionServiceExecute(Intent intent) {
         executionCommand.workingDirectory = IntentUtils.getStringExtraIfSet(intent, TERMUX_SERVICE.EXTRA_WORKDIR, null);
         executionCommand.isFailsafe = intent.getBooleanExtra(TERMUX_ACTIVITY.EXTRA_FAILSAFE_SESSION, false);
         executionCommand.sessionAction = intent.getStringExtra(TERMUX_SERVICE.EXTRA_SESSION_ACTION);
-        executionCommand.sessionName = IntentUtils.getStringExtraIfSet(intent, TERMUX_SERVICE.EXTRA_SESSION_NAME, null);
-        executionCommand.sessionCreateMode = IntentUtils.getStringExtraIfSet(intent, TERMUX_SERVICE.EXTRA_SESSION_CREATE_MODE, null);
+        executionCommand.shellName = IntentUtils.getStringExtraIfSet(intent, TERMUX_SERVICE.EXTRA_SHELL_NAME, null);
+        executionCommand.shellCreateMode = IntentUtils.getStringExtraIfSet(intent, TERMUX_SERVICE.EXTRA_SHELL_CREATE_MODE, null);
         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);
@@ -401,6 +402,9 @@ private void actionServiceExecute(Intent intent) {
             executionCommand.resultConfig.resultFilesSuffix = IntentUtils.getStringExtraIfSet(intent, TERMUX_SERVICE.EXTRA_RESULT_FILES_SUFFIX, null);
         }
 
+        if (executionCommand.shellCreateMode == null)
+            executionCommand.shellCreateMode = ShellCreateMode.ALWAYS.getMode();
+
         // Add the execution command to pending plugin execution commands list
         mPendingPluginExecutionCommands.add(executionCommand);
 
@@ -425,7 +429,23 @@ private void executeTermuxTaskCommand(ExecutionCommand executionCommand) {
 
         Logger.logDebug(LOG_TAG, "Executing background \"" + executionCommand.getCommandIdAndLabelLogString() + "\" TermuxTask command");
 
-        AppShell newTermuxTask = createTermuxTask(executionCommand);
+        // Transform executable path to shell/session name, e.g. "/bin/do-something.sh" => "do-something.sh".
+        if (executionCommand.shellName == null && executionCommand.executable != null)
+            executionCommand.shellName = ShellUtils.getExecutableBasename(executionCommand.executable);
+
+        AppShell newTermuxTask = null;
+        ShellCreateMode shellCreateMode = processShellCreateMode(executionCommand);
+        if (shellCreateMode == null) return;
+        if (ShellCreateMode.NO_SHELL_WITH_NAME.equals(shellCreateMode)) {
+            newTermuxTask = getTermuxTaskForShellName(executionCommand.shellName);
+            if (newTermuxTask != null)
+                Logger.logVerbose(LOG_TAG, "Existing TermuxTask with \"" + executionCommand.shellName + "\" shell name found for shell create mode \"" + shellCreateMode.getMode() + "\"");
+            else
+                Logger.logVerbose(LOG_TAG, "No existing TermuxTask with \"" + executionCommand.shellName + "\" shell name found for shell create mode \"" + shellCreateMode.getMode() + "\"");
+        }
+
+        if (newTermuxTask == null)
+            newTermuxTask = createTermuxTask(executionCommand);
     }
 
     /** Create a TermuxTask. */
@@ -502,35 +522,21 @@ public void onAppShellExited(final AppShell termuxTask) {
     private void executeTermuxSessionCommand(ExecutionCommand executionCommand) {
         if (executionCommand == null) return;
 
-        if (executionCommand.sessionCreateMode == null)
-            executionCommand.sessionCreateMode = SessionCreateMode.ALWAYS.getMode();
-
         Logger.logDebug(LOG_TAG, "Executing foreground \"" + executionCommand.getCommandIdAndLabelLogString() + "\" TermuxSession command");
 
-        // Transform executable path to session name, e.g. "/bin/do-something.sh" => "do-something.sh".
-        if (executionCommand.sessionName == null && executionCommand.executable != null) {
-            executionCommand.sessionName = ShellUtils.getExecutableBasename(executionCommand.executable);
-        }
+        // Transform executable path to shell/session name, e.g. "/bin/do-something.sh" => "do-something.sh".
+        if (executionCommand.shellName == null && executionCommand.executable != null)
+            executionCommand.shellName = ShellUtils.getExecutableBasename(executionCommand.executable);
 
         TermuxSession newTermuxSession = null;
-        if (SessionCreateMode.ALWAYS.equalsMode(executionCommand.sessionCreateMode))
-            ; // Default
-        else if (SessionCreateMode.NO_SESSION_WITH_NAME.equalsMode(executionCommand.sessionCreateMode))
-            if (DataUtils.isNullOrEmpty(executionCommand.sessionName)) {
-                String errmsg = getString(R.string.error_termux_service_execution_command_session_name_unset, executionCommand.sessionCreateMode);
-                executionCommand.setStateFailed(Errno.ERRNO_FAILED.getCode(), errmsg);
-                TermuxPluginUtils.processPluginExecutionCommandError(this, LOG_TAG, executionCommand, false);
-                return;
-            } else {
-                newTermuxSession = getTermuxSessionForName(executionCommand.sessionName);
-                if (newTermuxSession != null)
-                    Logger.logInfo(LOG_TAG, "Existing session with \"" + executionCommand.sessionName + "\" session name found");
-            }
-        else {
-            String errmsg = getString(R.string.error_termux_service_unsupported_execution_command_session_create_mode, executionCommand.sessionCreateMode);
-            executionCommand.setStateFailed(Errno.ERRNO_FAILED.getCode(), errmsg);
-            TermuxPluginUtils.processPluginExecutionCommandError(this, LOG_TAG, executionCommand, false);
-            return;
+        ShellCreateMode shellCreateMode = processShellCreateMode(executionCommand);
+        if (shellCreateMode == null) return;
+        if (ShellCreateMode.NO_SHELL_WITH_NAME.equals(shellCreateMode)) {
+            newTermuxSession = getTermuxSessionForShellName(executionCommand.shellName);
+            if (newTermuxSession != null)
+                Logger.logVerbose(LOG_TAG, "Existing TermuxSession with \"" + executionCommand.shellName + "\" shell name found for shell create mode \"" + shellCreateMode.getMode() + "\"");
+            else
+                Logger.logVerbose(LOG_TAG, "No existing TermuxSession with \"" + executionCommand.shellName + "\" shell name found for shell create mode \"" + shellCreateMode.getMode() + "\"");
         }
 
         if (newTermuxSession == null)
@@ -549,7 +555,7 @@ else if (SessionCreateMode.NO_SESSION_WITH_NAME.equalsMode(executionCommand.sess
     @Nullable
     public TermuxSession createTermuxSession(String executablePath, String[] arguments, String stdin, String workingDirectory, boolean isFailSafe, String sessionName) {
         ExecutionCommand executionCommand = new ExecutionCommand(getNextExecutionId(), executablePath, arguments, stdin, workingDirectory, Runner.TERMINAL_SESSION.getName(), isFailSafe);
-        executionCommand.sessionName = sessionName;
+        executionCommand.shellName = sessionName;
         return createTermuxSession(executionCommand);
     }
 
@@ -642,6 +648,24 @@ public void onTermuxSessionExited(final TermuxSession termuxSession) {
 
 
 
+    private ShellCreateMode processShellCreateMode(@NonNull ExecutionCommand executionCommand) {
+        if (ShellCreateMode.ALWAYS.equalsMode(executionCommand.shellCreateMode))
+            return ShellCreateMode.ALWAYS; // Default
+        else if (ShellCreateMode.NO_SHELL_WITH_NAME.equalsMode(executionCommand.shellCreateMode))
+            if (DataUtils.isNullOrEmpty(executionCommand.shellName)) {
+                TermuxPluginUtils.setAndProcessPluginExecutionCommandError(this, LOG_TAG, executionCommand, false,
+                    getString(R.string.error_termux_service_execution_command_shell_name_unset, executionCommand.shellCreateMode));
+                return null;
+            } else {
+               return ShellCreateMode.NO_SHELL_WITH_NAME;
+            }
+        else {
+            TermuxPluginUtils.setAndProcessPluginExecutionCommandError(this, LOG_TAG, executionCommand, false,
+                getString(R.string.error_termux_service_unsupported_execution_command_shell_create_mode, executionCommand.shellCreateMode));
+            return null;
+        }
+    }
+
     /** Process session action for new session. */
     private void handleSessionAction(int sessionAction, TerminalSession newTerminalSession) {
         Logger.logDebug(LOG_TAG, "Processing sessionAction \"" + sessionAction + "\" for session \"" + newTerminalSession.mSessionName + "\"");
@@ -888,13 +912,25 @@ public synchronized TerminalSession getTerminalSessionForHandle(String sessionHa
         return null;
     }
 
-    public synchronized TermuxSession getTermuxSessionForName(String name) {
+    public synchronized AppShell getTermuxTaskForShellName(String name) {
+        if (DataUtils.isNullOrEmpty(name)) return null;
+        AppShell appShell;
+        for (int i = 0, len = mTermuxTasks.size(); i < len; i++) {
+            appShell = mTermuxTasks.get(i);
+            String shellName = appShell.getExecutionCommand().shellName;
+            if (shellName != null && shellName.equals(name))
+                return appShell;
+        }
+        return null;
+    }
+
+    public synchronized TermuxSession getTermuxSessionForShellName(String name) {
         if (DataUtils.isNullOrEmpty(name)) return null;
         TermuxSession termuxSession;
         for (int i = 0, len = mTermuxSessions.size(); i < len; i++) {
             termuxSession = mTermuxSessions.get(i);
-            TerminalSession terminalSession = termuxSession.getTerminalSession();
-            if (terminalSession.mSessionName != null && terminalSession.mSessionName.equals(name))
+            String shellName = termuxSession.getExecutionCommand().shellName;
+            if (shellName != null && shellName.equals(name))
                 return termuxSession;
         }
         return null;
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java
index 070872d7d0..1054d91fec 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java
@@ -357,7 +357,7 @@ private void renameSession(TerminalSession sessionToRename, String text) {
         if (service != null) {
             TermuxSession termuxSession = service.getTermuxSessionForTerminalSession(sessionToRename);
             if (termuxSession != null)
-                termuxSession.getExecutionCommand().sessionName = text;
+                termuxSession.getExecutionCommand().shellName = text;
         }
     }
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e7e0da60e4..ca4c83a51c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -104,8 +104,8 @@
         Grants it from Settings -> Apps -> &TERMUX_APP_NAME; -> Advanced</string>
     <string name="error_termux_service_invalid_execution_command_runner">Invalid execution command runner to TermuxService: `%1$s`</string>
     <string name="error_termux_service_unsupported_execution_command_runner">Unsupported execution command runner to TermuxService: `%1$s`</string>
-    <string name="error_termux_service_unsupported_execution_command_session_create_mode">Unsupported execution command session create mode to TermuxService: `%1$s`</string>
-    <string name="error_termux_service_execution_command_session_name_unset">Session name not set but `%1$s` session create mode passed</string>
+    <string name="error_termux_service_unsupported_execution_command_shell_create_mode">Unsupported execution command shell create mode to TermuxService: `%1$s`</string>
+    <string name="error_termux_service_execution_command_shell_name_unset">Shell name not set but `%1$s` shell create mode passed</string>
 
 
 
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/command/ExecutionCommand.java b/termux-shared/src/main/java/com/termux/shared/shell/command/ExecutionCommand.java
index a579b313d4..7876ddaca4 100644
--- a/termux-shared/src/main/java/com/termux/shared/shell/command/ExecutionCommand.java
+++ b/termux-shared/src/main/java/com/termux/shared/shell/command/ExecutionCommand.java
@@ -105,17 +105,17 @@ public static Runner runnerOf(@Nullable String name, @NonNull Runner def) {
 
     }
 
-    public enum SessionCreateMode {
+    public enum ShellCreateMode {
 
         /** Always create {@link TerminalSession}. */
         ALWAYS("always"),
 
-        /** Create session only if no session with {@link #sessionName} found. */
-        NO_SESSION_WITH_NAME("no-session-with-name");
+        /** Create shell only if no shell with {@link #shellName} found. */
+        NO_SHELL_WITH_NAME("no-shell-with-name");
 
         private final String mode;
 
-        SessionCreateMode(final String mode) {
+        ShellCreateMode(final String mode) {
             this.mode = mode;
         }
 
@@ -127,10 +127,10 @@ public boolean equalsMode(String sessionCreateMode) {
             return sessionCreateMode != null && sessionCreateMode.equals(this.mode);
         }
 
-        /** Get {@link SessionCreateMode} for {@code mode} if found, otherwise {@code null}. */
+        /** Get {@link ShellCreateMode} for {@code mode} if found, otherwise {@code null}. */
         @Nullable
-        public static SessionCreateMode modeOf(String mode) {
-            for (SessionCreateMode v : SessionCreateMode.values()) {
+        public static ShellCreateMode modeOf(String mode) {
+            for (ShellCreateMode v : ShellCreateMode.values()) {
                 if (v.mode.equals(mode)) {
                     return v;
                 }
@@ -187,11 +187,12 @@ public static SessionCreateMode modeOf(String mode) {
     /** The session action of {@link Runner#TERMINAL_SESSION} commands. */
     public String sessionAction;
 
-    /** The session name of {@link Runner#TERMINAL_SESSION} commands. */
-    public String sessionName;
 
-    /** The {@link SessionCreateMode} of session for {@link Runner#TERMINAL_SESSION} commands. */
-    public String sessionCreateMode;
+    /** The shell name of commands. */
+    public String shellName;
+
+    /** The {@link ShellCreateMode} of commands. */
+    public String shellCreateMode;
 
 
 
@@ -386,12 +387,12 @@ public static String getExecutionInputLogString(final ExecutionCommand execution
         if (!ignoreNull || executionCommand.sessionAction != null)
             logString.append("\n").append(executionCommand.getSessionActionLogString());
 
-        if (!ignoreNull || executionCommand.sessionName != null) {
-            logString.append("\n").append(executionCommand.getSessionNameLogString());
+        if (!ignoreNull || executionCommand.shellName != null) {
+            logString.append("\n").append(executionCommand.getShellNameLogString());
         }
 
-        if (!ignoreNull || executionCommand.sessionCreateMode != null) {
-            logString.append("\n").append(executionCommand.getSessionCreateModeLogString());
+        if (!ignoreNull || executionCommand.shellCreateMode != null) {
+            logString.append("\n").append(executionCommand.getShellCreateModeLogString());
         }
 
         if (!ignoreNull || executionCommand.commandIntent != null)
@@ -485,8 +486,9 @@ public static String getExecutionCommandMarkdownString(final ExecutionCommand ex
         }
 
         markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Session Action", executionCommand.sessionAction, "-"));
-        markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Session Name", executionCommand.sessionName, "-"));
-        markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Session Create Mode", executionCommand.sessionCreateMode, "-"));
+
+        markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Shell Name", executionCommand.shellName, "-"));
+        markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Shell Create Mode", executionCommand.shellCreateMode, "-"));
 
 
         markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("isPluginExecutionCommand", executionCommand.isPluginExecutionCommand, "-"));
@@ -577,12 +579,12 @@ public String getSessionActionLogString() {
         return Logger.getSingleLineLogStringEntry("Session Action", sessionAction, "-");
     }
 
-    public String getSessionNameLogString() {
-        return Logger.getSingleLineLogStringEntry("Session Name", sessionName, "-");
+    public String getShellNameLogString() {
+        return Logger.getSingleLineLogStringEntry("Shell Name", shellName, "-");
     }
 
-    public String getSessionCreateModeLogString() {
-        return Logger.getSingleLineLogStringEntry("Session Create Mode", sessionCreateMode, "-");
+    public String getShellCreateModeLogString() {
+        return Logger.getSingleLineLogStringEntry("Shell Create Mode", shellCreateMode, "-");
     }
 
     public String getCommandDescriptionLogString() {
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/command/runner/app/AppShell.java b/termux-shared/src/main/java/com/termux/shared/shell/command/runner/app/AppShell.java
index d740a7e397..8eb3b89903 100644
--- a/termux-shared/src/main/java/com/termux/shared/shell/command/runner/app/AppShell.java
+++ b/termux-shared/src/main/java/com/termux/shared/shell/command/runner/app/AppShell.java
@@ -75,8 +75,15 @@ public static AppShell execute(@NonNull final Context context, @NonNull Executio
             executionCommand.workingDirectory = "/";
 
         String[] env = shellEnvironmentClient.buildEnvironment(context, executionCommand.isFailsafe, executionCommand.workingDirectory);
+        // Transform executable path to shell/session name, e.g. "/bin/do-something.sh" => "do-something.sh".
+        String executableBasename = ShellUtils.getExecutableBasename(executionCommand.executable);
+
+        if (executionCommand.shellName == null)
+            executionCommand.shellName = executableBasename;
 
         final String[] commandArray = shellEnvironmentClient.setupProcessArgs(executionCommand.executable, executionCommand.arguments);
+        if (executionCommand.commandLabel == null)
+            executionCommand.commandLabel = executableBasename;
 
         if (!executionCommand.setState(ExecutionState.EXECUTING)) {
             executionCommand.setStateFailed(Errno.ERRNO_FAILED.getCode(), context.getString(R.string.error_failed_to_execute_app_shell_command, executionCommand.getCommandIdAndLabelLogString()));
@@ -88,11 +95,6 @@ public static AppShell execute(@NonNull final Context context, @NonNull Executio
         Logger.logDebugExtended(LOG_TAG, ExecutionCommand.getExecutionInputLogString(executionCommand,
             true, Logger.shouldEnableLoggingForCustomLogLevel(executionCommand.backgroundCustomLogLevel)));
 
-        String taskName = ShellUtils.getExecutableBasename(executionCommand.executable);
-
-        if (executionCommand.commandLabel == null)
-            executionCommand.commandLabel = taskName;
-
         // Exec the process
         final Process process;
         try {
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
index ab142bf778..6e95c5b180 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
@@ -11,7 +11,7 @@
 import java.util.List;
 
 /*
- * Version: v0.45.0
+ * Version: v0.46.0
  * SPDX-License-Identifier: MIT
  *
  * Changelog
@@ -251,6 +251,12 @@
  *
  * - 0.45.0 (2022-06-01)
  *      - Added `TERMUX_APP.BUILD_CONFIG_CLASS_NAME`.
+ *
+ * - 0.46.0 (2022-06-03)
+ *      - Rename `TERMUX_APP.TERMUX_SERVICE.EXTRA_SESSION_NAME` to `*.EXTRA_SHELL_NAME`,
+ *          `TERMUX_APP.RUN_COMMAND_SERVICE.EXTRA_SESSION_NAME` to `*.EXTRA_SHELL_NAME`,
+ *          `TERMUX_APP.TERMUX_SERVICE.EXTRA_SESSION_CREATE_MODE` to `*.EXTRA_SHELL_CREATE_MODE` and
+ *          `TERMUX_APP.RUN_COMMAND_SERVICE.EXTRA_SESSION_CREATE_MODE` to `*.EXTRA_SHELL_CREATE_MODE`.
  */
 
 /**
@@ -992,10 +998,10 @@ public static final class TERMUX_SERVICE {
             public static final String EXTRA_BACKGROUND_CUSTOM_LOG_LEVEL = TERMUX_PACKAGE_NAME + ".execute.background_custom_log_level"; // Default: "com.termux.execute.background_custom_log_level"
             /** Intent {@code String} extra for session action for {@link Runner#TERMINAL_SESSION} commands for the TERMUX_SERVICE.ACTION_SERVICE_EXECUTE intent */
             public static final String EXTRA_SESSION_ACTION = TERMUX_PACKAGE_NAME + ".execute.session_action"; // Default: "com.termux.execute.session_action"
-            /** Intent {@code String} extra for session name for {@link Runner#TERMINAL_SESSION} commands for the TERMUX_SERVICE.ACTION_SERVICE_EXECUTE intent */
-            public static final String EXTRA_SESSION_NAME = TERMUX_PACKAGE_NAME + ".execute.session_name"; // Default: "com.termux.execute.session_name"
-            /** Intent {@code String} extra for the {@link ExecutionCommand.SessionCreateMode}  for the TERMUX_SERVICE.ACTION_SERVICE_EXECUTE intent. */
-            public static final String EXTRA_SESSION_CREATE_MODE = TERMUX_PACKAGE_NAME + ".execute.session_create_mode"; // Default: "com.termux.execute.session_create_mode"
+            /** Intent {@code String} extra for shell name for commands for the TERMUX_SERVICE.ACTION_SERVICE_EXECUTE intent */
+            public static final String EXTRA_SHELL_NAME = TERMUX_PACKAGE_NAME + ".execute.shell_name"; // Default: "com.termux.execute.shell_name"
+            /** Intent {@code String} extra for the {@link ExecutionCommand.ShellCreateMode}  for the TERMUX_SERVICE.ACTION_SERVICE_EXECUTE intent. */
+            public static final String EXTRA_SHELL_CREATE_MODE = TERMUX_PACKAGE_NAME + ".execute.shell_create_mode"; // Default: "com.termux.execute.shell_create_mode"
             /** Intent {@code String} extra for label of the command for the TERMUX_SERVICE.ACTION_SERVICE_EXECUTE intent */
             public static final String EXTRA_COMMAND_LABEL = TERMUX_PACKAGE_NAME + ".execute.command_label"; // Default: "com.termux.execute.command_label"
             /** Intent markdown {@code String} extra for description of the command for the TERMUX_SERVICE.ACTION_SERVICE_EXECUTE intent */
@@ -1133,10 +1139,10 @@ public static final class RUN_COMMAND_SERVICE {
             public static final String EXTRA_BACKGROUND_CUSTOM_LOG_LEVEL = TERMUX_PACKAGE_NAME + ".RUN_COMMAND_BACKGROUND_CUSTOM_LOG_LEVEL"; // Default: "com.termux.RUN_COMMAND_BACKGROUND_CUSTOM_LOG_LEVEL"
             /** Intent {@code String} extra for session action of {@link Runner#TERMINAL_SESSION} commands for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent */
             public static final String EXTRA_SESSION_ACTION = TERMUX_PACKAGE_NAME + ".RUN_COMMAND_SESSION_ACTION"; // Default: "com.termux.RUN_COMMAND_SESSION_ACTION"
-            /** Intent {@code String} extra for session name of {@link Runner#TERMINAL_SESSION} commands for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent */
-            public static final String EXTRA_SESSION_NAME = TERMUX_PACKAGE_NAME + ".RUN_COMMAND_SESSION_NAME"; // Default: "com.termux.RUN_COMMAND_SESSION_NAME"
-            /** Intent {@code String} extra for the {@link ExecutionCommand.SessionCreateMode}  for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent. */
-            public static final String EXTRA_SESSION_CREATE_MODE = TERMUX_PACKAGE_NAME + ".RUN_COMMAND_SESSION_CREATE_MODE"; // Default: "com.termux.RUN_COMMAND_SESSION_CREATE_MODE"
+            /** Intent {@code String} extra for shell name of commands for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent */
+            public static final String EXTRA_SHELL_NAME = TERMUX_PACKAGE_NAME + ".RUN_COMMAND_SHELL_NAME"; // Default: "com.termux.RUN_COMMAND_SHELL_NAME"
+            /** Intent {@code String} extra for the {@link ExecutionCommand.ShellCreateMode}  for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent. */
+            public static final String EXTRA_SHELL_CREATE_MODE = TERMUX_PACKAGE_NAME + ".RUN_COMMAND_SHELL_CREATE_MODE"; // Default: "com.termux.RUN_COMMAND_SHELL_CREATE_MODE"
             /** Intent {@code String} extra for label of the command for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent */
             public static final String EXTRA_COMMAND_LABEL = TERMUX_PACKAGE_NAME + ".RUN_COMMAND_COMMAND_LABEL"; // Default: "com.termux.RUN_COMMAND_COMMAND_LABEL"
             /** Intent markdown {@code String} extra for description of the command for the RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND intent */
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/plugins/TermuxPluginUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/plugins/TermuxPluginUtils.java
index 6be7c050aa..8d83dc0f41 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/plugins/TermuxPluginUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/plugins/TermuxPluginUtils.java
@@ -7,6 +7,7 @@
 import android.os.Build;
 import android.os.Environment;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import com.termux.shared.R;
@@ -103,6 +104,28 @@ public static void processPluginExecutionCommandResult(final Context context, St
             executionCommand.setState(ExecutionCommand.ExecutionState.SUCCESS);
     }
 
+    /**
+     * Set {@link ExecutionCommand} state to {@link Errno#ERRNO_FAILED} with {@code errmsg} and
+     * process error with {@link #processPluginExecutionCommandError(Context, String, ExecutionCommand, boolean)}.
+     *
+     *
+     * @param context The {@link Context} for operations.
+     * @param logTag The log tag to use for logging.
+     * @param executionCommand The {@link ExecutionCommand} that failed.
+     * @param forceNotification If set to {@code true}, then a flash and notification will be shown
+     *                          regardless of if pending intent is {@code null} or
+     *                          {@link TERMUX_APP#KEY_PLUGIN_ERROR_NOTIFICATIONS_ENABLED}
+     *                          is {@code false}.
+     * @param errmsg The error message to set.
+     */
+    public static void setAndProcessPluginExecutionCommandError(final Context context, String logTag,
+                                                          final ExecutionCommand executionCommand,
+                                                          boolean forceNotification,
+                                                          @NonNull String errmsg) {
+        executionCommand.setStateFailed(Errno.ERRNO_FAILED.getCode(), errmsg);
+        processPluginExecutionCommandError(context, logTag, executionCommand, forceNotification);
+    }
+
     /**
      * Process {@link ExecutionCommand} error.
      *
@@ -128,7 +151,9 @@ public static void processPluginExecutionCommandResult(final Context context, St
      *                          {@link TERMUX_APP#KEY_PLUGIN_ERROR_NOTIFICATIONS_ENABLED}
      *                          is {@code false}.
      */
-    public static void processPluginExecutionCommandError(final Context context, String logTag, final ExecutionCommand executionCommand, boolean forceNotification) {
+    public static void processPluginExecutionCommandError(final Context context, String logTag,
+                                                          final ExecutionCommand executionCommand,
+                                                          boolean forceNotification) {
         if (context == null || executionCommand == null) return;
 
         logTag = DataUtils.getDefaultIfNull(logTag, LOG_TAG);
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/shell/command/runner/terminal/TermuxSession.java b/termux-shared/src/main/java/com/termux/shared/termux/shell/command/runner/terminal/TermuxSession.java
index 7f365c9968..93e32f490f 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/shell/command/runner/terminal/TermuxSession.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/shell/command/runner/terminal/TermuxSession.java
@@ -131,8 +131,8 @@ public static TermuxSession execute(@NonNull final Context context, @NonNull Exe
         Logger.logDebug(LOG_TAG, "Running \"" + executionCommand.getCommandIdAndLabelLogString() + "\" TermuxSession");
         TerminalSession terminalSession = new TerminalSession(executionCommand.executable, executionCommand.workingDirectory, executionCommand.arguments, environment, executionCommand.terminalTranscriptRows, terminalSessionClient);
 
-        if (executionCommand.sessionName != null) {
-            terminalSession.mSessionName = executionCommand.sessionName;
+        if (executionCommand.shellName != null) {
+            terminalSession.mSessionName = executionCommand.shellName;
         }
 
         return new TermuxSession(terminalSession, executionCommand, termuxSessionClient, setStdoutOnExit);

From 0c22067b5e7b90b8631fa0c8b1032de53f2be3a8 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 4 Jun 2022 15:13:37 +0500
Subject: [PATCH 764/912] Added|Changed: Add termux site url and change donate
 url to https://termux.dev/donate

---
 .../com/termux/shared/termux/TermuxConstants.java  | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
index 6e95c5b180..93a169d65f 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
@@ -11,7 +11,7 @@
 import java.util.List;
 
 /*
- * Version: v0.46.0
+ * Version: v0.47.0
  * SPDX-License-Identifier: MIT
  *
  * Changelog
@@ -257,6 +257,10 @@
  *          `TERMUX_APP.RUN_COMMAND_SERVICE.EXTRA_SESSION_NAME` to `*.EXTRA_SHELL_NAME`,
  *          `TERMUX_APP.TERMUX_SERVICE.EXTRA_SESSION_CREATE_MODE` to `*.EXTRA_SHELL_CREATE_MODE` and
  *          `TERMUX_APP.RUN_COMMAND_SERVICE.EXTRA_SESSION_CREATE_MODE` to `*.EXTRA_SHELL_CREATE_MODE`.
+ *
+ * - 0.47.0 (2022-06-04)
+ *      - Added `TERMUX_SITE` and `TERMUX_SITE_URL`.
+ *      - Changed `TERMUX_DONATE_URL`.
  */
 
 /**
@@ -547,6 +551,12 @@ public final class TermuxConstants {
      * Termux miscellaneous urls.
      */
 
+    /** Termux Site */
+    public static final String TERMUX_SITE = TERMUX_APP_NAME + " Site"; // Default: "Termux Site"
+
+    /** Termux Site url */
+    public static final String TERMUX_SITE_URL = "https://termux.dev"; // Default: "https://termux.dev"
+
     /** Termux Wiki */
     public static final String TERMUX_WIKI = TERMUX_APP_NAME + " Wiki"; // Default: "Termux Wiki"
 
@@ -575,7 +585,7 @@ public final class TermuxConstants {
 
 
     /** Termux donate url */
-    public static final String TERMUX_DONATE_URL = TERMUX_PACKAGES_GITHUB_REPO_URL + "/wiki/Donate"; // Default: "https://github.com/termux/termux-packages/wiki/Donate"
+    public static final String TERMUX_DONATE_URL = TERMUX_SITE_URL + "/donate"; // Default: "https://termux.dev/donate"
 
 
 

From d29e20b0d0b7616be55d9ed22b625f7918ce7750 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 4 Jun 2022 15:23:15 +0500
Subject: [PATCH 765/912] Removed: Remove Termux game, root, science, unstable
 and x11 repo links since they have all been merged with
 https://github.com/termux/termux-packages

---
 .../termux/shared/termux/TermuxConstants.java | 46 ++-----------------
 .../com/termux/shared/termux/TermuxUtils.java |  5 --
 2 files changed, 5 insertions(+), 46 deletions(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
index 93a169d65f..63b5cbb31a 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
@@ -11,7 +11,7 @@
 import java.util.List;
 
 /*
- * Version: v0.47.0
+ * Version: v0.48.0
  * SPDX-License-Identifier: MIT
  *
  * Changelog
@@ -261,6 +261,10 @@
  * - 0.47.0 (2022-06-04)
  *      - Added `TERMUX_SITE` and `TERMUX_SITE_URL`.
  *      - Changed `TERMUX_DONATE_URL`.
+ *
+ * - 0.48.0 (2022-06-04)
+ *      - Removed `TERMUX_GAME_PACKAGES_GITHUB_*`, `TERMUX_SCIENCE_PACKAGES_GITHUB_*`,
+ *          `TERMUX_ROOT_PACKAGES_GITHUB_*`, `TERMUX_UNSTABLE_PACKAGES_GITHUB_*`
  */
 
 /**
@@ -494,46 +498,6 @@ public final class TermuxConstants {
     public static final String TERMUX_PACKAGES_GITHUB_ISSUES_REPO_URL = TERMUX_PACKAGES_GITHUB_REPO_URL + "/issues"; // Default: "https://github.com/termux/termux-packages/issues"
 
 
-    /** Termux Game Packages Github repo name */
-    public static final String TERMUX_GAME_PACKAGES_GITHUB_REPO_NAME = "game-packages"; // Default: "game-packages"
-    /** Termux Game Packages Github repo url */
-    public static final String TERMUX_GAME_PACKAGES_GITHUB_REPO_URL = TERMUX_GITHUB_ORGANIZATION_URL + "/" + TERMUX_GAME_PACKAGES_GITHUB_REPO_NAME; // Default: "https://github.com/termux/game-packages"
-    /** Termux Game Packages Github issues repo url */
-    public static final String TERMUX_GAME_PACKAGES_GITHUB_ISSUES_REPO_URL = TERMUX_GAME_PACKAGES_GITHUB_REPO_URL + "/issues"; // Default: "https://github.com/termux/game-packages/issues"
-
-
-    /** Termux Science Packages Github repo name */
-    public static final String TERMUX_SCIENCE_PACKAGES_GITHUB_REPO_NAME = "science-packages"; // Default: "science-packages"
-    /** Termux Science Packages Github repo url */
-    public static final String TERMUX_SCIENCE_PACKAGES_GITHUB_REPO_URL = TERMUX_GITHUB_ORGANIZATION_URL + "/" + TERMUX_SCIENCE_PACKAGES_GITHUB_REPO_NAME; // Default: "https://github.com/termux/science-packages"
-    /** Termux Science Packages Github issues repo url */
-    public static final String TERMUX_SCIENCE_PACKAGES_GITHUB_ISSUES_REPO_URL = TERMUX_SCIENCE_PACKAGES_GITHUB_REPO_URL + "/issues"; // Default: "https://github.com/termux/science-packages/issues"
-
-
-    /** Termux Root Packages Github repo name */
-    public static final String TERMUX_ROOT_PACKAGES_GITHUB_REPO_NAME = "termux-root-packages"; // Default: "termux-root-packages"
-    /** Termux Root Packages Github repo url */
-    public static final String TERMUX_ROOT_PACKAGES_GITHUB_REPO_URL = TERMUX_GITHUB_ORGANIZATION_URL + "/" + TERMUX_ROOT_PACKAGES_GITHUB_REPO_NAME; // Default: "https://github.com/termux/termux-root-packages"
-    /** Termux Root Packages Github issues repo url */
-    public static final String TERMUX_ROOT_PACKAGES_GITHUB_ISSUES_REPO_URL = TERMUX_ROOT_PACKAGES_GITHUB_REPO_URL + "/issues"; // Default: "https://github.com/termux/termux-root-packages/issues"
-
-
-    /** Termux Unstable Packages Github repo name */
-    public static final String TERMUX_UNSTABLE_PACKAGES_GITHUB_REPO_NAME = "unstable-packages"; // Default: "unstable-packages"
-    /** Termux Unstable Packages Github repo url */
-    public static final String TERMUX_UNSTABLE_PACKAGES_GITHUB_REPO_URL = TERMUX_GITHUB_ORGANIZATION_URL + "/" + TERMUX_UNSTABLE_PACKAGES_GITHUB_REPO_NAME; // Default: "https://github.com/termux/unstable-packages"
-    /** Termux Unstable Packages Github issues repo url */
-    public static final String TERMUX_UNSTABLE_PACKAGES_GITHUB_ISSUES_REPO_URL = TERMUX_UNSTABLE_PACKAGES_GITHUB_REPO_URL + "/issues"; // Default: "https://github.com/termux/unstable-packages/issues"
-
-
-    /** Termux X11 Packages Github repo name */
-    public static final String TERMUX_X11_PACKAGES_GITHUB_REPO_NAME = "x11-packages"; // Default: "x11-packages"
-    /** Termux X11 Packages Github repo url */
-    public static final String TERMUX_X11_PACKAGES_GITHUB_REPO_URL = TERMUX_GITHUB_ORGANIZATION_URL + "/" + TERMUX_X11_PACKAGES_GITHUB_REPO_NAME; // Default: "https://github.com/termux/x11-packages"
-    /** Termux X11 Packages Github issues repo url */
-    public static final String TERMUX_X11_PACKAGES_GITHUB_ISSUES_REPO_URL = TERMUX_X11_PACKAGES_GITHUB_REPO_URL + "/issues"; // Default: "https://github.com/termux/x11-packages/issues"
-
-
     /** Termux API apt package name */
     public static final String TERMUX_API_APT_PACKAGE_NAME = "termux-api"; // Default: "termux-api"
     /** Termux API apt Github repo name */
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
index 42208ac131..75e4a90217 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
@@ -517,11 +517,6 @@ public static String getReportIssueMarkdownString(@NonNull final Context context
 
         markdownString.append("\n\n### Github Issues for Termux packages\n");
         markdownString.append("\n").append(MarkdownUtils.getLinkMarkdownString(TermuxConstants.TERMUX_PACKAGES_GITHUB_REPO_NAME, TermuxConstants.TERMUX_PACKAGES_GITHUB_ISSUES_REPO_URL)).append("  ");
-        markdownString.append("\n").append(MarkdownUtils.getLinkMarkdownString(TermuxConstants.TERMUX_GAME_PACKAGES_GITHUB_REPO_NAME, TermuxConstants.TERMUX_GAME_PACKAGES_GITHUB_ISSUES_REPO_URL)).append("  ");
-        markdownString.append("\n").append(MarkdownUtils.getLinkMarkdownString(TermuxConstants.TERMUX_SCIENCE_PACKAGES_GITHUB_REPO_NAME, TermuxConstants.TERMUX_SCIENCE_PACKAGES_GITHUB_ISSUES_REPO_URL)).append("  ");
-        markdownString.append("\n").append(MarkdownUtils.getLinkMarkdownString(TermuxConstants.TERMUX_ROOT_PACKAGES_GITHUB_REPO_NAME, TermuxConstants.TERMUX_ROOT_PACKAGES_GITHUB_ISSUES_REPO_URL)).append("  ");
-        markdownString.append("\n").append(MarkdownUtils.getLinkMarkdownString(TermuxConstants.TERMUX_UNSTABLE_PACKAGES_GITHUB_REPO_NAME, TermuxConstants.TERMUX_UNSTABLE_PACKAGES_GITHUB_ISSUES_REPO_URL)).append("  ");
-        markdownString.append("\n").append(MarkdownUtils.getLinkMarkdownString(TermuxConstants.TERMUX_X11_PACKAGES_GITHUB_REPO_NAME, TermuxConstants.TERMUX_X11_PACKAGES_GITHUB_ISSUES_REPO_URL)).append("  ");
 
         markdownString.append("\n##\n");
 

From 9547869a52f5c672e0577f772aea9ba986dd84e6 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 4 Jun 2022 15:35:05 +0500
Subject: [PATCH 766/912] Changed: Update funding link to
 https://termux.dev/donate

---
 .github/FUNDING.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
index 35f0f86845..c7fc532b31 100644
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1 +1 @@
-open_collective: termux
+custom: https://termux.dev/donate

From b96fcb78fd9269ee40a3f488a425d35204d38251 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 9 Jun 2022 17:23:37 +0500
Subject: [PATCH 767/912] Changed: Update termux twitter to
 https://twitter.com/termuxdevs

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 926fcef715..9f9c18d847 100644
--- a/README.md
+++ b/README.md
@@ -152,7 +152,7 @@ The main ones are the following.
 - [Termux Reddit community](https://reddit.com/r/termux)
 - [Termux User Matrix Channel](https://matrix.to/#/#termux_termux:gitter.im) ([Gitter](https://gitter.im/termux/termux))
 - [Termux Dev Matrix Channel](https://matrix.to/#/#termux_dev:gitter.im) ([Gitter](https://gitter.im/termux/dev))
-- [Termux Twitter](https://twitter.com/termux/)
+- [Termux Twitter](https://twitter.com/termuxdevs)
 - [Termux Support Email](mailto:support@termux.dev)
 
 ### Wikis

From 042487c2b460c759f5066cd9792d2f385a146f94 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 11 Jun 2022 13:52:10 +0500
Subject: [PATCH 768/912] Changed: Ensure `AppShell` executable is not `null`
 before trying to execute it

---
 .../termux/shared/shell/command/runner/app/AppShell.java   | 7 +++++++
 termux-shared/src/main/res/values/strings.xml              | 1 +
 2 files changed, 8 insertions(+)

diff --git a/termux-shared/src/main/java/com/termux/shared/shell/command/runner/app/AppShell.java b/termux-shared/src/main/java/com/termux/shared/shell/command/runner/app/AppShell.java
index 8eb3b89903..ad08239273 100644
--- a/termux-shared/src/main/java/com/termux/shared/shell/command/runner/app/AppShell.java
+++ b/termux-shared/src/main/java/com/termux/shared/shell/command/runner/app/AppShell.java
@@ -69,6 +69,13 @@ public static AppShell execute(@NonNull final Context context, @NonNull Executio
                                    final AppShellClient appShellClient,
                                    @NonNull final ShellEnvironmentClient shellEnvironmentClient,
                                    final boolean isSynchronous) {
+        if (executionCommand.executable == null || executionCommand.executable.isEmpty()) {
+            executionCommand.setStateFailed(Errno.ERRNO_FAILED.getCode(),
+                currentPackageContext.getString(R.string.error_executable_unset, executionCommand.getCommandIdAndLabelLogString()));
+            AppShell.processAppShellResult(null, executionCommand);
+            return null;
+        }
+
         if (executionCommand.workingDirectory == null || executionCommand.workingDirectory.isEmpty())
             executionCommand.workingDirectory = shellEnvironmentClient.getDefaultWorkingDirectoryPath();
         if (executionCommand.workingDirectory.isEmpty())
diff --git a/termux-shared/src/main/res/values/strings.xml b/termux-shared/src/main/res/values/strings.xml
index a0111fc3d1..c9f1622bb4 100644
--- a/termux-shared/src/main/res/values/strings.xml
+++ b/termux-shared/src/main/res/values/strings.xml
@@ -62,6 +62,7 @@
 
     <!-- Shell -->
     <string name="error_sending_sigkill_to_process">Sending SIGKILL to process on user request or because android is killing the execution service</string>
+    <string name="error_executable_unset">Executable not set \"%1$s\" for shell command</string>
     <string name="error_execution_cancelled">Execution has been cancelled since execution service is being killed</string>
     <string name="error_failed_to_execute_termux_session_command">Failed to execute \"%1$s\" termux session command</string>
     <string name="error_failed_to_execute_app_shell_command">Failed to execute \"%1$s\" app shell command</string>

From 0fd354a469c4a2943838aa7885c3bcd2525c1d88 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 11 Jun 2022 13:55:49 +0500
Subject: [PATCH 769/912] Changed: Ensure `TermuxSession` executable is `null`
 if its empty so that `login` shell can start

---
 .../termux/shell/command/runner/terminal/TermuxSession.java     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/termux-shared/src/main/java/com/termux/shared/termux/shell/command/runner/terminal/TermuxSession.java b/termux-shared/src/main/java/com/termux/shared/termux/shell/command/runner/terminal/TermuxSession.java
index 93e32f490f..a356449be2 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/shell/command/runner/terminal/TermuxSession.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/shell/command/runner/terminal/TermuxSession.java
@@ -67,6 +67,8 @@ public static TermuxSession execute(@NonNull final Context context, @NonNull Exe
                                         @NonNull final TerminalSessionClient terminalSessionClient, final TermuxSessionClient termuxSessionClient,
                                         @NonNull final ShellEnvironmentClient shellEnvironmentClient,
                                         final boolean setStdoutOnExit) {
+        if (executionCommand.executable != null && executionCommand.executable.isEmpty())
+            executionCommand.executable = null;
         if (executionCommand.workingDirectory == null || executionCommand.workingDirectory.isEmpty())
             executionCommand.workingDirectory = shellEnvironmentClient.getDefaultWorkingDirectoryPath();
         if (executionCommand.workingDirectory.isEmpty())

From 575941110956b0c32723da73b739663d06d42459 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 11 Jun 2022 14:10:34 +0500
Subject: [PATCH 770/912] Added: Add `SELinuxUtils` to get process and file
 paths security contexts

---
 .../termux/shared/android/SELinuxUtils.java   | 96 +++++++++++++++++++
 1 file changed, 96 insertions(+)
 create mode 100644 termux-shared/src/main/java/com/termux/shared/android/SELinuxUtils.java

diff --git a/termux-shared/src/main/java/com/termux/shared/android/SELinuxUtils.java b/termux-shared/src/main/java/com/termux/shared/android/SELinuxUtils.java
new file mode 100644
index 0000000000..13810eb7b3
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/android/SELinuxUtils.java
@@ -0,0 +1,96 @@
+package com.termux.shared.android;
+
+import android.annotation.SuppressLint;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.termux.shared.logger.Logger;
+import com.termux.shared.reflection.ReflectionUtils;
+
+import java.lang.reflect.Method;
+
+public class SELinuxUtils {
+
+    public static final String ANDROID_OS_SELINUX_CLASS = "android.os.SELinux";
+
+    private static final String LOG_TAG = "SELinuxUtils";
+
+    /**
+     * Gets the security context of the current process.
+     *
+     * @return Returns a {@link String} representing the security context of the current process.
+     * This will be {@code null} if an exception is raised.
+     */
+    @Nullable
+    public static String getContext() {
+        ReflectionUtils.bypassHiddenAPIReflectionRestrictions();
+        String methodName = "getContext";
+        try {
+            @SuppressLint("PrivateApi") Class<?> clazz = Class.forName(ANDROID_OS_SELINUX_CLASS);
+            Method method = ReflectionUtils.getDeclaredMethod(clazz, methodName);
+            if (method == null) {
+                Logger.logError(LOG_TAG, "Failed to get " + methodName + "() method of " + ANDROID_OS_SELINUX_CLASS + " class");
+                return null;
+            }
+
+            return (String) ReflectionUtils.invokeMethod(method, null).value;
+        } catch (Exception e) {
+            Logger.logStackTraceWithMessage(LOG_TAG, "Failed to call " + methodName + "() method of " + ANDROID_OS_SELINUX_CLASS + " class", e);
+            return null;
+        }
+    }
+
+    /**
+     * Get the security context of a given process id.
+     *
+     * @param pid The pid of process.
+     * @return Returns a {@link String} representing the security context of the given pid.
+     * This will be {@code null} if an exception is raised.
+     */
+    @Nullable
+    public static String getPidContext(int pid) {
+        ReflectionUtils.bypassHiddenAPIReflectionRestrictions();
+        String methodName = "getPidContext";
+        try {
+            @SuppressLint("PrivateApi") Class<?> clazz = Class.forName(ANDROID_OS_SELINUX_CLASS);
+            Method method = ReflectionUtils.getDeclaredMethod(clazz, methodName, int.class);
+            if (method == null) {
+                Logger.logError(LOG_TAG, "Failed to get " + methodName + "() method of " + ANDROID_OS_SELINUX_CLASS + " class");
+                return null;
+            }
+
+            return (String) ReflectionUtils.invokeMethod(method, null, pid).value;
+        } catch (Exception e) {
+            Logger.logStackTraceWithMessage(LOG_TAG, "Failed to call " + methodName + "() method of " + ANDROID_OS_SELINUX_CLASS + " class", e);
+            return null;
+        }
+    }
+
+    /**
+     * Get the security context of a file object.
+     *
+     * @param path The pathname of the file object.
+     * @return Returns a {@link String} representing the security context of the file.
+     * This will be {@code null} if an exception is raised.
+     */
+    @Nullable
+    public static String getFileContext(@NonNull String path) {
+        ReflectionUtils.bypassHiddenAPIReflectionRestrictions();
+        String methodName = "getFileContext";
+        try {
+            @SuppressLint("PrivateApi") Class<?> clazz = Class.forName(ANDROID_OS_SELINUX_CLASS);
+            Method method = ReflectionUtils.getDeclaredMethod(clazz, methodName, String.class);
+            if (method == null) {
+                Logger.logError(LOG_TAG, "Failed to get " + methodName + "() method of " + ANDROID_OS_SELINUX_CLASS + " class");
+                return null;
+            }
+
+            return (String) ReflectionUtils.invokeMethod(method, null, path).value;
+        } catch (Exception e) {
+            Logger.logStackTraceWithMessage(LOG_TAG, "Failed to call " + methodName + "() method of " + ANDROID_OS_SELINUX_CLASS + " class", e);
+            return null;
+        }
+    }
+
+}

From 1788013c80bbc48fafa7bf34712131270ccbf1d5 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 11 Jun 2022 14:11:58 +0500
Subject: [PATCH 771/912] Added: Add functions to `PackageUtils` to get
 `seInfo` and `seInfoUser` of package

---
 .../termux/shared/android/PackageUtils.java   | 49 +++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/termux-shared/src/main/java/com/termux/shared/android/PackageUtils.java b/termux-shared/src/main/java/com/termux/shared/android/PackageUtils.java
index ded3c01fee..a11ffb6cc7 100644
--- a/termux-shared/src/main/java/com/termux/shared/android/PackageUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/android/PackageUtils.java
@@ -196,6 +196,55 @@ public static Integer getApplicationInfoPrivateFlagsForPackage(@NonNull final Ap
         }
     }
 
+    /**
+     * Get the {@code seInfo} {@link Field} of the {@link ApplicationInfo} class.
+     *
+     * String retrieved from the seinfo tag found in selinux policy. This value can be set through
+     * the mac_permissions.xml policy construct. This value is used for setting an SELinux security
+     * context on the process as well as its data directory.
+     *
+     * https://cs.android.com/android/platform/superproject/+/android-7.1.0_r1:frameworks/base/core/java/android/content/pm/ApplicationInfo.java;l=609
+     * https://cs.android.com/android/platform/superproject/+/android-12.0.0_r32:frameworks/base/core/java/android/content/pm/ApplicationInfo.java;l=981
+     * https://cs.android.com/android/platform/superproject/+/android-7.0.0_r1:frameworks/base/services/core/java/com/android/server/pm/SELinuxMMAC.java;l=282
+     * https://cs.android.com/android/platform/superproject/+/android-12.0.0_r32:frameworks/base/services/core/java/com/android/server/pm/SELinuxMMAC.java;l=375
+     * https://cs.android.com/android/_/android/platform/frameworks/base/+/be0b8896d1bc385d4c8fb54c21929745935dcbea
+     *
+     * @param applicationInfo The {@link ApplicationInfo} for the package.
+     * @return Returns the selinux info or {@code null} if an exception was raised.
+     */
+    @Nullable
+    public static String getApplicationInfoSeInfoForPackage(@NonNull final ApplicationInfo applicationInfo) {
+        ReflectionUtils.bypassHiddenAPIReflectionRestrictions();
+        try {
+            return (String) ReflectionUtils.invokeField(ApplicationInfo.class, Build.VERSION.SDK_INT < Build.VERSION_CODES.O ? "seinfo" : "seInfo", applicationInfo).value;
+        } catch (Exception e) {
+            // ClassCastException may be thrown
+            Logger.logStackTraceWithMessage(LOG_TAG, "Failed to get seInfo field value for ApplicationInfo class", e);
+            return null;
+        }
+    }
+
+    /**
+     * Get the {@code seInfoUser} {@link Field} of the {@link ApplicationInfo} class.
+     *
+     * Also check {@link #getApplicationInfoSeInfoForPackage(ApplicationInfo)}.
+     *
+     * @param applicationInfo The {@link ApplicationInfo} for the package.
+     * @return Returns the selinux info user or {@code null} if an exception was raised.
+     */
+    @Nullable
+    public static String getApplicationInfoSeInfoUserForPackage(@NonNull final ApplicationInfo applicationInfo) {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) return null;
+        ReflectionUtils.bypassHiddenAPIReflectionRestrictions();
+        try {
+            return (String) ReflectionUtils.invokeField(ApplicationInfo.class, "seInfoUser", applicationInfo).value;
+        } catch (Exception e) {
+            // ClassCastException may be thrown
+            Logger.logStackTraceWithMessage(LOG_TAG, "Failed to get seInfoUser field value for ApplicationInfo class", e);
+            return null;
+        }
+    }
+
     /**
      * Get the {@code privateFlags} {@link Field} of the {@link ApplicationInfo} class.
      *

From 790481b8027d245bcd8180e95ca3aa42d2c045fc Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 11 Jun 2022 14:12:58 +0500
Subject: [PATCH 772/912] Added: Add functions to `PackageUtils` to get base
 APK path of package

---
 .../termux/shared/android/PackageUtils.java   | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/termux-shared/src/main/java/com/termux/shared/android/PackageUtils.java b/termux-shared/src/main/java/com/termux/shared/android/PackageUtils.java
index a11ffb6cc7..a9ecb902cf 100644
--- a/termux-shared/src/main/java/com/termux/shared/android/PackageUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/android/PackageUtils.java
@@ -375,6 +375,28 @@ public static int getTargetSDKForPackage(@NonNull final ApplicationInfo applicat
 
 
 
+    /**
+     * Get the base apk path for the package associated with the {@code context}.
+     *
+     * @param context The {@link Context} for the package.
+     * @return Returns the base apk path.
+     */
+    public static String getBaseAPKPathForPackage(@NonNull final Context context) {
+        return getBaseAPKPathForPackage(context.getApplicationInfo());
+    }
+
+    /**
+     * Get the base apk path for the package associated with the {@code applicationInfo}.
+     *
+     * @param applicationInfo The {@link ApplicationInfo} for the package.
+     * @return Returns the base apk path.
+     */
+    public static String getBaseAPKPathForPackage(@NonNull final ApplicationInfo applicationInfo) {
+        return applicationInfo.publicSourceDir;
+    }
+
+
+
     /**
      * Check if the app associated with the {@code context} has {@link ApplicationInfo#FLAG_DEBUGGABLE}
      * set.

From f9e9193c4e1e1b0c061d68856e9b673f9d450ea4 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 11 Jun 2022 14:15:33 +0500
Subject: [PATCH 773/912] Added: Add package `APK_PATH`, `SE_PROCESS_CONTEXT`,
 `SE_FILE_CONTEXT` and `SE_INFO` when generating app info markdown string

---
 .../java/com/termux/shared/android/AndroidUtils.java     | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/termux-shared/src/main/java/com/termux/shared/android/AndroidUtils.java b/termux-shared/src/main/java/com/termux/shared/android/AndroidUtils.java
index 4ddcc3fbbc..bc229f454a 100644
--- a/termux-shared/src/main/java/com/termux/shared/android/AndroidUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/android/AndroidUtils.java
@@ -9,6 +9,7 @@
 import androidx.annotation.NonNull;
 
 import com.google.common.base.Joiner;
+import com.termux.shared.data.DataUtils;
 import com.termux.shared.logger.Logger;
 import com.termux.shared.markdown.MarkdownUtils;
 
@@ -84,9 +85,17 @@ public static String getAppInfoMarkdownString(@NonNull final Context context, @N
         AndroidUtils.appendPropertyToMarkdown(markdownString,"IS_DEBUGGABLE_BUILD", PackageUtils.isAppForPackageADebuggableBuild(applicationInfo));
 
         if (PackageUtils.isAppInstalledOnExternalStorage(applicationInfo)) {
+            AndroidUtils.appendPropertyToMarkdown(markdownString,"APK_PATH", PackageUtils.getBaseAPKPathForPackage(applicationInfo));
             AndroidUtils.appendPropertyToMarkdown(markdownString,"IS_INSTALLED_ON_EXTERNAL_STORAGE", true);
         }
 
+        AndroidUtils.appendPropertyToMarkdown(markdownString,"SE_PROCESS_CONTEXT", SELinuxUtils.getContext());
+        AndroidUtils.appendPropertyToMarkdown(markdownString,"SE_FILE_CONTEXT", SELinuxUtils.getFileContext(context.getFilesDir().getAbsolutePath()));
+
+        String seInfoUser = PackageUtils.getApplicationInfoSeInfoUserForPackage(applicationInfo);
+        AndroidUtils.appendPropertyToMarkdown(markdownString,"SE_INFO", PackageUtils.getApplicationInfoSeInfoForPackage(applicationInfo) +
+            (DataUtils.isNullOrEmpty(seInfoUser) ? "" : seInfoUser));
+
         return markdownString.toString();
     }
 

From 0328d15ea77515469f1cd69afd1944f80ff71860 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 11 Jun 2022 14:24:26 +0500
Subject: [PATCH 774/912] Fixed: Fix duplicate logging of `file` word in
 `FileUtils.copyOrMoveFile()`

---
 .../src/main/java/com/termux/shared/file/FileUtils.java     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/file/FileUtils.java b/termux-shared/src/main/java/com/termux/shared/file/FileUtils.java
index f51de78283..308bc77e66 100644
--- a/termux-shared/src/main/java/com/termux/shared/file/FileUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/file/FileUtils.java
@@ -991,7 +991,7 @@ public static Error copyOrMoveFile(String label, final String srcFilePath, final
                     return FileUtilsErrno.ERRNO_CANNOT_OVERWRITE_A_DIFFERENT_FILE_TYPE.getError(label + "source file", mode.toLowerCase(), srcFilePath, destFilePath, destFileType.getName(), srcFileType.getName());
 
                 // Delete the destination file
-                error = deleteFile(label + "destination file", destFilePath, true);
+                error = deleteFile(label + "destination", destFilePath, true);
                 if (error != null)
                     return error;
             }
@@ -1038,7 +1038,7 @@ public static Error copyOrMoveFile(String label, final String srcFilePath, final
                     } else {
                         // read the target for the source file and create a symlink at dest
                         // source file metadata will be lost
-                        error = createSymlinkFile(label + "dest file", Os.readlink(srcFilePath), destFilePath);
+                        error = createSymlinkFile(label + "dest", Os.readlink(srcFilePath), destFilePath);
                         if (error != null)
                             return error;
                     }
@@ -1055,7 +1055,7 @@ public static Error copyOrMoveFile(String label, final String srcFilePath, final
             // If source file had to be moved
             if (moveFile) {
                 // Delete the source file since copying would have succeeded
-                error = deleteFile(label + "source file", srcFilePath, true);
+                error = deleteFile(label + "source", srcFilePath, true);
                 if (error != null)
                     return error;
             }

From f102ea20b2041723c94a6fd5dd27558250beb5bd Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 11 Jun 2022 19:08:20 +0500
Subject: [PATCH 775/912] Added|Changed!: Implement new design for shell
 environment generation and add support for `MIT` licensed shell environment
 client

- `ShellEnvironmentClient` has been renamed to `IShellEnvironment` with certain changes to its interface methods, including requirement for `Execution` command itself for `setupShellCommandEnvironment()`.
- `UnixShellEnvironment` implements the `IShellEnvironment` interface as is the abstract base class of all other shell environments.
- `AndroidShellEnvironment` extends from the `UnixShellEnvironment` class and provides an environment that would work for Android shells. This is `MIT` licensed and can be used by users importing the `termux-shared` library or the library itself to run `AppShell` shells. Previously, `TermuxShellEnvironmentClient` existed which was `GPLv3` licensed and it would not have been possible to use it for non-GPL code.
- `TermuxShellEnvironment` extends from the `AndroidShellEnvironment` class and adds/overrides additional environment variables required for Termux shells to work, including setting `HOME`, `TMPDIR`, `PATH` and `LD_LIBRARY_PATH` appropriately. Termux app related variables will be added in a later commit. `TermuxShellEnvironment` replaces `TermuxShellEnvironmentClient` and is `GPLv3` licensed.
---
 .../java/com/termux/app/TermuxService.java    |   8 +-
 .../shared/shell/ShellEnvironmentClient.java  |  47 -------
 .../com/termux/shared/shell/ShellUtils.java   |  24 +++-
 .../environment/AndroidShellEnvironment.java  |  91 +++++++++++++
 .../environment/IShellEnvironment.java        |  52 ++++++++
 .../environment/ShellEnvironmentUtils.java    | 126 ++++++++++++++++++
 .../environment/UnixShellEnvironment.java     |  80 +++++++++++
 .../shell/command/runner/app/AppShell.java    |  46 ++++---
 .../com/termux/shared/termux/TermuxUtils.java |   6 +-
 .../shared/termux/file/TermuxFileUtils.java   |   4 +-
 .../shell/TermuxShellEnvironmentClient.java   |  35 -----
 .../shared/termux/shell/TermuxShellUtils.java |  82 ++----------
 .../environment/TermuxShellEnvironment.java   |  74 ++++++++++
 .../runner/terminal/TermuxSession.java        |  48 ++++---
 14 files changed, 533 insertions(+), 190 deletions(-)
 delete mode 100644 termux-shared/src/main/java/com/termux/shared/shell/ShellEnvironmentClient.java
 create mode 100644 termux-shared/src/main/java/com/termux/shared/shell/command/environment/AndroidShellEnvironment.java
 create mode 100644 termux-shared/src/main/java/com/termux/shared/shell/command/environment/IShellEnvironment.java
 create mode 100644 termux-shared/src/main/java/com/termux/shared/shell/command/environment/ShellEnvironmentUtils.java
 create mode 100644 termux-shared/src/main/java/com/termux/shared/shell/command/environment/UnixShellEnvironment.java
 delete mode 100644 termux-shared/src/main/java/com/termux/shared/termux/shell/TermuxShellEnvironmentClient.java
 create mode 100644 termux-shared/src/main/java/com/termux/shared/termux/shell/command/environment/TermuxShellEnvironment.java

diff --git a/app/src/main/java/com/termux/app/TermuxService.java b/app/src/main/java/com/termux/app/TermuxService.java
index 7f10c6c8cf..202ac40529 100644
--- a/app/src/main/java/com/termux/app/TermuxService.java
+++ b/app/src/main/java/com/termux/app/TermuxService.java
@@ -28,7 +28,7 @@
 import com.termux.shared.shell.ShellUtils;
 import com.termux.shared.shell.command.runner.app.AppShell;
 import com.termux.shared.termux.settings.properties.TermuxAppSharedProperties;
-import com.termux.shared.termux.shell.TermuxShellEnvironmentClient;
+import com.termux.shared.termux.shell.command.environment.TermuxShellEnvironment;
 import com.termux.shared.termux.shell.TermuxShellUtils;
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.termux.TermuxConstants.TERMUX_APP.TERMUX_ACTIVITY;
@@ -469,7 +469,8 @@ public synchronized AppShell createTermuxTask(ExecutionCommand executionCommand)
         if (Logger.getLogLevel() >= Logger.LOG_LEVEL_VERBOSE)
             Logger.logVerboseExtended(LOG_TAG, executionCommand.toString());
 
-        AppShell newTermuxTask = AppShell.execute(this, executionCommand, this, new TermuxShellEnvironmentClient(), false);
+        AppShell newTermuxTask = AppShell.execute(this, executionCommand, this,
+            new TermuxShellEnvironment(),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
@@ -578,7 +579,8 @@ public synchronized TermuxSession createTermuxSession(ExecutionCommand execution
         // Otherwise if command was manually started by the user like by adding a new terminal session,
         // then no need to set stdout
         executionCommand.terminalTranscriptRows = mProperties.getTerminalTranscriptRows();
-        TermuxSession newTermuxSession = TermuxSession.execute(this, executionCommand, getTermuxTerminalSessionClient(), this, new TermuxShellEnvironmentClient(), executionCommand.isPluginExecutionCommand);
+        TermuxSession newTermuxSession = TermuxSession.execute(this, executionCommand, getTermuxTerminalSessionClient(),
+            this, new TermuxShellEnvironment(), 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
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/ShellEnvironmentClient.java b/termux-shared/src/main/java/com/termux/shared/shell/ShellEnvironmentClient.java
deleted file mode 100644
index f8ed9a1024..0000000000
--- a/termux-shared/src/main/java/com/termux/shared/shell/ShellEnvironmentClient.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.termux.shared.shell;
-
-import android.content.Context;
-
-import androidx.annotation.NonNull;
-
-public interface ShellEnvironmentClient {
-
-    /**
-     * Get the default working directory path for the environment in case the path that was passed
-     * was {@code null} or empty.
-     *
-     * @return Should return the default working directory path.
-     */
-    @NonNull
-    String getDefaultWorkingDirectoryPath();
-
-    /**
-     * Get the default "/bin" path, likely $PREFIX/bin.
-     *
-     * @return Should return the "/bin" path.
-     */
-    @NonNull
-    String getDefaultBinPath();
-
-    /**
-     * Build the shell environment to be used for commands.
-     *
-     * @param currentPackageContext The {@link Context} for the current package.
-     * @param isFailSafe If running a failsafe session.
-     * @param workingDirectory The working directory for the environment.
-     * @return Should return the build environment.
-     */
-    @NonNull
-    String[] buildEnvironment(Context currentPackageContext, boolean isFailSafe, String workingDirectory);
-
-    /**
-     * Setup process arguments for the file to execute, like interpreter, etc.
-     *
-     * @param fileToExecute The file to execute.
-     * @param arguments     The arguments to pass to the executable.
-     * @return Should return the final process arguments.
-     */
-    @NonNull
-    String[] setupProcessArgs(@NonNull String fileToExecute, String[] arguments);
-
-}
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/ShellUtils.java b/termux-shared/src/main/java/com/termux/shared/shell/ShellUtils.java
index 302528b794..5c3ad57607 100644
--- a/termux-shared/src/main/java/com/termux/shared/shell/ShellUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/shell/ShellUtils.java
@@ -1,5 +1,8 @@
 package com.termux.shared.shell;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import com.termux.shared.file.FileUtils;
 import com.termux.terminal.TerminalBuffer;
 import com.termux.terminal.TerminalEmulator;
@@ -7,8 +10,13 @@
 
 import java.lang.reflect.Field;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
 public class ShellUtils {
 
+    /** Get process id of {@link Process}. */
     public static int getPid(Process p) {
         try {
             Field f = p.getClass().getDeclaredField("pid");
@@ -23,10 +31,24 @@ public static int getPid(Process p) {
         }
     }
 
-    public static String getExecutableBasename(String executable) {
+    /** Setup shell command arguments for the execute. */
+    @NonNull
+    public static String[] setupShellCommandArguments(@NonNull String executable, @Nullable String[] arguments) {
+        List<String> result = new ArrayList<>();
+        result.add(executable);
+        if (arguments != null) Collections.addAll(result, arguments);
+        return result.toArray(new String[0]);
+    }
+
+    /** Get basename for executable. */
+    @Nullable
+    public static String getExecutableBasename(@Nullable String executable) {
         return FileUtils.getFileBasename(executable);
     }
 
+
+
+    /** Get transcript for {@link TerminalSession}. */
     public static String getTerminalSessionTranscriptText(TerminalSession terminalSession, boolean linesJoined, boolean trim) {
         if (terminalSession == null) return null;
 
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/command/environment/AndroidShellEnvironment.java b/termux-shared/src/main/java/com/termux/shared/shell/command/environment/AndroidShellEnvironment.java
new file mode 100644
index 0000000000..f87c143877
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/shell/command/environment/AndroidShellEnvironment.java
@@ -0,0 +1,91 @@
+package com.termux.shared.shell.command.environment;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+
+import com.termux.shared.shell.command.ExecutionCommand;
+
+import java.io.File;
+import java.util.HashMap;
+
+/**
+ * Environment for Android.
+ *
+ * https://cs.android.com/android/platform/superproject/+/android-12.0.0_r32:frameworks/base/core/java/android/os/Environment.java
+ * https://cs.android.com/android/platform/superproject/+/android-12.0.0_r32:system/core/rootdir/init.environ.rc.in
+ * https://cs.android.com/android/platform/superproject/+/android-5.0.0_r1.0.1:system/core/rootdir/init.environ.rc.in
+ * https://cs.android.com/android/_/android/platform/system/core/+/refs/tags/android-12.0.0_r32:rootdir/init.rc;l=910
+ * https://cs.android.com/android/platform/superproject/+/android-12.0.0_r32:packages/modules/SdkExtensions/derive_classpath/derive_classpath.cpp;l=96
+ */
+public class AndroidShellEnvironment extends UnixShellEnvironment {
+
+    /** Get shell environment for Android. */
+    @NonNull
+    @Override
+    public HashMap<String, String> getEnvironment(@NonNull Context currentPackageContext, boolean isFailSafe) {
+        HashMap<String, String> environment = new HashMap<>();
+
+        environment.put(ENV_HOME, "/");
+        environment.put(ENV_LANG, "en_US.UTF-8");
+        environment.put(ENV_PATH, System.getenv(ENV_PATH));
+        environment.put(ENV_TMPDIR, "/data/local/tmp");
+
+        environment.put(ENV_COLORTERM, "truecolor");
+        environment.put(ENV_TERM, "xterm-256color");
+
+        ShellEnvironmentUtils.putToEnvIfInSystemEnv(environment, "ANDROID_ASSETS");
+        ShellEnvironmentUtils.putToEnvIfInSystemEnv(environment, "ANDROID_DATA");
+        ShellEnvironmentUtils.putToEnvIfInSystemEnv(environment, "ANDROID_ROOT");
+        ShellEnvironmentUtils.putToEnvIfInSystemEnv(environment, "ANDROID_STORAGE");
+
+        // EXTERNAL_STORAGE is needed for /system/bin/am to work on at least
+        // Samsung S7 - see https://plus.google.com/110070148244138185604/posts/gp8Lk3aCGp3.
+        // https://cs.android.com/android/_/android/platform/system/core/+/fc000489
+        ShellEnvironmentUtils.putToEnvIfInSystemEnv(environment, "EXTERNAL_STORAGE");
+        ShellEnvironmentUtils.putToEnvIfInSystemEnv(environment, "ASEC_MOUNTPOINT");
+        ShellEnvironmentUtils.putToEnvIfInSystemEnv(environment, "LOOP_MOUNTPOINT");
+
+        ShellEnvironmentUtils.putToEnvIfInSystemEnv(environment, "ANDROID_RUNTIME_ROOT");
+        ShellEnvironmentUtils.putToEnvIfInSystemEnv(environment, "ANDROID_ART_ROOT");
+        ShellEnvironmentUtils.putToEnvIfInSystemEnv(environment, "ANDROID_I18N_ROOT");
+        ShellEnvironmentUtils.putToEnvIfInSystemEnv(environment, "ANDROID_TZDATA_ROOT");
+
+        ShellEnvironmentUtils.putToEnvIfInSystemEnv(environment, "BOOTCLASSPATH");
+        ShellEnvironmentUtils.putToEnvIfInSystemEnv(environment, "DEX2OATBOOTCLASSPATH");
+        ShellEnvironmentUtils.putToEnvIfInSystemEnv(environment, "SYSTEMSERVERCLASSPATH");
+
+        return environment;
+    }
+
+
+
+    @NonNull
+    @Override
+    public String getDefaultWorkingDirectoryPath() {
+        return "/";
+    }
+
+
+    @NonNull
+    @Override
+    public String getDefaultBinPath() {
+        return "/system/bin";
+    }
+
+    @NonNull
+    @Override
+    public HashMap<String, String> setupShellCommandEnvironment(@NonNull Context currentPackageContext,
+                                                                @NonNull ExecutionCommand executionCommand) {
+        HashMap<String, String> environment = getEnvironment(currentPackageContext, executionCommand.isFailsafe);
+
+        String workingDirectory = executionCommand.workingDirectory;
+        environment.put(ENV_PWD,
+            workingDirectory != null && !workingDirectory.isEmpty() ? new File(workingDirectory).getAbsolutePath() : // PWD must be absolute path
+            getDefaultWorkingDirectoryPath());
+        ShellEnvironmentUtils.createHomeDir(environment);
+
+        return environment;
+    }
+
+}
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/command/environment/IShellEnvironment.java b/termux-shared/src/main/java/com/termux/shared/shell/command/environment/IShellEnvironment.java
new file mode 100644
index 0000000000..a8e75e9afe
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/shell/command/environment/IShellEnvironment.java
@@ -0,0 +1,52 @@
+package com.termux.shared.shell.command.environment;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.termux.shared.shell.command.ExecutionCommand;
+
+import java.util.HashMap;
+
+public interface IShellEnvironment {
+
+    /**
+     * Get the default working directory path for the environment in case the path that was passed
+     * was {@code null} or empty.
+     *
+     * @return Should return the default working directory path.
+     */
+    @NonNull
+    String getDefaultWorkingDirectoryPath();
+
+    /**
+     * Get the default "/bin" path, like $PREFIX/bin.
+     *
+     * @return Should return the "/bin" path.
+     */
+    @NonNull
+    String getDefaultBinPath();
+
+    /**
+     * Setup shell command arguments for the file to execute, like interpreter, etc.
+     *
+     * @param fileToExecute The file to execute.
+     * @param arguments The arguments to pass to the executable.
+     * @return Should return the final process arguments.
+     */
+    @NonNull
+    String[] setupShellCommandArguments(@NonNull String fileToExecute, @Nullable String[] arguments);
+
+    /**
+     * Setup shell command environment to be used for commands.
+     *
+     * @param currentPackageContext The {@link Context} for the current package.
+     * @param executionCommand The {@link ExecutionCommand} for which to set environment.
+     * @return Should return the shell environment.
+     */
+    @NonNull
+    HashMap<String, String> setupShellCommandEnvironment(@NonNull Context currentPackageContext,
+                                                         @NonNull ExecutionCommand executionCommand);
+
+}
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/command/environment/ShellEnvironmentUtils.java b/termux-shared/src/main/java/com/termux/shared/shell/command/environment/ShellEnvironmentUtils.java
new file mode 100644
index 0000000000..03ec6ab55a
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/shell/command/environment/ShellEnvironmentUtils.java
@@ -0,0 +1,126 @@
+package com.termux.shared.shell.command.environment;
+
+import static com.termux.shared.shell.command.environment.UnixShellEnvironment.*;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.termux.shared.errors.Error;
+import com.termux.shared.file.FileUtils;
+import com.termux.shared.logger.Logger;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class ShellEnvironmentUtils {
+
+    private static final String LOG_TAG = "ShellEnvironmentUtils";
+
+    /**
+     * Convert environment {@link HashMap} to `environ` {@link List <String>}.
+     *
+     * The items in the environ will have the format `name=value`.
+     *
+     * Check {@link #isValidEnvironmentVariableName(String)} and {@link #isValidEnvironmentVariableValue(String)}
+     * for valid variable names and values.
+     *
+     * https://manpages.debian.org/testing/manpages/environ.7.en.html
+     * https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap08.html
+     */
+    @NonNull
+    public static List<String> convertEnvironmentToEnviron(@NonNull HashMap<String, String> environmentMap) {
+        List<String> environmentList = new ArrayList<>(environmentMap.size());
+        String value;
+        for (String name : environmentMap.keySet()) {
+            value = environmentMap.get(name);
+            if (isValidEnvironmentVariableNameValuePair(name, value, true))
+                environmentList.add(name + "=" + environmentMap.get(name));
+        }
+        return environmentList;
+    }
+
+
+    /**
+     * Check if environment variable name and value pair is valid. Errors will be logged if
+     * {@code logErrors} is {@code true}.
+     *
+     * Check {@link #isValidEnvironmentVariableName(String)} and {@link #isValidEnvironmentVariableValue(String)}
+     * for valid variable names and values.
+     */
+    public static boolean isValidEnvironmentVariableNameValuePair(@Nullable String name, @Nullable String value, boolean logErrors) {
+        if (!isValidEnvironmentVariableName(name)) {
+            if (logErrors)
+                Logger.logErrorPrivate(LOG_TAG, "Invalid environment variable name. name=`" + name + "`, value=`" + value + "`");
+            return false;
+        }
+
+        if (!isValidEnvironmentVariableValue(value)) {
+            if (logErrors)
+                Logger.logErrorPrivate(LOG_TAG, "Invalid environment variable value. name=`" + name + "`, value=`" + value + "`");
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Check if environment variable name is valid. It must not be {@code null} and must not contain
+     * the null byte ('\0') and must only contain alphanumeric and underscore characters and must not
+     * start with a digit.
+     */
+    public static boolean isValidEnvironmentVariableName(@Nullable String name) {
+        return name != null && !name.contains("\0") && name.matches("[a-zA-Z_][a-zA-Z0-9_]*");
+    }
+
+    /**
+     * Check if environment variable value is valid. It must not be {@code null} and must not contain
+     * the null byte ('\0').
+     */
+    public static boolean isValidEnvironmentVariableValue(@Nullable String value) {
+        return value != null && !value.contains("\0");
+    }
+
+
+
+    /** Put value in environment if variable exists in {@link System) environment. */
+    public static void putToEnvIfInSystemEnv(@NonNull HashMap<String, String> environment,
+                                             @NonNull String name) {
+        String value = System.getenv(name);
+        if (value != null) {
+            environment.put(name, value);
+        }
+    }
+
+    /** Put {@link String} value in environment if value set. */
+    public static void putToEnvIfSet(@NonNull HashMap<String, String> environment, @NonNull String name,
+                                     @Nullable String value) {
+        if (value != null) {
+            environment.put(name, value);
+        }
+    }
+
+    /** Put {@link Boolean} value "true" or "false" in environment if value set. */
+    public static void putToEnvIfSet(@NonNull HashMap<String, String> environment, @NonNull String name,
+                                     @Nullable Boolean value) {
+        if (value != null) {
+            environment.put(name, String.valueOf(value));
+        }
+    }
+
+
+
+    /** Create HOME directory in environment {@link Map} if set. */
+    public static void createHomeDir(@NonNull HashMap<String, String> environment) {
+        String homeDirectory = environment.get(ENV_HOME);
+        if (homeDirectory != null && !homeDirectory.isEmpty()) {
+            Error error = FileUtils.createDirectoryFile("shell home", homeDirectory);
+            if (error != null) {
+                Logger.logErrorExtended(LOG_TAG, "Failed to create shell home directory\n" + error.toString());
+            }
+        }
+    }
+
+}
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/command/environment/UnixShellEnvironment.java b/termux-shared/src/main/java/com/termux/shared/shell/command/environment/UnixShellEnvironment.java
new file mode 100644
index 0000000000..376879faf1
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/shell/command/environment/UnixShellEnvironment.java
@@ -0,0 +1,80 @@
+package com.termux.shared.shell.command.environment;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.termux.shared.shell.ShellUtils;
+import com.termux.shared.shell.command.ExecutionCommand;
+
+import java.util.HashMap;
+
+/**
+ * Environment for Unix-like systems.
+ *
+ * https://manpages.debian.org/testing/manpages/environ.7.en.html
+ * https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap08.html
+ */
+public abstract class UnixShellEnvironment implements IShellEnvironment {
+
+    /** Environment variable for the terminal's colour capabilities. */
+    public static final String ENV_COLORTERM = "COLORTERM";
+
+    /** Environment variable for the path of the user's home directory. */
+    public static final String ENV_HOME = "HOME";
+
+    /** Environment variable for the locale category for native language, local customs, and coded
+     * character set in the absence of the LC_ALL and other LC_* environment variables. */
+    public static final String ENV_LANG = "LANG";
+
+    /** Environment variable for the represent the sequence of directory paths separated with
+     * colons ":" that should be searched in for dynamic shared libraries to link programs against. */
+    public static final String ENV_LD_LIBRARY_PATH = "LD_LIBRARY_PATH";
+
+    /** Environment variable for the represent the sequence of directory path prefixes separated with
+     * colons ":" that certain functions and utilities apply in searching for an executable file
+     * known only by a filename. */
+    public static final String ENV_PATH = "PATH";
+
+    /** Environment variable for the absolute path of the current working directory. It shall not
+     * contain any components that are dot or dot-dot. The value is set by the cd utility, and by
+     * the sh utility during initialization. */
+    public static final String ENV_PWD = "PWD";
+
+    /** Environment variable for the terminal type for which output is to be prepared. This information
+     * is used by utilities and application programs wishing to exploit special capabilities specific
+     * to a terminal. The format and allowable values of this environment variable are unspecified. */
+    public static final String ENV_TERM = "TERM";
+
+    /** Environment variable for the path of a directory made available for programs that need a place
+     * to create temporary files. */
+    public static final String ENV_TMPDIR = "TMPDIR";
+
+
+
+
+    @NonNull
+    public abstract HashMap<String, String> getEnvironment(@NonNull Context currentPackageContext,
+                                                           boolean isFailSafe);
+
+    @NonNull
+    @Override
+    public abstract String getDefaultWorkingDirectoryPath();
+
+    @NonNull
+    @Override
+    public abstract String getDefaultBinPath();
+
+    @NonNull
+    @Override
+    public String[] setupShellCommandArguments(@NonNull String executable, @Nullable String[] arguments) {
+        return ShellUtils.setupShellCommandArguments(executable, arguments);
+    }
+
+    @NonNull
+    @Override
+    public abstract HashMap<String, String> setupShellCommandEnvironment(@NonNull Context currentPackageContext,
+                                                                         @NonNull ExecutionCommand executionCommand);
+
+}
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/command/runner/app/AppShell.java b/termux-shared/src/main/java/com/termux/shared/shell/command/runner/app/AppShell.java
index ad08239273..614e68166b 100644
--- a/termux-shared/src/main/java/com/termux/shared/shell/command/runner/app/AppShell.java
+++ b/termux-shared/src/main/java/com/termux/shared/shell/command/runner/app/AppShell.java
@@ -7,14 +7,16 @@
 
 import androidx.annotation.NonNull;
 
+import com.google.common.base.Joiner;
 import com.termux.shared.R;
 import com.termux.shared.data.DataUtils;
 import com.termux.shared.shell.command.ExecutionCommand;
+import com.termux.shared.shell.command.environment.ShellEnvironmentUtils;
 import com.termux.shared.shell.command.result.ResultData;
 import com.termux.shared.errors.Errno;
 import com.termux.shared.logger.Logger;
 import com.termux.shared.shell.command.ExecutionCommand.ExecutionState;
-import com.termux.shared.shell.ShellEnvironmentClient;
+import com.termux.shared.shell.command.environment.IShellEnvironment;
 import com.termux.shared.shell.ShellUtils;
 import com.termux.shared.shell.StreamGobbler;
 
@@ -22,6 +24,9 @@
 import java.io.File;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
 
 /**
  * A class that maintains info for background app shells run with {@link Runtime#exec(String[], String[], File)}.
@@ -50,14 +55,16 @@ private AppShell(@NonNull final Process process, @NonNull final ExecutionCommand
      * The  {@link ExecutionCommand#commandLabel}, {@link ExecutionCommand#arguments} and
      * {@link ExecutionCommand#workingDirectory} may optionally be set.
      *
-     * @param context The {@link Context} for operations.
+     * @param currentPackageContext The {@link Context} for operations. This must be the context for
+     *                              the current package and not the context of a `sharedUserId` package,
+     *                              since environment setup may be dependent on current package.
      * @param executionCommand The {@link ExecutionCommand} containing the information for execution command.
      * @param appShellClient The {@link AppShellClient} interface implementation.
      *                           The {@link AppShellClient#onAppShellExited(AppShell)} will
      *                           be called regardless of {@code isSynchronous} value but not if
      *                           {@code null} is returned by this method. This can
      *                           optionally be {@code null}.
-     * @param shellEnvironmentClient The {@link ShellEnvironmentClient} interface implementation.
+     * @param shellEnvironmentClient The {@link IShellEnvironment} interface implementation.
      * @param isSynchronous If set to {@code true}, then the command will be executed in the
      *                      caller thread and results returned synchronously in the {@link ExecutionCommand}
      *                      sub object of the {@link AppShell} returned.
@@ -65,9 +72,9 @@ private AppShell(@NonNull final Process process, @NonNull final ExecutionCommand
      *                      asynchronously in the background and control is returned to the caller thread.
      * @return Returns the {@link AppShell}. This will be {@code null} if failed to start the execution command.
      */
-    public static AppShell execute(@NonNull final Context context, @NonNull ExecutionCommand executionCommand,
+    public static AppShell execute(@NonNull final Context currentPackageContext, @NonNull ExecutionCommand executionCommand,
                                    final AppShellClient appShellClient,
-                                   @NonNull final ShellEnvironmentClient shellEnvironmentClient,
+                                   @NonNull final IShellEnvironment shellEnvironmentClient,
                                    final boolean isSynchronous) {
         if (executionCommand.executable == null || executionCommand.executable.isEmpty()) {
             executionCommand.setStateFailed(Errno.ERRNO_FAILED.getCode(),
@@ -81,19 +88,27 @@ public static AppShell execute(@NonNull final Context context, @NonNull Executio
         if (executionCommand.workingDirectory.isEmpty())
             executionCommand.workingDirectory = "/";
 
-        String[] env = shellEnvironmentClient.buildEnvironment(context, executionCommand.isFailsafe, executionCommand.workingDirectory);
         // Transform executable path to shell/session name, e.g. "/bin/do-something.sh" => "do-something.sh".
         String executableBasename = ShellUtils.getExecutableBasename(executionCommand.executable);
 
         if (executionCommand.shellName == null)
             executionCommand.shellName = executableBasename;
 
-        final String[] commandArray = shellEnvironmentClient.setupProcessArgs(executionCommand.executable, executionCommand.arguments);
         if (executionCommand.commandLabel == null)
             executionCommand.commandLabel = executableBasename;
 
+        // Setup command args
+        final String[] commandArray = shellEnvironmentClient.setupShellCommandArguments(executionCommand.executable, executionCommand.arguments);
+
+        // Setup command environment
+        HashMap<String, String> environment = shellEnvironmentClient.setupShellCommandEnvironment(currentPackageContext,
+            executionCommand);
+        List<String> environmentList = ShellEnvironmentUtils.convertEnvironmentToEnviron(environment);
+        Collections.sort(environmentList);
+        String[] environmentArray = environmentList.toArray(new String[0]);
+
         if (!executionCommand.setState(ExecutionState.EXECUTING)) {
-            executionCommand.setStateFailed(Errno.ERRNO_FAILED.getCode(), context.getString(R.string.error_failed_to_execute_app_shell_command, executionCommand.getCommandIdAndLabelLogString()));
+            executionCommand.setStateFailed(Errno.ERRNO_FAILED.getCode(), currentPackageContext.getString(R.string.error_failed_to_execute_app_shell_command, executionCommand.getCommandIdAndLabelLogString()));
             AppShell.processAppShellResult(null, executionCommand);
             return null;
         }
@@ -101,22 +116,23 @@ public static AppShell execute(@NonNull final Context context, @NonNull Executio
         // No need to log stdin if logging is disabled, like for app internal scripts
         Logger.logDebugExtended(LOG_TAG, ExecutionCommand.getExecutionInputLogString(executionCommand,
             true, Logger.shouldEnableLoggingForCustomLogLevel(executionCommand.backgroundCustomLogLevel)));
+        Logger.logVerboseExtended(LOG_TAG, "\"" + executionCommand.getCommandIdAndLabelLogString() + "\" AppShell Environment:\n" +
+            Joiner.on("\n").join(environmentArray));
 
         // Exec the process
         final Process process;
         try {
-            process = Runtime.getRuntime().exec(commandArray, env, new File(executionCommand.workingDirectory));
+            process = Runtime.getRuntime().exec(commandArray, environmentArray, new File(executionCommand.workingDirectory));
         } catch (IOException e) {
-            executionCommand.setStateFailed(Errno.ERRNO_FAILED.getCode(), context.getString(R.string.error_failed_to_execute_app_shell_command, executionCommand.getCommandIdAndLabelLogString()), e);
+            executionCommand.setStateFailed(Errno.ERRNO_FAILED.getCode(), currentPackageContext.getString(R.string.error_failed_to_execute_app_shell_command, executionCommand.getCommandIdAndLabelLogString()), e);
             AppShell.processAppShellResult(null, executionCommand);
             return null;
         }
 
         final AppShell appShell = new AppShell(process, executionCommand, appShellClient);
-
         if (isSynchronous) {
             try {
-                appShell.executeInner(context);
+                appShell.executeInner(currentPackageContext);
             } catch (IllegalThreadStateException | InterruptedException e) {
                 // TODO: Should either of these be handled or returned?
             }
@@ -125,7 +141,7 @@ public static AppShell execute(@NonNull final Context context, @NonNull Executio
                 @Override
                 public void run() {
                     try {
-                        appShell.executeInner(context);
+                        appShell.executeInner(currentPackageContext);
                     } catch (IllegalThreadStateException | InterruptedException e) {
                         // TODO: Should either of these be handled or returned?
                     }
@@ -274,10 +290,10 @@ public void kill() {
      * then the {@link AppShellClient#onAppShellExited(AppShell)} callback will be called.
      *
      * @param appShell The {@link AppShell}, which should be set if
-     *                  {@link #execute(Context, ExecutionCommand, AppShellClient, ShellEnvironmentClient, boolean)}
+     *                  {@link #execute(Context, ExecutionCommand, AppShellClient, IShellEnvironment, HashMap, boolean)}
      *                   successfully started the process.
      * @param executionCommand The {@link ExecutionCommand}, which should be set if
-     *                          {@link #execute(Context, ExecutionCommand, AppShellClient, ShellEnvironmentClient, boolean)}
+     *                          {@link #execute(Context, ExecutionCommand, AppShellClient, IShellEnvironment, HashMap, boolean)}
      *                          failed to start the process.
      */
     private static void processAppShellResult(final AppShell appShell, ExecutionCommand executionCommand) {
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
index 75e4a90217..93ae246335 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
@@ -23,7 +23,7 @@
 import com.termux.shared.errors.Error;
 import com.termux.shared.android.PackageUtils;
 import com.termux.shared.termux.TermuxConstants.TERMUX_APP;
-import com.termux.shared.termux.shell.TermuxShellEnvironmentClient;
+import com.termux.shared.termux.shell.command.environment.TermuxShellEnvironment;
 
 import org.apache.commons.io.IOUtils;
 
@@ -597,7 +597,7 @@ public static String geAPTInfoMarkdownString(@NonNull final Context context) {
             null, ExecutionCommand.Runner.APP_SHELL.getName(), false);
         executionCommand.commandLabel = "APT Info Command";
         executionCommand.backgroundCustomLogLevel = Logger.LOG_LEVEL_OFF;
-        AppShell appShell = AppShell.execute(context, executionCommand, null, new TermuxShellEnvironmentClient(), true);
+        AppShell appShell = AppShell.execute(context, executionCommand, null, new TermuxShellEnvironment(), true);
         if (appShell == null || !executionCommand.isSuccessful() || executionCommand.resultData.exitCode != 0) {
             Logger.logErrorExtended(LOG_TAG, executionCommand.toString());
             return null;
@@ -656,7 +656,7 @@ public static String getLogcatDumpMarkdownString(@NonNull final Context context)
             null, logcatScript + "\n", "/", ExecutionCommand.Runner.APP_SHELL.getName(), true);
         executionCommand.commandLabel = "Logcat dump command";
         executionCommand.backgroundCustomLogLevel = Logger.LOG_LEVEL_OFF;
-        AppShell appShell = AppShell.execute(context, executionCommand, null, new TermuxShellEnvironmentClient(), true);
+        AppShell appShell = AppShell.execute(context, executionCommand, null, new TermuxShellEnvironment(), true);
         if (appShell == null || !executionCommand.isSuccessful()) {
             Logger.logErrorExtended(LOG_TAG, executionCommand.toString());
             return null;
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/file/TermuxFileUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/file/TermuxFileUtils.java
index 68c547dc25..8af32d875d 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/file/TermuxFileUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/file/TermuxFileUtils.java
@@ -11,7 +11,7 @@
 import com.termux.shared.shell.command.ExecutionCommand;
 import com.termux.shared.errors.Error;
 import com.termux.shared.file.FileUtilsErrno;
-import com.termux.shared.termux.shell.TermuxShellEnvironmentClient;
+import com.termux.shared.termux.shell.command.environment.TermuxShellEnvironment;
 import com.termux.shared.shell.command.runner.app.AppShell;
 import com.termux.shared.android.AndroidUtils;
 import com.termux.shared.termux.TermuxConstants;
@@ -364,7 +364,7 @@ public static String getTermuxFilesStatMarkdownString(@NonNull final Context con
             statScript.toString() + "\n", "/", ExecutionCommand.Runner.APP_SHELL.getName(), true);
         executionCommand.commandLabel = TermuxConstants.TERMUX_APP_NAME + " Files Stat Command";
         executionCommand.backgroundCustomLogLevel = Logger.LOG_LEVEL_OFF;
-        AppShell appShell = AppShell.execute(context, executionCommand, null, new TermuxShellEnvironmentClient(), true);
+        AppShell appShell = AppShell.execute(context, executionCommand, null, new TermuxShellEnvironment(), true);
         if (appShell == null || !executionCommand.isSuccessful()) {
             Logger.logErrorExtended(LOG_TAG, executionCommand.toString());
             return null;
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/shell/TermuxShellEnvironmentClient.java b/termux-shared/src/main/java/com/termux/shared/termux/shell/TermuxShellEnvironmentClient.java
deleted file mode 100644
index 3d94a65cf8..0000000000
--- a/termux-shared/src/main/java/com/termux/shared/termux/shell/TermuxShellEnvironmentClient.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.termux.shared.termux.shell;
-
-import android.content.Context;
-
-import androidx.annotation.NonNull;
-
-import com.termux.shared.shell.ShellEnvironmentClient;
-
-public class TermuxShellEnvironmentClient implements ShellEnvironmentClient {
-
-    @NonNull
-    @Override
-    public String getDefaultWorkingDirectoryPath() {
-        return TermuxShellUtils.getDefaultWorkingDirectoryPath();
-    }
-
-    @NonNull
-    @Override
-    public String getDefaultBinPath() {
-        return TermuxShellUtils.getDefaultBinPath();
-    }
-
-    @NonNull
-    @Override
-    public String[] buildEnvironment(Context currentPackageContext, boolean isFailSafe, String workingDirectory) {
-        return TermuxShellUtils.buildEnvironment(currentPackageContext, isFailSafe, workingDirectory);
-    }
-
-    @NonNull
-    @Override
-    public String[] setupProcessArgs(@NonNull String fileToExecute, String[] arguments) {
-        return TermuxShellUtils.setupProcessArgs(fileToExecute, arguments);
-    }
-
-}
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/shell/TermuxShellUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/shell/TermuxShellUtils.java
index 35a0be275d..3a005d8ae1 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/shell/TermuxShellUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/shell/TermuxShellUtils.java
@@ -3,10 +3,10 @@
 import android.content.Context;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.termux.shared.errors.Error;
 import com.termux.shared.file.filesystem.FileTypes;
-import com.termux.shared.termux.TermuxBootstrap;
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.file.FileUtils;
 import com.termux.shared.logger.Logger;
@@ -25,31 +25,11 @@
 
 public class TermuxShellUtils {
 
-    public static String TERMUX_VERSION_NAME;
-    public static String TERMUX_IS_DEBUGGABLE_BUILD;
-    public static String TERMUX_APP_PID;
-    public static String TERMUX_APK_RELEASE;
-    public static Boolean TERMUX_APP_AM_SOCKET_SERVER_ENABLED;
-
-    public static String TERMUX_API_VERSION_NAME;
-
-
     private static final String LOG_TAG = "TermuxShellUtils";
 
-    public static String getDefaultWorkingDirectoryPath() {
-        return TermuxConstants.TERMUX_HOME_DIR_PATH;
-    }
-
-    public static String getDefaultBinPath() {
-        return TermuxConstants.TERMUX_BIN_PREFIX_DIR_PATH;
-    }
 
     public static String[] buildEnvironment(Context currentPackageContext, boolean isFailSafe, String workingDirectory) {
         TermuxConstants.TERMUX_HOME_DIR.mkdirs();
-
-        if (workingDirectory == null || workingDirectory.isEmpty())
-            workingDirectory = getDefaultWorkingDirectoryPath();
-
         List<String> environment = new ArrayList<>();
 
         loadTermuxEnvVariables(currentPackageContext);
@@ -71,51 +51,14 @@ public static String[] buildEnvironment(Context currentPackageContext, boolean i
 
         if (TERMUX_API_VERSION_NAME != null)
             environment.add("TERMUX_API_VERSION=" + TERMUX_API_VERSION_NAME);
-
-        environment.add("TERM=xterm-256color");
-        environment.add("COLORTERM=truecolor");
-        environment.add("HOME=" + TermuxConstants.TERMUX_HOME_DIR_PATH);
-        environment.add("PREFIX=" + TermuxConstants.TERMUX_PREFIX_DIR_PATH);
-        environment.add("BOOTCLASSPATH=" + System.getenv("BOOTCLASSPATH"));
-        environment.add("ANDROID_ROOT=" + System.getenv("ANDROID_ROOT"));
-        environment.add("ANDROID_DATA=" + System.getenv("ANDROID_DATA"));
-        // EXTERNAL_STORAGE is needed for /system/bin/am to work on at least
-        // Samsung S7 - see https://plus.google.com/110070148244138185604/posts/gp8Lk3aCGp3.
-        environment.add("EXTERNAL_STORAGE=" + System.getenv("EXTERNAL_STORAGE"));
-
-        // These variables are needed if running on Android 10 and higher.
-        addToEnvIfPresent(environment, "ANDROID_ART_ROOT");
-        addToEnvIfPresent(environment, "DEX2OATBOOTCLASSPATH");
-        addToEnvIfPresent(environment, "ANDROID_I18N_ROOT");
-        addToEnvIfPresent(environment, "ANDROID_RUNTIME_ROOT");
-        addToEnvIfPresent(environment, "ANDROID_TZDATA_ROOT");
-
-        if (isFailSafe) {
-            // Keep the default path so that system binaries can be used in the failsafe session.
-            environment.add("PATH= " + System.getenv("PATH"));
-        } else {
-            environment.add("LANG=en_US.UTF-8");
-            environment.add("PWD=" + workingDirectory);
-            environment.add("TMPDIR=" + TermuxConstants.TERMUX_TMP_PREFIX_DIR_PATH);
-            if (TermuxBootstrap.isAppPackageVariantAPTAndroid5()) {
-                environment.add("PATH=" + TermuxConstants.TERMUX_BIN_PREFIX_DIR_PATH + ":" + TermuxConstants.TERMUX_BIN_PREFIX_DIR_PATH + "/applets");
-                environment.add("LD_LIBRARY_PATH=" + TermuxConstants.TERMUX_LIB_PREFIX_DIR_PATH);
-            } else {
-                environment.add("PATH=" + TermuxConstants.TERMUX_BIN_PREFIX_DIR_PATH);
-            }
-        }
-
         return environment.toArray(new String[0]);
     }
-
-    public static void addToEnvIfPresent(List<String> environment, String name) {
-        String value = System.getenv(name);
-        if (value != null) {
-            environment.add(name + "=" + value);
-        }
-    }
-
-    public static String[] setupProcessArgs(@NonNull String fileToExecute, String[] arguments) {
+    /**
+     * Setup shell command arguments for the execute. The file interpreter may be prefixed to
+     * command arguments if needed.
+     */
+    @NonNull
+    public static String[] setupShellCommandArguments(@NonNull String executable, @Nullable String[] arguments) {
         // The file to execute may either be:
         // - An elf file, in which we execute it directly.
         // - A script file without shebang, which we execute with our standard shell $PREFIX/bin/sh instead of the
@@ -123,7 +66,7 @@ public static String[] setupProcessArgs(@NonNull String fileToExecute, String[]
         // - A file with shebang, which we try to handle with e.g. /bin/foo -> $PREFIX/bin/foo.
         String interpreter = null;
         try {
-            File file = new File(fileToExecute);
+            File file = new File(executable);
             try (FileInputStream in = new FileInputStream(file)) {
                 byte[] buffer = new byte[256];
                 int bytesRead = in.read(buffer);
@@ -140,9 +83,9 @@ public static String[] setupProcessArgs(@NonNull String fileToExecute, String[]
                                     // Skip whitespace after shebang.
                                 } else {
                                     // End of shebang.
-                                    String executable = builder.toString();
-                                    if (executable.startsWith("/usr") || executable.startsWith("/bin")) {
-                                        String[] parts = executable.split("/");
+                                    String shebangExecutable = builder.toString();
+                                    if (shebangExecutable.startsWith("/usr") || shebangExecutable.startsWith("/bin")) {
+                                        String[] parts = shebangExecutable.split("/");
                                         String binary = parts[parts.length - 1];
                                         interpreter = TermuxConstants.TERMUX_BIN_PREFIX_DIR_PATH + "/" + binary;
                                     }
@@ -164,11 +107,12 @@ public static String[] setupProcessArgs(@NonNull String fileToExecute, String[]
 
         List<String> result = new ArrayList<>();
         if (interpreter != null) result.add(interpreter);
-        result.add(fileToExecute);
+        result.add(executable);
         if (arguments != null) Collections.addAll(result, arguments);
         return result.toArray(new String[0]);
     }
 
+    /** Clear files under {@link TermuxConstants#TERMUX_TMP_PREFIX_DIR_PATH}. */
     public static void clearTermuxTMPDIR(boolean onlyIfExists) {
         // Existence check before clearing may be required since clearDirectory() will automatically
         // re-create empty directory if doesn't exist, which should not be done for things like
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/shell/command/environment/TermuxShellEnvironment.java b/termux-shared/src/main/java/com/termux/shared/termux/shell/command/environment/TermuxShellEnvironment.java
new file mode 100644
index 0000000000..24d10f7bc2
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/termux/shell/command/environment/TermuxShellEnvironment.java
@@ -0,0 +1,74 @@
+package com.termux.shared.termux.shell.command.environment;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+
+import com.termux.shared.shell.command.ExecutionCommand;
+import com.termux.shared.shell.command.environment.AndroidShellEnvironment;
+import com.termux.shared.termux.TermuxBootstrap;
+import com.termux.shared.termux.TermuxConstants;
+import com.termux.shared.termux.shell.TermuxShellUtils;
+
+import java.nio.charset.Charset;
+import java.util.HashMap;
+
+/**
+ * Environment for Termux.
+ */
+public class TermuxShellEnvironment extends AndroidShellEnvironment {
+
+    private static final String LOG_TAG = "TermuxShellEnvironment";
+
+    /** Environment variable for the termux {@link TermuxConstants#TERMUX_PREFIX_DIR_PATH}. */
+    public static final String ENV_PREFIX = "PREFIX";
+
+
+    /** Get shell environment for Termux. */
+    @NonNull
+    @Override
+    public HashMap<String, String> getEnvironment(@NonNull Context currentPackageContext, boolean isFailSafe) {
+
+        // Termux environment builds upon the Android environment
+        HashMap<String, String> environment = super.getEnvironment(currentPackageContext, isFailSafe);
+
+        environment.put(ENV_HOME, TermuxConstants.TERMUX_HOME_DIR_PATH);
+        environment.put(ENV_PREFIX, TermuxConstants.TERMUX_PREFIX_DIR_PATH);
+
+        // If failsafe is not enabled, then we keep default PATH and TMPDIR so that system binaries can be used
+        if (!isFailSafe) {
+            environment.put(ENV_TMPDIR, TermuxConstants.TERMUX_TMP_PREFIX_DIR_PATH);
+            if (TermuxBootstrap.isAppPackageVariantAPTAndroid5()) {
+                // Termux in android 5/6 era shipped busybox binaries in applets directory
+                environment.put(ENV_PATH, TermuxConstants.TERMUX_BIN_PREFIX_DIR_PATH + ":" + TermuxConstants.TERMUX_BIN_PREFIX_DIR_PATH + "/applets");
+                environment.put(ENV_LD_LIBRARY_PATH, TermuxConstants.TERMUX_LIB_PREFIX_DIR_PATH);
+            } else {
+                // Termux binaries on Android 7+ rely on DT_RUNPATH, so LD_LIBRARY_PATH should be unset by default
+                environment.put(ENV_PATH, TermuxConstants.TERMUX_BIN_PREFIX_DIR_PATH);
+                environment.remove(ENV_LD_LIBRARY_PATH);
+            }
+        }
+
+        return environment;
+    }
+
+
+    @NonNull
+    @Override
+    public String getDefaultWorkingDirectoryPath() {
+        return TermuxConstants.TERMUX_HOME_DIR_PATH;
+    }
+
+    @NonNull
+    @Override
+    public String getDefaultBinPath() {
+        return TermuxConstants.TERMUX_BIN_PREFIX_DIR_PATH;
+    }
+
+    @NonNull
+    @Override
+    public String[] setupShellCommandArguments(@NonNull String executable, String[] arguments) {
+        return TermuxShellUtils.setupShellCommandArguments(executable, arguments);
+    }
+
+}
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/shell/command/runner/terminal/TermuxSession.java b/termux-shared/src/main/java/com/termux/shared/termux/shell/command/runner/terminal/TermuxSession.java
index a356449be2..d9ad1a6169 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/shell/command/runner/terminal/TermuxSession.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/shell/command/runner/terminal/TermuxSession.java
@@ -5,17 +5,23 @@
 
 import androidx.annotation.NonNull;
 
+import com.google.common.base.Joiner;
 import com.termux.shared.R;
 import com.termux.shared.shell.command.ExecutionCommand;
+import com.termux.shared.shell.command.environment.ShellEnvironmentUtils;
+import com.termux.shared.shell.command.environment.UnixShellEnvironment;
 import com.termux.shared.shell.command.result.ResultData;
 import com.termux.shared.errors.Errno;
 import com.termux.shared.logger.Logger;
-import com.termux.shared.shell.ShellEnvironmentClient;
+import com.termux.shared.shell.command.environment.IShellEnvironment;
 import com.termux.shared.shell.ShellUtils;
 import com.termux.terminal.TerminalSession;
 import com.termux.terminal.TerminalSessionClient;
 
 import java.io.File;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
 
 /**
  * A class that maintains info for foreground Termux sessions.
@@ -49,11 +55,13 @@ private TermuxSession(@NonNull final TerminalSession terminalSession, @NonNull f
      * If {@link ExecutionCommand#executable} is {@code null}, then a default shell is automatically
      * chosen.
      *
-     * @param context The {@link Context} for operations.
+     * @param currentPackageContext The {@link Context} for operations. This must be the context for
+     *                              the current package and not the context of a `sharedUserId` package,
+     *                              since environment setup may be dependent on current package.
      * @param executionCommand The {@link ExecutionCommand} containing the information for execution command.
      * @param terminalSessionClient The {@link TerminalSessionClient} interface implementation.
      * @param termuxSessionClient The {@link TermuxSessionClient} interface implementation.
-     * @param shellEnvironmentClient The {@link ShellEnvironmentClient} interface implementation.
+     * @param shellEnvironmentClient The {@link IShellEnvironment} interface implementation.
      * @param setStdoutOnExit If set to {@code true}, then the {@link ResultData#stdout}
      *                        available in the {@link TermuxSessionClient#onTermuxSessionExited(TermuxSession)}
      *                        callback will be set to the {@link TerminalSession} transcript. The session
@@ -63,9 +71,9 @@ private TermuxSession(@NonNull final TerminalSession terminalSession, @NonNull f
      *                        since this requires extra processing to get it.
      * @return Returns the {@link TermuxSession}. This will be {@code null} if failed to start the execution command.
      */
-    public static TermuxSession execute(@NonNull final Context context, @NonNull ExecutionCommand executionCommand,
+    public static TermuxSession execute(@NonNull final Context currentPackageContext, @NonNull ExecutionCommand executionCommand,
                                         @NonNull final TerminalSessionClient terminalSessionClient, final TermuxSessionClient termuxSessionClient,
-                                        @NonNull final ShellEnvironmentClient shellEnvironmentClient,
+                                        @NonNull final IShellEnvironment shellEnvironmentClient,
                                         final boolean setStdoutOnExit) {
         if (executionCommand.executable != null && executionCommand.executable.isEmpty())
             executionCommand.executable = null;
@@ -74,8 +82,6 @@ public static TermuxSession execute(@NonNull final Context context, @NonNull Exe
         if (executionCommand.workingDirectory.isEmpty())
             executionCommand.workingDirectory = "/";
 
-        String[] environment = shellEnvironmentClient.buildEnvironment(context, executionCommand.isFailsafe, executionCommand.workingDirectory);
-
         String defaultBinPath = shellEnvironmentClient.getDefaultBinPath();
         if (defaultBinPath.isEmpty())
             defaultBinPath = "/system/bin";
@@ -108,30 +114,42 @@ public static TermuxSession execute(@NonNull final Context context, @NonNull Exe
 
         }
 
-        String[] processArgs = shellEnvironmentClient.setupProcessArgs(executionCommand.executable, executionCommand.arguments);
+        // Setup command args
+        String[] commandArgs = shellEnvironmentClient.setupShellCommandArguments(executionCommand.executable, executionCommand.arguments);
 
-        executionCommand.executable = processArgs[0];
+        executionCommand.executable = commandArgs[0];
         String processName = (isLoginShell ? "-" : "") + ShellUtils.getExecutableBasename(executionCommand.executable);
 
-        String[] arguments = new String[processArgs.length];
+        String[] arguments = new String[commandArgs.length];
         arguments[0] = processName;
-        if (processArgs.length > 1) System.arraycopy(processArgs, 1, arguments, 1, processArgs.length - 1);
+        if (commandArgs.length > 1) System.arraycopy(commandArgs, 1, arguments, 1, commandArgs.length - 1);
 
         executionCommand.arguments = arguments;
 
         if (executionCommand.commandLabel == null)
             executionCommand.commandLabel = processName;
 
+        // Setup command environment
+        HashMap<String, String> environment = shellEnvironmentClient.setupShellCommandEnvironment(currentPackageContext,
+            executionCommand);
+        List<String> environmentList = ShellEnvironmentUtils.convertEnvironmentToEnviron(environment);
+        Collections.sort(environmentList);
+        String[] environmentArray = environmentList.toArray(new String[0]);
+
         if (!executionCommand.setState(ExecutionCommand.ExecutionState.EXECUTING)) {
-            executionCommand.setStateFailed(Errno.ERRNO_FAILED.getCode(), context.getString(R.string.error_failed_to_execute_termux_session_command, executionCommand.getCommandIdAndLabelLogString()));
+            executionCommand.setStateFailed(Errno.ERRNO_FAILED.getCode(), currentPackageContext.getString(R.string.error_failed_to_execute_termux_session_command, executionCommand.getCommandIdAndLabelLogString()));
             TermuxSession.processTermuxSessionResult(null, executionCommand);
             return null;
         }
 
         Logger.logDebugExtended(LOG_TAG, executionCommand.toString());
+        Logger.logVerboseExtended(LOG_TAG, "\"" + executionCommand.getCommandIdAndLabelLogString() + "\" TermuxSession Environment:\n" +
+            Joiner.on("\n").join(environmentArray));
 
         Logger.logDebug(LOG_TAG, "Running \"" + executionCommand.getCommandIdAndLabelLogString() + "\" TermuxSession");
-        TerminalSession terminalSession = new TerminalSession(executionCommand.executable, executionCommand.workingDirectory, executionCommand.arguments, environment, executionCommand.terminalTranscriptRows, terminalSessionClient);
+        TerminalSession terminalSession = new TerminalSession(executionCommand.executable,
+            executionCommand.workingDirectory, executionCommand.arguments, environmentArray,
+            executionCommand.terminalTranscriptRows, terminalSessionClient);
 
         if (executionCommand.shellName != null) {
             terminalSession.mSessionName = executionCommand.shellName;
@@ -219,10 +237,10 @@ public void killIfExecuting(@NonNull final Context context, boolean processResul
      * callback will be called.
      *
      * @param termuxSession The {@link TermuxSession}, which should be set if
-     *                  {@link #execute(Context, ExecutionCommand, TerminalSessionClient, TermuxSessionClient, ShellEnvironmentClient, boolean)}
+     *                  {@link #execute(Context, ExecutionCommand, TerminalSessionClient, TermuxSessionClient, IShellEnvironment, HashMap, boolean)}
      *                   successfully started the process.
      * @param executionCommand The {@link ExecutionCommand}, which should be set if
-     *                          {@link #execute(Context, ExecutionCommand, TerminalSessionClient, TermuxSessionClient, ShellEnvironmentClient, boolean)}
+     *                          {@link #execute(Context, ExecutionCommand, TerminalSessionClient, TermuxSessionClient, IShellEnvironment, HashMap, boolean)}
      *                          failed to start the process.
      */
     private static void processTermuxSessionResult(final TermuxSession termuxSession, ExecutionCommand executionCommand) {

From 13d93ccac70bd5ea7017f606ff05bd0b45ac5fa8 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 11 Jun 2022 19:18:40 +0500
Subject: [PATCH 776/912] Added: Add `TermuxShellManager` to manage all termux
 app wide shells

---
 .../com/termux/app/TermuxApplication.java     |   4 +
 .../java/com/termux/app/TermuxService.java    | 125 +++++++++---------
 .../termux/shell/TermuxShellManager.java      |  76 +++++++++++
 3 files changed, 140 insertions(+), 65 deletions(-)
 create mode 100644 termux-shared/src/main/java/com/termux/shared/termux/shell/TermuxShellManager.java

diff --git a/app/src/main/java/com/termux/app/TermuxApplication.java b/app/src/main/java/com/termux/app/TermuxApplication.java
index 1d7925f78a..2af2a8db41 100644
--- a/app/src/main/java/com/termux/app/TermuxApplication.java
+++ b/app/src/main/java/com/termux/app/TermuxApplication.java
@@ -13,6 +13,7 @@
 import com.termux.shared.termux.settings.preferences.TermuxAppSharedPreferences;
 import com.termux.shared.termux.settings.properties.TermuxAppSharedProperties;
 import com.termux.shared.termux.shell.am.TermuxAmSocketServer;
+import com.termux.shared.termux.shell.TermuxShellManager;
 import com.termux.shared.termux.theme.TermuxThemeUtils;
 
 public class TermuxApplication extends Application {
@@ -38,6 +39,9 @@ public void onCreate() {
         // Init app wide SharedProperties loaded from termux.properties
         TermuxAppSharedProperties properties = TermuxAppSharedProperties.init(context);
 
+        // Init app wide shell manager
+        TermuxShellManager shellManager = TermuxShellManager.init(context);
+
         // Set NightMode.APP_NIGHT_MODE
         TermuxThemeUtils.setAppNightMode(properties.getNightMode());
 
diff --git a/app/src/main/java/com/termux/app/TermuxService.java b/app/src/main/java/com/termux/app/TermuxService.java
index 202ac40529..d334a4d6e7 100644
--- a/app/src/main/java/com/termux/app/TermuxService.java
+++ b/app/src/main/java/com/termux/app/TermuxService.java
@@ -14,7 +14,6 @@
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.PowerManager;
-import android.widget.ArrayAdapter;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -34,6 +33,7 @@
 import com.termux.shared.termux.TermuxConstants.TERMUX_APP.TERMUX_ACTIVITY;
 import com.termux.shared.termux.TermuxConstants.TERMUX_APP.TERMUX_SERVICE;
 import com.termux.shared.termux.settings.preferences.TermuxAppSharedPreferences;
+import com.termux.shared.termux.shell.TermuxShellManager;
 import com.termux.shared.termux.shell.command.runner.terminal.TermuxSession;
 import com.termux.shared.termux.terminal.TermuxTerminalSessionClientBase;
 import com.termux.shared.logger.Logger;
@@ -51,8 +51,8 @@
 import java.util.List;
 
 /**
- * A service holding a list of {@link TermuxSession} in {@link #mTermuxSessions} and background {@link AppShell}
- * in {@link #mTermuxTasks}, showing a foreground notification while running so that it is not terminated.
+ * A service holding a list of {@link TermuxSession} in {@link TermuxShellManager#mTermuxSessions} and background {@link AppShell}
+ * in {@link TermuxShellManager#mTermuxTasks}, showing a foreground notification while running so that it is not terminated.
  * The user interacts with the session through {@link TermuxActivity}, but this service may outlive
  * the activity when the user or the system disposes of the activity. In that case the user may
  * restart {@link TermuxActivity} later to yet again access the sessions.
@@ -65,8 +65,6 @@
  */
 public final class TermuxService extends Service implements AppShell.AppShellClient, TermuxSession.TermuxSessionClient {
 
-    private static int EXECUTION_ID = 1000;
-
     /** This service is only bound from inside the same process and never uses IPC. */
     class LocalBinder extends Binder {
         public final TermuxService service = TermuxService.this;
@@ -76,23 +74,6 @@ class LocalBinder extends Binder {
 
     private final Handler mHandler = new Handler();
 
-    /**
-     * The foreground TermuxSessions which this service manages.
-     * Note that this list is observed by {@link TermuxActivity#mTermuxSessionListViewController},
-     * so any changes must be made on the UI thread and followed by a call to
-     * {@link ArrayAdapter#notifyDataSetChanged()} }.
-     */
-    final List<TermuxSession> mTermuxSessions = new ArrayList<>();
-
-    /**
-     * The background TermuxTasks which this service manages.
-     */
-    final List<AppShell> mTermuxTasks = new ArrayList<>();
-
-    /**
-     * The pending plugin ExecutionCommands that have yet to be processed by this service.
-     */
-    final List<ExecutionCommand> mPendingPluginExecutionCommands = new ArrayList<>();
 
     /** The full implementation of the {@link TerminalSessionClient} interface to be used by {@link TerminalSession}
      * that holds activity references for activity related functions.
@@ -110,6 +91,11 @@ class LocalBinder extends Binder {
      */
     private TermuxAppSharedProperties mProperties;
 
+    /**
+     * Termux app shell manager
+     */
+    private TermuxShellManager mShellManager;
+
     /** The wake lock and wifi lock are always acquired and released together. */
     private PowerManager.WakeLock mWakeLock;
     private WifiManager.WifiLock mWifiLock;
@@ -127,6 +113,8 @@ public void onCreate() {
         // load and TermuxActivity handles reloads
         mProperties = TermuxAppSharedProperties.getProperties();
 
+        mShellManager = TermuxShellManager.getShellManager();
+
         runStartForeground();
     }
 
@@ -266,23 +254,31 @@ private void actionStopService() {
     private synchronized void killAllTermuxExecutionCommands() {
         boolean processResult;
 
-        Logger.logDebug(LOG_TAG, "Killing TermuxSessions=" + mTermuxSessions.size() + ", TermuxTasks=" + mTermuxTasks.size() + ", PendingPluginExecutionCommands=" + mPendingPluginExecutionCommands.size());
+        Logger.logDebug(LOG_TAG, "Killing TermuxSessions=" + mShellManager.mTermuxSessions.size() +
+            ", TermuxTasks=" + mShellManager.mTermuxTasks.size() +
+            ", PendingPluginExecutionCommands=" + mShellManager.mPendingPluginExecutionCommands.size());
+
+        List<TermuxSession> termuxSessions = new ArrayList<>(mShellManager.mTermuxSessions);
+        List<AppShell> termuxTasks = new ArrayList<>(mShellManager.mTermuxTasks);
+        List<ExecutionCommand> pendingPluginExecutionCommands = new ArrayList<>(mShellManager.mPendingPluginExecutionCommands);
 
-        List<TermuxSession> termuxSessions = new ArrayList<>(mTermuxSessions);
         for (int i = 0; i < termuxSessions.size(); i++) {
             ExecutionCommand executionCommand = termuxSessions.get(i).getExecutionCommand();
             processResult = mWantsToStop || executionCommand.isPluginExecutionCommandWithPendingResult();
             termuxSessions.get(i).killIfExecuting(this, processResult);
+            if (!processResult)
+                mShellManager.mTermuxSessions.remove(termuxSessions.get(i));
         }
 
-        List<AppShell> termuxTasks = new ArrayList<>(mTermuxTasks);
+
         for (int i = 0; i < termuxTasks.size(); i++) {
             ExecutionCommand executionCommand = termuxTasks.get(i).getExecutionCommand();
             if (executionCommand.isPluginExecutionCommandWithPendingResult())
                 termuxTasks.get(i).killIfExecuting(this, true);
+            else
+                mShellManager.mTermuxTasks.remove(termuxTasks.get(i));
         }
 
-        List<ExecutionCommand> pendingPluginExecutionCommands = new ArrayList<>(mPendingPluginExecutionCommands);
         for (int i = 0; i < pendingPluginExecutionCommands.size(); i++) {
             ExecutionCommand executionCommand = pendingPluginExecutionCommands.get(i);
             if (!executionCommand.shouldNotProcessResults() && executionCommand.isPluginExecutionCommandWithPendingResult()) {
@@ -357,7 +353,7 @@ private void actionServiceExecute(Intent intent) {
             return;
         }
 
-        ExecutionCommand executionCommand = new ExecutionCommand(getNextExecutionId());
+        ExecutionCommand executionCommand = new ExecutionCommand(TermuxShellManager.getNextShellId());
 
         executionCommand.executableUri = intent.getData();
         executionCommand.isPluginExecutionCommand = true;
@@ -406,7 +402,7 @@ private void actionServiceExecute(Intent intent) {
             executionCommand.shellCreateMode = ShellCreateMode.ALWAYS.getMode();
 
         // Add the execution command to pending plugin execution commands list
-        mPendingPluginExecutionCommands.add(executionCommand);
+        mShellManager.mPendingPluginExecutionCommands.add(executionCommand);
 
         if (Runner.APP_SHELL.equalsRunner(executionCommand.runner))
             executeTermuxTaskCommand(executionCommand);
@@ -451,7 +447,8 @@ private void executeTermuxTaskCommand(ExecutionCommand executionCommand) {
     /** Create a TermuxTask. */
     @Nullable
     public AppShell createTermuxTask(String executablePath, String[] arguments, String stdin, String workingDirectory) {
-        return createTermuxTask(new ExecutionCommand(getNextExecutionId(), executablePath, arguments, stdin, workingDirectory, Runner.APP_SHELL.getName(), false));
+        return createTermuxTask(new ExecutionCommand(TermuxShellManager.getNextShellId(), executablePath,
+            arguments, stdin, workingDirectory, Runner.APP_SHELL.getName(), false));
     }
 
     /** Create a TermuxTask. */
@@ -483,12 +480,12 @@ public synchronized AppShell createTermuxTask(ExecutionCommand executionCommand)
             return null;
         }
 
-        mTermuxTasks.add(newTermuxTask);
+        mShellManager.mTermuxTasks.add(newTermuxTask);
 
         // Remove the execution command from the pending plugin execution commands list since it has
         // now been processed
         if (executionCommand.isPluginExecutionCommand)
-            mPendingPluginExecutionCommands.remove(executionCommand);
+            mShellManager.mPendingPluginExecutionCommands.remove(executionCommand);
 
         updateNotification();
 
@@ -508,7 +505,7 @@ public void onAppShellExited(final AppShell termuxTask) {
                 if (executionCommand != null && executionCommand.isPluginExecutionCommand)
                     TermuxPluginUtils.processPluginExecutionCommandResult(this, LOG_TAG, executionCommand);
 
-                mTermuxTasks.remove(termuxTask);
+                mShellManager.mTermuxTasks.remove(termuxTask);
             }
 
             updateNotification();
@@ -554,8 +551,10 @@ private void executeTermuxSessionCommand(ExecutionCommand executionCommand) {
      * Currently called by {@link TermuxTerminalSessionClient#addNewSession(boolean, String)} to add a new {@link TermuxSession}.
      */
     @Nullable
-    public TermuxSession createTermuxSession(String executablePath, String[] arguments, String stdin, String workingDirectory, boolean isFailSafe, String sessionName) {
-        ExecutionCommand executionCommand = new ExecutionCommand(getNextExecutionId(), executablePath, arguments, stdin, workingDirectory, Runner.TERMINAL_SESSION.getName(), isFailSafe);
+    public TermuxSession createTermuxSession(String executablePath, String[] arguments, String stdin,
+                                             String workingDirectory, boolean isFailSafe, String sessionName) {
+        ExecutionCommand executionCommand = new ExecutionCommand(TermuxShellManager.getNextShellId(),
+            executablePath, arguments, stdin, workingDirectory, Runner.TERMINAL_SESSION.getName(), isFailSafe);
         executionCommand.shellName = sessionName;
         return createTermuxSession(executionCommand);
     }
@@ -593,12 +592,12 @@ public synchronized TermuxSession createTermuxSession(ExecutionCommand execution
             return null;
         }
 
-        mTermuxSessions.add(newTermuxSession);
+        mShellManager.mTermuxSessions.add(newTermuxSession);
 
         // Remove the execution command from the pending plugin execution commands list since it has
         // now been processed
         if (executionCommand.isPluginExecutionCommand)
-            mPendingPluginExecutionCommands.remove(executionCommand);
+            mShellManager.mPendingPluginExecutionCommands.remove(executionCommand);
 
         // Notify {@link TermuxSessionsListViewController} that sessions list has been updated if
         // activity in is foreground
@@ -618,7 +617,7 @@ public synchronized int removeTermuxSession(TerminalSession sessionToRemove) {
         int index = getIndexOfSession(sessionToRemove);
 
         if (index >= 0)
-            mTermuxSessions.get(index).finish();
+            mShellManager.mTermuxSessions.get(index).finish();
 
         return index;
     }
@@ -635,7 +634,7 @@ public void onTermuxSessionExited(final TermuxSession termuxSession) {
             if (executionCommand != null && executionCommand.isPluginExecutionCommand)
                 TermuxPluginUtils.processPluginExecutionCommandResult(this, LOG_TAG, executionCommand);
 
-            mTermuxSessions.remove(termuxSession);
+            mShellManager.mTermuxSessions.remove(termuxSession);
 
             // Notify {@link TermuxSessionsListViewController} that sessions list has been updated if
             // activity in is foreground
@@ -748,8 +747,8 @@ public synchronized TermuxTerminalSessionClientBase getTermuxTerminalSessionClie
     public synchronized void setTermuxTerminalSessionClient(TermuxTerminalSessionClient termuxTerminalSessionClient) {
         mTermuxTerminalSessionClient = termuxTerminalSessionClient;
 
-        for (int i = 0; i < mTermuxSessions.size(); i++)
-            mTermuxSessions.get(i).getTerminalSession().updateTerminalSessionClient(mTermuxTerminalSessionClient);
+        for (int i = 0; i < mShellManager.mTermuxSessions.size(); i++)
+            mShellManager.mTermuxSessions.get(i).getTerminalSession().updateTerminalSessionClient(mTermuxTerminalSessionClient);
     }
 
     /** This should be called when {@link TermuxActivity} has been destroyed and in {@link #onUnbind(Intent)}
@@ -757,8 +756,8 @@ public synchronized void setTermuxTerminalSessionClient(TermuxTerminalSessionCli
      * clients do not hold an activity references.
      */
     public synchronized void unsetTermuxTerminalSessionClient() {
-        for (int i = 0; i < mTermuxSessions.size(); i++)
-            mTermuxSessions.get(i).getTerminalSession().updateTerminalSessionClient(mTermuxTerminalSessionClientBase);
+        for (int i = 0; i < mShellManager.mTermuxSessions.size(); i++)
+            mShellManager.mTermuxSessions.get(i).getTerminalSession().updateTerminalSessionClient(mTermuxTerminalSessionClientBase);
 
         mTermuxTerminalSessionClient = null;
     }
@@ -777,7 +776,7 @@ private Notification buildNotification() {
 
         // Set notification text
         int sessionCount = getTermuxSessionsSize();
-        int taskCount = mTermuxTasks.size();
+        int taskCount = mShellManager.mTermuxTasks.size();
         String notificationText = sessionCount + " session" + (sessionCount == 1 ? "" : "s");
         if (taskCount > 0) {
             notificationText += ", " + taskCount + " task" + (taskCount == 1 ? "" : "s");
@@ -838,7 +837,7 @@ private void setupNotificationChannel() {
 
     /** Update the shown foreground service notification after making any changes that affect it. */
     private synchronized void updateNotification() {
-        if (mWakeLock == null && mTermuxSessions.isEmpty() && mTermuxTasks.isEmpty()) {
+        if (mWakeLock == null && mShellManager.mTermuxSessions.isEmpty() && mShellManager.mTermuxTasks.isEmpty()) {
             // Exit if we are updating after the user disabled all locks with no sessions or tasks running.
             requestStopService();
         } else {
@@ -859,21 +858,21 @@ private void setCurrentStoredTerminalSession(TerminalSession terminalSession) {
     }
 
     public synchronized boolean isTermuxSessionsEmpty() {
-        return mTermuxSessions.isEmpty();
+        return mShellManager.mTermuxSessions.isEmpty();
     }
 
     public synchronized int getTermuxSessionsSize() {
-        return mTermuxSessions.size();
+        return mShellManager.mTermuxSessions.size();
     }
 
     public synchronized List<TermuxSession> getTermuxSessions() {
-        return mTermuxSessions;
+        return mShellManager.mTermuxSessions;
     }
 
     @Nullable
     public synchronized TermuxSession getTermuxSession(int index) {
-        if (index >= 0 && index < mTermuxSessions.size())
-            return mTermuxSessions.get(index);
+        if (index >= 0 && index < mShellManager.mTermuxSessions.size())
+            return mShellManager.mTermuxSessions.get(index);
         else
             return null;
     }
@@ -882,23 +881,23 @@ public synchronized TermuxSession getTermuxSession(int index) {
     public synchronized TermuxSession getTermuxSessionForTerminalSession(TerminalSession terminalSession) {
         if (terminalSession == null) return null;
 
-        for (int i = 0; i < mTermuxSessions.size(); i++) {
-            if (mTermuxSessions.get(i).getTerminalSession().equals(terminalSession))
-                return mTermuxSessions.get(i);
+        for (int i = 0; i < mShellManager.mTermuxSessions.size(); i++) {
+            if (mShellManager.mTermuxSessions.get(i).getTerminalSession().equals(terminalSession))
+                return mShellManager.mTermuxSessions.get(i);
         }
 
         return null;
     }
 
     public synchronized TermuxSession getLastTermuxSession() {
-        return mTermuxSessions.isEmpty() ? null : mTermuxSessions.get(mTermuxSessions.size() - 1);
+        return mShellManager.mTermuxSessions.isEmpty() ? null : mShellManager.mTermuxSessions.get(mShellManager.mTermuxSessions.size() - 1);
     }
 
     public synchronized int getIndexOfSession(TerminalSession terminalSession) {
         if (terminalSession == null) return -1;
 
-        for (int i = 0; i < mTermuxSessions.size(); i++) {
-            if (mTermuxSessions.get(i).getTerminalSession().equals(terminalSession))
+        for (int i = 0; i < mShellManager.mTermuxSessions.size(); i++) {
+            if (mShellManager.mTermuxSessions.get(i).getTerminalSession().equals(terminalSession))
                 return i;
         }
         return -1;
@@ -906,8 +905,8 @@ public synchronized int getIndexOfSession(TerminalSession terminalSession) {
 
     public synchronized TerminalSession getTerminalSessionForHandle(String sessionHandle) {
         TerminalSession terminalSession;
-        for (int i = 0, len = mTermuxSessions.size(); i < len; i++) {
-            terminalSession = mTermuxSessions.get(i).getTerminalSession();
+        for (int i = 0, len = mShellManager.mTermuxSessions.size(); i < len; i++) {
+            terminalSession = mShellManager.mTermuxSessions.get(i).getTerminalSession();
             if (terminalSession.mHandle.equals(sessionHandle))
                 return terminalSession;
         }
@@ -917,8 +916,8 @@ public synchronized TerminalSession getTerminalSessionForHandle(String sessionHa
     public synchronized AppShell getTermuxTaskForShellName(String name) {
         if (DataUtils.isNullOrEmpty(name)) return null;
         AppShell appShell;
-        for (int i = 0, len = mTermuxTasks.size(); i < len; i++) {
-            appShell = mTermuxTasks.get(i);
+        for (int i = 0, len = mShellManager.mTermuxTasks.size(); i < len; i++) {
+            appShell = mShellManager.mTermuxTasks.get(i);
             String shellName = appShell.getExecutionCommand().shellName;
             if (shellName != null && shellName.equals(name))
                 return appShell;
@@ -929,8 +928,8 @@ public synchronized AppShell getTermuxTaskForShellName(String name) {
     public synchronized TermuxSession getTermuxSessionForShellName(String name) {
         if (DataUtils.isNullOrEmpty(name)) return null;
         TermuxSession termuxSession;
-        for (int i = 0, len = mTermuxSessions.size(); i < len; i++) {
-            termuxSession = mTermuxSessions.get(i);
+        for (int i = 0, len = mShellManager.mTermuxSessions.size(); i < len; i++) {
+            termuxSession = mShellManager.mTermuxSessions.get(i);
             String shellName = termuxSession.getExecutionCommand().shellName;
             if (shellName != null && shellName.equals(name))
                 return termuxSession;
@@ -940,10 +939,6 @@ public synchronized TermuxSession getTermuxSessionForShellName(String name) {
 
 
 
-    public static synchronized int getNextExecutionId() {
-        return EXECUTION_ID++;
-    }
-
     public boolean wantsToStop() {
         return mWantsToStop;
     }
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/shell/TermuxShellManager.java b/termux-shared/src/main/java/com/termux/shared/termux/shell/TermuxShellManager.java
new file mode 100644
index 0000000000..1cc52e6532
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/termux/shell/TermuxShellManager.java
@@ -0,0 +1,76 @@
+package com.termux.shared.termux.shell;
+
+import android.content.Context;
+import android.content.Intent;
+import android.widget.ArrayAdapter;
+
+import androidx.annotation.NonNull;
+
+import com.termux.shared.shell.command.ExecutionCommand;
+import com.termux.shared.shell.command.runner.app.AppShell;
+import com.termux.shared.termux.settings.preferences.TermuxAppSharedPreferences;
+import com.termux.shared.termux.shell.command.runner.terminal.TermuxSession;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class TermuxShellManager {
+
+    private static TermuxShellManager shellManager;
+
+    private static int SHELL_ID = 0;
+
+    protected final Context mContext;
+
+    /**
+     * The foreground TermuxSessions which this service manages.
+     * Note that this list is observed by an activity, like TermuxActivity.mTermuxSessionListViewController,
+     * so any changes must be made on the UI thread and followed by a call to
+     * {@link ArrayAdapter#notifyDataSetChanged()}.
+     */
+    public final List<TermuxSession> mTermuxSessions = new ArrayList<>();
+
+    /**
+     * The background TermuxTasks which this service manages.
+     */
+    public final List<AppShell> mTermuxTasks = new ArrayList<>();
+
+    /**
+     * The pending plugin ExecutionCommands that have yet to be processed by this service.
+     */
+    public final List<ExecutionCommand> mPendingPluginExecutionCommands = new ArrayList<>();
+
+
+
+    public TermuxShellManager(@NonNull Context context) {
+        mContext = context.getApplicationContext();
+    }
+
+    /**
+     * Initialize the {@link #shellManager}.
+     *
+     * @param context The {@link Context} for operations.
+     * @return Returns the {@link TermuxShellManager}.
+     */
+    public static TermuxShellManager init(@NonNull Context context) {
+        if (shellManager == null)
+            shellManager = new TermuxShellManager(context);
+
+        return shellManager;
+    }
+
+    /**
+     * Get the {@link #shellManager}.
+     *
+     * @return Returns the {@link TermuxShellManager}.
+     */
+    public static TermuxShellManager getShellManager() {
+        return shellManager;
+    }
+
+
+    public static synchronized int getNextShellId() {
+        return SHELL_ID++;
+    }
+
+}

From 2998558e9ffbac2af2527967a6481100fd911952 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 11 Jun 2022 19:23:53 +0500
Subject: [PATCH 777/912] Added: Add support in `AppShell` and `TermuxSession`
 for caller to add/override additional environment variables not added by
 `IShellEnvironment.setupShellCommandEnvironment()`

---
 app/src/main/java/com/termux/app/TermuxService.java         | 4 ++--
 .../termux/shared/shell/command/runner/app/AppShell.java    | 6 ++++++
 .../src/main/java/com/termux/shared/termux/TermuxUtils.java | 4 ++--
 .../java/com/termux/shared/termux/file/TermuxFileUtils.java | 2 +-
 .../termux/shell/command/runner/terminal/TermuxSession.java | 6 ++++++
 5 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxService.java b/app/src/main/java/com/termux/app/TermuxService.java
index d334a4d6e7..902aa1b1e9 100644
--- a/app/src/main/java/com/termux/app/TermuxService.java
+++ b/app/src/main/java/com/termux/app/TermuxService.java
@@ -467,7 +467,7 @@ public synchronized AppShell createTermuxTask(ExecutionCommand executionCommand)
             Logger.logVerboseExtended(LOG_TAG, executionCommand.toString());
 
         AppShell newTermuxTask = AppShell.execute(this, executionCommand, this,
-            new TermuxShellEnvironment(),false);
+            new TermuxShellEnvironment(), null,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
@@ -579,7 +579,7 @@ public synchronized TermuxSession createTermuxSession(ExecutionCommand execution
         // then no need to set stdout
         executionCommand.terminalTranscriptRows = mProperties.getTerminalTranscriptRows();
         TermuxSession newTermuxSession = TermuxSession.execute(this, executionCommand, getTermuxTerminalSessionClient(),
-            this, new TermuxShellEnvironment(), executionCommand.isPluginExecutionCommand);
+            this, new TermuxShellEnvironment(), null, 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
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/command/runner/app/AppShell.java b/termux-shared/src/main/java/com/termux/shared/shell/command/runner/app/AppShell.java
index 614e68166b..3f49e5aebb 100644
--- a/termux-shared/src/main/java/com/termux/shared/shell/command/runner/app/AppShell.java
+++ b/termux-shared/src/main/java/com/termux/shared/shell/command/runner/app/AppShell.java
@@ -6,6 +6,7 @@
 import android.system.OsConstants;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.google.common.base.Joiner;
 import com.termux.shared.R;
@@ -65,6 +66,8 @@ private AppShell(@NonNull final Process process, @NonNull final ExecutionCommand
      *                           {@code null} is returned by this method. This can
      *                           optionally be {@code null}.
      * @param shellEnvironmentClient The {@link IShellEnvironment} interface implementation.
+     * @param additionalEnvironment The additional shell environment variables to export. Existing
+     *                              variables will be overridden.
      * @param isSynchronous If set to {@code true}, then the command will be executed in the
      *                      caller thread and results returned synchronously in the {@link ExecutionCommand}
      *                      sub object of the {@link AppShell} returned.
@@ -75,6 +78,7 @@ private AppShell(@NonNull final Process process, @NonNull final ExecutionCommand
     public static AppShell execute(@NonNull final Context currentPackageContext, @NonNull ExecutionCommand executionCommand,
                                    final AppShellClient appShellClient,
                                    @NonNull final IShellEnvironment shellEnvironmentClient,
+                                   @Nullable HashMap<String, String> additionalEnvironment,
                                    final boolean isSynchronous) {
         if (executionCommand.executable == null || executionCommand.executable.isEmpty()) {
             executionCommand.setStateFailed(Errno.ERRNO_FAILED.getCode(),
@@ -103,6 +107,8 @@ public static AppShell execute(@NonNull final Context currentPackageContext, @No
         // Setup command environment
         HashMap<String, String> environment = shellEnvironmentClient.setupShellCommandEnvironment(currentPackageContext,
             executionCommand);
+        if (additionalEnvironment != null)
+            environment.putAll(additionalEnvironment);
         List<String> environmentList = ShellEnvironmentUtils.convertEnvironmentToEnviron(environment);
         Collections.sort(environmentList);
         String[] environmentArray = environmentList.toArray(new String[0]);
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
index 93ae246335..0d66a3f51d 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
@@ -597,7 +597,7 @@ public static String geAPTInfoMarkdownString(@NonNull final Context context) {
             null, ExecutionCommand.Runner.APP_SHELL.getName(), false);
         executionCommand.commandLabel = "APT Info Command";
         executionCommand.backgroundCustomLogLevel = Logger.LOG_LEVEL_OFF;
-        AppShell appShell = AppShell.execute(context, executionCommand, null, new TermuxShellEnvironment(), true);
+        AppShell appShell = AppShell.execute(context, executionCommand, null, new TermuxShellEnvironment(), null, true);
         if (appShell == null || !executionCommand.isSuccessful() || executionCommand.resultData.exitCode != 0) {
             Logger.logErrorExtended(LOG_TAG, executionCommand.toString());
             return null;
@@ -656,7 +656,7 @@ public static String getLogcatDumpMarkdownString(@NonNull final Context context)
             null, logcatScript + "\n", "/", ExecutionCommand.Runner.APP_SHELL.getName(), true);
         executionCommand.commandLabel = "Logcat dump command";
         executionCommand.backgroundCustomLogLevel = Logger.LOG_LEVEL_OFF;
-        AppShell appShell = AppShell.execute(context, executionCommand, null, new TermuxShellEnvironment(), true);
+        AppShell appShell = AppShell.execute(context, executionCommand, null, new TermuxShellEnvironment(), null, true);
         if (appShell == null || !executionCommand.isSuccessful()) {
             Logger.logErrorExtended(LOG_TAG, executionCommand.toString());
             return null;
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/file/TermuxFileUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/file/TermuxFileUtils.java
index 8af32d875d..6172a412f5 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/file/TermuxFileUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/file/TermuxFileUtils.java
@@ -364,7 +364,7 @@ public static String getTermuxFilesStatMarkdownString(@NonNull final Context con
             statScript.toString() + "\n", "/", ExecutionCommand.Runner.APP_SHELL.getName(), true);
         executionCommand.commandLabel = TermuxConstants.TERMUX_APP_NAME + " Files Stat Command";
         executionCommand.backgroundCustomLogLevel = Logger.LOG_LEVEL_OFF;
-        AppShell appShell = AppShell.execute(context, executionCommand, null, new TermuxShellEnvironment(), true);
+        AppShell appShell = AppShell.execute(context, executionCommand, null, new TermuxShellEnvironment(), null, true);
         if (appShell == null || !executionCommand.isSuccessful()) {
             Logger.logErrorExtended(LOG_TAG, executionCommand.toString());
             return null;
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/shell/command/runner/terminal/TermuxSession.java b/termux-shared/src/main/java/com/termux/shared/termux/shell/command/runner/terminal/TermuxSession.java
index d9ad1a6169..c95de6efca 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/shell/command/runner/terminal/TermuxSession.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/shell/command/runner/terminal/TermuxSession.java
@@ -4,6 +4,7 @@
 import android.system.OsConstants;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.google.common.base.Joiner;
 import com.termux.shared.R;
@@ -62,6 +63,8 @@ private TermuxSession(@NonNull final TerminalSession terminalSession, @NonNull f
      * @param terminalSessionClient The {@link TerminalSessionClient} interface implementation.
      * @param termuxSessionClient The {@link TermuxSessionClient} interface implementation.
      * @param shellEnvironmentClient The {@link IShellEnvironment} interface implementation.
+     * @param additionalEnvironment The additional shell environment variables to export. Existing
+     *                              variables will be overridden.
      * @param setStdoutOnExit If set to {@code true}, then the {@link ResultData#stdout}
      *                        available in the {@link TermuxSessionClient#onTermuxSessionExited(TermuxSession)}
      *                        callback will be set to the {@link TerminalSession} transcript. The session
@@ -74,6 +77,7 @@ private TermuxSession(@NonNull final TerminalSession terminalSession, @NonNull f
     public static TermuxSession execute(@NonNull final Context currentPackageContext, @NonNull ExecutionCommand executionCommand,
                                         @NonNull final TerminalSessionClient terminalSessionClient, final TermuxSessionClient termuxSessionClient,
                                         @NonNull final IShellEnvironment shellEnvironmentClient,
+                                        @Nullable HashMap<String, String> additionalEnvironment,
                                         final boolean setStdoutOnExit) {
         if (executionCommand.executable != null && executionCommand.executable.isEmpty())
             executionCommand.executable = null;
@@ -132,6 +136,8 @@ public static TermuxSession execute(@NonNull final Context currentPackageContext
         // Setup command environment
         HashMap<String, String> environment = shellEnvironmentClient.setupShellCommandEnvironment(currentPackageContext,
             executionCommand);
+        if (additionalEnvironment != null)
+            environment.putAll(additionalEnvironment);
         List<String> environmentList = ShellEnvironmentUtils.convertEnvironmentToEnviron(environment);
         Collections.sort(environmentList);
         String[] environmentArray = environmentList.toArray(new String[0]);

From 29d05cc72c44b42df783b252eb3488b7f4d38c4e Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 11 Jun 2022 19:25:45 +0500
Subject: [PATCH 778/912] Changed: All `ExecutionCommands` not managed by
 `TermuxShellManager` should have `id` `-1`

---
 .../com/termux/shared/shell/command/ExecutionCommand.java     | 3 ++-
 .../src/main/java/com/termux/shared/termux/TermuxUtils.java   | 4 ++--
 .../java/com/termux/shared/termux/file/TermuxFileUtils.java   | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/shell/command/ExecutionCommand.java b/termux-shared/src/main/java/com/termux/shared/shell/command/ExecutionCommand.java
index 7876ddaca4..d68c628cb5 100644
--- a/termux-shared/src/main/java/com/termux/shared/shell/command/ExecutionCommand.java
+++ b/termux-shared/src/main/java/com/termux/shared/shell/command/ExecutionCommand.java
@@ -140,7 +140,8 @@ public static ShellCreateMode modeOf(String mode) {
 
     }
 
-    /** The optional unique id for the {@link ExecutionCommand}. */
+    /** The optional unique id for the {@link ExecutionCommand}. This should equal -1 if execution
+     * command is not going to be managed by a shell manager. */
     public Integer id;
 
     /** The process id of command. */
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
index 0d66a3f51d..4104fe5b36 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
@@ -592,7 +592,7 @@ public static String geAPTInfoMarkdownString(@NonNull final Context context) {
 
         aptInfoScript = aptInfoScript.replaceAll(Pattern.quote("@TERMUX_PREFIX@"), TermuxConstants.TERMUX_PREFIX_DIR_PATH);
 
-        ExecutionCommand executionCommand = new ExecutionCommand(1,
+        ExecutionCommand executionCommand = new ExecutionCommand(-1,
             TermuxConstants.TERMUX_BIN_PREFIX_DIR_PATH + "/bash", null, aptInfoScript,
             null, ExecutionCommand.Runner.APP_SHELL.getName(), false);
         executionCommand.commandLabel = "APT Info Command";
@@ -652,7 +652,7 @@ public static String getLogcatDumpMarkdownString(@NonNull final Context context)
 
         // Run script
         // Logging must be disabled for output of logcat command itself in StreamGobbler
-        ExecutionCommand executionCommand = new ExecutionCommand(1, "/system/bin/sh",
+        ExecutionCommand executionCommand = new ExecutionCommand(-1, "/system/bin/sh",
             null, logcatScript + "\n", "/", ExecutionCommand.Runner.APP_SHELL.getName(), true);
         executionCommand.commandLabel = "Logcat dump command";
         executionCommand.backgroundCustomLogLevel = Logger.LOG_LEVEL_OFF;
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/file/TermuxFileUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/file/TermuxFileUtils.java
index 6172a412f5..2f73c689c7 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/file/TermuxFileUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/file/TermuxFileUtils.java
@@ -360,7 +360,7 @@ public static String getTermuxFilesStatMarkdownString(@NonNull final Context con
             .append("/system/bin/grep -E '( /data )|( /data/data )|( /data/user/[0-9]+ )' /proc/self/mountinfo 2>&1 | /system/bin/grep -v '/data_mirror' 2>&1");
 
         // Run script
-        ExecutionCommand executionCommand = new ExecutionCommand(1, "/system/bin/sh", null,
+        ExecutionCommand executionCommand = new ExecutionCommand(-1, "/system/bin/sh", null,
             statScript.toString() + "\n", "/", ExecutionCommand.Runner.APP_SHELL.getName(), true);
         executionCommand.commandLabel = TermuxConstants.TERMUX_APP_NAME + " Files Stat Command";
         executionCommand.backgroundCustomLogLevel = Logger.LOG_LEVEL_OFF;

From 9749360caacc8b4e3486343a44b7e0a8d87edf06 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 11 Jun 2022 19:29:24 +0500
Subject: [PATCH 779/912] Added: Add
 `UnixShellEnvironment.LOGIN_SHELL_BINARIES` variable for common/supported
 login shell binaries searched and add `fish` and `sh` shell as additional
 backups

---
 .../shared/shell/command/environment/UnixShellEnvironment.java | 3 +++
 .../termux/shell/command/runner/terminal/TermuxSession.java    | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/shell/command/environment/UnixShellEnvironment.java b/termux-shared/src/main/java/com/termux/shared/shell/command/environment/UnixShellEnvironment.java
index 376879faf1..7f29a6403a 100644
--- a/termux-shared/src/main/java/com/termux/shared/shell/command/environment/UnixShellEnvironment.java
+++ b/termux-shared/src/main/java/com/termux/shared/shell/command/environment/UnixShellEnvironment.java
@@ -52,6 +52,9 @@ public abstract class UnixShellEnvironment implements IShellEnvironment {
     public static final String ENV_TMPDIR = "TMPDIR";
 
 
+    /** Names for common/supported login shell binaries. */
+    public static final String[] LOGIN_SHELL_BINARIES = new String[]{"login", "bash", "zsh", "fish", "sh"};
+
 
 
     @NonNull
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/shell/command/runner/terminal/TermuxSession.java b/termux-shared/src/main/java/com/termux/shared/termux/shell/command/runner/terminal/TermuxSession.java
index c95de6efca..7aa874d1ea 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/shell/command/runner/terminal/TermuxSession.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/shell/command/runner/terminal/TermuxSession.java
@@ -93,7 +93,7 @@ public static TermuxSession execute(@NonNull final Context currentPackageContext
         boolean isLoginShell = false;
         if (executionCommand.executable == null) {
             if (!executionCommand.isFailsafe) {
-                for (String shellBinary : new String[]{"login", "bash", "zsh"}) {
+                for (String shellBinary : UnixShellEnvironment.LOGIN_SHELL_BINARIES) {
                     File shellFile = new File(defaultBinPath, shellBinary);
                     if (shellFile.canExecute()) {
                         executionCommand.executable = shellFile.getAbsolutePath();

From afc06cfd0a9855e8443d0b62cd57d8fa9e4547a1 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 11 Jun 2022 19:48:26 +0500
Subject: [PATCH 780/912] Added|Changed!: Add `TermuxAppShellEnvironment` and
 `TermuxAPIShellEnvironment` to export `Termux` and `Termux:API` app variables
 in `TermuxShellEnvironment`

This adds onto f102ea20 to build termux environment. Variables for `Termux` app have the `TERMUX_APP__` scope and variables for `Termux:API` app have `TERMUX_API_APP__` scope, which allows easier management for variables and know which variable belongs to which component. Some variables that were added in the last `termux-app` `v0.118.0` release have been renamed as per scoped variable design. The `TERMUX_VERSION` variable will stay as is for backward compatibility and will be duplicate of `TERMUX_APP__VERSION_NAME`. Docs will be provided for details of the variables.

- `TERMUX_APP__VERSION_NAME`
- `TERMUX_APP__VERSION_CODE`
- `TERMUX_APP__PACKAGE_NAME`
- `TERMUX_APP__PID` (previously `TERMUX_APP_PID`)
- `TERMUX_APP__UID`
- `TERMUX_APP__TARGET_SDK`
- `TERMUX_APP__IS_DEBUGGABLE_BUILD` (previously `TERMUX_IS_DEBUGGABLE_BUILD`)
- `TERMUX_APP__APK_RELEASE` (previously `TERMUX_APK_RELEASE`)
- `TERMUX_APP__APK_PATH`
- `TERMUX_APP__IS_INSTALLED_ON_EXTERNAL_STORAGE`
- `TERMUX_APP__SE_PROCESS_CONTEXT`
- `TERMUX_APP__SE_FILE_CONTEXT`
- `TERMUX_APP__SE_INFO`
- `TERMUX_APP__USER_ID`
- `TERMUX_APP__PROFILE_OWNER`
- `TERMUX_APP__PACKAGE_MANAGER` (previously `TERMUX_APP_PACKAGE_MANAGER`)
- `TERMUX_APP__PACKAGE_VARIANT` (previously `TERMUX_APP_PACKAGE_VARIANT`)
- `TERMUX_APP__FILES_DIR`
- `TERMUX_APP__AM_SOCKET_SERVER_ENABLED` (previously `TERMUX_APP_AM_SOCKET_SERVER_ENABLED`)

- `TERMUX_API_APP__VERSION_NAME` (previously `TERMUX_API_VERSION`)
---
 .../termux/shared/termux/TermuxConstants.java |   8 +-
 .../shared/termux/shell/TermuxShellUtils.java |  67 -------
 .../termux/shell/am/TermuxAmSocketServer.java |  26 ++-
 .../TermuxAPIShellEnvironment.java            |  43 +++++
 .../TermuxAppShellEnvironment.java            | 164 ++++++++++++++++++
 .../environment/TermuxShellEnvironment.java   |   8 +
 6 files changed, 245 insertions(+), 71 deletions(-)
 create mode 100644 termux-shared/src/main/java/com/termux/shared/termux/shell/command/environment/TermuxAPIShellEnvironment.java
 create mode 100644 termux-shared/src/main/java/com/termux/shared/termux/shell/command/environment/TermuxAppShellEnvironment.java

diff --git a/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
index 63b5cbb31a..309ef97006 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
@@ -11,7 +11,7 @@
 import java.util.List;
 
 /*
- * Version: v0.48.0
+ * Version: v0.49.0
  * SPDX-License-Identifier: MIT
  *
  * Changelog
@@ -265,6 +265,9 @@
  * - 0.48.0 (2022-06-04)
  *      - Removed `TERMUX_GAME_PACKAGES_GITHUB_*`, `TERMUX_SCIENCE_PACKAGES_GITHUB_*`,
  *          `TERMUX_ROOT_PACKAGES_GITHUB_*`, `TERMUX_UNSTABLE_PACKAGES_GITHUB_*`
+ *
+ * - 0.49.0 (2022-06-10)
+ *      - Added `TERMUX_ENV_PREFIX_ROOT`.
  */
 
 /**
@@ -871,6 +874,9 @@ public final class TermuxConstants {
      * may be used instead of {@link #COMMA_NORMAL} */
     public static final String COMMA_ALTERNATIVE = "‚"; // Default: "‚"
 
+    /** Environment variable prefix root for the Termux app. */
+    public static final String TERMUX_ENV_PREFIX_ROOT = "TERMUX";
+
 
 
 
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/shell/TermuxShellUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/shell/TermuxShellUtils.java
index 3a005d8ae1..de56a29e3a 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/shell/TermuxShellUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/shell/TermuxShellUtils.java
@@ -1,7 +1,5 @@
 package com.termux.shared.termux.shell;
 
-import android.content.Context;
-
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
@@ -10,8 +8,6 @@
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.file.FileUtils;
 import com.termux.shared.logger.Logger;
-import com.termux.shared.android.PackageUtils;
-import com.termux.shared.termux.TermuxUtils;
 import com.termux.shared.termux.settings.properties.TermuxAppSharedProperties;
 
 import org.apache.commons.io.filefilter.TrueFileFilter;
@@ -27,32 +23,6 @@ public class TermuxShellUtils {
 
     private static final String LOG_TAG = "TermuxShellUtils";
 
-
-    public static String[] buildEnvironment(Context currentPackageContext, boolean isFailSafe, String workingDirectory) {
-        TermuxConstants.TERMUX_HOME_DIR.mkdirs();
-        List<String> environment = new ArrayList<>();
-
-        loadTermuxEnvVariables(currentPackageContext);
-
-        if (TERMUX_VERSION_NAME != null)
-            environment.add("TERMUX_VERSION=" + TERMUX_VERSION_NAME);
-        if (TERMUX_IS_DEBUGGABLE_BUILD != null)
-            environment.add("TERMUX_IS_DEBUGGABLE_BUILD=" + TERMUX_IS_DEBUGGABLE_BUILD);
-        if (TERMUX_APP_PID != null)
-            environment.add("TERMUX_APP_PID=" + TERMUX_APP_PID);
-        if (TERMUX_APK_RELEASE != null)
-            environment.add("TERMUX_APK_RELEASE=" + TERMUX_APK_RELEASE);
-        if (TermuxBootstrap.TERMUX_APP_PACKAGE_MANAGER != null)
-            environment.add("TERMUX_APP_PACKAGE_MANAGER=" + TermuxBootstrap.TERMUX_APP_PACKAGE_MANAGER.getName());
-        if (TermuxBootstrap.TERMUX_APP_PACKAGE_VARIANT != null)
-            environment.add("TERMUX_APP_PACKAGE_VARIANT=" + TermuxBootstrap.TERMUX_APP_PACKAGE_VARIANT.getName());
-        if (TERMUX_APP_AM_SOCKET_SERVER_ENABLED != null)
-            environment.add("TERMUX_APP_AM_SOCKET_SERVER_ENABLED=" + TERMUX_APP_AM_SOCKET_SERVER_ENABLED);
-
-        if (TERMUX_API_VERSION_NAME != null)
-            environment.add("TERMUX_API_VERSION=" + TERMUX_API_VERSION_NAME);
-        return environment.toArray(new String[0]);
-    }
     /**
      * Setup shell command arguments for the execute. The file interpreter may be prefixed to
      * command arguments if needed.
@@ -149,41 +119,4 @@ public static void clearTermuxTMPDIR(boolean onlyIfExists) {
         }
     }
 
-    public static void loadTermuxEnvVariables(Context currentPackageContext) {
-        String termuxAPKReleaseOld = TERMUX_APK_RELEASE;
-        TERMUX_VERSION_NAME = TERMUX_IS_DEBUGGABLE_BUILD = TERMUX_APP_PID = TERMUX_APK_RELEASE = null;
-
-        // Check if Termux app is installed and not disabled
-        if (TermuxUtils.isTermuxAppInstalled(currentPackageContext) == null) {
-            // This function may be called by a different package like a plugin, so we get version for Termux package via its context
-            Context termuxPackageContext = TermuxUtils.getTermuxPackageContext(currentPackageContext);
-            if (termuxPackageContext != null) {
-                TERMUX_VERSION_NAME = PackageUtils.getVersionNameForPackage(termuxPackageContext);
-                TERMUX_IS_DEBUGGABLE_BUILD = PackageUtils.isAppForPackageADebuggableBuild(termuxPackageContext) ? "1" : "0";
-
-                TERMUX_APP_PID = TermuxUtils.getTermuxAppPID(currentPackageContext);
-
-                // Getting APK signature is a slightly expensive operation, so do it only when needed
-                if (termuxAPKReleaseOld == null) {
-                    String signingCertificateSHA256Digest = PackageUtils.getSigningCertificateSHA256DigestForPackage(termuxPackageContext);
-                    if (signingCertificateSHA256Digest != null)
-                        TERMUX_APK_RELEASE = TermuxUtils.getAPKRelease(signingCertificateSHA256Digest).replaceAll("[^a-zA-Z]", "_").toUpperCase();
-                } else {
-                    TERMUX_APK_RELEASE = termuxAPKReleaseOld;
-                }
-            }
-        }
-
-
-        TERMUX_API_VERSION_NAME = null;
-
-        // Check if Termux:API app is installed and not disabled
-        if (TermuxUtils.isTermuxAPIAppInstalled(currentPackageContext) == null) {
-            // This function may be called by a different package like a plugin, so we get version for Termux:API package via its context
-            Context termuxAPIPackageContext = TermuxUtils.getTermuxAPIPackageContext(currentPackageContext);
-            if (termuxAPIPackageContext != null)
-                TERMUX_API_VERSION_NAME = PackageUtils.getVersionNameForPackage(termuxAPIPackageContext);
-        }
-    }
-
 }
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/shell/am/TermuxAmSocketServer.java b/termux-shared/src/main/java/com/termux/shared/termux/shell/am/TermuxAmSocketServer.java
index 32116b3083..e6c293e95e 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/shell/am/TermuxAmSocketServer.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/shell/am/TermuxAmSocketServer.java
@@ -2,6 +2,7 @@
 
 import android.content.Context;
 
+import androidx.annotation.Keep;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
@@ -18,7 +19,7 @@
 import com.termux.shared.termux.plugins.TermuxPluginUtils;
 import com.termux.shared.termux.settings.properties.TermuxAppSharedProperties;
 import com.termux.shared.termux.settings.properties.TermuxPropertyConstants;
-import com.termux.shared.termux.shell.TermuxShellUtils;
+import com.termux.shared.termux.shell.command.environment.TermuxAppShellEnvironment;
 
 /**
  * A wrapper for {@link AmSocketServer} for termux-app usage.
@@ -48,7 +49,7 @@
  * require termux-app to be force stopped and restarted.
  *
  * The current state of the server can be checked with the
- * {@link TermuxShellUtils#TERMUX_APP_AM_SOCKET_SERVER_ENABLED} env variable, which is exported
+ * {@link TermuxAppShellEnvironment#ENV_TERMUX_APP__AM_SOCKET_SERVER_ENABLED} env variable, which is exported
  * for all shell sessions and tasks.
  *
  * https://github.com/termux/termux-am-socket
@@ -63,6 +64,10 @@ public class TermuxAmSocketServer {
     /** The static instance for the {@link TermuxAmSocketServer} {@link LocalSocketManager}. */
     private static LocalSocketManager termuxAmSocketServer;
 
+    /** Whether {@link TermuxAmSocketServer} is enabled and running or not. */
+    @Keep
+    protected static Boolean TERMUX_APP_AM_SOCKET_SERVER_ENABLED;
+
     /**
      * Setup the {@link AmSocketServer} {@link LocalServerSocket} and start listening for
      * new {@link LocalClientSocket} if enabled.
@@ -86,7 +91,7 @@ public static void setupTermuxAmSocketServer(@NonNull Context context) {
         // Once termux-app has started, the server state must not be changed since the variable is
         // exported in shell sessions and tasks and if state is changed, then env of older shells will
         // retain invalid value. User should force stop the app to update state after changing prop.
-        TermuxShellUtils.TERMUX_APP_AM_SOCKET_SERVER_ENABLED = enabled;
+        TERMUX_APP_AM_SOCKET_SERVER_ENABLED = enabled;
     }
 
     /**
@@ -160,6 +165,21 @@ public static synchronized void showErrorNotification(@NonNull Context context,
 
 
 
+    public static Boolean getTermuxAppAMSocketServerEnabled(@NonNull Context currentPackageContext) {
+        boolean isTermuxApp = TermuxConstants.TERMUX_PACKAGE_NAME.equals(currentPackageContext.getPackageName());
+        if (isTermuxApp) {
+            return TERMUX_APP_AM_SOCKET_SERVER_ENABLED;
+        } else {
+            // Currently, unsupported since plugin app processes don't know that value is set in termux
+            // app process TermuxAmSocketServer class. A binder API or a way to check if server is actually
+            // running needs to be used. Long checks would also not be possible on main application thread
+            return null;
+        }
+
+    }
+
+
+
 
 
     /** Enhanced implementation for {@link AmSocketServer.AmSocketServerClient} for {@link TermuxAmSocketServer}. */
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/shell/command/environment/TermuxAPIShellEnvironment.java b/termux-shared/src/main/java/com/termux/shared/termux/shell/command/environment/TermuxAPIShellEnvironment.java
new file mode 100644
index 0000000000..78c4772ea6
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/termux/shell/command/environment/TermuxAPIShellEnvironment.java
@@ -0,0 +1,43 @@
+package com.termux.shared.termux.shell.command.environment;
+
+import android.content.Context;
+import android.content.pm.PackageInfo;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.termux.shared.android.PackageUtils;
+import com.termux.shared.shell.command.environment.ShellEnvironmentUtils;
+import com.termux.shared.termux.TermuxConstants;
+import com.termux.shared.termux.TermuxUtils;
+
+import java.util.HashMap;
+
+/**
+ * Environment for {@link TermuxConstants#TERMUX_API_PACKAGE_NAME} app.
+ */
+public class TermuxAPIShellEnvironment {
+
+    /** Environment variable prefix for the Termux:API app. */
+    public static final String TERMUX_API_APP_ENV_PREFIX = TermuxConstants.TERMUX_ENV_PREFIX_ROOT + "_API_APP__";
+
+    /** Environment variable for the Termux:API app version. */
+    public static final String ENV_TERMUX_API_APP__VERSION_NAME = TERMUX_API_APP_ENV_PREFIX + "VERSION_NAME";
+
+    /** Get shell environment for Termux:API app. */
+    @Nullable
+    public static HashMap<String, String> getEnvironment(@NonNull Context currentPackageContext) {
+        if (TermuxUtils.isTermuxAPIAppInstalled(currentPackageContext) != null) return null;
+
+        String packageName = TermuxConstants.TERMUX_API_PACKAGE_NAME;
+        PackageInfo packageInfo = PackageUtils.getPackageInfoForPackage(currentPackageContext, packageName);
+        if (packageInfo == null) return null;
+
+        HashMap<String, String> environment = new HashMap<>();
+
+        ShellEnvironmentUtils.putToEnvIfSet(environment, ENV_TERMUX_API_APP__VERSION_NAME, PackageUtils.getVersionNameForPackage(packageInfo));
+
+        return environment;
+    }
+
+}
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/shell/command/environment/TermuxAppShellEnvironment.java b/termux-shared/src/main/java/com/termux/shared/termux/shell/command/environment/TermuxAppShellEnvironment.java
new file mode 100644
index 0000000000..078afc1bc5
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/termux/shell/command/environment/TermuxAppShellEnvironment.java
@@ -0,0 +1,164 @@
+package com.termux.shared.termux.shell.command.environment;
+
+import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageInfo;
+import android.os.Build;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.termux.shared.android.PackageUtils;
+import com.termux.shared.android.SELinuxUtils;
+import com.termux.shared.data.DataUtils;
+import com.termux.shared.shell.command.environment.ShellEnvironmentUtils;
+import com.termux.shared.termux.TermuxBootstrap;
+import com.termux.shared.termux.TermuxConstants;
+import com.termux.shared.termux.TermuxUtils;
+import com.termux.shared.termux.shell.am.TermuxAmSocketServer;
+
+import java.util.HashMap;
+
+/**
+ * Environment for {@link TermuxConstants#TERMUX_PACKAGE_NAME} app.
+ */
+public class TermuxAppShellEnvironment {
+
+    /** Termux app environment variables. */
+    public static HashMap<String, String> termuxAppEnvironment;
+
+    /** Environment variable for the Termux app version. */
+    public static final String ENV_TERMUX_VERSION = TermuxConstants.TERMUX_ENV_PREFIX_ROOT + "_VERSION";
+
+    /** Environment variable prefix for the Termux app. */
+    public static final String TERMUX_APP_ENV_PREFIX = TermuxConstants.TERMUX_ENV_PREFIX_ROOT + "_APP__";
+
+    /** Environment variable for the Termux app version name. */
+    public static final String ENV_TERMUX_APP__VERSION_NAME = TERMUX_APP_ENV_PREFIX + "VERSION_NAME";
+    /** Environment variable for the Termux app version code. */
+    public static final String ENV_TERMUX_APP__VERSION_CODE = TERMUX_APP_ENV_PREFIX + "VERSION_CODE";
+    /** Environment variable for the Termux app package name. */
+    public static final String ENV_TERMUX_APP__PACKAGE_NAME = TERMUX_APP_ENV_PREFIX + "PACKAGE_NAME";
+    /** Environment variable for the Termux app process id. */
+    public static final String ENV_TERMUX_APP__PID = TERMUX_APP_ENV_PREFIX + "PID";
+    /** Environment variable for the Termux app uid. */
+    public static final String ENV_TERMUX_APP__UID = TERMUX_APP_ENV_PREFIX + "UID";
+    /** Environment variable for the Termux app targetSdkVersion. */
+    public static final String ENV_TERMUX_APP__TARGET_SDK = TERMUX_APP_ENV_PREFIX + "TARGET_SDK";
+    /** Environment variable for the Termux app is debuggable apk build. */
+    public static final String ENV_TERMUX_APP__IS_DEBUGGABLE_BUILD = TERMUX_APP_ENV_PREFIX + "IS_DEBUGGABLE_BUILD";
+    /** Environment variable for the Termux app {@link TermuxConstants} APK_RELEASE_*. */
+    public static final String ENV_TERMUX_APP__APK_RELEASE = TERMUX_APP_ENV_PREFIX + "APK_RELEASE";
+    /** Environment variable for the Termux app install path. */
+    public static final String ENV_TERMUX_APP__APK_PATH = TERMUX_APP_ENV_PREFIX + "APK_PATH";
+    /** Environment variable for the Termux app is installed on external/portable storage. */
+    public static final String ENV_TERMUX_APP__IS_INSTALLED_ON_EXTERNAL_STORAGE = TERMUX_APP_ENV_PREFIX + "IS_INSTALLED_ON_EXTERNAL_STORAGE";
+
+    /** Environment variable for the Termux app process selinux context. */
+    public static final String ENV_TERMUX_APP__SE_PROCESS_CONTEXT = TERMUX_APP_ENV_PREFIX + "SE_PROCESS_CONTEXT";
+    /** Environment variable for the Termux app data files selinux context. */
+    public static final String ENV_TERMUX_APP__SE_FILE_CONTEXT = TERMUX_APP_ENV_PREFIX + "SE_FILE_CONTEXT";
+    /** Environment variable for the Termux app seInfo tag found in selinux policy used to set app process and app data files selinux context. */
+    public static final String ENV_TERMUX_APP__SE_INFO = TERMUX_APP_ENV_PREFIX + "SE_INFO";
+    /** Environment variable for the Termux app user id. */
+    public static final String ENV_TERMUX_APP__USER_ID = TERMUX_APP_ENV_PREFIX + "USER_ID";
+    /** Environment variable for the Termux app profile owner. */
+    public static final String ENV_TERMUX_APP__PROFILE_OWNER = TERMUX_APP_ENV_PREFIX + "PROFILE_OWNER";
+
+    /** Environment variable for the Termux app {@link TermuxBootstrap#TERMUX_APP_PACKAGE_MANAGER}. */
+    public static final String ENV_TERMUX_APP__PACKAGE_MANAGER = TERMUX_APP_ENV_PREFIX + "PACKAGE_MANAGER";
+    /** Environment variable for the Termux app {@link TermuxBootstrap#TERMUX_APP_PACKAGE_VARIANT}. */
+    public static final String ENV_TERMUX_APP__PACKAGE_VARIANT = TERMUX_APP_ENV_PREFIX + "PACKAGE_VARIANT";
+    /** Environment variable for the Termux app files directory. */
+    public static final String ENV_TERMUX_APP__FILES_DIR = TERMUX_APP_ENV_PREFIX + "FILES_DIR";
+
+
+    /** Environment variable for the Termux app {@link TermuxAmSocketServer#getTermuxAppAMSocketServerEnabled(Context)}. */
+    public static final String ENV_TERMUX_APP__AM_SOCKET_SERVER_ENABLED = TERMUX_APP_ENV_PREFIX + "AM_SOCKET_SERVER_ENABLED";
+
+
+
+    /** Get shell environment for Termux app. */
+    @Nullable
+    public static HashMap<String, String> getEnvironment(@NonNull Context currentPackageContext) {
+        setTermuxAppEnvironment(currentPackageContext);
+        return termuxAppEnvironment;
+    }
+
+    /** Set Termux app environment variables in {@link #termuxAppEnvironment}. */
+    public synchronized static void setTermuxAppEnvironment(@NonNull Context currentPackageContext) {
+        boolean isTermuxApp = TermuxConstants.TERMUX_PACKAGE_NAME.equals(currentPackageContext.getPackageName());
+
+        // If current package context is of termux app and its environment is already set, then no need to set again since it won't change
+        // Other apps should always set environment again since termux app may be installed/updated/deleted in background
+        if (termuxAppEnvironment != null && isTermuxApp)
+            return;
+
+        termuxAppEnvironment = null;
+
+        String packageName = TermuxConstants.TERMUX_PACKAGE_NAME;
+        PackageInfo packageInfo = PackageUtils.getPackageInfoForPackage(currentPackageContext, packageName);
+        if (packageInfo == null) return;
+        ApplicationInfo applicationInfo = PackageUtils.getApplicationInfoForPackage(currentPackageContext, packageName);
+        if (applicationInfo == null || !applicationInfo.enabled) return;
+
+        HashMap<String, String> environment = new HashMap<>();
+
+        ShellEnvironmentUtils.putToEnvIfSet(environment, ENV_TERMUX_VERSION, PackageUtils.getVersionNameForPackage(packageInfo));
+        ShellEnvironmentUtils.putToEnvIfSet(environment, ENV_TERMUX_APP__VERSION_NAME, PackageUtils.getVersionNameForPackage(packageInfo));
+        ShellEnvironmentUtils.putToEnvIfSet(environment, ENV_TERMUX_APP__VERSION_CODE, String.valueOf(PackageUtils.getVersionCodeForPackage(packageInfo)));
+
+        ShellEnvironmentUtils.putToEnvIfSet(environment, ENV_TERMUX_APP__PACKAGE_NAME, packageName);
+        ShellEnvironmentUtils.putToEnvIfSet(environment, ENV_TERMUX_APP__PID, TermuxUtils.getTermuxAppPID(currentPackageContext));
+        ShellEnvironmentUtils.putToEnvIfSet(environment, ENV_TERMUX_APP__UID, String.valueOf(PackageUtils.getUidForPackage(applicationInfo)));
+        ShellEnvironmentUtils.putToEnvIfSet(environment, ENV_TERMUX_APP__TARGET_SDK, String.valueOf(PackageUtils.getTargetSDKForPackage(applicationInfo)));
+        ShellEnvironmentUtils.putToEnvIfSet(environment, ENV_TERMUX_APP__IS_DEBUGGABLE_BUILD, PackageUtils.isAppForPackageADebuggableBuild(applicationInfo));
+        ShellEnvironmentUtils.putToEnvIfSet(environment, ENV_TERMUX_APP__APK_PATH, PackageUtils.getBaseAPKPathForPackage(applicationInfo));
+        ShellEnvironmentUtils.putToEnvIfSet(environment, ENV_TERMUX_APP__IS_INSTALLED_ON_EXTERNAL_STORAGE, PackageUtils.isAppInstalledOnExternalStorage(applicationInfo));
+
+        putTermuxAPKSignature(currentPackageContext, environment);
+
+        Context termuxPackageContext = TermuxUtils.getTermuxPackageContext(currentPackageContext);
+        if (termuxPackageContext != null) {
+            // An app that does not have the same sharedUserId as termux app will not be able to get
+            // get termux context's classloader to get BuildConfig.TERMUX_PACKAGE_VARIANT via reflection.
+            // Check TermuxBootstrap.setTermuxPackageManagerAndVariantFromTermuxApp()
+            if (TermuxBootstrap.TERMUX_APP_PACKAGE_MANAGER != null)
+                environment.put(ENV_TERMUX_APP__PACKAGE_MANAGER, TermuxBootstrap.TERMUX_APP_PACKAGE_MANAGER.getName());
+            if (TermuxBootstrap.TERMUX_APP_PACKAGE_VARIANT != null)
+                environment.put(ENV_TERMUX_APP__PACKAGE_VARIANT, TermuxBootstrap.TERMUX_APP_PACKAGE_VARIANT.getName());
+
+            // Will not be set for plugins
+            ShellEnvironmentUtils.putToEnvIfSet(environment, ENV_TERMUX_APP__AM_SOCKET_SERVER_ENABLED,
+                TermuxAmSocketServer.getTermuxAppAMSocketServerEnabled(currentPackageContext));
+
+            String filesDirPath = currentPackageContext.getFilesDir().getAbsolutePath();
+            ShellEnvironmentUtils.putToEnvIfSet(environment, ENV_TERMUX_APP__FILES_DIR, filesDirPath);
+
+            ShellEnvironmentUtils.putToEnvIfSet(environment, ENV_TERMUX_APP__SE_PROCESS_CONTEXT, SELinuxUtils.getContext());
+            ShellEnvironmentUtils.putToEnvIfSet(environment, ENV_TERMUX_APP__SE_FILE_CONTEXT, SELinuxUtils.getFileContext(filesDirPath));
+
+            String seInfoUser = PackageUtils.getApplicationInfoSeInfoUserForPackage(applicationInfo);
+            ShellEnvironmentUtils.putToEnvIfSet(environment, ENV_TERMUX_APP__SE_INFO, PackageUtils.getApplicationInfoSeInfoForPackage(applicationInfo) +
+                (DataUtils.isNullOrEmpty(seInfoUser) ? "" : seInfoUser));
+
+            if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
+                ShellEnvironmentUtils.putToEnvIfSet(environment, ENV_TERMUX_APP__USER_ID, String.valueOf(PackageUtils.getUserIdForPackage(currentPackageContext)));
+            ShellEnvironmentUtils.putToEnvIfSet(environment, ENV_TERMUX_APP__PROFILE_OWNER, PackageUtils.getProfileOwnerPackageNameForUser(currentPackageContext));
+        }
+
+        termuxAppEnvironment = environment;
+    }
+
+    /** Put {@link #ENV_TERMUX_APP__APK_RELEASE} in {@code environment}. */
+    public static void putTermuxAPKSignature(@NonNull Context currentPackageContext,
+                                             @NonNull HashMap<String, String> environment) {
+        String signingCertificateSHA256Digest = PackageUtils.getSigningCertificateSHA256DigestForPackage(currentPackageContext,
+            TermuxConstants.TERMUX_PACKAGE_NAME);
+        if (signingCertificateSHA256Digest != null) {
+            ShellEnvironmentUtils.putToEnvIfSet(environment, ENV_TERMUX_APP__APK_RELEASE,
+                TermuxUtils.getAPKRelease(signingCertificateSHA256Digest).replaceAll("[^a-zA-Z]", "_").toUpperCase());
+        }
+    }
+
+}
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/shell/command/environment/TermuxShellEnvironment.java b/termux-shared/src/main/java/com/termux/shared/termux/shell/command/environment/TermuxShellEnvironment.java
index 24d10f7bc2..0677c20f82 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/shell/command/environment/TermuxShellEnvironment.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/shell/command/environment/TermuxShellEnvironment.java
@@ -32,6 +32,14 @@ public HashMap<String, String> getEnvironment(@NonNull Context currentPackageCon
         // Termux environment builds upon the Android environment
         HashMap<String, String> environment = super.getEnvironment(currentPackageContext, isFailSafe);
 
+        HashMap<String, String> termuxAppEnvironment = TermuxAppShellEnvironment.getEnvironment(currentPackageContext);
+        if (termuxAppEnvironment != null)
+            environment.putAll(termuxAppEnvironment);
+
+        HashMap<String, String> termuxApiAppEnvironment = TermuxAPIShellEnvironment.getEnvironment(currentPackageContext);
+        if (termuxApiAppEnvironment != null)
+            environment.putAll(termuxApiAppEnvironment);
+
         environment.put(ENV_HOME, TermuxConstants.TERMUX_HOME_DIR_PATH);
         environment.put(ENV_PREFIX, TermuxConstants.TERMUX_PREFIX_DIR_PATH);
 

From ebdab0e59c702434ead044198dbf4a945fe36c70 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 11 Jun 2022 19:50:08 +0500
Subject: [PATCH 781/912] Changed: Update
 `TERMUX_APP__AM_SOCKET_SERVER_ENABLED` environment variable value if
 `termux-am-socket` server state changes

---
 .../shared/termux/shell/am/TermuxAmSocketServer.java      | 1 +
 .../command/environment/TermuxAppShellEnvironment.java    | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/termux-shared/src/main/java/com/termux/shared/termux/shell/am/TermuxAmSocketServer.java b/termux-shared/src/main/java/com/termux/shared/termux/shell/am/TermuxAmSocketServer.java
index e6c293e95e..438744e1d4 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/shell/am/TermuxAmSocketServer.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/shell/am/TermuxAmSocketServer.java
@@ -92,6 +92,7 @@ public static void setupTermuxAmSocketServer(@NonNull Context context) {
         // exported in shell sessions and tasks and if state is changed, then env of older shells will
         // retain invalid value. User should force stop the app to update state after changing prop.
         TERMUX_APP_AM_SOCKET_SERVER_ENABLED = enabled;
+        TermuxAppShellEnvironment.updateTermuxAppAMSocketServerEnabled(context);
     }
 
     /**
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/shell/command/environment/TermuxAppShellEnvironment.java b/termux-shared/src/main/java/com/termux/shared/termux/shell/command/environment/TermuxAppShellEnvironment.java
index 078afc1bc5..abd11f652a 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/shell/command/environment/TermuxAppShellEnvironment.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/shell/command/environment/TermuxAppShellEnvironment.java
@@ -161,4 +161,12 @@ public static void putTermuxAPKSignature(@NonNull Context currentPackageContext,
         }
     }
 
+    /** Update {@link #ENV_TERMUX_APP__AM_SOCKET_SERVER_ENABLED} value in {@code environment}. */
+    public synchronized static void updateTermuxAppAMSocketServerEnabled(@NonNull Context currentPackageContext) {
+        if (termuxAppEnvironment == null) return;
+        termuxAppEnvironment.remove(ENV_TERMUX_APP__AM_SOCKET_SERVER_ENABLED);
+        ShellEnvironmentUtils.putToEnvIfSet(termuxAppEnvironment, ENV_TERMUX_APP__AM_SOCKET_SERVER_ENABLED,
+            TermuxAmSocketServer.getTermuxAppAMSocketServerEnabled(currentPackageContext));
+    }
+
 }

From 150b1ff99c280dac09209b16c4149d3accf39591 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sun, 12 Jun 2022 00:31:38 +0500
Subject: [PATCH 782/912] Added: Add `ShellCommandShellEnvironment` and
 `TermuxShellCommandShellEnvironment` to export `ExecutionCommand` variables

This adds onto f102ea20 to build termux environment. Variables for `ExecutionCommand` app have the `SHELL_CMD__` scope. Docs will be provided for details of the variables.

- `SHELL_CMD__SHELL_ID`
- `SHELL_CMD__SHELL_NAME`
- `SHELL_CMD__APP_SHELL_NUMBER_SINCE_BOOT`
- `SHELL_CMD__TERMINAL_SESSION_NUMBER_SINCE_BOOT`
- `SHELL_CMD__APP_SHELL_NUMBER_SINCE_APP_START`
- `SHELL_CMD__TERMINAL_SESSION_NUMBER_SINCE_APP_START`

The commit also adds `SystemEventReceiver` to Termux app that will receive `ACTION_BOOT_COMPLETED`.
---
 app/src/main/AndroidManifest.xml              |  9 +++
 .../java/com/termux/app/TermuxService.java    |  8 ++-
 .../termux/app/event/SystemEventReceiver.java | 47 ++++++++++++++
 .../preferences/SharedPreferenceUtils.java    | 32 ++++++++++
 .../shell/command/ExecutionCommand.java       | 12 +++-
 .../environment/AndroidShellEnvironment.java  |  9 +++
 .../ShellCommandShellEnvironment.java         | 62 +++++++++++++++++++
 .../TermuxAppSharedPreferences.java           | 22 +++++++
 .../TermuxPreferenceConstants.java            | 20 +++++-
 .../termux/shell/TermuxShellManager.java      | 47 ++++++++++++++
 .../TermuxShellCommandShellEnvironment.java   | 48 ++++++++++++++
 .../environment/TermuxShellEnvironment.java   |  4 ++
 12 files changed, 317 insertions(+), 3 deletions(-)
 create mode 100644 app/src/main/java/com/termux/app/event/SystemEventReceiver.java
 create mode 100644 termux-shared/src/main/java/com/termux/shared/shell/command/environment/ShellCommandShellEnvironment.java
 create mode 100644 termux-shared/src/main/java/com/termux/shared/termux/shell/command/environment/TermuxShellCommandShellEnvironment.java

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4a2bc2f895..6a9ac9ff8c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -34,6 +34,7 @@
     <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.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.PACKAGE_USAGE_STATS" tools:ignore="ProtectedPermissions" />
 
     <application
@@ -169,6 +170,14 @@
             android:name=".app.TermuxOpenReceiver"
             android:exported="false" />
 
+        <receiver
+            android:name=".app.event.SystemEventReceiver"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+            </intent-filter>
+        </receiver>
+
         <receiver
             android:name=".shared.activities.ReportActivity$ReportActivityBroadcastReceiver"
             android:exported="false" />
diff --git a/app/src/main/java/com/termux/app/TermuxService.java b/app/src/main/java/com/termux/app/TermuxService.java
index 902aa1b1e9..4e9479160f 100644
--- a/app/src/main/java/com/termux/app/TermuxService.java
+++ b/app/src/main/java/com/termux/app/TermuxService.java
@@ -170,6 +170,8 @@ public void onDestroy() {
         actionReleaseWakeLock(false);
         if (!mWantsToStop)
             killAllTermuxExecutionCommands();
+
+        TermuxShellManager.onAppExit(this);
         runStopForeground();
     }
 
@@ -463,6 +465,8 @@ public synchronized AppShell createTermuxTask(ExecutionCommand executionCommand)
             return null;
         }
 
+        executionCommand.setShellCommandShellEnvironment = true;
+
         if (Logger.getLogLevel() >= Logger.LOG_LEVEL_VERBOSE)
             Logger.logVerboseExtended(LOG_TAG, executionCommand.toString());
 
@@ -571,13 +575,15 @@ public synchronized TermuxSession createTermuxSession(ExecutionCommand execution
             return null;
         }
 
+        executionCommand.setShellCommandShellEnvironment = true;
+        executionCommand.terminalTranscriptRows = mProperties.getTerminalTranscriptRows();
+
         if (Logger.getLogLevel() >= Logger.LOG_LEVEL_VERBOSE)
             Logger.logVerboseExtended(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 = mProperties.getTerminalTranscriptRows();
         TermuxSession newTermuxSession = TermuxSession.execute(this, executionCommand, getTermuxTerminalSessionClient(),
             this, new TermuxShellEnvironment(), null, executionCommand.isPluginExecutionCommand);
         if (newTermuxSession == null) {
diff --git a/app/src/main/java/com/termux/app/event/SystemEventReceiver.java b/app/src/main/java/com/termux/app/event/SystemEventReceiver.java
new file mode 100644
index 0000000000..49a3c17261
--- /dev/null
+++ b/app/src/main/java/com/termux/app/event/SystemEventReceiver.java
@@ -0,0 +1,47 @@
+package com.termux.app.event;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.termux.shared.data.IntentUtils;
+import com.termux.shared.logger.Logger;
+import com.termux.shared.termux.shell.TermuxShellManager;
+
+public class SystemEventReceiver extends BroadcastReceiver {
+
+    private static SystemEventReceiver mInstance;
+
+    private static final String LOG_TAG = "SystemEventReceiver";
+
+    public static synchronized SystemEventReceiver getInstance() {
+        if (mInstance == null) {
+            mInstance = new SystemEventReceiver();
+        }
+        return mInstance;
+    }
+
+    @Override
+    public void onReceive(@NonNull Context context, @Nullable Intent intent) {
+        if (intent == null) return;
+        Logger.logDebug(LOG_TAG, "Intent Received:\n" + IntentUtils.getIntentString(intent));
+
+        String action = intent.getAction();
+        if (action == null) return;
+
+        switch (action) {
+            case Intent.ACTION_BOOT_COMPLETED:
+                onActionBootCompleted(context, intent);
+                break;
+            default:
+                Logger.logError(LOG_TAG, "Invalid action \"" + action + "\" passed to " + LOG_TAG);
+        }
+    }
+
+    public synchronized void onActionBootCompleted(@NonNull Context context, @NonNull Intent intent) {
+        TermuxShellManager.onActionBootCompleted(context, intent);
+    }
+
+}
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/preferences/SharedPreferenceUtils.java b/termux-shared/src/main/java/com/termux/shared/settings/preferences/SharedPreferenceUtils.java
index 8f7a420ae8..68bd7c3eee 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/preferences/SharedPreferenceUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/preferences/SharedPreferenceUtils.java
@@ -188,6 +188,38 @@ public static void setInt(SharedPreferences sharedPreferences, String key, int v
             sharedPreferences.edit().putInt(key, value).apply();
     }
 
+    /**
+     * Set an {@code int} in {@link SharedPreferences}.
+     *
+     * @param sharedPreferences The {@link SharedPreferences} to set the value in.
+     * @param key The key for the value.
+     * @param def The default value if failed to read a valid value.
+     * @param commitToFile If set to {@code true}, then value will be set to shared preferences
+     *                     in-memory cache and the file synchronously. Ideally, only to be used for
+     *                     multi-process use-cases.
+     * @param resetValue The value if not {@code null} that should be set if current or incremented
+     *                   value is less than 0.
+     * @return Returns the {@code int} value stored in {@link SharedPreferences} before increment,
+     * otherwise returns default if failed to read a valid value, like in case of an exception.
+     */
+    @SuppressLint("ApplySharedPref")
+    public static int getAndIncrementInt(SharedPreferences sharedPreferences, String key, int def,
+                                         boolean commitToFile, Integer resetValue) {
+        if (sharedPreferences == null) {
+            Logger.logError(LOG_TAG, "Ignoring incrementing int value for the \"" + key + "\" key into null shared preferences.");
+            return def;
+        }
+
+        int curValue = getInt(sharedPreferences, key, def);
+        if (resetValue != null && (curValue < 0)) curValue = resetValue;
+
+        int newValue = curValue + 1;
+        if (resetValue != null && newValue < 0) newValue = resetValue;
+
+        setInt(sharedPreferences, key, newValue, commitToFile);
+        return curValue;
+    }
+
 
 
     /**
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/command/ExecutionCommand.java b/termux-shared/src/main/java/com/termux/shared/shell/command/ExecutionCommand.java
index d68c628cb5..5a97f9664b 100644
--- a/termux-shared/src/main/java/com/termux/shared/shell/command/ExecutionCommand.java
+++ b/termux-shared/src/main/java/com/termux/shared/shell/command/ExecutionCommand.java
@@ -195,6 +195,10 @@ public static ShellCreateMode modeOf(String mode) {
     /** The {@link ShellCreateMode} of commands. */
     public String shellCreateMode;
 
+    /** Whether to set {@link ExecutionCommand} shell environment. */
+    public boolean setShellCommandShellEnvironment;
+
+
 
 
     /** The command label for the {@link ExecutionCommand}. */
@@ -396,6 +400,8 @@ public static String getExecutionInputLogString(final ExecutionCommand execution
             logString.append("\n").append(executionCommand.getShellCreateModeLogString());
         }
 
+        logString.append("\n").append(executionCommand.getSetRunnerShellEnvironmentLogString());
+
         if (!ignoreNull || executionCommand.commandIntent != null)
             logString.append("\n").append(executionCommand.getCommandIntentLogString());
 
@@ -490,7 +496,7 @@ public static String getExecutionCommandMarkdownString(final ExecutionCommand ex
 
         markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Shell Name", executionCommand.shellName, "-"));
         markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Shell Create Mode", executionCommand.shellCreateMode, "-"));
-
+        markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Set Shell Command Shell Environment", executionCommand.setShellCommandShellEnvironment, "-"));
 
         markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("isPluginExecutionCommand", executionCommand.isPluginExecutionCommand, "-"));
 
@@ -588,6 +594,10 @@ public String getShellCreateModeLogString() {
         return Logger.getSingleLineLogStringEntry("Shell Create Mode", shellCreateMode, "-");
     }
 
+    public String getSetRunnerShellEnvironmentLogString() {
+        return "Set Shell Command Shell Environment: `" + setShellCommandShellEnvironment + "`";
+    }
+
     public String getCommandDescriptionLogString() {
         return Logger.getSingleLineLogStringEntry("Command Description", commandDescription, "-");
     }
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/command/environment/AndroidShellEnvironment.java b/termux-shared/src/main/java/com/termux/shared/shell/command/environment/AndroidShellEnvironment.java
index f87c143877..91a8652e89 100644
--- a/termux-shared/src/main/java/com/termux/shared/shell/command/environment/AndroidShellEnvironment.java
+++ b/termux-shared/src/main/java/com/termux/shared/shell/command/environment/AndroidShellEnvironment.java
@@ -20,6 +20,12 @@
  */
 public class AndroidShellEnvironment extends UnixShellEnvironment {
 
+    protected ShellCommandShellEnvironment shellCommandShellEnvironment;
+
+    public AndroidShellEnvironment() {
+        shellCommandShellEnvironment = new ShellCommandShellEnvironment();
+    }
+
     /** Get shell environment for Android. */
     @NonNull
     @Override
@@ -85,6 +91,9 @@ public HashMap<String, String> setupShellCommandEnvironment(@NonNull Context cur
             getDefaultWorkingDirectoryPath());
         ShellEnvironmentUtils.createHomeDir(environment);
 
+        if (executionCommand.setShellCommandShellEnvironment && shellCommandShellEnvironment != null)
+            environment.putAll(shellCommandShellEnvironment.getEnvironment(currentPackageContext, executionCommand));
+
         return environment;
     }
 
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/command/environment/ShellCommandShellEnvironment.java b/termux-shared/src/main/java/com/termux/shared/shell/command/environment/ShellCommandShellEnvironment.java
new file mode 100644
index 0000000000..a898dec911
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/shell/command/environment/ShellCommandShellEnvironment.java
@@ -0,0 +1,62 @@
+package com.termux.shared.shell.command.environment;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+
+import com.termux.shared.shell.command.ExecutionCommand;
+
+import java.util.HashMap;
+
+/**
+ * Environment for {@link ExecutionCommand}.
+ */
+public class ShellCommandShellEnvironment {
+
+    /** Environment variable prefix for the {@link ExecutionCommand}. */
+    public static final String SHELL_CMD_ENV_PREFIX = "SHELL_CMD__";
+
+    /** Environment variable for the {@link ExecutionCommand.Runner} name. */
+    public static final String ENV_SHELL_CMD__RUNNER_NAME = SHELL_CMD_ENV_PREFIX + "RUNNER_NAME";
+
+    /** Environment variable for the package name running the {@link ExecutionCommand}. */
+    public static final String ENV_SHELL_CMD__PACKAGE_NAME = SHELL_CMD_ENV_PREFIX + "PACKAGE_NAME";
+
+    /** Environment variable for the {@link ExecutionCommand#id}/TermuxShellManager.SHELL_ID name.
+     * This will be common for all runners. */
+    public static final String ENV_SHELL_CMD__SHELL_ID = SHELL_CMD_ENV_PREFIX + "SHELL_ID";
+
+    /** Environment variable for the {@link ExecutionCommand#shellName} name. */
+    public static final String ENV_SHELL_CMD__SHELL_NAME = SHELL_CMD_ENV_PREFIX + "SHELL_NAME";
+    
+    /** Environment variable for the {@link ExecutionCommand.Runner#APP_SHELL} number since boot. */
+    public static final String ENV_SHELL_CMD__APP_SHELL_NUMBER_SINCE_BOOT = SHELL_CMD_ENV_PREFIX + "APP_SHELL_NUMBER_SINCE_BOOT";
+
+    /** Environment variable for the {{@link ExecutionCommand.Runner#TERMINAL_SESSION} number since boot. */
+    public static final String ENV_SHELL_CMD__TERMINAL_SESSION_NUMBER_SINCE_BOOT = SHELL_CMD_ENV_PREFIX + "TERMINAL_SESSION_NUMBER_SINCE_BOOT";
+
+    /** Environment variable for the {@link ExecutionCommand.Runner#APP_SHELL} number since app start. */
+    public static final String ENV_SHELL_CMD__APP_SHELL_NUMBER_SINCE_APP_START = SHELL_CMD_ENV_PREFIX + "APP_SHELL_NUMBER_SINCE_APP_START";
+
+    /** Environment variable for the {@link ExecutionCommand.Runner#TERMINAL_SESSION} number since app start. */
+    public static final String ENV_SHELL_CMD__TERMINAL_SESSION_NUMBER_SINCE_APP_START = SHELL_CMD_ENV_PREFIX + "TERMINAL_SESSION_NUMBER_SINCE_APP_START";
+
+
+    /** Get shell environment containing info for {@link ExecutionCommand}. */
+    @NonNull
+    public HashMap<String, String> getEnvironment(@NonNull Context currentPackageContext,
+                                                  @NonNull ExecutionCommand executionCommand) {
+        HashMap<String, String> environment = new HashMap<>();
+
+        ExecutionCommand.Runner runner = ExecutionCommand.Runner.runnerOf(executionCommand.runner);
+        if (runner == null) return environment;
+
+        ShellEnvironmentUtils.putToEnvIfSet(environment, ENV_SHELL_CMD__RUNNER_NAME, runner.getName());
+        ShellEnvironmentUtils.putToEnvIfSet(environment, ENV_SHELL_CMD__PACKAGE_NAME, currentPackageContext.getPackageName());
+        ShellEnvironmentUtils.putToEnvIfSet(environment, ENV_SHELL_CMD__SHELL_ID, String.valueOf(executionCommand.id));
+        ShellEnvironmentUtils.putToEnvIfSet(environment, ENV_SHELL_CMD__SHELL_NAME, executionCommand.shellName);
+
+        return environment;
+    }
+
+}
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxAppSharedPreferences.java b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxAppSharedPreferences.java
index f0f3eba1f7..a33be8e68e 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxAppSharedPreferences.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxAppSharedPreferences.java
@@ -215,6 +215,28 @@ public void setLastNotificationId(int notificationId) {
     }
 
 
+    public synchronized int getAndIncrementAppShellNumberSinceBoot() {
+        // Keep value at MAX_VALUE on integer overflow and not 0, since not first shell
+        return SharedPreferenceUtils.getAndIncrementInt(mSharedPreferences, TERMUX_APP.KEY_APP_SHELL_NUMBER_SINCE_BOOT,
+            TERMUX_APP.DEFAULT_VALUE_APP_SHELL_NUMBER_SINCE_BOOT, true, Integer.MAX_VALUE);
+    }
+
+    public synchronized void resetAppShellNumberSinceBoot() {
+        SharedPreferenceUtils.setInt(mSharedPreferences, TERMUX_APP.KEY_APP_SHELL_NUMBER_SINCE_BOOT,
+            TERMUX_APP.DEFAULT_VALUE_APP_SHELL_NUMBER_SINCE_BOOT, true);
+    }
+
+    public synchronized int getAndIncrementTerminalSessionNumberSinceBoot() {
+        // Keep value at MAX_VALUE on integer overflow and not 0, since not first shell
+        return SharedPreferenceUtils.getAndIncrementInt(mSharedPreferences, TERMUX_APP.KEY_TERMINAL_SESSION_NUMBER_SINCE_BOOT,
+            TERMUX_APP.DEFAULT_VALUE_TERMINAL_SESSION_NUMBER_SINCE_BOOT, true, Integer.MAX_VALUE);
+    }
+
+    public synchronized void resetTerminalSessionNumberSinceBoot() {
+        SharedPreferenceUtils.setInt(mSharedPreferences, TERMUX_APP.KEY_TERMINAL_SESSION_NUMBER_SINCE_BOOT,
+            TERMUX_APP.DEFAULT_VALUE_TERMINAL_SESSION_NUMBER_SINCE_BOOT, true);
+    }
+
 
     public boolean isTerminalViewKeyLoggingEnabled() {
         return SharedPreferenceUtils.getBoolean(mSharedPreferences, TERMUX_APP.KEY_TERMINAL_VIEW_KEY_LOGGING_ENABLED, TERMUX_APP.DEFAULT_VALUE_TERMINAL_VIEW_KEY_LOGGING_ENABLED);
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxPreferenceConstants.java b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxPreferenceConstants.java
index b03f19d001..80226914d7 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxPreferenceConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxPreferenceConstants.java
@@ -1,7 +1,7 @@
 package com.termux.shared.termux.settings.preferences;
 
 /*
- * Version: v0.15.0
+ * Version: v0.16.0
  *
  * Changelog
  *
@@ -65,8 +65,14 @@
  * - 0.15.0 (2021-09-05)
  *      - Added following to `TERMUX_TASKER_APP`:
  *          `KEY_LAST_PENDING_INTENT_REQUEST_CODE` and `DEFAULT_VALUE_KEY_LAST_PENDING_INTENT_REQUEST_CODE`.
+ *
+ * - 0.16.0 (2022-06-11)
+ *      - Added following to `TERMUX_APP`:
+ *          `KEY_APP_SHELL_NUMBER_SINCE_BOOT` and `KEY_TERMINAL_SESSION_NUMBER_SINCE_BOOT`.
  */
 
+import com.termux.shared.shell.command.ExecutionCommand;
+
 /**
  * A class that defines shared constants of the SharedPreferences used by Termux app and its plugins.
  * This class will be hosted by termux-shared lib and should be imported by other termux plugin
@@ -143,6 +149,18 @@ public static final class TERMUX_APP {
         public static final String KEY_LAST_NOTIFICATION_ID = "last_notification_id";
         public static final int DEFAULT_VALUE_KEY_LAST_NOTIFICATION_ID = 0;
 
+        /**
+         * The {@link ExecutionCommand.Runner#APP_SHELL} number after termux app process since boot.
+         */
+        public static final String KEY_APP_SHELL_NUMBER_SINCE_BOOT = "app_shell_number_since_boot";
+        public static final int DEFAULT_VALUE_APP_SHELL_NUMBER_SINCE_BOOT = 0;
+
+        /**
+         * The {@link ExecutionCommand.Runner#TERMINAL_SESSION} number after termux app process since boot.
+         */
+        public static final String KEY_TERMINAL_SESSION_NUMBER_SINCE_BOOT = "terminal_session_number_since_boot";
+        public static final int DEFAULT_VALUE_TERMINAL_SESSION_NUMBER_SINCE_BOOT = 0;
+
 
         /**
          * Defines the key for whether termux terminal view key logging is enabled or not
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/shell/TermuxShellManager.java b/termux-shared/src/main/java/com/termux/shared/termux/shell/TermuxShellManager.java
index 1cc52e6532..b5477b990b 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/shell/TermuxShellManager.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/shell/TermuxShellManager.java
@@ -40,6 +40,16 @@ public class TermuxShellManager {
      */
     public final List<ExecutionCommand> mPendingPluginExecutionCommands = new ArrayList<>();
 
+    /**
+     * The {@link ExecutionCommand.Runner#APP_SHELL} number after app process was started/restarted.
+     */
+    public static int APP_SHELL_NUMBER_SINCE_APP_START;
+
+    /**
+     * The {@link ExecutionCommand.Runner#TERMINAL_SESSION} number after app process was started/restarted.
+     */
+    public static int TERMINAL_SESSION_NUMBER_SINCE_APP_START;
+
 
 
     public TermuxShellManager(@NonNull Context context) {
@@ -69,8 +79,45 @@ public static TermuxShellManager getShellManager() {
     }
 
 
+    public synchronized static void onActionBootCompleted(@NonNull Context context, @NonNull Intent intent) {
+        TermuxAppSharedPreferences preferences = TermuxAppSharedPreferences.build(context);
+        if (preferences == null) return;
+
+        // Ensure any shells started after boot have valid ENV_SHELL_CMD__APP_SHELL_NUMBER_SINCE_BOOT and
+        // ENV_SHELL_CMD__TERMINAL_SESSION_NUMBER_SINCE_BOOT exported
+        preferences.resetAppShellNumberSinceBoot();
+        preferences.resetTerminalSessionNumberSinceBoot();
+    }
+
+    public static void onAppExit(@NonNull Context context) {
+        // Ensure any shells started after boot have valid ENV_SHELL_CMD__APP_SHELL_NUMBER_SINCE_APP_START and
+        // ENV_SHELL_CMD__TERMINAL_SESSION_NUMBER_SINCE_APP_START exported
+        APP_SHELL_NUMBER_SINCE_APP_START = 0;
+        TERMINAL_SESSION_NUMBER_SINCE_APP_START = 0;
+    }
+
     public static synchronized int getNextShellId() {
         return SHELL_ID++;
     }
 
+    public static synchronized int getAndIncrementAppShellNumberSinceAppStart() {
+        // Keep value at MAX_VALUE on integer overflow and not 0, since not first shell
+        int curValue = APP_SHELL_NUMBER_SINCE_APP_START;
+        if (curValue < 0) curValue = Integer.MAX_VALUE;
+
+        APP_SHELL_NUMBER_SINCE_APP_START = curValue + 1;
+        if (APP_SHELL_NUMBER_SINCE_APP_START < 0) APP_SHELL_NUMBER_SINCE_APP_START = Integer.MAX_VALUE;
+        return curValue;
+    }
+
+    public static synchronized int getAndIncrementTerminalSessionNumberSinceAppStart() {
+        // Keep value at MAX_VALUE on integer overflow and not 0, since not first shell
+        int curValue = TERMINAL_SESSION_NUMBER_SINCE_APP_START;
+        if (curValue < 0) curValue = Integer.MAX_VALUE;
+
+        TERMINAL_SESSION_NUMBER_SINCE_APP_START = curValue + 1;
+        if (TERMINAL_SESSION_NUMBER_SINCE_APP_START < 0) TERMINAL_SESSION_NUMBER_SINCE_APP_START = Integer.MAX_VALUE;
+        return curValue;
+    }
+
 }
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/shell/command/environment/TermuxShellCommandShellEnvironment.java b/termux-shared/src/main/java/com/termux/shared/termux/shell/command/environment/TermuxShellCommandShellEnvironment.java
new file mode 100644
index 0000000000..421d94b58c
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/termux/shell/command/environment/TermuxShellCommandShellEnvironment.java
@@ -0,0 +1,48 @@
+package com.termux.shared.termux.shell.command.environment;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+
+import com.termux.shared.shell.command.ExecutionCommand;
+import com.termux.shared.shell.command.environment.ShellCommandShellEnvironment;
+import com.termux.shared.shell.command.environment.ShellEnvironmentUtils;
+import com.termux.shared.termux.settings.preferences.TermuxAppSharedPreferences;
+import com.termux.shared.termux.shell.TermuxShellManager;
+
+import java.util.HashMap;
+
+/**
+ * Environment for Termux {@link ExecutionCommand}.
+ */
+public class TermuxShellCommandShellEnvironment extends ShellCommandShellEnvironment {
+
+    /** Get shell environment containing info for Termux {@link ExecutionCommand}. */
+    @NonNull
+    @Override
+    public HashMap<String, String> getEnvironment(@NonNull Context currentPackageContext,
+                                                  @NonNull ExecutionCommand executionCommand) {
+        HashMap<String, String> environment = super.getEnvironment(currentPackageContext, executionCommand);
+
+        TermuxAppSharedPreferences preferences = TermuxAppSharedPreferences.build(currentPackageContext);
+        if (preferences == null) return environment;
+
+        if (ExecutionCommand.Runner.APP_SHELL.equalsRunner(executionCommand.runner)) {
+            ShellEnvironmentUtils.putToEnvIfSet(environment, ENV_SHELL_CMD__APP_SHELL_NUMBER_SINCE_BOOT,
+                String.valueOf(preferences.getAndIncrementAppShellNumberSinceBoot()));
+            ShellEnvironmentUtils.putToEnvIfSet(environment, ENV_SHELL_CMD__APP_SHELL_NUMBER_SINCE_APP_START,
+                String.valueOf(TermuxShellManager.getAndIncrementAppShellNumberSinceAppStart()));
+
+        } else if (ExecutionCommand.Runner.TERMINAL_SESSION.equalsRunner(executionCommand.runner)) {
+            ShellEnvironmentUtils.putToEnvIfSet(environment, ENV_SHELL_CMD__TERMINAL_SESSION_NUMBER_SINCE_BOOT,
+                String.valueOf(preferences.getAndIncrementTerminalSessionNumberSinceBoot()));
+            ShellEnvironmentUtils.putToEnvIfSet(environment, ENV_SHELL_CMD__TERMINAL_SESSION_NUMBER_SINCE_APP_START,
+                String.valueOf(TermuxShellManager.getAndIncrementTerminalSessionNumberSinceAppStart()));
+        } else {
+            return environment;
+        }
+
+        return environment;
+    }
+
+}
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/shell/command/environment/TermuxShellEnvironment.java b/termux-shared/src/main/java/com/termux/shared/termux/shell/command/environment/TermuxShellEnvironment.java
index 0677c20f82..dce3c53482 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/shell/command/environment/TermuxShellEnvironment.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/shell/command/environment/TermuxShellEnvironment.java
@@ -23,6 +23,10 @@ public class TermuxShellEnvironment extends AndroidShellEnvironment {
     /** Environment variable for the termux {@link TermuxConstants#TERMUX_PREFIX_DIR_PATH}. */
     public static final String ENV_PREFIX = "PREFIX";
 
+    public TermuxShellEnvironment() {
+        super();
+        shellCommandShellEnvironment = new TermuxShellCommandShellEnvironment();
+    }
 
     /** Get shell environment for Termux. */
     @NonNull

From f76c20d036e88369c42958aa046a1c0345fdeca2 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sun, 12 Jun 2022 00:37:09 +0500
Subject: [PATCH 783/912] Added: Init `TermuxShellEnvironment` at app startup

This will currently cache `TermuxAppShellEnvironment` so that its not regenerated for each shell started since it contains some slightly expensive operations.
---
 app/src/main/java/com/termux/app/TermuxApplication.java      | 3 +++
 .../shell/command/environment/TermuxShellEnvironment.java    | 5 +++++
 2 files changed, 8 insertions(+)

diff --git a/app/src/main/java/com/termux/app/TermuxApplication.java b/app/src/main/java/com/termux/app/TermuxApplication.java
index 2af2a8db41..1688ab0bfe 100644
--- a/app/src/main/java/com/termux/app/TermuxApplication.java
+++ b/app/src/main/java/com/termux/app/TermuxApplication.java
@@ -60,6 +60,9 @@ public void onCreate() {
             }
 
             TermuxAmSocketServer.setupTermuxAmSocketServer(context);
+
+        // Init TermuxShellEnvironment constants and caches after everything has been setup including termux-am-socket server
+        TermuxShellEnvironment.init(this);
         }
     }
 
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/shell/command/environment/TermuxShellEnvironment.java b/termux-shared/src/main/java/com/termux/shared/termux/shell/command/environment/TermuxShellEnvironment.java
index dce3c53482..635a43269f 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/shell/command/environment/TermuxShellEnvironment.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/shell/command/environment/TermuxShellEnvironment.java
@@ -28,6 +28,11 @@ public TermuxShellEnvironment() {
         shellCommandShellEnvironment = new TermuxShellCommandShellEnvironment();
     }
 
+    /** Init {@link TermuxShellEnvironment} constants and caches. */
+    public synchronized static void init(@NonNull Context currentPackageContext) {
+        TermuxAppShellEnvironment.setTermuxAppEnvironment(currentPackageContext);
+    }
+
     /** Get shell environment for Termux. */
     @NonNull
     @Override

From 03e1d14e1e65e054eeeb0ad672a46c2c17254d3e Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sun, 12 Jun 2022 00:51:19 +0500
Subject: [PATCH 784/912] Added: Write termux shell environment to
 `/data/data/com.termux/files/usr/etc/termux/termux.env` on app startup and
 package changes

The `termux.env` can be sourced by shells to set termux environment normally exported. This can be useful for users starting termux shells with `adb` `run-as` or `root`. The file will not contain `SHELL_CMD__` variables since those are shell command specific.

The items in the `termux.env` file have the format `export name="value"`.
The `"`\$` characters will be escaped with `a backslash `\`, like `\"` if characters are for literal value. Note that if `$` is escaped and if its part of variable, then variable expansion will not happen if `.env` file is sourced. The `\` at the end of a value line means line continuation. Value can contain newline characters.

The `termux.env` file should be sourceable by `POSIX` compliant shells like `bash`, `zsh`, `sh`, android's `mksh`, etc. Other shells with require manual parsing of the file to export variables.

Related discussion #2565
---
 .../com/termux/app/TermuxApplication.java     | 13 +++--
 .../java/com/termux/app/TermuxService.java    |  6 +++
 .../termux/app/event/SystemEventReceiver.java | 44 +++++++++++++++
 .../environment/ShellEnvironmentUtils.java    | 54 +++++++++++++++++++
 .../environment/ShellEnvironmentVariable.java | 28 ++++++++++
 .../termux/shared/termux/TermuxConstants.java | 18 ++++++-
 .../com/termux/shared/termux/TermuxUtils.java | 12 +++++
 .../environment/TermuxShellEnvironment.java   | 26 +++++++++
 8 files changed, 196 insertions(+), 5 deletions(-)
 create mode 100644 termux-shared/src/main/java/com/termux/shared/shell/command/environment/ShellEnvironmentVariable.java

diff --git a/app/src/main/java/com/termux/app/TermuxApplication.java b/app/src/main/java/com/termux/app/TermuxApplication.java
index 1688ab0bfe..1123abf623 100644
--- a/app/src/main/java/com/termux/app/TermuxApplication.java
+++ b/app/src/main/java/com/termux/app/TermuxApplication.java
@@ -12,6 +12,7 @@
 import com.termux.shared.termux.file.TermuxFileUtils;
 import com.termux.shared.termux.settings.preferences.TermuxAppSharedPreferences;
 import com.termux.shared.termux.settings.properties.TermuxAppSharedProperties;
+import com.termux.shared.termux.shell.command.environment.TermuxShellEnvironment;
 import com.termux.shared.termux.shell.am.TermuxAmSocketServer;
 import com.termux.shared.termux.shell.TermuxShellManager;
 import com.termux.shared.termux.theme.TermuxThemeUtils;
@@ -48,9 +49,8 @@ public void onCreate() {
         // Check and create termux files directory. If failed to access it like in case of secondary
         // user or external sd card installation, then don't run files directory related code
         Error error = TermuxFileUtils.isTermuxFilesDirectoryAccessible(this, true, true);
-        if (error != null) {
-            Logger.logErrorExtended(LOG_TAG, "Termux files directory is not accessible\n" + error);
-        } else {
+        boolean isTermuxFilesDirectoryAccessible = error == null;
+        if (isTermuxFilesDirectoryAccessible) {
             Logger.logInfo(LOG_TAG, "Termux files directory is accessible");
 
             error = TermuxFileUtils.isAppsTermuxAppDirectoryAccessible(true, true);
@@ -59,10 +59,17 @@ public void onCreate() {
                 return;
             }
 
+            // Setup termux-am-socket server
             TermuxAmSocketServer.setupTermuxAmSocketServer(context);
+        } else {
+            Logger.logErrorExtended(LOG_TAG, "Termux files directory is not accessible\n" + error);
+        }
 
         // Init TermuxShellEnvironment constants and caches after everything has been setup including termux-am-socket server
         TermuxShellEnvironment.init(this);
+
+        if (isTermuxFilesDirectoryAccessible) {
+            TermuxShellEnvironment.writeEnvironmentToFile(this);
         }
     }
 
diff --git a/app/src/main/java/com/termux/app/TermuxService.java b/app/src/main/java/com/termux/app/TermuxService.java
index 4e9479160f..31581a6c0e 100644
--- a/app/src/main/java/com/termux/app/TermuxService.java
+++ b/app/src/main/java/com/termux/app/TermuxService.java
@@ -19,6 +19,7 @@
 import androidx.annotation.Nullable;
 
 import com.termux.R;
+import com.termux.app.event.SystemEventReceiver;
 import com.termux.app.terminal.TermuxTerminalSessionClient;
 import com.termux.shared.termux.plugins.TermuxPluginUtils;
 import com.termux.shared.data.IntentUtils;
@@ -116,6 +117,8 @@ public void onCreate() {
         mShellManager = TermuxShellManager.getShellManager();
 
         runStartForeground();
+
+        SystemEventReceiver.registerPackageUpdateEvents(this);
     }
 
     @SuppressLint("Wakelock")
@@ -172,6 +175,9 @@ public void onDestroy() {
             killAllTermuxExecutionCommands();
 
         TermuxShellManager.onAppExit(this);
+
+        SystemEventReceiver.unregisterPackageUpdateEvents(this);
+
         runStopForeground();
     }
 
diff --git a/app/src/main/java/com/termux/app/event/SystemEventReceiver.java b/app/src/main/java/com/termux/app/event/SystemEventReceiver.java
index 49a3c17261..efc710f312 100644
--- a/app/src/main/java/com/termux/app/event/SystemEventReceiver.java
+++ b/app/src/main/java/com/termux/app/event/SystemEventReceiver.java
@@ -2,12 +2,18 @@
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.net.Uri;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import com.termux.shared.data.IntentUtils;
 import com.termux.shared.logger.Logger;
+import com.termux.shared.termux.TermuxUtils;
+import com.termux.shared.termux.file.TermuxFileUtils;
+import com.termux.shared.termux.shell.command.environment.TermuxShellEnvironment;
 import com.termux.shared.termux.shell.TermuxShellManager;
 
 public class SystemEventReceiver extends BroadcastReceiver {
@@ -35,6 +41,11 @@ public void onReceive(@NonNull Context context, @Nullable Intent intent) {
             case Intent.ACTION_BOOT_COMPLETED:
                 onActionBootCompleted(context, intent);
                 break;
+            case Intent.ACTION_PACKAGE_ADDED:
+            case Intent.ACTION_PACKAGE_REMOVED:
+            case Intent.ACTION_PACKAGE_REPLACED:
+                onActionPackageUpdated(context, intent);
+                break;
             default:
                 Logger.logError(LOG_TAG, "Invalid action \"" + action + "\" passed to " + LOG_TAG);
         }
@@ -44,4 +55,37 @@ public synchronized void onActionBootCompleted(@NonNull Context context, @NonNul
         TermuxShellManager.onActionBootCompleted(context, intent);
     }
 
+    public synchronized void onActionPackageUpdated(@NonNull Context context, @NonNull Intent intent) {
+        Uri data = intent.getData();
+        if (data != null && TermuxUtils.isUriDataForTermuxPluginPackage(data)) {
+            Logger.logDebug(LOG_TAG, intent.getAction().replaceAll("^android.intent.action.", "") +
+                " event received for \"" + data.toString().replaceAll("^package:", "") + "\"");
+            if (TermuxFileUtils.isTermuxFilesDirectoryAccessible(context, false, false) == null)
+                TermuxShellEnvironment.writeEnvironmentToFile(context);
+        }
+    }
+
+
+
+    /**
+     * Register {@link SystemEventReceiver} to listen to {@link Intent#ACTION_PACKAGE_ADDED},
+     * {@link Intent#ACTION_PACKAGE_REMOVED} and {@link Intent#ACTION_PACKAGE_REPLACED} broadcasts.
+     * They must be registered dynamically and cannot be registered implicitly in
+     * the AndroidManifest.xml due to Android 8+ restrictions.
+     *
+     *  https://developer.android.com/guide/components/broadcast-exceptions
+     */
+    public synchronized static void registerPackageUpdateEvents(@NonNull Context context) {
+        IntentFilter intentFilter = new IntentFilter();
+        intentFilter.addAction(Intent.ACTION_PACKAGE_ADDED);
+        intentFilter.addAction(Intent.ACTION_PACKAGE_REMOVED);
+        intentFilter.addAction(Intent.ACTION_PACKAGE_REPLACED);
+        intentFilter.addDataScheme("package");
+        context.registerReceiver(getInstance(), intentFilter);
+    }
+
+    public synchronized static void unregisterPackageUpdateEvents(@NonNull Context context) {
+        context.unregisterReceiver(getInstance());
+    }
+
 }
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/command/environment/ShellEnvironmentUtils.java b/termux-shared/src/main/java/com/termux/shared/shell/command/environment/ShellEnvironmentUtils.java
index 03ec6ab55a..9b331c3335 100644
--- a/termux-shared/src/main/java/com/termux/shared/shell/command/environment/ShellEnvironmentUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/shell/command/environment/ShellEnvironmentUtils.java
@@ -42,6 +42,60 @@ public static List<String> convertEnvironmentToEnviron(@NonNull HashMap<String,
         return environmentList;
     }
 
+    /**
+     * Convert environment {@link HashMap} to {@link String} where each item equals "key=value".
+     *
+     */
+    @NonNull
+    public static String convertEnvironmentToDotEnvFile(@NonNull HashMap<String, String> environmentMap) {
+        return convertEnvironmentToDotEnvFile(convertEnvironmentMapToEnvironmentVariableList(environmentMap));
+    }
+
+    /**
+     * Convert environment {@link HashMap} to `.env` file {@link String}.
+     *
+     * The items in the `.env` file have the format `export name="value"`.
+     *
+     * If the {@link ShellEnvironmentVariable#escaped} is set to {@code true}, then
+     * {@link ShellEnvironmentVariable#value} will be considered to be a literal value that has
+     * already been escaped by the caller, otherwise all the `"`\$` in the value will be escaped
+     * with `a backslash `\`, like `\"`. Note that if `$` is escaped and if its part of variable,
+     * then variable expansion will not happen if `.env` file is sourced.
+     *
+     * The `\` at the end of a value line means line continuation. Value can contain newline characters.
+     *
+     * Check {@link #isValidEnvironmentVariableName(String)} and {@link #isValidEnvironmentVariableValue(String)}
+     * for valid variable names and values.
+     *
+     * https://github.com/ko1nksm/shdotenv#env-file-syntax
+     * https://github.com/ko1nksm/shdotenv/blob/main/docs/specification.md
+     */
+    @NonNull
+    public static String convertEnvironmentToDotEnvFile(@NonNull List<ShellEnvironmentVariable> environmentList) {
+        StringBuilder environment = new StringBuilder();
+        Collections.sort(environmentList);
+        for (ShellEnvironmentVariable variable : environmentList) {
+            if (isValidEnvironmentVariableNameValuePair(variable.name, variable.value, true) && variable.value != null) {
+                environment.append("export ").append(variable.name).append("=\"")
+                    .append(variable.escaped ? variable.value : variable.value.replaceAll("([\"`\\\\$])", "\\\\$1"))
+                    .append("\"\n");
+            }
+        }
+        return environment.toString();
+    }
+
+    /**
+     * Convert environment {@link HashMap} to {@link List< ShellEnvironmentVariable >}. Each item
+     * will have its {@link ShellEnvironmentVariable#escaped} set to {@code false}.
+     */
+    @NonNull
+    public static List<ShellEnvironmentVariable> convertEnvironmentMapToEnvironmentVariableList(@NonNull HashMap<String, String> environmentMap) {
+        List<ShellEnvironmentVariable> environmentList = new ArrayList<>();
+        for (String name :environmentMap.keySet()) {
+            environmentList.add(new ShellEnvironmentVariable(name, environmentMap.get(name), false));
+        }
+        return environmentList;
+    }
 
     /**
      * Check if environment variable name and value pair is valid. Errors will be logged if
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/command/environment/ShellEnvironmentVariable.java b/termux-shared/src/main/java/com/termux/shared/shell/command/environment/ShellEnvironmentVariable.java
new file mode 100644
index 0000000000..f4abee3a27
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/shell/command/environment/ShellEnvironmentVariable.java
@@ -0,0 +1,28 @@
+package com.termux.shared.shell.command.environment;
+
+public class ShellEnvironmentVariable implements Comparable<ShellEnvironmentVariable> {
+
+    /** The name for environment variable */
+    public String name;
+
+    /** The value for environment variable */
+    public String value;
+
+    /** If environment variable {@link #value} is already escaped. */
+    public boolean escaped;
+
+    public ShellEnvironmentVariable(String name, String value) {
+        this(name, value, false);
+    }
+
+    public ShellEnvironmentVariable(String name, String value, boolean escaped) {
+        this.name = name;
+        this.value = value;
+        this.escaped = escaped;
+    }
+
+    @Override
+    public int compareTo(ShellEnvironmentVariable other) {
+        return this.name.compareTo(other.name);
+    }
+}
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
index 309ef97006..8678027ed1 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
@@ -11,7 +11,7 @@
 import java.util.List;
 
 /*
- * Version: v0.49.0
+ * Version: v0.50.0
  * SPDX-License-Identifier: MIT
  *
  * Changelog
@@ -266,8 +266,11 @@
  *      - Removed `TERMUX_GAME_PACKAGES_GITHUB_*`, `TERMUX_SCIENCE_PACKAGES_GITHUB_*`,
  *          `TERMUX_ROOT_PACKAGES_GITHUB_*`, `TERMUX_UNSTABLE_PACKAGES_GITHUB_*`
  *
- * - 0.49.0 (2022-06-10)
+ * - 0.49.0 (2022-06-11)
  *      - Added `TERMUX_ENV_PREFIX_ROOT`.
+ *
+ * - 0.50.0 (2022-06-11)
+ *      - Added `TERMUX_CONFIG_PREFIX_DIR_PATH`, `TERMUX_ENV_FILE_PATH` and `TERMUX_ENV_TEMP_FILE_PATH`.
  */
 
 /**
@@ -650,6 +653,11 @@ public final class TermuxConstants {
     /** Termux app config home directory */
     public static final File TERMUX_CONFIG_HOME_DIR = new File(TERMUX_CONFIG_HOME_DIR_PATH);
 
+    /** Termux app config $PREFIX directory path */
+    public static final String TERMUX_CONFIG_PREFIX_DIR_PATH = TERMUX_ETC_PREFIX_DIR_PATH + "/termux"; // Default: "/data/data/com.termux/files/usr/etc/termux"
+    /** Termux app config $PREFIX directory */
+    public static final File TERMUX_CONFIG_PREFIX_DIR = new File(TERMUX_CONFIG_PREFIX_DIR_PATH);
+
 
     /** Termux app data home directory path */
     public static final String TERMUX_DATA_HOME_DIR_PATH = TERMUX_HOME_DIR_PATH + "/.termux"; // Default: "/data/data/com.termux/files/home/.termux"
@@ -756,6 +764,12 @@ public final class TermuxConstants {
     public static final String TERMUX_CRASH_LOG_BACKUP_FILE_PATH = TERMUX_HOME_DIR_PATH + "/crash_log_backup.md"; // Default: "/data/data/com.termux/files/home/crash_log_backup.md"
 
 
+    /** Termux app environment file path */
+    public static final String TERMUX_ENV_FILE_PATH = TERMUX_CONFIG_PREFIX_DIR_PATH + "/termux.env"; // Default: "/data/data/com.termux/files/usr/etc/termux/termux.env"
+
+    /** Termux app environment temp file path */
+    public static final String TERMUX_ENV_TEMP_FILE_PATH = TERMUX_CONFIG_PREFIX_DIR_PATH + "/termux.env.tmp"; // Default: "/data/data/com.termux/files/usr/etc/termux/termux.env.tmp"
+
 
 
 
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
index 4104fe5b36..793968afcb 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
@@ -6,6 +6,7 @@
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
+import android.net.Uri;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -273,6 +274,17 @@ public static Object getTermuxAppAPKClassField(@NonNull Context currentPackageCo
 
 
 
+    /** Returns {@code true} if {@link Uri} has `package:` scheme for {@link TermuxConstants#TERMUX_PACKAGE_NAME} or its sub plugin package. */
+    public static boolean isUriDataForTermuxOrPluginPackage(@NonNull Uri data) {
+        return data.toString().equals("package:" + TermuxConstants.TERMUX_PACKAGE_NAME) ||
+            data.toString().startsWith("package:" + TermuxConstants.TERMUX_PACKAGE_NAME + ".");
+    }
+
+    /** Returns {@code true} if {@link Uri} has `package:` scheme for {@link TermuxConstants#TERMUX_PACKAGE_NAME} sub plugin package. */
+    public static boolean isUriDataForTermuxPluginPackage(@NonNull Uri data) {
+        return data.toString().startsWith("package:" + TermuxConstants.TERMUX_PACKAGE_NAME + ".");
+    }
+
     /**
      * Send the {@link TermuxConstants#BROADCAST_TERMUX_OPENED} broadcast to notify apps that Termux
      * app has been opened.
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/shell/command/environment/TermuxShellEnvironment.java b/termux-shared/src/main/java/com/termux/shared/termux/shell/command/environment/TermuxShellEnvironment.java
index 635a43269f..acabc47e34 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/shell/command/environment/TermuxShellEnvironment.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/shell/command/environment/TermuxShellEnvironment.java
@@ -4,8 +4,13 @@
 
 import androidx.annotation.NonNull;
 
+import com.termux.shared.errors.Error;
+import com.termux.shared.file.FileUtils;
+import com.termux.shared.logger.Logger;
 import com.termux.shared.shell.command.ExecutionCommand;
 import com.termux.shared.shell.command.environment.AndroidShellEnvironment;
+import com.termux.shared.shell.command.environment.ShellEnvironmentUtils;
+import com.termux.shared.shell.command.environment.ShellCommandShellEnvironment;
 import com.termux.shared.termux.TermuxBootstrap;
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.termux.shell.TermuxShellUtils;
@@ -28,11 +33,32 @@ public TermuxShellEnvironment() {
         shellCommandShellEnvironment = new TermuxShellCommandShellEnvironment();
     }
 
+
     /** Init {@link TermuxShellEnvironment} constants and caches. */
     public synchronized static void init(@NonNull Context currentPackageContext) {
         TermuxAppShellEnvironment.setTermuxAppEnvironment(currentPackageContext);
     }
 
+    /** Init {@link TermuxShellEnvironment} constants and caches. */
+    public synchronized static void writeEnvironmentToFile(@NonNull Context currentPackageContext) {
+        HashMap<String, String> environmentMap = new TermuxShellEnvironment().getEnvironment(currentPackageContext, false);
+        String environmentString = ShellEnvironmentUtils.convertEnvironmentToDotEnvFile(environmentMap);
+
+        // Write environment string to temp file and then move to final location since otherwise
+        // writing may happen while file is being sourced/read
+        Error error = FileUtils.writeTextToFile("termux.env.tmp", TermuxConstants.TERMUX_ENV_TEMP_FILE_PATH,
+            Charset.defaultCharset(), environmentString, false);
+        if (error != null) {
+            Logger.logErrorExtended(LOG_TAG, error.toString());
+            return;
+        }
+
+        error = FileUtils.moveRegularFile("termux.env.tmp", TermuxConstants.TERMUX_ENV_TEMP_FILE_PATH, TermuxConstants.TERMUX_ENV_FILE_PATH, true);
+        if (error != null) {
+            Logger.logErrorExtended(LOG_TAG, error.toString());
+        }
+    }
+
     /** Get shell environment for Termux. */
     @NonNull
     @Override

From 42eee49d308958ee23376eb6e029a7bf61907f94 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sun, 12 Jun 2022 02:35:46 +0500
Subject: [PATCH 785/912] Added: Add `SettingsProviderUtils` to get `Setting`
 global, secure and system namespace values

---
 .../shared/android/SettingsProviderUtils.java | 99 +++++++++++++++++++
 1 file changed, 99 insertions(+)
 create mode 100644 termux-shared/src/main/java/com/termux/shared/android/SettingsProviderUtils.java

diff --git a/termux-shared/src/main/java/com/termux/shared/android/SettingsProviderUtils.java b/termux-shared/src/main/java/com/termux/shared/android/SettingsProviderUtils.java
new file mode 100644
index 0000000000..4b7cde5975
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/android/SettingsProviderUtils.java
@@ -0,0 +1,99 @@
+package com.termux.shared.android;
+
+import android.content.Context;
+import android.provider.Settings;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.termux.shared.logger.Logger;
+
+public class SettingsProviderUtils {
+
+    private static final String LOG_TAG = "SettingsProviderUtils";
+
+    /** The namespaces for {@link Settings} provider. */
+    public enum SettingNamespace {
+        /** The {@link Settings.Global} namespace */
+        GLOBAL,
+
+        /** The {@link Settings.Secure} namespace */
+        SECURE,
+
+        /** The {@link Settings.System} namespace */
+        SYSTEM
+    }
+
+    /** The type of values for {@link Settings} provider. */
+    public enum SettingType {
+        FLOAT,
+        INT,
+        LONG,
+        STRING,
+        URI
+    }
+
+    /**
+     * Get settings key value from {@link SettingNamespace} namespace and of {@link SettingType} type.
+     *
+     * @param context The {@link Context} for operations.
+     * @param namespace The {@link SettingNamespace} in which to get key value from.
+     * @param type The {@link SettingType} for the key.
+     * @param key The {@link String} name for key.
+     * @param def The {@link Object} default value for key.
+     * @return Returns the key value. This will be {@code null} if an exception is raised.
+     */
+    @Nullable
+    public static Object getSettingsValue(@NonNull Context context, @NonNull SettingNamespace namespace,
+                                          @NonNull SettingType type, @NonNull String key, @Nullable Object def) {
+        try {
+            switch (namespace) {
+                case GLOBAL:
+                    switch (type) {
+                        case FLOAT:
+                            return Settings.Global.getFloat(context.getContentResolver(), key);
+                        case INT:
+                            return Settings.Global.getInt(context.getContentResolver(), key);
+                        case LONG:
+                            return Settings.Global.getLong(context.getContentResolver(), key);
+                        case STRING:
+                            return Settings.Global.getString(context.getContentResolver(), key);
+                        case URI:
+                            return Settings.Global.getUriFor(key);
+                    }
+                case SECURE:
+                    switch (type) {
+                        case FLOAT:
+                            return Settings.Secure.getFloat(context.getContentResolver(), key);
+                        case INT:
+                            return Settings.Secure.getInt(context.getContentResolver(), key);
+                        case LONG:
+                            return Settings.Secure.getLong(context.getContentResolver(), key);
+                        case STRING:
+                            return Settings.Secure.getString(context.getContentResolver(), key);
+                        case URI:
+                            return Settings.Secure.getUriFor(key);
+                    }
+                case SYSTEM:
+                    switch (type) {
+                        case FLOAT:
+                            return Settings.System.getFloat(context.getContentResolver(), key);
+                        case INT:
+                            return Settings.System.getInt(context.getContentResolver(), key);
+                        case LONG:
+                            return Settings.System.getLong(context.getContentResolver(), key);
+                        case STRING:
+                            return Settings.System.getString(context.getContentResolver(), key);
+                        case URI:
+                            return Settings.System.getUriFor(key);
+                    }
+            }
+        } catch (Settings.SettingNotFoundException e) {
+            // Ignore
+        } catch (Exception e) {
+            Logger.logError(LOG_TAG, "Failed to get \"" + key + "\" key value from settings \"" + namespace.name() + "\" namespace of type \"" + type.name() + "\"");
+        }
+        return def;
+    }
+
+}

From b69630355a45d4eb80ae3d35f633280b39477d00 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sun, 12 Jun 2022 02:48:06 +0500
Subject: [PATCH 786/912] Added: Add `PhantomProcessUtils` to get phantom
 processes related settings values

- `settings_enable_monitor_phantom_procs` feature flag value can be received with a call to `getFeatureFlagMonitorPhantomProcsValueString()`. Likely only available on Android `12L+`.

- `max_phantom_processes` value from `dumpsys activity settings` output can be received with a call to `getActivityManagerMaxPhantomProcesses()`. Requires granting Termux `DUMP` and `PACKAGE_USAGE_STATS` permission. Can be granted with `adb shell "pm grant com.termux android.permission.PACKAGE_USAGE_STATS; pm grant com.termux android.permission.DUMP"` and revoked with `adb shell "pm revoke com.termux android.permission.PACKAGE_USAGE_STATS; pm revoke com.termux android.permission.DUMP"`.

- `device_config_sync_disabled` settings global namespace value can be received with a call to `getSettingsGlobalDeviceConfigSyncDisabled()`.
---
 .../shared/android/FeatureFlagUtils.java      |  14 +--
 .../shared/android/PhantomProcessUtils.java   | 115 ++++++++++++++++++
 2 files changed, 116 insertions(+), 13 deletions(-)
 create mode 100644 termux-shared/src/main/java/com/termux/shared/android/PhantomProcessUtils.java

diff --git a/termux-shared/src/main/java/com/termux/shared/android/FeatureFlagUtils.java b/termux-shared/src/main/java/com/termux/shared/android/FeatureFlagUtils.java
index 42c1b8017a..14e6cd5b3c 100644
--- a/termux-shared/src/main/java/com/termux/shared/android/FeatureFlagUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/android/FeatureFlagUtils.java
@@ -80,19 +80,6 @@ public String getName() {
 
     public static final String FEATURE_FLAGS_CLASS = "android.util.FeatureFlagUtils";
 
-    /**
-     * If set to false, then will disable trimming of phantom process and processes using excessive
-     * CPU. Flag is available on Pixel Android 12L beta 3 and Android 13. Availability on other
-     * devices will depend on if other vendors merged the 09dcdad5 commit or not in their releases
-     * and if they actually want to support the flag.
-     *
-     * https://github.com/termux/termux-app/issues/2366
-     * https://issuetracker.google.com/u/1/issues/205156966#comment28
-     * https://cs.android.com/android/_/android/platform/frameworks/base/+/09dcdad5
-     * https://github.com/agnostic-apollo/Android-Docs/tree/master/ocs/apps/processes/phantom-cached-and-empty-processes.md
-     */
-    public static final String SETTINGS_ENABLE_MONITOR_PHANTOM_PROCS = "settings_enable_monitor_phantom_procs";
-
     private static final String LOG_TAG = "FeatureFlagUtils";
 
     /**
@@ -133,6 +120,7 @@ public static Boolean featureFlagExists(@NonNull String feature) {
      * @param feature The {@link String} name for feature.
      * @return Returns {@link FeatureFlagValue}.
      */
+    @NonNull
     public static FeatureFlagValue getFeatureFlagValueString(@NonNull Context context, @NonNull String feature) {
         Boolean featureFlagExists = featureFlagExists(feature);
         if (featureFlagExists == null) {
diff --git a/termux-shared/src/main/java/com/termux/shared/android/PhantomProcessUtils.java b/termux-shared/src/main/java/com/termux/shared/android/PhantomProcessUtils.java
new file mode 100644
index 0000000000..c4dc7790f7
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/android/PhantomProcessUtils.java
@@ -0,0 +1,115 @@
+package com.termux.shared.android;
+
+import android.Manifest;
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.termux.shared.logger.Logger;
+import com.termux.shared.shell.command.environment.AndroidShellEnvironment;
+import com.termux.shared.shell.command.ExecutionCommand;
+import com.termux.shared.shell.command.runner.app.AppShell;
+
+/**
+ * Utils for phantom processes added in android 12.
+ *
+ * https://github.com/termux/termux-app/issues/2366
+ * https://issuetracker.google.com/u/1/issues/205156966#comment28
+ * https://cs.android.com/android/_/android/platform/frameworks/base/+/09dcdad5
+ * https://github.com/agnostic-apollo/Android-Docs/tree/master/ocs/apps/processes/phantom-cached-and-empty-processes.md
+ */
+public class PhantomProcessUtils {
+
+    private static final String LOG_TAG = "PhantomProcessUtils";
+
+    /**
+     * If feature flag set to false, then will disable trimming of phantom process and processes using
+     * excessive CPU. Flag is available on Pixel Android 12L beta 3 and Android 13. Availability on
+     * other devices will depend on if other vendors merged the 09dcdad5 commit or not in their releases
+     * and if they actually want to support the flag. Check {@link FeatureFlagUtils} javadocs for
+     * more details.
+     */
+    public static final String FEATURE_FLAG_SETTINGS_ENABLE_MONITOR_PHANTOM_PROCS = "settings_enable_monitor_phantom_procs";
+
+    /**
+     * Maximum number of allowed phantom processes. It is also used as the label for the currently
+     * enforced ActivityManagerConstants MAX_PHANTOM_PROCESSES value in the `dumpsys activity settings`
+     * output.
+     *
+     * https://cs.android.com/android/platform/superproject/+/android-12.0.0_r4:frameworks/base/services/core/java/com/android/server/am/ActivityManagerConstants.java;l=574
+     * https://cs.android.com/android/platform/superproject/+/android-12.0.0_r4:frameworks/base/services/core/java/com/android/server/am/ActivityManagerConstants.java;l=172
+     */
+    public static final String KEY_MAX_PHANTOM_PROCESSES = "max_phantom_processes";
+
+    /**
+     * Whether or not syncs (bulk set operations) for DeviceConfig are disabled currently. The value
+     * is boolean (1 or 0). The value '1' means that DeviceConfig#setProperties(DeviceConfig.Properties)
+     * will return {@code false}.
+     *
+     * https://cs.android.com/android/platform/superproject/+/android-12.0.0_r4:frameworks/base/core/java/android/provider/DeviceConfig.java
+     * https://cs.android.com/android/platform/superproject/+/android-12.0.0_r4:frameworks/base/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java;l=1186
+     * https://cs.android.com/android/platform/superproject/+/android-12.0.0_r4:frameworks/base/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java;l=1142
+     */
+    public static final String SETTINGS_GLOBAL_DEVICE_CONFIG_SYNC_DISABLED = "device_config_sync_disabled";
+
+    /**
+     * Get {@link #FEATURE_FLAG_SETTINGS_ENABLE_MONITOR_PHANTOM_PROCS} feature flag value.
+     *
+     * @param context The {@link Context} for operations.
+     * @return Returns {@link FeatureFlagUtils.FeatureFlagValue}.
+     */
+    @NonNull
+    public static FeatureFlagUtils.FeatureFlagValue getFeatureFlagMonitorPhantomProcsValueString(@NonNull Context context) {
+        return FeatureFlagUtils.getFeatureFlagValueString(context, FEATURE_FLAG_SETTINGS_ENABLE_MONITOR_PHANTOM_PROCS);
+    }
+
+    /**
+     * Get currently enforced ActivityManagerConstants MAX_PHANTOM_PROCESSES value, defaults to 32.
+     * Can be changed by modifying device config activity_manager namespace "max_phantom_processes" value.
+     *
+     * @param context The {@link Context} for operations.
+     * @return Returns {@link Integer}.
+     */
+    @Nullable
+    public static Integer getActivityManagerMaxPhantomProcesses(@NonNull Context context) {
+        if (!PermissionUtils.checkPermissions(context, new String[]{Manifest.permission.DUMP, Manifest.permission.PACKAGE_USAGE_STATS})) {
+            return null;
+        }
+
+        // Dumpsys logs the currently enforced MAX_PHANTOM_PROCESSES value and not the device config setting.
+        String script = "/system/bin/dumpsys activity settings | /system/bin/grep -iE '^[\t ]+" + KEY_MAX_PHANTOM_PROCESSES + "=[0-9]+$' | /system/bin/cut -d = -f2";
+        ExecutionCommand executionCommand = new ExecutionCommand(-1, "/system/bin/sh", null,
+            script + "\n", "/", ExecutionCommand.Runner.APP_SHELL.getName(), true);
+        executionCommand.commandLabel = " ActivityManager " + KEY_MAX_PHANTOM_PROCESSES + " Command";
+        executionCommand.backgroundCustomLogLevel = Logger.LOG_LEVEL_OFF;
+        AppShell appShell = AppShell.execute(context, executionCommand, null, new AndroidShellEnvironment(), null, true);
+        boolean stderrSet = !executionCommand.resultData.stderr.toString().isEmpty();
+        if (appShell == null || !executionCommand.isSuccessful() || executionCommand.resultData.exitCode != 0 || stderrSet) {
+            Logger.logErrorExtended(LOG_TAG, executionCommand.toString());
+            return null;
+        }
+
+        try {
+            return Integer.parseInt(executionCommand.resultData.stdout.toString().trim());
+        } catch (NumberFormatException e) {
+            Logger.logStackTraceWithMessage(LOG_TAG, "The " + executionCommand.commandLabel + " did not return a valid integer", e);
+            Logger.logErrorExtended(LOG_TAG, executionCommand.toString());
+        }
+
+        return null;
+    }
+
+    /**
+     * Get {@link #SETTINGS_GLOBAL_DEVICE_CONFIG_SYNC_DISABLED} settings value.
+     *
+     * @param context The {@link Context} for operations.
+     * @return Returns {@link Integer}.
+     */
+    @Nullable
+    public static Integer getSettingsGlobalDeviceConfigSyncDisabled(@NonNull Context context) {
+        return (Integer) SettingsProviderUtils.getSettingsValue(context, SettingsProviderUtils.SettingNamespace.GLOBAL,
+            SettingsProviderUtils.SettingType.INT, SETTINGS_GLOBAL_DEVICE_CONFIG_SYNC_DISABLED, null);
+    }
+
+}

From c2ddc23ae5bc21f18bc886e30a8b67e1c3c987f0 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sun, 12 Jun 2022 02:50:38 +0500
Subject: [PATCH 787/912] Added: Add `MAX_PHANTOM_PROCESSES` and
 `DEVICE_CONFIG_SYNC_DISABLED` value to device info output like shown in
 Termux About page

Related commit b6963035
---
 .../app/activities/SettingsActivity.java      |  2 +-
 .../terminal/TermuxTerminalViewClient.java    |  2 +-
 .../termux/shared/android/AndroidUtils.java   | 30 ++++++++++++++++---
 .../termux/shared/markdown/MarkdownUtils.java |  4 +++
 .../shared/termux/crash/TermuxCrashUtils.java |  2 +-
 .../termux/plugins/TermuxPluginUtils.java     |  2 +-
 termux-shared/src/main/res/values/strings.xml |  1 +
 7 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/termux/app/activities/SettingsActivity.java b/app/src/main/java/com/termux/app/activities/SettingsActivity.java
index 8c871a449a..7ca7848335 100644
--- a/app/src/main/java/com/termux/app/activities/SettingsActivity.java
+++ b/app/src/main/java/com/termux/app/activities/SettingsActivity.java
@@ -120,7 +120,7 @@ public void run() {
 
                             StringBuilder aboutString = new StringBuilder();
                             aboutString.append(TermuxUtils.getAppInfoMarkdownString(context, TermuxUtils.AppInfoMode.TERMUX_AND_PLUGIN_PACKAGES));
-                            aboutString.append("\n\n").append(AndroidUtils.getDeviceInfoMarkdownString(context));
+                            aboutString.append("\n\n").append(AndroidUtils.getDeviceInfoMarkdownString(context, true));
                             aboutString.append("\n\n").append(TermuxUtils.getImportantLinksMarkdownString(context));
 
                             String userActionName = UserAction.ABOUT.getName();
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
index 1a3a8c3d8c..e352c790b8 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
@@ -755,7 +755,7 @@ public void run() {
                     reportString.append("\n\n").append(TermuxUtils.getAppInfoMarkdownString(mActivity, TermuxUtils.AppInfoMode.TERMUX_PACKAGE));
                 }
 
-                reportString.append("\n\n").append(AndroidUtils.getDeviceInfoMarkdownString(mActivity));
+                reportString.append("\n\n").append(AndroidUtils.getDeviceInfoMarkdownString(mActivity, true));
 
                 if (TermuxBootstrap.isAppPackageManagerAPT()) {
                     String termuxAptInfo = TermuxUtils.geAPTInfoMarkdownString(mActivity);
diff --git a/termux-shared/src/main/java/com/termux/shared/android/AndroidUtils.java b/termux-shared/src/main/java/com/termux/shared/android/AndroidUtils.java
index bc229f454a..bca47578e9 100644
--- a/termux-shared/src/main/java/com/termux/shared/android/AndroidUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/android/AndroidUtils.java
@@ -9,6 +9,7 @@
 import androidx.annotation.NonNull;
 
 import com.google.common.base.Joiner;
+import com.termux.shared.R;
 import com.termux.shared.data.DataUtils;
 import com.termux.shared.logger.Logger;
 import com.termux.shared.markdown.MarkdownUtils;
@@ -50,7 +51,7 @@ public static String getAppInfoMarkdownString(@NonNull final Context context) {
             AndroidUtils.appendPropertyToMarkdown(markdownString,"FILES_DIR", filesDir);
 
 
-        if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.N ) {
+        if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
             Long userId = PackageUtils.getUserIdForPackage(context);
             if (userId == null || userId != 0)
                 AndroidUtils.appendPropertyToMarkdown(markdownString, "USER_ID", userId);
@@ -99,13 +100,18 @@ public static String getAppInfoMarkdownString(@NonNull final Context context, @N
         return markdownString.toString();
     }
 
+    public static String getDeviceInfoMarkdownString(@NonNull final Context context) {
+        return getDeviceInfoMarkdownString(context, false);
+    }
+
     /**
      * Get a markdown {@link String} for the device info.
      *
      * @param context The context for operations.
+     * @param addPhantomProcessesInfo If phantom processes info should be added on Android >= 12.
      * @return Returns the markdown {@link String}.
      */
-    public static String getDeviceInfoMarkdownString(@NonNull final Context context) {
+    public static String getDeviceInfoMarkdownString(@NonNull final Context context, boolean addPhantomProcessesInfo) {
         // Some properties cannot be read with {@link System#getProperty(String)} but can be read
         // directly by running getprop command
         Properties systemProperties = getSystemProperties();
@@ -133,8 +139,16 @@ public static String getDeviceInfoMarkdownString(@NonNull final Context context)
         appendPropertyToMarkdown(markdownString, "TAGS", Build.TAGS);
 
         // If on Android >= 12
-        if (Build.VERSION.SDK_INT > Build.VERSION_CODES.R)
-            appendPropertyToMarkdown(markdownString, "MONITOR_PHANTOM_PROCS", FeatureFlagUtils.getFeatureFlagValueString(context, FeatureFlagUtils.SETTINGS_ENABLE_MONITOR_PHANTOM_PROCS).getName());
+        if (Build.VERSION.SDK_INT > Build.VERSION_CODES.R) {
+            Integer maxPhantomProcesses = PhantomProcessUtils.getActivityManagerMaxPhantomProcesses(context);
+            if (maxPhantomProcesses != null)
+                appendPropertyToMarkdown(markdownString, "MAX_PHANTOM_PROCESSES", maxPhantomProcesses);
+            else
+                appendLiteralPropertyToMarkdown(markdownString, "MAX_PHANTOM_PROCESSES", "- (*" + context.getString(R.string.msg_requires_dump_and_package_usage_stats_permissions) + "*)");
+
+            appendPropertyToMarkdown(markdownString, "MONITOR_PHANTOM_PROCS", PhantomProcessUtils.getFeatureFlagMonitorPhantomProcsValueString(context).getName());
+            appendPropertyToMarkdown(markdownString, "DEVICE_CONFIG_SYNC_DISABLED", PhantomProcessUtils.getSettingsGlobalDeviceConfigSyncDisabled(context));
+        }
 
         markdownString.append("\n\n### Hardware\n");
         appendPropertyToMarkdown(markdownString, "MANUFACTURER", Build.MANUFACTURER);
@@ -222,6 +236,14 @@ public static String getPropertyMarkdown(String label, Object value) {
         return MarkdownUtils.getSingleLineMarkdownStringEntry(label, value, "-");
     }
 
+    public static void appendLiteralPropertyToMarkdown(StringBuilder markdownString, String label, Object value) {
+        markdownString.append("\n").append(getLiteralPropertyMarkdown(label, value));
+    }
+
+    public static String getLiteralPropertyMarkdown(String label, Object value) {
+        return MarkdownUtils.getLiteralSingleLineMarkdownStringEntry(label, value, "-");
+    }
+
 
 
     public static String getCurrentTimeStamp() {
diff --git a/termux-shared/src/main/java/com/termux/shared/markdown/MarkdownUtils.java b/termux-shared/src/main/java/com/termux/shared/markdown/MarkdownUtils.java
index 08d8c867ef..4e1b482ec4 100644
--- a/termux-shared/src/main/java/com/termux/shared/markdown/MarkdownUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/markdown/MarkdownUtils.java
@@ -106,6 +106,10 @@ public static int getMaxConsecutiveBackTicksCount(String string) {
 
 
 
+    public static String getLiteralSingleLineMarkdownStringEntry(String label, Object object, String def) {
+        return "**" + label + "**: " + (object != null ? object.toString() : def) +  "  ";
+    }
+
     public static String getSingleLineMarkdownStringEntry(String label, Object object, String def) {
         if (object != null)
             return "**" + label + "**: " + getMarkdownCodeForString(object.toString(), false) +  "  ";
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/crash/TermuxCrashUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/crash/TermuxCrashUtils.java
index 8117af025f..1cd4ce0668 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/crash/TermuxCrashUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/crash/TermuxCrashUtils.java
@@ -324,7 +324,7 @@ public static void sendCrashReportNotification(final Context currentPackageConte
             reportString.append("\n\n").append(TermuxUtils.getAppInfoMarkdownString(currentPackageContext, appInfoMode, currentPackageName));
 
         if (addDeviceInfo)
-            reportString.append("\n\n").append(AndroidUtils.getDeviceInfoMarkdownString(currentPackageContext));
+            reportString.append("\n\n").append(AndroidUtils.getDeviceInfoMarkdownString(currentPackageContext, true));
 
         String userActionName = UserAction.CRASH_REPORT.getName();
 
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/plugins/TermuxPluginUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/plugins/TermuxPluginUtils.java
index 8d83dc0f41..cb37ddc3fe 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/plugins/TermuxPluginUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/plugins/TermuxPluginUtils.java
@@ -362,7 +362,7 @@ public static void sendPluginCommandErrorNotification(Context currentPackageCont
                 callingPackageName != null ? callingPackageName : currentPackageName));
 
         if (addDeviceInfo)
-            reportString.append("\n\n").append(AndroidUtils.getDeviceInfoMarkdownString(currentPackageContext));
+            reportString.append("\n\n").append(AndroidUtils.getDeviceInfoMarkdownString(currentPackageContext, true));
 
         String userActionName = UserAction.PLUGIN_EXECUTION_COMMAND.getName();
 
diff --git a/termux-shared/src/main/res/values/strings.xml b/termux-shared/src/main/res/values/strings.xml
index c9f1622bb4..9124a889ae 100644
--- a/termux-shared/src/main/res/values/strings.xml
+++ b/termux-shared/src/main/res/values/strings.xml
@@ -36,6 +36,7 @@
     <string name="error_attempted_to_check_for_permissions_not_requested">Attempted to check for permissions that have not been requested in app manifest: %1$s</string>
     <string name="error_attempted_to_ask_for_permissions_not_requested">Attempted to ask for permissions that have not been requested in app manifest: %1$s</string>
     <string name="error_has_not_requested_legacy_external_storage">The \"%1$s\" package is targeting targetSdkVersion %2$d and is running on android sdk %3$d but has not set requestLegacyExternalStorage to true in app manifest</string>
+    <string name="msg_requires_dump_and_package_usage_stats_permissions">Requires `DUMP` and `PACKAGE_USAGE_STATS` permission</string>
 
 
 

From 841c41bf37e8d7a6b8bd20598f56daad6ffccce4 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Mon, 13 Jun 2022 16:07:04 +0500
Subject: [PATCH 788/912] Added|Changed: Added
 `TermuxTerminalSessionServiceClient` and renamed
 `TermuxTerminalSessionClient` to `TermuxTerminalSessionActivityClient`

Addition of `TermuxTerminalSessionServiceClient` is required so that interface methods that `TermuxService` can handle without `TermuxActivity` should implemented instead of relying on base implementation of `TermuxTerminalSessionClientBase`.
---
 .../java/com/termux/app/TermuxActivity.java   | 52 ++++++++--------
 .../java/com/termux/app/TermuxService.java    | 61 ++++++++++---------
 ... TermuxTerminalSessionActivityClient.java} | 11 ++--
 .../TermuxTerminalSessionServiceClient.java   | 24 ++++++++
 .../terminal/TermuxTerminalViewClient.java    | 28 ++++-----
 .../terminal/io/TermuxTerminalExtraKeys.java  | 12 ++--
 6 files changed, 108 insertions(+), 80 deletions(-)
 rename app/src/main/java/com/termux/app/terminal/{TermuxTerminalSessionClient.java => TermuxTerminalSessionActivityClient.java} (98%)
 create mode 100644 app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionServiceClient.java

diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index 47fe2363f6..1abc104cfe 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -30,6 +30,7 @@
 
 import com.termux.R;
 import com.termux.app.terminal.TermuxActivityRootView;
+import com.termux.app.terminal.TermuxTerminalSessionActivityClient;
 import com.termux.app.terminal.io.TermuxTerminalExtraKeys;
 import com.termux.shared.activities.ReportActivity;
 import com.termux.shared.activity.ActivityUtils;
@@ -44,7 +45,6 @@
 import com.termux.shared.termux.settings.preferences.TermuxAppSharedPreferences;
 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.termux.extrakeys.ExtraKeysView;
 import com.termux.shared.termux.interact.TextInputDialogUtils;
@@ -101,7 +101,7 @@ public final class TermuxActivity extends AppCompatActivity implements ServiceCo
      *  The {@link TerminalSessionClient} interface implementation to allow for communication between
      *  {@link TerminalSession} and {@link TermuxActivity}.
      */
-    TermuxTerminalSessionClient mTermuxTerminalSessionClient;
+    TermuxTerminalSessionActivityClient mTermuxTerminalSessionActivityClient;
 
     /**
      * Termux app shared preferences manager.
@@ -285,8 +285,8 @@ public void onStart() {
 
         mIsVisible = true;
 
-        if (mTermuxTerminalSessionClient != null)
-            mTermuxTerminalSessionClient.onStart();
+        if (mTermuxTerminalSessionActivityClient != null)
+            mTermuxTerminalSessionActivityClient.onStart();
 
         if (mTermuxTerminalViewClient != null)
             mTermuxTerminalViewClient.onStart();
@@ -305,8 +305,8 @@ public void onResume() {
 
         if (mIsInvalidState) return;
 
-        if (mTermuxTerminalSessionClient != null)
-            mTermuxTerminalSessionClient.onResume();
+        if (mTermuxTerminalSessionActivityClient != null)
+            mTermuxTerminalSessionActivityClient.onResume();
 
         if (mTermuxTerminalViewClient != null)
             mTermuxTerminalViewClient.onResume();
@@ -328,8 +328,8 @@ protected void onStop() {
 
         mIsVisible = false;
 
-        if (mTermuxTerminalSessionClient != null)
-            mTermuxTerminalSessionClient.onStop();
+        if (mTermuxTerminalSessionActivityClient != null)
+            mTermuxTerminalSessionActivityClient.onStop();
 
         if (mTermuxTerminalViewClient != null)
             mTermuxTerminalViewClient.onStop();
@@ -399,7 +399,7 @@ public void onServiceConnected(ComponentName componentName, IBinder service) {
                         if (intent != null && intent.getExtras() != null) {
                             launchFailsafe = intent.getExtras().getBoolean(TERMUX_ACTIVITY.EXTRA_FAILSAFE_SESSION, false);
                         }
-                        mTermuxTerminalSessionClient.addNewSession(launchFailsafe, null);
+                        mTermuxTerminalSessionActivityClient.addNewSession(launchFailsafe, null);
                     } catch (WindowManager.BadTokenException e) {
                         // Activity finished - ignore.
                     }
@@ -415,14 +415,14 @@ public void onServiceConnected(ComponentName componentName, IBinder service) {
             if (!mIsActivityRecreated && intent != null && Intent.ACTION_RUN.equals(intent.getAction())) {
                 // Android 7.1 app shortcut from res/xml/shortcuts.xml.
                 boolean isFailSafe = intent.getBooleanExtra(TERMUX_ACTIVITY.EXTRA_FAILSAFE_SESSION, false);
-                mTermuxTerminalSessionClient.addNewSession(isFailSafe, null);
+                mTermuxTerminalSessionActivityClient.addNewSession(isFailSafe, null);
             } else {
-                mTermuxTerminalSessionClient.setCurrentSession(mTermuxTerminalSessionClient.getCurrentStoredSessionOrLast());
+                mTermuxTerminalSessionActivityClient.setCurrentSession(mTermuxTerminalSessionActivityClient.getCurrentStoredSessionOrLast());
             }
         }
 
         // Update the {@link TerminalSession} and {@link TerminalEmulator} clients.
-        mTermuxService.setTermuxTerminalSessionClient(mTermuxTerminalSessionClient);
+        mTermuxService.setTermuxTerminalSessionClient(mTermuxTerminalSessionActivityClient);
     }
 
     @Override
@@ -479,8 +479,8 @@ public void removeTermuxActivityRootViewGlobalLayoutListener() {
 
     private void setTermuxTerminalViewAndClients() {
         // Set termux terminal view and session clients
-        mTermuxTerminalSessionClient = new TermuxTerminalSessionClient(this);
-        mTermuxTerminalViewClient = new TermuxTerminalViewClient(this, mTermuxTerminalSessionClient);
+        mTermuxTerminalSessionActivityClient = new TermuxTerminalSessionActivityClient(this);
+        mTermuxTerminalViewClient = new TermuxTerminalViewClient(this, mTermuxTerminalSessionActivityClient);
 
         // Set termux terminal view
         mTerminalView = findViewById(R.id.terminal_view);
@@ -489,8 +489,8 @@ private void setTermuxTerminalViewAndClients() {
         if (mTermuxTerminalViewClient != null)
             mTermuxTerminalViewClient.onCreate();
 
-        if (mTermuxTerminalSessionClient != null)
-            mTermuxTerminalSessionClient.onCreate();
+        if (mTermuxTerminalSessionActivityClient != null)
+            mTermuxTerminalSessionActivityClient.onCreate();
     }
 
     private void setTermuxSessionsListView() {
@@ -505,7 +505,7 @@ private void setTermuxSessionsListView() {
 
     private void setTerminalToolbarView(Bundle savedInstanceState) {
         mTermuxTerminalExtraKeys = new TermuxTerminalExtraKeys(this, mTerminalView,
-            mTermuxTerminalViewClient, mTermuxTerminalSessionClient);
+            mTermuxTerminalViewClient, mTermuxTerminalSessionActivityClient);
 
         final ViewPager terminalToolbarViewPager = getTerminalToolbarViewPager();
         if (mPreferences.shouldShowTerminalToolbar()) terminalToolbarViewPager.setVisibility(View.VISIBLE);
@@ -568,11 +568,11 @@ private void setSettingsButtonView() {
 
     private void setNewSessionButtonView() {
         View newSessionButton = findViewById(R.id.new_session_button);
-        newSessionButton.setOnClickListener(v -> mTermuxTerminalSessionClient.addNewSession(false, null));
+        newSessionButton.setOnClickListener(v -> mTermuxTerminalSessionActivityClient.addNewSession(false, null));
         newSessionButton.setOnLongClickListener(v -> {
             TextInputDialogUtils.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),
+                R.string.action_create_named_session_confirm, text -> mTermuxTerminalSessionActivityClient.addNewSession(false, text),
+                R.string.action_new_session_failsafe, text -> mTermuxTerminalSessionActivityClient.addNewSession(true, text),
                 -1, null, null);
             return true;
         });
@@ -713,8 +713,8 @@ private void onResetTerminalSession(TerminalSession session) {
             session.reset();
             showToast(getResources().getString(R.string.msg_terminal_reset), true);
 
-            if (mTermuxTerminalSessionClient != null)
-                mTermuxTerminalSessionClient.onResetTerminalSession();
+            if (mTermuxTerminalSessionActivityClient != null)
+                mTermuxTerminalSessionActivityClient.onResetTerminalSession();
         }
     }
 
@@ -878,8 +878,8 @@ public TermuxTerminalViewClient getTermuxTerminalViewClient() {
         return mTermuxTerminalViewClient;
     }
 
-    public TermuxTerminalSessionClient getTermuxTerminalSessionClient() {
-        return mTermuxTerminalSessionClient;
+    public TermuxTerminalSessionActivityClient getTermuxTerminalSessionClient() {
+        return mTermuxTerminalSessionActivityClient;
     }
 
     @Nullable
@@ -974,8 +974,8 @@ private void reloadActivityStyling(boolean recreateActivity) {
         setMargins();
         setTerminalToolbarHeight();
 
-        if (mTermuxTerminalSessionClient != null)
-            mTermuxTerminalSessionClient.onReloadActivityStyling();
+        if (mTermuxTerminalSessionActivityClient != null)
+            mTermuxTerminalSessionActivityClient.onReloadActivityStyling();
 
         if (mTermuxTerminalViewClient != null)
             mTermuxTerminalViewClient.onReloadActivityStyling();
diff --git a/app/src/main/java/com/termux/app/TermuxService.java b/app/src/main/java/com/termux/app/TermuxService.java
index 31581a6c0e..d26259e102 100644
--- a/app/src/main/java/com/termux/app/TermuxService.java
+++ b/app/src/main/java/com/termux/app/TermuxService.java
@@ -20,7 +20,8 @@
 
 import com.termux.R;
 import com.termux.app.event.SystemEventReceiver;
-import com.termux.app.terminal.TermuxTerminalSessionClient;
+import com.termux.app.terminal.TermuxTerminalSessionActivityClient;
+import com.termux.app.terminal.TermuxTerminalSessionServiceClient;
 import com.termux.shared.termux.plugins.TermuxPluginUtils;
 import com.termux.shared.data.IntentUtils;
 import com.termux.shared.net.uri.UriUtils;
@@ -80,12 +81,12 @@ class LocalBinder extends Binder {
      * that holds activity references for activity related functions.
      * Note that the service may often outlive the activity, so need to clear this reference.
      */
-    TermuxTerminalSessionClient mTermuxTerminalSessionClient;
+    private TermuxTerminalSessionActivityClient mTermuxTerminalSessionActivityClient;
 
     /** The basic implementation of the {@link TerminalSessionClient} interface to be used by {@link TerminalSession}
-     * that does not hold activity references.
+     * that does not hold activity references and only a service reference.
      */
-    final TermuxTerminalSessionClientBase mTermuxTerminalSessionClientBase = new TermuxTerminalSessionClientBase();
+    private final TermuxTerminalSessionServiceClient mTermuxTerminalSessionServiceClient = new TermuxTerminalSessionServiceClient(this);
 
     /**
      * Termux app shared properties manager, loaded from termux.properties
@@ -194,7 +195,7 @@ public boolean onUnbind(Intent intent) {
         // Since we cannot rely on {@link TermuxActivity.onDestroy()} to always complete,
         // we unset clients here as well if it failed, so that we do not leave service and session
         // clients with references to the activity.
-        if (mTermuxTerminalSessionClient != null)
+        if (mTermuxTerminalSessionActivityClient != null)
             unsetTermuxTerminalSessionClient();
         return false;
     }
@@ -558,7 +559,7 @@ private void executeTermuxSessionCommand(ExecutionCommand executionCommand) {
 
     /**
      * Create a {@link TermuxSession}.
-     * Currently called by {@link TermuxTerminalSessionClient#addNewSession(boolean, String)} to add a new {@link TermuxSession}.
+     * Currently called by {@link TermuxTerminalSessionActivityClient#addNewSession(boolean, String)} to add a new {@link TermuxSession}.
      */
     @Nullable
     public TermuxSession createTermuxSession(String executablePath, String[] arguments, String stdin,
@@ -613,8 +614,8 @@ public synchronized TermuxSession createTermuxSession(ExecutionCommand execution
 
         // Notify {@link TermuxSessionsListViewController} that sessions list has been updated if
         // activity in is foreground
-        if (mTermuxTerminalSessionClient != null)
-            mTermuxTerminalSessionClient.termuxSessionListNotifyUpdated();
+        if (mTermuxTerminalSessionActivityClient != null)
+            mTermuxTerminalSessionActivityClient.termuxSessionListNotifyUpdated();
 
         updateNotification();
 
@@ -650,8 +651,8 @@ public void onTermuxSessionExited(final TermuxSession termuxSession) {
 
             // Notify {@link TermuxSessionsListViewController} that sessions list has been updated if
             // activity in is foreground
-            if (mTermuxTerminalSessionClient != null)
-                mTermuxTerminalSessionClient.termuxSessionListNotifyUpdated();
+            if (mTermuxTerminalSessionActivityClient != null)
+                mTermuxTerminalSessionActivityClient.termuxSessionListNotifyUpdated();
         }
 
         updateNotification();
@@ -686,8 +687,8 @@ private void handleSessionAction(int sessionAction, TerminalSession newTerminalS
         switch (sessionAction) {
             case TERMUX_SERVICE.VALUE_EXTRA_SESSION_ACTION_SWITCH_TO_NEW_SESSION_AND_OPEN_ACTIVITY:
                 setCurrentStoredTerminalSession(newTerminalSession);
-                if (mTermuxTerminalSessionClient != null)
-                    mTermuxTerminalSessionClient.setCurrentSession(newTerminalSession);
+                if (mTermuxTerminalSessionActivityClient != null)
+                    mTermuxTerminalSessionActivityClient.setCurrentSession(newTerminalSession);
                 startTermuxActivity();
                 break;
             case TERMUX_SERVICE.VALUE_EXTRA_SESSION_ACTION_KEEP_CURRENT_SESSION_AND_OPEN_ACTIVITY:
@@ -697,8 +698,8 @@ private void handleSessionAction(int sessionAction, TerminalSession newTerminalS
                 break;
             case TERMUX_SERVICE.VALUE_EXTRA_SESSION_ACTION_SWITCH_TO_NEW_SESSION_AND_DONT_OPEN_ACTIVITY:
                 setCurrentStoredTerminalSession(newTerminalSession);
-                if (mTermuxTerminalSessionClient != null)
-                    mTermuxTerminalSessionClient.setCurrentSession(newTerminalSession);
+                if (mTermuxTerminalSessionActivityClient != null)
+                    mTermuxTerminalSessionActivityClient.setCurrentSession(newTerminalSession);
                 break;
             case TERMUX_SERVICE.VALUE_EXTRA_SESSION_ACTION_KEEP_CURRENT_SESSION_AND_DONT_OPEN_ACTIVITY:
                 if (getTermuxSessionsSize() == 1)
@@ -732,35 +733,35 @@ private void startTermuxActivity() {
 
     /** If {@link TermuxActivity} has not bound to the {@link TermuxService} yet or is destroyed, then
      * interface functions requiring the activity should not be available to the terminal sessions,
-     * so we just return the {@link #mTermuxTerminalSessionClientBase}. Once {@link TermuxActivity} bind
+     * so we just return the {@link #mTermuxTerminalSessionServiceClient}. Once {@link TermuxActivity} bind
      * callback is received, it should call {@link #setTermuxTerminalSessionClient} to set the
-     * {@link TermuxService#mTermuxTerminalSessionClient} so that further terminal sessions are directly
-     * passed the {@link TermuxTerminalSessionClient} object which fully implements the
+     * {@link TermuxService#mTermuxTerminalSessionActivityClient} so that further terminal sessions are directly
+     * passed the {@link TermuxTerminalSessionActivityClient} object which fully implements the
      * {@link TerminalSessionClient} interface.
      *
-     * @return Returns the {@link TermuxTerminalSessionClient} if {@link TermuxActivity} has bound with
-     * {@link TermuxService}, otherwise {@link TermuxTerminalSessionClientBase}.
+     * @return Returns the {@link TermuxTerminalSessionActivityClient} if {@link TermuxActivity} has bound with
+     * {@link TermuxService}, otherwise {@link TermuxTerminalSessionServiceClient}.
      */
     public synchronized TermuxTerminalSessionClientBase getTermuxTerminalSessionClient() {
-        if (mTermuxTerminalSessionClient != null)
-            return mTermuxTerminalSessionClient;
+        if (mTermuxTerminalSessionActivityClient != null)
+            return mTermuxTerminalSessionActivityClient;
         else
-            return mTermuxTerminalSessionClientBase;
+            return mTermuxTerminalSessionServiceClient;
     }
 
     /** This should be called when {@link TermuxActivity#onServiceConnected} is called to set the
-     * {@link TermuxService#mTermuxTerminalSessionClient} variable and update the {@link TerminalSession}
-     * and {@link TerminalEmulator} clients in case they were passed {@link TermuxTerminalSessionClientBase}
+     * {@link TermuxService#mTermuxTerminalSessionActivityClient} variable and update the {@link TerminalSession}
+     * and {@link TerminalEmulator} clients in case they were passed {@link TermuxTerminalSessionServiceClient}
      * earlier.
      *
-     * @param termuxTerminalSessionClient The {@link TermuxTerminalSessionClient} object that fully
+     * @param termuxTerminalSessionActivityClient The {@link TermuxTerminalSessionActivityClient} object that fully
      * implements the {@link TerminalSessionClient} interface.
      */
-    public synchronized void setTermuxTerminalSessionClient(TermuxTerminalSessionClient termuxTerminalSessionClient) {
-        mTermuxTerminalSessionClient = termuxTerminalSessionClient;
+    public synchronized void setTermuxTerminalSessionClient(TermuxTerminalSessionActivityClient termuxTerminalSessionActivityClient) {
+        mTermuxTerminalSessionActivityClient = termuxTerminalSessionActivityClient;
 
         for (int i = 0; i < mShellManager.mTermuxSessions.size(); i++)
-            mShellManager.mTermuxSessions.get(i).getTerminalSession().updateTerminalSessionClient(mTermuxTerminalSessionClient);
+            mShellManager.mTermuxSessions.get(i).getTerminalSession().updateTerminalSessionClient(mTermuxTerminalSessionActivityClient);
     }
 
     /** This should be called when {@link TermuxActivity} has been destroyed and in {@link #onUnbind(Intent)}
@@ -769,9 +770,9 @@ public synchronized void setTermuxTerminalSessionClient(TermuxTerminalSessionCli
      */
     public synchronized void unsetTermuxTerminalSessionClient() {
         for (int i = 0; i < mShellManager.mTermuxSessions.size(); i++)
-            mShellManager.mTermuxSessions.get(i).getTerminalSession().updateTerminalSessionClient(mTermuxTerminalSessionClientBase);
+            mShellManager.mTermuxSessions.get(i).getTerminalSession().updateTerminalSessionClient(mTermuxTerminalSessionServiceClient);
 
-        mTermuxTerminalSessionClient = null;
+        mTermuxTerminalSessionActivityClient = null;
     }
 
 
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionActivityClient.java
similarity index 98%
rename from app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java
rename to app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionActivityClient.java
index 1054d91fec..e507cd192a 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionActivityClient.java
@@ -1,6 +1,7 @@
 package com.termux.app.terminal;
 
 import android.annotation.SuppressLint;
+import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.ClipData;
 import android.content.ClipboardManager;
@@ -27,6 +28,7 @@
 import com.termux.shared.logger.Logger;
 import com.termux.terminal.TerminalColors;
 import com.termux.terminal.TerminalSession;
+import com.termux.terminal.TerminalSessionClient;
 import com.termux.terminal.TextStyle;
 
 import java.io.File;
@@ -34,7 +36,8 @@
 import java.io.InputStream;
 import java.util.Properties;
 
-public class TermuxTerminalSessionClient extends TermuxTerminalSessionClientBase {
+/** The {@link TerminalSessionClient} implementation that may require an {@link Activity} for its interface methods. */
+public class TermuxTerminalSessionActivityClient extends TermuxTerminalSessionClientBase {
 
     private final TermuxActivity mActivity;
 
@@ -44,9 +47,9 @@ public class TermuxTerminalSessionClient extends TermuxTerminalSessionClientBase
 
     private int mBellSoundId;
 
-    private static final String LOG_TAG = "TermuxTerminalSessionClient";
+    private static final String LOG_TAG = "TermuxTerminalSessionActivityClient";
 
-    public TermuxTerminalSessionClient(TermuxActivity activity) {
+    public TermuxTerminalSessionActivityClient(TermuxActivity activity) {
         this.mActivity = activity;
     }
 
@@ -238,7 +241,7 @@ public void onTerminalCursorStateChange(boolean enabled) {
     public void setTerminalShellPid(@NonNull TerminalSession terminalSession, int pid) {
         TermuxService service = mActivity.getTermuxService();
         if (service == null) return;
-
+        
         TermuxSession termuxSession = service.getTermuxSessionForTerminalSession(terminalSession);
         if (termuxSession != null)
             termuxSession.getExecutionCommand().mPid = pid;
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionServiceClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionServiceClient.java
new file mode 100644
index 0000000000..6941a348a2
--- /dev/null
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionServiceClient.java
@@ -0,0 +1,24 @@
+package com.termux.app.terminal;
+
+import android.app.Service;
+
+import androidx.annotation.NonNull;
+
+import com.termux.app.TermuxService;
+import com.termux.shared.termux.shell.command.runner.terminal.TermuxSession;
+import com.termux.shared.termux.terminal.TermuxTerminalSessionClientBase;
+import com.termux.terminal.TerminalSession;
+import com.termux.terminal.TerminalSessionClient;
+
+/** The {@link TerminalSessionClient} implementation that may require a {@link Service} for its interface methods. */
+public class TermuxTerminalSessionServiceClient extends TermuxTerminalSessionClientBase {
+
+    private static final String LOG_TAG = "TermuxTerminalSessionServiceClient";
+
+    private final TermuxService mService;
+
+    public TermuxTerminalSessionServiceClient(TermuxService service) {
+        this.mService = service;
+    }
+
+}
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
index e352c790b8..9c38cdbc08 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
@@ -57,7 +57,7 @@ public class TermuxTerminalViewClient extends TermuxTerminalViewClientBase {
 
     final TermuxActivity mActivity;
 
-    final TermuxTerminalSessionClient mTermuxTerminalSessionClient;
+    final TermuxTerminalSessionActivityClient mTermuxTerminalSessionActivityClient;
 
     /** Keeping track of the special keys acting as Ctrl and Fn for the soft keyboard and other hardware keys. */
     boolean mVirtualControlKeyDown, mVirtualFnKeyDown;
@@ -73,9 +73,9 @@ public class TermuxTerminalViewClient extends TermuxTerminalViewClientBase {
 
     private static final String LOG_TAG = "TermuxTerminalViewClient";
 
-    public TermuxTerminalViewClient(TermuxActivity activity, TermuxTerminalSessionClient termuxTerminalSessionClient) {
+    public TermuxTerminalViewClient(TermuxActivity activity, TermuxTerminalSessionActivityClient termuxTerminalSessionActivityClient) {
         this.mActivity = activity;
-        this.mTermuxTerminalSessionClient = termuxTerminalSessionClient;
+        this.mTermuxTerminalSessionActivityClient = termuxTerminalSessionActivityClient;
     }
 
     public TermuxActivity getActivity() {
@@ -242,7 +242,7 @@ public boolean onKeyDown(int keyCode, KeyEvent e, TerminalSession currentSession
         if (handleVirtualKeys(keyCode, e, true)) return true;
 
         if (keyCode == KeyEvent.KEYCODE_ENTER && !currentSession.isRunning()) {
-            mTermuxTerminalSessionClient.removeFinishedSession(currentSession);
+            mTermuxTerminalSessionActivityClient.removeFinishedSession(currentSession);
             return true;
         } else if (!mActivity.getProperties().areHardwareKeyboardShortcutsDisabled() &&
             e.isCtrlPressed() && e.isAltPressed()) {
@@ -250,9 +250,9 @@ public boolean onKeyDown(int keyCode, KeyEvent e, TerminalSession currentSession
             int unicodeChar = e.getUnicodeChar(0);
 
             if (keyCode == KeyEvent.KEYCODE_DPAD_DOWN || unicodeChar == 'n'/* next */) {
-                mTermuxTerminalSessionClient.switchToSession(true);
+                mTermuxTerminalSessionActivityClient.switchToSession(true);
             } else if (keyCode == KeyEvent.KEYCODE_DPAD_UP || unicodeChar == 'p' /* previous */) {
-                mTermuxTerminalSessionClient.switchToSession(false);
+                mTermuxTerminalSessionActivityClient.switchToSession(false);
             } else if (keyCode == KeyEvent.KEYCODE_DPAD_RIGHT) {
                 mActivity.getDrawer().openDrawer(Gravity.LEFT);
             } else if (keyCode == KeyEvent.KEYCODE_DPAD_LEFT) {
@@ -262,9 +262,9 @@ public boolean onKeyDown(int keyCode, KeyEvent e, TerminalSession currentSession
             } else if (unicodeChar == 'm'/* menu */) {
                 mActivity.getTerminalView().showContextMenu();
             } else if (unicodeChar == 'r'/* rename */) {
-                mTermuxTerminalSessionClient.renameSession(currentSession);
+                mTermuxTerminalSessionActivityClient.renameSession(currentSession);
             } else if (unicodeChar == 'c'/* create */) {
-                mTermuxTerminalSessionClient.addNewSession(false, null);
+                mTermuxTerminalSessionActivityClient.addNewSession(false, null);
             } else if (unicodeChar == 'u' /* urls */) {
                 showUrlSelection();
             } else if (unicodeChar == 'v') {
@@ -277,7 +277,7 @@ public boolean onKeyDown(int keyCode, KeyEvent e, TerminalSession currentSession
                 changeFontSize(false);
             } else if (unicodeChar >= '1' && unicodeChar <= '9') {
                 int index = unicodeChar - '1';
-                mTermuxTerminalSessionClient.switchToSession(index);
+                mTermuxTerminalSessionActivityClient.switchToSession(index);
             }
             return true;
         }
@@ -461,7 +461,7 @@ public boolean onCodePoint(final int codePoint, boolean ctrlDown, TerminalSessio
             return true;
         } else if (ctrlDown) {
             if (codePoint == 106 /* Ctrl+j or \n */ && !session.isRunning()) {
-                mTermuxTerminalSessionClient.removeFinishedSession(session);
+                mTermuxTerminalSessionActivityClient.removeFinishedSession(session);
                 return true;
             }
 
@@ -473,16 +473,16 @@ public boolean onCodePoint(final int codePoint, boolean ctrlDown, TerminalSessio
                     if (codePointLowerCase == shortcut.codePoint) {
                         switch (shortcut.shortcutAction) {
                             case TermuxPropertyConstants.ACTION_SHORTCUT_CREATE_SESSION:
-                                mTermuxTerminalSessionClient.addNewSession(false, null);
+                                mTermuxTerminalSessionActivityClient.addNewSession(false, null);
                                 return true;
                             case TermuxPropertyConstants.ACTION_SHORTCUT_NEXT_SESSION:
-                                mTermuxTerminalSessionClient.switchToSession(true);
+                                mTermuxTerminalSessionActivityClient.switchToSession(true);
                                 return true;
                             case TermuxPropertyConstants.ACTION_SHORTCUT_PREVIOUS_SESSION:
-                                mTermuxTerminalSessionClient.switchToSession(false);
+                                mTermuxTerminalSessionActivityClient.switchToSession(false);
                                 return true;
                             case TermuxPropertyConstants.ACTION_SHORTCUT_RENAME_SESSION:
-                                mTermuxTerminalSessionClient.renameSession(mActivity.getCurrentSession());
+                                mTermuxTerminalSessionActivityClient.renameSession(mActivity.getCurrentSession());
                                 return true;
                         }
                     }
diff --git a/app/src/main/java/com/termux/app/terminal/io/TermuxTerminalExtraKeys.java b/app/src/main/java/com/termux/app/terminal/io/TermuxTerminalExtraKeys.java
index 48cd6be28b..bcb70655e4 100644
--- a/app/src/main/java/com/termux/app/terminal/io/TermuxTerminalExtraKeys.java
+++ b/app/src/main/java/com/termux/app/terminal/io/TermuxTerminalExtraKeys.java
@@ -8,7 +8,7 @@
 import androidx.drawerlayout.widget.DrawerLayout;
 
 import com.termux.app.TermuxActivity;
-import com.termux.app.terminal.TermuxTerminalSessionClient;
+import com.termux.app.terminal.TermuxTerminalSessionActivityClient;
 import com.termux.app.terminal.TermuxTerminalViewClient;
 import com.termux.shared.logger.Logger;
 import com.termux.shared.termux.extrakeys.ExtraKeysConstants;
@@ -26,18 +26,18 @@ public class TermuxTerminalExtraKeys extends TerminalExtraKeys {
 
     final TermuxActivity mActivity;
     final TermuxTerminalViewClient mTermuxTerminalViewClient;
-    final TermuxTerminalSessionClient mTermuxTerminalSessionClient;
+    final TermuxTerminalSessionActivityClient mTermuxTerminalSessionActivityClient;
 
     private static final String LOG_TAG = "TermuxTerminalExtraKeys";
 
     public TermuxTerminalExtraKeys(TermuxActivity activity, @NonNull TerminalView terminalView,
                                    TermuxTerminalViewClient termuxTerminalViewClient,
-                                   TermuxTerminalSessionClient termuxTerminalSessionClient) {
+                                   TermuxTerminalSessionActivityClient termuxTerminalSessionActivityClient) {
         super(terminalView);
 
         mActivity = activity;
         mTermuxTerminalViewClient = termuxTerminalViewClient;
-        mTermuxTerminalSessionClient = termuxTerminalSessionClient;
+        mTermuxTerminalSessionActivityClient = termuxTerminalSessionActivityClient;
 
         setExtraKeys();
     }
@@ -94,8 +94,8 @@ public void onTerminalExtraKeyButtonClick(View view, String key, boolean ctrlDow
             else
                 drawerLayout.openDrawer(Gravity.LEFT);
         } else if ("PASTE".equals(key)) {
-            if(mTermuxTerminalSessionClient != null)
-                mTermuxTerminalSessionClient.onPasteTextFromClipboard(null);
+            if(mTermuxTerminalSessionActivityClient != null)
+                mTermuxTerminalSessionActivityClient.onPasteTextFromClipboard(null);
         } else {
             super.onTerminalExtraKeyButtonClick(view, key, ctrlDown, altDown, shiftDown, fnDown);
         }

From 79d799a99d5fc3b9caba972079eb7804e0c61129 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Mon, 13 Jun 2022 16:11:13 +0500
Subject: [PATCH 789/912] Fixed: Fix `ExecutionCommand.pid` not being set for
 first and background terminal sessions since
 `TermuxTerminalSessionClientBase` was still being used instead of
 `TermuxTerminalSessionActivityClient`

This commit adds onto 841c41bf and implements the `setTerminalShellPid()` interface method in `TermuxTerminalSessionServiceClient` so that `pid` is set properly for all cases.
---
 .../app/terminal/TermuxTerminalSessionServiceClient.java   | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionServiceClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionServiceClient.java
index 6941a348a2..e943bb3ad1 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionServiceClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionServiceClient.java
@@ -21,4 +21,11 @@ public TermuxTerminalSessionServiceClient(TermuxService service) {
         this.mService = service;
     }
 
+    @Override
+    public void setTerminalShellPid(@NonNull TerminalSession terminalSession, int pid) {
+        TermuxSession termuxSession = mService.getTermuxSessionForTerminalSession(terminalSession);
+        if (termuxSession != null)
+            termuxSession.getExecutionCommand().mPid = pid;
+    }
+
 }

From af6ac30bb1b062ccca5813e65380c8cafe20eaa3 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Tue, 14 Jun 2022 03:56:00 +0500
Subject: [PATCH 790/912] Added: Allow users to disable termux file view and
 share receivers

The user can add `disable-file-share-receiver=true` entry to `termux.properties` file to disable termux from showing in Android file `Share With` apps list.
The user can add `disable-file-view-receiver=true` entry to `termux.properties` file to disable termux from showing in Android file `Open With` apps list.

The default value is `false`. Restarting termux app or running `termux-reload-settings` command will update the behaviour instantaneously if changed.

Closes #2549
---
 app/src/main/AndroidManifest.xml              | 21 ++++++--
 .../java/com/termux/app/TermuxActivity.java   |  5 ++
 .../api/file/FileReceiverActivity.java}       | 52 ++++++++++++++++---
 .../api/file/FileReceiverActivityTest.java}   | 10 ++--
 .../termux/shared/termux/TermuxConstants.java | 12 ++++-
 .../properties/TermuxPropertyConstants.java   | 17 +++++-
 .../properties/TermuxSharedProperties.java    |  9 ++++
 7 files changed, 109 insertions(+), 17 deletions(-)
 rename app/src/main/java/com/termux/{filepicker/TermuxFileReceiverActivity.java => app/api/file/FileReceiverActivity.java} (80%)
 rename app/src/test/java/com/termux/{filepicker/TermuxFileReceiverActivityTest.java => app/api/file/FileReceiverActivityTest.java} (77%)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6a9ac9ff8c..4e95702bc3 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -109,14 +109,19 @@
             android:documentLaunchMode="intoExisting" />
 
         <activity
-            android:name=".filepicker.TermuxFileReceiverActivity"
+            android:name=".app.api.file.FileReceiverActivity"
             android:excludeFromRecents="true"
-            android:exported="true"
-            android:label="@string/application_name"
+            android:exported="false"
             android:noHistory="true"
             android:resizeableActivity="true"
             android:taskAffinity="${TERMUX_PACKAGE_NAME}.filereceiver"
             tools:targetApi="n">
+        </activity>
+
+        <activity-alias
+            android:name=".app.api.file.FileShareReceiverActivity"
+            android:exported="true"
+            android:targetActivity=".app.api.file.FileReceiverActivity">
 
             <!-- Accept multiple file types when sending. -->
             <intent-filter>
@@ -132,6 +137,13 @@
                 <data android:mimeType="text/*" />
                 <data android:mimeType="video/*" />
             </intent-filter>
+        </activity-alias>
+
+        <activity-alias
+            android:name=".app.api.file.FileViewReceiverActivity"
+            android:exported="true"
+            android:targetActivity=".app.api.file.FileReceiverActivity">
+
             <!-- Accept multiple file types to let Termux be usable as generic file viewer. -->
             <intent-filter tools:ignore="AppLinkUrlError">
                 <action android:name="android.intent.action.VIEW" />
@@ -144,8 +156,7 @@
                 <data android:mimeType="text/*" />
                 <data android:mimeType="video/*" />
             </intent-filter>
-        </activity>
-
+        </activity-alias>
 
         <provider
             android:name=".filepicker.TermuxDocumentsProvider"
diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index 1abc104cfe..1aa35a32e1 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -29,6 +29,7 @@
 import android.widget.Toast;
 
 import com.termux.R;
+import com.termux.app.api.file.FileReceiverActivity;
 import com.termux.app.terminal.TermuxActivityRootView;
 import com.termux.app.terminal.TermuxTerminalSessionActivityClient;
 import com.termux.app.terminal.io.TermuxTerminalExtraKeys;
@@ -251,6 +252,8 @@ public void onCreate(Bundle savedInstanceState) {
 
         registerForContextMenu(mTerminalView);
 
+        FileReceiverActivity.updateFileReceiverActivityComponentsState(this);
+
         try {
             // Start the {@link TermuxService} and make it run regardless of who is bound to it
             Intent serviceIntent = new Intent(this, TermuxService.class);
@@ -974,6 +977,8 @@ private void reloadActivityStyling(boolean recreateActivity) {
         setMargins();
         setTerminalToolbarHeight();
 
+        FileReceiverActivity.updateFileReceiverActivityComponentsState(this);
+
         if (mTermuxTerminalSessionActivityClient != null)
             mTermuxTerminalSessionActivityClient.onReloadActivityStyling();
 
diff --git a/app/src/main/java/com/termux/filepicker/TermuxFileReceiverActivity.java b/app/src/main/java/com/termux/app/api/file/FileReceiverActivity.java
similarity index 80%
rename from app/src/main/java/com/termux/filepicker/TermuxFileReceiverActivity.java
rename to app/src/main/java/com/termux/app/api/file/FileReceiverActivity.java
index 019fb4a9d7..3ce524f6b2 100644
--- a/app/src/main/java/com/termux/filepicker/TermuxFileReceiverActivity.java
+++ b/app/src/main/java/com/termux/app/api/file/FileReceiverActivity.java
@@ -1,5 +1,6 @@
-package com.termux.filepicker;
+package com.termux.app.api.file;
 
+import android.content.Context;
 import android.content.Intent;
 import android.database.Cursor;
 import android.net.Uri;
@@ -10,6 +11,7 @@
 import androidx.appcompat.app.AppCompatActivity;
 
 import com.termux.R;
+import com.termux.shared.android.PackageUtils;
 import com.termux.shared.data.DataUtils;
 import com.termux.shared.data.IntentUtils;
 import com.termux.shared.net.uri.UriUtils;
@@ -17,9 +19,12 @@
 import com.termux.shared.net.uri.UriScheme;
 import com.termux.shared.termux.interact.TextInputDialogUtils;
 import com.termux.shared.termux.TermuxConstants;
+import com.termux.shared.termux.TermuxConstants.TERMUX_APP;
 import com.termux.shared.termux.TermuxConstants.TERMUX_APP.TERMUX_SERVICE;
 import com.termux.app.TermuxService;
 import com.termux.shared.logger.Logger;
+import com.termux.shared.termux.settings.properties.TermuxAppSharedProperties;
+import com.termux.shared.termux.settings.properties.TermuxPropertyConstants;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;
@@ -31,7 +36,7 @@
 import java.nio.charset.StandardCharsets;
 import java.util.regex.Pattern;
 
-public class TermuxFileReceiverActivity extends AppCompatActivity {
+public class FileReceiverActivity extends AppCompatActivity {
 
     static final String TERMUX_RECEIVEDIR = TermuxConstants.TERMUX_FILES_DIR_PATH + "/home/downloads";
     static final String EDITOR_PROGRAM = TermuxConstants.TERMUX_HOME_DIR_PATH + "/bin/termux-file-editor";
@@ -47,7 +52,7 @@ public class TermuxFileReceiverActivity extends AppCompatActivity {
 
     private static final String API_TAG = TermuxConstants.TERMUX_APP_NAME + "FileReceiver";
 
-    private static final String LOG_TAG = "TermuxFileReceiverActivity";
+    private static final String LOG_TAG = "FileReceiverActivity";
 
     static boolean isSharedTextAnUrl(String sharedText) {
         return Patterns.WEB_URL.matcher(sharedText).matches()
@@ -172,7 +177,7 @@ void promptNameAndSave(final InputStream in, final String attachmentFileName) {
                 final Uri scriptUri = UriUtils.getFileUri(EDITOR_PROGRAM);
 
                 Intent executeIntent = new Intent(TERMUX_SERVICE.ACTION_SERVICE_EXECUTE, scriptUri);
-                executeIntent.setClass(TermuxFileReceiverActivity.this, TermuxService.class);
+                executeIntent.setClass(FileReceiverActivity.this, TermuxService.class);
                 executeIntent.putExtra(TERMUX_SERVICE.EXTRA_ARGUMENTS, new String[]{outFile.getAbsolutePath()});
                 startService(executeIntent);
                 finish();
@@ -182,7 +187,7 @@ void promptNameAndSave(final InputStream in, final String attachmentFileName) {
 
                 Intent executeIntent = new Intent(TERMUX_SERVICE.ACTION_SERVICE_EXECUTE);
                 executeIntent.putExtra(TERMUX_SERVICE.EXTRA_WORKDIR, TERMUX_RECEIVEDIR);
-                executeIntent.setClass(TermuxFileReceiverActivity.this, TermuxService.class);
+                executeIntent.setClass(FileReceiverActivity.this, TermuxService.class);
                 startService(executeIntent);
                 finish();
             },
@@ -236,10 +241,45 @@ void handleUrlAndFinish(final String url) {
         final Uri urlOpenerProgramUri = UriUtils.getFileUri(URL_OPENER_PROGRAM);
 
         Intent executeIntent = new Intent(TERMUX_SERVICE.ACTION_SERVICE_EXECUTE, urlOpenerProgramUri);
-        executeIntent.setClass(TermuxFileReceiverActivity.this, TermuxService.class);
+        executeIntent.setClass(FileReceiverActivity.this, TermuxService.class);
         executeIntent.putExtra(TERMUX_SERVICE.EXTRA_ARGUMENTS, new String[]{url});
         startService(executeIntent);
         finish();
     }
 
+    /**
+     * Update {@link TERMUX_APP#FILE_SHARE_RECEIVER_ACTIVITY_CLASS_NAME} component state depending on
+     * {@link TermuxPropertyConstants#KEY_DISABLE_FILE_SHARE_RECEIVER} value and
+     * {@link TERMUX_APP#FILE_VIEW_RECEIVER_ACTIVITY_CLASS_NAME} component state depending on
+     * {@link TermuxPropertyConstants#KEY_DISABLE_FILE_VIEW_RECEIVER} value.
+     */
+    public static void updateFileReceiverActivityComponentsState(@NonNull Context context) {
+        new Thread() {
+            @Override
+            public void run() {
+                TermuxAppSharedProperties properties = TermuxAppSharedProperties.getProperties();
+
+                String errmsg;
+                boolean state;
+
+                state = !properties.isFileShareReceiverDisabled();
+                Logger.logVerbose(LOG_TAG, "Setting " + TERMUX_APP.FILE_SHARE_RECEIVER_ACTIVITY_CLASS_NAME + " component state to " + state);
+                errmsg = PackageUtils.setComponentState(context,TermuxConstants.TERMUX_PACKAGE_NAME,
+                    TERMUX_APP.FILE_SHARE_RECEIVER_ACTIVITY_CLASS_NAME,
+                    state, null, false, false);
+                if (errmsg != null)
+                    Logger.logError(LOG_TAG, errmsg);
+
+                state = !properties.isFileViewReceiverDisabled();
+                Logger.logVerbose(LOG_TAG, "Setting " + TERMUX_APP.FILE_VIEW_RECEIVER_ACTIVITY_CLASS_NAME + " component state to " + state);
+                errmsg = PackageUtils.setComponentState(context,TermuxConstants.TERMUX_PACKAGE_NAME,
+                    TERMUX_APP.FILE_VIEW_RECEIVER_ACTIVITY_CLASS_NAME,
+                    state, null, false, false);
+                if (errmsg != null)
+                    Logger.logError(LOG_TAG, errmsg);
+
+            }
+        }.start();
+    }
+
 }
diff --git a/app/src/test/java/com/termux/filepicker/TermuxFileReceiverActivityTest.java b/app/src/test/java/com/termux/app/api/file/FileReceiverActivityTest.java
similarity index 77%
rename from app/src/test/java/com/termux/filepicker/TermuxFileReceiverActivityTest.java
rename to app/src/test/java/com/termux/app/api/file/FileReceiverActivityTest.java
index 9becbefcd0..1107671daf 100644
--- a/app/src/test/java/com/termux/filepicker/TermuxFileReceiverActivityTest.java
+++ b/app/src/test/java/com/termux/app/api/file/FileReceiverActivityTest.java
@@ -1,4 +1,6 @@
-package com.termux.filepicker;
+package com.termux.app.api.file;
+
+import com.termux.app.api.file.FileReceiverActivity;
 
 import org.junit.Assert;
 import org.junit.Test;
@@ -9,7 +11,7 @@
 import java.util.List;
 
 @RunWith(RobolectricTestRunner.class)
-public class TermuxFileReceiverActivityTest {
+public class FileReceiverActivityTest {
 
     @Test
     public void testIsSharedTextAnUrl() {
@@ -19,13 +21,13 @@ public void testIsSharedTextAnUrl() {
         validUrls.add("https://example.com/path/parameter=foo");
         validUrls.add("magnet:?xt=urn:btih:d540fc48eb12f2833163eed6421d449dd8f1ce1f&dn=Ubuntu+desktop+19.04+%2864bit%29&tr=udp%3A%2F%2Ftracker.openbittorrent.com%3A80&tr=udp%3A%2F%2Ftracker.publicbt.com%3A80&tr=udp%3A%2F%2Ftracker.ccc.de%3A80");
         for (String url : validUrls) {
-            Assert.assertTrue(TermuxFileReceiverActivity.isSharedTextAnUrl(url));
+            Assert.assertTrue(FileReceiverActivity.isSharedTextAnUrl(url));
         }
 
         List<String> invalidUrls = new ArrayList<>();
         invalidUrls.add("a test with example.com");
         for (String url : invalidUrls) {
-            Assert.assertFalse(TermuxFileReceiverActivity.isSharedTextAnUrl(url));
+            Assert.assertFalse(FileReceiverActivity.isSharedTextAnUrl(url));
         }
     }
 
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
index 8678027ed1..203f514f3c 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
@@ -11,7 +11,7 @@
 import java.util.List;
 
 /*
- * Version: v0.50.0
+ * Version: v0.51.0
  * SPDX-License-Identifier: MIT
  *
  * Changelog
@@ -271,6 +271,9 @@
  *
  * - 0.50.0 (2022-06-11)
  *      - Added `TERMUX_CONFIG_PREFIX_DIR_PATH`, `TERMUX_ENV_FILE_PATH` and `TERMUX_ENV_TEMP_FILE_PATH`.
+ *
+ * - 0.51.0 (2022-06-13)
+ *      - Added `TERMUX_APP.FILE_SHARE_RECEIVER_ACTIVITY_CLASS_NAME` and `TERMUX_APP.FILE_VIEW_RECEIVER_ACTIVITY_CLASS_NAME`.
  */
 
 /**
@@ -907,9 +910,16 @@ public static final class TERMUX_APP {
         /** termux-am socket file path */
         public static final String TERMUX_AM_SOCKET_FILE_PATH = APPS_DIR_PATH + "/termux-am/am.sock"; // Default: "/data/data/com.termux/files/apps/com.termux/termux-am/am.sock"
 
+
         /** Termux app BuildConfig class name */
         public static final String BUILD_CONFIG_CLASS_NAME = TERMUX_PACKAGE_NAME + ".BuildConfig"; // Default: "com.termux.BuildConfig"
 
+        /** Termux app FileShareReceiverActivity class name */
+        public static final String FILE_SHARE_RECEIVER_ACTIVITY_CLASS_NAME = TERMUX_PACKAGE_NAME + ".app.api.file.FileShareReceiverActivity"; // Default: "com.termux.app.api.file.FileShareReceiverActivity"
+
+        /** Termux app FileViewReceiverActivity class name */
+        public static final String FILE_VIEW_RECEIVER_ACTIVITY_CLASS_NAME = TERMUX_PACKAGE_NAME + ".app.api.file.FileViewReceiverActivity"; // Default: "com.termux.app.api.file.FileViewReceiverActivity"
+
 
         /** Termux app core activity name. */
         public static final String TERMUX_ACTIVITY_NAME = TERMUX_PACKAGE_NAME + ".app.TermuxActivity"; // Default: "com.termux.app.TermuxActivity"
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxPropertyConstants.java b/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxPropertyConstants.java
index 643b1ddd5b..8fcbf62902 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxPropertyConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxPropertyConstants.java
@@ -18,7 +18,7 @@
 import java.util.Set;
 
 /*
- * Version: v0.17.0
+ * Version: v0.18.0
  * SPDX-License-Identifier: MIT
  *
  * Changelog
@@ -77,6 +77,9 @@
  *
  * - 0.17.0 (2022-03-17)
  *      - Add `KEY_DELETE_TMPDIR_FILES_OLDER_THAN_X_DAYS_ON_EXIT`.
+ *
+ * - 0.18.0 (2022-06-13)
+ *      - Add `KEY_DISABLE_FILE_SHARE_RECEIVER` and `KEY_DISABLE_FILE_VIEW_RECEIVER`.
  */
 
 /**
@@ -96,6 +99,14 @@ public final class TermuxPropertyConstants {
 
     /* boolean */
 
+    /** Defines the key for whether file share receiver of the app is enabled. */
+    public static final String KEY_DISABLE_FILE_SHARE_RECEIVER =  "disable-file-share-receiver"; // Default: "disable-file-share-receiver"
+
+    /** Defines the key for whether file view receiver of the app is enabled. */
+    public static final String KEY_DISABLE_FILE_VIEW_RECEIVER =  "disable-file-view-receiver"; // Default: "disable-file-view-receiver"
+
+
+
     /** Defines the key for whether hardware keyboard shortcuts are enabled. */
     public static final String KEY_DISABLE_HARDWARE_KEYBOARD_SHORTCUTS =  "disable-hardware-keyboard-shortcuts"; // Default: "disable-hardware-keyboard-shortcuts"
 
@@ -380,6 +391,8 @@ public final class TermuxPropertyConstants {
      * */
     public static final Set<String> TERMUX_APP_PROPERTIES_LIST = new HashSet<>(Arrays.asList(
         /* boolean */
+        KEY_DISABLE_FILE_SHARE_RECEIVER,
+        KEY_DISABLE_FILE_VIEW_RECEIVER,
         KEY_DISABLE_HARDWARE_KEYBOARD_SHORTCUTS,
         KEY_DISABLE_TERMINAL_SESSION_CHANGE_TOAST,
         KEY_ENFORCE_CHAR_BASED_INPUT,
@@ -426,6 +439,8 @@ public final class TermuxPropertyConstants {
      * default: false
      */
     public static final Set<String> TERMUX_DEFAULT_FALSE_BOOLEAN_BEHAVIOUR_PROPERTIES_LIST = new HashSet<>(Arrays.asList(
+        KEY_DISABLE_FILE_SHARE_RECEIVER,
+        KEY_DISABLE_FILE_VIEW_RECEIVER,
         KEY_DISABLE_HARDWARE_KEYBOARD_SHORTCUTS,
         KEY_DISABLE_TERMINAL_SESSION_CHANGE_TOAST,
         KEY_ENFORCE_CHAR_BASED_INPUT,
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxSharedProperties.java b/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxSharedProperties.java
index ad863e9c66..cd1d0ec048 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxSharedProperties.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxSharedProperties.java
@@ -563,6 +563,15 @@ public static String getVolumeKeysBehaviourInternalPropertyValueFromValue(String
     public boolean shouldAllowExternalApps() {
         return (boolean) getInternalPropertyValue(TermuxConstants.PROP_ALLOW_EXTERNAL_APPS, true);
     }
+
+    public boolean isFileShareReceiverDisabled() {
+        return (boolean) getInternalPropertyValue(TermuxPropertyConstants.KEY_DISABLE_FILE_SHARE_RECEIVER, true);
+    }
+
+    public boolean isFileViewReceiverDisabled() {
+        return (boolean) getInternalPropertyValue(TermuxPropertyConstants.KEY_DISABLE_FILE_VIEW_RECEIVER, true);
+    }
+
     public boolean areHardwareKeyboardShortcutsDisabled() {
         return (boolean) getInternalPropertyValue(TermuxPropertyConstants.KEY_DISABLE_HARDWARE_KEYBOARD_SHORTCUTS, true);
     }

From e75680a88428a01a6a4566bdf1cd0255c5981fee Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Tue, 14 Jun 2022 04:04:09 +0500
Subject: [PATCH 791/912] Changed: Do not re-set component state if current
 state equals new state in `PackageUtils.setComponentState()`

---
 .../termux/shared/android/PackageUtils.java   | 37 ++++++++++++++++---
 1 file changed, 31 insertions(+), 6 deletions(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/android/PackageUtils.java b/termux-shared/src/main/java/com/termux/shared/android/PackageUtils.java
index a9ecb902cf..904c75cb5c 100644
--- a/termux-shared/src/main/java/com/termux/shared/android/PackageUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/android/PackageUtils.java
@@ -710,6 +710,13 @@ public static String isAppInstalled(@NonNull final Context context, String appNa
     }
 
 
+    /** Wrapper for {@link #setComponentState(Context, String, String, boolean, String, boolean, boolean)} with
+     * {@code alwaysShowToast} {@code true}. */
+    public static String setComponentState(@NonNull final Context context, @NonNull String packageName,
+                                           @NonNull String className, boolean newState, String toastString,
+                                           boolean showErrorMessage) {
+        return setComponentState(context, packageName, className, newState, toastString, showErrorMessage, true);
+    }
 
     /**
      * Enable or disable a {@link ComponentName} with a call to
@@ -718,28 +725,46 @@ public static String isAppInstalled(@NonNull final Context context, String appNa
      * @param context The {@link Context} for operations.
      * @param packageName The package name of the component.
      * @param className The {@link Class} name of the component.
-     * @param state If component should be enabled or disabled.
+     * @param newState If component should be enabled or disabled.
      * @param toastString If this is not {@code null} or empty, then a toast before setting state.
      * @param showErrorMessage If an error message toast should be shown.
+     * @param alwaysShowToast If toast should always be shown even if current state matches new state.
      * @return Returns the errmsg if failed to set state, otherwise {@code null}.
      */
     @Nullable
     public static String setComponentState(@NonNull final Context context, @NonNull String packageName,
-                                           @NonNull String className, boolean state, String toastString,
-                                           boolean showErrorMessage) {
+                                           @NonNull String className, boolean newState, String toastString,
+                                           boolean alwaysShowToast, boolean showErrorMessage) {
         try {
             PackageManager packageManager = context.getPackageManager();
             if (packageManager != null) {
-                ComponentName componentName = new ComponentName(packageName, className);
+                if (toastString != null && alwaysShowToast) {
+                    Logger.showToast(context, toastString, true);
+                    toastString = null;
+                }
+
+                Boolean currentlyDisabled = PackageUtils.isComponentDisabled(context, packageName, className, false);
+                if (currentlyDisabled == null)
+                    throw new UnsupportedOperationException("Failed to find if component currently disabled");
+
+                Boolean setState = null;
+                if (newState && currentlyDisabled)
+                    setState = true;
+                else if (!newState && !currentlyDisabled)
+                    setState = false;
+
+                if (setState == null) return null;
+
                 if (toastString != null) Logger.showToast(context, toastString, true);
+                ComponentName componentName = new ComponentName(packageName, className);
                 packageManager.setComponentEnabledSetting(componentName,
-                    state ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED : PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
+                    setState ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED : PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
                     PackageManager.DONT_KILL_APP);
             }
             return null;
         } catch (final Exception e) {
             String errmsg = context.getString(
-                state ? R.string.error_enable_component_failed : R.string.error_disable_component_failed,
+                newState ? R.string.error_enable_component_failed : R.string.error_disable_component_failed,
                 packageName, className) + ": " + e.getMessage();
             if (showErrorMessage)
                 Logger.showToast(context, errmsg, true);

From 162469f7ced7ff2d1fdbeb3cd12a50737787e03f Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Tue, 14 Jun 2022 04:05:00 +0500
Subject: [PATCH 792/912] Fixed: Fix message dialog button text not showing in
 day mode due to white text

---
 .../shared/interact/MessageDialogUtils.java     | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/interact/MessageDialogUtils.java b/termux-shared/src/main/java/com/termux/shared/interact/MessageDialogUtils.java
index abea1763d1..d7543fc7c9 100644
--- a/termux-shared/src/main/java/com/termux/shared/interact/MessageDialogUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/interact/MessageDialogUtils.java
@@ -4,11 +4,14 @@
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
+import android.graphics.Color;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.widget.Button;
 import android.widget.TextView;
 
 import com.termux.shared.R;
+import com.termux.shared.logger.Logger;
 
 public class MessageDialogUtils {
 
@@ -74,7 +77,19 @@ public static void showMessage(Context context, String titleText, String message
         if (onDismiss != null)
             builder.setOnDismissListener(onDismiss);
 
-        builder.show();
+        AlertDialog dialog = builder.create();
+
+        dialog.setOnShowListener(dialogInterface -> {
+            Logger.logError("dialog");
+            Button button = dialog.getButton(AlertDialog.BUTTON_POSITIVE);
+            if (button != null)
+                button.setTextColor(Color.BLACK);
+            button = dialog.getButton(AlertDialog.BUTTON_NEGATIVE);
+            if (button != null)
+                button.setTextColor(Color.BLACK);
+        });
+
+        dialog.show();
     }
 
     public static void exitAppWithErrorMessage(Context context, String titleText, String messageText) {

From b80126fd61de3bcdaee3b38a6f1f4670838c9513 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Tue, 14 Jun 2022 04:08:03 +0500
Subject: [PATCH 793/912] Fixed: Catch exceptions if failed to bypass hidden
 API restrictions

Attempting to bypass restrictions while tests are running will fail due to call to `TermuxApplication.onCreate()` -> `TermuxShellEnvironment.init()` -> `SELinuxUtils.getContext()`
---
 .../java/com/termux/shared/reflection/ReflectionUtils.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/reflection/ReflectionUtils.java b/termux-shared/src/main/java/com/termux/shared/reflection/ReflectionUtils.java
index 10886a4164..c57f103b4e 100644
--- a/termux-shared/src/main/java/com/termux/shared/reflection/ReflectionUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/reflection/ReflectionUtils.java
@@ -28,7 +28,12 @@ public class ReflectionUtils {
     public static void bypassHiddenAPIReflectionRestrictions() {
         if (!HIDDEN_API_REFLECTION_RESTRICTIONS_BYPASSED && Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
             Logger.logDebug(LOG_TAG, "Bypassing android hidden api reflection restrictions");
-            HiddenApiBypass.addHiddenApiExemptions("");
+            try {
+                HiddenApiBypass.addHiddenApiExemptions("");
+            } catch (Throwable t) {
+                Logger.logStackTraceWithMessage(LOG_TAG, "Failed to bypass hidden API reflection restrictions", t);
+            }
+
             HIDDEN_API_REFLECTION_RESTRICTIONS_BYPASSED = true;
         }
     }

From 26ff978b0ffc788385f74ada472e5b819615c0c0 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Tue, 14 Jun 2022 19:13:19 +0500
Subject: [PATCH 794/912] Changed: Use black or white cursor color based on
 terminal background instead of always white if colors.properties didn't have
 cursor color set

Credit for algorithm link belong to @Jamie-Landeg-Jones

Closes #2653
---
 .../termux/terminal/TerminalColorScheme.java  | 23 +++++++++++++++++++
 .../com/termux/terminal/TerminalColors.java   | 20 ++++++++++++++++
 2 files changed, 43 insertions(+)

diff --git a/terminal-emulator/src/main/java/com/termux/terminal/TerminalColorScheme.java b/terminal-emulator/src/main/java/com/termux/terminal/TerminalColorScheme.java
index e4fd4e9c77..4088781805 100644
--- a/terminal-emulator/src/main/java/com/termux/terminal/TerminalColorScheme.java
+++ b/terminal-emulator/src/main/java/com/termux/terminal/TerminalColorScheme.java
@@ -71,6 +71,7 @@ private void reset() {
 
     public void updateWith(Properties props) {
         reset();
+        boolean cursorPropExists = false;
         for (Map.Entry<Object, Object> entries : props.entrySet()) {
             String key = (String) entries.getKey();
             String value = (String) entries.getValue();
@@ -82,6 +83,7 @@ public void updateWith(Properties props) {
                 colorIndex = TextStyle.COLOR_INDEX_BACKGROUND;
             } else if (key.equals("cursor")) {
                 colorIndex = TextStyle.COLOR_INDEX_CURSOR;
+                cursorPropExists = true;
             } else if (key.startsWith("color")) {
                 try {
                     colorIndex = Integer.parseInt(key.substring(5));
@@ -98,6 +100,27 @@ public void updateWith(Properties props) {
 
             mDefaultColors[colorIndex] = colorValue;
         }
+
+        if (!cursorPropExists)
+            setCursorColorForBackground();
+    }
+
+    /**
+     * If the "cursor" color is not set by user, we need to decide on the appropriate color that will
+     * be visible on the current terminal background. White will not be visible on light backgrounds
+     * and black won't be visible on dark backgrounds. So we find the perceived brightness of the
+     * background color and if its below the threshold (too dark), we use white cursor and if its
+     * above (too bright), we use black cursor.
+     */
+    public void setCursorColorForBackground() {
+        int backgroundColor = mDefaultColors[TextStyle.COLOR_INDEX_BACKGROUND];
+        int brightness = TerminalColors.getPerceivedBrightnessOfColor(backgroundColor);
+        if (brightness > 0) {
+            if (brightness < 130)
+                mDefaultColors[TextStyle.COLOR_INDEX_CURSOR] = 0xffffffff;
+            else
+                mDefaultColors[TextStyle.COLOR_INDEX_CURSOR] = 0xff000000;
+        }
     }
 
 }
diff --git a/terminal-emulator/src/main/java/com/termux/terminal/TerminalColors.java b/terminal-emulator/src/main/java/com/termux/terminal/TerminalColors.java
index 6d8cfdb9ec..25135a2fab 100644
--- a/terminal-emulator/src/main/java/com/termux/terminal/TerminalColors.java
+++ b/terminal-emulator/src/main/java/com/termux/terminal/TerminalColors.java
@@ -1,5 +1,7 @@
 package com.termux.terminal;
 
+import android.graphics.Color;
+
 /** Current terminal colors (if different from default). */
 public final class TerminalColors {
 
@@ -73,4 +75,22 @@ public void tryParseColor(int intoIndex, String textParameter) {
         if (c != 0) mCurrentColors[intoIndex] = c;
     }
 
+    /**
+     * Get the perceived brightness of the color based on its RGB components.
+     *
+     * https://www.nbdtech.com/Blog/archive/2008/04/27/Calculating-the-Perceived-Brightness-of-a-Color.aspx
+     * http://alienryderflex.com/hsp.html
+     *
+     * @param color The color code int.
+     * @return Returns value between 0-255.
+     */
+    public static int getPerceivedBrightnessOfColor(int color) {
+        return (int)
+            Math.floor(Math.sqrt(
+                Math.pow(Color.red(color), 2) * 0.241 +
+                    Math.pow(Color.green(color), 2) * 0.691 +
+                    Math.pow(Color.blue(color), 2) * 0.068
+            ));
+    }
+
 }

From 4c47f4f732c9d5e15df6536fa357ff43d0223b07 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 15 Jun 2022 04:03:47 +0500
Subject: [PATCH 795/912] Fixed: Fix CSI parameters parsing like for SGR
 sequences that start with a `;` or have sequential `;` characters

https://vt100.net/docs/vt510-rm/chapter4.html#S4.3.3

https://en.wikipedia.org/wiki/ANSI_escape_code#CSI_(Control_Sequence_Introducer)_sequences

Credits for finding the issue belongs to @Screwtapello

https://github.com/mawww/kakoune/issues/4339#issuecomment-916980723

Closes #2272, Closes mawww/kakoune#4339
---
 .../com/termux/terminal/TerminalEmulator.java | 73 ++++++++++++++-----
 .../com/termux/terminal/TerminalTest.java     | 13 ++++
 2 files changed, 66 insertions(+), 20 deletions(-)

diff --git a/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java b/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
index 975c1a5abb..076babb133 100644
--- a/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
+++ b/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
@@ -126,6 +126,10 @@ public final class TerminalEmulator {
     private String mTitle;
     private final Stack<String> mTitleStack = new Stack<>();
 
+    /** If processing first character of first parameter of {@link #ESC_CSI}. */
+    private boolean mIsCSIStart;
+    /** The last character processed of a parameter of {@link #ESC_CSI}. */
+    private Integer mLastCSIArg;
 
     /** The cursor position. Between (0,0) and (mRows-1, mColumns-1). */
     private int mCursorRow, mCursorCol;
@@ -1386,6 +1390,8 @@ private void doEsc(int b) {
                 break;
             case '[':
                 continueSequence(ESC_CSI);
+                mIsCSIStart = true;
+                mLastCSIArg = null;
                 break;
             case '=': // DECKPAM
                 setDecsetinternalBit(DECSET_BIT_APPLICATION_KEYPAD, true);
@@ -2093,28 +2099,55 @@ private void scrollDownOneLine() {
         }
     }
 
-    /** Process the next ASCII character of a parameter. */
-    private void parseArg(int b) {
-        if (b >= '0' && b <= '9') {
-            if (mArgIndex < mArgs.length) {
-                int oldValue = mArgs[mArgIndex];
-                int thisDigit = b - '0';
-                int value;
-                if (oldValue >= 0) {
-                    value = oldValue * 10 + thisDigit;
-                } else {
-                    value = thisDigit;
-                }
-                mArgs[mArgIndex] = value;
+    /**
+     * Process the next ASCII character of a parameter.
+     *
+     * Parameter characters modify the action or interpretation of the sequence. You can use up to
+     * 16 parameters per sequence. You must use the ; character to separate parameters.
+     * All parameters are unsigned, positive decimal integers, with the most significant
+     * digit sent first. Any parameter greater than 9999 (decimal) is set to 9999
+     * (decimal). If you do not specify a value, a 0 value is assumed. A 0 value
+     * or omitted parameter indicates a default value for the sequence. For most
+     * sequences, the default value is 1.
+     *
+     * https://vt100.net/docs/vt510-rm/chapter4.html#S4.3.3
+     * */
+    private void parseArg(int inputByte) {
+        int[] bytes = new int[]{inputByte};
+        // Only doing this for ESC_CSI and not for other ESC_CSI_* since they seem to be using their
+        // own defaults with getArg*() calls, but there may be missed cases
+        if (mEscapeState == ESC_CSI) {
+            if ((mIsCSIStart && inputByte == ';') || // If sequence starts with a ; character, like \033[;m
+                (!mIsCSIStart && mLastCSIArg != null && mLastCSIArg == ';'  && inputByte == ';')) {  // If sequence contains sequential ; characters, like \033[;;m
+                bytes = new int[]{'0', ';'}; // Assume 0 was passed
             }
-            continueSequence(mEscapeState);
-        } else if (b == ';') {
-            if (mArgIndex < mArgs.length) {
-                mArgIndex++;
+        }
+
+        mIsCSIStart = false;
+
+        for (int b : bytes) {
+            if (b >= '0' && b <= '9') {
+                if (mArgIndex < mArgs.length) {
+                    int oldValue = mArgs[mArgIndex];
+                    int thisDigit = b - '0';
+                    int value;
+                    if (oldValue >= 0) {
+                        value = oldValue * 10 + thisDigit;
+                    } else {
+                        value = thisDigit;
+                    }
+                    mArgs[mArgIndex] = value;
+                }
+                continueSequence(mEscapeState);
+            } else if (b == ';') {
+                if (mArgIndex < mArgs.length) {
+                    mArgIndex++;
+                }
+                continueSequence(mEscapeState);
+            } else {
+                unknownSequence(b);
             }
-            continueSequence(mEscapeState);
-        } else {
-            unknownSequence(b);
+            mLastCSIArg = b;
         }
     }
 
diff --git a/terminal-emulator/src/test/java/com/termux/terminal/TerminalTest.java b/terminal-emulator/src/test/java/com/termux/terminal/TerminalTest.java
index 390c0496ec..89ad9eca67 100644
--- a/terminal-emulator/src/test/java/com/termux/terminal/TerminalTest.java
+++ b/terminal-emulator/src/test/java/com/termux/terminal/TerminalTest.java
@@ -151,6 +151,19 @@ public void testSelectGraphics() {
 		assertEquals(TextStyle.COLOR_INDEX_FOREGROUND, mTerminal.mForeColor);
 		assertEquals(TextStyle.COLOR_INDEX_BACKGROUND, mTerminal.mBackColor);
 
+		// Test CSI resetting to default if sequence starts with ; or has sequential ;;
+        // Check TerminalEmulator.parseArg()
+        enterString("\033[31m\033[m");
+        assertEquals(TextStyle.COLOR_INDEX_FOREGROUND, mTerminal.mForeColor);
+        enterString("\033[31m\033[;m");
+        assertEquals(TextStyle.COLOR_INDEX_FOREGROUND, mTerminal.mForeColor);
+        enterString("\033[31m\033[0m");
+        assertEquals(TextStyle.COLOR_INDEX_FOREGROUND, mTerminal.mForeColor);
+        enterString("\033[31m\033[0;m");
+        assertEquals(TextStyle.COLOR_INDEX_FOREGROUND, mTerminal.mForeColor);
+        enterString("\033[31;;m");
+        assertEquals(TextStyle.COLOR_INDEX_FOREGROUND, mTerminal.mForeColor);
+
 		// 256 colors:
 		enterString("\033[38;5;119m");
 		assertEquals(119, mTerminal.mForeColor);

From e92a6db06bb910a90b322af7c2813886d2156175 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 15 Jun 2022 04:05:34 +0500
Subject: [PATCH 796/912] Fixed: Ensure CSI parameter value is not greater than
 `9999` as per vt510

---
 .../src/main/java/com/termux/terminal/TerminalEmulator.java     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java b/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
index 076babb133..127ef6d975 100644
--- a/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
+++ b/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
@@ -2136,6 +2136,8 @@ private void parseArg(int inputByte) {
                     } else {
                         value = thisDigit;
                     }
+                    if (value > 9999)
+                        value = 9999;
                     mArgs[mArgIndex] = value;
                 }
                 continueSequence(mEscapeState);

From 82b15803126138eef8899e0c7b582713f872cd09 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 15 Jun 2022 18:30:21 +0500
Subject: [PATCH 797/912] Fixed: Fix `termux.properties` reload not working if
 the properties file didn't exist at app startup

Closes #2836
---
 .../settings/properties/SharedProperties.java | 35 ++++++++++++
 .../properties/TermuxAppSharedProperties.java |  2 +-
 .../properties/TermuxPropertyConstants.java   | 54 -------------------
 .../properties/TermuxSharedProperties.java    | 32 +++++++----
 4 files changed, 59 insertions(+), 64 deletions(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/settings/properties/SharedProperties.java b/termux-shared/src/main/java/com/termux/shared/settings/properties/SharedProperties.java
index 0dee047037..d2efd0b4e8 100644
--- a/termux-shared/src/main/java/com/termux/shared/settings/properties/SharedProperties.java
+++ b/termux-shared/src/main/java/com/termux/shared/settings/properties/SharedProperties.java
@@ -9,6 +9,8 @@
 import com.google.common.collect.BiMap;
 import com.google.common.collect.ImmutableBiMap;
 import com.google.common.primitives.Primitives;
+import com.termux.shared.file.FileUtils;
+import com.termux.shared.file.filesystem.FileType;
 import com.termux.shared.logger.Logger;
 
 import java.io.File;
@@ -16,6 +18,7 @@
 import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
@@ -253,6 +256,38 @@ public static Properties getPropertiesFromFile(Context context, File propertiesF
             return properties;
     }
 
+    /** Returns the first {@link File} found in
+     * {@code propertiesFilePaths} from which app properties can be loaded. If the {@link File} found
+     * is not a regular file or is not readable, then {@code null} is returned. Symlinks **will not**
+     * be followed for potential security reasons.
+     *
+     * @param propertiesFilePaths The {@link List<String>} containing properties file paths.
+     * @param logTag If log tag to use for logging errors.
+     * @return Returns the {@link File} object for Termux:Float app properties.
+     */
+    public static File getPropertiesFileFromList(List<String> propertiesFilePaths, @NonNull String logTag) {
+        if (propertiesFilePaths == null || propertiesFilePaths.size() == 0)
+            return null;
+
+        for(String propertiesFilePath : propertiesFilePaths) {
+            File propertiesFile = new File(propertiesFilePath);
+
+            // Symlinks **will not** be followed.
+            FileType fileType = FileUtils.getFileType(propertiesFilePath, false);
+            if (fileType == FileType.REGULAR) {
+                if (propertiesFile.canRead())
+                    return propertiesFile;
+                else
+                    Logger.logWarn(logTag, "Ignoring properties file at \"" + propertiesFilePath + "\" since it is not readable");
+            } else if (fileType != FileType.NO_EXIST) {
+                Logger.logWarn(logTag, "Ignoring properties file at \"" + propertiesFilePath + "\" of type: \"" + fileType.getName() + "\"");
+            }
+        }
+
+        Logger.logDebug(logTag, "No readable properties file found at: " + propertiesFilePaths);
+        return null;
+    }
+
 
 
     public static String getProperty(Context context, File propertiesFile, String key, String def) {
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxAppSharedProperties.java b/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxAppSharedProperties.java
index a0189c965e..7faf5f8b10 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxAppSharedProperties.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxAppSharedProperties.java
@@ -13,7 +13,7 @@ public class TermuxAppSharedProperties extends TermuxSharedProperties {
 
     private TermuxAppSharedProperties(@NonNull Context context) {
         super(context, TermuxConstants.TERMUX_APP_NAME,
-            TermuxPropertyConstants.getTermuxPropertiesFile(), TermuxPropertyConstants.TERMUX_APP_PROPERTIES_LIST,
+            TermuxConstants.TERMUX_PROPERTIES_FILE_PATHS_LIST, TermuxPropertyConstants.TERMUX_APP_PROPERTIES_LIST,
             new TermuxSharedProperties.SharedPropertiesParserClient());
     }
 
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxPropertyConstants.java b/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxPropertyConstants.java
index 8fcbf62902..dd935f3ab5 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxPropertyConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxPropertyConstants.java
@@ -478,58 +478,4 @@ public final class TermuxPropertyConstants {
     public static final Set<String> TERMUX_DEFAULT_INVERETED_TRUE_BOOLEAN_BEHAVIOUR_PROPERTIES_LIST = new HashSet<>(Arrays.asList(
     ));
 
-
-
-
-
-    /** Returns the first {@link File} found in
-     * {@link TermuxConstants#TERMUX_PROPERTIES_FILE_PATHS_LIST} via a call to
-     * {@link #getPropertiesFile(List)}.
-     *
-     * @return Returns the {@link File} object for Termux app properties.
-     */
-    public static File getTermuxPropertiesFile() {
-        return getPropertiesFile(TermuxConstants.TERMUX_PROPERTIES_FILE_PATHS_LIST);
-    }
-
-    /** Returns the first {@link File} found in
-     * {@link TermuxConstants#TERMUX_FLOAT_PROPERTIES_FILE_PATHS_LIST} via a call to
-     * {@link #getPropertiesFile(List)}.
-     *
-     * @return Returns the {@link File} object for Termux:Float app properties.
-     */
-    public static File getTermuxFloatPropertiesFile() {
-        return getPropertiesFile(TermuxConstants.TERMUX_FLOAT_PROPERTIES_FILE_PATHS_LIST);
-    }
-
-    /** Returns the first {@link File} found in
-     * {@code propertiesFilePaths} from which app properties can be loaded. If the {@link File} found
-     * is not a regular file or is not readable, then {@code null} is returned. Symlinks **will not**
-     * be followed for potential security reasons.
-     *
-     * @return Returns the {@link File} object for Termux:Float app properties.
-     */
-    public static File getPropertiesFile(List<String> propertiesFilePaths) {
-        if (propertiesFilePaths == null || propertiesFilePaths.size() == 0)
-            return null;
-
-        for(String propertiesFilePath : propertiesFilePaths) {
-            File propertiesFile = new File(propertiesFilePath);
-
-            // Symlinks **will not** be followed.
-            FileType fileType = FileUtils.getFileType(propertiesFilePath, false);
-            if (fileType == FileType.REGULAR) {
-                if (propertiesFile.canRead())
-                    return propertiesFile;
-                else
-                    Logger.logWarn(LOG_TAG, "Ignoring properties file at \"" + propertiesFilePath + "\" since it is not readable");
-            } else if (fileType != FileType.NO_EXIST) {
-                Logger.logWarn(LOG_TAG, "Ignoring properties file at \"" + propertiesFilePath + "\" of type: \"" + fileType.getName() + "\"");
-            }
-        }
-
-        Logger.logDebug(LOG_TAG, "No readable properties file found at: " + propertiesFilePaths);
-        return null;
-    }
-
 }
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxSharedProperties.java b/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxSharedProperties.java
index cd1d0ec048..e277f4506a 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxSharedProperties.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxSharedProperties.java
@@ -12,6 +12,7 @@
 
 import java.io.File;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
@@ -20,24 +21,35 @@ public abstract class TermuxSharedProperties {
 
     protected final Context mContext;
     protected final String mLabel;
-    protected final File mPropertiesFile;
-    protected final SharedProperties mSharedProperties;
+    protected final List<String> mPropertiesFilePaths;
+    protected final Set<String> mPropertiesList;
+    protected final SharedPropertiesParser mSharedPropertiesParser;
+    protected File mPropertiesFile;
+    protected SharedProperties mSharedProperties;
 
     public static final String LOG_TAG = "TermuxSharedProperties";
 
-    public TermuxSharedProperties(@NonNull Context context, @NonNull String label, File propertiesFile,
+    public TermuxSharedProperties(@NonNull Context context, @NonNull String label, List<String> propertiesFilePaths,
                                   @NonNull Set<String> propertiesList, @NonNull SharedPropertiesParser sharedPropertiesParser) {
         mContext = context.getApplicationContext();
         mLabel = label;
-        mPropertiesFile = propertiesFile;
-        mSharedProperties = new SharedProperties(context, mPropertiesFile, propertiesList, sharedPropertiesParser);
+        mPropertiesFilePaths = propertiesFilePaths;
+        mPropertiesList = propertiesList;
+        mSharedPropertiesParser = sharedPropertiesParser;
         loadTermuxPropertiesFromDisk();
     }
 
     /**
      * Reload the termux properties from disk into an in-memory cache.
      */
-    public void loadTermuxPropertiesFromDisk() {
+    public synchronized void loadTermuxPropertiesFromDisk() {
+        // Properties files must be searched everytime since no file may exist when constructor is
+        // called or a higher priority file may have been created afterward. Otherwise, if no file
+        // was found, then default props would keep loading, since mSharedProperties would be null. #2836
+        mPropertiesFile = SharedProperties.getPropertiesFileFromList(mPropertiesFilePaths, LOG_TAG);
+        mSharedProperties = null;
+        mSharedProperties = new SharedProperties(mContext, mPropertiesFile, mPropertiesList, mSharedPropertiesParser);
+
         mSharedProperties.loadPropertiesFromDisk();
         dumpPropertiesToLog();
         dumpInternalPropertiesToLog();
@@ -167,8 +179,8 @@ public Object getInternalPropertyValue(String key, boolean cached) {
 
 
     /**
-     * Get the internal {@link Object} value for the key passed from the file returned by
-     * {@link TermuxPropertyConstants#getTermuxPropertiesFile()}. The {@link Properties} object is
+     * Get the internal {@link Object} value for the key passed from the first file found in
+     * {@link TermuxConstants#TERMUX_PROPERTIES_FILE_PATHS_LIST}. The {@link Properties} object is
      * read directly from the file and internal value is returned for the property value against the key.
      *
      * @param context The context for operations.
@@ -177,7 +189,9 @@ public Object getInternalPropertyValue(String key, boolean cached) {
      * the object stored against the key is {@code null}.
      */
     public static Object getTermuxInternalPropertyValue(Context context, String key) {
-        return SharedProperties.getInternalProperty(context, TermuxPropertyConstants.getTermuxPropertiesFile(), key, new SharedPropertiesParserClient());
+        return SharedProperties.getInternalProperty(context,
+            SharedProperties.getPropertiesFileFromList(TermuxConstants.TERMUX_PROPERTIES_FILE_PATHS_LIST, LOG_TAG),
+            key, new SharedPropertiesParserClient());
     }
 
     /**

From a2df7d791a5c09f9ed16e5755bb15ab871cee9e6 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 18 Jun 2022 05:53:26 +0500
Subject: [PATCH 798/912] Fixed: Fix bootstrap not installing on app install

Previously, bootstrap was only installed if `$PREFIX` didn't exist, was empty or only had `$PREFIX/tmp`. But now with 03e1d14e, `$PREFIX/etc/termux/termux.env` was also created at app startup before bootstrap check was made, hence it was being assumed that bootstrap was already installed.

Now, bootstrap will be installed even if `$PREFIX/tmp`, `$PREFIX/etc/termux/termux.env.tmp` or `$PREFIX/etc/termux/termux.env` exist but no other files do.

Closes #2844
---
 .../java/com/termux/app/TermuxInstaller.java  |  11 +-
 .../java/com/termux/shared/errors/Errno.java  |   5 +
 .../com/termux/shared/file/FileUtils.java     | 113 ++++++++++++++++++
 .../termux/shared/file/FileUtilsErrno.java    |   6 +-
 .../shared/file/tests/FileUtilsTests.java     |  86 +++++++++++++
 .../termux/shared/termux/TermuxConstants.java |  10 +-
 .../shared/termux/file/TermuxFileUtils.java   |  17 +++
 7 files changed, 241 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxInstaller.java b/app/src/main/java/com/termux/app/TermuxInstaller.java
index 504b515f77..b14149993a 100644
--- a/app/src/main/java/com/termux/app/TermuxInstaller.java
+++ b/app/src/main/java/com/termux/app/TermuxInstaller.java
@@ -21,6 +21,7 @@
 import com.termux.shared.android.PackageUtils;
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.termux.TermuxUtils;
+import com.termux.shared.termux.shell.command.environment.TermuxShellEnvironment;
 
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
@@ -103,10 +104,8 @@ static void setupBootstrapIfNeeded(final Activity activity, final Runnable whenD
 
         // 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 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.");
+            if (TermuxFileUtils.isTermuxPrefixDirectoryEmpty()) {
+                Logger.logInfo(LOG_TAG, "The termux prefix directory \"" + TERMUX_PREFIX_DIR_PATH + "\" exists but is empty or only contains specific unimportant files.");
             } else {
                 whenDone.run();
                 return;
@@ -218,6 +217,10 @@ public void run() {
                     }
 
                     Logger.logInfo(LOG_TAG, "Bootstrap packages installed successfully.");
+
+                    // Recreate env file since termux prefix was wiped earlier
+                    TermuxShellEnvironment.writeEnvironmentToFile(activity);
+
                     activity.runOnUiThread(whenDone);
 
                 } catch (final Exception e) {
diff --git a/termux-shared/src/main/java/com/termux/shared/errors/Errno.java b/termux-shared/src/main/java/com/termux/shared/errors/Errno.java
index 1ac9fd089b..5dfa745c20 100644
--- a/termux-shared/src/main/java/com/termux/shared/errors/Errno.java
+++ b/termux-shared/src/main/java/com/termux/shared/errors/Errno.java
@@ -110,4 +110,9 @@ public Error getError(List<Throwable> throwablesList, Object... args) {
         }
     }
 
+    public boolean equalsErrorTypeAndCode(Error error) {
+        if (error == null) return false;
+        return type.equals(error.getType()) && code == error.getCode();
+    }
+
 }
diff --git a/termux-shared/src/main/java/com/termux/shared/file/FileUtils.java b/termux-shared/src/main/java/com/termux/shared/file/FileUtils.java
index 308bc77e66..602c4982c5 100644
--- a/termux-shared/src/main/java/com/termux/shared/file/FileUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/file/FileUtils.java
@@ -33,6 +33,7 @@
 import java.nio.charset.Charset;
 import java.nio.file.LinkOption;
 import java.nio.file.StandardCopyOption;
+import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Collections;
 import java.util.Iterator;
@@ -185,6 +186,118 @@ public static boolean isPathInDirPaths(String path, final List<String> dirPaths,
     }
 
 
+
+    /**
+     * Validate that directory is empty or contains only files in {@code ignoredSubFilePaths}.
+     *
+     * If parent path of an ignored file exists, but ignored file itself does not exist, then directory
+     * is not considered empty.
+     *
+     * @param label The optional label for directory to check. This can optionally be {@code null}.
+     * @param filePath The {@code path} for directory to check.
+     * @param ignoredSubFilePaths The list of absolute file paths under {@code filePath} dir.
+     *                            Validation is done for the paths.
+     * @param ignoreNonExistentFile The {@code boolean} that decides if it should be considered an
+     *                              error if file to be checked doesn't exist.
+     * @return Returns {@code null} if directory is empty or contains only files in {@code ignoredSubFilePaths}.
+     * Returns {@code FileUtilsErrno#ERRNO_NON_EMPTY_DIRECTORY_FILE} if a file was found that did not
+     * exist in the {@code ignoredSubFilePaths}, otherwise returns an appropriate {@code error} if
+     * checking was not successful.
+     */
+    public static Error validateDirectoryFileEmptyOrOnlyContainsSpecificFiles(String label, String filePath,
+                                                                              final List<String> ignoredSubFilePaths,
+                                                                              final boolean ignoreNonExistentFile) {
+        label = (label == null || label.isEmpty() ? "" : label + " ");
+        if (filePath == null || filePath.isEmpty()) return FunctionErrno.ERRNO_NULL_OR_EMPTY_PARAMETER.getError(label + "file path", "isDirectoryFileEmptyOrOnlyContainsSpecificFiles");
+
+        try {
+            File file = new File(filePath);
+            FileType fileType = getFileType(filePath, false);
+
+            // If file exists but not a directory file
+            if (fileType != FileType.NO_EXIST && fileType != FileType.DIRECTORY) {
+                return FileUtilsErrno.ERRNO_NON_DIRECTORY_FILE_FOUND.getError(label + "directory", filePath).setLabel(label + "directory");
+            }
+
+            // If file does not exist
+            if (fileType == FileType.NO_EXIST) {
+                // If checking is to be ignored if file does not exist
+                if (ignoreNonExistentFile)
+                    return null;
+                else {
+                    label += "directory to check if is empty or only contains specific files";
+                    return FileUtilsErrno.ERRNO_FILE_NOT_FOUND_AT_PATH.getError(label, filePath).setLabel(label);
+                }
+            }
+
+            File[] subFiles = file.listFiles();
+            if (subFiles == null || subFiles.length == 0)
+                return null;
+
+            // If sub files exists but no file should be ignored
+            if (ignoredSubFilePaths == null || ignoredSubFilePaths.size() == 0)
+                return FileUtilsErrno.ERRNO_NON_EMPTY_DIRECTORY_FILE.getError(label, filePath);
+
+            // If a sub file does not exist in ignored file path
+            if (nonIgnoredSubFileExists(subFiles, ignoredSubFilePaths)) {
+                return FileUtilsErrno.ERRNO_NON_EMPTY_DIRECTORY_FILE.getError(label, filePath);
+            }
+
+        } catch (Exception e) {
+            return FileUtilsErrno.ERRNO_VALIDATE_DIRECTORY_EMPTY_OR_ONLY_CONTAINS_SPECIFIC_FILES_FAILED_WITH_EXCEPTION.getError(e, label + "directory", filePath, e.getMessage());
+        }
+
+        return null;
+    }
+
+    /**
+     * Check if {@code subFiles} contains contains a file not in {@code ignoredSubFilePaths}.
+     *
+     * If parent path of an ignored file exists, but ignored file itself does not exist, then directory
+     * is not considered empty.
+     *
+     * This function should ideally not be called by itself but through
+     * {@link #validateDirectoryFileEmptyOrOnlyContainsSpecificFiles(String, String, List, boolean)}.
+     *
+     * @param subFiles The list of files of a directory to check.
+     * @param ignoredSubFilePaths The list of absolute file paths under {@code filePath} dir.
+     *                            Validation is done for the paths.
+     * @return Returns {@code true} if a file was found that did not exist in the {@code ignoredSubFilePaths},
+     * otherwise  {@code false}.
+     */
+    public static boolean nonIgnoredSubFileExists(File[] subFiles, @NonNull List<String> ignoredSubFilePaths) {
+        if (subFiles == null || subFiles.length == 0) return false;
+
+        String subFilePath;
+        for (File subFile : subFiles) {
+            subFilePath = subFile.getAbsolutePath();
+            // If sub file does not exist in ignored sub file paths
+            if (!ignoredSubFilePaths.contains(subFilePath)) {
+                boolean isParentPath = false;
+                for (String ignoredSubFilePath : ignoredSubFilePaths) {
+                    if (ignoredSubFilePath.startsWith(subFilePath + "/") && fileExists(ignoredSubFilePath, false)) {
+                        isParentPath = true;
+                        break;
+                    }
+                }
+                // If sub file is not a parent of any existing ignored sub file paths
+                if (!isParentPath) {
+                    return true;
+                }
+            }
+                
+            if (getFileType(subFilePath, false) == FileType.DIRECTORY) {
+                // If non ignored sub file found, then early exit, otherwise continue looking
+                if (nonIgnoredSubFileExists(subFile.listFiles(), ignoredSubFilePaths))
+                     return true;
+            }
+        }
+
+        return false;
+    }
+
+
+
     /**
      * Checks whether a regular file exists at {@code filePath}.
      *
diff --git a/termux-shared/src/main/java/com/termux/shared/file/FileUtilsErrno.java b/termux-shared/src/main/java/com/termux/shared/file/FileUtilsErrno.java
index 4a0d73f442..7e336aad37 100644
--- a/termux-shared/src/main/java/com/termux/shared/file/FileUtilsErrno.java
+++ b/termux-shared/src/main/java/com/termux/shared/file/FileUtilsErrno.java
@@ -34,9 +34,11 @@ public class FileUtilsErrno extends Errno {
     public static final Errno ERRNO_NON_SYMLINK_FILE_FOUND_SHORT = new Errno(TYPE, 157, "Non-symlink file found at %1$s path.");
 
     public static final Errno ERRNO_FILE_NOT_AN_ALLOWED_FILE_TYPE = new Errno(TYPE, 158, "The %1$s found at path \"%2$s\" of type \"%3$s\" is not one of allowed file types \"%4$s\".");
+    public static final Errno ERRNO_NON_EMPTY_DIRECTORY_FILE = new Errno(TYPE, 159, "The %1$s directory at path \"%2$s\" is not empty.");
 
-    public static final Errno ERRNO_VALIDATE_FILE_EXISTENCE_AND_PERMISSIONS_FAILED_WITH_EXCEPTION = new Errno(TYPE, 159, "Validating file existence and permissions of %1$s at path \"%2$s\" failed.\nException: %3$s");
-    public static final Errno ERRNO_VALIDATE_DIRECTORY_EXISTENCE_AND_PERMISSIONS_FAILED_WITH_EXCEPTION = new Errno(TYPE, 160, "Validating directory existence and permissions of %1$s at path \"%2$s\" failed.\nException: %3$s");
+    public static final Errno ERRNO_VALIDATE_FILE_EXISTENCE_AND_PERMISSIONS_FAILED_WITH_EXCEPTION = new Errno(TYPE, 160, "Validating file existence and permissions of %1$s at path \"%2$s\" failed.\nException: %3$s");
+    public static final Errno ERRNO_VALIDATE_DIRECTORY_EXISTENCE_AND_PERMISSIONS_FAILED_WITH_EXCEPTION = new Errno(TYPE, 161, "Validating directory existence and permissions of %1$s at path \"%2$s\" failed.\nException: %3$s");
+    public static final Errno ERRNO_VALIDATE_DIRECTORY_EMPTY_OR_ONLY_CONTAINS_SPECIFIC_FILES_FAILED_WITH_EXCEPTION = new Errno(TYPE, 162, "Validating directory is empty or only contains specific files of %1$s at path \"%2$s\" failed.\nException: %3$s");
 
 
 
diff --git a/termux-shared/src/main/java/com/termux/shared/file/tests/FileUtilsTests.java b/termux-shared/src/main/java/com/termux/shared/file/tests/FileUtilsTests.java
index 927a20a885..bf1c210c00 100644
--- a/termux-shared/src/main/java/com/termux/shared/file/tests/FileUtilsTests.java
+++ b/termux-shared/src/main/java/com/termux/shared/file/tests/FileUtilsTests.java
@@ -4,12 +4,16 @@
 
 import androidx.annotation.NonNull;
 
+import com.termux.shared.errors.Errno;
 import com.termux.shared.file.FileUtils;
+import com.termux.shared.file.FileUtilsErrno;
 import com.termux.shared.logger.Logger;
 import com.termux.shared.errors.Error;
 
 import java.io.File;
 import java.nio.charset.Charset;
+import java.util.Arrays;
+import java.util.List;
 
 public class FileUtilsTests {
 
@@ -68,6 +72,15 @@ private static void runTestsInner(@NonNull final String testRootDirectoryPath) t
         String dir1__sub_dir1_label = "dir1/sub_dir1";
         String dir1__sub_dir1_path = dir1_path + "/sub_dir1";
 
+        String dir1__sub_dir2_label = "dir1/sub_dir2";
+        String dir1__sub_dir2_path = dir1_path + "/sub_dir2";
+
+        String dir1__sub_dir3_label = "dir1/sub_dir3";
+        String dir1__sub_dir3_path = dir1_path + "/sub_dir3";
+
+        String dir1__sub_dir3__sub_reg1_label = "dir1/sub_dir3/sub_reg1";
+        String dir1__sub_dir3__sub_reg1_path = dir1__sub_dir3_path + "/sub_reg1";
+
         String dir1__sub_reg1_label = "dir1/sub_reg1";
         String dir1__sub_reg1_path = dir1_path + "/sub_reg1";
 
@@ -274,6 +287,72 @@ private static void runTestsInner(@NonNull final String testRootDirectoryPath) t
         if (FileUtils.fileExists(path, false))
             throwException("The " + label + " regular file still exist after deletion");
 
+
+        List<String> ignoredSubFilePaths = Arrays.asList(dir1__sub_dir2_path, dir1__sub_dir3__sub_reg1_path);
+
+        // Create dir1 directory file
+        error = FileUtils.createDirectoryFile(dir1_label, dir1_path);
+        assertEqual("Failed to create " + dir1_label + " directory file", null, error);
+
+        // Test empty dir
+        error = FileUtils.validateDirectoryFileEmptyOrOnlyContainsSpecificFiles(dir1_label, dir1_path, ignoredSubFilePaths, false);
+        assertEqual("Failed to validate if " + dir1_label + " directory file is empty", null, error);
+
+
+        // Create dir1/sub_dir3 directory file
+        label = dir1__sub_dir3_label; path = dir1__sub_dir3_path;
+        error = FileUtils.createDirectoryFile(label, path);
+        assertEqual("Failed to create " + label + " directory file", null, error);
+        if (!FileUtils.directoryFileExists(path, false))
+            throwException("The " + label + " directory file does not exist as expected after creation");
+
+        // Test parent dir existing of non existing ignored regular file
+        error = FileUtils.validateDirectoryFileEmptyOrOnlyContainsSpecificFiles(dir1_label, dir1_path, ignoredSubFilePaths, false);
+        assertErrnoEqual("Failed to validate if " + dir1_label + " directory file is empty with parent dir existing of non existing ignored regular file", FileUtilsErrno.ERRNO_NON_EMPTY_DIRECTORY_FILE, error);
+
+
+        // Write "line1" to dir1/sub_dir3/sub_reg1 regular file
+        label = dir1__sub_dir3__sub_reg1_label; path = dir1__sub_dir3__sub_reg1_path;
+        error = FileUtils.writeTextToFile(label, path, Charset.defaultCharset(), "line1", false);
+        assertEqual("Failed to write string to " + label + " file with append mode false", null, error);
+        if (!FileUtils.regularFileExists(path, false))
+            throwException("The " + label + " file does not exist as expected after writing to it with append mode false");
+
+        // Test ignored regular file existing
+        error = FileUtils.validateDirectoryFileEmptyOrOnlyContainsSpecificFiles(dir1_label, dir1_path, ignoredSubFilePaths, false);
+        assertEqual("Failed to validate if " + dir1_label + " directory file is empty with ignored regular file existing", null, error);
+
+
+        // Create dir1/sub_dir2 directory file
+        label = dir1__sub_dir2_label; path = dir1__sub_dir2_path;
+        error = FileUtils.createDirectoryFile(label, path);
+        assertEqual("Failed to create " + label + " directory file", null, error);
+        if (!FileUtils.directoryFileExists(path, false))
+            throwException("The " + label + " directory file does not exist as expected after creation");
+
+        // Test ignored dir file existing
+        error = FileUtils.validateDirectoryFileEmptyOrOnlyContainsSpecificFiles(dir1_label, dir1_path, ignoredSubFilePaths, false);
+        assertEqual("Failed to validate if " + dir1_label + " directory file is empty with ignored dir file existing", null, error);
+
+
+        // Create dir1/sub_dir1 directory file
+        label = dir1__sub_dir1_label; path = dir1__sub_dir1_path;
+        error = FileUtils.createDirectoryFile(label, path);
+        assertEqual("Failed to create " + label + " directory file", null, error);
+        if (!FileUtils.directoryFileExists(path, false))
+            throwException("The " + label + " directory file does not exist as expected after creation");
+
+        // Test non ignored dir file existing
+        error = FileUtils.validateDirectoryFileEmptyOrOnlyContainsSpecificFiles(dir1_label, dir1_path, ignoredSubFilePaths, false);
+        assertErrnoEqual("Failed to validate if " + dir1_label + " directory file is empty with non ignored dir file existing", FileUtilsErrno.ERRNO_NON_EMPTY_DIRECTORY_FILE, error);
+
+
+        // Delete dir1 directory file
+        label = dir1_label; path = dir1_path;
+        error = FileUtils.deleteDirectoryFile(label, path, false);
+        assertEqual("Failed to delete " + label + " directory file", null, error);
+
+
         FileUtils.getFileType("/dev/ptmx", false);
         FileUtils.getFileType("/dev/null", false);
     }
@@ -299,6 +378,13 @@ private static boolean equalsRegardingNull(final String expected, final String a
         return isEquals(expected, actual);
     }
 
+    public static void assertErrnoEqual(@NonNull final String message, final Errno expected, final Error actual) throws Exception {
+        if ((expected == null && actual != null) || (expected != null && !expected.equalsErrorTypeAndCode(actual)))
+            throwException(message + "\nexpected: \"" + expected + "\"\nactual: \"" + actual + "\"\nFull Error:\n" + (actual != null ? actual.toString() : ""));
+    }
+
+
+
     private static boolean isEquals(String expected, String actual) {
         return expected.equals(actual);
     }
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
index 203f514f3c..a3cc5dd334 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
@@ -11,7 +11,7 @@
 import java.util.List;
 
 /*
- * Version: v0.51.0
+ * Version: v0.52.0
  * SPDX-License-Identifier: MIT
  *
  * Changelog
@@ -274,6 +274,9 @@
  *
  * - 0.51.0 (2022-06-13)
  *      - Added `TERMUX_APP.FILE_SHARE_RECEIVER_ACTIVITY_CLASS_NAME` and `TERMUX_APP.FILE_VIEW_RECEIVER_ACTIVITY_CLASS_NAME`.
+ *
+ * - 0.52.0 (2022-06-18)
+ *      - Added `TERMUX_PREFIX_DIR_IGNORED_SUB_FILES_PATHS_TO_CONSIDER_AS_EMPTY`.
  */
 
 /**
@@ -681,6 +684,11 @@ public final class TermuxConstants {
     public static final File TERMUX_APPS_DIR = new File(TERMUX_APPS_DIR_PATH);
 
 
+    /** Termux app $PREFIX directory path ignored sub file paths to consider it empty */
+    public static final List<String> TERMUX_PREFIX_DIR_IGNORED_SUB_FILES_PATHS_TO_CONSIDER_AS_EMPTY = Arrays.asList(
+        TermuxConstants.TERMUX_TMP_PREFIX_DIR_PATH, TermuxConstants.TERMUX_ENV_TEMP_FILE_PATH, TermuxConstants.TERMUX_ENV_FILE_PATH);
+
+
 
     /*
      * Termux app and plugin preferences and properties file paths.
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/file/TermuxFileUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/file/TermuxFileUtils.java
index 2f73c689c7..6fc79a7e2b 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/file/TermuxFileUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/file/TermuxFileUtils.java
@@ -1,5 +1,7 @@
 package com.termux.shared.termux.file;
 
+import static com.termux.shared.termux.TermuxConstants.TERMUX_PREFIX_DIR_PATH;
+
 import android.content.Context;
 import android.os.Environment;
 
@@ -325,6 +327,21 @@ public static Error isAppsTermuxAppDirectoryAccessible(boolean createDirectoryIf
             false, false);
     }
 
+    /**
+     * If {@link TermuxConstants#TERMUX_PREFIX_DIR_PATH} doesn't exist, is empty or only contains
+     * files in {@link TermuxConstants#TERMUX_PREFIX_DIR_IGNORED_SUB_FILES_PATHS_TO_CONSIDER_AS_EMPTY}.
+     */
+    public static boolean isTermuxPrefixDirectoryEmpty() {
+        Error error = FileUtils.validateDirectoryFileEmptyOrOnlyContainsSpecificFiles("termux prefix",
+            TERMUX_PREFIX_DIR_PATH, TermuxConstants.TERMUX_PREFIX_DIR_IGNORED_SUB_FILES_PATHS_TO_CONSIDER_AS_EMPTY, true);
+        if (error == null)
+            return true;
+
+        if (!FileUtilsErrno.ERRNO_NON_EMPTY_DIRECTORY_FILE.equalsErrorTypeAndCode(error))
+            Logger.logErrorExtended(LOG_TAG, "Failed to check if termux prefix directory is empty:\n" + error.getErrorLogString());
+        return false;
+    }
+
     /**
      * Get a markdown {@link String} for stat output for various Termux app files paths.
      *

From 5fc2b4cd4ae59a7cbfccea60c76019e96efb847c Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 18 Jun 2022 06:58:44 +0500
Subject: [PATCH 799/912] Added: Add `SCROLL` extra key to toggle auto
 scrolling of terminal to bottom on terminal text updates and termux activity
 return

The toggle will apply to each terminal session separately.

Closes #2535
---
 .../app/terminal/io/TermuxTerminalExtraKeys.java |  4 ++++
 .../com/termux/terminal/TerminalEmulator.java    | 12 ++++++++++++
 .../main/java/com/termux/view/TerminalView.java  | 16 +++++++++++++---
 .../termux/extrakeys/ExtraKeysConstants.java     |  1 +
 4 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/termux/app/terminal/io/TermuxTerminalExtraKeys.java b/app/src/main/java/com/termux/app/terminal/io/TermuxTerminalExtraKeys.java
index bcb70655e4..a38e8cbbc8 100644
--- a/app/src/main/java/com/termux/app/terminal/io/TermuxTerminalExtraKeys.java
+++ b/app/src/main/java/com/termux/app/terminal/io/TermuxTerminalExtraKeys.java
@@ -96,6 +96,10 @@ public void onTerminalExtraKeyButtonClick(View view, String key, boolean ctrlDow
         } else if ("PASTE".equals(key)) {
             if(mTermuxTerminalSessionActivityClient != null)
                 mTermuxTerminalSessionActivityClient.onPasteTextFromClipboard(null);
+        }  else if ("SCROLL".equals(key)) {
+            TerminalView terminalView = mTermuxTerminalViewClient.getActivity().getTerminalView();
+            if (terminalView != null && terminalView.mEmulator != null)
+                terminalView.mEmulator.toggleAutoScrollDisabled();
         } else {
             super.onTerminalExtraKeyButtonClick(view, key, ctrlDown, altDown, shiftDown, fnDown);
         }
diff --git a/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java b/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
index 127ef6d975..aeef393c62 100644
--- a/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
+++ b/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
@@ -252,6 +252,9 @@ public final class TerminalEmulator {
      */
     private int mScrollCounter = 0;
 
+    /** If automatic scrolling of terminal is disabled */
+    private boolean mAutoScrollDisabled;
+
     private byte mUtf8ToFollow, mUtf8Index;
     private final byte[] mUtf8InputBuffer = new byte[4];
     private int mLastEmittedCodePoint = -1;
@@ -2412,6 +2415,15 @@ public void clearScrollCounter() {
         mScrollCounter = 0;
     }
 
+    public boolean isAutoScrollDisabled() {
+        return mAutoScrollDisabled;
+    }
+
+    public void toggleAutoScrollDisabled() {
+        mAutoScrollDisabled = !mAutoScrollDisabled;
+    }
+
+
     /** Reset terminal state so user can interact with it regardless of present state. */
     public void reset() {
         setCursorStyle();
diff --git a/terminal-view/src/main/java/com/termux/view/TerminalView.java b/terminal-view/src/main/java/com/termux/view/TerminalView.java
index 2bed7cabd4..b96b0426b1 100644
--- a/terminal-view/src/main/java/com/termux/view/TerminalView.java
+++ b/terminal-view/src/main/java/com/termux/view/TerminalView.java
@@ -409,19 +409,29 @@ protected int computeVerticalScrollOffset() {
     }
 
     public void onScreenUpdated() {
+        onScreenUpdated(false);
+    }
+
+    public void onScreenUpdated(boolean skipScrolling) {
         if (mEmulator == null) return;
 
         int rowsInHistory = mEmulator.getScreen().getActiveTranscriptRows();
         if (mTopRow < -rowsInHistory) mTopRow = -rowsInHistory;
 
-        boolean skipScrolling = false;
-        if (isSelectingText()) {
+        if (isSelectingText() || mEmulator.isAutoScrollDisabled()) {
+
             // Do not scroll when selecting text.
             int rowShift = mEmulator.getScrollCounter();
             if (-mTopRow + rowShift > rowsInHistory) {
                 // .. unless we're hitting the end of history transcript, in which
                 // case we abort text selection and scroll to end.
-                stopTextSelectionMode();
+                if (isSelectingText())
+                    stopTextSelectionMode();
+
+                if (mEmulator.isAutoScrollDisabled()) {
+                    mTopRow = -rowsInHistory;
+                    skipScrolling = true;
+                }
             } else {
                 skipScrolling = true;
                 mTopRow -= rowShift;
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/extrakeys/ExtraKeysConstants.java b/termux-shared/src/main/java/com/termux/shared/termux/extrakeys/ExtraKeysConstants.java
index f67a127a35..e625db5cd3 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/extrakeys/ExtraKeysConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/extrakeys/ExtraKeysConstants.java
@@ -90,6 +90,7 @@ public static class EXTRA_KEY_DISPLAY_MAPS {
             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
             put("PASTE", "⎘"); // U+2398
+            put("SCROLL", "⇳"); // U+21F3
         }};
 
         public static final ExtraKeyDisplayMap LESS_KNOWN_CHARACTERS_DISPLAY = new ExtraKeyDisplayMap() {{

From f1d411a5abd4d9fce46a8a8545df4b25c24dc44d Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sun, 19 Jun 2022 03:08:28 +0500
Subject: [PATCH 800/912] Fixed: Fix shared terminal transcript joining back
 lines

Regression of 370ac2bd caused in 5f71e3e7 by the (in)famous @trygveaa
---
 .../src/main/java/com/termux/terminal/TerminalBuffer.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/terminal-emulator/src/main/java/com/termux/terminal/TerminalBuffer.java b/terminal-emulator/src/main/java/com/termux/terminal/TerminalBuffer.java
index df57bd3629..21d6518785 100644
--- a/terminal-emulator/src/main/java/com/termux/terminal/TerminalBuffer.java
+++ b/terminal-emulator/src/main/java/com/termux/terminal/TerminalBuffer.java
@@ -54,7 +54,7 @@ public String getSelectedText(int selX1, int selY1, int selX2, int selY2) {
     }
 
     public String getSelectedText(int selX1, int selY1, int selX2, int selY2, boolean joinBackLines) {
-        return getSelectedText(selX1, selY1, selX2, selY2, true, false);
+        return getSelectedText(selX1, selY1, selX2, selY2, joinBackLines, false);
     }
 
     public String getSelectedText(int selX1, int selY1, int selX2, int selY2, boolean joinBackLines, boolean joinFullLines) {

From 4646aca597b64c9c7e34ee29b611efb2056657d7 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Tue, 21 Jun 2022 03:20:57 +0500
Subject: [PATCH 801/912] Added: Start termux app docs support at
 https://termux.dev/docs/apps/termux as per termux/termux.github.io@612fa084
 and termux/termux.github.io@f9c8d848

---
 docs/index.md | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 docs/index.md

diff --git a/docs/index.md b/docs/index.md
new file mode 100644
index 0000000000..a03cdc7260
--- /dev/null
+++ b/docs/index.md
@@ -0,0 +1,8 @@
+# Termux App Docs
+
+Welcome to documentation for the [Termux App].
+
+---
+&nbsp;&nbsp;
+
+[Termux App]: https://github.com/termux/termux-app

From 605dd6c192de882cea8113b2316fb4bca6bc370a Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 6 Jul 2022 02:53:36 +0500
Subject: [PATCH 802/912] Added: Add check for if Termux has been granted
 Display Over Apps Permission if starting activities and services with
 termux-am-socket on Android 10+

---
 .../java/com/termux/app/TermuxService.java    |   2 +-
 app/src/main/res/values/strings.xml           |   2 +-
 .../socket/local/LocalSocketRunConfig.java    |  16 +--
 .../shared/shell/am/AmSocketServer.java       |  27 ++++-
 .../shell/am/AmSocketServerRunConfig.java     | 108 ++++++++++++++++++
 .../termux/shell/am/TermuxAmSocketServer.java |   5 +-
 termux-shared/src/main/res/values/strings.xml |   6 +
 7 files changed, 150 insertions(+), 16 deletions(-)
 create mode 100644 termux-shared/src/main/java/com/termux/shared/shell/am/AmSocketServerRunConfig.java

diff --git a/app/src/main/java/com/termux/app/TermuxService.java b/app/src/main/java/com/termux/app/TermuxService.java
index d26259e102..8025d0bd2c 100644
--- a/app/src/main/java/com/termux/app/TermuxService.java
+++ b/app/src/main/java/com/termux/app/TermuxService.java
@@ -723,7 +723,7 @@ private void startTermuxActivity() {
             TermuxAppSharedPreferences preferences = TermuxAppSharedPreferences.build(this);
             if (preferences == null) return;
             if (preferences.arePluginErrorNotificationsEnabled(false))
-                Logger.showToast(this, this.getString(R.string.error_display_over_other_apps_permission_not_granted), true);
+                Logger.showToast(this, this.getString(R.string.error_display_over_other_apps_permission_not_granted_to_start_terminal), true);
         }
     }
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ca4c83a51c..642fbb5e07 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -99,7 +99,7 @@
 
 
     <!-- TermuxService -->
-    <string name="error_display_over_other_apps_permission_not_granted">&TERMUX_APP_NAME; requires
+    <string name="error_display_over_other_apps_permission_not_granted_to_start_terminal">&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>
     <string name="error_termux_service_invalid_execution_command_runner">Invalid execution command runner to TermuxService: `%1$s`</string>
diff --git a/termux-shared/src/main/java/com/termux/shared/net/socket/local/LocalSocketRunConfig.java b/termux-shared/src/main/java/com/termux/shared/net/socket/local/LocalSocketRunConfig.java
index 53ef895720..c09f5bef31 100644
--- a/termux-shared/src/main/java/com/termux/shared/net/socket/local/LocalSocketRunConfig.java
+++ b/termux-shared/src/main/java/com/termux/shared/net/socket/local/LocalSocketRunConfig.java
@@ -16,7 +16,7 @@
 public class LocalSocketRunConfig implements Serializable {
 
     /** The {@link LocalSocketManager} title. */
-    private final String mTitle;
+    protected final String mTitle;
 
     /**
      * The {@link LocalServerSocket} path.
@@ -40,19 +40,19 @@ public class LocalSocketRunConfig implements Serializable {
      *
      * Max allowed length is 108 bytes as per sun_path size (UNIX_PATH_MAX) on Linux.
      */
-    private final String mPath;
+    protected final String mPath;
 
     /** If abstract namespace {@link LocalServerSocket} instead of filesystem. */
     protected final boolean mAbstractNamespaceSocket;
 
     /** The {@link ILocalSocketManager} client for the {@link LocalSocketManager}. */
-    private final ILocalSocketManager mLocalSocketManagerClient;
+    protected final ILocalSocketManager mLocalSocketManagerClient;
 
     /**
      * The {@link LocalServerSocket} file descriptor.
      * Value will be `>= 0` if socket has been created successfully and `-1` if not created or closed.
      */
-    private int mFD = -1;
+    protected int mFD = -1;
 
     /**
      * The {@link LocalClientSocket} receiving (SO_RCVTIMEO) timeout in milliseconds.
@@ -61,7 +61,7 @@ public class LocalSocketRunConfig implements Serializable {
      * https://cs.android.com/android/platform/superproject/+/android-12.0.0_r32:frameworks/base/services/core/java/com/android/server/am/NativeCrashListener.java;l=55
      * Defaults to {@link #DEFAULT_RECEIVE_TIMEOUT}.
      */
-    private Integer mReceiveTimeout;
+    protected Integer mReceiveTimeout;
     public static final int DEFAULT_RECEIVE_TIMEOUT = 10000;
 
     /**
@@ -71,7 +71,7 @@ public class LocalSocketRunConfig implements Serializable {
      * https://cs.android.com/android/platform/superproject/+/android-12.0.0_r32:frameworks/base/services/core/java/com/android/server/am/NativeCrashListener.java;l=55
      * Defaults to {@link #DEFAULT_SEND_TIMEOUT}.
      */
-    private Integer mSendTimeout;
+    protected Integer mSendTimeout;
     public static final int DEFAULT_SEND_TIMEOUT = 10000;
 
     /**
@@ -80,7 +80,7 @@ public class LocalSocketRunConfig implements Serializable {
      * deadline.
      * Defaults to {@link #DEFAULT_DEADLINE}.
      */
-    private Long mDeadline;
+    protected Long mDeadline;
     public static final int DEFAULT_DEADLINE = 0;
 
     /**
@@ -91,7 +91,7 @@ public class LocalSocketRunConfig implements Serializable {
      * https://cs.android.com/android/platform/superproject/+/android-12.0.0_r32:frameworks/base/core/java/android/net/LocalSocketManager.java;l=31
      * Defaults to {@link #DEFAULT_BACKLOG}.
      */
-    private Integer mBacklog;
+    protected Integer mBacklog;
     public static final int DEFAULT_BACKLOG = 50;
 
 
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/am/AmSocketServer.java b/termux-shared/src/main/java/com/termux/shared/shell/am/AmSocketServer.java
index f94e345311..e316ec0662 100644
--- a/termux-shared/src/main/java/com/termux/shared/shell/am/AmSocketServer.java
+++ b/termux-shared/src/main/java/com/termux/shared/shell/am/AmSocketServer.java
@@ -1,5 +1,6 @@
 package com.termux.shared.shell.am;
 
+import android.Manifest;
 import android.app.Application;
 import android.content.Context;
 
@@ -7,6 +8,9 @@
 import androidx.annotation.Nullable;
 
 import com.termux.am.Am;
+import com.termux.shared.R;
+import com.termux.shared.android.PackageUtils;
+import com.termux.shared.android.PermissionUtils;
 import com.termux.shared.errors.Error;
 import com.termux.shared.logger.Logger;
 import com.termux.shared.net.socket.local.ILocalSocketManager;
@@ -40,8 +44,9 @@
  * 1. Optionally extend {@link AmSocketServerClient}, the implementation for
  *    {@link ILocalSocketManager} that will receive call backs from the server including
  *    when client connects via {@link ILocalSocketManager#onClientAccepted(LocalSocketManager, LocalClientSocket)}.
- * 2. Create a {@link LocalSocketRunConfig} instance with the run config of the am server. It would
- *    be better to use a filesystem socket instead of abstract namespace socket for security reasons.
+ * 2. Create a {@link AmSocketServerRunConfig} instance which extends from {@link LocalSocketRunConfig}
+ *    with the run config of the am server. It would  be better to use a filesystem socket instead
+ *    of abstract namespace socket for security reasons.
  * 3. Call {@link #start(Context, LocalSocketRunConfig)} to start the server and store the {@link LocalSocketManager}
  *    instance returned.
  * 4. Stop server if needed with a call to {@link LocalSocketManager#stop()} on the
@@ -104,10 +109,13 @@ public static void processAmClient(@NonNull LocalSocketManager localSocketManage
         Logger.logDebug(LOG_TAG, "am command received from peer " + clientSocket.getPeerCred().getMinimalString() +
             "\n" + ExecutionCommand.getArgumentsLogString("am command", amCommandArray));
 
+        AmSocketServerRunConfig amSocketServerRunConfig = (AmSocketServerRunConfig) localSocketManager.getLocalSocketRunConfig();
+
         // Run am command and send its result to the client
         StringBuilder stdout = new StringBuilder();
         StringBuilder stderr = new StringBuilder();
-        error = runAmCommand(localSocketManager.getContext(), amCommandArray, stdout, stderr);
+        error = runAmCommand(localSocketManager.getContext(), amCommandArray, stdout, stderr,
+            amSocketServerRunConfig.shouldCheckDisplayOverAppsPermission());
         if (error != null) {
             sendResultToClient(localSocketManager, clientSocket, 1, stdout.toString(),
                 !stderr.toString().isEmpty() ? stderr + "\n\n" + error : error.toString());
@@ -194,16 +202,27 @@ public static Error parseAmCommand(String amCommandString, List<String> amComman
      * @param amCommandArray The am command array.
      * @param stdout The {@link StringBuilder} to set stdout in that is returned by the am command.
      * @param stderr The {@link StringBuilder} to set stderr in that is returned by the am command.
+     * @param checkDisplayOverAppsPermission Check if {@link Manifest.permission#SYSTEM_ALERT_WINDOW}
+     *                                       has been granted if running on Android `>= 10` and
+     *                                       starting activity or service.
      * @return Returns the {@code error} if am command failed, otherwise {@code null}.
      */
     public static Error runAmCommand(@NonNull Context context,
                                      String[] amCommandArray,
-                                     @NonNull StringBuilder stdout, @NonNull StringBuilder stderr) {
+                                     @NonNull StringBuilder stdout, @NonNull StringBuilder stderr,
+                                     boolean checkDisplayOverAppsPermission) {
         try (ByteArrayOutputStream stdoutByteStream = new ByteArrayOutputStream();
              PrintStream stdoutPrintStream = new PrintStream(stdoutByteStream);
              ByteArrayOutputStream stderrByteStream = new ByteArrayOutputStream();
              PrintStream stderrPrintStream = new PrintStream(stderrByteStream)) {
 
+            if (checkDisplayOverAppsPermission && amCommandArray.length >= 1 &&
+                (amCommandArray[0].equals("start") || amCommandArray[0].equals("startservice")) &&
+                !PermissionUtils.validateDisplayOverOtherAppsPermissionForPostAndroid10(context, true)) {
+                throw new IllegalStateException(context.getString(R.string.error_display_over_other_apps_permission_not_granted,
+                    PackageUtils.getAppNameForPackage(context)));
+            }
+
             new Am(stdoutPrintStream, stderrPrintStream, (Application) context.getApplicationContext()).run(amCommandArray);
 
             // Set stdout to value set by am command in stdoutPrintStream
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/am/AmSocketServerRunConfig.java b/termux-shared/src/main/java/com/termux/shared/shell/am/AmSocketServerRunConfig.java
new file mode 100644
index 0000000000..f36cbece58
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/shell/am/AmSocketServerRunConfig.java
@@ -0,0 +1,108 @@
+package com.termux.shared.shell.am;
+
+import android.Manifest;
+
+import androidx.annotation.NonNull;
+
+import com.termux.shared.logger.Logger;
+import com.termux.shared.markdown.MarkdownUtils;
+import com.termux.shared.net.socket.local.ILocalSocketManager;
+import com.termux.shared.net.socket.local.LocalSocketRunConfig;
+
+import java.io.Serializable;
+
+/**
+ * Run config for {@link AmSocketServer}.
+ */
+public class AmSocketServerRunConfig extends LocalSocketRunConfig implements Serializable {
+
+    /**
+     * Check if {@link Manifest.permission#SYSTEM_ALERT_WINDOW} has been granted if running on Android `>= 10`
+     * if starting activities. Will also check when starting services in case starting foreground
+     * service is not allowed.
+     *
+     * https://developer.android.com/guide/components/activities/background-starts
+     */
+    private Boolean mCheckDisplayOverAppsPermission;
+    public static final boolean DEFAULT_CHECK_DISPLAY_OVER_APPS_PERMISSION = true;
+
+    /**
+     * Create an new instance of {@link AmSocketServerRunConfig}.
+     *
+     * @param title The {@link #mTitle} value.
+     * @param path The {@link #mPath} value.
+     * @param localSocketManagerClient The {@link #mLocalSocketManagerClient} value.
+     */
+    public AmSocketServerRunConfig(@NonNull String title, @NonNull String path, @NonNull ILocalSocketManager localSocketManagerClient) {
+        super(title, path, localSocketManagerClient);
+    }
+
+
+    /** Get {@link #mCheckDisplayOverAppsPermission} if set, otherwise {@link #DEFAULT_CHECK_DISPLAY_OVER_APPS_PERMISSION}. */
+    public boolean shouldCheckDisplayOverAppsPermission() {
+        return mCheckDisplayOverAppsPermission != null ? mCheckDisplayOverAppsPermission : DEFAULT_CHECK_DISPLAY_OVER_APPS_PERMISSION;
+    }
+
+    /** Set {@link #mCheckDisplayOverAppsPermission}. */
+    public void setCheckDisplayOverAppsPermission(Boolean checkDisplayOverAppsPermission) {
+        mCheckDisplayOverAppsPermission = checkDisplayOverAppsPermission;
+    }
+
+
+
+    /**
+     * Get a log {@link String} for {@link AmSocketServerRunConfig}.
+     *
+     * @param config The {@link AmSocketServerRunConfig} to get info of.
+     * @return Returns the log {@link String}.
+     */
+    @NonNull
+    public static String getRunConfigLogString(final AmSocketServerRunConfig config) {
+        if (config == null) return "null";
+        return config.getLogString();
+    }
+
+    /** Get a log {@link String} for the {@link AmSocketServerRunConfig}. */
+    @NonNull
+    public String getLogString() {
+        StringBuilder logString = new StringBuilder();
+        logString.append(super.getLogString()).append("\n\n\n");
+
+        logString.append("Am Command:");
+        logString.append("\n").append(Logger.getSingleLineLogStringEntry("CheckDisplayOverAppsPermission", shouldCheckDisplayOverAppsPermission(), "-"));
+
+        return logString.toString();
+    }
+
+    /**
+     * Get a markdown {@link String} for {@link AmSocketServerRunConfig}.
+     *
+     * @param config The {@link AmSocketServerRunConfig} to get info of.
+     * @return Returns the markdown {@link String}.
+     */
+    public static String getRunConfigMarkdownString(final AmSocketServerRunConfig config) {
+        if (config == null) return "null";
+        return config.getMarkdownString();
+    }
+
+    /** Get a markdown {@link String} for the {@link AmSocketServerRunConfig}. */
+    @NonNull
+    public String getMarkdownString() {
+        StringBuilder markdownString = new StringBuilder();
+        markdownString.append(super.getMarkdownString()).append("\n\n\n");
+
+        markdownString.append("## ").append("Am Command");
+        markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("CheckDisplayOverAppsPermission", shouldCheckDisplayOverAppsPermission(), "-"));
+
+        return markdownString.toString();
+    }
+
+
+
+    @NonNull
+    @Override
+    public String toString() {
+        return getLogString();
+    }
+
+}
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/shell/am/TermuxAmSocketServer.java b/termux-shared/src/main/java/com/termux/shared/termux/shell/am/TermuxAmSocketServer.java
index 438744e1d4..0d68ae5c66 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/shell/am/TermuxAmSocketServer.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/shell/am/TermuxAmSocketServer.java
@@ -13,6 +13,7 @@
 import com.termux.shared.net.socket.local.LocalSocketManager;
 import com.termux.shared.net.socket.local.LocalSocketManagerClientBase;
 import com.termux.shared.net.socket.local.LocalSocketRunConfig;
+import com.termux.shared.shell.am.AmSocketServerRunConfig;
 import com.termux.shared.shell.am.AmSocketServer;
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.termux.crash.TermuxCrashUtils;
@@ -101,10 +102,10 @@ public static void setupTermuxAmSocketServer(@NonNull Context context) {
     public static synchronized void start(@NonNull Context context) {
         stop();
 
-        LocalSocketRunConfig localSocketRunConfig = new LocalSocketRunConfig(TITLE,
+        AmSocketServerRunConfig amSocketServerRunConfig = new AmSocketServerRunConfig(TITLE,
             TermuxConstants.TERMUX_APP.TERMUX_AM_SOCKET_FILE_PATH, new TermuxAmSocketServerClient());
 
-        termuxAmSocketServer = AmSocketServer.start(context, localSocketRunConfig);
+        termuxAmSocketServer = AmSocketServer.start(context, amSocketServerRunConfig);
     }
 
     /**
diff --git a/termux-shared/src/main/res/values/strings.xml b/termux-shared/src/main/res/values/strings.xml
index 9124a889ae..88f555b9a8 100644
--- a/termux-shared/src/main/res/values/strings.xml
+++ b/termux-shared/src/main/res/values/strings.xml
@@ -37,6 +37,12 @@
     <string name="error_attempted_to_ask_for_permissions_not_requested">Attempted to ask for permissions that have not been requested in app manifest: %1$s</string>
     <string name="error_has_not_requested_legacy_external_storage">The \"%1$s\" package is targeting targetSdkVersion %2$d and is running on android sdk %3$d but has not set requestLegacyExternalStorage to true in app manifest</string>
     <string name="msg_requires_dump_and_package_usage_stats_permissions">Requires `DUMP` and `PACKAGE_USAGE_STATS` permission</string>
+    <string name="error_display_over_other_apps_permission_not_granted">%1$s requires
+        \"Display over other apps\" permission to start activities and services from background on Android >= 10.
+        Grants it from Android Settings -> Apps -> %1$s -> Advanced -> Draw over other apps.
+        The permission name may be different on different devices, like on Xiaomi, its called
+        \"Display pop-up windows while running in the background\", check https://dontkillmyapp.com
+        for device specific issues.</string>
 
 
 

From 211340781bcb0576ffe100fda2e0ed87d7333d53 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sun, 17 Jul 2022 08:48:03 +0500
Subject: [PATCH 803/912] Added: Add multi language i18n support for docs per
 termux/termux.github.io@f234d089e

---
 docs/{ => en}/index.md | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
 rename docs/{ => en}/index.md (60%)

diff --git a/docs/index.md b/docs/en/index.md
similarity index 60%
rename from docs/index.md
rename to docs/en/index.md
index a03cdc7260..8f0387ab79 100644
--- a/docs/index.md
+++ b/docs/en/index.md
@@ -1,8 +1,13 @@
+---
+page_ref: /docs/apps/termux/index.html
+---
+
 # Termux App Docs
 
+<!--- DOC_HEADER_PLACEHOLDER -->
+
 Welcome to documentation for the [Termux App].
 
----
-&nbsp;&nbsp;
+##
 
 [Termux App]: https://github.com/termux/termux-app

From 061dc776bd74101b7917c2c2551ca88d7dda8939 Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Wed, 21 Sep 2022 10:30:24 +0300
Subject: [PATCH 804/912] rename dev_keystore.jks to testkey_untrusted.jks

Hopefully the new name of keystore file would provide to potential user
more info about what it actually is.
---
 app/build.gradle                                |   2 +-
 app/{dev_keystore.jks => testkey_untrusted.jks} | Bin
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename app/{dev_keystore.jks => testkey_untrusted.jks} (100%)

diff --git a/app/build.gradle b/app/build.gradle
index 1071633d04..8338a27a85 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -77,7 +77,7 @@ android {
 
     signingConfigs {
         debug {
-            storeFile file('dev_keystore.jks')
+            storeFile file('testkey_untrusted.jks')
             keyAlias 'alias'
             storePassword 'xrj45yWGLbsO7W0v'
             keyPassword 'xrj45yWGLbsO7W0v'
diff --git a/app/dev_keystore.jks b/app/testkey_untrusted.jks
similarity index 100%
rename from app/dev_keystore.jks
rename to app/testkey_untrusted.jks

From 6c5607395807122b432514201f560aa7631a4b65 Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Wed, 21 Sep 2022 20:01:13 +0300
Subject: [PATCH 805/912] readme: add notes about test keystore

---
 README.md | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/README.md b/README.md
index 9f9c18d847..bbcdab3a62 100644
--- a/README.md
+++ b/README.md
@@ -89,6 +89,29 @@ The APKs for both of these are [`debuggable`](https://developer.android.com/stud
 
 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.
 
+**Security warning**: APK files on GitHub are signed with a test key that has been [shared with community](https://github.com/termux/termux-app/blob/master/app/testkey_untrusted.jks). This IS NOT an official developer key and everyone can use it to generate releases for own testing. Be very careful when using Termux GitHub builds obtained elsewhere except https://github.com/termux/termux-app. Everyone is able to use it to forge a malicious Termux update installable over the GitHub build. Think twice about installing Termux builds distributed via Telegram or other social media. If your device get caught by malware, we will not be able to help you.
+
+The [test key](https://github.com/termux/termux-app/blob/master/app/testkey_untrusted.jks) shall not be used to impersonate @termux and can't be used for this anyway. This key is not trusted by us and it is quite easy to detect its use in user generated content.
+
+Keystore information:
+```
+Alias name: alias
+Creation date: Oct 4, 2019
+Entry type: PrivateKeyEntry
+Certificate chain length: 1
+Certificate[1]:
+Owner: CN=APK Signer, OU=Earth, O=Earth
+Issuer: CN=APK Signer, OU=Earth, O=Earth
+Serial number: 29be297b
+Valid from: Wed Sep 04 02:03:24 EEST 2019 until: Tue Oct 26 02:03:24 EEST 2049
+Certificate fingerprints:
+         SHA1: 51:79:55:EA:BF:69:FC:05:7C:41:C7:D3:79:DB:BC:EF:20:AD:85:F2
+         SHA256: B6:DA:01:48:0E:EF:D5:FB:F2:CD:37:71:B8:D1:02:1E:C7:91:30:4B:DD:6C:4B:F4:1D:3F:AA:BA:D4:8E:E5:E1
+Signature algorithm name: SHA1withRSA (disabled)
+Subject Public Key Algorithm: 2048-bit RSA key
+Version: 3
+```
+
 ### 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.**

From 8c1749ef9699e2953c7ca12a976c2fb70a6107e5 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 29 Sep 2022 02:45:31 +0500
Subject: [PATCH 806/912] Added|Changed: Add `AppSharedPreferences` to hold
 `SharedPreferences` of apps and inherit termux app prefrences from it

---
 .../preferences/AppSharedPreferences.java     | 49 +++++++++++++++++++
 .../TermuxAPIAppSharedPreferences.java        | 27 +++-------
 .../TermuxAppSharedPreferences.java           | 28 +++--------
 .../TermuxBootAppSharedPreferences.java       | 27 +++-------
 .../TermuxFloatAppSharedPreferences.java      | 26 +++-------
 .../TermuxStylingAppSharedPreferences.java    | 27 +++-------
 .../TermuxTaskerAppSharedPreferences.java     | 27 +++-------
 .../TermuxWidgetAppSharedPreferences.java     | 27 +++-------
 8 files changed, 98 insertions(+), 140 deletions(-)
 create mode 100644 termux-shared/src/main/java/com/termux/shared/settings/preferences/AppSharedPreferences.java

diff --git a/termux-shared/src/main/java/com/termux/shared/settings/preferences/AppSharedPreferences.java b/termux-shared/src/main/java/com/termux/shared/settings/preferences/AppSharedPreferences.java
new file mode 100644
index 0000000000..03a75e03b5
--- /dev/null
+++ b/termux-shared/src/main/java/com/termux/shared/settings/preferences/AppSharedPreferences.java
@@ -0,0 +1,49 @@
+package com.termux.shared.settings.preferences;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+/** A class that holds {@link SharedPreferences} objects for apps. */
+public class AppSharedPreferences {
+
+    /** The {@link Context} for operations. */
+    protected final Context mContext;
+
+    /** The {@link SharedPreferences} that ideally should be created with {@link SharedPreferenceUtils#getPrivateSharedPreferences(Context, String)}. */
+    protected final SharedPreferences mSharedPreferences;
+
+    /** The {@link SharedPreferences}that ideally should be created with {@link SharedPreferenceUtils#getPrivateAndMultiProcessSharedPreferences(Context, String)}. */
+    protected final SharedPreferences mMultiProcessSharedPreferences;
+
+    protected AppSharedPreferences(@NonNull Context context, @Nullable SharedPreferences sharedPreferences) {
+        this(context, sharedPreferences, null);
+    }
+
+    protected AppSharedPreferences(@NonNull Context context, @Nullable SharedPreferences sharedPreferences,
+                                   @Nullable SharedPreferences multiProcessSharedPreferences) {
+        mContext = context;
+        mSharedPreferences = sharedPreferences;
+        mMultiProcessSharedPreferences = multiProcessSharedPreferences;
+    }
+
+
+
+    /** Get {@link #mContext}. */
+    public Context getContext() {
+        return mContext;
+    }
+
+    /** Get {@link #mSharedPreferences}. */
+    public SharedPreferences getSharedPreferences() {
+        return mSharedPreferences;
+    }
+
+    /** Get {@link #mMultiProcessSharedPreferences}. */
+    public SharedPreferences getMultiProcessSharedPreferences() {
+        return mMultiProcessSharedPreferences;
+    }
+
+}
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxAPIAppSharedPreferences.java b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxAPIAppSharedPreferences.java
index 228f9cc4f3..0eec1a1486 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxAPIAppSharedPreferences.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxAPIAppSharedPreferences.java
@@ -1,31 +1,28 @@
 package com.termux.shared.termux.settings.preferences;
 
 import android.content.Context;
-import android.content.SharedPreferences;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import com.termux.shared.logger.Logger;
 import com.termux.shared.android.PackageUtils;
+import com.termux.shared.settings.preferences.AppSharedPreferences;
 import com.termux.shared.settings.preferences.SharedPreferenceUtils;
 import com.termux.shared.termux.TermuxUtils;
 import com.termux.shared.termux.settings.preferences.TermuxPreferenceConstants.TERMUX_API_APP;
 import com.termux.shared.termux.TermuxConstants;
 
-public class TermuxAPIAppSharedPreferences {
-
-    private final Context mContext;
-    private final SharedPreferences mSharedPreferences;
-    private final SharedPreferences mMultiProcessSharedPreferences;
-
+public class TermuxAPIAppSharedPreferences extends AppSharedPreferences {
 
     private static final String LOG_TAG = "TermuxAPIAppSharedPreferences";
 
     private TermuxAPIAppSharedPreferences(@NonNull Context context) {
-        mContext = context;
-        mSharedPreferences = getPrivateSharedPreferences(mContext);
-        mMultiProcessSharedPreferences = getPrivateAndMultiProcessSharedPreferences(mContext);
+        super(context,
+            SharedPreferenceUtils.getPrivateSharedPreferences(context,
+                TermuxConstants.TERMUX_API_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION),
+            SharedPreferenceUtils.getPrivateAndMultiProcessSharedPreferences(context,
+                TermuxConstants.TERMUX_API_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION));
     }
 
     /**
@@ -61,16 +58,6 @@ public static TermuxAPIAppSharedPreferences build(@NonNull final Context context
             return new TermuxAPIAppSharedPreferences(termuxAPIPackageContext);
     }
 
-    private static SharedPreferences getPrivateSharedPreferences(Context context) {
-        if (context == null) return null;
-        return SharedPreferenceUtils.getPrivateSharedPreferences(context, TermuxConstants.TERMUX_API_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION);
-    }
-
-    private static SharedPreferences getPrivateAndMultiProcessSharedPreferences(Context context) {
-        if (context == null) return null;
-        return SharedPreferenceUtils.getPrivateAndMultiProcessSharedPreferences(context, TermuxConstants.TERMUX_API_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION);
-    }
-
 
 
     public int getLogLevel(boolean readFromFile) {
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxAppSharedPreferences.java b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxAppSharedPreferences.java
index a33be8e68e..cd3812fe49 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxAppSharedPreferences.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxAppSharedPreferences.java
@@ -1,13 +1,13 @@
 package com.termux.shared.termux.settings.preferences;
 
 import android.content.Context;
-import android.content.SharedPreferences;
 import android.util.TypedValue;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import com.termux.shared.android.PackageUtils;
+import com.termux.shared.settings.preferences.AppSharedPreferences;
 import com.termux.shared.settings.preferences.SharedPreferenceUtils;
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.logger.Logger;
@@ -15,11 +15,7 @@
 import com.termux.shared.termux.TermuxUtils;
 import com.termux.shared.termux.settings.preferences.TermuxPreferenceConstants.TERMUX_APP;
 
-public class TermuxAppSharedPreferences {
-
-    private final Context mContext;
-    private final SharedPreferences mSharedPreferences;
-    private final SharedPreferences mMultiProcessSharedPreferences;
+public class TermuxAppSharedPreferences extends AppSharedPreferences {
 
     private int MIN_FONTSIZE;
     private int MAX_FONTSIZE;
@@ -28,10 +24,11 @@ public class TermuxAppSharedPreferences {
     private static final String LOG_TAG = "TermuxAppSharedPreferences";
 
     private TermuxAppSharedPreferences(@NonNull Context context) {
-        mContext = context;
-        mSharedPreferences = getPrivateSharedPreferences(mContext);
-        mMultiProcessSharedPreferences = getPrivateAndMultiProcessSharedPreferences(mContext);
-
+        super(context,
+            SharedPreferenceUtils.getPrivateSharedPreferences(context,
+                TermuxConstants.TERMUX_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION),
+            SharedPreferenceUtils.getPrivateAndMultiProcessSharedPreferences(context,
+                TermuxConstants.TERMUX_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION));
 
         setFontVariables(context);
     }
@@ -69,17 +66,6 @@ public static TermuxAppSharedPreferences build(@NonNull final Context context, f
             return new TermuxAppSharedPreferences(termuxPackageContext);
     }
 
-    private static SharedPreferences getPrivateSharedPreferences(Context context) {
-        if (context == null) return null;
-        return SharedPreferenceUtils.getPrivateSharedPreferences(context, TermuxConstants.TERMUX_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION);
-    }
-
-
-    private static SharedPreferences getPrivateAndMultiProcessSharedPreferences(Context context) {
-        if (context == null) return null;
-        return SharedPreferenceUtils.getPrivateAndMultiProcessSharedPreferences(context, TermuxConstants.TERMUX_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION);
-    }
-
 
 
     public boolean shouldShowTerminalToolbar() {
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxBootAppSharedPreferences.java b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxBootAppSharedPreferences.java
index 49db9cef16..317f93ce1e 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxBootAppSharedPreferences.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxBootAppSharedPreferences.java
@@ -1,31 +1,28 @@
 package com.termux.shared.termux.settings.preferences;
 
 import android.content.Context;
-import android.content.SharedPreferences;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import com.termux.shared.logger.Logger;
 import com.termux.shared.android.PackageUtils;
+import com.termux.shared.settings.preferences.AppSharedPreferences;
 import com.termux.shared.settings.preferences.SharedPreferenceUtils;
 import com.termux.shared.termux.TermuxUtils;
 import com.termux.shared.termux.settings.preferences.TermuxPreferenceConstants.TERMUX_BOOT_APP;
 import com.termux.shared.termux.TermuxConstants;
 
-public class TermuxBootAppSharedPreferences {
-
-    private final Context mContext;
-    private final SharedPreferences mSharedPreferences;
-    private final SharedPreferences mMultiProcessSharedPreferences;
-
+public class TermuxBootAppSharedPreferences extends AppSharedPreferences {
 
     private static final String LOG_TAG = "TermuxBootAppSharedPreferences";
 
     private TermuxBootAppSharedPreferences(@NonNull Context context) {
-        mContext = context;
-        mSharedPreferences = getPrivateSharedPreferences(mContext);
-        mMultiProcessSharedPreferences = getPrivateAndMultiProcessSharedPreferences(mContext);
+        super(context,
+            SharedPreferenceUtils.getPrivateSharedPreferences(context,
+                TermuxConstants.TERMUX_BOOT_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION),
+            SharedPreferenceUtils.getPrivateAndMultiProcessSharedPreferences(context,
+                TermuxConstants.TERMUX_BOOT_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION));
     }
 
     /**
@@ -61,16 +58,6 @@ public static TermuxBootAppSharedPreferences build(@NonNull final Context contex
             return new TermuxBootAppSharedPreferences(termuxBootPackageContext);
     }
 
-    private static SharedPreferences getPrivateSharedPreferences(Context context) {
-        if (context == null) return null;
-        return SharedPreferenceUtils.getPrivateSharedPreferences(context, TermuxConstants.TERMUX_BOOT_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION);
-    }
-
-    private static SharedPreferences getPrivateAndMultiProcessSharedPreferences(Context context) {
-        if (context == null) return null;
-        return SharedPreferenceUtils.getPrivateAndMultiProcessSharedPreferences(context, TermuxConstants.TERMUX_BOOT_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION);
-    }
-
 
 
     public int getLogLevel(boolean readFromFile) {
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxFloatAppSharedPreferences.java b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxFloatAppSharedPreferences.java
index 4c0c7939d1..e56e29acdd 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxFloatAppSharedPreferences.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxFloatAppSharedPreferences.java
@@ -1,7 +1,6 @@
 package com.termux.shared.termux.settings.preferences;
 
 import android.content.Context;
-import android.content.SharedPreferences;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -9,16 +8,13 @@
 import com.termux.shared.data.DataUtils;
 import com.termux.shared.logger.Logger;
 import com.termux.shared.android.PackageUtils;
+import com.termux.shared.settings.preferences.AppSharedPreferences;
 import com.termux.shared.settings.preferences.SharedPreferenceUtils;
 import com.termux.shared.termux.TermuxUtils;
 import com.termux.shared.termux.settings.preferences.TermuxPreferenceConstants.TERMUX_FLOAT_APP;
 import com.termux.shared.termux.TermuxConstants;
 
-public class TermuxFloatAppSharedPreferences {
-
-    private final Context mContext;
-    private final SharedPreferences mSharedPreferences;
-    private final SharedPreferences mMultiProcessSharedPreferences;
+public class TermuxFloatAppSharedPreferences extends AppSharedPreferences {
 
     private int MIN_FONTSIZE;
     private int MAX_FONTSIZE;
@@ -27,9 +23,11 @@ public class TermuxFloatAppSharedPreferences {
     private static final String LOG_TAG = "TermuxFloatAppSharedPreferences";
 
     private TermuxFloatAppSharedPreferences(@NonNull Context context) {
-        mContext = context;
-        mSharedPreferences = getPrivateSharedPreferences(mContext);
-        mMultiProcessSharedPreferences = getPrivateAndMultiProcessSharedPreferences(mContext);
+        super(context,
+            SharedPreferenceUtils.getPrivateSharedPreferences(context,
+                TermuxConstants.TERMUX_FLOAT_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION),
+            SharedPreferenceUtils.getPrivateAndMultiProcessSharedPreferences(context,
+                TermuxConstants.TERMUX_FLOAT_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION));
 
         setFontVariables(context);
     }
@@ -67,16 +65,6 @@ public static TermuxFloatAppSharedPreferences build(@NonNull final Context conte
             return new TermuxFloatAppSharedPreferences(termuxFloatPackageContext);
     }
 
-    private static SharedPreferences getPrivateSharedPreferences(Context context) {
-        if (context == null) return null;
-        return SharedPreferenceUtils.getPrivateSharedPreferences(context, TermuxConstants.TERMUX_FLOAT_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION);
-    }
-
-    private static SharedPreferences getPrivateAndMultiProcessSharedPreferences(Context context) {
-        if (context == null) return null;
-        return SharedPreferenceUtils.getPrivateAndMultiProcessSharedPreferences(context, TermuxConstants.TERMUX_FLOAT_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION);
-    }
-
 
 
     public int getWindowX() {
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxStylingAppSharedPreferences.java b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxStylingAppSharedPreferences.java
index 5e6b25a268..0e1b539ee9 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxStylingAppSharedPreferences.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxStylingAppSharedPreferences.java
@@ -1,31 +1,28 @@
 package com.termux.shared.termux.settings.preferences;
 
 import android.content.Context;
-import android.content.SharedPreferences;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import com.termux.shared.logger.Logger;
 import com.termux.shared.android.PackageUtils;
+import com.termux.shared.settings.preferences.AppSharedPreferences;
 import com.termux.shared.settings.preferences.SharedPreferenceUtils;
 import com.termux.shared.termux.TermuxUtils;
 import com.termux.shared.termux.settings.preferences.TermuxPreferenceConstants.TERMUX_STYLING_APP;
 import com.termux.shared.termux.TermuxConstants;
 
-public class TermuxStylingAppSharedPreferences {
-
-    private final Context mContext;
-    private final SharedPreferences mSharedPreferences;
-    private final SharedPreferences mMultiProcessSharedPreferences;
-
+public class TermuxStylingAppSharedPreferences extends AppSharedPreferences {
 
     private static final String LOG_TAG = "TermuxStylingAppSharedPreferences";
 
     private TermuxStylingAppSharedPreferences(@NonNull Context context) {
-        mContext = context;
-        mSharedPreferences = getPrivateSharedPreferences(mContext);
-        mMultiProcessSharedPreferences = getPrivateAndMultiProcessSharedPreferences(mContext);
+        super(context,
+            SharedPreferenceUtils.getPrivateSharedPreferences(context,
+                TermuxConstants.TERMUX_STYLING_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION),
+            SharedPreferenceUtils.getPrivateAndMultiProcessSharedPreferences(context,
+                TermuxConstants.TERMUX_STYLING_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION));
     }
 
     /**
@@ -61,16 +58,6 @@ public static TermuxStylingAppSharedPreferences build(@NonNull final Context con
             return new TermuxStylingAppSharedPreferences(termuxStylingPackageContext);
     }
 
-    private static SharedPreferences getPrivateSharedPreferences(Context context) {
-        if (context == null) return null;
-        return SharedPreferenceUtils.getPrivateSharedPreferences(context, TermuxConstants.TERMUX_STYLING_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION);
-    }
-
-    private static SharedPreferences getPrivateAndMultiProcessSharedPreferences(Context context) {
-        if (context == null) return null;
-        return SharedPreferenceUtils.getPrivateAndMultiProcessSharedPreferences(context, TermuxConstants.TERMUX_STYLING_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION);
-    }
-
 
 
     public int getLogLevel(boolean readFromFile) {
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxTaskerAppSharedPreferences.java b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxTaskerAppSharedPreferences.java
index b647f09661..5c518a67c4 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxTaskerAppSharedPreferences.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxTaskerAppSharedPreferences.java
@@ -1,31 +1,28 @@
 package com.termux.shared.termux.settings.preferences;
 
 import android.content.Context;
-import android.content.SharedPreferences;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import com.termux.shared.android.PackageUtils;
+import com.termux.shared.settings.preferences.AppSharedPreferences;
 import com.termux.shared.settings.preferences.SharedPreferenceUtils;
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.termux.TermuxUtils;
 import com.termux.shared.termux.settings.preferences.TermuxPreferenceConstants.TERMUX_TASKER_APP;
 import com.termux.shared.logger.Logger;
 
-public class TermuxTaskerAppSharedPreferences {
-
-    private final Context mContext;
-    private final SharedPreferences mSharedPreferences;
-    private final SharedPreferences mMultiProcessSharedPreferences;
-
+public class TermuxTaskerAppSharedPreferences extends AppSharedPreferences {
 
     private static final String LOG_TAG = "TermuxTaskerAppSharedPreferences";
 
     private  TermuxTaskerAppSharedPreferences(@NonNull Context context) {
-        mContext = context;
-        mSharedPreferences = getPrivateSharedPreferences(mContext);
-        mMultiProcessSharedPreferences = getPrivateAndMultiProcessSharedPreferences(mContext);
+        super(context,
+            SharedPreferenceUtils.getPrivateSharedPreferences(context,
+                TermuxConstants.TERMUX_TASKER_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION),
+            SharedPreferenceUtils.getPrivateAndMultiProcessSharedPreferences(context,
+                TermuxConstants.TERMUX_TASKER_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION));
     }
 
     /**
@@ -61,16 +58,6 @@ public static  TermuxTaskerAppSharedPreferences build(@NonNull final Context con
             return new TermuxTaskerAppSharedPreferences(termuxTaskerPackageContext);
     }
 
-    private static SharedPreferences getPrivateSharedPreferences(Context context) {
-        if (context == null) return null;
-        return SharedPreferenceUtils.getPrivateSharedPreferences(context, TermuxConstants.TERMUX_TASKER_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION);
-    }
-
-    private static SharedPreferences getPrivateAndMultiProcessSharedPreferences(Context context) {
-        if (context == null) return null;
-        return SharedPreferenceUtils.getPrivateAndMultiProcessSharedPreferences(context, TermuxConstants.TERMUX_TASKER_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION);
-    }
-
 
 
     public int getLogLevel(boolean readFromFile) {
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxWidgetAppSharedPreferences.java b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxWidgetAppSharedPreferences.java
index 301feec299..40ce92264a 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxWidgetAppSharedPreferences.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxWidgetAppSharedPreferences.java
@@ -1,13 +1,13 @@
 package com.termux.shared.termux.settings.preferences;
 
 import android.content.Context;
-import android.content.SharedPreferences;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import com.termux.shared.logger.Logger;
 import com.termux.shared.android.PackageUtils;
+import com.termux.shared.settings.preferences.AppSharedPreferences;
 import com.termux.shared.settings.preferences.SharedPreferenceUtils;
 import com.termux.shared.termux.TermuxUtils;
 import com.termux.shared.termux.settings.preferences.TermuxPreferenceConstants.TERMUX_WIDGET_APP;
@@ -15,19 +15,16 @@
 
 import java.util.UUID;
 
-public class TermuxWidgetAppSharedPreferences {
-
-    private final Context mContext;
-    private final SharedPreferences mSharedPreferences;
-    private final SharedPreferences mMultiProcessSharedPreferences;
-
+public class TermuxWidgetAppSharedPreferences extends AppSharedPreferences {
 
     private static final String LOG_TAG = "TermuxWidgetAppSharedPreferences";
 
     private TermuxWidgetAppSharedPreferences(@NonNull Context context) {
-        mContext = context;
-        mSharedPreferences = getPrivateSharedPreferences(mContext);
-        mMultiProcessSharedPreferences = getPrivateAndMultiProcessSharedPreferences(mContext);
+        super(context,
+            SharedPreferenceUtils.getPrivateSharedPreferences(context,
+                TermuxConstants.TERMUX_WIDGET_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION),
+            SharedPreferenceUtils.getPrivateAndMultiProcessSharedPreferences(context,
+                TermuxConstants.TERMUX_WIDGET_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION));
     }
 
     /**
@@ -63,16 +60,6 @@ public static TermuxWidgetAppSharedPreferences build(@NonNull final Context cont
             return new TermuxWidgetAppSharedPreferences(termuxWidgetPackageContext);
     }
 
-    private static SharedPreferences getPrivateSharedPreferences(Context context) {
-        if (context == null) return null;
-        return SharedPreferenceUtils.getPrivateSharedPreferences(context, TermuxConstants.TERMUX_WIDGET_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION);
-    }
-
-    private static SharedPreferences getPrivateAndMultiProcessSharedPreferences(Context context) {
-        if (context == null) return null;
-        return SharedPreferenceUtils.getPrivateAndMultiProcessSharedPreferences(context, TermuxConstants.TERMUX_WIDGET_DEFAULT_PREFERENCES_FILE_BASENAME_WITHOUT_EXTENSION);
-    }
-
 
 
     public static String getGeneratedToken(@NonNull Context context) {

From 63d035ce39bff075408815b7aded71063aa68cc3 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Mon, 3 Oct 2022 15:37:26 +0500
Subject: [PATCH 807/912] Changed: Update phantom process links

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index bbcdab3a62..5a97d58e0e 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ Quick how-to about Termux package management is available at [Package Management
 
 ***
 
-**NOTICE: Termux is broken on Android 12.** Android OS will kill any (phantom) processes greater than 32 (limit is for all apps combined) and also kill any processes using excessive CPU. You may get `[Process completed (signal 9) - press Enter]` message in the terminal without actually exiting the shell process yourself. Check the related issue [#2366](https://github.com/termux/termux-app/issues/2366), [issue tracker](https://issuetracker.google.com/u/1/issues/205156966), [gist with details](https://gist.github.com/agnostic-apollo/dc7e47991c512755ff26bd2d31e72ca8) and [this TLDR comment](https://github.com/termux/termux-app/issues/2366#issuecomment-1009269410) on how to disable trimming of phantom processes. A proper docs page will be added later. An option to disable the killing should be available in Android 12L or 13, so upgrade at your own risk if you are on Android 11, specially if you are not rooted.
+**NOTICE: Termux is broken on Android 12.** Android OS will kill any (phantom) processes greater than 32 (limit is for all apps combined) and also kill any processes using excessive CPU. You may get `[Process completed (signal 9) - press Enter]` message in the terminal without actually exiting the shell process yourself. Check the related issue [#2366](https://github.com/termux/termux-app/issues/2366), [issue tracker](https://issuetracker.google.com/u/1/issues/205156966), [phantom cached and empty processes docs](https://github.com/agnostic-apollo/Android-Docs/blob/master/en/docs/apps/processes/phantom-cached-and-empty-processes.md) and [this TLDR comment](https://github.com/termux/termux-app/issues/2366#issuecomment-1237468220) on how to disable trimming of phantom and excessive cpu usage processes. A proper docs page will be added later. An option to disable the killing should be available in Android 12L or 13, so upgrade at your own risk if you are on Android 11, specially if you are not rooted.
 
 ***
 

From 0c14c291b2d8474d2f061576ebe596ae071d4496 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Tue, 4 Oct 2022 04:02:22 +0500
Subject: [PATCH 808/912] Changed: Use `ShareUtils` to copy and paste text and
 prevent potential `NPE`

The `copyTextToClipboard()` method has been updated to pass clip label when copying text to clipboard and `getTextFromClipboard()` and `getTextStringFromClipboardIfSet()` methods have been added to get current clipboard.
---
 .../TermuxTerminalSessionActivityClient.java  | 12 ++--
 .../terminal/TermuxTerminalViewClient.java    | 13 ++--
 .../java/com/termux/view/TerminalView.java    | 11 +--
 .../termux/shared/interact/ShareUtils.java    | 72 ++++++++++++++++---
 4 files changed, 78 insertions(+), 30 deletions(-)

diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionActivityClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionActivityClient.java
index e507cd192a..e3143635e9 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionActivityClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionActivityClient.java
@@ -183,20 +183,16 @@ public void onSessionFinished(@NonNull TerminalSession finishedSession) {
     public void onCopyTextToClipboard(@NonNull 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)));
+        ShareUtils.copyTextToClipboard(mActivity, text);
     }
 
     @Override
     public void onPasteTextFromClipboard(@Nullable 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());
-        }
+        String text = ShareUtils.getTextStringFromClipboardIfSet(mActivity, true);
+        if (text != null)
+            mActivity.getTerminalView().mEmulator.paste(text);
     }
 
     @Override
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
index 9c38cdbc08..90350a9c1a 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
@@ -702,9 +702,7 @@ public void showUrlSelection() {
         // Click to copy url to clipboard:
         final AlertDialog dialog = new AlertDialog.Builder(mActivity).setItems(urls, (di, which) -> {
             String url = (String) urls[which];
-            ClipboardManager clipboard = (ClipboardManager) mActivity.getSystemService(Context.CLIPBOARD_SERVICE);
-            clipboard.setPrimaryClip(new ClipData(null, new String[]{"text/plain"}, new ClipData.Item(url)));
-            Toast.makeText(mActivity, R.string.msg_select_url_copied_to_clipboard, Toast.LENGTH_LONG).show();
+            ShareUtils.copyTextToClipboard(mActivity, url, mActivity.getString(R.string.msg_select_url_copied_to_clipboard));
         }).setTitle(R.string.title_select_url_dialog).create();
 
         // Long press to open URL:
@@ -789,12 +787,9 @@ public void doPaste() {
         if (session == null) return;
         if (!session.isRunning()) return;
 
-        ClipboardManager clipboard = (ClipboardManager) mActivity.getSystemService(Context.CLIPBOARD_SERVICE);
-        ClipData clipData = clipboard.getPrimaryClip();
-        if (clipData == null) return;
-        CharSequence paste = clipData.getItemAt(0).coerceToText(mActivity);
-        if (!TextUtils.isEmpty(paste))
-            session.getEmulator().paste(paste.toString());
+        String text = ShareUtils.getTextStringFromClipboardIfSet(mActivity, true);
+        if (text != null)
+            session.getEmulator().paste(text);
     }
 
 }
diff --git a/terminal-view/src/main/java/com/termux/view/TerminalView.java b/terminal-view/src/main/java/com/termux/view/TerminalView.java
index b96b0426b1..365e300001 100644
--- a/terminal-view/src/main/java/com/termux/view/TerminalView.java
+++ b/terminal-view/src/main/java/com/termux/view/TerminalView.java
@@ -566,11 +566,14 @@ public boolean onTouchEvent(MotionEvent event) {
                 if (action == MotionEvent.ACTION_DOWN) showContextMenu();
                 return true;
             } else if (event.isButtonPressed(MotionEvent.BUTTON_TERTIARY)) {
-                ClipboardManager clipboard = (ClipboardManager) getContext().getSystemService(Context.CLIPBOARD_SERVICE);
-                ClipData clipData = clipboard.getPrimaryClip();
+                ClipboardManager clipboardManager = (ClipboardManager) getContext().getSystemService(Context.CLIPBOARD_SERVICE);
+                ClipData clipData = clipboardManager.getPrimaryClip();
                 if (clipData != null) {
-                    CharSequence paste = clipData.getItemAt(0).coerceToText(getContext());
-                    if (!TextUtils.isEmpty(paste)) mEmulator.paste(paste.toString());
+                    ClipData.Item clipItem = clipData.getItemAt(0);
+                    if (clipItem != null) {
+                        CharSequence text = clipItem.coerceToText(getContext());
+                        if (!TextUtils.isEmpty(text)) mEmulator.paste(text.toString());
+                    }
                 }
             } else if (mEmulator.isMouseTrackingActive()) { // BUTTON_PRIMARY.
                 switch (event.getAction()) {
diff --git a/termux-shared/src/main/java/com/termux/shared/interact/ShareUtils.java b/termux-shared/src/main/java/com/termux/shared/interact/ShareUtils.java
index 4d17af86f6..8d42215bcc 100644
--- a/termux-shared/src/main/java/com/termux/shared/interact/ShareUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/interact/ShareUtils.java
@@ -12,7 +12,6 @@
 import android.os.Environment;
 
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.core.content.ContextCompat;
 
 import com.termux.shared.R;
 import com.termux.shared.data.DataUtils;
@@ -81,27 +80,82 @@ public static void shareText(final Context context, final String subject, final
         openSystemAppChooser(context, shareTextIntent, DataUtils.isNullOrEmpty(title) ? context.getString(R.string.title_share_with) : title);
     }
 
+
+
+    /** Wrapper for {@link #copyTextToClipboard(Context, String, String, String)} with `null` `clipDataLabel` and `toastString`. */
+    public static void copyTextToClipboard(Context context, final String text) {
+        copyTextToClipboard(context, null, text, null);
+    }
+
+    /** Wrapper for {@link #copyTextToClipboard(Context, String, String, String)} with `null` `clipDataLabel`. */
+    public static void copyTextToClipboard(Context context, final String text, final String toastString) {
+        copyTextToClipboard(context, null, text, toastString);
+    }
+
     /**
-     * Copy the text to clipboard.
+     * Copy the text to primary clip of the clipboard.
      *
      * @param context The context for operations.
+     * @param clipDataLabel The label to show to the user describing the copied text.
      * @param text The text to copy.
      * @param toastString If this is not {@code null} or empty, then a toast is shown if copying to
      *                    clipboard is successful.
      */
-    public static void copyTextToClipboard(final Context context, final String text, final String toastString) {
+    public static void copyTextToClipboard(Context context, @Nullable final String clipDataLabel,
+                                           final String text, final String toastString) {
         if (context == null || text == null) return;
 
-        final ClipboardManager clipboardManager = ContextCompat.getSystemService(context, ClipboardManager.class);
+        ClipboardManager clipboardManager = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
+        if (clipboardManager == null) return;
 
-        if (clipboardManager != null) {
-            clipboardManager.setPrimaryClip(ClipData.newPlainText(null, DataUtils.getTruncatedCommandOutput(text, DataUtils.TRANSACTION_SIZE_LIMIT_IN_BYTES, true, false, false)));
-            if (toastString != null && !toastString.isEmpty())
-                Logger.showToast(context, toastString, true);
-        }
+        clipboardManager.setPrimaryClip(ClipData.newPlainText(clipDataLabel,
+            DataUtils.getTruncatedCommandOutput(text, DataUtils.TRANSACTION_SIZE_LIMIT_IN_BYTES,
+                true, false, false)));
+
+        if (toastString != null && !toastString.isEmpty())
+            Logger.showToast(context, toastString, true);
     }
 
+
+
     /**
+     * Wrapper for {@link #getTextFromClipboard(Context, boolean)} that returns primary text {@link String}
+     * if its set and not empty.
+     */
+    @Nullable
+    public static String getTextStringFromClipboardIfSet(Context context, boolean coerceToText) {
+        CharSequence textCharSequence = getTextFromClipboard(context, coerceToText);
+        if (textCharSequence == null) return null;
+        String textString = textCharSequence.toString();
+        return !textString.isEmpty() ? textString : null;
+    }
+
+    /**
+     * Get the text from primary clip of the clipboard.
+     *
+     * @param context The context for operations.
+     * @param coerceToText Whether to call {@link ClipData.Item#coerceToText(Context)} to coerce
+     *                     non-text data to text.
+     * @return Returns the {@link CharSequence} of primary text. This will be `null` if failed to get it.
+     */
+    @Nullable
+    public static CharSequence getTextFromClipboard(Context context, boolean coerceToText) {
+        if (context == null) return null;
+
+        ClipboardManager clipboardManager = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
+        if (clipboardManager == null) return null;
+
+        ClipData clipData = clipboardManager.getPrimaryClip();
+        if (clipData == null) return null;
+
+        ClipData.Item clipItem = clipData.getItemAt(0);
+        if (clipItem == null) return null;
+
+        return coerceToText ? clipItem.coerceToText(context) : clipItem.getText();
+    }
+
+
+
      * Open a url.
      *
      * @param context The context for operations.

From 3f7a93931329d4d5cd10a8ec45eb29126984bd5e Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Tue, 4 Oct 2022 04:05:43 +0500
Subject: [PATCH 809/912] Added: Add support for `Share selected text` of
 terminal in long hold `MORE` menu so that users don't have to copy and paste
 to move text between apps

---
 .../java/com/termux/app/TermuxActivity.java   | 17 ++++++++-
 .../TermuxTerminalSessionActivityClient.java  |  1 +
 .../terminal/TermuxTerminalViewClient.java    |  7 ++++
 app/src/main/res/values/strings.xml           |  4 ++
 .../java/com/termux/view/TerminalView.java    | 30 +++++++++++++++
 .../TextSelectionCursorController.java        | 37 ++++++++++++++++---
 .../termux/shared/interact/ShareUtils.java    |  1 +
 7 files changed, 90 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index 1aa35a32e1..a2bb11e8c4 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -38,6 +38,7 @@
 import com.termux.shared.activity.media.AppCompatActivityUtils;
 import com.termux.shared.data.IntentUtils;
 import com.termux.shared.android.PermissionUtils;
+import com.termux.shared.data.DataUtils;
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.termux.TermuxConstants.TERMUX_APP.TERMUX_ACTIVITY;
 import com.termux.app.activities.HelpActivity;
@@ -179,6 +180,7 @@ public final class TermuxActivity extends AppCompatActivity implements ServiceCo
 
     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_SHARE_SELECTED_TEXT = 10;
     private static final int CONTEXT_MENU_AUTOFILL_ID = 2;
     private static final int CONTEXT_MENU_RESET_TERMINAL_ID = 3;
     private static final int CONTEXT_MENU_KILL_PROCESS_ID = 4;
@@ -640,7 +642,10 @@ public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuIn
 
         menu.add(Menu.NONE, CONTEXT_MENU_SELECT_URL_ID, Menu.NONE, R.string.action_select_url);
         menu.add(Menu.NONE, CONTEXT_MENU_SHARE_TRANSCRIPT_ID, Menu.NONE, R.string.action_share_transcript);
-        if (addAutoFillMenu) menu.add(Menu.NONE, CONTEXT_MENU_AUTOFILL_ID, Menu.NONE, R.string.action_autofill_password);
+        if (!DataUtils.isNullOrEmpty(mTerminalView.getStoredSelectedText()))
+            menu.add(Menu.NONE, CONTEXT_MENU_SHARE_SELECTED_TEXT, Menu.NONE, R.string.action_share_selected_text);
+        if (addAutoFillMenu)
+            menu.add(Menu.NONE, CONTEXT_MENU_AUTOFILL_ID, Menu.NONE, R.string.action_autofill_password);
         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);
@@ -668,6 +673,9 @@ public boolean onContextItemSelected(MenuItem item) {
             case CONTEXT_MENU_SHARE_TRANSCRIPT_ID:
                 mTermuxTerminalViewClient.shareSessionTranscript();
                 return true;
+            case CONTEXT_MENU_SHARE_SELECTED_TEXT:
+                mTermuxTerminalViewClient.shareSelectedText();
+                return true;
             case CONTEXT_MENU_AUTOFILL_ID:
                 requestAutoFill();
                 return true;
@@ -697,6 +705,13 @@ public boolean onContextItemSelected(MenuItem item) {
         }
     }
 
+    @Override
+    public void onContextMenuClosed(Menu menu) {
+        super.onContextMenuClosed(menu);
+        // onContextMenuClosed() is triggered twice if back button is pressed to dismiss instead of tap for some reason
+        mTerminalView.onContextMenuClosed(menu);
+    }
+
     private void showKillSessionDialog(TerminalSession session) {
         if (session == null) return;
 
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionActivityClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionActivityClient.java
index e3143635e9..cd38163116 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionActivityClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionActivityClient.java
@@ -17,6 +17,7 @@
 import androidx.annotation.Nullable;
 
 import com.termux.R;
+import com.termux.shared.interact.ShareUtils;
 import com.termux.shared.termux.shell.command.runner.terminal.TermuxSession;
 import com.termux.shared.termux.interact.TextInputDialogUtils;
 import com.termux.app.TermuxActivity;
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
index 90350a9c1a..a3d09d3d52 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
@@ -684,6 +684,13 @@ public void shareSessionTranscript() {
             transcriptText, mActivity.getString(R.string.title_share_transcript_with));
     }
 
+    public void shareSelectedText() {
+        String selectedText = mActivity.getTerminalView().getStoredSelectedText();
+        if (DataUtils.isNullOrEmpty(selectedText)) return;
+        ShareUtils.shareText(mActivity, mActivity.getString(R.string.title_share_selected_text),
+            selectedText, mActivity.getString(R.string.title_share_selected_text_with));
+    }
+
     public void showUrlSelection() {
         TerminalSession session = mActivity.getCurrentSession();
         if (session == null) return;
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 642fbb5e07..794d8df3e0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -69,6 +69,10 @@
     <string name="title_share_transcript">Terminal transcript</string>
     <string name="title_share_transcript_with">Send transcript to:</string>
 
+    <string name="action_share_selected_text">Share selected text</string>
+    <string name="title_share_selected_text">Terminal Text</string>
+    <string name="title_share_selected_text_with">Send selected text to:</string>
+
     <string name="action_autofill_password">Autofill password</string>
 
     <string name="action_reset_terminal">Reset</string>
diff --git a/terminal-view/src/main/java/com/termux/view/TerminalView.java b/terminal-view/src/main/java/com/termux/view/TerminalView.java
index 365e300001..3baecd2481 100644
--- a/terminal-view/src/main/java/com/termux/view/TerminalView.java
+++ b/terminal-view/src/main/java/com/termux/view/TerminalView.java
@@ -2,6 +2,7 @@
 
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
+import android.app.Activity;
 import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
@@ -19,6 +20,7 @@
 import android.view.InputDevice;
 import android.view.KeyCharacterMap;
 import android.view.KeyEvent;
+import android.view.Menu;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewConfiguration;
@@ -30,6 +32,7 @@
 import android.view.inputmethod.InputConnection;
 import android.widget.Scroller;
 
+import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 
 import com.termux.terminal.KeyHandler;
@@ -456,6 +459,14 @@ public void onScreenUpdated(boolean skipScrolling) {
         if (mAccessibilityEnabled) setContentDescription(getText());
     }
 
+    /** This must be called by the hosting activity in {@link Activity#onContextMenuClosed(Menu)}
+     * when context menu for the {@link TerminalView} is started by
+     * {@link TextSelectionCursorController#ACTION_MORE} is closed. */
+    public void onContextMenuClosed(Menu menu) {
+        // Unset the stored text since it shouldn't be used anymore and should be cleared from memory
+        unsetStoredSelectedText();
+    }
+
     /**
      * Sets the text size, which in turn sets the number of rows and columns.
      *
@@ -1206,6 +1217,25 @@ public boolean isSelectingText() {
         }
     }
 
+    /** Get the currently selected text if selecting. */
+    public String getSelectedText() {
+        if (isSelectingText() && mTextSelectionCursorController != null)
+            return mTextSelectionCursorController.getSelectedText();
+        else
+            return null;
+    }
+
+    /** Get the selected text stored before "MORE" button was pressed on the context menu. */
+    @Nullable
+    public String getStoredSelectedText() {
+        return mTextSelectionCursorController != null ? mTextSelectionCursorController.getStoredSelectedText() : null;
+    }
+
+    /** Unset the selected text stored before "MORE" button was pressed on the context menu. */
+    public void unsetStoredSelectedText() {
+        if (mTextSelectionCursorController != null) mTextSelectionCursorController.unsetStoredSelectedText();
+    }
+
     private ActionMode getTextSelectionActionMode() {
         if (mTextSelectionCursorController != null) {
             return mTextSelectionCursorController.getActionMode();
diff --git a/terminal-view/src/main/java/com/termux/view/textselection/TextSelectionCursorController.java b/terminal-view/src/main/java/com/termux/view/textselection/TextSelectionCursorController.java
index c08dca4470..c2cd7c6c0a 100644
--- a/terminal-view/src/main/java/com/termux/view/textselection/TextSelectionCursorController.java
+++ b/terminal-view/src/main/java/com/termux/view/textselection/TextSelectionCursorController.java
@@ -11,6 +11,8 @@
 import android.view.MotionEvent;
 import android.view.View;
 
+import androidx.annotation.Nullable;
+
 import com.termux.terminal.TerminalBuffer;
 import com.termux.terminal.WcWidth;
 import com.termux.view.R;
@@ -20,6 +22,7 @@ public class TextSelectionCursorController implements CursorController {
 
     private final TerminalView terminalView;
     private final TextSelectionHandleView mStartHandle, mEndHandle;
+    private String mStoredSelectedText;
     private boolean mIsSelectingText = false;
     private long mShowStartTime = System.currentTimeMillis();
 
@@ -27,9 +30,9 @@ public class TextSelectionCursorController implements CursorController {
     private int mSelX1 = -1, mSelX2 = -1, mSelY1 = -1, mSelY2 = -1;
 
     private ActionMode mActionMode;
-    private final int ACTION_COPY = 1;
-    private final int ACTION_PASTE = 2;
-    private final int ACTION_MORE = 3;
+    public final int ACTION_COPY = 1;
+    public final int ACTION_PASTE = 2;
+    public final int ACTION_MORE = 3;
 
     public TextSelectionCursorController(TerminalView terminalView) {
         this.terminalView = terminalView;
@@ -112,7 +115,7 @@ public boolean onCreateActionMode(ActionMode mode, Menu menu) {
 
                 ClipboardManager clipboard = (ClipboardManager) terminalView.getContext().getSystemService(Context.CLIPBOARD_SERVICE);
                 menu.add(Menu.NONE, ACTION_COPY, Menu.NONE, R.string.copy_text).setShowAsAction(show);
-                menu.add(Menu.NONE, ACTION_PASTE, Menu.NONE, R.string.paste_text).setEnabled(clipboard.hasPrimaryClip()).setShowAsAction(show);
+                menu.add(Menu.NONE, ACTION_PASTE, Menu.NONE, R.string.paste_text).setEnabled(clipboard != null && clipboard.hasPrimaryClip()).setShowAsAction(show);
                 menu.add(Menu.NONE, ACTION_MORE, Menu.NONE, R.string.text_selection_more);
                 return true;
             }
@@ -131,7 +134,7 @@ public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
 
                 switch (item.getItemId()) {
                     case ACTION_COPY:
-                        String selectedText = terminalView.mEmulator.getSelectedText(mSelX1, mSelY1, mSelX2, mSelY2).trim();
+                        String selectedText = getSelectedText();
                         terminalView.mTermSession.onCopyTextToClipboard(selectedText);
                         terminalView.stopTextSelectionMode();
                         break;
@@ -140,7 +143,13 @@ public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
                         terminalView.mTermSession.onPasteTextFromClipboard();
                         break;
                     case ACTION_MORE:
-                        terminalView.stopTextSelectionMode(); //we stop text selection first, otherwise handles will show above popup
+                        // We first store the selected text in case TerminalViewClient needs the
+                        // selected text before MORE button was pressed since we are going to
+                        // stop selection mode
+                        mStoredSelectedText = getSelectedText();
+                        // The text selection needs to be stopped before showing context menu,
+                        // otherwise handles will show above popup
+                        terminalView.stopTextSelectionMode();
                         terminalView.showContextMenu();
                         break;
                 }
@@ -361,6 +370,22 @@ public void getSelectors(int[] sel) {
         sel[3] = mSelX2;
     }
 
+    /** Get the currently selected text. */
+    public String getSelectedText() {
+        return terminalView.mEmulator.getSelectedText(mSelX1, mSelY1, mSelX2, mSelY2);
+    }
+
+    /** Get the selected text stored before "MORE" button was pressed on the context menu. */
+    @Nullable
+    public String getStoredSelectedText() {
+        return mStoredSelectedText;
+    }
+
+    /** Unset the selected text stored before "MORE" button was pressed on the context menu. */
+    public void unsetStoredSelectedText() {
+        mStoredSelectedText = null;
+    }
+
     public ActionMode getActionMode() {
         return mActionMode;
     }
diff --git a/termux-shared/src/main/java/com/termux/shared/interact/ShareUtils.java b/termux-shared/src/main/java/com/termux/shared/interact/ShareUtils.java
index 8d42215bcc..969502447c 100644
--- a/termux-shared/src/main/java/com/termux/shared/interact/ShareUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/interact/ShareUtils.java
@@ -156,6 +156,7 @@ public static CharSequence getTextFromClipboard(Context context, boolean coerceT
 
 
 
+    /**
      * Open a url.
      *
      * @param context The context for operations.

From 5bc3d2db8d4b2e401928df5cc11a225960a83751 Mon Sep 17 00:00:00 2001
From: EduardDurech <39579228+EduardDurech@users.noreply.github.com>
Date: Wed, 12 Oct 2022 19:44:48 +0200
Subject: [PATCH 810/912] Added: Add `KEY_LAST_PENDING_INTENT_REQUEST_CODE` to
 `TermuxAPIAppSharedPreferences`

---
 .../preferences/TermuxAPIAppSharedPreferences.java       | 9 +++++++++
 .../settings/preferences/TermuxPreferenceConstants.java  | 7 +++++++
 2 files changed, 16 insertions(+)

diff --git a/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxAPIAppSharedPreferences.java b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxAPIAppSharedPreferences.java
index 0eec1a1486..67c00a752f 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxAPIAppSharedPreferences.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxAPIAppSharedPreferences.java
@@ -72,4 +72,13 @@ public void setLogLevel(Context context, int logLevel, boolean commitToFile) {
         SharedPreferenceUtils.setInt(mSharedPreferences, TERMUX_API_APP.KEY_LOG_LEVEL, logLevel, commitToFile);
     }
 
+
+    public int getLastPendingIntentRequestCode() {
+        return SharedPreferenceUtils.getInt(mSharedPreferences, TERMUX_API_APP.KEY_LAST_PENDING_INTENT_REQUEST_CODE, TERMUX_API_APP.DEFAULT_VALUE_KEY_LAST_PENDING_INTENT_REQUEST_CODE);
+    }
+
+    public void setLastPendingIntentRequestCode(int lastPendingIntentRequestCode) {
+        SharedPreferenceUtils.setInt(mSharedPreferences, TERMUX_API_APP.KEY_LAST_PENDING_INTENT_REQUEST_CODE, lastPendingIntentRequestCode, true);
+    }
+
 }
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxPreferenceConstants.java b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxPreferenceConstants.java
index 80226914d7..15bc74c9f2 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxPreferenceConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxPreferenceConstants.java
@@ -194,6 +194,13 @@ public static final class TERMUX_API_APP {
          */
         public static final String KEY_LOG_LEVEL = "log_level";
 
+
+        /**
+         * Defines the key for last used PendingIntent request code.
+         */
+        public static final String KEY_LAST_PENDING_INTENT_REQUEST_CODE = "last_pending_intent_request_code";
+        public static final int DEFAULT_VALUE_KEY_LAST_PENDING_INTENT_REQUEST_CODE = 0;
+
     }
 
 

From 3516f1979f8ab77789048c816cc99effce3c049e Mon Sep 17 00:00:00 2001
From: Sushrut1101 <guptasushrut@gmail.com>
Date: Wed, 5 Oct 2022 19:06:43 +0530
Subject: [PATCH 811/912] Update actions/checkout to v3

---
 .github/workflows/attach_debug_apks_to_release.yml | 2 +-
 .github/workflows/debug_build.yml                  | 2 +-
 .github/workflows/gradle-wrapper-validation.yml    | 2 +-
 .github/workflows/run_tests.yml                    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/attach_debug_apks_to_release.yml b/.github/workflows/attach_debug_apks_to_release.yml
index 5c95e788ba..4f24d5e34b 100644
--- a/.github/workflows/attach_debug_apks_to_release.yml
+++ b/.github/workflows/attach_debug_apks_to_release.yml
@@ -17,7 +17,7 @@ jobs:
 
     steps:
       - name: Clone repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           ref: ${{ env.GITHUB_REF }}
 
diff --git a/.github/workflows/debug_build.yml b/.github/workflows/debug_build.yml
index efd08e8de7..526edb8023 100644
--- a/.github/workflows/debug_build.yml
+++ b/.github/workflows/debug_build.yml
@@ -18,7 +18,7 @@ jobs:
 
     steps:
       - name: Clone repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Build APKs
         shell: bash {0}
diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
index 7c8edafc63..b384f85868 100644
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -15,5 +15,5 @@ jobs:
     name: "Validation"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: gradle/wrapper-validation-action@v1
diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml
index 2647499554..fdc20787a0 100644
--- a/.github/workflows/run_tests.yml
+++ b/.github/workflows/run_tests.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Clone repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
     - name: Execute tests
       run: |
         ./gradlew test

From 20dee0e9407f71c5189bb075fc32828c472132e1 Mon Sep 17 00:00:00 2001
From: daywalk3r666 <markushelm3@gmail.com>
Date: Fri, 14 Oct 2022 07:14:13 +0200
Subject: [PATCH 812/912] Update actions/upload-artifact to v3

---
 .github/workflows/debug_build.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/debug_build.yml b/.github/workflows/debug_build.yml
index 526edb8023..8384a8d49b 100644
--- a/.github/workflows/debug_build.yml
+++ b/.github/workflows/debug_build.yml
@@ -78,7 +78,7 @@ jobs:
           fi
 
       - name: Attach universal APK file
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: ${{ env.APK_BASENAME_PREFIX }}_universal
           path: |
@@ -86,7 +86,7 @@ jobs:
             ${{ env.APK_DIR_PATH }}/output-metadata.json
 
       - name: Attach arm64-v8a APK file
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: ${{ env.APK_BASENAME_PREFIX }}_arm64-v8a
           path: |
@@ -94,7 +94,7 @@ jobs:
             ${{ env.APK_DIR_PATH }}/output-metadata.json
 
       - name: Attach armeabi-v7a APK file
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: ${{ env.APK_BASENAME_PREFIX }}_armeabi-v7a
           path: |
@@ -102,7 +102,7 @@ jobs:
             ${{ env.APK_DIR_PATH }}/output-metadata.json
 
       - name: Attach x86_64 APK file
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: ${{ env.APK_BASENAME_PREFIX }}_x86_64
           path: |
@@ -110,7 +110,7 @@ jobs:
             ${{ env.APK_DIR_PATH }}/output-metadata.json
 
       - name: Attach x86 APK file
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: ${{ env.APK_BASENAME_PREFIX }}_x86
           path: |
@@ -118,7 +118,7 @@ jobs:
             ${{ env.APK_DIR_PATH }}/output-metadata.json
 
       - name: Attach sha256sums file
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: ${{ env.APK_BASENAME_PREFIX }}_sha256sums
           path: |

From c8a74dc58898ffee1d1207a125f2b4000d20b39b Mon Sep 17 00:00:00 2001
From: Yaksh Bariya <yakshbari4@gmail.com>
Date: Mon, 24 Oct 2022 07:55:57 +0530
Subject: [PATCH 813/912] feat(KeyHandler): respect modifiers with PgUp and
 PgDn

---
 .../src/main/java/com/termux/terminal/KeyHandler.java         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/terminal-emulator/src/main/java/com/termux/terminal/KeyHandler.java b/terminal-emulator/src/main/java/com/termux/terminal/KeyHandler.java
index 254f5e3a7c..e6323c5992 100644
--- a/terminal-emulator/src/main/java/com/termux/terminal/KeyHandler.java
+++ b/terminal-emulator/src/main/java/com/termux/terminal/KeyHandler.java
@@ -227,9 +227,9 @@ public static String getCode(int keyCode, int keyMode, boolean cursorApp, boolea
                 return transformForModifiers("\033[3", keyMode, '~');
 
             case KEYCODE_PAGE_UP:
-                return "\033[5~";
+                return transformForModifiers("\033[5", keyMode, '~');
             case KEYCODE_PAGE_DOWN:
-                return "\033[6~";
+                return transformForModifiers("\033[6", keyMode, '~');
             case KEYCODE_DEL:
                 String prefix = ((keyMode & KEYMOD_ALT) == 0) ? "" : "\033";
                 // Just do what xterm and gnome-terminal does:

From 29cf9820e1421e06c7d024dd34ddd0b4457fdeb5 Mon Sep 17 00:00:00 2001
From: Frieder Bluemle <frieder.bluemle@gmail.com>
Date: Thu, 27 Oct 2022 01:06:02 -0700
Subject: [PATCH 814/912] Fix GitHub spelling

---
 README.md                                     | 24 +++++++++----------
 termux-shared/src/main/res/values/strings.xml |  4 ++--
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index 5a97d58e0e..5e7fb1dcfc 100644
--- a/README.md
+++ b/README.md
@@ -55,11 +55,11 @@ The core [Termux](https://github.com/termux/termux-app) app comes with the follo
 
 Latest version is `v0.118.0`.
 
-**NOTICE: It is highly recommended that you update to `v0.118.0` or higher ASAP for various bug fixes, including a critical world-readable vulnerability reported at https://termux.github.io/general/2022/02/15/termux-apps-vulnerability-disclosures.html. Also reminding [again](https://www.reddit.com/r/termux/comments/pkujfa/important_deprecation_notice_for_google_play) to users who have installed termux apps from google playstore that playstore builds are [deprecated](#google-play-store-deprecated) and no longer supported. It is recommended that you shift to F-Droid or Github releases.**
+**NOTICE: It is highly recommended that you update to `v0.118.0` or higher ASAP for various bug fixes, including a critical world-readable vulnerability reported at https://termux.github.io/general/2022/02/15/termux-apps-vulnerability-disclosures.html. Also reminding [again](https://www.reddit.com/r/termux/comments/pkujfa/important_deprecation_notice_for_google_play) to users who have installed termux apps from google playstore that playstore builds are [deprecated](#google-play-store-deprecated) and no longer supported. It is recommended that you shift to F-Droid or GitHub releases.**
 
 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 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.
 
 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.
 
@@ -71,19 +71,19 @@ Termux application can be obtained from `F-Droid` from [here](https://f-droid.or
 
 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.
 
-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.
+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.
 
 The `F-Droid` app often may not notify you of updates and you will manually have to do a pull down swipe action in the `Updates` tab of the app for it to check updates. Make sure battery optimizations are disabled for the app, check https://dontkillmyapp.com/ for details on how to do that.
 
 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.
 
-### Github
+### GitHub
 
-Termux application can be obtained on `Github` either from [`Github Releases`](https://github.com/termux/termux-app/releases) for version `>= 0.118.0` or from [`Github Build`](https://github.com/termux/termux-app/actions/workflows/debug_build.yml) action workflows.
+Termux application can be obtained on `GitHub` either from [`GitHub Releases`](https://github.com/termux/termux-app/releases) for version `>= 0.118.0` 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 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. Note that for action workflows, you need to be [**logged into a `Github` account**](https://github.com/login) for the `Artifacts` links to be enabled/clickable. If you are using the [`Github` app](https://github.com/mobile), then make sure to open workflow link in a browser like Chrome or Firefox that has your Github account logged in since the in-app browser may not be logged in. 
+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. Note that for action workflows, you need to be [**logged into a `GitHub` account**](https://github.com/login) for the `Artifacts` links to be enabled/clickable. If you are using the [`GitHub` app](https://github.com/mobile), then make sure to open workflow link in a browser like Chrome or Firefox that has your GitHub account logged in since the in-app browser may not be logged in.
 
 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.
 
@@ -116,13 +116,13 @@ Version: 3
 
 **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.
+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 **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. 
+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.
 
 Note that by upgrading old packages to latest versions, like that of `python` may break your setups/scripts since they may not be compatible anymore. Moreover, you will not be able to downgrade the package versions since termux repos only keep the latest version and you will have to manually rebuild the old versions of the packages if required as per https://github.com/termux/termux-packages/wiki/Building-packages.
 
@@ -137,7 +137,7 @@ If you plan on staying on Play Store sources in future as well, then you may wan
 
 - 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).
+- 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.
 
@@ -274,7 +274,7 @@ Commit messages **must** use [Conventional Commits](https://www.conventionalcomm
 
 Changelogs for releases are generated based on [Keep a Changelog](https://github.com/olivierlacan/keep-a-changelog) specs.
 
-The `versionName` in `build.gradle` files of Termux and its plugin apps must follow the [semantic version `2.0.0` spec](https://semver.org/spec/v2.0.0.html) in the format `major.minor.patch(-prerelease)(+buildmetadata)`. When bumping `versionName` in `build.gradle` files and when creating a tag for new releases on github, make sure to include the patch number as well, like `v0.1.0` instead of just `v0.1`. The `build.gradle` files and `attach_debug_apks_to_release` workflow validates the version as well and the build/attachment will fail if `versionName` does not follow the spec.
+The `versionName` in `build.gradle` files of Termux and its plugin apps must follow the [semantic version `2.0.0` spec](https://semver.org/spec/v2.0.0.html) in the format `major.minor.patch(-prerelease)(+buildmetadata)`. When bumping `versionName` in `build.gradle` files and when creating a tag for new releases on GitHub, make sure to include the patch number as well, like `v0.1.0` instead of just `v0.1`. The `build.gradle` files and `attach_debug_apks_to_release` workflow validates the version as well and the build/attachment will fail if `versionName` does not follow the spec.
 ##
 
 
diff --git a/termux-shared/src/main/res/values/strings.xml b/termux-shared/src/main/res/values/strings.xml
index 88f555b9a8..d585e24f97 100644
--- a/termux-shared/src/main/res/values/strings.xml
+++ b/termux-shared/src/main/res/values/strings.xml
@@ -84,12 +84,12 @@
         an issue on one of the following links.
         \n\nIf you are posting a Termux app crash report, then please provide details on what you were doing that
         caused the crash and how to reproduce it, if possible.
-        \n\nIf you are posting an issue on Github, then post it in the repository at which the report belongs at.
+        \n\nIf you are posting an issue on GitHub, then post it in the repository at which the report belongs at.
         Issues opened or emails sent with **(partial) screenshots** instead of copied text or a file of this report
         **will likely be automatically closed/deleted**. You may optionally remove any device specific info that
         you consider private or don\'t want to share or that is not relevant to the issue.
         \n\nWe do not provide support for any hacking related tools/scripts. Any questions asked about them over email,
-        on github or other official termux community forums **will likely be automatically closed/deleted** and may
+        on GitHub or other official termux community forums **will likely be automatically closed/deleted** and may
         even result in **temporary or permanent** ban. Check %1$s/wiki/Hacking for details.</string>
 
     <string name="msg_termux_app_required_by_app">The &TERMUX_APP_NAME; is required by the %1$s app to run termux commands.</string>

From cff6cff609143d7441b42dad20c058ca26543247 Mon Sep 17 00:00:00 2001
From: Lucy Phipps <landfillbaby69@gmail.com>
Date: Mon, 7 Nov 2022 01:16:28 +0000
Subject: [PATCH 815/912] Create dependabot.yml

---
 .github/dependabot.yml | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 .github/dependabot.yml

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000000..a83ef38514
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,6 @@
+version: 2
+updates:
+- package-ecosystem: github-actions
+  directory: /
+  schedule:
+    interval: daily

From b1c043d54084d2325b0cfaf3056f54bac14d45a3 Mon Sep 17 00:00:00 2001
From: Lucy Phipps <landfillbaby69@gmail.com>
Date: Fri, 16 Dec 2022 06:56:27 +0000
Subject: [PATCH 816/912] update WcWidth.java to Unicode 15.0.0

---
 .../java/com/termux/terminal/WcWidth.java     | 106 +++++++++++-------
 1 file changed, 66 insertions(+), 40 deletions(-)

diff --git a/terminal-emulator/src/main/java/com/termux/terminal/WcWidth.java b/terminal-emulator/src/main/java/com/termux/terminal/WcWidth.java
index 25660b30e8..5eb18b13dc 100644
--- a/terminal-emulator/src/main/java/com/termux/terminal/WcWidth.java
+++ b/terminal-emulator/src/main/java/com/termux/terminal/WcWidth.java
@@ -1,7 +1,7 @@
 package com.termux.terminal;
 
 /**
- * Implementation of wcwidth(3) for Unicode 9.
+ * Implementation of wcwidth(3) for Unicode 15.
  *
  * Implementation from https://github.com/jquast/wcwidth but we return 0 for unprintable characters.
  *
@@ -9,12 +9,13 @@
  * Must be kept in sync with the following:
  * https://github.com/termux/wcwidth
  * https://github.com/termux/libandroid-support
- * https://github.com/termux/termux-packages/tree/master/libandroid-support
+ * https://github.com/termux/termux-packages/tree/master/packages/libandroid-support
  */
 public final class WcWidth {
 
-    // From https://github.com/jquast/wcwidth/blob/master/wcwidth/table_zero.py
-    // at commit b29897e5a1b403a0e36f7fc991614981cbc42475 (2020-07-14):
+    // From https://github.com/jquast/wcwidth/blob/master/wcwidth/table_wide.py
+    // from https://github.com/jquast/wcwidth/pull/64
+    // at commit 1b9b6585b0080ea5cb88dc9815796505724793fe (2022-12-16):
     private static final int[][] ZERO_WIDTH = {
         {0x00300, 0x0036f},  // Combining Grave Accent  ..Combining Latin Small Le
         {0x00483, 0x00489},  // Combining Cyrillic Titlo..Combining Cyrillic Milli
@@ -40,7 +41,8 @@ public final class WcWidth {
         {0x00825, 0x00827},  // Samaritan Vowel Sign Sho..Samaritan Vowel Sign U
         {0x00829, 0x0082d},  // Samaritan Vowel Sign Lon..Samaritan Mark Nequdaa
         {0x00859, 0x0085b},  // Mandaic Affrication Mark..Mandaic Gemination Mark
-        {0x008d3, 0x008e1},  // Arabic Small Low Waw    ..Arabic Small High Sign S
+        {0x00898, 0x0089f},  // Arabic Small High Word A..Arabic Half Madda Over M
+        {0x008ca, 0x008e1},  // Arabic Small High Farsi ..Arabic Small High Sign S
         {0x008e3, 0x00902},  // Arabic Turned Damma Belo..Devanagari Sign Anusvara
         {0x0093a, 0x0093a},  // Devanagari Vowel Sign Oe..Devanagari Vowel Sign Oe
         {0x0093c, 0x0093c},  // Devanagari Sign Nukta   ..Devanagari Sign Nukta
@@ -74,13 +76,14 @@ public final class WcWidth {
         {0x00b3f, 0x00b3f},  // Oriya Vowel Sign I      ..Oriya Vowel Sign I
         {0x00b41, 0x00b44},  // Oriya Vowel Sign U      ..Oriya Vowel Sign Vocalic
         {0x00b4d, 0x00b4d},  // Oriya Sign Virama       ..Oriya Sign Virama
-        {0x00b55, 0x00b56},  // (nil)                   ..Oriya Ai Length Mark
+        {0x00b55, 0x00b56},  // Oriya Sign Overline     ..Oriya Ai Length Mark
         {0x00b62, 0x00b63},  // Oriya Vowel Sign Vocalic..Oriya Vowel Sign Vocalic
         {0x00b82, 0x00b82},  // Tamil Sign Anusvara     ..Tamil Sign Anusvara
         {0x00bc0, 0x00bc0},  // Tamil Vowel Sign Ii     ..Tamil Vowel Sign Ii
         {0x00bcd, 0x00bcd},  // Tamil Sign Virama       ..Tamil Sign Virama
         {0x00c00, 0x00c00},  // Telugu Sign Combining Ca..Telugu Sign Combining Ca
         {0x00c04, 0x00c04},  // Telugu Sign Combining An..Telugu Sign Combining An
+        {0x00c3c, 0x00c3c},  // Telugu Sign Nukta       ..Telugu Sign Nukta
         {0x00c3e, 0x00c40},  // Telugu Vowel Sign Aa    ..Telugu Vowel Sign Ii
         {0x00c46, 0x00c48},  // Telugu Vowel Sign E     ..Telugu Vowel Sign Ai
         {0x00c4a, 0x00c4d},  // Telugu Vowel Sign O     ..Telugu Sign Virama
@@ -97,7 +100,7 @@ public final class WcWidth {
         {0x00d41, 0x00d44},  // Malayalam Vowel Sign U  ..Malayalam Vowel Sign Voc
         {0x00d4d, 0x00d4d},  // Malayalam Sign Virama   ..Malayalam Sign Virama
         {0x00d62, 0x00d63},  // Malayalam Vowel Sign Voc..Malayalam Vowel Sign Voc
-        {0x00d81, 0x00d81},  // (nil)                   ..(nil)
+        {0x00d81, 0x00d81},  // Sinhala Sign Candrabindu..Sinhala Sign Candrabindu
         {0x00dca, 0x00dca},  // Sinhala Sign Al-lakuna  ..Sinhala Sign Al-lakuna
         {0x00dd2, 0x00dd4},  // Sinhala Vowel Sign Ketti..Sinhala Vowel Sign Ketti
         {0x00dd6, 0x00dd6},  // Sinhala Vowel Sign Diga ..Sinhala Vowel Sign Diga
@@ -106,7 +109,7 @@ public final class WcWidth {
         {0x00e47, 0x00e4e},  // Thai Character Maitaikhu..Thai Character Yamakkan
         {0x00eb1, 0x00eb1},  // Lao Vowel Sign Mai Kan  ..Lao Vowel Sign Mai Kan
         {0x00eb4, 0x00ebc},  // Lao Vowel Sign I        ..Lao Semivowel Sign Lo
-        {0x00ec8, 0x00ecd},  // Lao Tone Mai Ek         ..Lao Niggahita
+        {0x00ec8, 0x00ece},  // Lao Tone Mai Ek         ..(nil)
         {0x00f18, 0x00f19},  // Tibetan Astrological Sig..Tibetan Astrological Sig
         {0x00f35, 0x00f35},  // Tibetan Mark Ngas Bzung ..Tibetan Mark Ngas Bzung
         {0x00f37, 0x00f37},  // Tibetan Mark Ngas Bzung ..Tibetan Mark Ngas Bzung
@@ -130,7 +133,7 @@ public final class WcWidth {
         {0x0109d, 0x0109d},  // Myanmar Vowel Sign Aiton..Myanmar Vowel Sign Aiton
         {0x0135d, 0x0135f},  // Ethiopic Combining Gemin..Ethiopic Combining Gemin
         {0x01712, 0x01714},  // Tagalog Vowel Sign I    ..Tagalog Sign Virama
-        {0x01732, 0x01734},  // Hanunoo Vowel Sign I    ..Hanunoo Sign Pamudpod
+        {0x01732, 0x01733},  // Hanunoo Vowel Sign I    ..Hanunoo Vowel Sign U
         {0x01752, 0x01753},  // Buhid Vowel Sign I      ..Buhid Vowel Sign U
         {0x01772, 0x01773},  // Tagbanwa Vowel Sign I   ..Tagbanwa Vowel Sign U
         {0x017b4, 0x017b5},  // Khmer Vowel Inherent Aq ..Khmer Vowel Inherent Aa
@@ -139,6 +142,7 @@ public final class WcWidth {
         {0x017c9, 0x017d3},  // Khmer Sign Muusikatoan  ..Khmer Sign Bathamasat
         {0x017dd, 0x017dd},  // Khmer Sign Atthacan     ..Khmer Sign Atthacan
         {0x0180b, 0x0180d},  // Mongolian Free Variation..Mongolian Free Variation
+        {0x0180f, 0x0180f},  // Mongolian Free Variation..Mongolian Free Variation
         {0x01885, 0x01886},  // Mongolian Letter Ali Gal..Mongolian Letter Ali Gal
         {0x018a9, 0x018a9},  // Mongolian Letter Ali Gal..Mongolian Letter Ali Gal
         {0x01920, 0x01922},  // Limbu Vowel Sign A      ..Limbu Vowel Sign U
@@ -154,7 +158,7 @@ public final class WcWidth {
         {0x01a65, 0x01a6c},  // Tai Tham Vowel Sign I   ..Tai Tham Vowel Sign Oa B
         {0x01a73, 0x01a7c},  // Tai Tham Vowel Sign Oa A..Tai Tham Sign Khuen-lue
         {0x01a7f, 0x01a7f},  // Tai Tham Combining Crypt..Tai Tham Combining Crypt
-        {0x01ab0, 0x01ac0},  // Combining Doubled Circum..(nil)
+        {0x01ab0, 0x01ace},  // Combining Doubled Circum..Combining Latin Small Le
         {0x01b00, 0x01b03},  // Balinese Sign Ulu Ricem ..Balinese Sign Surang
         {0x01b34, 0x01b34},  // Balinese Sign Rerekan   ..Balinese Sign Rerekan
         {0x01b36, 0x01b3a},  // Balinese Vowel Sign Ulu ..Balinese Vowel Sign Ra R
@@ -177,8 +181,7 @@ public final class WcWidth {
         {0x01ced, 0x01ced},  // Vedic Sign Tiryak       ..Vedic Sign Tiryak
         {0x01cf4, 0x01cf4},  // Vedic Tone Candra Above ..Vedic Tone Candra Above
         {0x01cf8, 0x01cf9},  // Vedic Tone Ring Above   ..Vedic Tone Double Ring A
-        {0x01dc0, 0x01df9},  // Combining Dotted Grave A..Combining Wide Inverted
-        {0x01dfb, 0x01dff},  // Combining Deletion Mark ..Combining Right Arrowhea
+        {0x01dc0, 0x01dff},  // Combining Dotted Grave A..Combining Right Arrowhea
         {0x020d0, 0x020f0},  // Combining Left Harpoon A..Combining Asterisk Above
         {0x02cef, 0x02cf1},  // Coptic Combining Ni Abov..Coptic Combining Spiritu
         {0x02d7f, 0x02d7f},  // Tifinagh Consonant Joine..Tifinagh Consonant Joine
@@ -193,7 +196,7 @@ public final class WcWidth {
         {0x0a806, 0x0a806},  // Syloti Nagri Sign Hasant..Syloti Nagri Sign Hasant
         {0x0a80b, 0x0a80b},  // Syloti Nagri Sign Anusva..Syloti Nagri Sign Anusva
         {0x0a825, 0x0a826},  // Syloti Nagri Vowel Sign ..Syloti Nagri Vowel Sign
-        {0x0a82c, 0x0a82c},  // (nil)                   ..(nil)
+        {0x0a82c, 0x0a82c},  // Syloti Nagri Sign Altern..Syloti Nagri Sign Altern
         {0x0a8c4, 0x0a8c5},  // Saurashtra Sign Virama  ..Saurashtra Sign Candrabi
         {0x0a8e0, 0x0a8f1},  // Combining Devanagari Dig..Combining Devanagari Sig
         {0x0a8ff, 0x0a8ff},  // Devanagari Vowel Sign Ay..Devanagari Vowel Sign Ay
@@ -233,13 +236,18 @@ public final class WcWidth {
         {0x10a3f, 0x10a3f},  // Kharoshthi Virama       ..Kharoshthi Virama
         {0x10ae5, 0x10ae6},  // Manichaean Abbreviation ..Manichaean Abbreviation
         {0x10d24, 0x10d27},  // Hanifi Rohingya Sign Har..Hanifi Rohingya Sign Tas
-        {0x10eab, 0x10eac},  // (nil)                   ..(nil)
+        {0x10eab, 0x10eac},  // Yezidi Combining Hamza M..Yezidi Combining Madda M
+        {0x10efd, 0x10eff},  // (nil)                   ..(nil)
         {0x10f46, 0x10f50},  // Sogdian Combining Dot Be..Sogdian Combining Stroke
+        {0x10f82, 0x10f85},  // Old Uyghur Combining Dot..Old Uyghur Combining Two
         {0x11001, 0x11001},  // Brahmi Sign Anusvara    ..Brahmi Sign Anusvara
         {0x11038, 0x11046},  // Brahmi Vowel Sign Aa    ..Brahmi Virama
+        {0x11070, 0x11070},  // Brahmi Sign Old Tamil Vi..Brahmi Sign Old Tamil Vi
+        {0x11073, 0x11074},  // Brahmi Vowel Sign Old Ta..Brahmi Vowel Sign Old Ta
         {0x1107f, 0x11081},  // Brahmi Number Joiner    ..Kaithi Sign Anusvara
         {0x110b3, 0x110b6},  // Kaithi Vowel Sign U     ..Kaithi Vowel Sign Ai
         {0x110b9, 0x110ba},  // Kaithi Sign Virama      ..Kaithi Sign Nukta
+        {0x110c2, 0x110c2},  // Kaithi Vowel Sign Vocali..Kaithi Vowel Sign Vocali
         {0x11100, 0x11102},  // Chakma Sign Candrabindu ..Chakma Sign Visarga
         {0x11127, 0x1112b},  // Chakma Vowel Sign A     ..Chakma Vowel Sign Uu
         {0x1112d, 0x11134},  // Chakma Vowel Sign Ai    ..Chakma Maayyaa
@@ -247,11 +255,12 @@ public final class WcWidth {
         {0x11180, 0x11181},  // Sharada Sign Candrabindu..Sharada Sign Anusvara
         {0x111b6, 0x111be},  // Sharada Vowel Sign U    ..Sharada Vowel Sign O
         {0x111c9, 0x111cc},  // Sharada Sandhi Mark     ..Sharada Extra Short Vowe
-        {0x111cf, 0x111cf},  // (nil)                   ..(nil)
+        {0x111cf, 0x111cf},  // Sharada Sign Inverted Ca..Sharada Sign Inverted Ca
         {0x1122f, 0x11231},  // Khojki Vowel Sign U     ..Khojki Vowel Sign Ai
         {0x11234, 0x11234},  // Khojki Sign Anusvara    ..Khojki Sign Anusvara
         {0x11236, 0x11237},  // Khojki Sign Nukta       ..Khojki Sign Shadda
         {0x1123e, 0x1123e},  // Khojki Sign Sukun       ..Khojki Sign Sukun
+        {0x11241, 0x11241},  // (nil)                   ..(nil)
         {0x112df, 0x112df},  // Khudawadi Sign Anusvara ..Khudawadi Sign Anusvara
         {0x112e3, 0x112ea},  // Khudawadi Vowel Sign U  ..Khudawadi Sign Virama
         {0x11300, 0x11301},  // Grantha Sign Combining A..Grantha Sign Candrabindu
@@ -283,9 +292,9 @@ public final class WcWidth {
         {0x11727, 0x1172b},  // Ahom Vowel Sign Aw      ..Ahom Sign Killer
         {0x1182f, 0x11837},  // Dogra Vowel Sign U      ..Dogra Sign Anusvara
         {0x11839, 0x1183a},  // Dogra Sign Virama       ..Dogra Sign Nukta
-        {0x1193b, 0x1193c},  // (nil)                   ..(nil)
-        {0x1193e, 0x1193e},  // (nil)                   ..(nil)
-        {0x11943, 0x11943},  // (nil)                   ..(nil)
+        {0x1193b, 0x1193c},  // Dives Akuru Sign Anusvar..Dives Akuru Sign Candrab
+        {0x1193e, 0x1193e},  // Dives Akuru Virama      ..Dives Akuru Virama
+        {0x11943, 0x11943},  // Dives Akuru Sign Nukta  ..Dives Akuru Sign Nukta
         {0x119d4, 0x119d7},  // Nandinagari Vowel Sign U..Nandinagari Vowel Sign V
         {0x119da, 0x119db},  // Nandinagari Vowel Sign E..Nandinagari Vowel Sign A
         {0x119e0, 0x119e0},  // Nandinagari Sign Virama ..Nandinagari Sign Virama
@@ -313,12 +322,20 @@ public final class WcWidth {
         {0x11d95, 0x11d95},  // Gunjala Gondi Sign Anusv..Gunjala Gondi Sign Anusv
         {0x11d97, 0x11d97},  // Gunjala Gondi Virama    ..Gunjala Gondi Virama
         {0x11ef3, 0x11ef4},  // Makasar Vowel Sign I    ..Makasar Vowel Sign U
+        {0x11f00, 0x11f01},  // (nil)                   ..(nil)
+        {0x11f36, 0x11f3a},  // (nil)                   ..(nil)
+        {0x11f40, 0x11f40},  // (nil)                   ..(nil)
+        {0x11f42, 0x11f42},  // (nil)                   ..(nil)
+        {0x13440, 0x13440},  // (nil)                   ..(nil)
+        {0x13447, 0x13455},  // (nil)                   ..(nil)
         {0x16af0, 0x16af4},  // Bassa Vah Combining High..Bassa Vah Combining High
         {0x16b30, 0x16b36},  // Pahawh Hmong Mark Cim Tu..Pahawh Hmong Mark Cim Ta
         {0x16f4f, 0x16f4f},  // Miao Sign Consonant Modi..Miao Sign Consonant Modi
         {0x16f8f, 0x16f92},  // Miao Tone Right         ..Miao Tone Below
-        {0x16fe4, 0x16fe4},  // (nil)                   ..(nil)
+        {0x16fe4, 0x16fe4},  // Khitan Small Script Fill..Khitan Small Script Fill
         {0x1bc9d, 0x1bc9e},  // Duployan Thick Letter Se..Duployan Double Mark
+        {0x1cf00, 0x1cf2d},  // Znamenny Combining Mark ..Znamenny Combining Mark
+        {0x1cf30, 0x1cf46},  // Znamenny Combining Tonal..Znamenny Priznak Modifie
         {0x1d167, 0x1d169},  // Musical Symbol Combining..Musical Symbol Combining
         {0x1d17b, 0x1d182},  // Musical Symbol Combining..Musical Symbol Combining
         {0x1d185, 0x1d18b},  // Musical Symbol Combining..Musical Symbol Combining
@@ -335,15 +352,19 @@ public final class WcWidth {
         {0x1e01b, 0x1e021},  // Combining Glagolitic Let..Combining Glagolitic Let
         {0x1e023, 0x1e024},  // Combining Glagolitic Let..Combining Glagolitic Let
         {0x1e026, 0x1e02a},  // Combining Glagolitic Let..Combining Glagolitic Let
+        {0x1e08f, 0x1e08f},  // (nil)                   ..(nil)
         {0x1e130, 0x1e136},  // Nyiakeng Puachue Hmong T..Nyiakeng Puachue Hmong T
+        {0x1e2ae, 0x1e2ae},  // Toto Sign Rising Tone   ..Toto Sign Rising Tone
         {0x1e2ec, 0x1e2ef},  // Wancho Tone Tup         ..Wancho Tone Koini
+        {0x1e4ec, 0x1e4ef},  // (nil)                   ..(nil)
         {0x1e8d0, 0x1e8d6},  // Mende Kikakui Combining ..Mende Kikakui Combining
         {0x1e944, 0x1e94a},  // Adlam Alif Lengthener   ..Adlam Nukta
         {0xe0100, 0xe01ef},  // Variation Selector-17   ..Variation Selector-256
     };
 
-    // https://github.com/jquast/wcwidth/blob/master/wcwidth/table_wide.py
-    // at commit b29897e5a1b403a0e36f7fc991614981cbc42475 (2020-07-14):
+    // https://github.com/jquast/wcwidth/blob/master/wcwidth/table_zero.py
+    // from https://github.com/jquast/wcwidth/pull/64
+    // at commit 1b9b6585b0080ea5cb88dc9815796505724793fe (2022-12-16):
     private static final int[][] WIDE_EASTASIAN = {
         {0x01100, 0x0115f},  // Hangul Choseong Kiyeok  ..Hangul Choseong Filler
         {0x0231a, 0x0231b},  // Watch                   ..Hourglass
@@ -392,7 +413,7 @@ public final class WcWidth {
         {0x03190, 0x031e3},  // Ideographic Annotation L..Cjk Stroke Q
         {0x031f0, 0x0321e},  // Katakana Letter Small Ku..Parenthesized Korean Cha
         {0x03220, 0x03247},  // Parenthesized Ideograph ..Circled Ideograph Koto
-        {0x03250, 0x04dbf},  // Partnership Sign        ..(nil)
+        {0x03250, 0x04dbf},  // Partnership Sign        ..Cjk Unified Ideograph-4d
         {0x04e00, 0x0a48c},  // Cjk Unified Ideograph-4e..Yi Syllable Yyr
         {0x0a490, 0x0a4c6},  // Yi Radical Qot          ..Yi Radical Ke
         {0x0a960, 0x0a97c},  // Hangul Choseong Tikeut-m..Hangul Choseong Ssangyeo
@@ -404,13 +425,18 @@ public final class WcWidth {
         {0x0fe68, 0x0fe6b},  // Small Reverse Solidus   ..Small Commercial At
         {0x0ff01, 0x0ff60},  // Fullwidth Exclamation Ma..Fullwidth Right White Pa
         {0x0ffe0, 0x0ffe6},  // Fullwidth Cent Sign     ..Fullwidth Won Sign
-        {0x16fe0, 0x16fe4},  // Tangut Iteration Mark   ..(nil)
-        {0x16ff0, 0x16ff1},  // (nil)                   ..(nil)
+        {0x16fe0, 0x16fe4},  // Tangut Iteration Mark   ..Khitan Small Script Fill
+        {0x16ff0, 0x16ff1},  // Vietnamese Alternate Rea..Vietnamese Alternate Rea
         {0x17000, 0x187f7},  // (nil)                   ..(nil)
-        {0x18800, 0x18cd5},  // Tangut Component-001    ..(nil)
+        {0x18800, 0x18cd5},  // Tangut Component-001    ..Khitan Small Script Char
         {0x18d00, 0x18d08},  // (nil)                   ..(nil)
-        {0x1b000, 0x1b11e},  // Katakana Letter Archaic ..Hentaigana Letter N-mu-m
+        {0x1aff0, 0x1aff3},  // Katakana Letter Minnan T..Katakana Letter Minnan T
+        {0x1aff5, 0x1affb},  // Katakana Letter Minnan T..Katakana Letter Minnan N
+        {0x1affd, 0x1affe},  // Katakana Letter Minnan N..Katakana Letter Minnan N
+        {0x1b000, 0x1b122},  // Katakana Letter Archaic ..Katakana Letter Archaic
+        {0x1b132, 0x1b132},  // (nil)                   ..(nil)
         {0x1b150, 0x1b152},  // Hiragana Letter Small Wi..Hiragana Letter Small Wo
+        {0x1b155, 0x1b155},  // (nil)                   ..(nil)
         {0x1b164, 0x1b167},  // Katakana Letter Small Wi..Katakana Letter Small N
         {0x1b170, 0x1b2fb},  // Nushu Character-1b170   ..Nushu Character-1b2fb
         {0x1f004, 0x1f004},  // Mahjong Tile Red Dragon ..Mahjong Tile Red Dragon
@@ -443,24 +469,24 @@ public final class WcWidth {
         {0x1f680, 0x1f6c5},  // Rocket                  ..Left Luggage
         {0x1f6cc, 0x1f6cc},  // Sleeping Accommodation  ..Sleeping Accommodation
         {0x1f6d0, 0x1f6d2},  // Place Of Worship        ..Shopping Trolley
-        {0x1f6d5, 0x1f6d7},  // Hindu Temple            ..(nil)
+        {0x1f6d5, 0x1f6d7},  // Hindu Temple            ..Elevator
+        {0x1f6dc, 0x1f6df},  // (nil)                   ..Ring Buoy
         {0x1f6eb, 0x1f6ec},  // Airplane Departure      ..Airplane Arriving
-        {0x1f6f4, 0x1f6fc},  // Scooter                 ..(nil)
+        {0x1f6f4, 0x1f6fc},  // Scooter                 ..Roller Skate
         {0x1f7e0, 0x1f7eb},  // Large Orange Circle     ..Large Brown Square
-        {0x1f90c, 0x1f93a},  // (nil)                   ..Fencer
+        {0x1f7f0, 0x1f7f0},  // Heavy Equals Sign       ..Heavy Equals Sign
+        {0x1f90c, 0x1f93a},  // Pinched Fingers         ..Fencer
         {0x1f93c, 0x1f945},  // Wrestlers               ..Goal Net
-        {0x1f947, 0x1f978},  // First Place Medal       ..(nil)
-        {0x1f97a, 0x1f9cb},  // Face With Pleading Eyes ..(nil)
-        {0x1f9cd, 0x1f9ff},  // Standing Person         ..Nazar Amulet
-        {0x1fa70, 0x1fa74},  // Ballet Shoes            ..(nil)
-        {0x1fa78, 0x1fa7a},  // Drop Of Blood           ..Stethoscope
-        {0x1fa80, 0x1fa86},  // Yo-yo                   ..(nil)
-        {0x1fa90, 0x1faa8},  // Ringed Planet           ..(nil)
-        {0x1fab0, 0x1fab6},  // (nil)                   ..(nil)
-        {0x1fac0, 0x1fac2},  // (nil)                   ..(nil)
-        {0x1fad0, 0x1fad6},  // (nil)                   ..(nil)
+        {0x1f947, 0x1f9ff},  // First Place Medal       ..Nazar Amulet
+        {0x1fa70, 0x1fa7c},  // Ballet Shoes            ..Crutch
+        {0x1fa80, 0x1fa88},  // Yo-yo                   ..(nil)
+        {0x1fa90, 0x1fabd},  // Ringed Planet           ..(nil)
+        {0x1fabf, 0x1fac5},  // (nil)                   ..Person With Crown
+        {0x1face, 0x1fadb},  // (nil)                   ..(nil)
+        {0x1fae0, 0x1fae8},  // Melting Face            ..(nil)
+        {0x1faf0, 0x1faf8},  // Hand With Index Finger A..(nil)
         {0x20000, 0x2fffd},  // Cjk Unified Ideograph-20..(nil)
-        {0x30000, 0x3fffd},  // (nil)                   ..(nil)
+        {0x30000, 0x3fffd},  // Cjk Unified Ideograph-30..(nil)
     };
 
 

From 82f83a2970b86f1e1f16233d8039abff95fc080e Mon Sep 17 00:00:00 2001
From: Lucy Phipps <landfillbaby69@gmail.com>
Date: Fri, 16 Dec 2022 06:58:37 +0000
Subject: [PATCH 817/912] WcWidth.c: fix typo

---
 .../src/main/java/com/termux/terminal/WcWidth.java              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/terminal-emulator/src/main/java/com/termux/terminal/WcWidth.java b/terminal-emulator/src/main/java/com/termux/terminal/WcWidth.java
index 5eb18b13dc..bd7bea8cab 100644
--- a/terminal-emulator/src/main/java/com/termux/terminal/WcWidth.java
+++ b/terminal-emulator/src/main/java/com/termux/terminal/WcWidth.java
@@ -362,7 +362,7 @@ public final class WcWidth {
         {0xe0100, 0xe01ef},  // Variation Selector-17   ..Variation Selector-256
     };
 
-    // https://github.com/jquast/wcwidth/blob/master/wcwidth/table_zero.py
+    // https://github.com/jquast/wcwidth/blob/master/wcwidth/table_wide.py
     // from https://github.com/jquast/wcwidth/pull/64
     // at commit 1b9b6585b0080ea5cb88dc9815796505724793fe (2022-12-16):
     private static final int[][] WIDE_EASTASIAN = {

From 2f5a6f7de663074df829a62e44a23ee70e932763 Mon Sep 17 00:00:00 2001
From: Lucy Phipps <landfillbaby69@gmail.com>
Date: Fri, 16 Dec 2022 07:01:40 +0000
Subject: [PATCH 818/912] WcWidth.c: fix 2nd typo

---
 .../src/main/java/com/termux/terminal/WcWidth.java              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/terminal-emulator/src/main/java/com/termux/terminal/WcWidth.java b/terminal-emulator/src/main/java/com/termux/terminal/WcWidth.java
index bd7bea8cab..5981c4a882 100644
--- a/terminal-emulator/src/main/java/com/termux/terminal/WcWidth.java
+++ b/terminal-emulator/src/main/java/com/termux/terminal/WcWidth.java
@@ -13,7 +13,7 @@
  */
 public final class WcWidth {
 
-    // From https://github.com/jquast/wcwidth/blob/master/wcwidth/table_wide.py
+    // From https://github.com/jquast/wcwidth/blob/master/wcwidth/table_zero.py
     // from https://github.com/jquast/wcwidth/pull/64
     // at commit 1b9b6585b0080ea5cb88dc9815796505724793fe (2022-12-16):
     private static final int[][] ZERO_WIDTH = {

From c6dce125104620befd24b8f14e5a9f5871ed63a3 Mon Sep 17 00:00:00 2001
From: Young-Lord <51789698+Young-Lord@users.noreply.github.com>
Date: Fri, 13 Jan 2023 13:26:33 +0800
Subject: [PATCH 819/912] Fix GitHub spelling

---
 .../termux/shared/termux/TermuxConstants.java | 64 +++++++++----------
 .../com/termux/shared/termux/TermuxUtils.java |  6 +-
 2 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
index a3cc5dd334..59f523af72 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
@@ -325,9 +325,9 @@ public final class TermuxConstants {
      * Termux organization variables.
      */
 
-    /** Termux Github organization name */
+    /** Termux GitHub organization name */
     public static final String TERMUX_GITHUB_ORGANIZATION_NAME = "termux"; // Default: "termux"
-    /** Termux Github organization url */
+    /** Termux GitHub organization url */
     public static final String TERMUX_GITHUB_ORGANIZATION_URL = "https://github.com" + "/" + TERMUX_GITHUB_ORGANIZATION_NAME; // Default: "https://github.com/termux"
 
     /** F-Droid packages base url */
@@ -345,11 +345,11 @@ public final class TermuxConstants {
     public static final String TERMUX_APP_NAME = "Termux"; // Default: "Termux"
     /** Termux package name */
     public static final String TERMUX_PACKAGE_NAME = "com.termux"; // Default: "com.termux"
-    /** Termux Github repo name */
+    /** Termux GitHub repo name */
     public static final String TERMUX_GITHUB_REPO_NAME = "termux-app"; // Default: "termux-app"
-    /** Termux Github repo url */
+    /** Termux GitHub repo url */
     public static final String TERMUX_GITHUB_REPO_URL = TERMUX_GITHUB_ORGANIZATION_URL + "/" + TERMUX_GITHUB_REPO_NAME; // Default: "https://github.com/termux/termux-app"
-    /** Termux Github issues repo url */
+    /** Termux GitHub issues repo url */
     public static final String TERMUX_GITHUB_ISSUES_REPO_URL = TERMUX_GITHUB_REPO_URL + "/issues"; // Default: "https://github.com/termux/termux-app/issues"
     /** Termux F-Droid package url */
     public static final String TERMUX_FDROID_PACKAGE_URL = FDROID_PACKAGES_BASE_URL + "/" + TERMUX_PACKAGE_NAME; // Default: "https://f-droid.org/en/packages/com.termux"
@@ -359,11 +359,11 @@ public final class TermuxConstants {
     public static final String TERMUX_API_APP_NAME = "Termux:API"; // Default: "Termux:API"
     /** Termux:API app package name */
     public static final String TERMUX_API_PACKAGE_NAME = TERMUX_PACKAGE_NAME + ".api"; // Default: "com.termux.api"
-    /** Termux:API Github repo name */
+    /** Termux:API GitHub repo name */
     public static final String TERMUX_API_GITHUB_REPO_NAME = "termux-api"; // Default: "termux-api"
-    /** Termux:API Github repo url */
+    /** Termux:API GitHub repo url */
     public static final String TERMUX_API_GITHUB_REPO_URL = TERMUX_GITHUB_ORGANIZATION_URL + "/" + TERMUX_API_GITHUB_REPO_NAME; // Default: "https://github.com/termux/termux-api"
-    /** Termux:API Github issues repo url */
+    /** Termux:API GitHub issues repo url */
     public static final String TERMUX_API_GITHUB_ISSUES_REPO_URL = TERMUX_API_GITHUB_REPO_URL + "/issues"; // Default: "https://github.com/termux/termux-api/issues"
     /** Termux:API F-Droid package url */
     public static final String TERMUX_API_FDROID_PACKAGE_URL = FDROID_PACKAGES_BASE_URL + "/" + TERMUX_API_PACKAGE_NAME; // Default: "https://f-droid.org/en/packages/com.termux.api"
@@ -373,11 +373,11 @@ public final class TermuxConstants {
     public static final String TERMUX_BOOT_APP_NAME = "Termux:Boot"; // Default: "Termux:Boot"
     /** Termux:Boot app package name */
     public static final String TERMUX_BOOT_PACKAGE_NAME = TERMUX_PACKAGE_NAME + ".boot"; // Default: "com.termux.boot"
-    /** Termux:Boot Github repo name */
+    /** Termux:Boot GitHub repo name */
     public static final String TERMUX_BOOT_GITHUB_REPO_NAME = "termux-boot"; // Default: "termux-boot"
-    /** Termux:Boot Github repo url */
+    /** Termux:Boot GitHub repo url */
     public static final String TERMUX_BOOT_GITHUB_REPO_URL = TERMUX_GITHUB_ORGANIZATION_URL + "/" + TERMUX_BOOT_GITHUB_REPO_NAME; // Default: "https://github.com/termux/termux-boot"
-    /** Termux:Boot Github issues repo url */
+    /** Termux:Boot GitHub issues repo url */
     public static final String TERMUX_BOOT_GITHUB_ISSUES_REPO_URL = TERMUX_BOOT_GITHUB_REPO_URL + "/issues"; // Default: "https://github.com/termux/termux-boot/issues"
     /** Termux:Boot F-Droid package url */
     public static final String TERMUX_BOOT_FDROID_PACKAGE_URL = FDROID_PACKAGES_BASE_URL + "/" + TERMUX_BOOT_PACKAGE_NAME; // Default: "https://f-droid.org/en/packages/com.termux.boot"
@@ -387,11 +387,11 @@ public final class TermuxConstants {
     public static final String TERMUX_FLOAT_APP_NAME = "Termux:Float"; // Default: "Termux:Float"
     /** Termux:Float app package name */
     public static final String TERMUX_FLOAT_PACKAGE_NAME = TERMUX_PACKAGE_NAME + ".window"; // Default: "com.termux.window"
-    /** Termux:Float Github repo name */
+    /** Termux:Float GitHub repo name */
     public static final String TERMUX_FLOAT_GITHUB_REPO_NAME = "termux-float"; // Default: "termux-float"
-    /** Termux:Float Github repo url */
+    /** Termux:Float GitHub repo url */
     public static final String TERMUX_FLOAT_GITHUB_REPO_URL = TERMUX_GITHUB_ORGANIZATION_URL + "/" + TERMUX_FLOAT_GITHUB_REPO_NAME; // Default: "https://github.com/termux/termux-float"
-    /** Termux:Float Github issues repo url */
+    /** Termux:Float GitHub issues repo url */
     public static final String TERMUX_FLOAT_GITHUB_ISSUES_REPO_URL = TERMUX_FLOAT_GITHUB_REPO_URL + "/issues"; // Default: "https://github.com/termux/termux-float/issues"
     /** Termux:Float F-Droid package url */
     public static final String TERMUX_FLOAT_FDROID_PACKAGE_URL = FDROID_PACKAGES_BASE_URL + "/" + TERMUX_FLOAT_PACKAGE_NAME; // Default: "https://f-droid.org/en/packages/com.termux.window"
@@ -401,11 +401,11 @@ public final class TermuxConstants {
     public static final String TERMUX_STYLING_APP_NAME = "Termux:Styling"; // Default: "Termux:Styling"
     /** Termux:Styling app package name */
     public static final String TERMUX_STYLING_PACKAGE_NAME = TERMUX_PACKAGE_NAME + ".styling"; // Default: "com.termux.styling"
-    /** Termux:Styling Github repo name */
+    /** Termux:Styling GitHub repo name */
     public static final String TERMUX_STYLING_GITHUB_REPO_NAME = "termux-styling"; // Default: "termux-styling"
-    /** Termux:Styling Github repo url */
+    /** Termux:Styling GitHub repo url */
     public static final String TERMUX_STYLING_GITHUB_REPO_URL = TERMUX_GITHUB_ORGANIZATION_URL + "/" + TERMUX_STYLING_GITHUB_REPO_NAME; // Default: "https://github.com/termux/termux-styling"
-    /** Termux:Styling Github issues repo url */
+    /** Termux:Styling GitHub issues repo url */
     public static final String TERMUX_STYLING_GITHUB_ISSUES_REPO_URL = TERMUX_STYLING_GITHUB_REPO_URL + "/issues"; // Default: "https://github.com/termux/termux-styling/issues"
     /** Termux:Styling F-Droid package url */
     public static final String TERMUX_STYLING_FDROID_PACKAGE_URL = FDROID_PACKAGES_BASE_URL + "/" + TERMUX_STYLING_PACKAGE_NAME; // Default: "https://f-droid.org/en/packages/com.termux.styling"
@@ -415,11 +415,11 @@ public final class TermuxConstants {
     public static final String TERMUX_TASKER_APP_NAME = "Termux:Tasker"; // Default: "Termux:Tasker"
     /** Termux:Tasker app package name */
     public static final String TERMUX_TASKER_PACKAGE_NAME = TERMUX_PACKAGE_NAME + ".tasker"; // Default: "com.termux.tasker"
-    /** Termux:Tasker Github repo name */
+    /** Termux:Tasker GitHub repo name */
     public static final String TERMUX_TASKER_GITHUB_REPO_NAME = "termux-tasker"; // Default: "termux-tasker"
-    /** Termux:Tasker Github repo url */
+    /** Termux:Tasker GitHub repo url */
     public static final String TERMUX_TASKER_GITHUB_REPO_URL = TERMUX_GITHUB_ORGANIZATION_URL + "/" + TERMUX_TASKER_GITHUB_REPO_NAME; // Default: "https://github.com/termux/termux-tasker"
-    /** Termux:Tasker Github issues repo url */
+    /** Termux:Tasker GitHub issues repo url */
     public static final String TERMUX_TASKER_GITHUB_ISSUES_REPO_URL = TERMUX_TASKER_GITHUB_REPO_URL + "/issues"; // Default: "https://github.com/termux/termux-tasker/issues"
     /** Termux:Tasker F-Droid package url */
     public static final String TERMUX_TASKER_FDROID_PACKAGE_URL = FDROID_PACKAGES_BASE_URL + "/" + TERMUX_TASKER_PACKAGE_NAME; // Default: "https://f-droid.org/en/packages/com.termux.tasker"
@@ -429,11 +429,11 @@ public final class TermuxConstants {
     public static final String TERMUX_WIDGET_APP_NAME = "Termux:Widget"; // Default: "Termux:Widget"
     /** Termux:Widget app package name */
     public static final String TERMUX_WIDGET_PACKAGE_NAME = TERMUX_PACKAGE_NAME + ".widget"; // Default: "com.termux.widget"
-    /** Termux:Widget Github repo name */
+    /** Termux:Widget GitHub repo name */
     public static final String TERMUX_WIDGET_GITHUB_REPO_NAME = "termux-widget"; // Default: "termux-widget"
-    /** Termux:Widget Github repo url */
+    /** Termux:Widget GitHub repo url */
     public static final String TERMUX_WIDGET_GITHUB_REPO_URL = TERMUX_GITHUB_ORGANIZATION_URL + "/" + TERMUX_WIDGET_GITHUB_REPO_NAME; // Default: "https://github.com/termux/termux-widget"
-    /** Termux:Widget Github issues repo url */
+    /** Termux:Widget GitHub issues repo url */
     public static final String TERMUX_WIDGET_GITHUB_ISSUES_REPO_URL = TERMUX_WIDGET_GITHUB_REPO_URL + "/issues"; // Default: "https://github.com/termux/termux-widget/issues"
     /** Termux:Widget F-Droid package url */
     public static final String TERMUX_WIDGET_FDROID_PACKAGE_URL = FDROID_PACKAGES_BASE_URL + "/" + TERMUX_WIDGET_PACKAGE_NAME; // Default: "https://f-droid.org/en/packages/com.termux.widget"
@@ -476,10 +476,10 @@ public final class TermuxConstants {
     /** F-Droid APK release signing certificate SHA-256 digest */
     public static final String APK_RELEASE_FDROID_SIGNING_CERTIFICATE_SHA256_DIGEST = "228FB2CFE90831C1499EC3CCAF61E96E8E1CE70766B9474672CE427334D41C42"; // Default: "228FB2CFE90831C1499EC3CCAF61E96E8E1CE70766B9474672CE427334D41C42"
 
-    /** Github APK release */
+    /** GitHub APK release */
     public static final String APK_RELEASE_GITHUB = "Github"; // Default: "Github"
 
-    /** Github APK release signing certificate SHA-256 digest */
+    /** GitHub APK release signing certificate SHA-256 digest */
     public static final String APK_RELEASE_GITHUB_SIGNING_CERTIFICATE_SHA256_DIGEST = "B6DA01480EEFD5FBF2CD3771B8D1021EC791304BDD6C4BF41D3FAABAD48EE5E1"; // Default: "B6DA01480EEFD5FBF2CD3771B8D1021EC791304BDD6C4BF41D3FAABAD48EE5E1"
 
     /** Google Play Store APK release */
@@ -502,21 +502,21 @@ public final class TermuxConstants {
      * Termux packages urls.
      */
 
-    /** Termux Packages Github repo name */
+    /** Termux Packages GitHub repo name */
     public static final String TERMUX_PACKAGES_GITHUB_REPO_NAME = "termux-packages"; // Default: "termux-packages"
-    /** Termux Packages Github repo url */
+    /** Termux Packages GitHub repo url */
     public static final String TERMUX_PACKAGES_GITHUB_REPO_URL = TERMUX_GITHUB_ORGANIZATION_URL + "/" + TERMUX_PACKAGES_GITHUB_REPO_NAME; // Default: "https://github.com/termux/termux-packages"
-    /** Termux Packages Github issues repo url */
+    /** Termux Packages GitHub issues repo url */
     public static final String TERMUX_PACKAGES_GITHUB_ISSUES_REPO_URL = TERMUX_PACKAGES_GITHUB_REPO_URL + "/issues"; // Default: "https://github.com/termux/termux-packages/issues"
 
 
     /** Termux API apt package name */
     public static final String TERMUX_API_APT_PACKAGE_NAME = "termux-api"; // Default: "termux-api"
-    /** Termux API apt Github repo name */
+    /** Termux API apt GitHub repo name */
     public static final String TERMUX_API_APT_GITHUB_REPO_NAME = "termux-api-package"; // Default: "termux-api-package"
-    /** Termux API apt Github repo url */
+    /** Termux API apt GitHub repo url */
     public static final String TERMUX_API_APT_GITHUB_REPO_URL = TERMUX_GITHUB_ORGANIZATION_URL + "/" + TERMUX_API_APT_GITHUB_REPO_NAME; // Default: "https://github.com/termux/termux-api-package"
-    /** Termux API apt Github issues repo url */
+    /** Termux API apt GitHub issues repo url */
     public static final String TERMUX_API_APT_GITHUB_ISSUES_REPO_URL = TERMUX_API_APT_GITHUB_REPO_URL + "/issues"; // Default: "https://github.com/termux/termux-api-package/issues"
 
 
@@ -539,7 +539,7 @@ public final class TermuxConstants {
     /** Termux Wiki url */
     public static final String TERMUX_WIKI_URL = "https://wiki.termux.com"; // Default: "https://wiki.termux.com"
 
-    /** Termux Github wiki repo url */
+    /** Termux GitHub wiki repo url */
     public static final String TERMUX_GITHUB_WIKI_REPO_URL = TERMUX_GITHUB_REPO_URL + "/wiki"; // Default: "https://github.com/termux/termux-app/wiki"
 
     /** Termux Packages wiki repo url */
diff --git a/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
index 793968afcb..8ac94da162 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
@@ -518,7 +518,7 @@ public static String getReportIssueMarkdownString(@NonNull final Context context
         markdownString.append("\n\n### Reddit\n");
         markdownString.append("\n").append(MarkdownUtils.getLinkMarkdownString(TermuxConstants.TERMUX_REDDIT_SUBREDDIT, TermuxConstants.TERMUX_REDDIT_SUBREDDIT_URL)).append("  ");
 
-        markdownString.append("\n\n### Github Issues for Termux apps\n");
+        markdownString.append("\n\n### GitHub Issues for Termux apps\n");
         markdownString.append("\n").append(MarkdownUtils.getLinkMarkdownString(TermuxConstants.TERMUX_APP_NAME, TermuxConstants.TERMUX_GITHUB_ISSUES_REPO_URL)).append("  ");
         markdownString.append("\n").append(MarkdownUtils.getLinkMarkdownString(TermuxConstants.TERMUX_API_APP_NAME, TermuxConstants.TERMUX_API_GITHUB_ISSUES_REPO_URL)).append("  ");
         markdownString.append("\n").append(MarkdownUtils.getLinkMarkdownString(TermuxConstants.TERMUX_BOOT_APP_NAME, TermuxConstants.TERMUX_BOOT_GITHUB_ISSUES_REPO_URL)).append("  ");
@@ -527,7 +527,7 @@ public static String getReportIssueMarkdownString(@NonNull final Context context
         markdownString.append("\n").append(MarkdownUtils.getLinkMarkdownString(TermuxConstants.TERMUX_TASKER_APP_NAME, TermuxConstants.TERMUX_TASKER_GITHUB_ISSUES_REPO_URL)).append("  ");
         markdownString.append("\n").append(MarkdownUtils.getLinkMarkdownString(TermuxConstants.TERMUX_WIDGET_APP_NAME, TermuxConstants.TERMUX_WIDGET_GITHUB_ISSUES_REPO_URL)).append("  ");
 
-        markdownString.append("\n\n### Github Issues for Termux packages\n");
+        markdownString.append("\n\n### GitHub Issues for Termux packages\n");
         markdownString.append("\n").append(MarkdownUtils.getLinkMarkdownString(TermuxConstants.TERMUX_PACKAGES_GITHUB_REPO_NAME, TermuxConstants.TERMUX_PACKAGES_GITHUB_ISSUES_REPO_URL)).append("  ");
 
         markdownString.append("\n##\n");
@@ -548,7 +548,7 @@ public static String getImportantLinksMarkdownString(@NonNull final Context cont
 
         markdownString.append("## Important Links");
 
-        markdownString.append("\n\n### Github\n");
+        markdownString.append("\n\n### GitHub\n");
         markdownString.append("\n").append(MarkdownUtils.getLinkMarkdownString(TermuxConstants.TERMUX_APP_NAME, TermuxConstants.TERMUX_GITHUB_REPO_URL)).append("  ");
         markdownString.append("\n").append(MarkdownUtils.getLinkMarkdownString(TermuxConstants.TERMUX_API_APP_NAME, TermuxConstants.TERMUX_API_GITHUB_REPO_URL)).append("  ");
         markdownString.append("\n").append(MarkdownUtils.getLinkMarkdownString(TermuxConstants.TERMUX_BOOT_APP_NAME, TermuxConstants.TERMUX_BOOT_GITHUB_REPO_URL)).append("  ");

From 2ac7fd1e565872d10b91157022485c13ab179524 Mon Sep 17 00:00:00 2001
From: Yaksh Bariya <yakshbari4@gmail.com>
Date: Wed, 8 Feb 2023 18:45:10 +0530
Subject: [PATCH 820/912] ci: use termux/upload-release-actions to attach debug
 builds to new releases

---
 .../attach_debug_apks_to_release.yml          | 69 ++++++++-----------
 1 file changed, 29 insertions(+), 40 deletions(-)

diff --git a/.github/workflows/attach_debug_apks_to_release.yml b/.github/workflows/attach_debug_apks_to_release.yml
index 4f24d5e34b..e64d838fab 100644
--- a/.github/workflows/attach_debug_apks_to_release.yml
+++ b/.github/workflows/attach_debug_apks_to_release.yml
@@ -6,7 +6,7 @@ on:
       - published
 
 jobs:
-  attach-apks:
+  build:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -21,23 +21,15 @@ jobs:
         with:
           ref: ${{ env.GITHUB_REF }}
 
-      - name: Build and attach APKs to release
+      - name: Build
         shell: bash {0}
         env:
           PACKAGE_VARIANT: ${{ matrix.package_variant }}
         run: |
-          exit_on_error() {
-              echo "$1"
-              echo "Deleting '$RELEASE_VERSION_NAME' release and '$GITHUB_REF' tag"
-              hub release delete "$RELEASE_VERSION_NAME"
-              git push --delete origin "$GITHUB_REF"
-              exit 1
-          }
-
-          echo "Setting vars"
           RELEASE_VERSION_NAME="${GITHUB_REF/refs\/tags\//}"
           if ! printf "%s" "${RELEASE_VERSION_NAME/v/}" | grep -qP '^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$'; then
-           exit_on_error "The versionName '${RELEASE_VERSION_NAME/v/}' is not a valid version as per semantic version '2.0.0' spec in the format 'major.minor.patch(-prerelease)(+buildmetadata)'. https://semver.org/spec/v2.0.0.html."
+            echo "The versionName '${RELEASE_VERSION_NAME/v/}' is not a valid version as per semantic version '2.0.0' spec in the format 'major.minor.patch(-prerelease)(+buildmetadata)'. https://semver.org/spec/v2.0.0.html."
+            exit 1
           fi
 
           APK_DIR_PATH="./app/build/outputs/apk/debug"
@@ -47,38 +39,35 @@ jobs:
           echo "Building APKs for 'APK_VERSION_TAG' release"
           export TERMUX_APK_VERSION_TAG="$APK_VERSION_TAG" # Used by app/build.gradle
           export TERMUX_PACKAGE_VARIANT="${{ env.PACKAGE_VARIANT }}" # Used by app/build.gradle
-          if ! ./gradlew assembleDebug; then
-            exit_on_error "Build failed for '$APK_VERSION_TAG' release."
-          fi
+          ./gradlew assembleDebug
 
           echo "Validating APKs"
           for abi in universal arm64-v8a armeabi-v7a x86_64 x86; do
             if ! test -f "$APK_DIR_PATH/${APK_BASENAME_PREFIX}_$abi.apk"; then
               files_found="$(ls "$APK_DIR_PATH")"
-              exit_on_error "Failed to find built APK at '$APK_DIR_PATH/${APK_BASENAME_PREFIX}_$abi.apk'. Files found: "$'\n'"$files_found"
+              echo "Failed to find built APK at '$APK_DIR_PATH/${APK_BASENAME_PREFIX}_$abi.apk'. Files found: "$'\n'"$files_found"
+              exit 1
             fi
           done
-
-          echo "Generating sha25sums file"
-          if ! (cd "$APK_DIR_PATH"; sha256sum \
-            "${APK_BASENAME_PREFIX}_universal.apk" \
-            "${APK_BASENAME_PREFIX}_arm64-v8a.apk" \
-            "${APK_BASENAME_PREFIX}_armeabi-v7a.apk" \
-            "${APK_BASENAME_PREFIX}_x86_64.apk" \
-            "${APK_BASENAME_PREFIX}_x86.apk" \
-            > "${APK_BASENAME_PREFIX}_sha256sums"); then
-            exit_on_error "Generate sha25sums failed for '$APK_VERSION_TAG' release."
-          fi
-
-          echo "Attaching APKs to github release"
-          if ! hub release edit \
-          -m "" \
-          -a "$APK_DIR_PATH/${APK_BASENAME_PREFIX}_universal.apk" \
-          -a "$APK_DIR_PATH/${APK_BASENAME_PREFIX}_arm64-v8a.apk" \
-          -a "$APK_DIR_PATH/${APK_BASENAME_PREFIX}_armeabi-v7a.apk" \
-          -a "$APK_DIR_PATH/${APK_BASENAME_PREFIX}_x86_64.apk" \
-          -a "$APK_DIR_PATH/${APK_BASENAME_PREFIX}_x86.apk" \
-          -a "$APK_DIR_PATH/${APK_BASENAME_PREFIX}_sha256sums" \
-          "$RELEASE_VERSION_NAME"; then
-            exit_on_error "Attach APKs to release failed for '$APK_VERSION_TAG' release."
-          fi
+      - name: Upload APKs to GitHub artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: ${{ matrix.package_variant }}
+          path: ./app/build/outputs/apk/debug/*.apk
+  upload:
+    runs-on: ubuntu-latest
+    needs: build
+    env:
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    steps:
+      - name: Download artifact
+        uses: actions/download-artifact@v3
+      - name: Upload APKs to release
+        uses: termux/upload-release-action@v4.1.0
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: "**/*.apk"
+          file_glob: true
+          release_name: 
+          tag: ${{ github.event.release.tag_name }}
+          checksums: sha256,sha512,md5

From b800f1cc819fd549c8ba4e2a3a1fee2f1d916a21 Mon Sep 17 00:00:00 2001
From: Sandelinos <26635624+Sandelinos@users.noreply.github.com>
Date: Fri, 16 Sep 2022 22:50:17 +0300
Subject: [PATCH 821/912] Added: Add monochrome icon

---
 app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml       | 1 +
 app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index 6192469fc4..61bc6d97e3 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -2,4 +2,5 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@android:color/black"/>
     <foreground android:drawable="@drawable/ic_foreground"/>
+    <monochrome android:drawable="@drawable/ic_foreground"/>
 </adaptive-icon>
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index 6192469fc4..61bc6d97e3 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -2,4 +2,5 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@android:color/black"/>
     <foreground android:drawable="@drawable/ic_foreground"/>
+    <monochrome android:drawable="@drawable/ic_foreground"/>
 </adaptive-icon>

From 9b274f9a0dfdd17a6610ed27f8ffd62cdce573c1 Mon Sep 17 00:00:00 2001
From: utzcoz <utzcoz@outlook.com>
Date: Sat, 28 Jan 2023 10:48:27 +0800
Subject: [PATCH 822/912] Changed: Bump robolectric to 4.9.2

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 8338a27a85..9620f410a1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -142,7 +142,7 @@ android {
 
 dependencies {
     testImplementation "junit:junit:4.13.2"
-    testImplementation "org.robolectric:robolectric:4.4"
+    testImplementation "org.robolectric:robolectric:4.9.2"
     coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:1.1.5"
 }
 

From 93eafffb904035305c129d67e3087b9db85cccad Mon Sep 17 00:00:00 2001
From: utzcoz <43091780+utzcoz@users.noreply.github.com>
Date: Sun, 16 Apr 2023 11:22:21 +0800
Subject: [PATCH 823/912] Changed: Bump Robolectric to 4.10

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 9620f410a1..3df93fef10 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -142,7 +142,7 @@ android {
 
 dependencies {
     testImplementation "junit:junit:4.13.2"
-    testImplementation "org.robolectric:robolectric:4.9.2"
+    testImplementation "org.robolectric:robolectric:4.10"
     coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:1.1.5"
 }
 

From c1dca29076d43889cd0627080df8f02d38089eea Mon Sep 17 00:00:00 2001
From: maheshnikam <55378196+nikam14@users.noreply.github.com>
Date: Mon, 13 Mar 2023 10:19:05 +0000
Subject: [PATCH 824/912] [doc](readme)modified the links in file

improved some links to Hyperlinks.
---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 5e7fb1dcfc..89c8edb532 100644
--- a/README.md
+++ b/README.md
@@ -55,7 +55,7 @@ The core [Termux](https://github.com/termux/termux-app) app comes with the follo
 
 Latest version is `v0.118.0`.
 
-**NOTICE: It is highly recommended that you update to `v0.118.0` or higher ASAP for various bug fixes, including a critical world-readable vulnerability reported at https://termux.github.io/general/2022/02/15/termux-apps-vulnerability-disclosures.html. Also reminding [again](https://www.reddit.com/r/termux/comments/pkujfa/important_deprecation_notice_for_google_play) to users who have installed termux apps from google playstore that playstore builds are [deprecated](#google-play-store-deprecated) and no longer supported. It is recommended that you shift to F-Droid or GitHub releases.**
+**NOTICE: It is highly recommended that you update to `v0.118.0` or higher ASAP for various bug fixes, including a critical world-readable vulnerability reported [here](https://termux.github.io/general/2022/02/15/termux-apps-vulnerability-disclosures.html). Also reminding [again](https://www.reddit.com/r/termux/comments/pkujfa/important_deprecation_notice_for_google_play) to users who have installed termux apps from google playstore that playstore builds are [deprecated](#google-play-store-deprecated) and no longer supported. It is recommended that you shift to F-Droid or GitHub releases.**
 
 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).
 
@@ -73,7 +73,7 @@ You **do not** need to download the `F-Droid` app (via the `Download F-Droid` li
 
 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.
 
-The `F-Droid` app often may not notify you of updates and you will manually have to do a pull down swipe action in the `Updates` tab of the app for it to check updates. Make sure battery optimizations are disabled for the app, check https://dontkillmyapp.com/ for details on how to do that.
+The `F-Droid` app often may not notify you of updates and you will manually have to do a pull down swipe action in the `Updates` tab of the app for it to check updates. Make sure battery optimizations are disabled for the app, check [here](https://dontkillmyapp.com/) for details on how to do that.
 
 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.
 
@@ -124,7 +124,7 @@ You can backup all your data under `$HOME/` and `$PREFIX/` before changing insta
 
 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.
 
-Note that by upgrading old packages to latest versions, like that of `python` may break your setups/scripts since they may not be compatible anymore. Moreover, you will not be able to downgrade the package versions since termux repos only keep the latest version and you will have to manually rebuild the old versions of the packages if required as per https://github.com/termux/termux-packages/wiki/Building-packages.
+Note that by upgrading old packages to latest versions, like that of `python` may break your setups/scripts since they may not be compatible anymore. Moreover, you will not be able to downgrade the package versions since termux repos only keep the latest version and you will have to manually rebuild the old versions of the packages if required as per [Build packages](https://github.com/termux/termux-packages/wiki/Building-packages).
 
 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. The `termux-tools` [version `>= 0.135`](https://github.com/termux/termux-packages/pull/7493) will also show a banner at the top of the terminal saying `You are likely using a very old version of Termux, probably installed from the Google Play Store.`, you can remove it by running `rm -f /data/data/com.termux/files/usr/etc/motd-playstore` and restarting the app.
 

From 1240c5ca471ee09f3cc2d3b404ec7d55e1079c8c Mon Sep 17 00:00:00 2001
From: Kevin Williams <2096779623@qq.com>
Date: Mon, 1 May 2023 08:03:18 +0800
Subject: [PATCH 825/912] Revert "[doc](readme)modified the links in file"

This reverts commit c1dca29076d43889cd0627080df8f02d38089eea.
---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 89c8edb532..5e7fb1dcfc 100644
--- a/README.md
+++ b/README.md
@@ -55,7 +55,7 @@ The core [Termux](https://github.com/termux/termux-app) app comes with the follo
 
 Latest version is `v0.118.0`.
 
-**NOTICE: It is highly recommended that you update to `v0.118.0` or higher ASAP for various bug fixes, including a critical world-readable vulnerability reported [here](https://termux.github.io/general/2022/02/15/termux-apps-vulnerability-disclosures.html). Also reminding [again](https://www.reddit.com/r/termux/comments/pkujfa/important_deprecation_notice_for_google_play) to users who have installed termux apps from google playstore that playstore builds are [deprecated](#google-play-store-deprecated) and no longer supported. It is recommended that you shift to F-Droid or GitHub releases.**
+**NOTICE: It is highly recommended that you update to `v0.118.0` or higher ASAP for various bug fixes, including a critical world-readable vulnerability reported at https://termux.github.io/general/2022/02/15/termux-apps-vulnerability-disclosures.html. Also reminding [again](https://www.reddit.com/r/termux/comments/pkujfa/important_deprecation_notice_for_google_play) to users who have installed termux apps from google playstore that playstore builds are [deprecated](#google-play-store-deprecated) and no longer supported. It is recommended that you shift to F-Droid or GitHub releases.**
 
 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).
 
@@ -73,7 +73,7 @@ You **do not** need to download the `F-Droid` app (via the `Download F-Droid` li
 
 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.
 
-The `F-Droid` app often may not notify you of updates and you will manually have to do a pull down swipe action in the `Updates` tab of the app for it to check updates. Make sure battery optimizations are disabled for the app, check [here](https://dontkillmyapp.com/) for details on how to do that.
+The `F-Droid` app often may not notify you of updates and you will manually have to do a pull down swipe action in the `Updates` tab of the app for it to check updates. Make sure battery optimizations are disabled for the app, check https://dontkillmyapp.com/ for details on how to do that.
 
 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.
 
@@ -124,7 +124,7 @@ You can backup all your data under `$HOME/` and `$PREFIX/` before changing insta
 
 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.
 
-Note that by upgrading old packages to latest versions, like that of `python` may break your setups/scripts since they may not be compatible anymore. Moreover, you will not be able to downgrade the package versions since termux repos only keep the latest version and you will have to manually rebuild the old versions of the packages if required as per [Build packages](https://github.com/termux/termux-packages/wiki/Building-packages).
+Note that by upgrading old packages to latest versions, like that of `python` may break your setups/scripts since they may not be compatible anymore. Moreover, you will not be able to downgrade the package versions since termux repos only keep the latest version and you will have to manually rebuild the old versions of the packages if required as per https://github.com/termux/termux-packages/wiki/Building-packages.
 
 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. The `termux-tools` [version `>= 0.135`](https://github.com/termux/termux-packages/pull/7493) will also show a banner at the top of the terminal saying `You are likely using a very old version of Termux, probably installed from the Google Play Store.`, you can remove it by running `rm -f /data/data/com.termux/files/usr/etc/motd-playstore` and restarting the app.
 

From ba1fb850bff82b0196387a72206fa905b79cb1c7 Mon Sep 17 00:00:00 2001
From: maheshnikam <55378196+nikam14@users.noreply.github.com>
Date: Mon, 1 May 2023 08:19:30 +0800
Subject: [PATCH 826/912] Changed(README.md): Improved some links to Hyperlinks

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 5e7fb1dcfc..f882a0100f 100644
--- a/README.md
+++ b/README.md
@@ -55,7 +55,7 @@ The core [Termux](https://github.com/termux/termux-app) app comes with the follo
 
 Latest version is `v0.118.0`.
 
-**NOTICE: It is highly recommended that you update to `v0.118.0` or higher ASAP for various bug fixes, including a critical world-readable vulnerability reported at https://termux.github.io/general/2022/02/15/termux-apps-vulnerability-disclosures.html. Also reminding [again](https://www.reddit.com/r/termux/comments/pkujfa/important_deprecation_notice_for_google_play) to users who have installed termux apps from google playstore that playstore builds are [deprecated](#google-play-store-deprecated) and no longer supported. It is recommended that you shift to F-Droid or GitHub releases.**
+**NOTICE: It is highly recommended that you update to `v0.118.0` or higher ASAP for various bug fixes, including a critical world-readable vulnerability reported [here](https://termux.github.io/general/2022/02/15/termux-apps-vulnerability-disclosures.html). Also reminding [again](https://www.reddit.com/r/termux/comments/pkujfa/important_deprecation_notice_for_google_play) to users who have installed termux apps from google playstore that playstore builds are [deprecated](#google-play-store-deprecated) and no longer supported. It is recommended that you shift to F-Droid or GitHub releases.**
 
 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).
 
@@ -124,7 +124,7 @@ You can backup all your data under `$HOME/` and `$PREFIX/` before changing insta
 
 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.
 
-Note that by upgrading old packages to latest versions, like that of `python` may break your setups/scripts since they may not be compatible anymore. Moreover, you will not be able to downgrade the package versions since termux repos only keep the latest version and you will have to manually rebuild the old versions of the packages if required as per https://github.com/termux/termux-packages/wiki/Building-packages.
+Note that by upgrading old packages to latest versions, like that of `python` may break your setups/scripts since they may not be compatible anymore. Moreover, you will not be able to downgrade the package versions since termux repos only keep the latest version and you will have to manually rebuild the old versions of the packages if required as per [Building packages](https://github.com/termux/termux-packages/wiki/Building-packages).
 
 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. The `termux-tools` [version `>= 0.135`](https://github.com/termux/termux-packages/pull/7493) will also show a banner at the top of the terminal saying `You are likely using a very old version of Termux, probably installed from the Google Play Store.`, you can remove it by running `rm -f /data/data/com.termux/files/usr/etc/motd-playstore` and restarting the app.
 

From 33295decbb73d6c4e53873d7df192ec088d1581e Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sun, 21 May 2023 07:22:18 +0500
Subject: [PATCH 827/912] Changed: Add `PGUP` and `PGDN` extra keys to
 repetitive keys so that long holding them triggers page scrolling instead of
 having to repeatedly press the key to change pages

---
 .../termux/shared/termux/extrakeys/ExtraKeysConstants.java   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/termux/extrakeys/ExtraKeysConstants.java b/termux-shared/src/main/java/com/termux/shared/termux/extrakeys/ExtraKeysConstants.java
index e625db5cd3..b747381c02 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/extrakeys/ExtraKeysConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/extrakeys/ExtraKeysConstants.java
@@ -10,7 +10,10 @@
 public class ExtraKeysConstants {
 
     /** Defines the repetitive keys that can be passed to {@link ExtraKeysView#setRepetitiveKeys(List)}. */
-    public static List<String> PRIMARY_REPETITIVE_KEYS = Arrays.asList("UP", "DOWN", "LEFT", "RIGHT", "BKSP", "DEL");
+    public static List<String> PRIMARY_REPETITIVE_KEYS = Arrays.asList(
+        "UP", "DOWN", "LEFT", "RIGHT",
+        "BKSP", "DEL",
+        "PGUP", "PGDN");
 
 
 

From 66a9495d91b72119830fd2bafcc9f3e2230f754f Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sun, 21 May 2023 07:46:07 +0500
Subject: [PATCH 828/912] Fixed: Fix `SHIFT+PAGE_UP` and `SHIFT+PAGE_DOWN`
 behaviour to scroll `1` line of scrollback history instead of scrolling
 command history or changing pages

This will work for both `SHIFT` extra key and hardware keyboards. The `SHIFT` extra key can be long held to lock it in an enabled state and `PGUP` and `PGDN` keys can be long held to repeat scrolling.

Closes #867
---
 .../java/com/termux/view/TerminalView.java    | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/terminal-view/src/main/java/com/termux/view/TerminalView.java b/terminal-view/src/main/java/com/termux/view/TerminalView.java
index 3baecd2481..586cd63391 100644
--- a/terminal-view/src/main/java/com/termux/view/TerminalView.java
+++ b/terminal-view/src/main/java/com/termux/view/TerminalView.java
@@ -11,6 +11,7 @@
 import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
+import android.os.SystemClock;
 import android.text.Editable;
 import android.text.InputType;
 import android.text.TextUtils;
@@ -872,6 +873,9 @@ public boolean handleKeyCode(int keyCode, int keyMod) {
         if (mEmulator != null)
             mEmulator.setCursorBlinkState(true);
 
+        if (handleKeyCodeAction(keyCode, keyMod))
+            return true;
+
         TerminalEmulator term = mTermSession.getEmulator();
         String code = KeyHandler.getCode(keyCode, keyMod, term.isCursorKeysApplicationMode(), term.isKeypadApplicationMode());
         if (code == null) return false;
@@ -879,6 +883,26 @@ public boolean handleKeyCode(int keyCode, int keyMod) {
         return true;
     }
 
+    public boolean handleKeyCodeAction(int keyCode, int keyMod) {
+        boolean shiftDown = (keyMod & KeyHandler.KEYMOD_SHIFT) != 0;
+
+        switch (keyCode) {
+            case KeyEvent.KEYCODE_PAGE_UP:
+            case KeyEvent.KEYCODE_PAGE_DOWN:
+                // shift+page_up and shift+page_down should scroll scrollback history instead of
+                // scrolling command history or changing pages
+                if (shiftDown) {
+                    long time = SystemClock.uptimeMillis();
+                    MotionEvent motionEvent = MotionEvent.obtain(time, time, MotionEvent.ACTION_DOWN, 0, 0, 0);
+                    doScroll(motionEvent, keyCode == KeyEvent.KEYCODE_PAGE_UP ? -1 : 1);
+                    motionEvent.recycle();
+                    return true;
+                }
+        }
+
+       return false;
+    }
+
     /**
      * Called when a key is released in the view.
      *

From 11d8e4ff8fd3517842a2687ac5779477cb572fae Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Thu, 25 May 2023 12:42:54 +0300
Subject: [PATCH 829/912] update readme

Clarification why Termux is still not unpublished from Play Store.
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f882a0100f..a949ab8108 100644
--- a/README.md
+++ b/README.md
@@ -116,7 +116,7 @@ Version: 3
 
 **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.
+**Termux developers do not have access to Play Store Console account where Termux is published and therefore can't remove the app.** You are encouraged to move to `F-Droid` or `GitHub` builds as soon as possible and suggest doing so for other users via social media.
 
 You **will not need to buy plugins again** if you bought them on Play Store. All plugins are free on `F-Droid` and  `GitHub`.
 

From 9d308c23314375f9d2b9f022f31ca6d7459cda72 Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Sun, 25 Jun 2023 22:39:36 +0300
Subject: [PATCH 830/912] update readme

Presence of phantom process killer on Android 12 doesn't mean Termux is
broken. It could be unstable because of abrupt termination of all
processes by signal 9 under certain cases. But this doesn't mean it is
unusable on all devices with Android 12 or higher.

The word "broken" could be too scary for new users.
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a949ab8108..799182f5f8 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ Quick how-to about Termux package management is available at [Package Management
 
 ***
 
-**NOTICE: Termux is broken on Android 12.** Android OS will kill any (phantom) processes greater than 32 (limit is for all apps combined) and also kill any processes using excessive CPU. You may get `[Process completed (signal 9) - press Enter]` message in the terminal without actually exiting the shell process yourself. Check the related issue [#2366](https://github.com/termux/termux-app/issues/2366), [issue tracker](https://issuetracker.google.com/u/1/issues/205156966), [phantom cached and empty processes docs](https://github.com/agnostic-apollo/Android-Docs/blob/master/en/docs/apps/processes/phantom-cached-and-empty-processes.md) and [this TLDR comment](https://github.com/termux/termux-app/issues/2366#issuecomment-1237468220) on how to disable trimming of phantom and excessive cpu usage processes. A proper docs page will be added later. An option to disable the killing should be available in Android 12L or 13, so upgrade at your own risk if you are on Android 11, specially if you are not rooted.
+**NOTICE: Termux may be unstable on Android 12+.** Android OS will kill any (phantom) processes greater than 32 (limit is for all apps combined) and also kill any processes using excessive CPU. You may get `[Process completed (signal 9) - press Enter]` message in the terminal without actually exiting the shell process yourself. Check the related issue [#2366](https://github.com/termux/termux-app/issues/2366), [issue tracker](https://issuetracker.google.com/u/1/issues/205156966), [phantom cached and empty processes docs](https://github.com/agnostic-apollo/Android-Docs/blob/master/en/docs/apps/processes/phantom-cached-and-empty-processes.md) and [this TLDR comment](https://github.com/termux/termux-app/issues/2366#issuecomment-1237468220) on how to disable trimming of phantom and excessive cpu usage processes. A proper docs page will be added later. An option to disable the killing should be available in Android 12L or 13, so upgrade at your own risk if you are on Android 11, specially if you are not rooted.
 
 ***
 

From 06230f95dfa05cf4822aa619ed4328cb0f092ef1 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 10 Aug 2023 00:46:44 +0500
Subject: [PATCH 831/912] Changed: Only show github action builds for pushes to
 master branch and not of other branches and pull requests

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 799182f5f8..0061b9b587 100644
--- a/README.md
+++ b/README.md
@@ -79,7 +79,7 @@ Only a universal APK is released, which will work on all supported architectures
 
 ### GitHub
 
-Termux application can be obtained on `GitHub` either from [`GitHub Releases`](https://github.com/termux/termux-app/releases) for version `>= 0.118.0` or from [`GitHub Build`](https://github.com/termux/termux-app/actions/workflows/debug_build.yml) action workflows.
+Termux application can be obtained on `GitHub` either from [`GitHub Releases`](https://github.com/termux/termux-app/releases) for version `>= 0.118.0` or from [`GitHub Build Action`](https://github.com/termux/termux-app/actions/workflows/debug_build.yml?query=branch%3Amaster+event%3Apush) 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.
 

From 7c262b8d9917d953c4c899089a88b08899946737 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Mon, 14 Aug 2023 20:45:30 +0500
Subject: [PATCH 832/912] Fixed: Fix toggle toolbar not working due to
 accidental comment of function in a56ed577

Closes #3258
---
 app/src/main/java/com/termux/app/TermuxActivity.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index a2bb11e8c4..308d1f0b2b 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -590,7 +590,7 @@ private void setToggleKeyboardView() {
         });
 
         findViewById(R.id.toggle_keyboard_button).setOnLongClickListener(v -> {
-            //toggleTerminalToolbar();
+            toggleTerminalToolbar();
             return true;
         });
     }

From 55cdef01e7b2c0c1c7946a95e716098bf441256c Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 19 Aug 2023 03:59:10 +0500
Subject: [PATCH 833/912] Fixed: Allow numbers and hyphens in domain extension
 for url selector

Closes #3550
---
 .../main/java/com/termux/shared/termux/data/TermuxUrlUtils.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/termux/data/TermuxUrlUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/data/TermuxUrlUtils.java
index 6eabde8eab..d35d9f81d1 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/data/TermuxUrlUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/data/TermuxUrlUtils.java
@@ -60,7 +60,7 @@ public static Pattern getUrlMatchRegex() {
         regex_sb.append("(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)|");
 
         // Host name or domain.
-        regex_sb.append("(?:(?:[a-z\\u00a1-\\uffff0-9]-*)*[a-z\\u00a1-\\uffff0-9]+)(?:(?:\\.(?:[a-z\\u00a1-\\uffff0-9]-*)*[a-z\\u00a1-\\uffff0-9]+)*(?:\\.(?:[a-z\\u00a1-\\uffff]{2,})))?|");
+        regex_sb.append("(?:(?:[a-z\\u00a1-\\uffff0-9]-*)*[a-z\\u00a1-\\uffff0-9]+)(?:(?:\\.(?:[a-z\\u00a1-\\uffff0-9]-*)*[a-z\\u00a1-\\uffff0-9]+)*(?:\\.(?:[a-z\\u00a1-\\uffff0-9]-*){1,}[a-z\\u00a1-\\uffff0-9]{1,}))?|");
 
         // Just path. Used in case of 'file://' scheme.
         regex_sb.append("/(?:(?:[a-z\\u00a1-\\uffff0-9]-*)*[a-z\\u00a1-\\uffff0-9]+)");

From eef5ac43a72f6391a5360a7c1f123e97dee85182 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Tue, 22 Aug 2023 05:01:47 +0500
Subject: [PATCH 834/912] Fixed: Fix headings in README.md

---
 README.md | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 0061b9b587..2c886fea2f 100644
--- a/README.md
+++ b/README.md
@@ -26,13 +26,13 @@ Issue https://github.com/termux/termux-app/issues/1072 needs extra attention.
 ***
 
 ## Contents
-- [Termux App and Plugins](#Termux-App-and-Plugins)
-- [Installation](#Installation)
-- [Uninstallation](#Uninstallation)
-- [Important Links](#Important-Links)
-- [Debugging](#Debugging)
-- [For Maintainers and Contributors](#For-Maintainers-and-Contributors)
-- [Forking](#Forking)
+- [Termux App and Plugins](#termux-app-and-plugins)
+- [Installation](#installation)
+- [Uninstallation](#uninstallation)
+- [Important Links](#important-links)
+- [Debugging](#debugging)
+- [For Maintainers and Contributors](#for-maintainers-and-contributors)
+- [Forking](#forking)
 ##
 
 
@@ -61,7 +61,7 @@ Termux can be obtained through various sources listed below for **only** Android
 
 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.
 
-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.
+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).
 
@@ -154,9 +154,9 @@ If you plan on staying on Play Store sources in future as well, then you may wan
 
 ## 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 the 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).
+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.
 

From 32cd8a938442536d804ca00b3aef87a9ddd02f4e Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Thu, 5 Oct 2023 22:56:38 +0300
Subject: [PATCH 835/912] Changed: Remove info from README.md that fornwall is
 inactive and issue #1072 needs extra attention

Fornwall is active again and work is already being done on #1072 for an alternate variant at https://github.com/termux/termux-exec/pull/24 and the other alternate https://github.com/termux/termux-app/issues/2155#issuecomment-1636732850 will be worked on in future.
---
 README.md | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 2c886fea2f..625a4fc9bc 100644
--- a/README.md
+++ b/README.md
@@ -13,15 +13,11 @@ Note that this repository is for the app itself (the user interface and the term
 
 Quick how-to about Termux package management is available at [Package Management](https://github.com/termux/termux-packages/wiki/Package-Management). It also has info on how to fix **`repository is under maintenance or down`** errors when running `apt` or `pkg` commands.
 
-***
-
-**NOTICE: Termux may be unstable on Android 12+.** Android OS will kill any (phantom) processes greater than 32 (limit is for all apps combined) and also kill any processes using excessive CPU. You may get `[Process completed (signal 9) - press Enter]` message in the terminal without actually exiting the shell process yourself. Check the related issue [#2366](https://github.com/termux/termux-app/issues/2366), [issue tracker](https://issuetracker.google.com/u/1/issues/205156966), [phantom cached and empty processes docs](https://github.com/agnostic-apollo/Android-Docs/blob/master/en/docs/apps/processes/phantom-cached-and-empty-processes.md) and [this TLDR comment](https://github.com/termux/termux-app/issues/2366#issuecomment-1237468220) on how to disable trimming of phantom and excessive cpu usage processes. A proper docs page will be added later. An option to disable the killing should be available in Android 12L or 13, so upgrade at your own risk if you are on Android 11, specially if you are not rooted.
+**We are looking for Termux Android application maintainers.**
 
 ***
 
-**@termux is looking for Termux Application maintainers for implementing new features, fixing bugs and reviewing pull requests since the current one (@fornwall) is inactive.**
-
-Issue https://github.com/termux/termux-app/issues/1072 needs extra attention.
+**NOTICE: Termux may be unstable on Android 12+.** Android OS will kill any (phantom) processes greater than 32 (limit is for all apps combined) and also kill any processes using excessive CPU. You may get `[Process completed (signal 9) - press Enter]` message in the terminal without actually exiting the shell process yourself. Check the related issue [#2366](https://github.com/termux/termux-app/issues/2366), [issue tracker](https://issuetracker.google.com/u/1/issues/205156966), [phantom cached and empty processes docs](https://github.com/agnostic-apollo/Android-Docs/blob/master/en/docs/apps/processes/phantom-cached-and-empty-processes.md) and [this TLDR comment](https://github.com/termux/termux-app/issues/2366#issuecomment-1237468220) on how to disable trimming of phantom and excessive cpu usage processes. A proper docs page will be added later. An option to disable the killing should be available in Android 12L or 13, so upgrade at your own risk if you are on Android 11, specially if you are not rooted.
 
 ***
 

From cce78cc274ef082e6fab6026d4b532a2a614c02d Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 7 Oct 2023 06:46:22 +0500
Subject: [PATCH 836/912] Fixed: Fix dependabot commit format to use
 convetional commit format

All commit messages will now be prefixed with "Changed: "
---
 .github/dependabot.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index a83ef38514..af8a2fdafb 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -4,3 +4,6 @@ updates:
   directory: /
   schedule:
     interval: daily
+  commit-message:
+    # Prefix all commit messages with "Changed: "
+    prefix: "Changed"

From c5b69975e1a0fd7afc445e19174d83e9a4bd10b7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 7 Oct 2023 01:48:07 +0000
Subject: [PATCH 837/912] Changed: Bump actions/checkout from 3 to 4

Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/attach_debug_apks_to_release.yml | 2 +-
 .github/workflows/debug_build.yml                  | 2 +-
 .github/workflows/gradle-wrapper-validation.yml    | 2 +-
 .github/workflows/run_tests.yml                    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/attach_debug_apks_to_release.yml b/.github/workflows/attach_debug_apks_to_release.yml
index e64d838fab..04b4caecb5 100644
--- a/.github/workflows/attach_debug_apks_to_release.yml
+++ b/.github/workflows/attach_debug_apks_to_release.yml
@@ -17,7 +17,7 @@ jobs:
 
     steps:
       - name: Clone repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ env.GITHUB_REF }}
 
diff --git a/.github/workflows/debug_build.yml b/.github/workflows/debug_build.yml
index 8384a8d49b..f4cde739e6 100644
--- a/.github/workflows/debug_build.yml
+++ b/.github/workflows/debug_build.yml
@@ -18,7 +18,7 @@ jobs:
 
     steps:
       - name: Clone repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Build APKs
         shell: bash {0}
diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
index b384f85868..8169612c00 100644
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -15,5 +15,5 @@ jobs:
     name: "Validation"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: gradle/wrapper-validation-action@v1
diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml
index fdc20787a0..f8d33fd4fc 100644
--- a/.github/workflows/run_tests.yml
+++ b/.github/workflows/run_tests.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Clone repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: Execute tests
       run: |
         ./gradlew test

From e2f0edf4d20bc17c99b39c551708296f2c5c7939 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Sun, 8 Oct 2023 22:03:27 +0200
Subject: [PATCH 838/912] Chore: Add vim swap files to .gitignore

---
 .gitignore | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.gitignore b/.gitignore
index 6a9b993a2c..a52cbb3394 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,6 +24,10 @@ local.properties
 .idea/
 *.iml
 
+# Vim
+*.swo
+*.swp
+
 # OS-specific files
 .DS_Store
 .DS_Store?

From e27f9fa979dfd386e54a94d65d4101eb717bd204 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 19 Oct 2023 08:00:31 +0500
Subject: [PATCH 839/912] Changed: Update README with info on how to install
 termux for android 5 and 6

---
 README.md | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 625a4fc9bc..2f489c3d57 100644
--- a/README.md
+++ b/README.md
@@ -53,7 +53,9 @@ Latest version is `v0.118.0`.
 
 **NOTICE: It is highly recommended that you update to `v0.118.0` or higher ASAP for various bug fixes, including a critical world-readable vulnerability reported [here](https://termux.github.io/general/2022/02/15/termux-apps-vulnerability-disclosures.html). Also reminding [again](https://www.reddit.com/r/termux/comments/pkujfa/important_deprecation_notice_for_google_play) to users who have installed termux apps from google playstore that playstore builds are [deprecated](#google-play-store-deprecated) and no longer supported. It is recommended that you shift to F-Droid or GitHub releases.**
 
-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).
+Termux can be obtained through various sources listed below for **only** Android `>= 7` with full support for apps and packages.
+
+Support for both app and packages 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`, however it was re-added just for the app *without any support for package updates* on [2022-05-24](https://github.com/termux/termux-app/pull/2740) via the [GitHub](#github) sources. Check [here](https://github.com/termux/termux-app/wiki/Termux-on-android-5-or-6) for the details.
 
 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.
 
@@ -75,7 +77,7 @@ Only a universal APK is released, which will work on all supported architectures
 
 ### GitHub
 
-Termux application can be obtained on `GitHub` either from [`GitHub Releases`](https://github.com/termux/termux-app/releases) for version `>= 0.118.0` or from [`GitHub Build Action`](https://github.com/termux/termux-app/actions/workflows/debug_build.yml?query=branch%3Amaster+event%3Apush) workflows.
+Termux application can be obtained on `GitHub` either from [`GitHub Releases`](https://github.com/termux/termux-app/releases) for version `>= 0.118.0` or from [`GitHub Build Action`](https://github.com/termux/termux-app/actions/workflows/debug_build.yml?query=branch%3Amaster+event%3Apush) workflows. **For android `>= 7`, only install `apt-android-7` variants. For android `5` and `6`, only install `apt-android-5` variants.**
 
 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.
 
@@ -90,6 +92,7 @@ Both universal and architecture specific APKs are released. The APK and bootstra
 The [test key](https://github.com/termux/termux-app/blob/master/app/testkey_untrusted.jks) shall not be used to impersonate @termux and can't be used for this anyway. This key is not trusted by us and it is quite easy to detect its use in user generated content.
 
 Keystore information:
+
 ```
 Alias name: alias
 Creation date: Oct 4, 2019

From 6727bbecc4ddc92933fbc7426cf153d11c09a12f Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 19 Oct 2023 08:04:45 +0500
Subject: [PATCH 840/912] Changed: Put GitHub debug keystore information in
 README in dropdown

---
 README.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 2f489c3d57..b2a903e447 100644
--- a/README.md
+++ b/README.md
@@ -91,7 +91,8 @@ Both universal and architecture specific APKs are released. The APK and bootstra
 
 The [test key](https://github.com/termux/termux-app/blob/master/app/testkey_untrusted.jks) shall not be used to impersonate @termux and can't be used for this anyway. This key is not trusted by us and it is quite easy to detect its use in user generated content.
 
-Keystore information:
+<details>
+<summary>Keystore information</summary>
 
 ```
 Alias name: alias
@@ -111,6 +112,8 @@ Subject Public Key Algorithm: 2048-bit RSA key
 Version: 3
 ```
 
+</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.**

From c84d4804c82c8325d1037fc20a5a847026fa11ca Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 1 Nov 2023 17:30:43 +0500
Subject: [PATCH 841/912] Changed!: Update commit messages guidelines in README
 to be more clear and remove `Docs` as a valid type

The `Docs` refer to "something" that is changed, and not the type of change being made. If docs are to be changed in future, it should be added as a scope instead, like `Added(docs): Add some docs` or `Fixed(docs): Fix some docs`.
---
 README.md | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index b2a903e447..377ef8a457 100644
--- a/README.md
+++ b/README.md
@@ -264,7 +264,21 @@ The main Termux constants are defined by [`TermuxConstants`](https://github.com/
 
 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 **must** use [Conventional Commits](https://www.conventionalcommits.org) specs so that chagelogs can automatically be generated by the [`create-conventional-changelog`](https://github.com/termux/create-conventional-changelog) script, check its repo for further details on the spec. Use the following `types` as `Added: Add foo`, `Added|Fixed: Add foo and fix bar`, `Changed!: Change baz as a breaking change`, etc. You can optionally add a scope as well, like `Fixed(terminal): Some bug`. The space after `:` is necessary.
+The `versionName` in `build.gradle` files of Termux and its plugin apps must follow the [semantic version `2.0.0` spec](https://semver.org/spec/v2.0.0.html) in the format `major.minor.patch(-prerelease)(+buildmetadata)`. When bumping `versionName` in `build.gradle` files and when creating a tag for new releases on GitHub, make sure to include the patch number as well, like `v0.1.0` instead of just `v0.1`. The `build.gradle` files and `attach_debug_apks_to_release` workflow validates the version as well and the build/attachment will fail if `versionName` does not follow the spec.
+
+### Commit Messages Guidelines
+
+Commit messages **must** use the [Conventional Commits](https://www.conventionalcommits.org) spec so that chagelogs as per the [Keep a Changelog](https://github.com/olivierlacan/keep-a-changelog) spec can automatically be generated by the [`create-conventional-changelog`](https://github.com/termux/create-conventional-changelog) script, check its repo for further details on the spec. **The first letter for `type` and `description` must be capital and description should be in the present tense.** The space after the colon `:` is necessary. For a breaking change, add an exclamation mark `!` before the colon `:`, so that it is highlighted in the chagelog automatically.
+
+```
+<type>[optional scope]: <description>
+
+[optional body]
+
+[optional footer(s)]
+```
+
+**Only the `types` listed below must be used exactly as they are used in the changelog headings.** For example, `Added: Add foo`, `Added|Fixed: Add foo and fix bar`, `Changed!: Change baz as a breaking change`, etc. You can optionally add a scope as well, like `Fixed(terminal): Fix some bug`. **Do not use anything else as type, like `add` instead of `Added`, etc.**
 
 - **Added** for new features.
 - **Changed** for changes in existing functionality.
@@ -272,11 +286,6 @@ Commit messages **must** use [Conventional Commits](https://www.conventionalcomm
 - **Removed** for now removed features.
 - **Fixed** for any bug fixes.
 - **Security** in case of vulnerabilities.
-- **Docs** for updating documentation.
-
-Changelogs for releases are generated based on [Keep a Changelog](https://github.com/olivierlacan/keep-a-changelog) specs.
-
-The `versionName` in `build.gradle` files of Termux and its plugin apps must follow the [semantic version `2.0.0` spec](https://semver.org/spec/v2.0.0.html) in the format `major.minor.patch(-prerelease)(+buildmetadata)`. When bumping `versionName` in `build.gradle` files and when creating a tag for new releases on GitHub, make sure to include the patch number as well, like `v0.1.0` instead of just `v0.1`. The `build.gradle` files and `attach_debug_apks_to_release` workflow validates the version as well and the build/attachment will fail if `versionName` does not follow the spec.
 ##
 
 

From 3b5018b4c79a2c2d218eb6fd570b2f2bebb8415a Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 2 Nov 2023 09:20:21 +0500
Subject: [PATCH 842/912] Changed: Update `Twitter` to `X (Twitter)` in README

Co-authored-by: @BandhiyaHardik <bandhiya.hardik1905@gmail.com>
Co-authored-by: @agnostic-apollo  <agnosticapollo@gmail.com>

Related pull #3681
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 377ef8a457..d844a67714 100644
--- a/README.md
+++ b/README.md
@@ -177,7 +177,7 @@ The main ones are the following.
 - [Termux Reddit community](https://reddit.com/r/termux)
 - [Termux User Matrix Channel](https://matrix.to/#/#termux_termux:gitter.im) ([Gitter](https://gitter.im/termux/termux))
 - [Termux Dev Matrix Channel](https://matrix.to/#/#termux_dev:gitter.im) ([Gitter](https://gitter.im/termux/dev))
-- [Termux Twitter](https://twitter.com/termuxdevs)
+- [Termux X (Twitter)](https://twitter.com/termuxdevs)
 - [Termux Support Email](mailto:support@termux.dev)
 
 ### Wikis

From e4385832b74e0272d6cd9c34c2c14f9be0031381 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Jan 2024 15:19:09 +0000
Subject: [PATCH 843/912] Changed: Bump actions/download-artifact from 3 to 4
 (#3736)

l
---
 .github/workflows/attach_debug_apks_to_release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/attach_debug_apks_to_release.yml b/.github/workflows/attach_debug_apks_to_release.yml
index 04b4caecb5..0bd0f9cfcb 100644
--- a/.github/workflows/attach_debug_apks_to_release.yml
+++ b/.github/workflows/attach_debug_apks_to_release.yml
@@ -61,7 +61,7 @@ jobs:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
       - name: Download artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
       - name: Upload APKs to release
         uses: termux/upload-release-action@v4.1.0
         with:

From 8e3a8980a849046adbd4156741e1d84047ee1df6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Jan 2024 15:19:33 +0000
Subject: [PATCH 844/912] Changed: Bump actions/upload-artifact from 3 to 4
 (#3735)

---
 .github/workflows/attach_debug_apks_to_release.yml |  2 +-
 .github/workflows/debug_build.yml                  | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/attach_debug_apks_to_release.yml b/.github/workflows/attach_debug_apks_to_release.yml
index 0bd0f9cfcb..460d66a778 100644
--- a/.github/workflows/attach_debug_apks_to_release.yml
+++ b/.github/workflows/attach_debug_apks_to_release.yml
@@ -50,7 +50,7 @@ jobs:
             fi
           done
       - name: Upload APKs to GitHub artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.package_variant }}
           path: ./app/build/outputs/apk/debug/*.apk
diff --git a/.github/workflows/debug_build.yml b/.github/workflows/debug_build.yml
index f4cde739e6..cba26ab868 100644
--- a/.github/workflows/debug_build.yml
+++ b/.github/workflows/debug_build.yml
@@ -78,7 +78,7 @@ jobs:
           fi
 
       - name: Attach universal APK file
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.APK_BASENAME_PREFIX }}_universal
           path: |
@@ -86,7 +86,7 @@ jobs:
             ${{ env.APK_DIR_PATH }}/output-metadata.json
 
       - name: Attach arm64-v8a APK file
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.APK_BASENAME_PREFIX }}_arm64-v8a
           path: |
@@ -94,7 +94,7 @@ jobs:
             ${{ env.APK_DIR_PATH }}/output-metadata.json
 
       - name: Attach armeabi-v7a APK file
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.APK_BASENAME_PREFIX }}_armeabi-v7a
           path: |
@@ -102,7 +102,7 @@ jobs:
             ${{ env.APK_DIR_PATH }}/output-metadata.json
 
       - name: Attach x86_64 APK file
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.APK_BASENAME_PREFIX }}_x86_64
           path: |
@@ -110,7 +110,7 @@ jobs:
             ${{ env.APK_DIR_PATH }}/output-metadata.json
 
       - name: Attach x86 APK file
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.APK_BASENAME_PREFIX }}_x86
           path: |
@@ -118,7 +118,7 @@ jobs:
             ${{ env.APK_DIR_PATH }}/output-metadata.json
 
       - name: Attach sha256sums file
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.APK_BASENAME_PREFIX }}_sha256sums
           path: |

From 882da34fcddf56a82966b1dc3dbc0a3501a03b7b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 30 Jan 2024 19:04:56 +0000
Subject: [PATCH 845/912] Changed: Bump gradle/wrapper-validation-action from 1
 to 2

Bumps [gradle/wrapper-validation-action](https://github.com/gradle/wrapper-validation-action) from 1 to 2.
- [Release notes](https://github.com/gradle/wrapper-validation-action/releases)
- [Commits](https://github.com/gradle/wrapper-validation-action/compare/v1...v2)

---
updated-dependencies:
- dependency-name: gradle/wrapper-validation-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/gradle-wrapper-validation.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
index 8169612c00..c6adc8bdc6 100644
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -16,4 +16,4 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: gradle/wrapper-validation-action@v1
+      - uses: gradle/wrapper-validation-action@v2

From 7b19cd2f5a9da23ea56262fb342c1b0240ac8c88 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Apr 2024 20:02:23 +0000
Subject: [PATCH 846/912] Changed: Bump termux/upload-release-action from 4.1.0
 to 4.2.0

Bumps [termux/upload-release-action](https://github.com/termux/upload-release-action) from 4.1.0 to 4.2.0.
- [Release notes](https://github.com/termux/upload-release-action/releases)
- [Changelog](https://github.com/termux/upload-release-action/blob/master/CHANGELOG.md)
- [Commits](https://github.com/termux/upload-release-action/compare/v4.1.0...v4.2.0)

---
updated-dependencies:
- dependency-name: termux/upload-release-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/attach_debug_apks_to_release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/attach_debug_apks_to_release.yml b/.github/workflows/attach_debug_apks_to_release.yml
index 460d66a778..8c1ff0e015 100644
--- a/.github/workflows/attach_debug_apks_to_release.yml
+++ b/.github/workflows/attach_debug_apks_to_release.yml
@@ -63,7 +63,7 @@ jobs:
       - name: Download artifact
         uses: actions/download-artifact@v4
       - name: Upload APKs to release
-        uses: termux/upload-release-action@v4.1.0
+        uses: termux/upload-release-action@v4.2.0
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: "**/*.apk"

From 67f489158062e7e8b69c234e896ec24a3287f9cb Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 21 Mar 2024 21:26:12 +0500
Subject: [PATCH 847/912] Fixed: Limit max combining characters in TerminalRow
 to 15 characters to prevent buffer overflows

The exception below causing app crash happens because of malicious input where combining characters keep getting added to same column of the row and this increases the size of `mSpaceUsed` and `mText`, eventually causing a buffer overflow of `mSpaceUsed`, which is limited to max `32767` value as per java `short` limit, but the limit itself isn't the issue, but an endless number of combining characters being added. Check `MAX_COMBINING_CHARACTERS_PER_COLUMN` field javadocs for why the limit `15` was chosen.

```
curl -o matroska.js https://kimapr.net/lappy/matroska.js
cat matroska.js
```

The `charCount` below refers to value of `Character.charCount(codePoint)`, like before `oldCharactersUsedForColumn` is appended to `newCharactersUsedForColumn`.

```
TerminalRow: codePoint=112, mColumns=98, mText=637, columnToSet=18, mSpaceUsed=590, javaCharDifference=0, oldStartOfColumnIndex=510, oldCharactersUsedForColumn=1, newCharactersUsedForColumn=1, oldNextColumnIndex=511, newNextColumnIndex=511, charCount=1, oldCodePointDisplayWidth=1, newCodePointDisplayWidth=1
TerminalRow: codePoint=40, mColumns=98, mText=637, columnToSet=19, mSpaceUsed=590, javaCharDifference=0, oldStartOfColumnIndex=511, oldCharactersUsedForColumn=1, newCharactersUsedForColumn=1, oldNextColumnIndex=512, newNextColumnIndex=512, charCount=1, oldCodePointDisplayWidth=1, newCodePointDisplayWidth=1
TerminalRow: codePoint=40, mColumns=98, mText=637, columnToSet=20, mSpaceUsed=590, javaCharDifference=0, oldStartOfColumnIndex=512, oldCharactersUsedForColumn=1, newCharactersUsedForColumn=1, oldNextColumnIndex=513, newNextColumnIndex=513, charCount=1, oldCodePointDisplayWidth=1, newCodePointDisplayWidth=1
TerminalRow: codePoint=101, mColumns=98, mText=637, columnToSet=21, mSpaceUsed=590, javaCharDifference=0, oldStartOfColumnIndex=513, oldCharactersUsedForColumn=1, newCharactersUsedForColumn=1, oldNextColumnIndex=514, newNextColumnIndex=514, charCount=1, oldCodePointDisplayWidth=1, newCodePointDisplayWidth=1
TerminalRow: codePoint=917772, mColumns=98, mText=147, columnToSet=18, mSpaceUsed=98, javaCharDifference=2, oldStartOfColumnIndex=18, oldCharactersUsedForColumn=1, newCharactersUsedForColumn=3, oldNextColumnIndex=19, newNextColumnIndex=21, charCount=2, oldCodePointDisplayWidth=1, newCodePointDisplayWidth=0
I TerminalRow: codePoint=65024, mColumns=98, mText=147, columnToSet=18, mSpaceUsed=100, javaCharDifference=1, oldStartOfColumnIndex=18, oldCharactersUsedForColumn=3, newCharactersUsedForColumn=4, oldNextColumnIndex=21, newNextColumnIndex=22, charCount=1, oldCodePointDisplayWidth=1, newCodePointDisplayWidth=0
TerminalRow: codePoint=917772, mColumns=98, mText=147, columnToSet=18, mSpaceUsed=101, javaCharDifference=2, oldStartOfColumnIndex=18, oldCharactersUsedForColumn=4, newCharactersUsedForColumn=6, oldNextColumnIndex=22, newNextColumnIndex=24, charCount=2, oldCodePointDisplayWidth=1, newCodePointDisplayWidth=0
...
TerminalRow: codePoint=917959, mColumns=98, mText=32781, columnToSet=18, mSpaceUsed=32763, javaCharDifference=2, oldStartOfColumnIndex=18, oldCharactersUsedForColumn=32666, newCharactersUsedForColumn=32668, oldNextColumnIndex=32684, newNextColumnIndex=32686, charCount=2, oldCodePointDisplayWidth=1, newCodePointDisplayWidth=0
TerminalRow: codePoint=917939, mColumns=98, mText=32781, columnToSet=18, mSpaceUsed=32765, javaCharDifference=2, oldStartOfColumnIndex=18, oldCharactersUsedForColumn=32668, newCharactersUsedForColumn=32670, oldNextColumnIndex=32686, newNextColumnIndex=32688, charCount=2, oldCodePointDisplayWidth=1, newCodePointDisplayWidth=0
TerminalRow: codePoint=917961, mColumns=98, mText=32781, columnToSet=18, mSpaceUsed=32767, javaCharDifference=2, oldStartOfColumnIndex=18, oldCharactersUsedForColumn=32670, newCharactersUsedForColumn=32672, oldNextColumnIndex=32688, newNextColumnIndex=32690, charCount=2, oldCodePointDisplayWidth=1, newCodePointDisplayWidth=0
TerminalRow: codePoint=917804, mColumns=98, mText=32781, columnToSet=18, mSpaceUsed=-32767, javaCharDifference=2, oldStartOfColumnIndex=18, oldCharactersUsedForColumn=1, newCharactersUsedForColumn=3, oldNextColumnIndex=19, newNextColumnIndex=21, charCount=2, oldCodePointDisplayWidth=1, newCodePointDisplayWidth=0
```

```
java.lang.ArrayIndexOutOfBoundsException: src.length=32781 srcPos=19 dst.length=32781 dstPos=21 length=-32786
	at java.lang.System.arraycopy(System.java:469)
	at com.termux.terminal.TerminalRow.setChar(TerminalRow.java:196)
	at com.termux.terminal.TerminalBuffer.setChar(TerminalBuffer.java:455)
	at com.termux.terminal.TerminalEmulator.emitCodePoint(TerminalEmulator.java:2380)
	at com.termux.terminal.TerminalEmulator.processCodePoint(TerminalEmulator.java:624)
	at com.termux.terminal.TerminalEmulator.processByte(TerminalEmulator.java:520)
	at com.termux.terminal.TerminalEmulator.append(TerminalEmulator.java:487)
	at com.termux.terminal.TerminalSession$MainThreadHandler.handleMessage(TerminalSession.java:358)
	at android.os.Handler.dispatchMessage(Handler.java:106)
	at android.os.Looper.loop(Looper.java:223)
	at android.app.ActivityThread.main(ActivityThread.java:7664)
	at java.lang.reflect.Method.invoke(Native Method)
	at com.android.internal.os.RuntimeInit$MethodAndArgsCaller.run(RuntimeInit.java:592)
	at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:947)
```

See also following links for history of related changes to `TerminalRow` for combining characters. Note that jackpal terminal does not crash for above, which termux-app is based on, but changes were done by fornwall in initial commit of termux-app to change the behaviour, hence the crash, but he added the `FIXME: Put a limit of combining characters` comment as a note to solve the current issue in future, which is now.

- https://github.com/jackpal/Android-Terminal-Emulator/commit/9a47042620bec87617f0b4f5d50568535668fe26
- https://github.com/jackpal/Android-Terminal-Emulator/pull/338
- https://github.com/termux/termux-app/commit/a18ee58f7a4f56cab6ba4a8cacaa70c4c76379b3#diff-f84d215b18106c037e01986a3968fa54b74691174a78fcc99493f745d3805be5

Closes #3839
---
 .../java/com/termux/terminal/TerminalRow.java | 41 +++++++++++++++++--
 .../java/com/termux/terminal/WcWidth.java     | 25 +++++++++++
 2 files changed, 62 insertions(+), 4 deletions(-)

diff --git a/terminal-emulator/src/main/java/com/termux/terminal/TerminalRow.java b/terminal-emulator/src/main/java/com/termux/terminal/TerminalRow.java
index cbeaf52243..d68dc32623 100644
--- a/terminal-emulator/src/main/java/com/termux/terminal/TerminalRow.java
+++ b/terminal-emulator/src/main/java/com/termux/terminal/TerminalRow.java
@@ -11,11 +11,37 @@ public final class TerminalRow {
 
     private static final float SPARE_CAPACITY_FACTOR = 1.5f;
 
+    /**
+     * Max combining characters that can exist in a column, that are separate from the base character
+     * itself. Any additional combining characters will be ignored and not added to the column.
+     *
+     * There does not seem to be limit in unicode standard for max number of combination characters
+     * that can be combined but such characters are primarily under 10.
+     *
+     * "Section 3.6 Combination" of unicode standard contains combining characters info.
+     * - https://www.unicode.org/versions/Unicode15.0.0/ch03.pdf
+     * - https://en.wikipedia.org/wiki/Combining_character#Unicode_ranges
+     * - https://stackoverflow.com/questions/71237212/what-is-the-maximum-number-of-unicode-combined-characters-that-may-be-needed-to
+     *
+     * UAX15-D3 Stream-Safe Text Format limits to max 30 combining characters.
+     * > The value of 30 is chosen to be significantly beyond what is required for any linguistic or technical usage.
+     * > While it would have been feasible to chose a smaller number, this value provides a very wide margin,
+     * > yet is well within the buffer size limits of practical implementations.
+     * - https://unicode.org/reports/tr15/#Stream_Safe_Text_Format
+     * - https://stackoverflow.com/a/11983435/14686958
+     *
+     * We choose the value 15 because it should be enough for terminal based applications and keep
+     * the memory usage low for a terminal row, won't affect performance or cause terminal to
+     * lag or hang, and will keep malicious applications from causing harm. The value can be
+     * increased if ever needed for legitimate applications.
+     */
+    private static final int MAX_COMBINING_CHARACTERS_PER_COLUMN = 15;
+
     /** The number of columns in this terminal row. */
     private final int mColumns;
     /** The text filling this terminal row. */
     public char[] mText;
-    /** The number of java char:s used in {@link #mText}. */
+    /** The number of java chars used in {@link #mText}. */
     private short mSpaceUsed;
     /** If this row has been line wrapped due to text output at the end of line. */
     boolean mLineWrap;
@@ -163,18 +189,25 @@ public void setChar(int columnToSet, int codePoint, long style) {
         // Get the number of elements in the mText array this column uses now
         int oldCharactersUsedForColumn;
         if (columnToSet + oldCodePointDisplayWidth < mColumns) {
-            oldCharactersUsedForColumn = findStartOfColumn(columnToSet + oldCodePointDisplayWidth) - oldStartOfColumnIndex;
+            int oldEndOfColumnIndex = findStartOfColumn(columnToSet + oldCodePointDisplayWidth);
+            oldCharactersUsedForColumn = oldEndOfColumnIndex - oldStartOfColumnIndex;
         } else {
             // Last character.
             oldCharactersUsedForColumn = mSpaceUsed - oldStartOfColumnIndex;
         }
 
+        // If MAX_COMBINING_CHARACTERS_PER_COLUMN already exist in column, then ignore adding additional combining characters.
+        if (newIsCombining) {
+            int combiningCharsCount = WcWidth.zeroWidthCharsCount(mText, oldStartOfColumnIndex, oldStartOfColumnIndex + oldCharactersUsedForColumn);
+            if (combiningCharsCount >= MAX_COMBINING_CHARACTERS_PER_COLUMN)
+                return;
+        }
+
         // Find how many chars this column will need
         int newCharactersUsedForColumn = Character.charCount(codePoint);
         if (newIsCombining) {
             // Combining characters are added to the contents of the column instead of overwriting them, so that they
             // modify the existing contents.
-            // FIXME: Put a limit of combining characters.
             // FIXME: Unassigned characters also get width=0.
             newCharactersUsedForColumn += oldCharactersUsedForColumn;
         }
@@ -189,7 +222,7 @@ public void setChar(int columnToSet, int codePoint, long style) {
             if (mSpaceUsed + javaCharDifference > text.length) {
                 // We need to grow the array
                 char[] newText = new char[text.length + mColumns];
-                System.arraycopy(text, 0, newText, 0, oldStartOfColumnIndex + oldCharactersUsedForColumn);
+                System.arraycopy(text, 0, newText, 0, oldNextColumnIndex);
                 System.arraycopy(text, oldNextColumnIndex, newText, newNextColumnIndex, oldCharactersAfterColumn);
                 mText = text = newText;
             } else {
diff --git a/terminal-emulator/src/main/java/com/termux/terminal/WcWidth.java b/terminal-emulator/src/main/java/com/termux/terminal/WcWidth.java
index 5981c4a882..d71cc277b4 100644
--- a/terminal-emulator/src/main/java/com/termux/terminal/WcWidth.java
+++ b/terminal-emulator/src/main/java/com/termux/terminal/WcWidth.java
@@ -538,4 +538,29 @@ public static int width(char[] chars, int index) {
         return Character.isHighSurrogate(c) ? width(Character.toCodePoint(c, chars[index + 1])) : width(c);
     }
 
+    /**
+     * The zero width characters count like combining characters in the `chars` array from start
+     * index to end index (exclusive).
+     */
+    public static int zeroWidthCharsCount(char[] chars, int start, int end) {
+        if (start < 0 || start >= chars.length)
+            return 0;
+
+        int count = 0;
+        for (int i = start; i < end && i < chars.length;) {
+            if (Character.isHighSurrogate(chars[i])) {
+                if (width(Character.toCodePoint(chars[i], chars[i + 1])) <= 0) {
+                    count++;
+                }
+                i += 2;
+            } else {
+                if (width(chars[i]) <= 0) {
+                    count++;
+                }
+                i++;
+            }
+        }
+        return count;
+    }
+
 }

From 755b752a95a0d1c15662713b38a7476b746a1e95 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Tue, 16 Apr 2024 12:29:39 +0500
Subject: [PATCH 848/912] Reverted: Revert "ci: use
 termux/upload-release-actions to attach debug builds to new releases"

This reverts commit 2ac7fd1e565872d10b91157022485c13ab179524.

Do not use `upload-release-action` for uploading artifacts and generating checksum and instead keep using standard `sha256sum` and internal github tools. `upload-release-action` also generates checksum in the wrong format, check https://github.com/termux/termux-app/pull/3241#discussion_r1106019790.
---
 .../attach_debug_apks_to_release.yml          | 69 +++++++++++--------
 1 file changed, 40 insertions(+), 29 deletions(-)

diff --git a/.github/workflows/attach_debug_apks_to_release.yml b/.github/workflows/attach_debug_apks_to_release.yml
index 8c1ff0e015..a17b326443 100644
--- a/.github/workflows/attach_debug_apks_to_release.yml
+++ b/.github/workflows/attach_debug_apks_to_release.yml
@@ -6,7 +6,7 @@ on:
       - published
 
 jobs:
-  build:
+  attach-apks:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -21,15 +21,23 @@ jobs:
         with:
           ref: ${{ env.GITHUB_REF }}
 
-      - name: Build
+      - name: Build and attach APKs to release
         shell: bash {0}
         env:
           PACKAGE_VARIANT: ${{ matrix.package_variant }}
         run: |
+          exit_on_error() {
+              echo "$1"
+              echo "Deleting '$RELEASE_VERSION_NAME' release and '$GITHUB_REF' tag"
+              hub release delete "$RELEASE_VERSION_NAME"
+              git push --delete origin "$GITHUB_REF"
+              exit 1
+          }
+
+          echo "Setting vars"
           RELEASE_VERSION_NAME="${GITHUB_REF/refs\/tags\//}"
           if ! printf "%s" "${RELEASE_VERSION_NAME/v/}" | grep -qP '^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$'; then
-            echo "The versionName '${RELEASE_VERSION_NAME/v/}' is not a valid version as per semantic version '2.0.0' spec in the format 'major.minor.patch(-prerelease)(+buildmetadata)'. https://semver.org/spec/v2.0.0.html."
-            exit 1
+           exit_on_error "The versionName '${RELEASE_VERSION_NAME/v/}' is not a valid version as per semantic version '2.0.0' spec in the format 'major.minor.patch(-prerelease)(+buildmetadata)'. https://semver.org/spec/v2.0.0.html."
           fi
 
           APK_DIR_PATH="./app/build/outputs/apk/debug"
@@ -39,35 +47,38 @@ jobs:
           echo "Building APKs for 'APK_VERSION_TAG' release"
           export TERMUX_APK_VERSION_TAG="$APK_VERSION_TAG" # Used by app/build.gradle
           export TERMUX_PACKAGE_VARIANT="${{ env.PACKAGE_VARIANT }}" # Used by app/build.gradle
-          ./gradlew assembleDebug
+          if ! ./gradlew assembleDebug; then
+            exit_on_error "Build failed for '$APK_VERSION_TAG' release."
+          fi
 
           echo "Validating APKs"
           for abi in universal arm64-v8a armeabi-v7a x86_64 x86; do
             if ! test -f "$APK_DIR_PATH/${APK_BASENAME_PREFIX}_$abi.apk"; then
               files_found="$(ls "$APK_DIR_PATH")"
-              echo "Failed to find built APK at '$APK_DIR_PATH/${APK_BASENAME_PREFIX}_$abi.apk'. Files found: "$'\n'"$files_found"
-              exit 1
+              exit_on_error "Failed to find built APK at '$APK_DIR_PATH/${APK_BASENAME_PREFIX}_$abi.apk'. Files found: "$'\n'"$files_found"
             fi
           done
-      - name: Upload APKs to GitHub artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ matrix.package_variant }}
-          path: ./app/build/outputs/apk/debug/*.apk
-  upload:
-    runs-on: ubuntu-latest
-    needs: build
-    env:
-      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    steps:
-      - name: Download artifact
-        uses: actions/download-artifact@v4
-      - name: Upload APKs to release
-        uses: termux/upload-release-action@v4.2.0
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: "**/*.apk"
-          file_glob: true
-          release_name: 
-          tag: ${{ github.event.release.tag_name }}
-          checksums: sha256,sha512,md5
+
+          echo "Generating sha25sums file"
+          if ! (cd "$APK_DIR_PATH"; sha256sum \
+            "${APK_BASENAME_PREFIX}_universal.apk" \
+            "${APK_BASENAME_PREFIX}_arm64-v8a.apk" \
+            "${APK_BASENAME_PREFIX}_armeabi-v7a.apk" \
+            "${APK_BASENAME_PREFIX}_x86_64.apk" \
+            "${APK_BASENAME_PREFIX}_x86.apk" \
+            > "${APK_BASENAME_PREFIX}_sha256sums"); then
+            exit_on_error "Generate sha25sums failed for '$APK_VERSION_TAG' release."
+          fi
+
+          echo "Attaching APKs to github release"
+          if ! hub release edit \
+          -m "" \
+          -a "$APK_DIR_PATH/${APK_BASENAME_PREFIX}_universal.apk" \
+          -a "$APK_DIR_PATH/${APK_BASENAME_PREFIX}_arm64-v8a.apk" \
+          -a "$APK_DIR_PATH/${APK_BASENAME_PREFIX}_armeabi-v7a.apk" \
+          -a "$APK_DIR_PATH/${APK_BASENAME_PREFIX}_x86_64.apk" \
+          -a "$APK_DIR_PATH/${APK_BASENAME_PREFIX}_x86.apk" \
+          -a "$APK_DIR_PATH/${APK_BASENAME_PREFIX}_sha256sums" \
+          "$RELEASE_VERSION_NAME"; then
+            exit_on_error "Attach APKs to release failed for '$APK_VERSION_TAG' release."
+          fi

From 2f40df91e54662190befe3b981595209944348e8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Apr 2024 19:28:18 +0000
Subject: [PATCH 849/912] Changed: Bump gradle/wrapper-validation-action from 2
 to 3

Bumps [gradle/wrapper-validation-action](https://github.com/gradle/wrapper-validation-action) from 2 to 3.
- [Release notes](https://github.com/gradle/wrapper-validation-action/releases)
- [Commits](https://github.com/gradle/wrapper-validation-action/compare/v2...v3)

---
updated-dependencies:
- dependency-name: gradle/wrapper-validation-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/gradle-wrapper-validation.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
index c6adc8bdc6..b9306a157b 100644
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -16,4 +16,4 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: gradle/wrapper-validation-action@v2
+      - uses: gradle/wrapper-validation-action@v3

From 062c9771a9ca2efa23e8de109f880c10b93d3fe3 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 5 Jun 2024 19:13:57 +0500
Subject: [PATCH 850/912] Added: Request `SET_ALARM` permission to allow
 broadcasting an intent to set an alarm or timer in an alarm clock app

- https://developer.android.com/reference/android/Manifest.permission#SET_ALARM
- https://developer.android.com/reference/android/provider/AlarmClock

Closes #3990
---
 app/src/main/AndroidManifest.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4e95702bc3..7c566c8f0d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -36,6 +36,7 @@
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.PACKAGE_USAGE_STATS" tools:ignore="ProtectedPermissions" />
+    <uses-permission android:name="com.android.alarm.permission.SET_ALARM" />
 
     <application
         android:name=".app.TermuxApplication"

From d90be9cd508b26636d705cda95cbebaace3d9706 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Thu, 13 Jun 2024 13:41:40 +0200
Subject: [PATCH 851/912] Changed: Update information regarding Google Play in
 README

---
 README.md | 42 +++++-------------------------------------
 1 file changed, 5 insertions(+), 37 deletions(-)

diff --git a/README.md b/README.md
index d844a67714..1ff13608bf 100644
--- a/README.md
+++ b/README.md
@@ -51,7 +51,7 @@ The core [Termux](https://github.com/termux/termux-app) app comes with the follo
 
 Latest version is `v0.118.0`.
 
-**NOTICE: It is highly recommended that you update to `v0.118.0` or higher ASAP for various bug fixes, including a critical world-readable vulnerability reported [here](https://termux.github.io/general/2022/02/15/termux-apps-vulnerability-disclosures.html). Also reminding [again](https://www.reddit.com/r/termux/comments/pkujfa/important_deprecation_notice_for_google_play) to users who have installed termux apps from google playstore that playstore builds are [deprecated](#google-play-store-deprecated) and no longer supported. It is recommended that you shift to F-Droid or GitHub releases.**
+**NOTICE: It is highly recommended that you update to `v0.118.0` or higher ASAP for various bug fixes, including a critical world-readable vulnerability reported [here](https://termux.github.io/general/2022/02/15/termux-apps-vulnerability-disclosures.html). See [below](#google-play-store-experimental-branch) for information regarding Termux on Google Play.**
 
 Termux can be obtained through various sources listed below for **only** Android `>= 7` with full support for apps and packages.
 
@@ -114,45 +114,13 @@ Version: 3
 
 </details>
 
-### Google Play Store **(Deprecated)**
+### Google Play Store **(Experimental branch)**
 
-**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.**
-
-**Termux developers do not have access to Play Store Console account where Termux is published and therefore can't remove the app.** You are encouraged to move to `F-Droid` or `GitHub` builds as soon as possible and suggest doing so for other users via social media.
-
-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.
-
-Note that by upgrading old packages to latest versions, like that of `python` may break your setups/scripts since they may not be compatible anymore. Moreover, you will not be able to downgrade the package versions since termux repos only keep the latest version and you will have to manually rebuild the old versions of the packages if required as per [Building packages](https://github.com/termux/termux-packages/wiki/Building-packages).
-
-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. The `termux-tools` [version `>= 0.135`](https://github.com/termux/termux-packages/pull/7493) will also show a banner at the top of the terminal saying `You are likely using a very old version of Termux, probably installed from the Google Play Store.`, you can remove it by running `rm -f /data/data/com.termux/files/usr/etc/motd-playstore` and restarting the app.
-
-#### Why Disable?
-
-<details>
-<summary></summary>
-
-- Play store apps have multiple critical vulnerabilities as reported at https://termux.github.io/general/2022/02/15/termux-apps-vulnerability-disclosures.html and since they cannot be updated with fixes, any users using older versions would be vulnerable.
-
-- 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 shutdown](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>
-
-##
+There is currently a build of Termux available on Google Play for Android 11+ devices, with extensive adjustments in order to pass policy requirements there. This is under development and has missing functionality and bugs (see [here](https://github.com/termux-play-store/) for status updates) compared to the stable F-Droid build, which is why most users who can should still use F-Droid or GitHub build as mentioned above.
 
+Currently, Google Play will try to update installations away from F-Droid ones. Updating will still fail as [sharedUserId](https://developer.android.com/guide/topics/manifest/manifest-element#uid) has been removed. A planned 0.118.1 F-Droid release will fix this by setting a higher version code than used for the PlayStore app. Meanwhile, to prevent Google Play from attempting to download and then fail to install the Google Play releases over existing installations, you can open the Termux apps pages on Google Play and then click on the 3 dots options button in the top right and then disable the Enable auto update toggle. However, the Termux apps updates will still show in the PlayStore app updates list.
 
+If you want to help out with testing the Google Play build (or cannot install Termux from other sources), be aware that it's built from a separate repository (https://github.com/termux-play-store/) - be sure to report issues [there](https://github.com/termux-play-store/termux-issues/issues/new/choose), as any issues encountered might very well be specific to that repository.
 
 ## Uninstallation
 

From 57e4ef456b9ad154eccc4b049e21513f1ac5ec06 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Tue, 18 Jun 2024 02:08:34 +0500
Subject: [PATCH 852/912] Added: Add support for GitHub action builds for
 `github-releases/**` branches

---
 .github/workflows/debug_build.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/debug_build.yml b/.github/workflows/debug_build.yml
index cba26ab868..a1df15ae15 100644
--- a/.github/workflows/debug_build.yml
+++ b/.github/workflows/debug_build.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - master
+      - 'github-releases/**'
   pull_request:
     branches:
       - master

From a5de3d3a2bdaeff8c37c8df61059ae759a28a406 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Tue, 13 Aug 2024 14:27:23 +0200
Subject: [PATCH 853/912] Fixed: Use current bg color when scrolling with
 horizontal margins

Fixes https://github.com/termux/termux-packages/issues/12556

Issue was also reported here:
https://www.reddit.com/r/termux/comments/1df1dii/how_can_i_fix_this_annoying_screenfilling_thing/
---
 .../com/termux/terminal/TerminalEmulator.java |  5 ++--
 .../com/termux/terminal/ScrollRegionTest.java | 27 +++++++++++++++++++
 .../com/termux/terminal/TerminalTestCase.java |  5 ++++
 3 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java b/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
index aeef393c62..6cf06b6c19 100644
--- a/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
+++ b/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
@@ -2092,13 +2092,14 @@ private void setCursorPosition(int x, int y) {
 
     private void scrollDownOneLine() {
         mScrollCounter++;
+        long currentStyle = getStyle();
         if (mLeftMargin != 0 || mRightMargin != mColumns) {
             // Horizontal margin: Do not put anything into scroll history, just non-margin part of screen up.
             mScreen.blockCopy(mLeftMargin, mTopMargin + 1, mRightMargin - mLeftMargin, mBottomMargin - mTopMargin - 1, mLeftMargin, mTopMargin);
             // .. and blank bottom row between margins:
-            mScreen.blockSet(mLeftMargin, mBottomMargin - 1, mRightMargin - mLeftMargin, 1, ' ', mEffect);
+            mScreen.blockSet(mLeftMargin, mBottomMargin - 1, mRightMargin - mLeftMargin, 1, ' ', currentStyle);
         } else {
-            mScreen.scrollDownOneLine(mTopMargin, mBottomMargin, getStyle());
+            mScreen.scrollDownOneLine(mTopMargin, mBottomMargin, currentStyle);
         }
     }
 
diff --git a/terminal-emulator/src/test/java/com/termux/terminal/ScrollRegionTest.java b/terminal-emulator/src/test/java/com/termux/terminal/ScrollRegionTest.java
index cc01c0454b..5d2679c513 100644
--- a/terminal-emulator/src/test/java/com/termux/terminal/ScrollRegionTest.java
+++ b/terminal-emulator/src/test/java/com/termux/terminal/ScrollRegionTest.java
@@ -127,4 +127,31 @@ public void testScrollRegionDoesNotLimitCursorMovement() {
 				"   xxx"
 			);
 	}
+
+	/**
+	 * See <a href="https://github.com/termux/termux-packages/issues/12556">reported issue</a>.
+	 */
+	public void testClearingWhenScrollingWithMargins() {
+		int newForeground = 2;
+		int newBackground = 3;
+		int size = 3;
+		TerminalTestCase terminal = withTerminalSized(size, size)
+			// Enable horizontal margin and set left margin to 1:
+			.enterString("\033[?69h\033[2s")
+			// Set foreground and background color:
+			.enterString("\033[" + (30 + newForeground) + ";" + (40 + newBackground) + "m")
+			// Enter newlines to scroll down:
+			.enterString("\r\n\r\n\r\n\r\n\r\n");
+		for (int row = 0; row < size; row++) {
+			for (int col = 0; col < size; col++) {
+				// The first column (outside of the scrolling area, due to us setting a left scroll
+				// margin of 1) should be unmodified, the others should use the current style:
+				int expectedForeground = col == 0 ? TextStyle.COLOR_INDEX_FOREGROUND : newForeground;
+				int expectedBackground = col == 0 ? TextStyle.COLOR_INDEX_BACKGROUND : newBackground;
+				terminal.assertForegroundColorAt(row, col, expectedForeground);
+				terminal.assertBackgroundColorAt(row, col, expectedBackground);
+			}
+		}
+	}
+
 }
diff --git a/terminal-emulator/src/test/java/com/termux/terminal/TerminalTestCase.java b/terminal-emulator/src/test/java/com/termux/terminal/TerminalTestCase.java
index eb1da8c094..1d0b0271bb 100644
--- a/terminal-emulator/src/test/java/com/termux/terminal/TerminalTestCase.java
+++ b/terminal-emulator/src/test/java/com/termux/terminal/TerminalTestCase.java
@@ -301,6 +301,11 @@ public void assertForegroundColorAt(int externalRow, int column, int color) {
 		assertEquals(color, TextStyle.decodeForeColor(style));
 	}
 
+	public void assertBackgroundColorAt(int externalRow, int column, int color) {
+		long style = mTerminal.getScreen().mLines[mTerminal.getScreen().externalToInternalRow(externalRow)].getStyle(column);
+		assertEquals(color, TextStyle.decodeBackColor(style));
+	}
+
 	public TerminalTestCase assertColor(int colorIndex, int expected) {
 		int actual = mTerminal.mColors.mCurrentColors[colorIndex];
 		if (expected != actual) {

From f80b46487df539c7e9214550002f461e5c66131c Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Mon, 24 Jun 2024 09:11:31 +0200
Subject: [PATCH 854/912] Fixed: Improve handling of empty ';' SGR sequences

Currently the Termux terminal emulator prints "HI" in red with:

```sh
printf "\e[31;m HI \e[0m"
```

This is not how other terminals (tested on xterm, gnome-terminal,
alacritty and the mac built in terminal) handle it, since they parse
""\e[31;m" as "\e[31;0m", where the "0" resets the colors.

This change aligns with other terminals, as well as improves performance
by avoiding allocating a new int[] array for each byte processed by
`parseArg()`, and most importantly simplifies things by removing the
`mIsCSIStart` and `mLastCSIArg` state, preparing for supporting ':'
separated sub parameters such as used in
https://sw.kovidgoyal.net/kitty/underlines/
---
 .../com/termux/terminal/TerminalEmulator.java | 73 +++++++------------
 .../com/termux/terminal/TerminalTest.java     | 27 ++++++-
 2 files changed, 53 insertions(+), 47 deletions(-)

diff --git a/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java b/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
index 6cf06b6c19..cbbccbb4f2 100644
--- a/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
+++ b/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
@@ -126,11 +126,6 @@ public final class TerminalEmulator {
     private String mTitle;
     private final Stack<String> mTitleStack = new Stack<>();
 
-    /** If processing first character of first parameter of {@link #ESC_CSI}. */
-    private boolean mIsCSIStart;
-    /** The last character processed of a parameter of {@link #ESC_CSI}. */
-    private Integer mLastCSIArg;
-
     /** The cursor position. Between (0,0) and (mRows-1, mColumns-1). */
     private int mCursorRow, mCursorCol;
 
@@ -1393,8 +1388,6 @@ private void doEsc(int b) {
                 break;
             case '[':
                 continueSequence(ESC_CSI);
-                mIsCSIStart = true;
-                mLastCSIArg = null;
                 break;
             case '=': // DECKPAM
                 setDecsetinternalBit(DECSET_BIT_APPLICATION_KEYPAD, true);
@@ -1765,7 +1758,7 @@ private void doCsi(int b) {
     private void selectGraphicRendition() {
         if (mArgIndex >= mArgs.length) mArgIndex = mArgs.length - 1;
         for (int i = 0; i <= mArgIndex; i++) {
-            int code = mArgs[i];
+            int code = getArg(i, 0, false);
             if (code < 0) {
                 if (mArgIndex > 0) {
                     continue;
@@ -1823,7 +1816,10 @@ private void selectGraphicRendition() {
                     if (i + 4 > mArgIndex) {
                         Logger.logWarn(mClient, LOG_TAG, "Too few CSI" + code + ";2 RGB arguments");
                     } else {
-                        int red = mArgs[i + 2], green = mArgs[i + 3], blue = mArgs[i + 4];
+                        int red = getArg(i + 2, 0, false);
+                        int green = getArg(i + 3, 0, false);
+                        int blue = getArg(i + 4, 0, false);
+
                         if (red < 0 || green < 0 || blue < 0 || red > 255 || green > 255 || blue > 255) {
                             finishSequenceAndLogError("Invalid RGB: " + red + "," + green + "," + blue);
                         } else {
@@ -1837,7 +1833,7 @@ private void selectGraphicRendition() {
                         i += 4; // "2;P_r;P_g;P_r"
                     }
                 } else if (firstArg == 5) {
-                    int color = mArgs[i + 2];
+                    int color = getArg(i + 2, 0, false);
                     i += 2; // "5;P_s"
                     if (color >= 0 && color < TextStyle.NUM_INDEXED_COLORS) {
                         if (code == 38) {
@@ -2116,44 +2112,29 @@ private void scrollDownOneLine() {
      *
      * https://vt100.net/docs/vt510-rm/chapter4.html#S4.3.3
      * */
-    private void parseArg(int inputByte) {
-        int[] bytes = new int[]{inputByte};
-        // Only doing this for ESC_CSI and not for other ESC_CSI_* since they seem to be using their
-        // own defaults with getArg*() calls, but there may be missed cases
-        if (mEscapeState == ESC_CSI) {
-            if ((mIsCSIStart && inputByte == ';') || // If sequence starts with a ; character, like \033[;m
-                (!mIsCSIStart && mLastCSIArg != null && mLastCSIArg == ';'  && inputByte == ';')) {  // If sequence contains sequential ; characters, like \033[;;m
-                bytes = new int[]{'0', ';'}; // Assume 0 was passed
-            }
-        }
-
-        mIsCSIStart = false;
-
-        for (int b : bytes) {
-            if (b >= '0' && b <= '9') {
-                if (mArgIndex < mArgs.length) {
-                    int oldValue = mArgs[mArgIndex];
-                    int thisDigit = b - '0';
-                    int value;
-                    if (oldValue >= 0) {
-                        value = oldValue * 10 + thisDigit;
-                    } else {
-                        value = thisDigit;
-                    }
-                    if (value > 9999)
-                        value = 9999;
-                    mArgs[mArgIndex] = value;
-                }
-                continueSequence(mEscapeState);
-            } else if (b == ';') {
-                if (mArgIndex < mArgs.length) {
-                    mArgIndex++;
+    private void parseArg(int b) {
+        if (b >= '0' && b <= '9') {
+            if (mArgIndex < mArgs.length) {
+                int oldValue = mArgs[mArgIndex];
+                int thisDigit = b - '0';
+                int value;
+                if (oldValue >= 0) {
+                    value = oldValue * 10 + thisDigit;
+                } else {
+                    value = thisDigit;
                 }
-                continueSequence(mEscapeState);
-            } else {
-                unknownSequence(b);
+                if (value > 9999)
+                    value = 9999;
+                mArgs[mArgIndex] = value;
+            }
+            continueSequence(mEscapeState);
+        } else if (b == ';') {
+            if (mArgIndex < mArgs.length) {
+                mArgIndex++;
             }
-            mLastCSIArg = b;
+            continueSequence(mEscapeState);
+        } else {
+            unknownSequence(b);
         }
     }
 
diff --git a/terminal-emulator/src/test/java/com/termux/terminal/TerminalTest.java b/terminal-emulator/src/test/java/com/termux/terminal/TerminalTest.java
index 89ad9eca67..e3efa81d3f 100644
--- a/terminal-emulator/src/test/java/com/termux/terminal/TerminalTest.java
+++ b/terminal-emulator/src/test/java/com/termux/terminal/TerminalTest.java
@@ -163,6 +163,13 @@ public void testSelectGraphics() {
         assertEquals(TextStyle.COLOR_INDEX_FOREGROUND, mTerminal.mForeColor);
         enterString("\033[31;;m");
         assertEquals(TextStyle.COLOR_INDEX_FOREGROUND, mTerminal.mForeColor);
+        enterString("\033[31;m");
+        assertEquals(TextStyle.COLOR_INDEX_FOREGROUND, mTerminal.mForeColor);
+        enterString("\033[31;;41m");
+        assertEquals(TextStyle.COLOR_INDEX_FOREGROUND, mTerminal.mForeColor);
+        assertEquals(1, mTerminal.mBackColor);
+        enterString("\033[0m");
+        assertEquals(TextStyle.COLOR_INDEX_BACKGROUND, mTerminal.mBackColor);
 
 		// 256 colors:
 		enterString("\033[38;5;119m");
@@ -178,10 +185,18 @@ public void testSelectGraphics() {
 		assertEquals(129, mTerminal.mBackColor);
 
 		// Multiple parameters at once:
-		enterString("\033[38;5;178;48;5;179;m");
+		enterString("\033[38;5;178;48;5;179m");
 		assertEquals(178, mTerminal.mForeColor);
 		assertEquals(179, mTerminal.mBackColor);
 
+		// Omitted parameter means zero:
+		enterString("\033[38;5;m");
+		assertEquals(0, mTerminal.mForeColor);
+		assertEquals(179, mTerminal.mBackColor);
+		enterString("\033[48;5;m");
+		assertEquals(0, mTerminal.mForeColor);
+		assertEquals(0, mTerminal.mBackColor);
+
 		// 24 bit colors:
 		enterString(("\033[0m")); // Reset fg and bg colors.
 		enterString("\033[38;2;255;127;2m");
@@ -205,6 +220,16 @@ public void testSelectGraphics() {
 		enterString("\033[38;2;300;127;2;48;2;1;300;254m");
 		assertEquals(expectedForeground, mTerminal.mForeColor);
 		assertEquals(expectedBackground, mTerminal.mBackColor);
+
+		// 24 bit colors, omitted parameter means zero:
+		enterString("\033[38;2;255;127;m");
+		expectedForeground = 0xff000000 | (255 << 16) | (127 << 8);
+		assertEquals(expectedForeground, mTerminal.mForeColor);
+		assertEquals(expectedBackground, mTerminal.mBackColor);
+		enterString("\033[38;2;123;;77m");
+		expectedForeground = 0xff000000 | (123 << 16) | 77;
+		assertEquals(expectedForeground, mTerminal.mForeColor);
+		assertEquals(expectedBackground, mTerminal.mBackColor);
 	}
 
 	public void testBackgroundColorErase() {

From 661c37501f2f0d26a81c9d512e61d98ca05d987d Mon Sep 17 00:00:00 2001
From: Josh Triplett <josh@joshtriplett.org>
Date: Fri, 16 Aug 2024 01:21:41 -0700
Subject: [PATCH 855/912] Make Shift-PgUp and Shift-PgDn scroll by pages rather
 than lines

In other terminals, such as gnome-terminal, Shift-PgUp and Shift-PgDn
scroll the screen by a full page, rather than a single line. Adjust
termux to match.
---
 terminal-view/src/main/java/com/termux/view/TerminalView.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/terminal-view/src/main/java/com/termux/view/TerminalView.java b/terminal-view/src/main/java/com/termux/view/TerminalView.java
index 586cd63391..b4254a9832 100644
--- a/terminal-view/src/main/java/com/termux/view/TerminalView.java
+++ b/terminal-view/src/main/java/com/termux/view/TerminalView.java
@@ -894,7 +894,7 @@ public boolean handleKeyCodeAction(int keyCode, int keyMod) {
                 if (shiftDown) {
                     long time = SystemClock.uptimeMillis();
                     MotionEvent motionEvent = MotionEvent.obtain(time, time, MotionEvent.ACTION_DOWN, 0, 0, 0);
-                    doScroll(motionEvent, keyCode == KeyEvent.KEYCODE_PAGE_UP ? -1 : 1);
+                    doScroll(motionEvent, keyCode == KeyEvent.KEYCODE_PAGE_UP ? -mEmulator.mRows : mEmulator.mRows);
                     motionEvent.recycle();
                     return true;
                 }

From c2d57f2ed810b6fa854a6c9ab0ecee4aac38a0cc Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Tue, 27 Aug 2024 04:42:02 +0500
Subject: [PATCH 856/912] Added|Fixed: Do not show AutoFill UI on Termux start
 and add support for usernames

- The AutoFill type and hints are no longer hardcoded in `TerminalView` class and `TermuxActivity` layout xml. They are dynamically set to required values before making a manual AutoFill request and reverted back afterwards to default values. The hardcoded value `AUTOFILL_TYPE_TEXT` returned by `getAutofillType()` was causing the AutoFill UI to show on Activity starts, this will return `AUTOFILL_TYPE_NONE` by default now so that AutoFill UI isn't shown automatically.
- The AutoFill importance is no longer hardcoded in `TermuxActivity` layout xml and is returned by `TerminalView` class itself by `getImportantForAutofill()`.
- The AutoFill function in `TermuxActivity` for making a manual AutoFill request is moved to `TerminalView` class. This and moving of hardcoded values to `TerminalView` class mentioned above is done as complete logic of AutoFill should be handled by `TerminalView` class itself and not scattered in various places.
- The Terminal context menu now supports AutoFilling a username. Note that GBoard/Google Password Manager seems to have a bug where it will still show `Pick a saved password` instead of username, even though `AUTOFILL_HINT_USERNAME` is being requested, however it will still AutoFill a username of selected entry correctly.
- Pressing the back button to close the keyboard will also cancel the current manually requested AutoFill request and UI will not show when keyboard is opened again.

Closes #3909
---
 .../java/com/termux/app/TermuxActivity.java   |  35 ++---
 app/src/main/res/layout/activity_termux.xml   |   2 -
 app/src/main/res/values/strings.xml           |   1 +
 .../java/com/termux/view/TerminalView.java    | 120 +++++++++++++++++-
 4 files changed, 132 insertions(+), 26 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index 308d1f0b2b..e624d9e100 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -10,7 +10,6 @@
 import android.content.IntentFilter;
 import android.content.ServiceConnection;
 import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.view.ContextMenu;
@@ -21,7 +20,6 @@
 import android.view.View;
 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;
@@ -181,7 +179,8 @@ public final class TermuxActivity extends AppCompatActivity implements ServiceCo
     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_SHARE_SELECTED_TEXT = 10;
-    private static final int CONTEXT_MENU_AUTOFILL_ID = 2;
+    private static final int CONTEXT_MENU_AUTOFILL_USERNAME = 11;
+    private static final int CONTEXT_MENU_AUTOFILL_PASSWORD = 2;
     private static final int CONTEXT_MENU_RESET_TERMINAL_ID = 3;
     private static final int CONTEXT_MENU_KILL_PROCESS_ID = 4;
     private static final int CONTEXT_MENU_STYLING_ID = 5;
@@ -632,20 +631,16 @@ public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuIn
         TerminalSession currentSession = getCurrentSession();
         if (currentSession == null) return;
 
-        boolean addAutoFillMenu = false;
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            AutofillManager autofillManager = getSystemService(AutofillManager.class);
-            if (autofillManager != null && autofillManager.isEnabled()) {
-                addAutoFillMenu = true;
-            }
-        }
+        boolean autoFillEnabled = mTerminalView.isAutoFillEnabled();
 
         menu.add(Menu.NONE, CONTEXT_MENU_SELECT_URL_ID, Menu.NONE, R.string.action_select_url);
         menu.add(Menu.NONE, CONTEXT_MENU_SHARE_TRANSCRIPT_ID, Menu.NONE, R.string.action_share_transcript);
         if (!DataUtils.isNullOrEmpty(mTerminalView.getStoredSelectedText()))
             menu.add(Menu.NONE, CONTEXT_MENU_SHARE_SELECTED_TEXT, Menu.NONE, R.string.action_share_selected_text);
-        if (addAutoFillMenu)
-            menu.add(Menu.NONE, CONTEXT_MENU_AUTOFILL_ID, Menu.NONE, R.string.action_autofill_password);
+        if (autoFillEnabled)
+            menu.add(Menu.NONE, CONTEXT_MENU_AUTOFILL_USERNAME, Menu.NONE, R.string.action_autofill_username);
+        if (autoFillEnabled)
+            menu.add(Menu.NONE, CONTEXT_MENU_AUTOFILL_PASSWORD, Menu.NONE, R.string.action_autofill_password);
         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);
@@ -676,8 +671,11 @@ public boolean onContextItemSelected(MenuItem item) {
             case CONTEXT_MENU_SHARE_SELECTED_TEXT:
                 mTermuxTerminalViewClient.shareSelectedText();
                 return true;
-            case CONTEXT_MENU_AUTOFILL_ID:
-                requestAutoFill();
+            case CONTEXT_MENU_AUTOFILL_USERNAME:
+                mTerminalView.requestAutoFillUsername();
+                return true;
+            case CONTEXT_MENU_AUTOFILL_PASSWORD:
+                mTerminalView.requestAutoFillPassword();
                 return true;
             case CONTEXT_MENU_RESET_TERMINAL_ID:
                 onResetTerminalSession(session);
@@ -760,15 +758,6 @@ private void toggleKeepScreenOn() {
         }
     }
 
-    private void requestAutoFill() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            AutofillManager autofillManager = getSystemService(AutofillManager.class);
-            if (autofillManager != null && autofillManager.isEnabled()) {
-                autofillManager.requestAutofill(mTerminalView);
-            }
-        }
-    }
-
 
 
     /**
diff --git a/app/src/main/res/layout/activity_termux.xml b/app/src/main/res/layout/activity_termux.xml
index 484990ff24..831ea7cfb8 100644
--- a/app/src/main/res/layout/activity_termux.xml
+++ b/app/src/main/res/layout/activity_termux.xml
@@ -31,8 +31,6 @@
                 android:focusableInTouchMode="true"
                 android:scrollbarThumbVertical="@drawable/terminal_scroll_shape"
                 android:scrollbars="vertical"
-                android:importantForAutofill="no"
-                android:autofillHints="password"
                 tools:ignore="UnusedAttribute" />
 
             <LinearLayout
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 794d8df3e0..cbd2992ba1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -73,6 +73,7 @@
     <string name="title_share_selected_text">Terminal Text</string>
     <string name="title_share_selected_text_with">Send selected text to:</string>
 
+    <string name="action_autofill_username">Autofill username</string>
     <string name="action_autofill_password">Autofill password</string>
 
     <string name="action_reset_terminal">Reset</string>
diff --git a/terminal-view/src/main/java/com/termux/view/TerminalView.java b/terminal-view/src/main/java/com/termux/view/TerminalView.java
index b4254a9832..b00d3aa06b 100644
--- a/terminal-view/src/main/java/com/termux/view/TerminalView.java
+++ b/terminal-view/src/main/java/com/termux/view/TerminalView.java
@@ -27,6 +27,7 @@
 import android.view.ViewConfiguration;
 import android.view.ViewTreeObserver;
 import android.view.accessibility.AccessibilityManager;
+import android.view.autofill.AutofillManager;
 import android.view.autofill.AutofillValue;
 import android.view.inputmethod.BaseInputConnection;
 import android.view.inputmethod.EditorInfo;
@@ -85,6 +86,29 @@ public final class TerminalView extends View {
     /** If non-zero, this is the last unicode code point received if that was a combining character. */
     int mCombiningAccent;
 
+    /**
+     * The current AutoFill type returned for {@link View#getAutofillType()} by {@link #getAutofillType()}.
+     *
+     * The default is {@link #AUTOFILL_TYPE_NONE} so that AutoFill UI, like toolbar above keyboard
+     * is not shown automatically, like on Activity starts/View create. This value should be updated
+     * to required value, like {@link #AUTOFILL_TYPE_TEXT} before calling
+     * {@link AutofillManager#requestAutofill(View)} so that AutoFill UI shows. The updated value
+     * set will automatically be restored to {@link #AUTOFILL_TYPE_NONE} in
+     * {@link #autofill(AutofillValue)} so that AutoFill UI isn't shown anymore by calling
+     * {@link #resetAutoFill()}.
+     */
+    @RequiresApi(api = Build.VERSION_CODES.O)
+    private int mAutoFillType = AUTOFILL_TYPE_NONE;
+
+    /**
+     * The current AutoFill hints returned for {@link View#getAutofillHints()} ()} by {@link #getAutofillHints()} ()}.
+     *
+     * The default is an empty `string[]`. This value should be updated to required value. The
+     * updated value set will automatically be restored an empty `string[]` in
+     * {@link #autofill(AutofillValue)} by calling {@link #resetAutoFill()}.
+     */
+    private String[] mAutoFillHints = new String[0];
+
     private final boolean mAccessibilityEnabled;
 
     /** The {@link KeyEvent} is generated from a virtual keyboard, like manually with the {@link KeyEvent#KeyEvent(int, int)} constructor. */
@@ -609,6 +633,7 @@ public boolean onKeyPreIme(int keyCode, KeyEvent event) {
         if (TERMINAL_VIEW_KEY_LOGGING_ENABLED)
             mClient.logInfo(LOG_TAG, "onKeyPreIme(keyCode=" + keyCode + ", event=" + event + ")");
         if (keyCode == KeyEvent.KEYCODE_BACK) {
+            cancelRequestAutoFill();
             if (isSelectingText()) {
                 stopTextSelectionMode();
                 return true;
@@ -1028,12 +1053,20 @@ public void autofill(AutofillValue value) {
         if (value.isText()) {
             mTermSession.write(value.getTextValue().toString());
         }
+
+        resetAutoFill();
     }
 
     @RequiresApi(api = Build.VERSION_CODES.O)
     @Override
     public int getAutofillType() {
-        return AUTOFILL_TYPE_TEXT;
+        return mAutoFillType;
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.O)
+    @Override
+    public String[] getAutofillHints() {
+        return mAutoFillHints;
     }
 
     @RequiresApi(api = Build.VERSION_CODES.O)
@@ -1042,6 +1075,91 @@ public AutofillValue getAutofillValue() {
         return AutofillValue.forText("");
     }
 
+    @RequiresApi(api = Build.VERSION_CODES.O)
+    @Override
+    public int getImportantForAutofill() {
+        return IMPORTANT_FOR_AUTOFILL_NO;
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.O)
+    private synchronized void resetAutoFill() {
+        // Restore none type so that AutoFill UI isn't shown anymore.
+        mAutoFillType = AUTOFILL_TYPE_NONE;
+        mAutoFillHints = new String[0];
+    }
+
+    public AutofillManager getAutoFillManagerService() {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) return null;
+
+        try {
+            Context context = getContext();
+            if (context == null) return null;
+            return context.getSystemService(AutofillManager.class);
+        } catch (Exception e) {
+            mClient.logStackTraceWithMessage(LOG_TAG, "Failed to get AutofillManager service", e);
+            return null;
+        }
+    }
+
+    public boolean isAutoFillEnabled() {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) return false;
+
+        try {
+            AutofillManager autofillManager = getAutoFillManagerService();
+            return autofillManager != null && autofillManager.isEnabled();
+        } catch (Exception e) {
+            mClient.logStackTraceWithMessage(LOG_TAG, "Failed to check if Autofill is enabled", e);
+            return false;
+        }
+    }
+
+    public synchronized void requestAutoFillUsername() {
+        requestAutoFill(
+            Build.VERSION.SDK_INT >= Build.VERSION_CODES.O ? new String[]{View.AUTOFILL_HINT_USERNAME} :
+                null);
+    }
+
+    public synchronized void requestAutoFillPassword() {
+        requestAutoFill(
+            Build.VERSION.SDK_INT >= Build.VERSION_CODES.O ? new String[]{View.AUTOFILL_HINT_PASSWORD} :
+            null);
+    }
+
+    public synchronized void requestAutoFill(String[] autoFillHints) {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) return;
+        if (autoFillHints == null || autoFillHints.length < 1) return;
+
+        try {
+            AutofillManager autofillManager = getAutoFillManagerService();
+            if (autofillManager != null && autofillManager.isEnabled()) {
+                // Update type that will be returned by `getAutofillType()` so that AutoFill UI is shown.
+                mAutoFillType = AUTOFILL_TYPE_TEXT;
+                // Update hints that will be returned by `getAutofillHints()` for which to show AutoFill UI.
+                mAutoFillHints = autoFillHints;
+                autofillManager.requestAutofill(this);
+            }
+        } catch (Exception e) {
+            mClient.logStackTraceWithMessage(LOG_TAG, "Failed to request Autofill", e);
+        }
+    }
+
+    public synchronized void cancelRequestAutoFill() {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) return;
+        if (mAutoFillType == AUTOFILL_TYPE_NONE) return;
+
+        try {
+            AutofillManager autofillManager = getAutoFillManagerService();
+            if (autofillManager != null && autofillManager.isEnabled()) {
+                resetAutoFill();
+                autofillManager.cancel();
+            }
+        } catch (Exception e) {
+            mClient.logStackTraceWithMessage(LOG_TAG, "Failed to cancel Autofill request", e);
+        }
+    }
+
+
+
 
 
     /**

From 36d811ea7d6b0e76a6860e58cd08b0a24bf9f69a Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Tue, 17 Sep 2024 13:45:01 +0200
Subject: [PATCH 857/912] Fixed: Parse (but ignore for now) terminal APC
 sequences

---
 .../com/termux/terminal/TerminalEmulator.java | 40 +++++++++++++++++++
 .../java/com/termux/terminal/ApcTest.java     | 21 ++++++++++
 2 files changed, 61 insertions(+)
 create mode 100644 terminal-emulator/src/test/java/com/termux/terminal/ApcTest.java

diff --git a/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java b/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
index cbbccbb4f2..14fb84865a 100644
--- a/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
+++ b/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
@@ -79,6 +79,10 @@ public final class TerminalEmulator {
     private static final int ESC_CSI_SINGLE_QUOTE = 18;
     /** Escape processing: CSI ! */
     private static final int ESC_CSI_EXCLAMATION = 19;
+    /** Escape processing: "ESC _" or Application Program Command (APC). */
+    private static final int ESC_APC = 20;
+    /** Escape processing: "ESC _" or Application Program Command (APC), followed by Escape. */
+    private static final int ESC_APC_ESCAPE = 21;
 
     /** The number of parameter arguments. This name comes from the ANSI standard for terminal escape codes. */
     private static final int MAX_ESCAPE_PARAMETERS = 16;
@@ -548,6 +552,15 @@ private void processByte(byte byteToProcess) {
     }
 
     public void processCodePoint(int b) {
+        // The Application Program-Control (APC) string might be arbitrary non-printable characters, so handle that early.
+        if (mEscapeState == ESC_APC) {
+            doApc(b);
+            return;
+        } else if (mEscapeState == ESC_APC_ESCAPE) {
+            doApcEscape(b);
+            return;
+        }
+
         switch (b) {
             case 0: // Null character (NUL, ^@). Do nothing.
                 break;
@@ -1004,6 +1017,30 @@ private void doDeviceControl(int b) {
         }
     }
 
+    /**
+     * When in {@link #ESC_APC} (APC, Application Program Command) sequence.
+     */
+    private void doApc(int b) {
+        if (b == 27) {
+            continueSequence(ESC_APC_ESCAPE);
+        }
+        // Eat APC sequences silently for now.
+    }
+
+    /**
+     * When in {@link #ESC_APC} (APC, Application Program Command) sequence.
+     */
+    private void doApcEscape(int b) {
+        if (b == '\\') {
+            // A String Terminator (ST), ending the APC escape sequence.
+            finishSequence();
+        } else {
+            // The Escape character was not the start of a String Terminator (ST),
+            // but instead just data inside of the APC escape sequence.
+            continueSequence(ESC_APC);
+        }
+    }
+
     private int nextTabStop(int numTabs) {
         for (int i = mCursorCol + 1; i < mColumns; i++)
             if (mTabStop[i] && --numTabs == 0) return Math.min(i, mRightMargin);
@@ -1399,6 +1436,9 @@ private void doEsc(int b) {
             case '>': // DECKPNM
                 setDecsetinternalBit(DECSET_BIT_APPLICATION_KEYPAD, false);
                 break;
+            case '_': // APC - Application Program Command.
+                continueSequence(ESC_APC);
+                break;
             default:
                 unknownSequence(b);
                 break;
diff --git a/terminal-emulator/src/test/java/com/termux/terminal/ApcTest.java b/terminal-emulator/src/test/java/com/termux/terminal/ApcTest.java
new file mode 100644
index 0000000000..4f6292aaa9
--- /dev/null
+++ b/terminal-emulator/src/test/java/com/termux/terminal/ApcTest.java
@@ -0,0 +1,21 @@
+package com.termux.terminal;
+
+public class ApcTest extends TerminalTestCase {
+
+    public void testApcConsumed() {
+        // At time of writing this is part of what yazi sends for probing for kitty graphics protocol support:
+        // https://github.com/sxyazi/yazi/blob/0cdaff98d0b3723caff63eebf1974e7907a43a2c/yazi-adapter/src/emulator.rs#L129
+        // This should not result in anything being written to the screen: If kitty graphics protocol support
+        // is implemented it should instead result in an error code on stdin, and if not it should be consumed
+        // silently just as xterm does. See https://sw.kovidgoyal.net/kitty/graphics-protocol/.
+        withTerminalSized(2, 2)
+            .enterString("\033_Gi=31,s=1,v=1,a=q,t=d,f=24;AAAA\033\\")
+            .assertLinesAre("  ", "  ");
+
+        // It is ok for the APC content to be non printable characters:
+        withTerminalSized(12, 2)
+            .enterString("hello \033_some\023\033_\\apc#end\033\\ world")
+            .assertLinesAre("hello  world", "            ");
+    }
+
+}

From 438cd73fffcaf7370fbf0ed6d4a9759fe3f0de98 Mon Sep 17 00:00:00 2001
From: Krunal Patel <kbpatel5802@gmail.com>
Date: Wed, 16 Nov 2022 14:03:07 +0530
Subject: [PATCH 858/912] Added|Changed: Fill `.ws_xpixel` and `.ws_ypixel` in
 `winsize`

This allows to get terminal size in pixel using `TIOCGWINSZ` ioctl.
Set `.ws_xpixel` using `columns * cell_width` and set `.ws_ypixel` using `rows * cell_height`.
Cell width and height is font width and line spacing, respectively.
---
 .../src/main/java/com/termux/terminal/JNI.java   |  4 ++--
 .../com/termux/terminal/TerminalSession.java     | 14 +++++++-------
 terminal-emulator/src/main/jni/termux.c          | 16 ++++++++++------
 .../main/java/com/termux/view/TerminalView.java  |  2 +-
 4 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/terminal-emulator/src/main/java/com/termux/terminal/JNI.java b/terminal-emulator/src/main/java/com/termux/terminal/JNI.java
index 99229a6528..e2fc477b91 100644
--- a/terminal-emulator/src/main/java/com/termux/terminal/JNI.java
+++ b/terminal-emulator/src/main/java/com/termux/terminal/JNI.java
@@ -23,10 +23,10 @@ final class JNI {
      * @return the file descriptor resulting from opening /dev/ptmx master device. The sub process will have opened the
      * slave device counterpart (/dev/pts/$N) and have it as stdint, stdout and stderr.
      */
-    public static native int createSubprocess(String cmd, String cwd, String[] args, String[] envVars, int[] processId, int rows, int columns);
+    public static native int createSubprocess(String cmd, String cwd, String[] args, String[] envVars, int[] processId, int rows, int columns, int cellWidth, int cellHeight);
 
     /** Set the window size for a given pty, which allows connected programs to learn how large their screen is. */
-    public static native void setPtyWindowSize(int fd, int rows, int cols);
+    public static native void setPtyWindowSize(int fd, int rows, int cols, int cellWidth, int cellHeight);
 
     /**
      * Causes the calling thread to wait for the process associated with the receiver to finish executing.
diff --git a/terminal-emulator/src/main/java/com/termux/terminal/TerminalSession.java b/terminal-emulator/src/main/java/com/termux/terminal/TerminalSession.java
index c081108d8f..33f1b355b4 100644
--- a/terminal-emulator/src/main/java/com/termux/terminal/TerminalSession.java
+++ b/terminal-emulator/src/main/java/com/termux/terminal/TerminalSession.java
@@ -21,7 +21,7 @@
  * A terminal session, consisting of a process coupled to a terminal interface.
  * <p>
  * The subprocess will be executed by the constructor, and when the size is made known by a call to
- * {@link #updateSize(int, int)} terminal emulation will begin and threads will be spawned to handle the subprocess I/O.
+ * {@link #updateSize(int, int, int, int)} terminal emulation will begin and threads will be spawned to handle the subprocess I/O.
  * All terminal emulation and callback methods will be performed on the main thread.
  * <p>
  * The child process may be exited forcefully by using the {@link #finishIfRunning()} method.
@@ -61,7 +61,7 @@ public final class TerminalSession extends TerminalOutput {
 
     /**
      * The file descriptor referencing the master half of a pseudo-terminal pair, resulting from calling
-     * {@link JNI#createSubprocess(String, String, String[], String[], int[], int, int)}.
+     * {@link JNI#createSubprocess(String, String, String[], String[], int[], int, int, int, int)}.
      */
     private int mTerminalFileDescriptor;
 
@@ -100,11 +100,11 @@ public void updateTerminalSessionClient(TerminalSessionClient client) {
     }
 
     /** Inform the attached pty of the new size and reflow or initialize the emulator. */
-    public void updateSize(int columns, int rows) {
+    public void updateSize(int columns, int rows, int fontWidth, int fontHeight) {
         if (mEmulator == null) {
-            initializeEmulator(columns, rows);
+            initializeEmulator(columns, rows, fontWidth, fontHeight);
         } else {
-            JNI.setPtyWindowSize(mTerminalFileDescriptor, rows, columns);
+            JNI.setPtyWindowSize(mTerminalFileDescriptor, rows, columns, fontWidth, fontHeight);
             mEmulator.resize(columns, rows);
         }
     }
@@ -120,11 +120,11 @@ public String getTitle() {
      * @param columns The number of columns in the terminal window.
      * @param rows    The number of rows in the terminal window.
      */
-    public void initializeEmulator(int columns, int rows) {
+    public void initializeEmulator(int columns, int rows, int cellWidth, int cellHeight) {
         mEmulator = new TerminalEmulator(this, columns, rows, mTranscriptRows, mClient);
 
         int[] processId = new int[1];
-        mTerminalFileDescriptor = JNI.createSubprocess(mShellPath, mCwd, mArgs, mEnv, processId, rows, columns);
+        mTerminalFileDescriptor = JNI.createSubprocess(mShellPath, mCwd, mArgs, mEnv, processId, rows, columns, cellWidth, cellHeight);
         mShellPid = processId[0];
         mClient.setTerminalShellPid(this, mShellPid);
 
diff --git a/terminal-emulator/src/main/jni/termux.c b/terminal-emulator/src/main/jni/termux.c
index 22f1d507d1..8cd5e7891d 100644
--- a/terminal-emulator/src/main/jni/termux.c
+++ b/terminal-emulator/src/main/jni/termux.c
@@ -29,7 +29,9 @@ static int create_subprocess(JNIEnv* env,
         char** envp,
         int* pProcessId,
         jint rows,
-        jint columns)
+        jint columns,
+        jint cell_width,
+        jint cell_height)
 {
     int ptm = open("/dev/ptmx", O_RDWR | O_CLOEXEC);
     if (ptm < 0) return throw_runtime_exception(env, "Cannot open /dev/ptmx");
@@ -57,7 +59,7 @@ static int create_subprocess(JNIEnv* env,
     tcsetattr(ptm, TCSANOW, &tios);
 
     /** Set initial winsize. */
-    struct winsize sz = { .ws_row = (unsigned short) rows, .ws_col = (unsigned short) columns };
+    struct winsize sz = { .ws_row = (unsigned short) rows, .ws_col = (unsigned short) columns, .ws_xpixel = (unsigned short) (columns * cell_width), .ws_ypixel = (unsigned short) (rows * cell_height)};
     ioctl(ptm, TIOCSWINSZ, &sz);
 
     pid_t pid = fork();
@@ -121,7 +123,9 @@ JNIEXPORT jint JNICALL Java_com_termux_terminal_JNI_createSubprocess(
         jobjectArray envVars,
         jintArray processIdArray,
         jint rows,
-        jint columns)
+        jint columns,
+        jint cell_width,
+        jint cell_height)
 {
     jsize size = args ? (*env)->GetArrayLength(env, args) : 0;
     char** argv = NULL;
@@ -156,7 +160,7 @@ JNIEXPORT jint JNICALL Java_com_termux_terminal_JNI_createSubprocess(
     int procId = 0;
     char const* cmd_cwd = (*env)->GetStringUTFChars(env, cwd, NULL);
     char const* cmd_utf8 = (*env)->GetStringUTFChars(env, cmd, NULL);
-    int ptm = create_subprocess(env, cmd_utf8, cmd_cwd, argv, envp, &procId, rows, columns);
+    int ptm = create_subprocess(env, cmd_utf8, cmd_cwd, argv, envp, &procId, rows, columns, cell_width, cell_height);
     (*env)->ReleaseStringUTFChars(env, cmd, cmd_utf8);
     (*env)->ReleaseStringUTFChars(env, cmd, cmd_cwd);
 
@@ -178,9 +182,9 @@ JNIEXPORT jint JNICALL Java_com_termux_terminal_JNI_createSubprocess(
     return ptm;
 }
 
-JNIEXPORT void JNICALL Java_com_termux_terminal_JNI_setPtyWindowSize(JNIEnv* TERMUX_UNUSED(env), jclass TERMUX_UNUSED(clazz), jint fd, jint rows, jint cols)
+JNIEXPORT void JNICALL Java_com_termux_terminal_JNI_setPtyWindowSize(JNIEnv* TERMUX_UNUSED(env), jclass TERMUX_UNUSED(clazz), jint fd, jint rows, jint cols, jint cell_width, jint cell_height)
 {
-    struct winsize sz = { .ws_row = (unsigned short) rows, .ws_col = (unsigned short) cols };
+    struct winsize sz = { .ws_row = (unsigned short) rows, .ws_col = (unsigned short) cols, .ws_xpixel = (unsigned short) (cols * cell_width), .ws_ypixel = (unsigned short) (rows * cell_height) };
     ioctl(fd, TIOCSWINSZ, &sz);
 }
 
diff --git a/terminal-view/src/main/java/com/termux/view/TerminalView.java b/terminal-view/src/main/java/com/termux/view/TerminalView.java
index b00d3aa06b..ab0bca0920 100644
--- a/terminal-view/src/main/java/com/termux/view/TerminalView.java
+++ b/terminal-view/src/main/java/com/termux/view/TerminalView.java
@@ -975,7 +975,7 @@ public void updateSize() {
         int newRows = Math.max(4, (viewHeight - mRenderer.mFontLineSpacingAndAscent) / mRenderer.mFontLineSpacing);
 
         if (mEmulator == null || (newColumns != mEmulator.mColumns || newRows != mEmulator.mRows)) {
-            mTermSession.updateSize(newColumns, newRows);
+            mTermSession.updateSize(newColumns, newRows, (int) mRenderer.getFontWidth(), mRenderer.getFontLineSpacing());
             mEmulator = mTermSession.getEmulator();
             mClient.onEmulatorSet();
 

From a8a69c6d80e9602ee3b236dbcdf94b42c18c5c20 Mon Sep 17 00:00:00 2001
From: Dvd-Znf <101937630+Dvd-Znf@users.noreply.github.com>
Date: Fri, 26 Jul 2024 01:42:19 +0300
Subject: [PATCH 859/912] Update latest version in README.md to v0.118.1

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 1ff13608bf..5528c3f389 100644
--- a/README.md
+++ b/README.md
@@ -49,7 +49,7 @@ The core [Termux](https://github.com/termux/termux-app) app comes with the follo
 
 ## Installation
 
-Latest version is `v0.118.0`.
+Latest version is `v0.118.1`.
 
 **NOTICE: It is highly recommended that you update to `v0.118.0` or higher ASAP for various bug fixes, including a critical world-readable vulnerability reported [here](https://termux.github.io/general/2022/02/15/termux-apps-vulnerability-disclosures.html). See [below](#google-play-store-experimental-branch) for information regarding Termux on Google Play.**
 

From 4443b657bf7fdf4aec5161f2a0c1099dbeaaad99 Mon Sep 17 00:00:00 2001
From: Artem Chepurnyi <mail@artemchep.com>
Date: Mon, 23 Sep 2024 10:38:29 +0300
Subject: [PATCH 860/912] Fixed: Mark view as important for AutoFill before
 requesting an AutoFill

Co-authored-by: @AChep <mail@artemchep.com>
Co-authored-by: @agnostic-apollo  <agnosticapollo@gmail.com>
---
 .../java/com/termux/view/TerminalView.java    | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/terminal-view/src/main/java/com/termux/view/TerminalView.java b/terminal-view/src/main/java/com/termux/view/TerminalView.java
index ab0bca0920..435c102515 100644
--- a/terminal-view/src/main/java/com/termux/view/TerminalView.java
+++ b/terminal-view/src/main/java/com/termux/view/TerminalView.java
@@ -100,6 +100,20 @@ public final class TerminalView extends View {
     @RequiresApi(api = Build.VERSION_CODES.O)
     private int mAutoFillType = AUTOFILL_TYPE_NONE;
 
+    /**
+     * The current AutoFill type returned for {@link View#getImportantForAutofill()} by
+     * {@link #getImportantForAutofill()}.
+     *
+     * The default is {@link #IMPORTANT_FOR_AUTOFILL_NO} so that view is not considered important
+     * for AutoFill. This value should be updated to required value, like
+     * {@link #IMPORTANT_FOR_AUTOFILL_YES} before calling {@link AutofillManager#requestAutofill(View)}
+     * so that Android and apps consider the view as important for AutoFill to process the request.
+     * The updated value set will automatically be restored to {@link #IMPORTANT_FOR_AUTOFILL_NO} in
+     * {@link #autofill(AutofillValue)} by calling {@link #resetAutoFill()}.
+     */
+    @RequiresApi(api = Build.VERSION_CODES.O)
+    private int mAutoFillImportance = IMPORTANT_FOR_AUTOFILL_NO;
+
     /**
      * The current AutoFill hints returned for {@link View#getAutofillHints()} ()} by {@link #getAutofillHints()} ()}.
      *
@@ -1078,13 +1092,14 @@ public AutofillValue getAutofillValue() {
     @RequiresApi(api = Build.VERSION_CODES.O)
     @Override
     public int getImportantForAutofill() {
-        return IMPORTANT_FOR_AUTOFILL_NO;
+        return mAutoFillImportance;
     }
 
     @RequiresApi(api = Build.VERSION_CODES.O)
     private synchronized void resetAutoFill() {
         // Restore none type so that AutoFill UI isn't shown anymore.
         mAutoFillType = AUTOFILL_TYPE_NONE;
+        mAutoFillImportance = IMPORTANT_FOR_AUTOFILL_NO;
         mAutoFillHints = new String[0];
     }
 
@@ -1134,6 +1149,9 @@ public synchronized void requestAutoFill(String[] autoFillHints) {
             if (autofillManager != null && autofillManager.isEnabled()) {
                 // Update type that will be returned by `getAutofillType()` so that AutoFill UI is shown.
                 mAutoFillType = AUTOFILL_TYPE_TEXT;
+                // Update importance that will be returned by `getImportantForAutofill()` so that
+                // AutoFill considers the view as important.
+                mAutoFillImportance = IMPORTANT_FOR_AUTOFILL_YES;
                 // Update hints that will be returned by `getAutofillHints()` for which to show AutoFill UI.
                 mAutoFillHints = autoFillHints;
                 autofillManager.requestAutofill(this);

From 03142590ff42579505476729ed1e189a2aa35ce4 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Thu, 26 Sep 2024 16:49:38 +0200
Subject: [PATCH 861/912] Added: Terminal CSI reporting of window and cell
 pixel size
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Implement the following CSI escape sequences from
https://invisible-island.net/xterm/ctlseqs/ctlseqs.html:

> CSI Ps ; Ps ; Ps t
> [..]
>    Ps = 1 4  ⇒  Report xterm text area size in pixels.
>    Result is CSI  4 ;  height ;  width t
> [..]
>    Ps = 1 6  ⇒  Report xterm character cell size in pixels.
>    Result is CSI  6 ;  height ;  width t

Extracted from changes in https://github.com/termux/termux-app/pull/2973
by @MatanZ and adopted to play well with the just merged #3098 (.ws_xpixel
and .ws_ypixel values in winsize).
---
 .../com/termux/terminal/TerminalEmulator.java | 18 +++++++++++++----
 .../com/termux/terminal/TerminalSession.java  | 14 ++++++-------
 .../ControlSequenceIntroducerTest.java        | 20 +++++++++++++++++++
 .../java/com/termux/terminal/HistoryTest.java |  4 ++--
 .../java/com/termux/terminal/ResizeTest.java  |  6 +++---
 .../com/termux/terminal/TerminalTest.java     |  2 +-
 .../com/termux/terminal/TerminalTestCase.java |  9 ++++++---
 7 files changed, 53 insertions(+), 20 deletions(-)

diff --git a/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java b/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
index 14fb84865a..993e0c6895 100644
--- a/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
+++ b/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
@@ -136,6 +136,9 @@ public final class TerminalEmulator {
     /** The number of character rows and columns in the terminal screen. */
     public int mRows, mColumns;
 
+    /** Size of a terminal cell in pixels. */
+    private int mCellWidthPixels, mCellHeightPixels;
+
     /** 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;
@@ -314,13 +317,15 @@ static int mapDecSetBitToInternalBit(int decsetBit) {
         }
     }
 
-    public TerminalEmulator(TerminalOutput session, int columns, int rows, Integer transcriptRows, TerminalSessionClient client) {
+    public TerminalEmulator(TerminalOutput session, int columns, int rows, int cellWidthPixels, int cellHeightPixels, Integer transcriptRows, TerminalSessionClient client) {
         mSession = session;
         mScreen = mMainBuffer = new TerminalBuffer(columns, getTerminalTranscriptRows(transcriptRows), rows);
         mAltBuffer = new TerminalBuffer(columns, rows, rows);
         mClient = client;
         mRows = rows;
         mColumns = columns;
+        mCellWidthPixels = cellWidthPixels;
+        mCellHeightPixels = cellHeightPixels;
         mTabStop = new boolean[mColumns];
         reset();
     }
@@ -370,7 +375,10 @@ public void sendMouseEvent(int mouseButton, int column, int row, boolean pressed
         }
     }
 
-    public void resize(int columns, int rows) {
+    public void resize(int columns, int rows, int cellWidthPixels, int cellHeightPixels) {
+        this.mCellWidthPixels = cellWidthPixels;
+        this.mCellHeightPixels = cellHeightPixels;
+
         if (mRows == rows && mColumns == columns) {
             return;
         } else if (columns < 2 || rows < 2) {
@@ -1748,8 +1756,10 @@ private void doCsi(int b) {
                         mSession.write("\033[3;0;0t");
                         break;
                     case 14: // Report xterm window in pixels. Result is CSI 4 ; height ; width t
-                        // We just report characters time 12 here.
-                        mSession.write(String.format(Locale.US, "\033[4;%d;%dt", mRows * 12, mColumns * 12));
+                        mSession.write(String.format(Locale.US, "\033[4;%d;%dt", mRows * mCellHeightPixels, mColumns * mCellWidthPixels));
+                        break;
+                    case 16: // Report xterm character cell size in pixels. Result is CSI 6 ; height ; width t
+                        mSession.write(String.format(Locale.US, "\033[6;%d;%dt", mCellHeightPixels, mCellWidthPixels));
                         break;
                     case 18: // Report the size of the text area in characters. Result is CSI 8 ; height ; width t
                         mSession.write(String.format(Locale.US, "\033[8;%d;%dt", mRows, mColumns));
diff --git a/terminal-emulator/src/main/java/com/termux/terminal/TerminalSession.java b/terminal-emulator/src/main/java/com/termux/terminal/TerminalSession.java
index 33f1b355b4..b068be203b 100644
--- a/terminal-emulator/src/main/java/com/termux/terminal/TerminalSession.java
+++ b/terminal-emulator/src/main/java/com/termux/terminal/TerminalSession.java
@@ -100,12 +100,12 @@ public void updateTerminalSessionClient(TerminalSessionClient client) {
     }
 
     /** Inform the attached pty of the new size and reflow or initialize the emulator. */
-    public void updateSize(int columns, int rows, int fontWidth, int fontHeight) {
+    public void updateSize(int columns, int rows, int cellWidthPixels, int cellHeightPixels) {
         if (mEmulator == null) {
-            initializeEmulator(columns, rows, fontWidth, fontHeight);
+            initializeEmulator(columns, rows, cellWidthPixels, cellHeightPixels);
         } else {
-            JNI.setPtyWindowSize(mTerminalFileDescriptor, rows, columns, fontWidth, fontHeight);
-            mEmulator.resize(columns, rows);
+            JNI.setPtyWindowSize(mTerminalFileDescriptor, rows, columns, cellWidthPixels, cellHeightPixels);
+            mEmulator.resize(columns, rows, cellWidthPixels, cellHeightPixels);
         }
     }
 
@@ -120,11 +120,11 @@ public String getTitle() {
      * @param columns The number of columns in the terminal window.
      * @param rows    The number of rows in the terminal window.
      */
-    public void initializeEmulator(int columns, int rows, int cellWidth, int cellHeight) {
-        mEmulator = new TerminalEmulator(this, columns, rows, mTranscriptRows, mClient);
+    public void initializeEmulator(int columns, int rows, int cellWidthPixels, int cellHeightPixels) {
+        mEmulator = new TerminalEmulator(this, columns, rows, cellWidthPixels, cellHeightPixels, mTranscriptRows, mClient);
 
         int[] processId = new int[1];
-        mTerminalFileDescriptor = JNI.createSubprocess(mShellPath, mCwd, mArgs, mEnv, processId, rows, columns, cellWidth, cellHeight);
+        mTerminalFileDescriptor = JNI.createSubprocess(mShellPath, mCwd, mArgs, mEnv, processId, rows, columns, cellWidthPixels, cellHeightPixels);
         mShellPid = processId[0];
         mClient.setTerminalShellPid(this, mShellPid);
 
diff --git a/terminal-emulator/src/test/java/com/termux/terminal/ControlSequenceIntroducerTest.java b/terminal-emulator/src/test/java/com/termux/terminal/ControlSequenceIntroducerTest.java
index 5a12edd749..c356baa891 100644
--- a/terminal-emulator/src/test/java/com/termux/terminal/ControlSequenceIntroducerTest.java
+++ b/terminal-emulator/src/test/java/com/termux/terminal/ControlSequenceIntroducerTest.java
@@ -62,4 +62,24 @@ public void testCsi3J() {
 		assertEquals("y\nz", mTerminal.getScreen().getTranscriptText());
 	}
 
+    public void testReportPixelSize() {
+        int columns = 3;
+        int rows = 3;
+        withTerminalSized(columns, rows);
+        int cellWidth = TerminalTest.INITIAL_CELL_WIDTH_PIXELS;
+        int cellHeight = TerminalTest.INITIAL_CELL_HEIGHT_PIXELS;
+        assertEnteringStringGivesResponse("\033[14t", "\033[4;" + (rows*cellHeight) + ";" + (columns*cellWidth) + "t");
+        assertEnteringStringGivesResponse("\033[16t", "\033[6;" + cellHeight + ";" + cellWidth + "t");
+        columns = 23;
+        rows = 33;
+        resize(columns, rows);
+        assertEnteringStringGivesResponse("\033[14t", "\033[4;" + (rows*cellHeight) + ";" + (columns*cellWidth) + "t");
+        assertEnteringStringGivesResponse("\033[16t", "\033[6;" + cellHeight + ";" + cellWidth + "t");
+        cellWidth = 8;
+        cellHeight = 18;
+        mTerminal.resize(columns, rows, cellWidth, cellHeight);
+        assertEnteringStringGivesResponse("\033[14t", "\033[4;" + (rows*cellHeight) + ";" + (columns*cellWidth) + "t");
+        assertEnteringStringGivesResponse("\033[16t", "\033[6;" + cellHeight + ";" + cellWidth + "t");
+    }
+
 }
diff --git a/terminal-emulator/src/test/java/com/termux/terminal/HistoryTest.java b/terminal-emulator/src/test/java/com/termux/terminal/HistoryTest.java
index a252e1a8cb..17f8111205 100644
--- a/terminal-emulator/src/test/java/com/termux/terminal/HistoryTest.java
+++ b/terminal-emulator/src/test/java/com/termux/terminal/HistoryTest.java
@@ -11,10 +11,10 @@ public void testHistory() {
 		assertLinesAre("777", "888", "999");
 		assertHistoryStartsWith("666", "555");
 
-		mTerminal.resize(cols, 2);
+		resize(cols, 2);
 		assertHistoryStartsWith("777", "666", "555");
 
-		mTerminal.resize(cols, 3);
+		resize(cols, 3);
 		assertHistoryStartsWith("666", "555");
 	}
 
diff --git a/terminal-emulator/src/test/java/com/termux/terminal/ResizeTest.java b/terminal-emulator/src/test/java/com/termux/terminal/ResizeTest.java
index fa4a702473..6c32d663b4 100644
--- a/terminal-emulator/src/test/java/com/termux/terminal/ResizeTest.java
+++ b/terminal-emulator/src/test/java/com/termux/terminal/ResizeTest.java
@@ -72,11 +72,11 @@ public void testResizeAfterHistoryWraparound() {
 			enterString("\r\n");
 		}
 		assertLinesAre("998       ", "999       ", "          ");
-		mTerminal.resize(cols, 2);
+		resize(cols, 2);
 		assertLinesAre("999       ", "          ");
-		mTerminal.resize(cols, 5);
+		resize(cols, 5);
 		assertLinesAre("996       ", "997       ", "998       ", "999       ", "          ");
-		mTerminal.resize(cols, rows);
+		resize(cols, rows);
 		assertLinesAre("998       ", "999       ", "          ");
 	}
 
diff --git a/terminal-emulator/src/test/java/com/termux/terminal/TerminalTest.java b/terminal-emulator/src/test/java/com/termux/terminal/TerminalTest.java
index e3efa81d3f..739529a841 100644
--- a/terminal-emulator/src/test/java/com/termux/terminal/TerminalTest.java
+++ b/terminal-emulator/src/test/java/com/termux/terminal/TerminalTest.java
@@ -82,7 +82,7 @@ public void testReportTerminalSize() throws Exception {
 		assertEnteringStringGivesResponse("\033[18t", "\033[8;5;5t");
 		for (int width = 3; width < 12; width++) {
 			for (int height = 3; height < 12; height++) {
-				mTerminal.resize(width, height);
+				resize(width, height);
 				assertEnteringStringGivesResponse("\033[18t", "\033[8;" + height + ";" + width + "t");
 			}
 		}
diff --git a/terminal-emulator/src/test/java/com/termux/terminal/TerminalTestCase.java b/terminal-emulator/src/test/java/com/termux/terminal/TerminalTestCase.java
index 1d0b0271bb..4490207932 100644
--- a/terminal-emulator/src/test/java/com/termux/terminal/TerminalTestCase.java
+++ b/terminal-emulator/src/test/java/com/termux/terminal/TerminalTestCase.java
@@ -13,7 +13,10 @@
 
 public abstract class TerminalTestCase extends TestCase {
 
-	public static class MockTerminalOutput extends TerminalOutput {
+    public static final int INITIAL_CELL_WIDTH_PIXELS = 13;
+    public static final int INITIAL_CELL_HEIGHT_PIXELS = 15;
+
+    public static class MockTerminalOutput extends TerminalOutput {
 		final ByteArrayOutputStream baos = new ByteArrayOutputStream();
 		public final List<ChangedTitle> titleChanges = new ArrayList<>();
 		public final List<String> clipboardPuts = new ArrayList<>();
@@ -108,7 +111,7 @@ protected void setUp() throws Exception {
 
 	protected TerminalTestCase withTerminalSized(int columns, int rows) {
 	    // The tests aren't currently using the client, so a null client will suffice, a dummy client should be implemented if needed
-		mTerminal = new TerminalEmulator(mOutput, columns, rows, rows * 2, null);
+		mTerminal = new TerminalEmulator(mOutput, columns, rows, INITIAL_CELL_WIDTH_PIXELS, INITIAL_CELL_HEIGHT_PIXELS, rows * 2, null);
 		return this;
 	}
 
@@ -201,7 +204,7 @@ public TerminalTestCase assertLinesAre(String... lines) {
 	}
 
 	public TerminalTestCase resize(int cols, int rows) {
-		mTerminal.resize(cols, rows);
+		mTerminal.resize(cols, rows, INITIAL_CELL_WIDTH_PIXELS, INITIAL_CELL_HEIGHT_PIXELS);
 		assertInvariants();
 		return this;
 	}

From 6c00f1fc61e75df9e3b74ab42e2421623b646ca7 Mon Sep 17 00:00:00 2001
From: Matan Ziv-Av <matan@svgalib.org>
Date: Mon, 19 Sep 2022 10:56:21 +0300
Subject: [PATCH 862/912] Fixed: Use Canvas.drawTextRun instead of drawText

drawText does (very) basic BiDi, which causes inconsistent behaviour.
This ensures everything is LtR.
---
 .../src/main/java/com/termux/view/TerminalRenderer.java         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/terminal-view/src/main/java/com/termux/view/TerminalRenderer.java b/terminal-view/src/main/java/com/termux/view/TerminalRenderer.java
index 307e422694..a4bef7d37c 100644
--- a/terminal-view/src/main/java/com/termux/view/TerminalRenderer.java
+++ b/terminal-view/src/main/java/com/termux/view/TerminalRenderer.java
@@ -233,7 +233,7 @@ private void drawTextRun(Canvas canvas, char[] text, int[] palette, float y, int
             mTextPaint.setColor(foreColor);
 
             // The text alignment is the default Paint.Align.LEFT.
-            canvas.drawText(text, startCharIndex, runWidthChars, left, y - mFontLineSpacingAndAscent, mTextPaint);
+            canvas.drawTextRun(text, startCharIndex, runWidthChars, startCharIndex, runWidthChars, left, y - mFontLineSpacingAndAscent, false, mTextPaint);
         }
 
         if (savedMatrix) canvas.restore();

From 245158ceb98b58a3f179acbc89fab131081bf278 Mon Sep 17 00:00:00 2001
From: Tom Kranz <TpmKranz@users.noreply.github.com>
Date: Mon, 20 Jun 2022 17:51:49 +0200
Subject: [PATCH 863/912] Added: Basic MIME type recognition in ContentProvider

---
 app/src/main/java/com/termux/app/TermuxOpenReceiver.java | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/src/main/java/com/termux/app/TermuxOpenReceiver.java b/app/src/main/java/com/termux/app/TermuxOpenReceiver.java
index f8f21b5d32..f27f922cab 100644
--- a/app/src/main/java/com/termux/app/TermuxOpenReceiver.java
+++ b/app/src/main/java/com/termux/app/TermuxOpenReceiver.java
@@ -172,6 +172,13 @@ public Cursor query(@NonNull Uri uri, String[] projection, String selection, Str
 
         @Override
         public String getType(@NonNull Uri uri) {
+            String path = uri.getLastPathSegment();
+            int extIndex = path.lastIndexOf('.') + 1;
+            if (extIndex > 0) {
+                MimeTypeMap mimeMap = MimeTypeMap.getSingleton();
+                String ext = path.substring(extIndex).toLowerCase();
+                return mimeMap.getMimeTypeFromExtension(ext);
+            }
             return null;
         }
 

From d90e3fbca1af4f35b15ecfef6164590887a4e7cb Mon Sep 17 00:00:00 2001
From: Evgeny Zhabotinsky <evg-zhabotinsky@yandex.ru>
Date: Sun, 25 Sep 2022 05:25:14 +0300
Subject: [PATCH 864/912] Fixed: Make ScrollDown escape respect margins

SD sequence (`${CSI}${N}T`) was scrolling the whole width
 of the terminal instead of just between the margins.
RI sequence (`${ESC}M`, move cursor up 1 line) was doing the same.
Fixed that.

Fixes #2576 where in tmux scrolling one of several
 side-by-side panels down resulted in all visually scrolling.
---
 .../java/com/termux/terminal/TerminalEmulator.java     |  8 ++++----
 .../java/com/termux/terminal/ScrollRegionTest.java     | 10 ++++++++++
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java b/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
index 993e0c6895..3afb615080 100644
--- a/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
+++ b/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
@@ -1418,8 +1418,8 @@ private void doEsc(int b) {
                 // http://www.vt100.net/docs/vt100-ug/chapter3.html: "Move the active position to the same horizontal
                 // position on the preceding line. If the active position is at the top margin, a scroll down is performed".
                 if (mCursorRow <= mTopMargin) {
-                    mScreen.blockCopy(0, mTopMargin, mColumns, mBottomMargin - (mTopMargin + 1), 0, mTopMargin + 1);
-                    blockClear(0, mTopMargin, mColumns);
+                    mScreen.blockCopy(mLeftMargin, mTopMargin, mRightMargin - mLeftMargin, mBottomMargin - (mTopMargin + 1), mLeftMargin, mTopMargin + 1);
+                    blockClear(mLeftMargin, mTopMargin, mRightMargin - mLeftMargin);
                 } else {
                     mCursorRow--;
                 }
@@ -1628,8 +1628,8 @@ private void doCsi(int b) {
                     final int linesToScrollArg = getArg0(1);
                     final int linesBetweenTopAndBottomMargins = mBottomMargin - mTopMargin;
                     final int linesToScroll = Math.min(linesBetweenTopAndBottomMargins, linesToScrollArg);
-                    mScreen.blockCopy(0, mTopMargin, mColumns, linesBetweenTopAndBottomMargins - linesToScroll, 0, mTopMargin + linesToScroll);
-                    blockClear(0, mTopMargin, mColumns, linesToScroll);
+                    mScreen.blockCopy(mLeftMargin, mTopMargin, mRightMargin - mLeftMargin, linesBetweenTopAndBottomMargins - linesToScroll, mLeftMargin, mTopMargin + linesToScroll);
+                    blockClear(mLeftMargin, mTopMargin, mRightMargin - mLeftMargin, linesToScroll);
                 } else {
                     // "${CSI}${func};${startx};${starty};${firstrow};${lastrow}T" - initiate highlight mouse tracking.
                     unimplementedSequence(b);
diff --git a/terminal-emulator/src/test/java/com/termux/terminal/ScrollRegionTest.java b/terminal-emulator/src/test/java/com/termux/terminal/ScrollRegionTest.java
index 5d2679c513..039605a144 100644
--- a/terminal-emulator/src/test/java/com/termux/terminal/ScrollRegionTest.java
+++ b/terminal-emulator/src/test/java/com/termux/terminal/ScrollRegionTest.java
@@ -75,6 +75,16 @@ public void testNELRespectsLeftMargin() {
 		withTerminalSized(3, 3).enterString("\033[?69h\033[2sABC\033[?6h\033ED").assertLinesAre("ABC", " D ", "   ");
 	}
 
+	public void testRiRespectsLeftMargin() {
+		// Reverse Index (RI), ${ESC}M, should respect horizontal margins:
+		withTerminalSized(4, 3).enterString("ABCD\033[?69h\033[2;3s\033[?6h\033M").assertLinesAre("A  D", " BC ", "    ");
+	}
+
+	public void testSdRespectsLeftMargin() {
+		// Scroll Down (SD), ${CSI}${N}T, should respect horizontal margins:
+		withTerminalSized(4, 3).enterString("ABCD\033[?69h\033[2;3s\033[?6h\033[2T").assertLinesAre("A  D", "    ", " BC ");
+	}
+
 	public void testBackwardIndex() {
 		// vttest "Menu 11.3.2: VT420 Cursor-Movement Test", test 7.
 		// Without margins:

From 8be53336c381f427137d60170269966a08b6f462 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Tue, 17 Sep 2024 13:18:52 +0200
Subject: [PATCH 865/912] Fixed: Implement colon separated CSI parameters

---
 .../com/termux/terminal/TerminalEmulator.java | 81 +++++++++++++------
 .../ControlSequenceIntroducerTest.java        | 46 +++++++++++
 .../com/termux/terminal/TerminalTest.java     | 43 ++++++----
 3 files changed, 133 insertions(+), 37 deletions(-)

diff --git a/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java b/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
index 3afb615080..4e5a833c39 100644
--- a/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
+++ b/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
@@ -84,8 +84,8 @@ public final class TerminalEmulator {
     /** Escape processing: "ESC _" or Application Program Command (APC), followed by Escape. */
     private static final int ESC_APC_ESCAPE = 21;
 
-    /** The number of parameter arguments. This name comes from the ANSI standard for terminal escape codes. */
-    private static final int MAX_ESCAPE_PARAMETERS = 16;
+    /** The number of parameter arguments including colon separated sub-parameters. */
+    private static final int MAX_ESCAPE_PARAMETERS = 32;
 
     /** Needs to be large enough to contain reasonable OSC 52 pastes. */
     private static final int MAX_OSC_STRING_LENGTH = 8192;
@@ -178,6 +178,8 @@ public final class TerminalEmulator {
     private int mArgIndex;
     /** Holds the arguments of the current escape sequence. */
     private final int[] mArgs = new int[MAX_ESCAPE_PARAMETERS];
+    /** Holds the bit flags which arguments are sub parameters (after a colon) - bit N is set if <code>mArgs[N]</code> is a sub parameter. */
+    private int mArgsSubParamsBitSet = 0;
 
     /** Holds OSC and device control arguments, which can be strings. */
     private final StringBuilder mOSCOrDeviceControlArgs = new StringBuilder();
@@ -238,15 +240,17 @@ public final class TerminalEmulator {
     private boolean mCursorBlinkState;
 
     /**
-     * Current foreground and background colors. Can either be a color index in [0,259] or a truecolor (24-bit) value.
+     * Current foreground, background and underline 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.
      *
+     * <p>Note that the underline color is currently parsed but not yet used during rendering.
+     *
      * @see TextStyle
      */
-    int mForeColor, mBackColor;
+    int mForeColor, mBackColor, mUnderlineColor;
 
     /** Current {@link TextStyle} effect. */
-    private int mEffect;
+    int mEffect;
 
     /**
      * The number of scrolled lines since last calling {@link #clearScrollCounter()}. Used for moving selection up along
@@ -1324,6 +1328,7 @@ private void startEscapeSequence() {
         mEscapeState = ESC;
         mArgIndex = 0;
         Arrays.fill(mArgs, -1);
+        mArgsSubParamsBitSet = 0;
     }
 
     private void doLinefeed() {
@@ -1808,6 +1813,11 @@ private void doCsi(int b) {
     private void selectGraphicRendition() {
         if (mArgIndex >= mArgs.length) mArgIndex = mArgs.length - 1;
         for (int i = 0; i <= mArgIndex; i++) {
+            // Skip leading sub parameters:
+            if ((mArgsSubParamsBitSet & (1 << i)) != 0) {
+                continue;
+            }
+
             int code = getArg(i, 0, false);
             if (code < 0) {
                 if (mArgIndex > 0) {
@@ -1827,7 +1837,19 @@ private void selectGraphicRendition() {
             } else if (code == 3) {
                 mEffect |= TextStyle.CHARACTER_ATTRIBUTE_ITALIC;
             } else if (code == 4) {
-                mEffect |= TextStyle.CHARACTER_ATTRIBUTE_UNDERLINE;
+                if (i + 1 <= mArgIndex && ((mArgsSubParamsBitSet & (1 << (i + 1))) != 0)) {
+                    // Sub parameter, see https://sw.kovidgoyal.net/kitty/underlines/
+                    i++;
+                    if (mArgs[i] == 0) {
+                        // No underline.
+                        mEffect &= ~TextStyle.CHARACTER_ATTRIBUTE_UNDERLINE;
+                    } else {
+                        // Different variations of underlines: https://sw.kovidgoyal.net/kitty/underlines/
+                        mEffect |= TextStyle.CHARACTER_ATTRIBUTE_UNDERLINE;
+                    }
+                } else {
+                    mEffect |= TextStyle.CHARACTER_ATTRIBUTE_UNDERLINE;
+                }
             } else if (code == 5) {
                 mEffect |= TextStyle.CHARACTER_ATTRIBUTE_BLINK;
             } else if (code == 7) {
@@ -1856,8 +1878,8 @@ private void selectGraphicRendition() {
                 mEffect &= ~TextStyle.CHARACTER_ATTRIBUTE_STRIKETHROUGH;
             } else if (code >= 30 && code <= 37) {
                 mForeColor = code - 30;
-            } else if (code == 38 || code == 48) {
-                // Extended set foreground(38)/background (48) color.
+            } else if (code == 38 || code == 48 || code == 58) {
+                // Extended set foreground(38)/background(48)/underline(58) color.
                 // This is followed by either "2;$R;$G;$B" to set a 24-bit color or
                 // "5;$INDEX" to set an indexed color.
                 if (i + 2 > mArgIndex) continue;
@@ -1873,11 +1895,11 @@ private void selectGraphicRendition() {
                         if (red < 0 || green < 0 || blue < 0 || red > 255 || green > 255 || blue > 255) {
                             finishSequenceAndLogError("Invalid RGB: " + red + "," + green + "," + blue);
                         } else {
-                            int argbColor = 0xff000000 | (red << 16) | (green << 8) | blue;
-                            if (code == 38) {
-                                mForeColor = argbColor;
-                            } else {
-                                mBackColor = argbColor;
+                            int argbColor = 0xff_00_00_00 | (red << 16) | (green << 8) | blue;
+                            switch (code) {
+                                case 38: mForeColor = argbColor; break;
+                                case 48: mBackColor = argbColor; break;
+                                case 58: mUnderlineColor = argbColor; break;
                             }
                         }
                         i += 4; // "2;P_r;P_g;P_r"
@@ -1886,10 +1908,10 @@ private void selectGraphicRendition() {
                     int color = getArg(i + 2, 0, false);
                     i += 2; // "5;P_s"
                     if (color >= 0 && color < TextStyle.NUM_INDEXED_COLORS) {
-                        if (code == 38) {
-                            mForeColor = color;
-                        } else {
-                            mBackColor = color;
+                        switch (code) {
+                            case 38: mForeColor = color; break;
+                            case 48: mBackColor = color; break;
+                            case 58: mUnderlineColor = color; break;
                         }
                     } else {
                         if (LOG_ESCAPE_SEQUENCES) Logger.logWarn(mClient, LOG_TAG, "Invalid color index: " + color);
@@ -1903,6 +1925,8 @@ private void selectGraphicRendition() {
                 mBackColor = code - 40;
             } else if (code == 49) { // Set default background color.
                 mBackColor = TextStyle.COLOR_INDEX_BACKGROUND;
+            } else if (code == 59) { // Set default underline color.
+                mUnderlineColor = TextStyle.COLOR_INDEX_FOREGROUND;
             } else if (code >= 90 && code <= 97) { // Bright foreground colors (aixterm codes).
                 mForeColor = code - 90 + 8;
             } else if (code >= 100 && code <= 107) { // Bright background color (aixterm codes).
@@ -2152,15 +2176,21 @@ private void scrollDownOneLine() {
     /**
      * Process the next ASCII character of a parameter.
      *
-     * Parameter characters modify the action or interpretation of the sequence. You can use up to
-     * 16 parameters per sequence. You must use the ; character to separate parameters.
-     * All parameters are unsigned, positive decimal integers, with the most significant
+     * <p>You must use the ; character to separate parameters and : to separate sub-parameters.
+     *
+     * <p>Parameter characters modify the action or interpretation of the sequence. Originally
+     * you can use up to 16 parameters per sequence, but following at least xterm and alacritty
+     * we use a common space for parameters and sub-parameters, allowing 32 in total.
+     *
+     * <p>All parameters are unsigned, positive decimal integers, with the most significant
      * digit sent first. Any parameter greater than 9999 (decimal) is set to 9999
      * (decimal). If you do not specify a value, a 0 value is assumed. A 0 value
      * or omitted parameter indicates a default value for the sequence. For most
      * sequences, the default value is 1.
      *
-     * https://vt100.net/docs/vt510-rm/chapter4.html#S4.3.3
+     * <p>References:
+     * <a href="https://vt100.net/docs/vt510-rm/chapter4.html#S4.3.3">VT510 Video Terminal Programmer Information: Control Sequences</a>
+     * <a href="https://github.com/alacritty/vte/issues/22">alacritty/vte: Implement colon separated CSI parameters</a>
      * */
     private void parseArg(int b) {
         if (b >= '0' && b <= '9') {
@@ -2178,9 +2208,14 @@ private void parseArg(int b) {
                 mArgs[mArgIndex] = value;
             }
             continueSequence(mEscapeState);
-        } else if (b == ';') {
-            if (mArgIndex < mArgs.length) {
+        } else if (b == ';' || b == ':') {
+            if (mArgIndex + 1 < mArgs.length) {
                 mArgIndex++;
+                if (b == ':') {
+                    mArgsSubParamsBitSet |= 1 << mArgIndex;
+                }
+            } else {
+                logError("Too many parameters when in state: " + mEscapeState);
             }
             continueSequence(mEscapeState);
         } else {
diff --git a/terminal-emulator/src/test/java/com/termux/terminal/ControlSequenceIntroducerTest.java b/terminal-emulator/src/test/java/com/termux/terminal/ControlSequenceIntroducerTest.java
index c356baa891..9f123bc1d1 100644
--- a/terminal-emulator/src/test/java/com/termux/terminal/ControlSequenceIntroducerTest.java
+++ b/terminal-emulator/src/test/java/com/termux/terminal/ControlSequenceIntroducerTest.java
@@ -1,5 +1,7 @@
 package com.termux.terminal;
 
+import java.util.List;
+
 /** "\033[" is the Control Sequence Introducer char sequence (CSI). */
 public class ControlSequenceIntroducerTest extends TerminalTestCase {
 
@@ -82,4 +84,48 @@ public void testReportPixelSize() {
         assertEnteringStringGivesResponse("\033[16t", "\033[6;" + cellHeight + ";" + cellWidth + "t");
     }
 
+    /**
+     * See <a href="https://sw.kovidgoyal.net/kitty/underlines/">Colored and styled underlines</a>:
+     *
+     * <pre>
+     *  <ESC>[4:0m  # no underline
+     *  <ESC>[4:1m  # straight underline
+     *  <ESC>[4:2m  # double underline
+     *  <ESC>[4:3m  # curly underline
+     *  <ESC>[4:4m  # dotted underline
+     *  <ESC>[4:5m  # dashed underline
+     *  <ESC>[4m    # straight underline (for backwards compat)
+     *  <ESC>[24m   # no underline (for backwards compat)
+     * </pre>
+     * <p>
+     * We currently parse the variants, but map them to normal/no underlines as appropriate
+     */
+    public void testUnderlineVariants() {
+        for (String suffix : List.of("", ":1", ":2", ":3", ":4", ":5")) {
+            for (String stop : List.of("24", "4:0")) {
+                withTerminalSized(3, 3);
+                enterString("\033[4" + suffix + "m").assertLinesAre("   ", "   ", "   ");
+                assertEquals(TextStyle.CHARACTER_ATTRIBUTE_UNDERLINE, mTerminal.mEffect);
+                enterString("\033[4;1m").assertLinesAre("   ", "   ", "   ");
+                assertEquals(TextStyle.CHARACTER_ATTRIBUTE_BOLD | TextStyle.CHARACTER_ATTRIBUTE_UNDERLINE, mTerminal.mEffect);
+                enterString("\033[" + stop + "m").assertLinesAre("   ", "   ", "   ");
+                assertEquals(TextStyle.CHARACTER_ATTRIBUTE_BOLD, mTerminal.mEffect);
+            }
+        }
+    }
+
+    public void testManyParameters() {
+        StringBuilder b = new StringBuilder("\033[");
+        for (int i = 0; i < 30; i++) {
+            b.append("0;");
+        }
+        b.append("4:2");
+        // This clearing of underline should be ignored as the parameters pass the threshold for too many parameters:
+        b.append("4:0m");
+        withTerminalSized(3, 3)
+            .enterString(b.toString())
+            .assertLinesAre("   ", "   ", "   ");
+        assertEquals(TextStyle.CHARACTER_ATTRIBUTE_UNDERLINE, mTerminal.mEffect);
+    }
+
 }
diff --git a/terminal-emulator/src/test/java/com/termux/terminal/TerminalTest.java b/terminal-emulator/src/test/java/com/termux/terminal/TerminalTest.java
index 739529a841..3e1f824265 100644
--- a/terminal-emulator/src/test/java/com/termux/terminal/TerminalTest.java
+++ b/terminal-emulator/src/test/java/com/termux/terminal/TerminalTest.java
@@ -137,6 +137,11 @@ public void testPaste() {
 	}
 
 	public void testSelectGraphics() {
+		selectGraphicsTestRun(';');
+		selectGraphicsTestRun(':');
+	}
+
+	public void selectGraphicsTestRun(char separator) {
 		withTerminalSized(5, 5);
 		enterString("\033[31m");
 		assertEquals(mTerminal.mForeColor, 1);
@@ -155,16 +160,20 @@ public void testSelectGraphics() {
         // Check TerminalEmulator.parseArg()
         enterString("\033[31m\033[m");
         assertEquals(TextStyle.COLOR_INDEX_FOREGROUND, mTerminal.mForeColor);
-        enterString("\033[31m\033[;m");
+        enterString("\033[31m\033[;m".replace(';', separator));
         assertEquals(TextStyle.COLOR_INDEX_FOREGROUND, mTerminal.mForeColor);
         enterString("\033[31m\033[0m");
         assertEquals(TextStyle.COLOR_INDEX_FOREGROUND, mTerminal.mForeColor);
-        enterString("\033[31m\033[0;m");
+        enterString("\033[31m\033[0;m".replace(';', separator));
         assertEquals(TextStyle.COLOR_INDEX_FOREGROUND, mTerminal.mForeColor);
         enterString("\033[31;;m");
         assertEquals(TextStyle.COLOR_INDEX_FOREGROUND, mTerminal.mForeColor);
+        enterString("\033[31::m");
+        assertEquals(1, mTerminal.mForeColor);
         enterString("\033[31;m");
         assertEquals(TextStyle.COLOR_INDEX_FOREGROUND, mTerminal.mForeColor);
+        enterString("\033[31:m");
+        assertEquals(1, mTerminal.mForeColor);
         enterString("\033[31;;41m");
         assertEquals(TextStyle.COLOR_INDEX_FOREGROUND, mTerminal.mForeColor);
         assertEquals(1, mTerminal.mBackColor);
@@ -172,38 +181,38 @@ public void testSelectGraphics() {
         assertEquals(TextStyle.COLOR_INDEX_BACKGROUND, mTerminal.mBackColor);
 
 		// 256 colors:
-		enterString("\033[38;5;119m");
+		enterString("\033[38;5;119m".replace(';', separator));
 		assertEquals(119, mTerminal.mForeColor);
 		assertEquals(TextStyle.COLOR_INDEX_BACKGROUND, mTerminal.mBackColor);
-		enterString("\033[48;5;129m");
+		enterString("\033[48;5;129m".replace(';', separator));
 		assertEquals(119, mTerminal.mForeColor);
 		assertEquals(129, mTerminal.mBackColor);
 
 		// Invalid parameter:
-		enterString("\033[48;8;129m");
+		enterString("\033[48;8;129m".replace(';', separator));
 		assertEquals(119, mTerminal.mForeColor);
 		assertEquals(129, mTerminal.mBackColor);
 
 		// Multiple parameters at once:
-		enterString("\033[38;5;178;48;5;179m");
+		enterString("\033[38;5;178".replace(';', separator) + ";" + "48;5;179m".replace(';', separator));
 		assertEquals(178, mTerminal.mForeColor);
 		assertEquals(179, mTerminal.mBackColor);
 
 		// Omitted parameter means zero:
-		enterString("\033[38;5;m");
+		enterString("\033[38;5;m".replace(';', separator));
 		assertEquals(0, mTerminal.mForeColor);
 		assertEquals(179, mTerminal.mBackColor);
-		enterString("\033[48;5;m");
+		enterString("\033[48;5;m".replace(';', separator));
 		assertEquals(0, mTerminal.mForeColor);
 		assertEquals(0, mTerminal.mBackColor);
 
 		// 24 bit colors:
 		enterString(("\033[0m")); // Reset fg and bg colors.
-		enterString("\033[38;2;255;127;2m");
+		enterString("\033[38;2;255;127;2m".replace(';', separator));
 		int expectedForeground = 0xff000000 | (255 << 16) | (127 << 8) | 2;
 		assertEquals(expectedForeground, mTerminal.mForeColor);
 		assertEquals(TextStyle.COLOR_INDEX_BACKGROUND, mTerminal.mBackColor);
-		enterString("\033[48;2;1;2;254m");
+		enterString("\033[48;2;1;2;254m".replace(';', separator));
 		int expectedBackground = 0xff000000 | (1 << 16) | (2 << 8) | 254;
 		assertEquals(expectedForeground, mTerminal.mForeColor);
 		assertEquals(expectedBackground, mTerminal.mBackColor);
@@ -212,24 +221,30 @@ public void testSelectGraphics() {
 		enterString(("\033[0m")); // Reset fg and bg colors.
 		assertEquals(TextStyle.COLOR_INDEX_FOREGROUND, mTerminal.mForeColor);
 		assertEquals(TextStyle.COLOR_INDEX_BACKGROUND, mTerminal.mBackColor);
-		enterString("\033[38;2;255;127;2;48;2;1;2;254m");
+		enterString("\033[38;2;255;127;2".replace(';', separator) + ";" + "48;2;1;2;254m".replace(';', separator));
 		assertEquals(expectedForeground, mTerminal.mForeColor);
 		assertEquals(expectedBackground, mTerminal.mBackColor);
 
 		// 24 bit colors, invalid input:
-		enterString("\033[38;2;300;127;2;48;2;1;300;254m");
+		enterString("\033[38;2;300;127;2;48;2;1;300;254m".replace(';', separator));
 		assertEquals(expectedForeground, mTerminal.mForeColor);
 		assertEquals(expectedBackground, mTerminal.mBackColor);
 
 		// 24 bit colors, omitted parameter means zero:
-		enterString("\033[38;2;255;127;m");
+		enterString("\033[38;2;255;127;m".replace(';', separator));
 		expectedForeground = 0xff000000 | (255 << 16) | (127 << 8);
 		assertEquals(expectedForeground, mTerminal.mForeColor);
 		assertEquals(expectedBackground, mTerminal.mBackColor);
-		enterString("\033[38;2;123;;77m");
+		enterString("\033[38;2;123;;77m".replace(';', separator));
 		expectedForeground = 0xff000000 | (123 << 16) | 77;
 		assertEquals(expectedForeground, mTerminal.mForeColor);
 		assertEquals(expectedBackground, mTerminal.mBackColor);
+
+		// 24 bit colors, extra sub-parameters are skipped:
+		expectedForeground = 0xff000000 | (255 << 16) | (127 << 8) | 2;
+		enterString("\033[0;38:2:255:127:2:48:2:1:2:254m");
+		assertEquals(expectedForeground, mTerminal.mForeColor);
+		assertEquals(TextStyle.COLOR_INDEX_BACKGROUND, mTerminal.mBackColor);
 	}
 
 	public void testBackgroundColorErase() {

From b84dc703e82105d4fcbfb1501632cece1322fa37 Mon Sep 17 00:00:00 2001
From: Jason Yu <jasonyu@fas.harvard.edu>
Date: Sun, 20 Oct 2024 02:00:00 -0400
Subject: [PATCH 866/912] Added: Add empty and null strings tests for invalid
 urls to `FileReceiverActivityTest`

---
 .../java/com/termux/app/api/file/FileReceiverActivityTest.java  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/test/java/com/termux/app/api/file/FileReceiverActivityTest.java b/app/src/test/java/com/termux/app/api/file/FileReceiverActivityTest.java
index 1107671daf..7965255b73 100644
--- a/app/src/test/java/com/termux/app/api/file/FileReceiverActivityTest.java
+++ b/app/src/test/java/com/termux/app/api/file/FileReceiverActivityTest.java
@@ -26,6 +26,8 @@ public void testIsSharedTextAnUrl() {
 
         List<String> invalidUrls = new ArrayList<>();
         invalidUrls.add("a test with example.com");
+        invalidUrls.add("");
+        invalidUrls.add(null);
         for (String url : invalidUrls) {
             Assert.assertFalse(FileReceiverActivity.isSharedTextAnUrl(url));
         }

From fb01127ff2c95f6fa5f86a77956ca2d68afad9a9 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Mon, 28 Oct 2024 12:45:39 +0500
Subject: [PATCH 867/912] Fixed: Fix tests added in b84dc703

---
 .../main/java/com/termux/app/api/file/FileReceiverActivity.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/java/com/termux/app/api/file/FileReceiverActivity.java b/app/src/main/java/com/termux/app/api/file/FileReceiverActivity.java
index 3ce524f6b2..ca5c07407c 100644
--- a/app/src/main/java/com/termux/app/api/file/FileReceiverActivity.java
+++ b/app/src/main/java/com/termux/app/api/file/FileReceiverActivity.java
@@ -55,6 +55,8 @@ public class FileReceiverActivity extends AppCompatActivity {
     private static final String LOG_TAG = "FileReceiverActivity";
 
     static boolean isSharedTextAnUrl(String sharedText) {
+        if (sharedText == null || sharedText.isEmpty()) return false;
+
         return Patterns.WEB_URL.matcher(sharedText).matches()
             || Pattern.matches("magnet:\\?xt=urn:btih:.*?", sharedText);
     }

From 078eea2b74173d4b28884af746d6c6b3c0208193 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Mon, 13 Jan 2025 01:22:41 +0500
Subject: [PATCH 868/912] Added: Rename app classes in `TermuxConstants` with
 `_APP` suffix added and add `TERMUX_*_MAIN_ACTIVITY_NAME` and
 `TERMUX_*_LAUNCHER_ACTIVITY_NAME` constants to each app class

---
 .../termux/shared/termux/TermuxConstants.java | 64 +++++++++++++++----
 1 file changed, 53 insertions(+), 11 deletions(-)

diff --git a/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java b/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
index 59f523af72..534936ffca 100644
--- a/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
+++ b/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
@@ -1,6 +1,7 @@
 package com.termux.shared.termux;
 
 import android.annotation.SuppressLint;
+import android.content.Intent;
 
 import com.termux.shared.shell.command.ExecutionCommand;
 import com.termux.shared.shell.command.ExecutionCommand.Runner;
@@ -11,7 +12,7 @@
 import java.util.List;
 
 /*
- * Version: v0.52.0
+ * Version: v0.53.0
  * SPDX-License-Identifier: MIT
  *
  * Changelog
@@ -277,6 +278,10 @@
  *
  * - 0.52.0 (2022-06-18)
  *      - Added `TERMUX_PREFIX_DIR_IGNORED_SUB_FILES_PATHS_TO_CONSIDER_AS_EMPTY`.
+ *
+ * - 0.53.0 (2025-01-12)
+ *      - Renamed `TERMUX_API`, `TERMUX_STYLING`, `TERMUX_TASKER`, `TERMUX_WIDGET` classes with `_APP` suffix added.
+ *      - Added `TERMUX_*_MAIN_ACTIVITY_NAME` and `TERMUX_*_LAUNCHER_ACTIVITY_NAME` constants to each app class.
  */
 
 /**
@@ -1192,10 +1197,30 @@ public static final class RUN_COMMAND_SERVICE {
     /**
      * Termux:API app constants.
      */
-    public static final class TERMUX_API {
+    public static final class TERMUX_API_APP {
+
+        /** Termux:API app main activity name. */
+        public static final String TERMUX_API_MAIN_ACTIVITY_NAME = TERMUX_API_PACKAGE_NAME + ".activities.TermuxAPIMainActivity"; // Default: "com.termux.api.activities.TermuxAPIMainActivity"
+
+        /** Termux:API app launcher activity name. This is an `activity-alias` for {@link #TERMUX_API_MAIN_ACTIVITY_NAME} used for launchers with {@link Intent#CATEGORY_LAUNCHER}. */
+        public static final String TERMUX_API_LAUNCHER_ACTIVITY_NAME = TERMUX_API_PACKAGE_NAME + ".activities.TermuxAPILauncherActivity"; // Default: "com.termux.api.activities.TermuxAPILauncherActivity"
+
+    }
+
+
+
+
+
+    /**
+     * Termux:Boot app constants.
+     */
+    public static final class TERMUX_BOOT_APP {
+
+        /** Termux:Boot app main activity name. */
+        public static final String TERMUX_BOOT_MAIN_ACTIVITY_NAME = TERMUX_BOOT_PACKAGE_NAME + ".activities.TermuxBootMainActivity"; // Default: "com.termux.boot.activities.TermuxBootMainActivity"
 
-        /** Termux:API app core activity name. */
-        public static final String TERMUX_API_ACTIVITY_NAME = TERMUX_API_PACKAGE_NAME + ".activities.TermuxAPIActivity"; // Default: "com.termux.tasker.activities.TermuxAPIActivity"
+        /** Termux:Boot app launcher activity name. This is an `activity-alias` for {@link #TERMUX_BOOT_MAIN_ACTIVITY_NAME} used for launchers with {@link Intent#CATEGORY_LAUNCHER}. */
+        public static final String TERMUX_BOOT_LAUNCHER_ACTIVITY_NAME = TERMUX_BOOT_PACKAGE_NAME + ".activities.TermuxBootLauncherActivity"; // Default: "com.termux.boot.activities.TermuxBootLauncherActivity"
 
     }
 
@@ -1208,6 +1233,9 @@ public static final class TERMUX_API {
      */
     public static final class TERMUX_FLOAT_APP {
 
+        /** Termux:Float app core activity name. */
+        public static final String TERMUX_FLOAT_ACTIVITY_NAME = TERMUX_FLOAT_PACKAGE_NAME + ".TermuxFloatActivity"; // Default: "com.termux.window.TermuxFloatActivity"
+
         /** Termux:Float app core service name. */
         public static final String TERMUX_FLOAT_SERVICE_NAME = TERMUX_FLOAT_PACKAGE_NAME + ".TermuxFloatService"; // Default: "com.termux.window.TermuxFloatService"
 
@@ -1236,11 +1264,18 @@ public static final class TERMUX_FLOAT_SERVICE {
     /**
      * Termux:Styling app constants.
      */
-    public static final class TERMUX_STYLING {
+    public static final class TERMUX_STYLING_APP {
 
         /** Termux:Styling app core activity name. */
         public static final String TERMUX_STYLING_ACTIVITY_NAME = TERMUX_STYLING_PACKAGE_NAME + ".TermuxStyleActivity"; // Default: "com.termux.styling.TermuxStyleActivity"
 
+
+        /** Termux:Styling app main activity name. */
+        public static final String TERMUX_STYLING_MAIN_ACTIVITY_NAME = TERMUX_STYLING_PACKAGE_NAME + ".activities.TermuxStylingMainActivity"; // Default: "com.termux.styling.activities.TermuxStylingMainActivity"
+
+        /** Termux:Styling app launcher activity name. This is an `activity-alias` for {@link #TERMUX_STYLING_MAIN_ACTIVITY_NAME} used for launchers with {@link Intent#CATEGORY_LAUNCHER}. */
+        public static final String TERMUX_STYLING_LAUNCHER_ACTIVITY_NAME = TERMUX_STYLING_PACKAGE_NAME + ".activities.TermuxStylingLauncherActivity"; // Default: "com.termux.styling.activities.TermuxStylingLauncherActivity"
+
     }
 
 
@@ -1250,10 +1285,13 @@ public static final class TERMUX_STYLING {
     /**
      * Termux:Tasker app constants.
      */
-    public static final class TERMUX_TASKER {
+    public static final class TERMUX_TASKER_APP {
+
+        /** Termux:Tasker app main activity name. */
+        public static final String TERMUX_TASKER_MAIN_ACTIVITY_NAME = TERMUX_TASKER_PACKAGE_NAME + ".activities.TermuxTaskerMainActivity"; // Default: "com.termux.tasker.activities.TermuxTaskerMainActivity"
 
-        /** Termux:Tasker app core activity name. */
-        public static final String TERMUX_TASKER_ACTIVITY_NAME = TERMUX_TASKER_PACKAGE_NAME + ".activities.TermuxTaskerActivity"; // Default: "com.termux.tasker.activities.TermuxTaskerActivity"
+        /** Termux:Tasker app launcher activity name. This is an `activity-alias` for {@link #TERMUX_TASKER_MAIN_ACTIVITY_NAME} used for launchers with {@link Intent#CATEGORY_LAUNCHER}. */
+        public static final String TERMUX_TASKER_LAUNCHER_ACTIVITY_NAME = TERMUX_TASKER_PACKAGE_NAME + ".activities.TermuxTaskerLauncherActivity"; // Default: "com.termux.tasker.activities.TermuxTaskerLauncherActivity"
 
     }
 
@@ -1264,15 +1302,19 @@ public static final class TERMUX_TASKER {
     /**
      * Termux:Widget app constants.
      */
-    public static final class TERMUX_WIDGET {
+    public static final class TERMUX_WIDGET_APP {
 
-        /** Termux:Widget app core activity name. */
-        public static final String TERMUX_WIDGET_ACTIVITY_NAME = TERMUX_WIDGET_PACKAGE_NAME + ".activities.TermuxWidgetActivity"; // Default: "com.termux.widget.activities.TermuxWidgetActivity"
+        /** Termux:Widget app main activity name. */
+        public static final String TERMUX_WIDGET_MAIN_ACTIVITY_NAME = TERMUX_WIDGET_PACKAGE_NAME + ".activities.TermuxWidgetMainActivity"; // Default: "com.termux.widget.activities.TermuxWidgetMainActivity"
+
+        /** Termux:Widget app launcher activity name. This is an `activity-alias` for {@link #TERMUX_WIDGET_MAIN_ACTIVITY_NAME} used for launchers with {@link Intent#CATEGORY_LAUNCHER}. */
+        public static final String TERMUX_WIDGET_LAUNCHER_ACTIVITY_NAME = TERMUX_WIDGET_PACKAGE_NAME + ".activities.TermuxWidgetLauncherActivity"; // Default: "com.termux.widget.activities.TermuxWidgetLauncherActivity"
 
 
         /**  Intent {@code String} extra for the token of the Termux:Widget app shortcuts. */
         public static final String EXTRA_TOKEN_NAME = TERMUX_PACKAGE_NAME + ".shortcut.token"; // Default: "com.termux.shortcut.token"
 
+
         /**
          * Termux:Widget app {@link android.appwidget.AppWidgetProvider} class.
          */

From b0e1dbc3da72b2716a3813a8e7991365478b6095 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Mon, 13 Jan 2025 01:50:45 +0500
Subject: [PATCH 869/912] Fixed: Use `TERMUX_STYLING_APP` for
 `TERMUX_STYLING_ACTIVITY_NAME` as per 078eea2b

---
 app/src/main/java/com/termux/app/TermuxActivity.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index e624d9e100..0c9f74125b 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -736,7 +736,7 @@ private void onResetTerminalSession(TerminalSession session) {
 
     private void showStylingDialog() {
         Intent stylingIntent = new Intent();
-        stylingIntent.setClassName(TermuxConstants.TERMUX_STYLING_PACKAGE_NAME, TermuxConstants.TERMUX_STYLING.TERMUX_STYLING_ACTIVITY_NAME);
+        stylingIntent.setClassName(TermuxConstants.TERMUX_STYLING_PACKAGE_NAME, TermuxConstants.TERMUX_STYLING_APP.TERMUX_STYLING_ACTIVITY_NAME);
         try {
             startActivity(stylingIntent);
         } catch (ActivityNotFoundException | IllegalArgumentException e) {

From 52da00e5c270a9049c37d46d42899eeffc27da1f Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Mon, 13 Jan 2025 03:41:34 +0500
Subject: [PATCH 870/912] Fixed: Fix gradle build error if using jdk `17`

`Unable to make field private final java.lang.String java.io.File.path accessible: module java.base does not "opens java.io" to unnamed module`
---
 gradle.properties | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index fc751ab345..90de122196 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -12,7 +12,12 @@
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
-org.gradle.jvmargs=-Xmx2048M
+org.gradle.jvmargs=-Xmx2048M \
+--add-exports=java.base/sun.nio.ch=ALL-UNNAMED \
+--add-opens=java.base/java.lang=ALL-UNNAMED \
+--add-opens=java.base/java.lang.reflect=ALL-UNNAMED \
+--add-opens=java.base/java.io=ALL-UNNAMED \
+--add-exports=jdk.unsupported/sun.misc=ALL-UNNAMED
 android.useAndroidX=true
 
 minSdkVersion=21

From d2cd6ac2e579869b4fa1b1d2737c434e64c20fb9 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 25 Jan 2025 02:20:48 +0500
Subject: [PATCH 871/912] Changed|Fixed: Bump
 `org.lsposed.hiddenapibypass:hiddenapibypass` to `5.0` to fix crash on
 Android 16

```
Build fingerprint: 'google/sdk_gphone64_x86_64/emu64xa:Baklava/BP22.250103.008/12932282:userdebug/dev-keys'
Revision: '0'
ABI: 'x86_64'
Timestamp: 2025-01-25
Process uptime: 1s
Cmdline: com.termux
pid: 4700, tid: 4700, name: com.termux  >>> com.termux <<<
uid: 10212
signal 11 (SIGSEGV), code 1 (SEGV_MAPERR), fault addr 0x000000000000000c
Cause: null pointer dereference
    rax 0000000000000000  rbx 000071ad67c247b0  rcx 000000000000000c  rdx 000071abc520c888
    r8  00005f2000006018  r9  0000607c00006004  r10 000071abc423d68c  r11 000071abc4cca7c0
    r12 00007ffc65da8240  r13 000071ad67c24858  r14 00007ffc65da85d8  r15 000071ad67c247b0
    rdi 000071ad87c26110  rsi 00007ffc65da8148
    rbp 00007ffc65da8050  rsp 00007ffc65da8040  rip 000071abc4cca817
124 total frames
backtrace:
      #00 pc 00000000008ca817  /apex/com.android.art/lib64/libart.so (art::Unsafe_getObject(_JNIEnv*, _jobject*, _jobject*, long) (.__uniq.306581074569039686346581217366878976736)+87) (BuildId: 99c067c739342eb9769974bbb229d3b3)
      #01 pc 000000000022c80b  /apex/com.android.art/lib64/libart.so (art_quick_generic_jni_trampoline+219) (BuildId: 99c067c739342eb9769974bbb229d3b3)
      #02 pc 0000000000211dd4  /apex/com.android.art/lib64/libart.so (art_quick_invoke_stub+756) (BuildId: 99c067c739342eb9769974bbb229d3b3)
      #03 pc 0000000000556155  /apex/com.android.art/lib64/libart.so (art::ArtMethod::Invoke(art::Thread*, unsigned int*, unsigned int, art::JValue*, char const*)+181) (BuildId: 99c067c739342eb9769974bbb229d3b3)
      #04 pc 00000000006dd182  /apex/com.android.art/lib64/libart.so (bool art::interpreter::DoCall<false>(art::ArtMethod*, art::Thread*, art::ShadowFrame&, art::Instruction const*, unsigned short, bool, art::JValue*)+2434) (BuildId: 99c067c739342eb9769974bbb229d3b3)
      #05 pc 0000000000233564  /apex/com.android.art/lib64/libart.so (void art::interpreter::ExecuteSwitchImplCpp<false>(art::interpreter::SwitchImplContext*)+10804) (BuildId: 99c067c739342eb9769974bbb229d3b3)
      #06 pc 000000000022eb25  /apex/com.android.art/lib64/libart.so (ExecuteSwitchImplAsm+5) (BuildId: 99c067c739342eb9769974bbb229d3b3)
      #07 pc 0000000000080eb4  <anonymous:71ab3d335000> (org.lsposed.hiddenapibypass.HiddenApiBypass.getDeclaredMethods+0)
      ...
      #13 pc 0000000000080dd0  <anonymous:71ab3d335000> (org.lsposed.hiddenapibypass.HiddenApiBypass.setHiddenApiExemptions+0)
      ...
      #19 pc 0000000000080cf8  <anonymous:71ab3d335000> (org.lsposed.hiddenapibypass.HiddenApiBypass.addHiddenApiExemptions+0)
      ...
      #25 pc 0000000000005ab4  <anonymous:71ae82992000> (com.termux.shared.reflection.ReflectionUtils.bypassHiddenAPIReflectionRestrictions+0)
      ...
      #31 pc 0000000000004738  <anonymous:71ae86607000> (com.termux.shared.android.SELinuxUtils.getContext+0)
      ...
      #37 pc 0000000000005b48  <anonymous:71ae825d8000> (com.termux.shared.termux.shell.command.environment.TermuxAppShellEnvironment.setTermuxAppEnvironment+0)
      ...
      #43 pc 000000000000603c  <anonymous:71ae825d8000> (com.termux.shared.termux.shell.command.environment.TermuxShellEnvironment.init+0)
      ...
      #49 pc 0000000000006a68  <anonymous:71ae7e1c2000> (com.termux.app.TermuxApplication.onCreate+0)
```

Related commit https://github.com/LSPosed/AndroidHiddenApiBypass/commit/40b4cafa478ab464c55b28c16cc12802a3bb2c59
Related issue https://github.com/LSPosed/AndroidHiddenApiBypass/issues/52

Closes #4368
---
 termux-shared/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/termux-shared/build.gradle b/termux-shared/build.gradle
index d44a8e4573..7c3cfcc71d 100644
--- a/termux-shared/build.gradle
+++ b/termux-shared/build.gradle
@@ -14,7 +14,7 @@ android {
         implementation "io.noties.markwon:ext-strikethrough:$markwonVersion"
         implementation "io.noties.markwon:linkify:$markwonVersion"
         implementation "io.noties.markwon:recycler:$markwonVersion"
-        implementation "org.lsposed.hiddenapibypass:hiddenapibypass:2.0"
+        implementation "org.lsposed.hiddenapibypass:hiddenapibypass:5.0"
 
         // Do not increment version higher than 1.0.0-alpha09 since it will break ViewUtils and needs to be looked into
         // noinspection GradleDependency

From a988383e01b4bb76f5c0724421dd95047acea14a Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Sat, 1 Mar 2025 15:59:13 +0100
Subject: [PATCH 872/912] Fixed: Fully consume unknown CSI sequences containing
 unsupported parameter and intermediate bytes

Standard ECMA-48: Control Functions for Coded Character Sets specifies the format of CSI commands.
- https://en.wikipedia.org/wiki/ANSI_escape_code#Control_Sequence_Introducer_commands
- https://invisible-island.net/xterm/ecma-48-parameter-format.html#section5.4

Previously unsupported bytes would be echoed to the terminal.

```shell
$ printf '\x1b[=u' # PF
u
$ printf '\x1b[=5u' # PPF
5u
$ printf '\x1b[=5!u' # PPIF
5!u
$ printf '\x1b[=5!%u' # PPIIF
5!0
$ printf '\x1b[=?5!%u' # PPPIIF
?5!0
```

This fixes a problem with fish shell 4.0.0 which uses that sequence.

Closes #4338

Co-authored-by: @krobelus <aclopte@gmail.com>
Co-authored-by: @agnostic-apollo  <agnosticapollo@gmail.com>
---
 .../com/termux/terminal/TerminalEmulator.java | 47 ++++++++++++++++++-
 1 file changed, 45 insertions(+), 2 deletions(-)

diff --git a/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java b/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
index 4e5a833c39..b0be6f3440 100644
--- a/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
+++ b/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
@@ -83,6 +83,10 @@ public final class TerminalEmulator {
     private static final int ESC_APC = 20;
     /** Escape processing: "ESC _" or Application Program Command (APC), followed by Escape. */
     private static final int ESC_APC_ESCAPE = 21;
+    /** Escape processing: ESC [ <parameter bytes> */
+    private static final int ESC_CSI_UNSUPPORTED_PARAMETER_BYTE = 22;
+    /** Escape processing: ESC [ <parameter bytes> <intermediate bytes> */
+    private static final int ESC_CSI_UNSUPPORTED_INTERMEDIATE_BYTE = 23;
 
     /** The number of parameter arguments including colon separated sub-parameters. */
     private static final int MAX_ESCAPE_PARAMETERS = 32;
@@ -658,6 +662,10 @@ public void processCodePoint(int b) {
                     case ESC_CSI:
                         doCsi(b);
                         break;
+                    case ESC_CSI_UNSUPPORTED_PARAMETER_BYTE:
+                    case ESC_CSI_UNSUPPORTED_INTERMEDIATE_BYTE:
+                        doCsiUnsupportedParameterOrIntermediateByte(b);
+                        break;
                     case ESC_CSI_EXCLAMATION:
                         if (b == 'p') { // Soft terminal reset (DECSTR, http://vt100.net/docs/vt510-rm/DECSTR).
                             reset();
@@ -1059,6 +1067,37 @@ private int nextTabStop(int numTabs) {
         return mRightMargin - 1;
     }
 
+    /**
+     * Process byte while in the {@link #ESC_CSI_UNSUPPORTED_PARAMETER_BYTE} or
+     * {@link #ESC_CSI_UNSUPPORTED_INTERMEDIATE_BYTE} escape state.
+     *
+     * Parse unsupported parameter, intermediate and final bytes but ignore them.
+     *
+     * > For Control Sequence Introducer, ... the ESC [ is followed by
+     * > - any number (including none) of "parameter bytes" in the range 0x30–0x3F (ASCII 0–9:;<=>?),
+     * > - then by any number of "intermediate bytes" in the range 0x20–0x2F (ASCII space and !"#$%&'()*+,-./),
+     * > - then finally by a single "final byte" in the range 0x40–0x7E (ASCII @A–Z[\]^_`a–z{|}~).
+     *
+     * - https://en.wikipedia.org/wiki/ANSI_escape_code#Control_Sequence_Introducer_commands
+     * - https://invisible-island.net/xterm/ecma-48-parameter-format.html#section5.4
+     */
+    private void doCsiUnsupportedParameterOrIntermediateByte(int b) {
+        if (mEscapeState == ESC_CSI_UNSUPPORTED_PARAMETER_BYTE && b >= 0x30 && b <= 0x3F) {
+            // Supported `0–9:;>?` or unsupported `<=` parameter byte after an
+            // initial unsupported parameter byte in `doCsi()`, or a sequential parameter byte.
+            continueSequence(ESC_CSI_UNSUPPORTED_PARAMETER_BYTE);
+        } else if (b >= 0x20 && b <= 0x2F) {
+            // Optional intermediate byte `!"#$%&'()*+,-./` after parameter or intermediate byte.
+            continueSequence(ESC_CSI_UNSUPPORTED_INTERMEDIATE_BYTE);
+        } else if (b >= 0x40 && b <= 0x7E) {
+            // Final byte `@A–Z[\]^_`a–z{|}~` after parameter or intermediate byte.
+            // Calling `unknownSequence()` would log an error with only a final byte, so ignore it for now.
+            finishSequence();
+        } else {
+            unknownSequence(b);
+        }
+    }
+
     /** Process byte while in the {@link #ESC_CSI_QUESTIONMARK} escape state. */
     private void doCsiQuestionMark(int b) {
         switch (b) {
@@ -1656,12 +1695,16 @@ private void doCsi(int b) {
                     }
                 mCursorCol = newCol;
                 break;
-            case '?': // Esc [ ? -- start of a private mode set
+            case '?': // Esc [ ? -- start of a private parameter byte
                 continueSequence(ESC_CSI_QUESTIONMARK);
                 break;
-            case '>': // "Esc [ >" --
+            case '>': // "Esc [ >" -- start of a private parameter byte
                 continueSequence(ESC_CSI_BIGGERTHAN);
                 break;
+            case '<': // "Esc [ <" -- start of a private parameter byte
+            case '=': // "Esc [ =" -- start of a private parameter byte
+                continueSequence(ESC_CSI_UNSUPPORTED_PARAMETER_BYTE);
+                break;
             case '`': // Horizontal position absolute (HPA - http://www.vt100.net/docs/vt510-rm/HPA).
                 setCursorColRespectingOriginMode(getArg0(1) - 1);
                 break;

From 9ee1c9d5ad17cf8d48f890d15a8cf627bcfbbb65 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 29 Mar 2025 10:34:17 +0500
Subject: [PATCH 873/912] Fixed: Use `openjdk11` for jitpack builds of termux
 libraries

`Unrecognized option: --add-exports=java.base/sun.nio.ch=ALL-UNNAMED`

Related commit 52da00e5
---
 jitpack.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/jitpack.yml b/jitpack.yml
index 6a9b67d8bf..900c8ffd65 100644
--- a/jitpack.yml
+++ b/jitpack.yml
@@ -1,2 +1,4 @@
+jdk:
+  - openjdk11
 env:
   JITPACK_NDK_VERSION: "21.1.6352462"

From bc321d0a7c4f5391aa83ecf315cb8a47ff4cf090 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 29 Mar 2025 12:15:10 +0500
Subject: [PATCH 874/912] Changed(README): Set latest version to 0.118.2

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 5528c3f389..b5223aa790 100644
--- a/README.md
+++ b/README.md
@@ -49,7 +49,7 @@ The core [Termux](https://github.com/termux/termux-app) app comes with the follo
 
 ## Installation
 
-Latest version is `v0.118.1`.
+Latest version is `v0.118.2`.
 
 **NOTICE: It is highly recommended that you update to `v0.118.0` or higher ASAP for various bug fixes, including a critical world-readable vulnerability reported [here](https://termux.github.io/general/2022/02/15/termux-apps-vulnerability-disclosures.html). See [below](#google-play-store-experimental-branch) for information regarding Termux on Google Play.**
 

From 4de0caac5b1afd55e717af2c7f8b653a80a0d86a Mon Sep 17 00:00:00 2001
From: Wang Han <416810799@qq.com>
Date: Wed, 21 May 2025 15:21:46 +0800
Subject: [PATCH 875/912] Changed|Fixed: Bump
 `org.lsposed.hiddenapibypass:hiddenapibypass` to `6.1` to fix crash on
 Android 16 QPR1

```
Build fingerprint: 'google/shiba_beta/shiba:16/BP31.250502.008/13497110:user/release-keys'
Revision: 'MP1.0'
ABI: 'arm64'
Executable: /system/bin/app_process64
Cmdline: com.termux
pid: 22617, tid: 22617, name: com.termux  >>> com.termux <<<
uid: 10323
tagged_addr_ctrl: 0000000000000001 (PR_TAGGED_ADDR_ENABLE)
pac_enabled_keys: 000000000000000f (PR_PAC_APIAKEY, PR_PAC_APIBKEY, PR_PAC_APDAKEY, PR_PAC_APDBKEY)
esr: 0000000092000006 (Data Abort Exception 0x24)
signal 11 (SIGSEGV), code 1 (SEGV_MAPERR), fault addr 0x000000000000000c
Cause: null pointer dereference
    x0  0000000070b6f798  x1  0000000002159228  x2  000000000000000c  x3  00000000ebad6073
    x4  00000000ebad6074  x5  00000000ebad6075  x6  00000000ebad6076  x7  00000000ebad6077
    x8  00000000ebad6078  x9  00000000ebad6079  x10 00000000ebad607a  x11 00000000ebad607b
    x12 00000000ebad607c  x13 00000000ebad607d  x14 00000000ebad607e  x15 00000000ebad607f
    x16 0000007feda203f0  x17 0000007976776a9c  x18 0000007cd0e44000  x19 b400007b850b8be0
    x20 0000000000000000  x21 b400007b850b8ca0  x22 0000000000000000  x23 00000000021592b8
    x24 000000006413b378  x25 0000000070b99ee0  x26 0000000070b9fc78  x27 0000000000000000
    x28 0000000000000053  x29 0000000070b99ee0
    lr  0000007976776a98  sp  0000007feda203f0  pc  0000007976776b0c  pst 0000000080001000
    esr 0000000092000006
26 total frames
backtrace:
      #00 pc 00000000000c8b0c  /data/app/~~p_sHRwZKj3QVf_xeRMrR3g==/com.termux-rodTRD4IY6G2qtCPCrHfhw==/oat/arm64/base.odex (org.lsposed.hiddenapibypass.HiddenApiBypass.getDeclaredMethods+780)
      #01 pc 00000000000c8dc4  /data/app/~~p_sHRwZKj3QVf_xeRMrR3g==/com.termux-rodTRD4IY6G2qtCPCrHfhw==/oat/arm64/base.odex (org.lsposed.hiddenapibypass.HiddenApiBypass.setHiddenApiExemptions+68)
      #02 pc 00000000000ae560  /data/app/~~p_sHRwZKj3QVf_xeRMrR3g==/com.termux-rodTRD4IY6G2qtCPCrHfhw==/oat/arm64/base.odex (com.termux.shared.reflection.ReflectionUtils.bypassHiddenAPIReflectionRestrictions+448)
      #03 pc 00000000000a342c  /data/app/~~p_sHRwZKj3QVf_xeRMrR3g==/com.termux-rodTRD4IY6G2qtCPCrHfhw==/oat/arm64/base.odex (com.termux.shared.android.SELinuxUtils.getContext+108)
      #04 pc 00000000000c0b60  /data/app/~~p_sHRwZKj3QVf_xeRMrR3g==/com.termux-rodTRD4IY6G2qtCPCrHfhw==/oat/arm64/base.odex (com.termux.shared.termux.shell.command.environment.TermuxAppShellEnvironment.setTermuxAppEnvironment+3216)
      #05 pc 000000000009eafc  /data/app/~~p_sHRwZKj3QVf_xeRMrR3g==/com.termux-rodTRD4IY6G2qtCPCrHfhw==/oat/arm64/base.odex (com.termux.app.TermuxApplication.onCreate+1596)
      ...
      #22 pc 0000000000105c98  /system/lib64/libandroid_runtime.so (_JNIEnv::CallStaticVoidMethod(_jclass*, _jmethodID*, ...)+104) (BuildId: ea93df5e792bbd2e0cbb71b2a7599aaa)
      #23 pc 000000000013121c  /system/lib64/libandroid_runtime.so (android::AndroidRuntime::start(char const*, android::Vector<android::String8> const&, bool)+908) (BuildId: ea93df5e792bbd2e0cbb71b2a7599aaa)
      #24 pc 000000000000459c  /system/bin/app_process64 (main+1212) (BuildId: a237cfae6965d7f0b950e5955c73432c)
      #25 pc 000000000006bb88  /apex/com.android.runtime/lib64/bionic/libc.so (__libc_init+120) (BuildId: eecb0fc2ec8128ec92c091c0160586d1)
```

Related commit https://github.com/LSPosed/AndroidHiddenApiBypass/commit/9efadf06
Related commit https://android-review.googlesource.com/c/platform/libcore/+/3380841
Related commit https://cs.android.com/android/_/android/platform/libcore/+/0dc31afe

Closes #4556
---
 termux-shared/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/termux-shared/build.gradle b/termux-shared/build.gradle
index 7c3cfcc71d..3710035e75 100644
--- a/termux-shared/build.gradle
+++ b/termux-shared/build.gradle
@@ -14,7 +14,7 @@ android {
         implementation "io.noties.markwon:ext-strikethrough:$markwonVersion"
         implementation "io.noties.markwon:linkify:$markwonVersion"
         implementation "io.noties.markwon:recycler:$markwonVersion"
-        implementation "org.lsposed.hiddenapibypass:hiddenapibypass:5.0"
+        implementation "org.lsposed.hiddenapibypass:hiddenapibypass:6.1"
 
         // Do not increment version higher than 1.0.0-alpha09 since it will break ViewUtils and needs to be looked into
         // noinspection GradleDependency

From da3a0ac4e219b7a924af3a94cf4cfc4901f0f059 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 22 May 2025 15:57:05 +0500
Subject: [PATCH 876/912] Fixed: Add explicit `serialVersionUID` to
 `Serializable` classes like `ReportInfo` and `TextIOInfo`

Reading `ReportInfo` with `Bundle.getSerializable()` by `ReportActivity` is triggering exception when default algorithm is used for `serialVersionUID` in Termux:API plugin app when error notification created in `ResultReturner.returnData()` by `TermuxPluginUtils.sendPluginCommandErrorNotification()` is clicked.

```
java.lang.RuntimeException: Unable to start activity ComponentInfo{com.termux/com.termux.shared.activities.ReportActivity}: android.os.BadParcelableException: Parcelable encountered IOException reading a Serializable object (name = com.termux.shared.models.ReportInfo)
	at android.app.ActivityThread.performLaunchActivity(ActivityThread.java:4280)
	at android.app.ActivityThread.handleLaunchActivity(ActivityThread.java:4467)
	at android.app.servertransaction.LaunchActivityItem.execute(LaunchActivityItem.java:222)
	at android.app.servertransaction.TransactionExecutor.executeNonLifecycleItem(TransactionExecutor.java:133)
	at android.app.servertransaction.TransactionExecutor.executeTransactionItems(TransactionExecutor.java:103)
	at android.app.servertransaction.TransactionExecutor.execute(TransactionExecutor.java:80)
	at android.app.ActivityThread$H.handleMessage(ActivityThread.java:2823)
	at android.os.Handler.dispatchMessage(Handler.java:110)
	at android.os.Looper.loopOnce(Looper.java:248)
	at android.os.Looper.loop(Looper.java:338)
	at android.app.ActivityThread.main(ActivityThread.java:9067)
	at java.lang.reflect.Method.invoke(Native Method)
	at com.android.internal.os.RuntimeInit$MethodAndArgsCaller.run(RuntimeInit.java:593)
	at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:932)
Caused by: android.os.BadParcelableException: Parcelable encountered IOException reading a Serializable object (name = com.termux.shared.models.ReportInfo)
	at android.os.Parcel.readSerializableInternal(Parcel.java:5520)
	at android.os.Parcel.readValue(Parcel.java:5038)
	at android.os.Parcel.readValue(Parcel.java:4702)
	at android.os.Parcel.-$$Nest$mreadValue(Unknown Source:0)
	at android.os.Parcel$LazyValue.apply(Parcel.java:4811)
	at android.os.Parcel$LazyValue.apply(Parcel.java:4764)
	at android.os.BaseBundle.unwrapLazyValueFromMapLocked(BaseBundle.java:446)
	at android.os.BaseBundle.getValueAt(BaseBundle.java:426)
	at android.os.BaseBundle.getValue(BaseBundle.java:397)
	at android.os.BaseBundle.getValue(BaseBundle.java:380)
	at android.os.BaseBundle.getValue(BaseBundle.java:373)
	at android.os.BaseBundle.getSerializable(BaseBundle.java:1522)
	at android.os.Bundle.getSerializable(Bundle.java:1339)
	at com.termux.shared.activities.ReportActivity.updateUI(ReportActivity.java:140)
	at com.termux.shared.activities.ReportActivity.onCreate(ReportActivity.java:93)
	at android.app.Activity.performCreate(Activity.java:9155)
	at android.app.Activity.performCreate(Activity.java:9133)
	at android.app.Instrumentation.callActivityOnCreate(Instrumentation.java:1521)
	at android.app.ActivityThread.performLaunchActivity(ActivityThread.java:4262)
	... 13 more
Caused by: java.io.InvalidClassException: com.termux.shared.models.ReportInfo; local class incompatible: stream classdesc serialVersionUID = -5165426368218339031, local class serialVersionUID = 1
	at java.io.ObjectStreamClass.initNonProxy(ObjectStreamClass.java:652)
	at java.io.ObjectInputStream.readNonProxyDesc(ObjectInputStream.java:1743)
	at java.io.ObjectInputStream.readClassDesc(ObjectInputStream.java:1624)
	at java.io.ObjectInputStream.readOrdinaryObject(ObjectInputStream.java:1902)
	at java.io.ObjectInputStream.readObject0(ObjectInputStream.java:1442)
	at java.io.ObjectInputStream.readObject(ObjectInputStream.java:430)
	at android.os.Parcel.readSerializableInternal(Parcel.java:5507)
	... 31 more

```

If using release APK with obfuscation enabled, then following exception will be triggered.

```
java.lang.RuntimeException: Unable to start activity ComponentInfo{com.termux/com.termux.shared.activities.ReportActivity}: android.os.BadParcelableException: Parcelable encountered ClassNotFoundException reading a Serializable object (name = I0.a)
	at android.app.ActivityThread.performLaunchActivity(ActivityThread.java:3864)
	at android.app.ActivityThread.handleLaunchActivity(ActivityThread.java:4006)
	at android.app.servertransaction.LaunchActivityItem.execute(LaunchActivityItem.java:111)
	at android.app.servertransaction.TransactionExecutor.executeCallbacks(TransactionExecutor.java:135)
	at android.app.servertransaction.TransactionExecutor.execute(TransactionExecutor.java:95)
	at android.app.ActivityThread$H.handleMessage(ActivityThread.java:2462)
	at android.os.Handler.dispatchMessage(Handler.java:106)
	at android.os.Looper.loopOnce(Looper.java:240)
	at android.os.Looper.loop(Looper.java:351)
	at android.app.ActivityThread.main(ActivityThread.java:8377)
	at java.lang.reflect.Method.invoke(Native Method)
	at com.android.internal.os.RuntimeInit$MethodAndArgsCaller.run(RuntimeInit.java:584)
	at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:1013)
Caused by: android.os.BadParcelableException: Parcelable encountered ClassNotFoundException reading a Serializable object (name = I0.a)
	at android.os.Parcel.readSerializableInternal(Parcel.java:5113)
	at android.os.Parcel.readValue(Parcel.java:4655)
	at android.os.Parcel.readValue(Parcel.java:4363)
	at android.os.Parcel.-$$Nest$mreadValue(Unknown Source:0)
	at android.os.Parcel$LazyValue.apply(Parcel.java:4461)
	at android.os.Parcel$LazyValue.apply(Parcel.java:4420)
	at android.os.BaseBundle.getValueAt(BaseBundle.java:394)
	at android.os.BaseBundle.getValue(BaseBundle.java:374)
	at android.os.BaseBundle.getValue(BaseBundle.java:357)
	at android.os.BaseBundle.getValue(BaseBundle.java:350)
	at android.os.BaseBundle.getSerializable(BaseBundle.java:1451)
	at android.os.Bundle.getSerializable(Bundle.java:1144)
	at com.termux.shared.activities.ReportActivity.updateUI(ReportActivity.java:136)
	at com.termux.shared.activities.ReportActivity.onCreate(ReportActivity.java:89)
	at android.app.Activity.performCreate(Activity.java:8397)
	at android.app.Activity.performCreate(Activity.java:8370)
	at android.app.Instrumentation.callActivityOnCreate(Instrumentation.java:1403)
	at android.app.ActivityThread.performLaunchActivity(ActivityThread.java:3837)
	... 12 more
Caused by: java.lang.ClassNotFoundException: I0.a
	at java.lang.Class.classForName(Native Method)
	at java.lang.Class.forName(Class.java:536)
	at android.os.Parcel$2.resolveClass(Parcel.java:5090)
	at java.io.ObjectInputStream.readNonProxyDesc(ObjectInputStream.java:1733)
	at java.io.ObjectInputStream.readClassDesc(ObjectInputStream.java:1624)
	at java.io.ObjectInputStream.readOrdinaryObject(ObjectInputStream.java:1902)
	at java.io.ObjectInputStream.readObject0(ObjectInputStream.java:1442)
	at java.io.ObjectInputStream.readObject(ObjectInputStream.java:430)
	at android.os.Parcel.readSerializableInternal(Parcel.java:5096)
	... 29 more
Caused by: java.lang.ClassNotFoundException: I0.a
	... 38 more
```

Related issue https://github.com/termux/termux-api/issues/762
---
 .../com/termux/shared/models/ReportInfo.java  | 21 +++++++++++++++++++
 .../com/termux/shared/models/TextIOInfo.java  | 20 ++++++++++++++++++
 2 files changed, 41 insertions(+)

diff --git a/termux-shared/src/main/java/com/termux/shared/models/ReportInfo.java b/termux-shared/src/main/java/com/termux/shared/models/ReportInfo.java
index 0f70fb5623..3e0ad6863a 100644
--- a/termux-shared/src/main/java/com/termux/shared/models/ReportInfo.java
+++ b/termux-shared/src/main/java/com/termux/shared/models/ReportInfo.java
@@ -1,5 +1,7 @@
 package com.termux.shared.models;
 
+import androidx.annotation.Keep;
+
 import com.termux.shared.markdown.MarkdownUtils;
 import com.termux.shared.android.AndroidUtils;
 
@@ -10,6 +12,25 @@
  */
 public class ReportInfo implements Serializable {
 
+    /**
+     * Explicitly define `serialVersionUID` to prevent exceptions on deserialization.
+     *
+     * Like when calling `Bundle.getSerializable()` on Android.
+     * `android.os.BadParcelableException: Parcelable encountered IOException reading a Serializable object` (name = <class_name>)
+     * `java.io.InvalidClassException: <class_name>; local class incompatible`
+     *
+     * The `@Keep` annotation is necessary to prevent the field from being removed by proguard when
+     * app is compiled, even if its kept during library compilation.
+     *
+     * **See Also:**
+     * - https://docs.oracle.com/javase/8/docs/platform/serialization/spec/version.html#a6678
+     * - https://docs.oracle.com/javase/8/docs/platform/serialization/spec/class.html#a4100
+     */
+    @Keep
+    private static final long serialVersionUID = 1L;
+
+
+
     /** The user action that was being processed for which the report was generated. */
     public final String userAction;
     /** The internal app component that sent the report. */
diff --git a/termux-shared/src/main/java/com/termux/shared/models/TextIOInfo.java b/termux-shared/src/main/java/com/termux/shared/models/TextIOInfo.java
index df9993afcb..b688c398b3 100644
--- a/termux-shared/src/main/java/com/termux/shared/models/TextIOInfo.java
+++ b/termux-shared/src/main/java/com/termux/shared/models/TextIOInfo.java
@@ -3,6 +3,7 @@
 import android.graphics.Color;
 import android.graphics.Typeface;
 
+import androidx.annotation.Keep;
 import androidx.annotation.NonNull;
 
 import com.termux.shared.activities.TextIOActivity;
@@ -19,6 +20,25 @@
  */
 public class TextIOInfo implements Serializable {
 
+    /**
+     * Explicitly define `serialVersionUID` to prevent exceptions on deserialization.
+     *
+     * Like when calling `Bundle.getSerializable()` on Android.
+     * `android.os.BadParcelableException: Parcelable encountered IOException reading a Serializable object` (name = <class_name>)
+     * `java.io.InvalidClassException: <class_name>; local class incompatible`
+     *
+     * The `@Keep` annotation is necessary to prevent the field from being removed by proguard when
+     * app is compiled, even if its kept during library compilation.
+     *
+     * **See Also:**
+     * - https://docs.oracle.com/javase/8/docs/platform/serialization/spec/version.html#a6678
+     * - https://docs.oracle.com/javase/8/docs/platform/serialization/spec/class.html#a4100
+     */
+    @Keep
+    private static final long serialVersionUID = 1L;
+
+
+
     public static final int GENERAL_DATA_SIZE_LIMIT_IN_BYTES = 1000;
     public static final int LABEL_SIZE_LIMIT_IN_BYTES = 4000;
     public static final int TEXT_SIZE_LIMIT_IN_BYTES = 100000 - GENERAL_DATA_SIZE_LIMIT_IN_BYTES - LABEL_SIZE_LIMIT_IN_BYTES; // < 100KB

From c6e2ca7fde421d97e8f2f4990cd443d621007a02 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Fri, 23 May 2025 15:01:53 +0500
Subject: [PATCH 877/912] Changed(README): Set latest version to 0.118.3

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index b5223aa790..eee90ab779 100644
--- a/README.md
+++ b/README.md
@@ -49,7 +49,7 @@ The core [Termux](https://github.com/termux/termux-app) app comes with the follo
 
 ## Installation
 
-Latest version is `v0.118.2`.
+Latest version is `v0.118.3`.
 
 **NOTICE: It is highly recommended that you update to `v0.118.0` or higher ASAP for various bug fixes, including a critical world-readable vulnerability reported [here](https://termux.github.io/general/2022/02/15/termux-apps-vulnerability-disclosures.html). See [below](#google-play-store-experimental-branch) for information regarding Termux on Google Play.**
 

From 9d2ac14557c3436cee19d8973f271877a7237e7a Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Fri, 30 May 2025 12:06:20 +0500
Subject: [PATCH 878/912] Fixed: Use `ndkVersion` specified in project
 properties or `$JITPACK_NDK_VERSION` env variable for `termux-shared` library

---
 termux-shared/build.gradle | 1 +
 1 file changed, 1 insertion(+)

diff --git a/termux-shared/build.gradle b/termux-shared/build.gradle
index 3710035e75..30e9536282 100644
--- a/termux-shared/build.gradle
+++ b/termux-shared/build.gradle
@@ -3,6 +3,7 @@ apply plugin: 'maven-publish'
 
 android {
     compileSdkVersion project.properties.compileSdkVersion.toInteger()
+    ndkVersion = System.getenv("JITPACK_NDK_VERSION") ?: project.properties.ndkVersion
 
     dependencies {
         implementation "androidx.appcompat:appcompat:1.3.1"

From 4a9ad910ddc9ccaa872d37689705d21d98486821 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Tue, 17 Jun 2025 10:17:44 +0500
Subject: [PATCH 879/912] Added: Add Automatic Dependency Submission for SBOM

- https://docs.github.com/en/code-security/supply-chain-security/understanding-your-software-supply-chain/configuring-automatic-dependency-submission-for-your-repository#gradle-projects
- https://github.com/actions/gradle-build-tools-actions#the-dependency-submission-action
---
 .github/workflows/dependency-submission.yml | 22 +++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 .github/workflows/dependency-submission.yml

diff --git a/.github/workflows/dependency-submission.yml b/.github/workflows/dependency-submission.yml
new file mode 100644
index 0000000000..bb8f3b4ac3
--- /dev/null
+++ b/.github/workflows/dependency-submission.yml
@@ -0,0 +1,22 @@
+name: Automatic Dependency Submission
+
+on:
+  push:
+    branches: [ 'master' ]
+
+permissions:
+  contents: write
+
+jobs:
+  dependency-submission:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout sources
+      uses: actions/checkout@v4
+    - name: Setup Java
+      uses: actions/setup-java@v4
+      with:
+        distribution: 'temurin'
+        java-version: 17
+    - name: Generate and submit dependency graph
+      uses: gradle/actions/dependency-submission@v4

From 2c1bd650b0275fe5944f45a9c26eb4576edee5e1 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Fri, 20 Jun 2025 13:30:51 +0500
Subject: [PATCH 880/912] Added: Enable workflow dispatch trigger for Automatic
 Dependency Submission workflow

---
 .github/workflows/dependency-submission.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/dependency-submission.yml b/.github/workflows/dependency-submission.yml
index bb8f3b4ac3..9d3978b13b 100644
--- a/.github/workflows/dependency-submission.yml
+++ b/.github/workflows/dependency-submission.yml
@@ -3,6 +3,7 @@ name: Automatic Dependency Submission
 on:
   push:
     branches: [ 'master' ]
+  workflow_dispatch:
 
 permissions:
   contents: write

From 7bceab88e2272f961d1b94ef736f1a9e20173247 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 25 Jun 2025 21:10:08 +0500
Subject: [PATCH 881/912] Added: Add `SECURITY.md`

---
 SECURITY.md | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 SECURITY.md

diff --git a/SECURITY.md b/SECURITY.md
new file mode 100644
index 0000000000..479f15cb81
--- /dev/null
+++ b/SECURITY.md
@@ -0,0 +1 @@
+Check https://termux.dev/security for info on Termux security policies and how to report vulnerabilities.

From 8174a995ae24f8f4aef303af93308bbb09b6a2be Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 24 Sep 2025 22:59:57 +0500
Subject: [PATCH 882/912] Added: Add GitHub Accelerator sponsors logo

- https://github.com/accelerator
- https://github.blog/2023-04-12-github-accelerator-our-first-cohort-and-whats-next

The `github.png` logo is sourced from https://github.com/logos
---
 README.md                       |  10 ++++++++++
 site/assets/sponsors/github.png | Bin 0 -> 25206 bytes
 2 files changed, 10 insertions(+)
 create mode 100644 site/assets/sponsors/github.png

diff --git a/README.md b/README.md
index eee90ab779..e3448096db 100644
--- a/README.md
+++ b/README.md
@@ -29,6 +29,7 @@ Quick how-to about Termux package management is available at [Package Management
 - [Debugging](#debugging)
 - [For Maintainers and Contributors](#for-maintainers-and-contributors)
 - [Forking](#forking)
+- [Sponsors and Funders](#sponsors-and-funders)
 ##
 
 
@@ -264,3 +265,12 @@ Commit messages **must** use the [Conventional Commits](https://www.conventional
 - You also need to recompile bootstrap zip for the new package name. Check [building bootstrap](https://github.com/termux/termux-packages/wiki/For-maintainers#build-bootstrap-archives), [here](https://github.com/termux/termux-app/issues/1983) and [here](https://github.com/termux/termux-app/issues/2081#issuecomment-865280111).
 - 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.
+##
+
+
+
+## Sponsors and Funders
+
+[<img alt="GitHub Accelerator" width="25%" src="site/assets/sponsors/github.png" />](https://github.com)  
+*[GitHub Accelerator](https://github.com/accelerator) ([1](https://github.blog/2023-04-12-github-accelerator-our-first-cohort-and-whats-next))*
+
diff --git a/site/assets/sponsors/github.png b/site/assets/sponsors/github.png
new file mode 100644
index 0000000000000000000000000000000000000000..abff89edea6d6776af7f2fbb2a36d56abb86a86c
GIT binary patch
literal 25206
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

literal 0
HcmV?d00001


From f852dca0efca4015d81f0825d0cc1075321f1afc Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 24 Sep 2025 23:02:05 +0500
Subject: [PATCH 883/912] Added: Add GitHub Secure Open Source Fund sponsors
 logo

- https://resources.github.com/github-secure-open-source-fund
- https://github.blog/open-source/maintainers/securing-the-supply-chain-at-scale-starting-with-71-important-open-source-projects
- https://termux.dev/en/posts/general/2025/08/11/termux-selected-for-github-secure-open-source-fund-session-2.html

The `github.png` logo is sourced from https://github.com/logos
---
 README.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/README.md b/README.md
index e3448096db..90ad626aaa 100644
--- a/README.md
+++ b/README.md
@@ -274,3 +274,8 @@ Commit messages **must** use the [Conventional Commits](https://www.conventional
 [<img alt="GitHub Accelerator" width="25%" src="site/assets/sponsors/github.png" />](https://github.com)  
 *[GitHub Accelerator](https://github.com/accelerator) ([1](https://github.blog/2023-04-12-github-accelerator-our-first-cohort-and-whats-next))*
 
+&nbsp;
+
+[<img alt="GitHub Secure Open Source Fund" width="25%" src="site/assets/sponsors/github.png" />](https://github.com)  
+*[GitHub Secure Open Source Fund](https://resources.github.com/github-secure-open-source-fund) ([1](https://github.blog/open-source/maintainers/securing-the-supply-chain-at-scale-starting-with-71-important-open-source-projects), [2](https://termux.dev/en/posts/general/2025/08/11/termux-selected-for-github-secure-open-source-fund-session-2.html))*
+

From 338fb66e5cc908c3ce2b0d18f799cec3f577ad6c Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 24 Sep 2025 23:23:59 +0500
Subject: [PATCH 884/912] Added: Add NLnet NGI Mobifree sponsors logo

- https://nlnet.nl/mobifree
- https://nlnet.nl/news/2024/20241111-NGI-Mobifree-grants.html
- https://termux.dev/en/posts/general/2024/11/11/termux-selected-for-nlnet-ngi-mobifree-grant.html

The `nlnet-ngi-mobifree.png` logo is sourced from https://nlnet.nl/logo
---
 README.md                                   |   5 +++++
 site/assets/sponsors/nlnet-ngi-mobifree.png | Bin 0 -> 21109 bytes
 2 files changed, 5 insertions(+)
 create mode 100644 site/assets/sponsors/nlnet-ngi-mobifree.png

diff --git a/README.md b/README.md
index 90ad626aaa..d10de0cd7e 100644
--- a/README.md
+++ b/README.md
@@ -279,3 +279,8 @@ Commit messages **must** use the [Conventional Commits](https://www.conventional
 [<img alt="GitHub Secure Open Source Fund" width="25%" src="site/assets/sponsors/github.png" />](https://github.com)  
 *[GitHub Secure Open Source Fund](https://resources.github.com/github-secure-open-source-fund) ([1](https://github.blog/open-source/maintainers/securing-the-supply-chain-at-scale-starting-with-71-important-open-source-projects), [2](https://termux.dev/en/posts/general/2025/08/11/termux-selected-for-github-secure-open-source-fund-session-2.html))*
 
+&nbsp;
+
+[<img alt="NLnet NGI Mobifree" width="25%" src="site/assets/sponsors/nlnet-ngi-mobifree.png" />](https://nlnet.nl/mobifree)  
+*[NLnet NGI Mobifree](https://nlnet.nl/mobifree) ([1](https://nlnet.nl/news/2024/20241111-NGI-Mobifree-grants.html), [2](https://termux.dev/en/posts/general/2024/11/11/termux-selected-for-nlnet-ngi-mobifree-grant.html))*
+
diff --git a/site/assets/sponsors/nlnet-ngi-mobifree.png b/site/assets/sponsors/nlnet-ngi-mobifree.png
new file mode 100644
index 0000000000000000000000000000000000000000..6b95b93bd7bf4dd1426bae330d0bf3bec179d2fc
GIT binary patch
literal 21109
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
N!PC{xWt~$(695@{tA79h

literal 0
HcmV?d00001


From 1812a405eea04122645e1fddf2791ae0438c45b3 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 24 Sep 2025 23:35:18 +0500
Subject: [PATCH 885/912] Added: Add Clouflare funders logo

- https://www.cloudflare.com
- https://packages-cf.termux.dev

Clouflare has served around 36TB (32TB cached) data, 39M requests, 1M unique visitors in last 30 days for our https://termux.dev domain, and has potentially served 100s to 1000s of TBs of data over the years for free for Termux, primarily from the https://packages-cf.termux.dev `apt` packages repo, which is a cloudflare backed variant of our primary repo https://packages.termux.dev.

The `cloudflare.png` logo is sourced from www.cloudflare.com/press-kit
---
 README.md                           |   4 ++++
 site/assets/sponsors/cloudflare.png | Bin 0 -> 25723 bytes
 2 files changed, 4 insertions(+)
 create mode 100644 site/assets/sponsors/cloudflare.png

diff --git a/README.md b/README.md
index d10de0cd7e..d693b62ab1 100644
--- a/README.md
+++ b/README.md
@@ -284,3 +284,7 @@ Commit messages **must** use the [Conventional Commits](https://www.conventional
 [<img alt="NLnet NGI Mobifree" width="25%" src="site/assets/sponsors/nlnet-ngi-mobifree.png" />](https://nlnet.nl/mobifree)  
 *[NLnet NGI Mobifree](https://nlnet.nl/mobifree) ([1](https://nlnet.nl/news/2024/20241111-NGI-Mobifree-grants.html), [2](https://termux.dev/en/posts/general/2024/11/11/termux-selected-for-nlnet-ngi-mobifree-grant.html))*
 
+&nbsp;
+
+[<img alt="Cloudflare" width="25%" src="site/assets/sponsors/cloudflare.png" />](https://www.cloudflare.com)  
+*[Cloudflare](https://www.cloudflare.com) ([1](https://packages-cf.termux.dev))*
diff --git a/site/assets/sponsors/cloudflare.png b/site/assets/sponsors/cloudflare.png
new file mode 100644
index 0000000000000000000000000000000000000000..2929f478687138dd8db3195a50a55b44f43d60a9
GIT binary patch
literal 25723
zcmeFZbySsKw>G@#?(UKj>FzFRP^4kA>F$(n=@97#3F%VlmIi4lX^@ug@80~LbIx<d
z`~LBrF~0A=;}G3@-)qga)-|s==QWpm7^SW%kAX^x3Ic&J6cuDNK_FP*C8!b^5%{y;
zd|(3v!WHm&qvNIt_M~=lakQ|uGpBa*b~2|n_p-JCfxLbdXIQ(Cf5VY`+Q1is^>`5%
zA_I%l9u$B4>8*-)_|H&QEatk*nHe3I8^VU}n>lgEYb4{wK4KfPpO(jo)k6Ct(TupO
z)fe}wwPGC|?SFUv<W@zPiyNudp6INI7k9+(?cdHx<PJ1=%|3D@9E_vg?hsi##IUa-
z`pn@)SO3TjAjI9a%u8A&`e_+>;lOgqyb-TIaVF+(zlj1T-WBln=BzH@))!mUc0|iX
zjQ-<~V@)wMrpGBMU6J(rvEsYfrQh#{T(@j1;5Xkn-=6a7PF@tx8n2v->hHZ<u*oe7
zJzglkaaFn@+<e?P{WK?Svuea7zC9k0^=)WJ_tB&6^Z18$+0}p}-f!bM3w`C;>R00>
z?M>Gr8)D{6xq7fl`_3m*#HJ#v$&UHu{KY2D@>{;2)4BG(moX@@EW70lWb-L~xd|2V
zN;(_c`o?6wna=O6RDA3C-8<neixlBi@}=J2_{Jj3UnHJh7I+p-y_JHTI_s<*4;21a
z7*{?lMVqyD4^agBLkl6JTq3TInTtOZzUSsOF?JfSu6Br2hoSSu*ERomQFDu#&-#Fb
zGL*dA9UD8)j5Jj<4hoGdBa2oHLr-XYqgOyIH%3Pf%lyKs_T0cmn=3(YxS!UQ)ot=e
zlAp~A*H2elhxFl~{Xmj*tKv_R4!gohZ*2?x<p^x78h_f@RyI!-jW+r0H8!u@?P7kg
zP0{GFDvake8>uZ)_{d-w9;vL$Jq~Ntw6K%LwPO%1NJPiJ()Jb1I;z)TgZ9h4ba%Ru
zIoHs0(J!9W_sD$VLlD)hecF73`_KFoRnfz9?zk-P+2Uyjl;#zWJBoKlt^4w`V%86P
zcl>p!V!Fd>CHMWObhZW*8@7>~PCrE~U%ZOQ_;G!LuRgKhN=QGGA?lh_FF>)cXOTGS
zYB9(yhq$l!ZTb9TOTuc5&-SDCN_T0%kp5!;H<5^YNBXziv&)Jv=~EN_T$djCNW6sK
z<9)RWAG_X)i-&jktaXUxRJAm^f1VU5i&$u`tswE8ah50b^i<hzN><2b<A}}DF~Cmg
zQu{eRTYEla;5+@%chH?oA2NBDq})<D|8v1@rN|OP=#q;7fivYV@tz)IT-#0?ne%u{
z&X9<uh3L87OV`|`Ic>U5rRJ43b`-_>=C9?ytPSShe3{1~9DxN-$#raI#Oc5uzHF5n
z`}57Zx}dghQ_6j5N}Jv>#h2`Kc2<cZ%#H8$9eUgTmnw|TB_pt3QD=-v<S6CNpio#r
z@=?JczQSkia?3eWYrZm7`m&7g9xpxLXo_hHYiVI{F`JGy3a@d%3wT6HyhxyT-p?}p
zQeRxwlIxXbk?~jRc<V=UyOxZLS56E1ZDzbN+=VE2Hgfu8QKJ3l^mN`v!`)D=?{!Io
zf1=(I5GRmsr#f$N)wSy7(GR`0oHN)fPR__#z!dI~Rb-TQUzq(_Afe68YT;{GBIMS@
zN|zPEVYPdPJ@C42BTrOE&XjGtHI;XT&>gGdM)L>$P67NjB}+~=(eD{mJ01%%7UELb
zXqJUpZAY__z0r)M)Mk48Mh0=ye8S@rk!B3OqLMF}2DTDe6#4cJ+JV&0QF<R<%H)m7
zS`52+K|tlaTIlsK3KuU=3a&t6e2hah0u2-M%NgYRFSsx5jD*XMWfjNuHE=ws5=uxT
zi77JE2zv2NlCQly_40Vsb}aPFnkt6x=q}w$OUUQ)eLfveSi3Vod_M_%&ON2RXA2}(
z_gsCkpk1t4iFdBtm;A^Tk8eylDx0y#i(TdPE+e!2HG^$JSKAuQBV{0q<SWQArkL$;
zuYsCQh?A+Tk9BMXW|zDSdt=QZWl{-=dhB;Ac8d6WgP*t;aG3AdqXsd!OaEN-ezTh|
zOH5;h%=EjUWyxR!;+OIau#U?4Eu*By+RoJuY%+N@%9YL}F(WAAsuGM$vSREK{i$RO
z@a2Qkt}3#K5>P5WC`;wsCH&LS%(bBOwcHH`-pOzRR(8ZW=cc(|mpBMfKYh&8N^3yW
zh|IT+JruM|msfw;>3hP=I;^ts#n4E>*U`a`)$5#+X}syjkCxcXxwnuI>$(o_f!1bn
zG&c1G*4I9&xEge&AKNPJQ=7CG+Fto!j%ch>VWV#oST4`^T4UqF@V_(R3bbRnD??Sd
z)tj%sDI93dFAG~|sJG8iDl8rG@nV`yg++#(d=4+u^(ZW$ks`Kwb!!zQSrhBQKrBeZ
zY4WC+{!`Xl%qm5z9LtUHOuBRTu;G|CWLuFF#SWxj1sJ8g8Pevgc(sT#+18Ox9F_}X
zXJcWQ;Dt9QFAV6jlo|~Z%q96!oK>)+f>g?;c4rj`A+vr8?4nVJu0KNFc6ttZY&xL(
zunXyz`n*!GH5$A5BZfCU9d;l%MugWZ9_H`Q6f$d}g>NgR`|5m_V02P0Fq@h{!r}z(
zPmaTO2I72Jv=>D5wkZ^EajW}ip5A74E>`B{dT2_w2cE1#r%iFbq?zcexIB+S`D)!v
z9A;Ir4U&naijda3&W=(SvPk#8&T0z&9-X69Hj*k*CJF2W--DR2vrFmXmpr@jWjfq9
zrE^ht`59VRR1@)<$op$O$rak_Q@Y-KJ`&_WRtOFbHL3Hl-b^n)M#n-BvCm6-S2JPW
zWov?8CLNUsmudMU$ldPTQi9f(^eu_Lq{Bf_Fv5V!)V-cb0BRf|4dF@0i*$8#Qlg`{
z7PBkb?az#&KZ!Yl*?N*U;T!l3PzoYiq6N&1YWNKbPxpq9z;Yp*3$gknm8zO7J9kA4
z+l~E))8YJO{OTQQw$iB_QSjfXl^A&vdNZUy8#?2^?Oo{nLK<=+R<`x?#<QT3?ZU!n
z2G&SKRQD1+PT*W7Hu$Cd4lOLpA>^91^S#@zP~F|RslDHfAGyecf*iUIj*zvuG_c(M
z%%f{dNG2O1(fYwg=`6OK6NKL&{OW0^cod61Gr9XaPf1M5#Pgl~*UCm-+;7bcY!P?~
ztzirliS#L>2262^7>O)e`1gV1D_+_jX~!!$KLW5sRN%g8x^GddR1v1^gh$PDq6c~r
zZ<%1GQU7f4QSVzv+52Wy;{F&h;V+xYRjwe9h{?ezai>$Hma#=Cqt%Z*54J=`6Py;;
z6~%v~pyVjc8cL`jn0c!)PHJ-bFakH47yh1rG7xNE!x~D^>y;~f5EV^hlg3#_y`0Ez
z_Nhi_igx+8_Pal+srpn3s7kWJB${wdF!s!76fcC^b$u<*zqCp2RN=4e_KfbuK1zpA
zT;^CTsHtJHIPHY@%V*<|lWVSZ4TnuH^`!RCNI)_p78Pw^WI~0PQN^xYWBwxc2$6q8
zBnf$%%ZTgBMkEx9I*JUN>BkT3liAbM+<0*Tp*$BR4Q)X#bvS-^GLcAXy>E-48HHg0
z3tv*m#^pZopx__M#6dHWMT@oO$Y+I&&@BsBy)<F3`S4&=x|IIKF$*+YMdm8BmjzOy
zW9b5qz<3~eeev&yJvCQO;aAn1Mtkenc=w&o5HZH6+yOjb(*div638jV&`r1%9IfzY
zR{>FZhcAk7`^e!9mw}g+AX8k{9l1J%q_I<hkOuF`4+F~e@sW@2jGBR)!Py3HBQ3GH
z)&{cn_Fn%@tDx1T=5(`@Y3f$EQVej=`$K0p%d8eAF@8>=8d1p#k!Yn*W~!l=vcV`q
zcsu5Rh;xY<6{OlLf&XT;Gla%``vMXnH$Z-vIac4(sxEHlkp6ZnNP#^vE(W$UQ1<=d
z%X~I^B-Gb}=0=1ODH$V1G+9T%LGAhnd?<<CmbvolBKr~k<ejYn^|n7I3$Gi3&o(H`
zV7$5e_EGyOCP=IDXU!e*CGZ0U4v|%_eJ~3Ik6D615<(58oV_9}d5z45DgF7?r#Kw4
zad02QwLRs!j?I5&cM8Af-zSrp{*uG{sU#GIEd(!Vl?izPCK6xP9_wJtMb6k}4_i8r
z;ur7k6iFyQ?wH!t_J_o7qRuTV3-VhXWKVQBL-f2I#$>OOO|#8Eu1RFsY_ROF<Nrv_
z6i{IEOo>Z7v8a-0^W~i*RbNY@D4-4JFHl*#{t;-bpf%d@bNNC5zuPrRkn(3Kr1Kc`
zVxM8FRx`%(=e22`d%*0AA4w64vmcQ>eqf)r`fXd<;w5;|bKbBXV{izuF#R#*2Xo`K
zR*}t0$0fL5E%Rhj@z;Cm(3WEDl;2S7Qw$EQ#mN*c;5>9mcoBX{fJ9Sa=kb}kdSB+a
zA8%MTMtViqom0S9Vv&dyMFo}QBDUk7CwO$0t@yyvj_2=^vsXdBBH4tqiShX<A5hB}
z$!_Nj5NXH5t|pGj_|+Him61w5tdrSAqE$i!i2ph(h#PF|I8$GHn=OX%Y@(EMU*xgO
zSNUp~5Qq=qcJ}#MA<X8UNowbN_@IX)c?2P@=Na5<#UalbdGy)o%p;+_%sjoc2^<L1
z-?Jr+@_Df{uh>uFKvUCJ7{pWKn{Nz}tvsf*#-+bI8Fv2FLxKP9w1Jt2bB;O-v8_5A
zgOfn0e79Gcq-%pUUL}ovvw{tT{kkVUcBvy#;>6J>3<mp65yMtx8+z~OgM>s1W%2AV
zhVnmRbQ=1r{lS#2s8mw$G)kiE*kkvwV9*6vhdP(oVuH5bnSWTuPYZQd$xY0KU=1U}
z`Vi^*m;;H6!WEw)l_oHhz#akDtqV5s4hdDgD1aw1OIJ6dPMNs0lV;EBgViiDOaWDl
zy-5TGETZxvhE7oTPij>%SB#fQ7H*fla6jC>`l-He!=I!gY1m*ZjUbTU{dzq!!K}uQ
zaejOHCjymm9RqfZudVNN<}}M=W9Z%MI*59VuYoZkpDS9K4lemiUCNi9u$WN`24wD`
zij~-;cCU%36HbIvdKT}>{L0aUON|U8f7eh=EhrK+IRqPxRlcB}Vu$@Snlfxv<u;jc
zhYKr?c^^3$v*uS9LHza!JFX9|zy0O0t{Dz?l+=+`oAg+Du8jPW@#lLc74bmHSXV~W
z>=J8ilI7Kv>{}B0@f--rAIx|Z_HWgNkEFsB!6;uVNnFT?>@^Fi#)9j;X0+f?vG4=w
z94SiOOyj7y#6`>vK78BJ#)+>NP=wUCSz|`Nhy%}4$g?}1OZYoc)g&4$g`wwCQfS2G
z9{fZ!%(yNaj11$zC`IhJh}rmY8@Ks`G-u-t6`B!_9eKLmqZqm(<dqHSTB7PleXGb{
zqJwFO23TD*T~qq$i@{AYK}l-%RZ7(ER^kOm8a~?*j=k(Z_b_Fu8WS{icB1Sq;HO}C
zhz!5OP8DpNoOYI{&mku$>U3!a1ef*fe?y0L2L%?sD!yK;r1x}XGMXU1Af{FdClQ7F
z3QKVmHg`Cxk0~i1M7@dnr-<xcw;(seaY@Lm?jEo5O8v9}r->1xfVrnOO;hr1nXe6U
zR!)(o=63V&;?4m%jH(++vWZU`i|Y-Y+vY$~)EAdUJG`BdVA?T?8`fwdnF1<jT$?}?
zb^kv^C+tfNq!-N(8?k|m!`M;*Y8N%-Gq%`75t>H>Ob$i3+jx$K461&nL_@{gCyEE`
zyh!0|xl`>eMW_+Sjx#%2K{i#SoWf0$BFHXGx!0JMOhehbgw6aCr9X2N4)9DKSU=|2
z93#e4QF*+f5tbRoVH<a3RWzzN9%w|-48<|w{X~KMBZIIj&f#kT)#qjfeITLSQ@H0o
z*id(C5?#J;#N47o>GaB}(GhQWF(_K&IH}s`CjJ1?eyV9`cvx_8Z)t4Q-+_@l>LwFA
zr%s$j{>D(WB_^Q2QAj96{aV^ea$&knI4Q;|scp$3pKt*5AqV#yeHw<uSLV+5Yv5b-
z0n(}f3)&Ck#`Cf@=*%4VObchb?jb5P4Am!54-inLv|NZTmRAxiU%1<W-n~J@M-x7e
zf=JT4GAq--4U|uxXnzOlnW=r?0oP+J?BB~L@mk4<-0aAV;rHgpUfvuNq~$%lHJTFF
z!BuX|Em(Q8>m@FJiD&k`{VrmCT@0r|+9yz|LMxli#Dz~{%wCFSw)8$a<wYklW_Y#Z
z*G^g+G*OA0PyrZ~38%M2aJ&AT_`L0~uiH8g2~%Nov3hw$?9iKZW@0eFKP*I|qg2uH
z>@FzU@&aiy99FD_gF)@vIhN5YyN|}G-(TNHPav5-;iHc#ZQU_4_^Zb8%^m$h@M3(7
z&1xx!p{G%nmnT%c=<o(1*o6ncp^@4UpY2<J1%Y6~tfi&Z6{V&B;|>Y9Im+@&6jkVv
zAn!BQ>ce_T>ybd4mM^4>O@L$2fGS&xZ4;(Vq0IIW%z&ZzA-eFlp3@1W_RsJ2FBKsb
z)X4sUU(r-QuxYM8B}ql=V8z{?9<6K~QBc2$R<8fm4^n9!m3j5D<Y$HH0Lyo5DJlz&
z7u>^X$wdNsan-)p*FHpRx|QP(f<DtReV|+gkzw>Hh860ZUkw;zcfFFSpWd#!u4^Q-
zDct{X@7v%X6a0jbL&B3B<-JZ_n`UcT9HqN59myEgQ(mIgp72*^tF=#;B~|w!=RPbb
zroC>&JtHI%jH8r5EhR~UfDfjVs!;t927f58e=S{QO#4Zy3YJ)qP(2uN;UeUz>)4_4
zp!e%1{7BeC_P8@nbhiW8#t$3ssf1Mz;ZMZj-ud(xm%~ow7QG|YyGGt!Mr5lZ%cw&#
zI0C_`h1(5PZGL7ptM9xc@zWyR?LhcG*ShlOPQVY8H2wA-Q9uA*&LyR7Wqmn&wC%yS
zWMvg=p~+?9Z-W9iaM?#{4P5H!s3;3T9PQb_W{#%jY+m+G(7Qj7h`5&%7-DPgMr~?t
zY3(3Nd)(4NOKoi?O8bsig+s+j+T6-o!N<j1%SZJM#K#sQXhth8hAQGE1Q@V4cLP&<
z+1oj|3VDgrKHC)nUPC`-r=@-#;$|yKtD~Y$E$!%HPR+x{!^XiX>t*f1MJt9%E#hKk
zA*3lI_b(H`J5gFIH#a9Cc6LusPc~0(Hb)mrc1}S-L3R!<b}lYfU<9kHw}Ttli`BuE
z4r<~b8#3mu5EpAFH)}@+YN$=HsiV7_C@n4UoccfZXYZt<@}K4%T>pgvfCsx5*omE!
zjf36Zp8elvxVp)D07m|`q5ta)*Ehi3D7&V)tE0OM#9Y?H+`*0R-%Xf7{&T*QyNliP
zam*m>=62@xz))9URnGsmq`abv`hU)VLSSia@ANzi0Q<j<bhEbjFR=dG-k?vOkMr*v
z0jB?_-TyZFKhFL<7#O9ZA|&GoaffbCQAU&&y1tN^BgEQF=%1J7d|VI?K~q+UfPeri
zkA*3i6)eET&&mtt6XX!!HW%RK<o`EQiVm)BU<Zgf)D&Qx%^I*{#>*urz;DjM%F88S
z&dOtMVa_VZ1u<vk<PqfL<mNEr<r5V6Hxp_u)&MKPcK^OBs3|kR6quXK)Pe)xg#{lE
zFDnlpU=M7{2WB-l19O_1a)CL_O?jV9nL&i)99`_efIF@2!ItLiP7apO51@bxNvbP~
z(sHqJ{MRSyc3?LPV1g*EvbBS|*MB{DV{LD)<pzeL$;r<vAjlyoz#+gT$jQsW^IwCs
z&0SmpCPHm;a<Fm#V;AZcA>c3ouwW=p0Rzu7fU^imyO@LB99`ZxI@*cSLbpT>o%u{}
zYLS1OqG0U`jPQms{$HHeGI##x-9I5<XZ`$$n);cxLSV>0i@1V4%*~z`0_Oem2x0|x
zurvqa`(K3mkI$|DFV5mO<uWrhH#24B<>j^joW(7`DrnBh$;!jYDadKg$qnJ)H2?3`
zT^%jlJi#vJl9s?pfztp4dOi&`(=(LJ|9!Nll{pkA4lZ6+4nbBfzBgRlLLA&eTmmc{
zyh0otwCw*nFgrA=|Kr3W?EeQQBF_W<Ee!zk{`m|@FF>|p|Ic*wFU+7Y{{Q&vU%vSN
zaRtEi|1R=B!uNmS`d_&IM+p3n2LCU+{ui$Q5d#0C!T-yy|Igq;{jY|{+yPKQo<KYE
z5g8!_XoV0>mE>hWPtdN2oALb_@E3}cg03qFgoX$GfdOS?5d$A0xhbm1BJH7&;=++1
z7pwdQfv7=>GLmn+ejT>ys%KfI?mYOqhQKFfo8d%Kz$an<dN-W3Ri1QEXUO*Hb482o
zt?BpgbPNm(CDn`!rfimNX^~OKEoo6XyXn=1-C8qE!>Q)p8iT*+^~t1QQLw3B^d=pc
zNmU)+y(cPDR%()ANO%!F#va_s^)2VhJNHa{M{wMmr#M9l8(tDS^b=}wngsNf3<x=x
z8u$(S{4TUHQdSvwThp)p^1d)aJ)b%hwlt8+V!3n=CngF!ea@kbQBZQHam04w9=PUn
z=|1w-Y7Zl!9h22pRL_D_&x1x!6(@s^h?SS(3$saWf$kR*J~&dV41<ujfef;Nz)H5g
zdt^TIYe?^zI*52VV>p+hU6$oz#X+mYyGC!U5YKfvEF`Z2|K88v$a4rv4uf3z(hjXs
z(K(8P`!M%p)BcuEpxRELvP^KfOlTfj&AzG8>5-D?4MYY>V#9-@Xdl!;TiKG{44ej7
zoRlk47%Q;H)Gq}P@|`&tB)xM*#@iIe*S!7;qm87Sj7ry=N$KH~eDF&f;>+Lqlvi95
zQ4dduW>vTT>KP3M<%Z)-S??0{!iQbaIraFeJP}cFL^T%M$|SoCu?|a@b|iB>V&!}O
zk|EYL^N<*29(@}fWCd*r_&@+c4z+>m2=#hO0JfNcD-NM{$!~1ZR_HN_o5Bx7V3%M)
zD%M8yN-O?tjOqe{xB2E<`Nbts*w`>oXY?LlFB1b_m7r__yS<MkZK)ASe3a@9tVFGJ
zq5{T)U)o9x56Rbm4jFtk_wISM6S{NkA^vF2pYf-81ceU*HtRz}A1*g81u$!73kayX
zTi1|FE-<VF!>pLgH0l2FcBIV1%iq$mSYVOX=#@u$o0I4noYMh1cuhXjm*U~pJr!xM
z_c_hC{X1MGp0{=KQ|=*$IcC6c_t28#=m{p+uwwO8TprmfE+p;GYX6%KA}z3BhA5nJ
z62?E{>kuAcsBAVlZy)xF?Q`?`)!Mw`AN9I^MQXd?pY`X0%jaX5g~hWl{vqKPzj4RB
zR&L^Wp@~IR$kG$>y}d2_pWI;@^R_VS9^o|7%ZPfIrZ>8{&&F%QC#6gGoX?L4&u2GE
zgT#X;pIm;?x?`1m;OBIFRQ#&IF-k*g5|vO70!W^kYyyJ3$9_06k6C;Q&A9(l{NXkr
z^cYpnQhbOz#`}_Dgjau(Tu_sUngrlcXyfMn1F^K<ZnGN1?H*_A+qsMI6O~YDt1;x)
ztz{bjL08I0EQ=^zdN^pLAZB%lO@#PwxW-fkz^)S14q~Z8s7wqlq&ktvuuO(nadDo}
z2J;F(fo?Y(&i4m6zx!hak(nkFMFp0raX27S;|GpLaBO{wME>Vwud|;d_-`B4dhYJ}
zZUzWpj*@qq@7DtCyfL(lY8$W#p%kh4fQ-NyPMK%?Ad~g<K3y<&#RjpSAOjOJ<op_(
z2aSf%w}F)1#NNuKTP!h0@x3?f@Z)pDtb{f56B(HK=G#Mrk~knB9$AQcI@3sHJ6sV9
zH>6LD2{K<{Z;3@Y_XIn5nm8<x9pO<&f`B}s<4vg)7Ju4y#VWTb9(476-mI1(TP(!C
zCn_~3tjtI0D<toqW6BCv<WaRX6SQqzF<l8R?Bu5LfNVC&&NJx~Qlq{#XnP?3V^4CI
zW?G%<c2rG$WBne_c9Akh-Z-!EQ#dz_w``uG#y>|ekJrSQJ{QPe{HzhOW3;mJs1)_|
zvcJusA<ML(L0S`wLrsPaC7AkE*b^4wgm88KQ2<JiuW3SYUHuO3ZT2`P;&&Qi?2vyJ
zltUM7UF|qTOS!8ndi?YT=Bq~Gr-@@D36<Dju3iS(XPU6Q%<i}92qbNR30Fd|n}*lZ
z5dA!H_e<SBcU~GAX5C!as0CMz;PWg5<BEAY>!`qC;%p*yNQlX<DfTm*gMDd~J-gpS
zGrrT5Jr$9zgmF5-v|SMn3DaFZJ2zozch$=YiPwojD!!L;&|;fMZk#?Q(SJhP6zkc5
zBB~Ul0WpwnrdV+w*zs(xQTs!*Q`G7}wFzQ?zgpk#(!80#%BSA-@fvRj=UMArJCW2Q
zj1clfV|;14#>|?OCdOLSkmi@9!Y5-VT8So(zl6Nug{Z20!VH2Q((7A~R2b@Yr*O#M
z(L9ml(mjn7OY+vK(#}`Ak`i#Xs2QSotfEMxi4ogBLU@q$Y)JKNexXr($e<kXazol`
zr<;7LvxI5y*<Fn;%flbdp+Up}=-92acWwDuBe{?m60aeBrLlpfQNQt<Lh{A{n;5lv
zPCl!t4BxKUiaE^0vtYrMrk+>}OrR$zs27K)C5Jh$nd40b`7Jgy!(jWwLW|}^aq*Sn
z?LthdDN?eo9W9WGLqGMO`ihp;!o<j5aZonpF?`pUx-zBevpo-~rrLrlkr2f}_|xU_
zqrCUce576nN@XdmmIbAbJySIjqy~-GU9I4W!1-ahw9A&b$}jEjhb{)#=NxStaD;`}
z9oJEfQMe<Vvd>_1JF-q*KN+9#CxUq*!qZg5rn|u(tK5dA<fl-|K90>-xO+br80{Fu
zuVJJ|vTynF`}7BBprr!*QSPDMA?8u_+?Pnh&r)OR9bN!({L@RD-Iup!Wc?>%BNq`G
z8}S-dWG=tQUw0FC5!>_-FNO(<YJGr_1p(1)k=@}7+qUu2=k8r;7dQ6T+J@u3mSCUh
z5V3_=)NftB@>M-UuVL~GR`cbI<v+g3j{-s2)cwo#v40c!_OPDVQ%p8CSJCK&!&h~!
z+#kF;W!FOL8xOy;Vf4#i!9fE6tRnlU1=(f&%;E5Wxh2LZ>(#Bb(GyL2*p)`vckm<C
zJdlby8-yUK(>Aust+;!s8#9ZgKE>F3gC<T)=Mb}Iy9Noy5M<DShJh`_;c7I`(`dlz
z;j`1n4r&oBM}Dt<4IgzoC>o(})i?q<=cE1a;BD4}Wgff9Uvma#kjstwNGK9M<6hw<
z^{zCX`8<_fJ;Zo$R+t76=FJbR@W-NxWNgWov_Q5od|W-2?Fhh|xne|aik1u|o}VDU
zS#u@NSwS$_RpWwHtAIVcTh-fazMOV^4x8Z+aOl-tbFS2ALzHM}niYxugv(smIDDkQ
zX&%u`037cmM!!}gOa|gMK93UV&^E{yGeeZ@V8N=%Z9>_ED=fgaLOh5Ky89Wt2c!pL
z(Ps5R)}&h^Q;18!$D@Ha>bDPs66Sdflm)lrc?=y0bSEhw4j6`%LCkHp8UgifHy$O#
zp;UyuJ}ccVt8{vkaoA`Kp0jdMI|V3U6}@*XC!;2AIUx%zrdTvNCsdU+n5-?oeHkm!
zr)AiO{D^|310RDK#l2fCFxhdf%1j1jb<rm5yc3!*|MKN+&Eyqt1=Axar@n1`15LA`
zGeJOZKaf?q2+Y9sMdr-vfUEqC%wQ>)aZy&7DGhUiF6HEfxifwhpq01^gRCt58^>lA
zeTsxbJMuNN-0&A^7CX7&%0T>q<dM!HW7=mf{ZRmg1{3>LmZl@s9jZl2gXSk^c?$_r
zf&_6NSf)pay&@!Uh{|Pp3M8noo~~Ooau!P`hppl;tonTO@+euq%hb4pJ<BldpsRP-
zCt!3>2`BXfn%@3)6fH@5J)i9>RUHzJnfMGp<d>4ML2p3kI45y=_g5NPbCZY}`I{j8
z>4M^|KyPzOd8qsfeM=2OpPnZ68hG)*-iz}f%t3G@#ZoR)uaiqEFEqpr{}@!Wp~};b
zetlfnkEk)lYE>m#`tu#f)?4XvI)i@{4p<DYB8Za{9>)1mN(7b~t+Iwv%VAP$<_UEx
zJA8qLBh?FqnHE0Wki#3TaMRLi-y`3=63({#xq9B1gA7W4H_S^#9zMBZ<rBP(hzC9T
zV|SfX51nD72e^nua$>A_yvapd@>BO9&bqK-jw7gbSBH9=W%Y>#p*|VgMF}PkyXQ`L
zB8!X@P<XobYFM->cbp?DNLwoFNIz+KVn}b$xAvsYS`ms{Cb&>L?FgWy9a|bE4|c^e
zvkAHTOu=5tRl5+lgw+qCN()-hnE0e9@sfRHMeag1*pYk)GjHpQ@hm-zAiBacC*Y+_
zk-$gr5-WVl`+stm@2c^KxM8{DB}dtIsKYzqrZ)nl+;b&j-6SVk>~iI}fO_&JDcul{
z44G3zk0PU<lC^sCZoQ)h78H-hJB1PMcq49UMZ9&3E>)jLCCg$5($9FtW=AL>TBYO_
z_z0ZThNcC4g}Wif5}}Y%#(RMJx9QPQz@RdsazTGPyr@CKS8`g3BL+!q?Z@7@@YD>H
zRJQ~!(3<RIz#yM8J@0tQ6U;sLZwh0Q$)_n|?$SZ-2|O_e9ajg1@@Fm7UH$`PMe@xm
zRXJrlAsf_<)gJ-J>d9V`v1}E0U|ASYtnQC>JrMMJ=<c8&-DaI^w=rn&gSL8RL$?Gp
zD}1p_K^;HUMKE!X6b+?HuEWu~pcyH47ms_S$+E!m!JT{bWR~f?-aEN&`Zeh?oLndS
zkN>P_c_gs%&#{SpzIys{1pf8afHA&a4L;#vU@S?J1_a=f^Enj(DBtNU_oImaxnjyb
zi^3p`zEDQbx6RRDXh&5uf@h3OfGX7)k&)e>=G4_o-G2=^X`$JTNWj|4mhe7Oyfwb2
z91YSwaaA65%okJ&P``O<P~Zr%K)FItXSu!$Mbv=H4HBhdH4nJ9TBBcjc&>w+h4?Rt
zL94H9Y~Ud^WRMy-US3c=+sSwJ6^Drcr@y%Z0c+Mfxer<+`YU|~laZ;WxpYb<2(B+p
zjBZwk1E^-62wt{<Dy`^r4xv&&hb~V1w=~czA^LLoI2MF2cAa7Kx)R0UIRBM;|0uoz
z`c-npF>{Dcbt60nv9~Tw$#Nnz;r-nn?DGcE+I!6*NT~t;IUBu@z4r%XT7ORq@$x%$
zX?~5I7Hppvs>W%SCjsbFB>~~yQ<BOH2;)un50fFh3ZtPsjA;ifCBV0kuarQ%e+f3H
z3yZhH#h-9rAv~8V>q%**@fWv+sxd9AdAH+*7A+FTIE%<<7xz{R;(gQCXd@~SoLdB8
zb5{_ctSPa}EPS9A=q*==xfKw(#r>!ouKjgQk?z$q1yW0aN)mfsxY`mr>5R+ku0q~X
z<FsRZqBNp%Z2GGPNz3C=M011GtXh8fSLk1lu=qX08&nXlD_ppvgawYC+~ZO@=CdK<
zo#XUguZi%LTfzPwwHGt&ugDkq8j^a_GX3Me`3%Ra-A3;{HJ&tm4`wYLT;%YzbvJ`a
zA>wr+XYIf_&^1wf)=9514Wx**3U{xnOd8%tl0KoLf0~y~6K7!5yR5L<LgI833N0%l
z9ZmgSbK#VXfXZLs9hY~z{QFp!f|gn!khGO>%tRmyWfT?)6HV<{z&Yn_rFeexW5Dk=
zHjR!Nkfq^=)OMUoC!&&!wzTqQ(;;RZ1K!q>{Nf#{1ta9Kyzma#fa4(|n3sX1H;DGj
zlnTR&R{zxGC>s1;;yp&UjTdtJPjFoxwNV^cNQWR-&WtwFN+;o8x0Puud_Xy16Z!Kr
z>6<p;GL-ihS!YT;<a3v2z}6f*JQ5%}dvpWc^t(OapSQ=E_@p47zn=?PdJO2hK|2+E
zuLYA<-<1)&T`K3wXY#UKlBKL~^OdxcqSE~(|7d8cew>Apd@)hJoI^f?qm&bRO!~?A
z>tWPV(2zS~rJeCtLTbsKXVYM3Vxj(d>f6!k-kb3`7#ml2@A{z2;7a3+t-D+zmBU|X
zKesY&2FIgklXk8%E#xv?$J@-0I?`XQ285^B@yMg-T?#cENHu(sYPiR3_yWtLKZLtz
z1Sb!p_Y3AnrBvp8_+RwE9h@Oy<gURQWRBpq)ge#}Ba&8F_mega_4Q^4UHsH11(Dq~
zy};T#E8SwSFoOg!Aj#mtIEhhGDzW*ig3<mvRI@o}{2zncFh^6lBcypn@9xrf^t()v
za=3LfM@*Xhj`0IFZSC13&l^r$S((|5@S5kl#{;SYnnMGC3maZ7uMTfB$2Ol!d*0-m
zFyL6er~7gp)dcEb9Iy&Z3tTcC*-!4=fDfyhkfw08m0@P-GnGP%{x0!Y!oMLnu%dxn
z=O+Ob*t=aPgTX!^H!5NnWbd91ck!W<kRya1B0{*=l2*7<Z0akrsE4{vei3@j6s+_Q
zH;~uR5~g_eRPS(JwGZe@*wv4`JNJ#<{2Visa>MLs!W~3{?K>*{8JBHZ?<ZGPws+)Q
zNb{6S7>{p6PV+>gU;}pTX0EF5g2yY;M@;wz_Id+KK|BpRd@J66NmNRR<V!NF6|tIh
z4dgoEFYS1IFY9Od+<4622XL9opcB)iP@+HSV})n8;YdY4J`8SrjLYx|CA~!ynIrr}
zp$?O>L-}ijsc46>h%*6NiwNa9<0n_6RxS~2Zr3yJeDwMWmC5443vSq~-0!Nch9d{j
z({eMTqV$Kn%4v4xMwi~#$<!d9D^BYm={cB7!3Qc<)leg!^>c9aM@%e^=OK3JWZvCt
zp>b?|49^@x?hY>SxG-Dj&B(hO3n6WbLcPhErc*!!<cZn1tr5SR8k*ekJM2FOnZ`eb
zV>l;(W*FfzhN$GW@!QW|i5;SzZH9M`S5iN>Gx+3db1pYsM^Bf&`RryYyNX{Glbxuc
zf<B&3kH<e%=G<hW&LPBj<oDxZKfslOM#Mm?JVjgWU)f}#?og6qisZb<ZrdjxG0?3y
z)*3Y!_?jF}`Ug3;-@-?e;;HAyzP0>)>&5$IdV`Zo19@BTrro0j%K}|HH5+6=bmFS2
zh>z1`DqC6XM@Pfcg$1%>6J%^5R7WEc4wGYeH&87~mhE=%CNtZy)Faq2uRS~{xlJFo
zX8BG$6@6t7{eXWgOMa7V+Iiv=@LQ3_gxY}mT3O?_R$q|X?9-$l)0JPEJq@@84xQ>N
z5{>P0fjuKsz<CSxTgT*(mFAz>whZU4NvXV#%(!+stv0XniK}i1WF{DiV}xBFNd9Kg
z6e4)hx89X?8~iGeZwE8vWOYQukw9lkd9A~i{iQ(+4an%cm9e@)SF0;0Ds}69-2*!o
zt0)?4Urw*&myiI&t*g+&y#>w`PxSj_?DOEY0L^(K=0~(Z)Pfk3>yAS4_RsznohPA%
z=kyex>PrWatormjGhRaX_yPyrB<36<(u(<5VH)qH`x_<FhD7X7Qpe|SsG76+#UCa6
zg_Lh*toHdKFU$H<K3=WI$V*j8gLs8WJg)JuOv=ex+1{A&EFm-TpnlIJSf<n&4c-9@
z;MFQXRRH$W(ne;N*K{~3!4CT?DfH3HJc}TW2`c^qQL(`C`RMZ1kZ+~9xXZ{2SoszM
zCUsQ2K13x#8ue|zJ37vBe7haHsfYN<ja;DmT*`&v2)n<R!{+zcuf;R=S5#dd(<Z_|
zcWGmToDmN;>Y#C^?G%n8J(m9Fkl*jvrHmAc_^uXpPVx#6ld{dQxKJBeK@n8E^Rb-o
zRbpsfP#(+1jNwQG&4hnz@Ngc6@xkU5jU;VFsB+Xe(nc0DB5UG;{cU^?BL~$Akv(@T
z(_fH!W?D*Ep2Ex-rlTewIQ6tSGw6`CRM)zjC=e|)=nP8--l-Q7X<L>*^$jt+zYGj`
zP9}qCu2QAI<+0BAuc~{ZRH~=9F?XLQQ7Z_Wggb@9NWX^tc|zoMcX$7MXUy~?gsH=K
zQVH}EMIAeI{!E1_GJ`l2MQ~3|q1%h>fv)_C&Bj9LG0yXKzC}L=r9toR4dZlg?rh0f
zgcF5?lQvY+z6eqW@ou4BaTA5odpbG9OtLBC^(3UD5!xDz8DAJmh~DG3dg@H--{692
z=^A$D63~GNbA=ECw*_02x|yO+VIK$QDW-d|U&r@M-jt~O5outF`!i<+6g-dQgb$4S
ztDIjF(Mu@xmv$+gZ+hfKFD@vEBu4(7Mm%j|$MYQ`E;kODj~DHw2q6Sn5kKbvI}M|G
z!w)APWRpj5apHQ?Zg9aIC6J^Djc!i-z~BYzl+W^ZG%tum;cwC41M>?RZq*-lI$ixR
z?9Zad-EC8+;afid9sd$D=uIaY3=T-D?jh^uhLQed*k9Fx+YVV319Yn1GtICki<*+>
zQdEWjQd5;lhLxZh)X~Zb_?t&5gRw06ZLBi;$ln=)IEu=g4t1<TFf0c;XGns9-QtAi
z&n~-1=ksGq#5t9d6<<MnNS%~T6Ew{xeMH0#-OM+40LdT4bA#ltd4C3Fe0}^|{8*SH
zj9^CswS*nY%LH<<;V>7T^mn38_#4xGZFq9kUKGw5!b>!2VSKIx-4{)cuDmk!3(sEj
zYU$w--%A;Z;vO$7n>vD&D|%k#mn99j9Qx2Jkp%c1$D}eT1zPLsJadBJLnQs>d+yS*
zh~EKGo<(T~O!D4eF`q9Jlql~rNAd&#Z@7dT91%9Ox?2%0az7cXV06AgBCcnzc2?fA
zTG&Dv1SznXNMf6g^fNTPK`J^7U8pd{0$Xc1G#p%53CfOB!WJQEXvM1^T{5Z!jIe+9
zd$o|T_TIx<<~aecKe1{nk8vr#b<Cp_0xjS&z4~~@PhF4ey5+$m&u67JlLIshEXBOy
ztyo6BD0uVR=nVzZz~ut2#-~E&VzYpFfMVmr{_HkIR1i~v$Fl_l@FN`tt0-A=Jv!?K
z608JC>EJ-=9t;oN4<+3+o4SH6Z3&;1GqM-YzEtFJvqpaLN;KoLXj{hjk@yY!4KYtT
zUg`rhGXR&k?1ib=c+eNYP-p!g|EdH3d_@xc&rL4y7<wXL@Uzo^!T;F!e>D}Hqm#NH
z`%#lPJP1rY`84Y;ddr_Ycs>$eVm-M!cx`u@mGs40Pg87Mb5Zm!oXFhvV4W}5VeW`6
z`LS<hNo{K6al`M@KC>iWU(B5LTnLyi^V60ugU`K8yL4U0u*(Wk6mg*<5$Jmr9y;Rb
z&3k24RW4D{(UB2!|BhS<YHW99i~97G6nsrhO$9YIMqy#Hh@PNjhXK=C6Ts3z@Yu)*
z2RAp~q8B0B-rinONlDeUqU4;rR6e#*^{2A3veIQgF{&U5kl|b*=BiC&QbxvWA0HuI
zU0pMC^Tdpd4>LA~TrKj*VN%K}DmbWNred?epqw1l*RO|K85NorW5;)*??^uv6}{TE
z(0aXgc9WKqW0YbzV!=%qO)qpgYH`MG%9<W3MYH6<A0$D&w=r+Wmz<s+HEN+hv6GXN
z!$6GQpQS?wv86e#U%I-Pp2mkjAn+kwf&*U$%?e6OBS%I?iqP&C7Ic>!JiAxs%(%d{
zIyDP+Y04$L549<<@^kJMmX@bJZHh!NiJTe9$@N0;61_Juv9X*20zW!CLCed_4b9E2
zH-F8AgoShOT1!e8JdTzWArLwO0)mv36m<gwWg{a>j~3B2OvO2ON)fM4&s9GnS8U;I
z)h7EzIYq_653z&*UShfNlam_Z;o-!@#CgrlpDr&wstjA?Y;E^lbLZyge*kahzdA#v
zkLc;?HCpsvrP8Mpi%?<_u^XA$+1ZU{zMkUw@Zp1%gG0&JuU<ySc*yWpwzh?Zg^;l;
z_1B5Hxm0caXe74ZtGIc1degZr33(L(s17`Y0Vfp|7bm8s%4us80$=DfGcz-(U#QV}
zrAQJ{Ute#~;t|{4-d+@q717gGQQiL9-~X|7)z`x#b@&rIU<-eWGc`5!=hBig@Sq$Q
z1h{>6R=fT74~q!pINHD$Ffl-izZJ$0A4W6z8F?d7!lXprUniguvAwW+Y|?o(e|Wju
zw&o=8V|0|BkrAn7nUVl8>IF8k)6=8huV24T?j95`U;qyO{HYm7E?8HG5C|q785`r`
z;gNawj;Psjb$jWXYnFgBZPiY5Q<K<6(Td-d;pOq_`1WWfaJ2lI8tj(koSNv0eIYnF
zxcj?+r{lfj<J_~_fGf`c`L}Ng`uh4<R6#&^&F!0ed8LhwsRGLi1U!o5zW=LeFz)E+
z__?i3^!6As5a+x*LBr>`qHJ%^Dl01sphkaR^4F&=OUV7h)8p#XT~@rSQ1<<0b4PJq
zoy!U=H9o5I)sf-jVaG%BSA!}+s=Ml^i;j}Ix}<`F0t6Lp;9^i-{)Yc)d-b<R3!Z7=
z_wPb{4oeDtexfroGhg(Z<J|XWH4F@5de(H329K=Yi&3rmT~Rz8tv<9A#qW1qM|YUq
zT^??3ZL#jU=86a8Je}u0PG!Zju(EC$KMn^ds;G<t4haWyaB_CVlJQ?-J*|oNUSyS*
zznrZ$?)Z&9C$%%*)g}3O>G<TKXw*?v6=%QLRO@|aQC?nNT3VXd+M2brWMIdq-`#G>
zL0nW_9pCYE*ReB_&aK!s8yg#YKV$qbGeijLGD!fKd$iIvT&(ozdOe!`tJmpzfzjDU
zy!bZs=i@u0wNd_6v(<LL>AAV&<m8YU8<ly>c*cungMG`>c|TLr;1<tgm#rZJvHKJ0
zDx<dVrE?<Qe_t@F<(NG^K9Gz0r1;%kPEJfn`1|`y9a7d-^sJ>#fh_>0HtG=_?DD8Y
zd&g2>%JY;PjkwS9#D4kmB@`uaY;4Su%K}h2<f0kQ+%q81Ki>uLNdZo&VQj1hxX`Um
zzx*6hNB8vOLT5zuv$dW9EgLH<tMx*P%=*=x_w~sdTD{Ns#`)gV!9smRYile0;2&0`
z#Ji0UEHTjUxsFHP2rMd#fjEjcZ{H@Sr>7^Jl98yL83rrEC(<v-TB@dUz24p5-&pU9
zet+6Wbialbps>3Sb=BF<_*v%aeK<g>TH86c*Gfw7`h4y+*UxUe&UbNE{qI-@;;DA7
zI-dNbjGut%2CZI+SE~WJh4S$(zdK=uhKE0GF<|FppO9lB9d|s5-CZ49LbvheO+sQ~
z?W-{#X5FfSijNL>@dMI8m;gY=+<9A$Wv#vIxFy)y+A_1WtX5onf6|2ngidhB<9^4s
zrT87mVv{``JG<lHe!4cC5-kYGe0v86o125l(2-}FMQ2-7Pp4FS`}+_xvrszuICVqA
z*ky+RX7=ragI9)zhWC4F0qa-+*KqHu40P+RZhNR6CFJFidU|?VPy5NHXJ*<OJdByY
zE;~HVJ>41`e02))T=9;`eK@e>;pI&PlB-35@Y)TK%@L81zWLpGjF?w`26Ar}fLNt|
zGs7z`qq3|1fIG)0j8DU1<2w+5902_*7mi!(U_19OT!3ivf4W;e!+JWwIwOsV9z+Dn
z%9=-u_uXN0S!Jc)URL7V{?<yH?_}xI-o;&UL1W{`{Ct{{&!4@Y9<HqI?B4HjbFk3U
zoj~IU?BtYSe7{a~u-roQd5W3VBzE;lR8$m*cAJ&BQ@|;$50{JhL`2CsIqfBfZui&D
z=snb|tg&srSL;p!GN2b9B&a3S)Uc@h&T*b@#GiJG{1buH2;^+-ijP1^eaXV|ZkaHr
zZ@vx4_IQk{CoQWFM`6M*Q(-?1_XXU?KjB38N!i%EY;0^qsYbyj>=%FB5MTFb;Y1G!
zLBdMP&1JV9=Z&n|kBNzyn4N9Pv$G8d5Pw%~RGgn5)X>oIcJYbYsLOS|7v=BS88a)Z
z-`-9I5ETlje|n?vCfB3QrlzKPBB=Zofa-)95z^h=%`3h}65cg2fxY_v3<KbwTKQQ(
z2Cyg3&7GYMCjr7%b5#XsRzzV)Mrm0dW2tUUIu~7y%4rSTK?3>t`DKavdUVk~0?3dH
zx`f`}-}4%eZ+Nua{Hds(uZ181bqgr^mEV24cg|$Vc34|L>aPLce0zVxMHO(*2|#=1
z<8KD7h$ukfCJyg9Kj#6g8npSi8x11^2czfb|5R7U1^jXnAh*??d|3>Lf$iIieR6UC
z_bVSC-@biox7wZ!REh%+--d+Ut`Ma6faA~Vd;u@y`rk5}o0~&-_T|f~^z?Vg&_zi|
zNbm^=YOSYAirA(EvQ+`7@Gf(J<!yze3>82?=9C2ZYaH-!5p4Xqq9Qtz-%-=hu&n?-
zaB8opy!-=TN||BGRhT?3K7QQyh>V<k6G)HbB3>NdTg;ftDk=)UeG>$Sr7|-!<KyFh
zL5IOslnnSg$k@=>*!R$yE$r!XeF7#WC1qk~XJluO2lPTI9VsQ{Hh@<{Q<KZ~Ncz{p
zMfQ&Sr2c+6An41gs*LKHbJUr70R~*(?pJ?v+tXYc2f~&t0+ZsyuhP7{!0G8}tB5KE
z@ao}Wv!Ls?^3nx7fZbL!dwX6<2_P>Jby3q86ZbW>w9aA<(R(_NueiCndrnR`fW&vU
z;(5RI$+*sWL+(R#G||$O2~F}<Eo5N6&6oe%w{IwAD{5+L##06UG_IY1_W8taY&5-(
zj*01Vv?Pd0DWagQJ^P`IXray=O+KEoxV#)Sy6^82=jMe^dRkf@P(OgG@AP<o^R*5t
zo6ynG0dds2dDR1yYVYH=D*yzwAAZ;idaVbr)azfybH&HQ(1_MwPYIG^#!(3OXF9eI
zULGzMCU*3hcA0U>`c5N-NCM%s*zEWj;QYowyzA}x-dC}?C_KjbdP}UZurO$z`-URT
z+_$;;0yrPQP`;z{U46&4zLw*5ve<jNJH_0lyKoG$wDfc^kU)8Ocup29b58*f`rWns
z0QMX#eM<%y<>KmU9-e~)Wss0tq+yGPC|($I@r1kRFU7NywH|1Ra%{h0sM?2J<2i<|
z4-kG~VL_4ka%gPKVyZ+1O1$;;^-$&a49QV|k3O~g-0gj9ZfOxda^{$8^F3Y>{k6CV
z#Hk@?pED3DP$mOf(vEM@bs$0Wg9%6E@K!->ZQ}j?d(~_q0$0_njEr@F;YuqglWR`D
z-Gmluz;G8A7bw2VGD~pL&sF*H(SIyQba;CDje$lNnPY2Lwf_Z+$KfyD9YXrdQNlxc
zV;vm@2M0Fo3f`)&m4$`DGOf>mfQ;jF(^ZlYBFqu>O$Geecaa4s)=wR`6&)Y=9=$X|
z9qJbfDlM{A83DBjXvjD!amq7MA75X9jJUp6NA%p>S}(_Ux~4WByz!DWKNJ+u+Su4w
z+1M1cx99x*>mv4af0ky*0wW|OB;a{Op2=tbTCesUkmxWYHj1m8j8FkmZn-#b4Sftf
zX!>(}yz_T!_+Y*^<ox`cfTj*m{?^vkll{i7K*3e?@bGB3v-qMMIIsaWF$q*>3e~hx
zJVvTthyfY^=L>@9oNS=~fF?x%=qe^RpkTCKt@s`+HnSi75aH$h2;>t?Dlugy{O;qc
zfse3lUZ=Djw=>mD%*-@&bPyHhr}T7^?=3CX_V%&EM*u-K#-HxTy|+HT`!P5ewZGl8
zV3(4b3Jqd6!+}GOfrggF!?>pRaXbY$+n)Bu_{{Q{pjy33sK8E6#v`x{xZj|Hd;kFn
zzIoMum_6WTc=s%6t*FR({O9irAE2;qoQ;deleht?3}#I)n<xqa7z(6`-J_%aJ-4c~
z%IVWM8lWslO2Pm^583FC<wO9wG!r*B9-2P4)0IV*SXrf31)N_K6Y3)aM}TO7Dh$W~
zri+WqcJbF&glK@=Jy`9?g%)o;J<>BlphEzP1<=FQmoU&2<KyAs0g9iMZEJOUx>qgW
zRtu2QRLy4rLZg7T=xz7A6Yw}72DBe%?$pc-0RaQo4f|xQEmz{lk9|Nl<F%9RIp5;x
zXfW;z$e6>!L+9+!G-R_%|GljB`FUb~howkevPR!4hZWyr(Kt%c*Y@`IBfeKaEb2E3
zvjMIJLPj8aEKQ6S8<|5`II}^}hJFPtdJJ@ab#-=q3TZVu1~j$+x!v;jk3f23zYfFz
zz_7Mv2547YSs9BZb`APGC1?rnyFbfnVPV064jHvm;YJTBD`VEv(_4T2-~h~oL&8*7
zSFg!yFxqr$SZ?uj-Jh*YlMQ0~6b-0hK$0^vF(sG>()X@8)c|4`=sLQAY-_459Um9>
z^VhGT{pybPO=~sq9x`IcBz>oj-9la1oRM#AVq#+2l><;}njMx4Iy!O>4i4TfDABKQ
zQw0{Wh9SVhh)}8-3~$y(lFzl%+JJy|F+D3QrVNV8kJ(CnUFbCO;AIEPv+dFQihzsi
z>rqF4yic{WdNWQO#6Xkxs)~ENqP!gF0_gyLM3)b#si>Gg++IL8U^`dU7b660o`jqn
zXt?CyJ8=P_E$!;c4RsbmARv2yWZ~7eLQm9}uO11ox}>B;K}kvfO;NEmDbTvt)rTIV
z1s*Sb!*jh-1Ekz}Z%0D|4-mLcLfNhsn8L!s-<&rPfySgl6~t6r&;n~JxEK?Ij*5z!
zD#GE`vb@w0ApSl1&|9BmCwZ;3yu1K_oJNT!IwyT`agl_KEc)gvw4Kq?s^9fX08${3
z$Li|p*162gmfb4fV6YUQ+`I>xq%>Wkz+b=g{_OALap?fn7+OMGTSZDh#AIX;D=Q}8
zKfhq-=F5!j?v?_Y7%Ep6&z5DV#yj;&6}i|u^#T?l1d8qE=H{zE4?uTY-F8WOb92M~
zfC*edIDa$967v(X_}%EZDh3=4xX~D}<EsapOiD(!Lr#~N146>0d?708w}5c}KA0a6
z&p`DDz~Hn`&dyc=@{Xpef2+^M%k1oIAf#FUxC6((&g{4$<FlJjNXQ|MZm$EXOiWx{
z|3{lapp#S}C>k{LDO1ahHUq8e4zMyYMPmN#!_^o$jr@9g>I}Gmu-GH)T2W2y^Or9%
zK--n(P6OP#?Cn{*85;jTeVutAl<WJ(wJ0amsfZ*kB(fG|iJDF!>l6xEi?U~5BFjlD
ziloRcOX`#vYj!G)C0nQ_35o3c*s{$0uD9?1zy4EZ-gln&e(w9aKGzd1wMTPiCg43n
z!}fZQcQ%Z5l+@PMT^po&_I|1uFJF}Evl<>A-Y+gLbolV$Z-Qn2{b%23*;y0yM#+0j
z;)qoo$NI{<Ol9faA<9*wUZ`<Na-woAWVB_uleP7}$B!RtObR;{DDCmwDm`>7%W>ro
zjA7TUDHyhjqWi9Iegg*d^o%H_W`B#S_-0LI%p}UNf|62bQ-7r3o4wX6rlzKT+Hc%4
zm>qG?A@X^!Gj@?oRHA7KKA4ng;hUP8n)vYL+S36iAmZ|V7`GnM)YSZ%XUBztbpNsn
zuKi9_6c47+tqv!P*RSf{zhC|Lu48@|_np{(t83iG(eYkqr#Z#6=pA5%<rg)@1TvwM
z#Ke4GM2qq+H}tqN$r<{w-V$$BHifeth--M#(04Pv5LR&U$OoRR-p#ckG%h>pm&G&d
zcq-c|yTDz3)kRyadx=H2T_B-@{^P;tEVbf?Tahg+KD1p>P|)SNLNEL;S4er#mf3g1
zBqgOfSgt}?k?&Uqw6wGoJq9+RM@i>fXogG^R47#8<}Rg+W^~%D!;W-rte2Fo=&Mc#
zWkto>$Kr;TM~Wfb>>V5eJ=S}qJt=@n8KzU4_}+As`^T9SIH{IQNZw&{aCSaD-`q#e
zh&*{`W47n8K}&0^h5f}M+rd`ws@%Hh_EGe*+sAkB_I3>td<v0RsAp(Sm4E8L3Eb%I
zg#&#(EiEnT8XD(6HVAvJ;w+JJD&P;V=3-<=P%drJrAi5!u%yh2xn&u}_#i0N<JQ)F
z?x|gpCa+cER+Zf)kVktvhL4HtyOwU33F!5yMy2srcNcD-OIq=@$X#S-xQO+U4?U9y
zjvm!Hu<cQ%a_D<tx`YG)y7AKdyh8Xc(lZLhsrg37_}nR)sRTB5O?`d5w{OEG8Csd7
z&C`@VRd&^vd{lZJM4AtlcO<UU@@=<E&BO0vm7`v*EiESu4Grt74Gatb8iN|FukBm)
z+-^J6`74Wx#E_76Kr(&tC7>3KX!~$-W?YO}LJq=Jv6L^i5A>b1vl~nay~rz*A@zcd
zsItt=%!B%RH*OHJ;p4}TS<f{)Yu^4H!FXV$dN5+S(m{35F7|eVb!u|*Zi=LESy`Ef
zmsbw9nJVu^GMU^$r&mu*xYSqo_4n%=87VjexbfiDvf4-8$=W-^*CsU;B-iZSwjP+E
z=Yu*e&h9+f!_3CdFCIXks`PIm|KEn1)Vbf66wLcBzk*(`sp05vOt5lsacQhpd(Xs|
z#T1tMNUZigJX+Y9gX6griWI?6;J?slUcQbo*4O7E+82rSyQvKdAACWh;ongV@5(!W
z>z_TFH}Jb6C1vHy&#@1hDh6V%RNmg;dWF-$&hBY?`YkLIT2|SQ>)h+tpu0aUD@(xZ
zpQz!v5J;uBua6S*$Ob)dnxo5z0GQC93yX`jH8n<AvKW|f#bcNS^oS-OA0Jd){qV9N
z`)#>6$!B_AMW))?+V4MecKbwp>g~N`8m@ymGCAm0(5{1a31#nknLtRyba7kp!$kp-
z(i%4huqg52y2$WI(Bt^-;O}+WIhhzy1leFRnFEtUByKi+eSO?Zb!i}IE*_wVhX+JT
zv1Q}hyU~DS(Eio%?ro6vn131;bKXz_U$d^uclpU$i}zgxw*9MJx4?GAnRDk<|F~MK
z#_N1-scqlBY3k}W2j#G7?yst<Ds<^yNqBPjUw5)4(BdDHk9XD4S%a@&>EN`iz6rdu
zD+S`zhef%t=g_fZJ3F>>V-cz?m|1N5JJ%og_4PGv1Baju42WVgjs<J%r@=+R#<~XI
zQGb-D$A0|4wq6Wf(_)Wc_{J(fKS*tp*Nz(MToFcagDwC$0Sm23KRu4{3bWN)GfJDX
zjl|)5(Fs9y!P}%Mi<a5dt4PGM&W&|gLGq=grM>#k;f%R?BVl5o$G}a^<TmpS-pFlP
zFp@B40}pA2)S|E0La5&2;#f>w2*5BOZ`D}1Wvrneqd`7i*+)joRnNjADKDU@_C)I;
z_?xy8Z)v>d{&``-j5Nk8o>Wz3zcxD(GuQkI7E!mvq9WiZ<<%LWZEQ@&>ykD{Xwrvq
zar}&I?4R!?-r<Bx{qW&uSk!n|MH5QUD$KB?gN$wyvX$-n@qZH&cM@QjIh{eG<qOM`
zNJ$F|3u%tSIYtuPJUlSgI<BshDJCmK+?0mxA;?=hI&@4-OiqL?CrAqk34Jg1i9C93
z_CZoo(peG6IZZP&0aRzR14&jEl*_Q*DJ{YgKm__n%3(vLX@(!ge#L{Rs46TIVV12Z
zq~Z=IOu^vF?l+Ed)%iDeTb9<=Y8acCD1tU(e})d{mQ8&SKWkt>DO#fv`wSL?&(kk^
z^}p?-1ZKwCUd(O#nsZs}yJU>es3~c2M7Dfss;)4$7%u?>FHQD%+UEESB_x&p9a0e^
zAf<t9DR6WL$Ld1w@tp*}#e)p}y?`MC7$SL9zEY3852D+{)6;e6)Ba<>d%18sR>ztK
zJ#uWC64T^J!Q7r7d^T}b_e{FLxxr>d|5_HJ-684$^8YWBz_2?Y>x|iUXMGbBeu0zF
z54ko?Q-RDTR&d)y2C8WL66jjlCxJ`RDs1p;&{l2e=>h@*2e;Y-84;f3uQfNIqOu9!
z9};4I^<t^HG+HMR#8d`pIk<_$Ql@ZC#FIrxi)~F&(^+dHYx5k#-dg8o2Q2#%#viM%
zJ^8t-s|nVZ2y?Wxvo6>15brgRwj2;R?KeR!UkEu(T0SIIA}=S0kG7Lw(7S0@vW<*T
zR*-0}lFk5vD>7PxKij7l75y%n5!QTR+sm4vTeuS(<Yqk#2E?d_xL?S$<44csQ>xCz
zlpZ8Pv9Xp=3z%Y!AO=tiKRZRt&Yh!02%XyUh0jegS8uh&?oG*1<OnJX1v}FPTWoFU
z6f=b#VQGIALr4PY*F*cHGJ^HiA>_b*X7zx-DJG4(6)AWQaYHI$yPh#Hcr9`3UIh7`
z1DQ?bOP_h*vL`kPmtn|%85wuNNz5ncnX@Bp1kKnlA+Z-*W_#wfGIPL1LX#sbD6ZlQ
z=UVy4BjsGKdziR-9+t+bt6U(LXHQ}<Nkrrh_A0H+^rB3RsHo@#++w_<`##D>BlHx%
z`R+RaCRyI&=C7SPw&!0{;h6V3M!fgVozKwRwW6h52V2q$N5;@^ZEY{0$8%D04#zd1
zW_5LSp?3b!KGlH-WRv87ySnFTMFlB#!`-ye<p2_zZu6KOn4gYmb53RV1yt3e$B%`t
z<nV9b{u9Pzpg0TzS&dC)wL7W>(igSb+}XL)TeC1P?-9{F(S-j=NhV^Msfq5Buvj#R
zzZCrfAR|tm_XxHida5618xKhk*;h4@A_2?m$*LQ?+*;DXytfSbt?1UvfiB{=JVSRc
zSF^DZA%GnsG$JP?u4$tzCs(z+IL8&B@U7}Tf3zXn@j@|wSfx@Ha}ma&FkTgRXW=)=
zj>5)n%t2)WtJl`o-+Q*S>!|O049&sO(F8;J=kU{0j3ky{=eYsKuW$JdsC?SzK!2&A
zx4VHmegWMujGf6kI`<8tXJ=+;TlW;2N)a2gxVRX}h9DRaJinTWrCNMF-qdG$K-V<G
zUiJB_SH1ltmLkM>sGE#eNrHfq*B{t*OQ)AR3!w|9N@|yluWu|a(%jx&2UGdeX)AWS
zmX6K_^f8UlZMeexKx(+cwONUMk%KX#CbusF3-Im2&r&MzHea3**tiy)?<as0F~GlN
zn${9Vvo+&%E1fPs?i<tJkxH##9s&4b@UTVbvz$6h`RJXjbkxZmP%_9#72JJGRWsvD
z6W*)DYcvJ_g6ySgT9LqG%03UF-O}dR?n*pWX&hGHi@b_S|HaFOxd_7+Fcq2Pg4u9v
zVIZ||-}4%tNbqcQ1?=AD^3N!EIG@In0U9(U5pKY1NZC#A(v1q%tQ&>T?i~7fNv7N5
zh~m|W-S7k`m#Tz4!FgY`A9X-l|NbQ%$akN~djp~joC~Amj{vcOX~X(snPAKBep!X8
zM>x<wdSGt6>-5Q!C-sI;33lyiCU6-Mkia_zGkf;xO4`Q7#(vFrpa<n}pd-Q(y%&Cm
ztJvAvCMPFf_=m4%Y|IHs({^`1b0`oX0SOba<-sCqTG~xKRDzAOmXcVq&!}Li>(K!K
zhtaW;J~ef9b~X+S*uLWwHN468uS?}4T#`8@&3cFotT91Jo~j|gIWnoT`^PwQY+S*u
zS6z?p6wUSWvnHOhbLr%oo}M18vzxh>_RS73H0QDz9{jc1iLjk=aSa%QZqozJh3s!y
z<rgeZCpkbmjdzwo1qXcQrJ}SZ+q;-iSWA(z-@$K!nquYG3mMP*VHgz3C=;F#`-;KC
zUrcdlF8Mgh@k2+%GqNGcniJ$v6?Mj1mifl;)IBv3LdtjyeR@PfAwrH%hEgD+@VVRP
z!vuC{aIr=3M51E)sjLMmo`CD&Om%Lg1QpBe6~8hIIuT(01UJ|+=s~!8+mc`U8D!yx
zvCaLg{y=8`U-zGkdMPzDH0)6FlJJ!|pHtq1W(<ft_t54+)ItCRVV^Uz&so85-bF83
z<|Ykc^}x_jN@k{{wE^|@>nKe5Ecbpg!JzlbJ<@|T2Y5Ns|NWqh%sXU^c&@zc?Cf=7
zY=R|E(Q>&)jkeVpfF=3Ow%LGFNnFiniQV!%m|O?`%lIHpy&w}ak9;=J9kGqD;W0R^
zF6L}OvtUO4>v58K3DnB2+%|1BwKWz2zkfY!KdNUmJ8Z#<g;l)i^)-ZBvHW*m98N|c
zp8IKDVR5f@X@(lu00EZYJ0qm!Z$==ZYvX0rFpV{Jb&*%DzFbeGYdJU|iIqIKtHi0}
z2xcyCepxP}Uu^Lww+fsJ;!u)A#tjJ`m7Y9i2l$0RatYFi05wa?U99E!aKH`IBDY(B
zrt3I4_e)C$zPRQ3&W1g*Rs~WLr~-)U46t0ZML^Ns$b!o5WL%(Psji|IJ?yNZA$5Rq
zMay3Zy#k@(b=&k|Oy_NUd>U8f-r$7>22~bIGz*uJuLp;QhN9BSo?+*q3`mQ)Bq0Rw
zOY@V$?d#4N8-Hkbt^kT+5R@ZJ?Aj@GKWJ8h*v}L89_yahe>=+;IE+a4iEc8oXaNZh
z_>`WW9%}Cq84>XoJ-e;k|5|;KudVG}=;~bP0~uM_Xn#M|s3Zg|o=`T5{tMIb;p2mY
z-Jf3QBQ2c#V&a_nLT<87icL^(x43vHI=9}LGsjP!Tt$c$WRv$w)Fq=<iAhOWBU~<>
z`C>BiEnmEtcj>Zu&%Hd3&T@YxJnIeoauYOO3xs4*2lkvXG(3eHt62Ia-G(v(4%PZ5
zDk3a=3kHKptC;6~6dlb7WR0`ZU%nK-*tQ{~l{m{mkY7aDh<xnNDY9zH&gkjAgB9@^
z&8MfVb;`WCMopTr;ut4we9nDw_6q8NhmmMj;3U8=?{ul7*fTUy3GjjdchGbR45nL=
z>Gwj{8|CH4h@rs#zOJ@aYsKWqY!NhKQXo?i{RX*%d#9P5D%<-#E0K6Tr&2SrvL5vH
zS%d!55Q}UR5V&k>%R!~{7wEew?7*1BQ2}jF&%+oHmS`FH7+CfQm#y0sWe)T0l{q0F
zqYV+F3z2PZZvJTu>LQg&b=LLrK9W$%To^`X^#IyE?a=DxLmO}kLr4A#o$fx>s{x^n
z6DfDq)EU2z9sgwa<@0CN(;VWWqDDAxOA8Yz>3}*Al9i1__prTv1)Yd!#WTZnf|!B$
zw4~(l`im5_3kdLw>#p8A+?gmHkr{}Iez0KAw^1)tUW)q<%kkWr<$R=YPn1>)E}w@S
z$Zj9yq_963UTm;2zbC;?+@XiJx2%lJ7KS37YSG_%nv@Rp0S2YobXnX}TQZdG?s_pI
z)EF|buxKK}4mAHlAI3glU1)r4<!!rm!SIUlDUbBxw=2vLKNrBaIe~1Gx7ESROAdk@
zog)jVJT^8~6#5OKt6R6?nH?P0N1SePcXw||NmEH|qS$RmUgE2+kA4nd)r<U*0O&Xk
z1XzQ)L7em$O@vqX@liwvC1@`EGi>m~#4Fitj_B|YA3s(_38O3f&2@M;j~>S4)INQ>
zXY%TkgoOJ$XB=|d;GJQ32zFsR<BabmCN=sZNGNi<=z2TjOoNR(6ed!w&i9Lt;0yqg
z7{Wn8=%I;BA5({-vCb7v7ZulYpBgI}Z;bIGYiJOO2F*j@Ui{NZ=Hj@>m62!Z=?xC&
zWpGRdjR?+I!DHZz_CHtQOU1;*woLhBfS`$&E)2ay0$lC4^y9~FOs_vQVEd`QuSPwm
z=rgvgn^(&%u&#)yk%DoD(%wx^d(`*qkjZX?EyD5S{-7O&Xe<ywFRa9#&fU~ZQI=nS
z<HCV$_m8h#vu0p$FnBDZ!o7bZ{Jz4Djjx@%$k=a~bjZk5L`tx<1DDFU*I>?xsXs(9
zZpTN}dKeJ)wWFT_>bnin8qtn#vKq_}Ncx*W54c)F802jxU+Qv1Pe+=|+4<$sfav~B
z94aO~8`rO&`0;iXoF{SA0;j>66W9HZM`OM>;c24J;=CDB;#amRWsjQO(l)p%Z>}}n
zNOzR8$~R6;qTA<Vh^EqoV(2)hbl}L54<jRv^>ctALh|z7s?)nTR<DF&Sqcc$Q$2+n
zCcKU66CAvfljAX*=5O<P92Xatr5%s+3y5u;_<!~FHI{7LEmIwK|2}O83Fq2;8&4?<
zo}_z1wh<A5i3{KpW?_HAGUu%m&ByHz{tP%swD+C=J4g8L!*TNJ%{W&0|DQTEN?&3{
X)Xts#!DI%r;g5zYS%q@qLeT#KF3S<O

literal 0
HcmV?d00001


From 8aca6dbbf475576bb2d0554041c047f279958b9e Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 24 Sep 2025 23:36:58 +0500
Subject: [PATCH 886/912] Added: Add Warp sponsors logo

- https://www.warp.dev

The logo is sourced from https://github.com/warpdotdev/brand-assets/blob/640dffd347439bbcb535321ab36b7281cf4446c0/Github/Sponsor/Warp-Github-LG-03.png
---
 README.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/README.md b/README.md
index d693b62ab1..8233bf4ef6 100644
--- a/README.md
+++ b/README.md
@@ -288,3 +288,8 @@ Commit messages **must** use the [Conventional Commits](https://www.conventional
 
 [<img alt="Cloudflare" width="25%" src="site/assets/sponsors/cloudflare.png" />](https://www.cloudflare.com)  
 *[Cloudflare](https://www.cloudflare.com) ([1](https://packages-cf.termux.dev))*
+
+&nbsp;
+
+[<img alt="Warp" width="25%" src="https://github.com/warpdotdev/brand-assets/blob/640dffd347439bbcb535321ab36b7281cf4446c0/Github/Sponsor/Warp-Github-LG-03.png" />](https://www.warp.dev/?utm_source=github&utm_medium=readme&utm_campaign=termux)  
+[*Warp, built for coding with multiple AI agents*](https://www.warp.dev/?utm_source=github&utm_medium=readme&utm_campaign=termux)

From d3359b894e98b278becfc477224e4eb7748c6d75 Mon Sep 17 00:00:00 2001
From: Craig Comstock <craig@unreasonablefarm.org>
Date: Wed, 17 May 2023 09:27:21 -0500
Subject: [PATCH 887/912] Added drawing layer above terminal.

---
 .../java/com/termux/app/TermuxActivity.java   | 86 +++++++++++++++++++
 app/src/main/res/layout/activity_termux.xml   | 33 +++++--
 2 files changed, 110 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index 0c9f74125b..fffc6c39c8 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -9,6 +9,11 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.ServiceConnection;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.Path;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.IBinder;
@@ -17,6 +22,7 @@
 import android.view.Gravity;
 import android.view.Menu;
 import android.view.MenuItem;
+import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowManager;
@@ -65,6 +71,7 @@
 import androidx.drawerlayout.widget.DrawerLayout;
 import androidx.viewpager.widget.ViewPager;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 
 /**
@@ -194,6 +201,14 @@ public final class TermuxActivity extends AppCompatActivity implements ServiceCo
 
     private static final String LOG_TAG = "TermuxActivity";
 
+    // gesture graphics things
+    RelativeLayout gestureLayout;
+    Paint paint;
+    View view;
+    Path path2;
+    Bitmap bitmap;
+    Canvas canvas;
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         Logger.logDebug(LOG_TAG, "onCreate");
@@ -215,6 +230,20 @@ public void onCreate(Bundle savedInstanceState) {
 
         setContentView(R.layout.activity_termux);
 
+        gestureLayout = (RelativeLayout) findViewById(R.id.gesturelayout);
+        view = new SketchSheetView(TermuxActivity.this);
+        paint = new Paint();
+        path2 = new Path();
+        gestureLayout.addView(view, new ViewGroup.LayoutParams(
+            RelativeLayout.LayoutParams.MATCH_PARENT,
+            RelativeLayout.LayoutParams.MATCH_PARENT));
+        paint.setDither(true);
+        paint.setColor(Color.parseColor("#FF6600"));
+        paint.setStyle(Paint.Style.STROKE);
+        paint.setStrokeJoin(Paint.Join.ROUND);
+        paint.setStrokeCap(Paint.Cap.ROUND);
+        paint.setStrokeWidth(8);
+
         // Load termux shared preferences
         // This will also fail if TermuxConstants.TERMUX_PACKAGE_NAME does not equal applicationId
         mPreferences = TermuxAppSharedPreferences.build(this, true);
@@ -1010,4 +1039,61 @@ public static Intent newInstance(@NonNull final Context context) {
         return intent;
     }
 
+    class SketchSheetView extends View {
+        public SketchSheetView(Context context) {
+            super(context);
+            bitmap = Bitmap.createBitmap(820,480,Bitmap.Config.ARGB_4444);
+            canvas = new Canvas(bitmap);
+            //	    this.setBackgroundColor(Color.WHITE);
+        }
+        private ArrayList<DrawingClass> DrawingClassArrayList = new ArrayList<DrawingClass>();
+
+        @Override
+        public boolean onTouchEvent(MotionEvent event) {
+            DrawingClass pathWithPaint = new DrawingClass();
+            canvas.drawPath(path2, paint);
+            if (event.getAction() == MotionEvent.ACTION_DOWN) {
+                path2.reset(); // each gesture is separate
+                path2.moveTo(event.getX(), event.getY());
+                //		path2.moveTo(event.getX(), event.getY());
+                //		path2.lineTo(event.getX(), event.getY());
+            } else if (event.getAction() == MotionEvent.ACTION_MOVE) {
+                path2.lineTo(event.getX(), event.getY());
+                pathWithPaint.setPath(path2);
+                pathWithPaint.setPaint(paint);
+                DrawingClassArrayList.add(pathWithPaint);
+            }
+            invalidate();
+            return true;
+        }
+
+        @Override
+        protected void onDraw(Canvas canvas) {
+            super.onDraw(canvas);
+            if (DrawingClassArrayList.size() > 0) {
+                canvas.drawPath(
+                    DrawingClassArrayList.get(DrawingClassArrayList.size() - 1).getPath(),
+                    DrawingClassArrayList.get(DrawingClassArrayList.size() - 1).getPaint());
+            }
+        }
+    }
+
+    public class DrawingClass {
+        Path DrawingClassPath;
+        Paint DrawingClassPaint;
+
+        public Path getPath() {
+            return DrawingClassPath;
+        }
+        public void setPath(Path path) {
+            this.DrawingClassPath = path;
+        }
+        public Paint getPaint() {
+            return DrawingClassPaint;
+        }
+        public void setPaint(Paint paint) {
+            this.DrawingClassPaint = paint;
+        }
+    }
+
 }
diff --git a/app/src/main/res/layout/activity_termux.xml b/app/src/main/res/layout/activity_termux.xml
index 831ea7cfb8..9a771c09a1 100644
--- a/app/src/main/res/layout/activity_termux.xml
+++ b/app/src/main/res/layout/activity_termux.xml
@@ -23,15 +23,30 @@
             android:layout_above="@+id/terminal_toolbar_view_pager"
             android:layout_height="match_parent">
 
-            <com.termux.view.TerminalView
-                android:id="@+id/terminal_view"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:defaultFocusHighlightEnabled="false"
-                android:focusableInTouchMode="true"
-                android:scrollbarThumbVertical="@drawable/terminal_scroll_shape"
-                android:scrollbars="vertical"
-                tools:ignore="UnusedAttribute" />
+            <FrameLayout
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content">
+
+                <com.termux.view.TerminalView
+                    android:id="@+id/terminal_view"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:defaultFocusHighlightEnabled="false"
+                    android:focusableInTouchMode="true"
+                    android:scrollbarThumbVertical="@drawable/terminal_scroll_shape"
+                    android:scrollbars="vertical"
+                    android:importantForAutofill="no"
+                    android:autofillHints="password"
+                    tools:ignore="UnusedAttribute" />
+
+                <RelativeLayout
+                    android:id="@+id/gesturelayout"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@android:color/transparent">
+                </RelativeLayout>
+
+            </FrameLayout>
 
             <LinearLayout
                 android:id="@+id/left_drawer"

From ec897fa84a40d93dc84e2491c051a69bc658c0a1 Mon Sep 17 00:00:00 2001
From: Craig Comstock <craig@unreasonablefarm.org>
Date: Wed, 17 May 2023 09:57:03 -0500
Subject: [PATCH 888/912] added gesture.conf, list of gesture data for various
 characters

---
 app/src/main/res/raw/gesture.conf | 175 ++++++++++++++++++++++++++++++
 1 file changed, 175 insertions(+)
 create mode 100644 app/src/main/res/raw/gesture.conf

diff --git a/app/src/main/res/raw/gesture.conf b/app/src/main/res/raw/gesture.conf
new file mode 100644
index 0000000000..e3e5e405e8
--- /dev/null
+++ b/app/src/main/res/raw/gesture.conf
@@ -0,0 +1,175 @@
+# gesture.conf - gesture "key" to output character codes data
+#
+#   (C)opyright 2013-2018 by Craig Comstock <craig@unreasonablefarm.org>
+#
+#   This program is free software: you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation, either version 3 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+#
+# references:
+# http://ascii-table.com/ansi-escape-sequences-vt-100.php
+# https://theasciicode.com.ar/ascii-control-characters/backspace-ascii-code-8.html
+# http://www.ecma-international.org/publications/files/ECMA-ST/Ecma-048.pdf
+210:0x12 backspace
+0:0swx1 control
+0:0x1 dot
+210:012x24 enter
+0:210x14 shift
+012:210x24 tab 
+.012:210x124 tab
+# prefix gesture for gesture itself
+210:210x13 prefix
+012:0x12 space
+.0:210x14 !
+.012:2101210x1234 "
+.012:0121012x1234 #
+.2101210:012x1234 $
+# percent is tricky, start top-left corner, draw two counter-clockwise circles and then cross left-to-right horizontally from top-left corner at the end
+.01210121012:012101210x1234 %
+# alternate percent, start by drawing the number nine but at the bottom do a clockwise circle back to bottom left corner
+21012101210:0101212x1234 %
+# ampersand: tap, then draw the number 8
+.210121012:01210x1234 &
+.0:012x14 '
+.21012:012x1234 (
+.01210:012x1234 )
+# asterisk/times: tap, then top-left, one counter-clockwise circle finishing at bottom-left
+.01210:0121012x1234 *
+# plus: tap, start top-right, clockwise circle ending bottom-right
+.21012:0121012x1234 +
+.210:012x24 ,
+.012:0x12 -
+.0:0x1 .
+.012:210x24 /
+2101210:0121012x1234 0
+0:1012x14 1
+01:1012x1 1
+0121012:0121012x1234 2
+0121012:01212x1234 2
+0121210:012x1234 3
+01210121:012x123 3
+012121:012x123 3
+21012:1012x23 4
+21012:1012x123 4
+012:01012x123 4
+01210:012x134 5
+2101210:0121x234 6
+2101210:0121x1234 6
+101210:0121x134 6
+2101210:01212x1234 6
+01210:012x124 7
+210121012:01210x1234 8
+2101210:01012x124 9
+0:01210x14 :
+21012:01210x24 ;
+.21012:210x1234 <
+.0121012:012x1234 =
+.01210:210x1234 >
+.0121:012x12 ?
+.10121:01210x1234 @
+.1012:01210x1234 @
+.21012:01210x1234 @
+012:21012x234 a
+012:21012x134 a
+012:21012x1234 a
+012101210:21012x1234 b
+012101210:21012x134 b
+012101210:21012x234 b
+0121210:21012x1234 b
+01210:01212x134 b
+21012:012x1234 c 
+01210:21012x1234 d
+210121012:012x1234 e
+2101012:012x1234 e
+121012:1012x1234 e
+0121012:1012x1234 e
+012:210x124 f
+21012:0121x1234 g
+210121:0121x1234 g
+012:01212x134 h
+0:012x14 i
+210:012x234 j
+21012:01212x234 k
+21012:01012x123 k
+21012:0121012x1234 k
+21012:012x23 k
+012:012x134 l
+012:210121012x1234 m
+012:2101012x1234 m
+012:2101210x1234 n
+10121:01210x1234 o
+21012:01210x1234 o
+01210:2101x124 p
+2101212:01210x1234 q
+101212:01210x1234 q
+1012:01210x124 q
+10121012:01210x1234 q
+0121012:01210x1234 q
+0121012:21012x1234 r
+012:01210x124 r
+2101210:012x1234 s
+012:012x123 t
+012:01210x1234 u
+210:01210x124 v
+210:01210x123 v
+210:01210x1234 v
+210:0121x2 v
+012:0121210x1234 w
+01210:0121012x1234 x
+01210:01012x124 y
+0121012:012x1234 z
+.2101012:012x1234 [
+.210121012:012x1234 [
+.012:012x13 \
+.0121210:012x1234 ]
+.012101210:012x1234 ]
+.012:21012x234 ^
+.012:21012x1234 ^
+.012:21012x134 ^
+.012:21012x34 ^
+01210:0x12 _
+01210:01210x13 `
+2101012:210x1234 {
+210121012:210x1234 {
+0:21012x14 |
+012101210:210x1234 }
+0121210:210x1234 }
+# tilde is drawn right-to-left like an s or n or z but rotated
+210:0121012x1234 ~
+# Esc [2~ is "Insert"
+.0:0nwx1 [2~
+# Esc OH is "Home" ???
+.0:0nx1 OH
+# Esc [5~ is "PageUp"
+.0:0nex1 [5~
+# Esc [3~ is "Delete"
+.0:0swx1 [3~
+# Esc OF is "End"
+.0:0sx1 OF
+# Esc [6~ is "PageDown"
+.0:0sex1 [6~
+# \003 is Control-C
+012:012x13 
+# \033 is Escape
+0:0nwx1 
+# \002 is Ctrl-B, prefix key for tmux
+0:0sex1 
+# Esc OA is ??? TODO
+0:0nx1 OA
+# Esc OC is "Right"
+0:0ex1 OC
+# Esc OB is "Down"
+0:0sx1 OB
+# Esc OD is "Left"
+0:0wx1 OD
+# \177 is DEL
+0:0nex1 

From 7f15288186c96d8aff1f66f48b1eb0828d454072 Mon Sep 17 00:00:00 2001
From: Craig Comstock <craig@unreasonablefarm.org>
Date: Wed, 17 May 2023 10:46:04 -0500
Subject: [PATCH 889/912] move gesture.conf to gesture for use as R.raw.gesture
 and add in most everything needed, mostly works on square android watch!

---
 .../java/com/termux/app/TermuxActivity.java   | 505 +++++++++++++++++-
 .../main/res/raw/{gesture.conf => gesture}    |   0
 2 files changed, 502 insertions(+), 3 deletions(-)
 rename app/src/main/res/raw/{gesture.conf => gesture} (100%)

diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index fffc6c39c8..01c66ea866 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -16,7 +16,11 @@
 import android.graphics.Path;
 import android.net.Uri;
 import android.os.Bundle;
+import android.os.Environment;
+import android.os.Handler;
 import android.os.IBinder;
+import android.os.Message;
+import android.util.Log;
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
 import android.view.Gravity;
@@ -71,8 +75,15 @@
 import androidx.drawerlayout.widget.DrawerLayout;
 import androidx.viewpager.widget.ViewPager;
 
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.FileReader;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Properties;
 
 /**
  * A terminal emulator activity.
@@ -204,10 +215,22 @@ public final class TermuxActivity extends AppCompatActivity implements ServiceCo
     // gesture graphics things
     RelativeLayout gestureLayout;
     Paint paint;
-    View view;
+    GestureView gestureView;
     Path path2;
     Bitmap bitmap;
     Canvas canvas;
+    Properties gestures;
+
+    private Handler mHandler = new Handler() {
+        @Override
+        public void handleMessage(Message msg) {
+            if (msg.what == mHandlerCounter) {
+                gestureView.clearDrawing();
+                gestureView.invalidate();
+            }
+        }
+    };
+    int mHandlerCounter = 0; // keep track of which counter is "current" and only allow that one to cancel
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -231,10 +254,10 @@ public void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.activity_termux);
 
         gestureLayout = (RelativeLayout) findViewById(R.id.gesturelayout);
-        view = new SketchSheetView(TermuxActivity.this);
+        gestureView = new GestureView(TermuxActivity.this);
         paint = new Paint();
         path2 = new Path();
-        gestureLayout.addView(view, new ViewGroup.LayoutParams(
+        gestureLayout.addView(gestureView, new ViewGroup.LayoutParams(
             RelativeLayout.LayoutParams.MATCH_PARENT,
             RelativeLayout.LayoutParams.MATCH_PARENT));
         paint.setDither(true);
@@ -272,12 +295,14 @@ public void onCreate(Bundle savedInstanceState) {
 
         setTermuxTerminalViewAndClients();
 
+        // TODO, for gesture branch I never want this toolbar since gestures handle these extra keys nicely
         setTerminalToolbarView(savedInstanceState);
 
         setSettingsButtonView();
 
         setNewSessionButtonView();
 
+        // TODO, maybe disable this as I NEVER want the soft keyboard with gestures in use
         setToggleKeyboardView();
 
         registerForContextMenu(mTerminalView);
@@ -308,6 +333,11 @@ public void onCreate(Bundle savedInstanceState) {
         TermuxUtils.sendTermuxOpenedBroadcast(this);
     }
 
+    @Nullable
+    TerminalSession getCurrentTermSession() {
+        return mTerminalView.getCurrentSession();
+    }
+
     @Override
     public void onStart() {
         super.onStart();
@@ -809,6 +839,7 @@ public void run() {
                             getString(com.termux.shared.R.string.msg_storage_permission_granted_on_request));
 
                     TermuxInstaller.setupStorageSymlinks(TermuxActivity.this);
+                    loadGestureConf();
                 } else {
                     if (isPermissionCallback)
                         Logger.logInfoAndShowToast(TermuxActivity.this, LOG_TAG,
@@ -1078,6 +1109,474 @@ protected void onDraw(Canvas canvas) {
         }
     }
 
+    void loadGestureConf() {
+        Logger.logDebug(LOG_TAG, "loadGestureConf()");
+        try {
+            String gesturesFilePath = Environment.getExternalStorageDirectory().getAbsolutePath() + "/gesture.conf";
+            Logger.logDebug(LOG_TAG, "gesturesFilePath="+gesturesFilePath);
+            File gesturesFile = new File(gesturesFilePath);
+            Logger.logDebug(LOG_TAG, "gesturesFile="+gesturesFile);
+
+            // if gesture.conf isn't at /sdcard/gesture.conf then copy from resources
+            if (!gesturesFile.exists()) {
+                InputStream is = null;
+                OutputStream os = null;
+                try {
+                    // copy from resources
+                    is = getResources().openRawResource(R.raw.gest  ure); // TODO extension is .conf? matters?
+                    os = new FileOutputStream(gesturesFile);
+                    byte[] buffer = new byte[1024];
+                    int length;
+                    while ((length = is.read(buffer)) > 0) {
+                        os.write(buffer, 0, length);
+                    }
+                } catch(Exception e) {
+                    e.printStackTrace();
+                    Logger.logError(LOG_TAG, "copy raw resource gesture.conf failed: "+e);
+                } finally {
+                    if (is != null) {
+                        is.close();
+                    }
+                    if (os != null) {
+                        os.close();
+                    }
+                }
+            }
+            gestures = new Properties();
+            if (gesturesFile.isFile()) {
+                BufferedReader reader = null;
+                try {
+                    reader = new BufferedReader(new FileReader(gesturesFile));
+                    String line = reader.readLine();
+                    while (line != null) {
+                        if (line.startsWith("#")) {
+                            Logger.logError(LOG_TAG, "comment line: "+line);
+                        } else {
+                            String parts[] = line.split(" ");
+                            if (parts.length != 2) {
+                                Logger.logError(LOG_TAG, "bad line: "+line);
+                            } else {
+                                Logger.logError(LOG_TAG, "key: "+parts[0]+", value: "+parts[1]);
+                                gestures.setProperty(parts[0],parts[1]);
+                            }
+                        }
+                        line = reader.readLine();
+                    }
+                } finally {
+                    if (reader != null) {
+                        reader.close();
+                    }
+                }
+            }
+            Logger.logError(LOG_TAG, "gestures="+gestures);
+        } catch (Exception e) {
+            Logger.logError(LOG_TAG, "Error in loadGestures()");
+        }
+    }
+
+
+
+    class GestureView extends View {
+        public GestureView(Context context) {
+            super(context);
+            bitmap = Bitmap.createBitmap(820,480,Bitmap.Config.ARGB_4444);
+            canvas = new Canvas(bitmap);
+        }
+
+        private ArrayList<DrawingClass> DrawingClassArrayList = new ArrayList<DrawingClass>();
+
+        // gesture stuff
+        class TsEvent {
+            public int x;
+            public int y;
+            public int type;
+        }
+        TsEvent[] events = new TsEvent[300];
+
+        boolean slash, dot, shift, control, escape, alt, caps, prefix = false;
+
+        class Point {
+            public int x;
+            public int y;
+        }
+
+        int MAX_POINTS = 300;
+        class Gesture {
+            public int minx = 0;
+            public int maxx = 0 ;
+            public int miny = 0;
+            public int maxy = 0;
+            public int numPoints = 0;
+            public Point[] points = new Point[MAX_POINTS]; // how very C of me. :p but a limit is good
+        }
+        Gesture gs = new Gesture();
+        int gi = 0;
+        int view_width, view_height = 0;
+
+        @Override
+        protected void onSizeChanged(int xNew, int yNew, int xOld, int yOld) {
+            super.onSizeChanged(xNew, yNew, xOld, yOld);
+            view_width = xNew;
+            view_height = yNew;
+        }
+
+        protected void clearDrawing() {
+            DrawingClassArrayList.clear();
+        }
+
+        @Override
+        public boolean onTouchEvent(MotionEvent event) {
+            DrawingClass pathWithPaint = new DrawingClass();
+            canvas.drawPath(path2, paint);
+            if (event.getAction() == MotionEvent.ACTION_DOWN) {
+
+                mHandlerCounter++;
+                if (mHandlerCounter > 50) { // certainly you can't draw more than 50 gestures in a second right?
+                    mHandlerCounter = 0;
+                }
+
+                int x = (int)event.getX();
+                int y = (int)event.getY();
+                //		Log.e("GESTURE", "ACTION_DOWN, x="+x+", y="+y);
+
+                path2.reset(); // each gesture is separate
+                path2.moveTo(x, y);
+                path2.lineTo(x+1, y+1);
+                pathWithPaint.setPath(path2);
+                pathWithPaint.setPaint(paint);
+                DrawingClassArrayList.add(pathWithPaint);
+
+                // init a new gesture
+                gs = new Gesture();
+                gi = 0;
+                gs.minx = view_width;
+                gs.miny = view_height;
+
+                // update things as normal
+                updateMax(gs, x, y);
+                gs.points[gi] = new Point();
+                gs.points[gi].x = x;
+                gs.points[gi].y = y;
+                gi++;
+                if (gi > MAX_POINTS - 1) {
+                    gi--; // just keep pushing the last point into the last slot
+                }
+            } else if (event.getAction() == MotionEvent.ACTION_UP) {
+                gs.numPoints = gi;
+
+                // TODO how to get the physical size of the screen so we can make the
+                // minimum chunk ratio (fourth parameter to handleGesture()) be about
+                // the size of the average human finger?
+                // TODO maybe add the minimum chunk ratio as a config in gesture.conf?
+                // For big screen phone like nexus5 view_width / 6 was good
+                // but for kc05 watch I need something a bit more forgiving view_width / 4? (nope, try 5)
+                // watch 240x240, chunk (width/4)=60
+                // nexus5 1080x1920, chunk (width/6)=320
+                String output = handleGesture(gs, view_width, view_height, (int)(view_width / 4.5));
+                Logger.logDebug(LOG_TAG, "handleGesture()=>'"+output+"'");
+                gs = new Gesture();
+                gi = 0;
+
+                mHandler.sendEmptyMessageDelayed(mHandlerCounter, 1000); // TODO delay should be configurable in a file
+
+            } else if (event.getAction() == MotionEvent.ACTION_MOVE) {
+                int x = (int)event.getX();
+                int y = (int)event.getY();
+                //		Log.e("GESTURE", "ACTION_MOVE, x="+x+", y="+y);
+
+                path2.lineTo(event.getX(), event.getY());
+                pathWithPaint.setPath(path2);
+                pathWithPaint.setPaint(paint);
+                DrawingClassArrayList.add(pathWithPaint);
+
+                updateMax(gs, x, y);
+                gs.points[gi] = new Point();
+                gs.points[gi].x = x;
+                gs.points[gi].y = y;
+                gi++;
+                if (gi > MAX_POINTS - 1) {
+                    gi--; // just keep pushing the last point into the last slot
+                }
+            }
+            invalidate();
+            return true;
+        }
+
+        void updateMax(Gesture gs, int x, int y) {
+            if (x > gs.maxx) {
+                gs.maxx = x;
+            }
+            if (x < gs.minx) {
+                gs.minx = x;
+            }
+            if (y > gs.maxy) {
+                gs.maxy = y;
+            }
+            if (y < gs.miny) {
+                gs.miny = y;
+            }
+        }
+
+        // TODO UTF-8, other character set support? Use a String instead? auto-support for such things?
+        String handleGesture(Gesture gs, int screen_width, int screen_height, int minimum_chunk_size) {
+            //	    Log.e("TERMUX_ACTIVITY", "handleGesture(), screen_width="+screen_width+", screen_height="+screen_height+", minimum_chunk_size="+minimum_chunk_size);
+
+            String toput = "";
+            int MAX_KEYS = 50;
+            int key_x[] = new int[MAX_KEYS];
+            int key_y[] = new int[MAX_KEYS];
+            int i, kxi, kyi;
+            int sx, sy;
+            int tx, ty;
+            int rx, ry;
+            i = 0;
+            kxi = kyi = -1;
+            sx = (gs.maxx - gs.minx) / 3;
+            sy = (gs.maxy - gs.miny) / 3;
+            if (sx < minimum_chunk_size) {
+                sx = minimum_chunk_size;
+            }
+            if (sy < minimum_chunk_size) {
+                sy = minimum_chunk_size;
+            }
+            int nw, ne, se, sw;
+            nw = ne = se = sw = 0;
+            //	    Log.e("TERMUX_ACTIVITY", "handleGesture(), numPoints="+gs.numPoints+", minx="+gs.minx+", maxx="+gs.maxx+", miny="+gs.miny+", maxy="+gs.maxy+", sx="+sx+", sy="+sy);
+            for (; i < gs.numPoints; i++) {
+                rx = gs.points[i].x - gs.minx;
+                tx = rx / sx;
+                ry = gs.points[i].y - gs.miny;
+                ty = ry / sy;
+                if (tx == 3) {
+                    tx = 2;
+                }
+                if (ty == 3) {
+                    ty = 2;
+                }
+                //		Logger.logError(LOG_TAG, "handleGesture(), rx="+rx+", tx="+tx+", ry="+ry+", ty="+ty);
+
+                if (kxi == -1 || key_x[kxi] != tx) {
+                    key_x[++kxi] = tx;
+                    if (kxi > MAX_KEYS - 2) {
+                        kxi = MAX_KEYS - 2;
+                    }
+                }
+                if (kyi == -1 || key_y[kyi] != ty) {
+                    key_y[++kyi] = ty;
+                    if (kyi > MAX_KEYS - 2) {
+                        kyi = MAX_KEYS - 2;
+                    }
+                }
+
+                if (tx == 0 && ty == 0) {
+                    nw = 1;
+                }
+                if (tx == 2 && ty == 0) {
+                    ne = 1;
+                }
+                if (tx == 2 && ty == 2) {
+                    se = 1;
+                }
+                if (tx == 0 && ty == 2) {
+                    sw = 1;
+                }
+            }
+            if (kxi == -1) {
+                key_x[++kxi] = 0;
+                if (kxi > MAX_KEYS - 2) {
+                    kxi = MAX_KEYS - 2;
+                }
+            }
+            if (kyi == -1) {
+                key_y[++kyi] = 0;
+                if (kyi > MAX_KEYS - 2) {
+                    kyi = MAX_KEYS - 2;
+                }
+            }
+            String tmp, key = "";
+            if (dot) {
+                key += ".";
+                dot = false;
+            }
+            if (slash) {
+                key += "/";
+                slash = false;
+            }
+
+            i = 0;
+            for (; i <= kxi; i++) {
+                key += key_x[i];
+            }
+            key += ":";
+            i = 0;
+            for (; i <= kyi; i++) {
+                key += key_y[i];
+            }
+            if (key.equals("0:0") || key.equals(".0:0")) {
+                //		Log.d("TERMUX_ACTIVITY", "gesture, gs.maxy="+gs.maxy+", gs.miny="+gs.min
+                if (gs.maxy > screen_height - minimum_chunk_size) {
+                    key += "s";
+                }
+                if (gs.miny < minimum_chunk_size) {
+                    key += "n";
+                }
+                if (gs.maxx > screen_width - minimum_chunk_size) {
+                    key += "e";
+                }
+                if (gs.minx < minimum_chunk_size) {
+                    key += "w";
+                }
+            }
+
+            if (nw == 1 || ne == 1 || sw == 1 || se == 1) {
+                key += "x";
+                if (nw == 1) {
+                    key += "1";
+                }
+                if (ne == 1) {
+                    key += "2";
+                }
+                if (se == 1) {
+                    key += "3";
+                }
+                if (sw == 1) {
+                    key += "4";
+                }
+            }
+
+            // at this point we have our key, I think, let's just print it out and see if that much works. :+1:
+            Logger.logError(LOG_TAG, "handleGesture(), key='"+key+"'");
+
+            if (gestures == null) {
+                // TODO this might slow down the first recog but how else to do it?
+                Logger.logError(LOG_TAG, "gesture.conf not loaded, do it now");
+                //if (ensureStoragePermissionGranted()) {
+                    loadGestureConf();
+                //} else {
+                //    Logger.logError(LOG_TAG, "unable to get storage permission, can't load gesture, bailing");
+                 //   return "";
+                //}
+            }
+            String value = gestures.getProperty(key);
+            Logger.logError(LOG_TAG, "value from gesture.conf: "+value);
+            //letterView.setGravity(Gravity.CENTER_VERTICAL | Gravity.CENTER_HORIZONTAL);
+            if (value != null) {
+                // first translate some special names to single character
+                if (value.equals("enter")) {
+                    toput = "" + (char)0x0d;
+                } else if (value.equals("prefix")) {
+                    // TODO 2023-may-17, remove all 2-line business
+                    // TODO if in prefix mode already and keys are up or down or home or end
+                    // then move 2-line "first line" around but keep current line (prompt)
+                    // as second line in 2-line display
+/*
+                    if (prefix) {
+                        Log.e("CRAIG", "prefix-prefix entered, toggle visibility of lineView and mTerminalView");
+                        toggleViewVisibility(lineView);
+                        toggleViewVisibility(mTerminalView);
+                        updateLineView();
+                    }
+ */
+                    prefix = !prefix;
+                    // gesture prefix char
+                    // TODO might be nice to have some graphical indication
+                    // of being in prefix mode or control, shift, etc
+                    toput = "";
+                } else if (value.equals("tab")) {
+                    toput = "" + (char)0x09;
+                } else if (value.equals("backspace")) {
+                    toput = "" + (char)0x08;
+                } else if (value.equals("space")) {
+                    toput = " ";
+                } else if (value.equals("dot")) {
+                    if (dot) {
+                        toput = ".";
+                    }
+                    dot = !dot;
+                } else if (value.equals("shift")) {
+                    if (shift && caps) {
+                        caps = false; shift = false;
+                    } else if (shift && !caps) {
+                        caps = true; shift = false;
+                    } else if (!shift && caps) {
+                        shift = false; caps = false;
+                    } else {
+                        shift = true;
+                    }
+                } else if (value.equals("control")) {
+                    control = !control;
+                } else {
+                    toput = value;
+
+                    if (value.length() == 1) {
+                        if (caps || shift) {
+                            toput = "" + (char)(toput.charAt(0) - 32);
+                        }
+                        if (shift && !caps) {
+                            shift = !shift;
+                        }
+                        if (prefix) {
+                            // TODO 2023-may-17, remove 2-line stuff
+                            // TODO for both 2-line and console view, need to manage keyboard input focus
+                            /*
+                            if (toput.equals("b")) { // big letter display
+                                toggleViewVisibility(letterView);
+                            } else if (toput.equals("i")) { // image display
+                                //                        toggleViewVisibility(graphicsView); // TODO
+                            } else if (toput.equals("g")) { // gesture layer
+                                toggleViewVisibility(gestureView);
+                            }
+                             */
+                            prefix = !prefix; // regardless, get out of prefix mode
+                            toput = ""; // empty out the char, don't put anything
+                        }
+                        if (control) {
+                            toput = "" + (char)(toput.charAt(0) - 96);
+                            control = !control;
+                        }
+                    }
+                }
+
+                Logger.logError(LOG_TAG, "toput='"+toput+"' toput.length="+toput.length());
+
+                if (toput.length() > 0) {
+                    TerminalSession session = getCurrentTermSession();
+                    if (session != null) {
+                        if (session.isRunning()) {
+                            // todo check that toput is "disaplayable" :)
+                            session.write(toput);
+                        }
+                    }
+                }
+                // TODO this is odd, but wanted to avoid printing out OD OC etc for arrow keys
+/*
+                if (toput.length() == 1) {
+                    letterView.setTextColor(Color.GREEN);
+                    letterView.setText(toput);
+            } else {
+                //		letterView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 30);
+                letterView.setTextColor(Color.RED);
+                letterView.setText("key not found: "+key);
+             */
+            }
+            return toput;
+        }
+
+        @Override
+        protected void onDraw(Canvas canvas) {
+            super.onDraw(canvas);
+            //	    Log.e("GESTURE", "onDraw(), DrawingClassArrayList.size="+DrawingClassArrayList.size());
+
+            if (DrawingClassArrayList.size() > 0) {
+                canvas.drawPath(
+                    DrawingClassArrayList.get(DrawingClassArrayList.size() - 1).getPath(),
+                    DrawingClassArrayList.get(DrawingClassArrayList.size() - 1).getPaint());
+            } else {
+                canvas.drawColor(Color.TRANSPARENT);
+            }
+        }
+    }
+
     public class DrawingClass {
         Path DrawingClassPath;
         Paint DrawingClassPaint;
diff --git a/app/src/main/res/raw/gesture.conf b/app/src/main/res/raw/gesture
similarity index 100%
rename from app/src/main/res/raw/gesture.conf
rename to app/src/main/res/raw/gesture

From 0c9bfbfa952c13be4012cee6e4ae813acf388065 Mon Sep 17 00:00:00 2001
From: Craig Comstock <craig@unreasonablefarm.org>
Date: Wed, 17 May 2023 10:54:59 -0500
Subject: [PATCH 890/912] disable terminal toolbar always, dont need it with
 gestures around

---
 app/src/main/java/com/termux/app/TermuxActivity.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index 01c66ea866..e138aee890 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -296,7 +296,7 @@ public void onCreate(Bundle savedInstanceState) {
         setTermuxTerminalViewAndClients();
 
         // TODO, for gesture branch I never want this toolbar since gestures handle these extra keys nicely
-        setTerminalToolbarView(savedInstanceState);
+        //setTerminalToolbarView(savedInstanceState);
 
         setSettingsButtonView();
 
@@ -1039,7 +1039,7 @@ private void reloadActivityStyling(boolean recreateActivity) {
         }
 
         setMargins();
-        setTerminalToolbarHeight();
+        //setTerminalToolbarHeight();
 
         FileReceiverActivity.updateFileReceiverActivityComponentsState(this);
 

From 9ef256939d71f1046e8beb4d071b46eaa4db3a60 Mon Sep 17 00:00:00 2001
From: Craig Comstock <craig@unreasonablefarm.org>
Date: Wed, 17 May 2023 10:55:11 -0500
Subject: [PATCH 891/912] fixup gesture raw resource name

---
 app/src/main/java/com/termux/app/TermuxActivity.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index e138aee890..d6035bea64 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -1123,7 +1123,7 @@ void loadGestureConf() {
                 OutputStream os = null;
                 try {
                     // copy from resources
-                    is = getResources().openRawResource(R.raw.gest  ure); // TODO extension is .conf? matters?
+                    is = getResources().openRawResource(R.raw.gesture); // TODO extension is .conf? matters?
                     os = new FileOutputStream(gesturesFile);
                     byte[] buffer = new byte[1024];
                     int length;

From e82aa795b56f522d5f6037e5cceb285f990a6458 Mon Sep 17 00:00:00 2001
From: Craig Comstock <craig@unreasonablefarm.org>
Date: Wed, 17 May 2023 11:32:11 -0500
Subject: [PATCH 892/912] add prefix gesture (swipe bottom left to top right)
 and then up or down gestures for font increase/decrease since we took away
 ability to pinch zoom in terminal view

---
 app/src/main/java/com/termux/app/TermuxActivity.java | 9 +++++++++
 app/src/main/res/raw/gesture                         | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index d6035bea64..0c01e3ea14 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -1534,6 +1534,15 @@ String handleGesture(Gesture gs, int screen_width, int screen_height, int minimu
                             toput = "" + (char)(toput.charAt(0) - 96);
                             control = !control;
                         }
+                    } // value is length 1, simple char
+
+                    if (prefix) {
+                        // font size controls to replace pinch zoom
+                        if (toput.equals("\u001BOA")) // up
+                            mTermuxTerminalViewClient.changeFontSize(true);
+                        if (toput.equals("\u001BOB")) // down
+                            mTermuxTerminalViewClient.changeFontSize(false);
+                        prefix = !prefix;
                     }
                 }
 
diff --git a/app/src/main/res/raw/gesture b/app/src/main/res/raw/gesture
index e3e5e405e8..309570e11b 100644
--- a/app/src/main/res/raw/gesture
+++ b/app/src/main/res/raw/gesture
@@ -163,7 +163,7 @@
 0:0nwx1 
 # \002 is Ctrl-B, prefix key for tmux
 0:0sex1 
-# Esc OA is ??? TODO
+# Esc OA is "Up"
 0:0nx1 OA
 # Esc OC is "Right"
 0:0ex1 OC

From 449de8f277f1ccfead50a20a41df4a42dfdc17a6 Mon Sep 17 00:00:00 2001
From: Craig Comstock <craig@unreasonablefarm.org>
Date: Sat, 8 Jul 2023 12:10:16 -0500
Subject: [PATCH 893/912] Fixed font size up/down gesture so that up/down is
 not sent to terminal

---
 app/src/main/java/com/termux/app/TermuxActivity.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index 0c01e3ea14..40005ce38a 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -1538,10 +1538,14 @@ String handleGesture(Gesture gs, int screen_width, int screen_height, int minimu
 
                     if (prefix) {
                         // font size controls to replace pinch zoom
-                        if (toput.equals("\u001BOA")) // up
+                        if (toput.equals("\u001BOA")) { // up
                             mTermuxTerminalViewClient.changeFontSize(true);
-                        if (toput.equals("\u001BOB")) // down
+                            toput = ""; // no output, just font size change
+                        }
+                        if (toput.equals("\u001BOB")) { // down
                             mTermuxTerminalViewClient.changeFontSize(false);
+                            toput = ""; // no output, just font size change
+                        }
                         prefix = !prefix;
                     }
                 }

From 601699baf1f122fd1479db64c194013724f7587e Mon Sep 17 00:00:00 2001
From: Craig Comstock <craig@unreasonablefarm.org>
Date: Mon, 17 Jul 2023 20:07:59 -0500
Subject: [PATCH 894/912] sorry, i want termux-app to be home/default/launcher

---
 app/src/main/AndroidManifest.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c566c8f0d..3c3d9b8fb0 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -62,12 +62,12 @@
             tools:targetApi="n">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.HOME" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
             </intent-filter>
 

From dad7d46bd74c55e074fa31435cd682bfb16f7d69 Mon Sep 17 00:00:00 2001
From: Craig Comstock <craig@unreasonablefarm.org>
Date: Sun, 19 Nov 2023 08:30:29 -0600
Subject: [PATCH 895/912] fixup gesture loading so we use resource if storage
 is not available

---
 .../java/com/termux/app/TermuxActivity.java   | 69 ++++++++++++-------
 1 file changed, 44 insertions(+), 25 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index 40005ce38a..51f85f2937 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -80,6 +80,7 @@
 import java.io.FileOutputStream;
 import java.io.FileReader;
 import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -825,6 +826,7 @@ private void toggleKeepScreenOn() {
      * if targeting targetSdkVersion 30 (android 11) and running on sdk 30 (android 11) and higher.
      */
     public void requestStoragePermission(boolean isPermissionCallback) {
+        Logger.logDebug(LOG_TAG, "requestStoragePermission()");
         new Thread() {
             @Override
             public void run() {
@@ -834,6 +836,7 @@ public void run() {
                 // If permission is granted, then also setup storage symlinks.
                 if(PermissionUtils.checkAndRequestLegacyOrManageExternalStoragePermission(
                     TermuxActivity.this, requestCode, !isPermissionCallback)) {
+                    Logger.logDebug(LOG_TAG, "checkAndRequestLegacyManageExternalStoragePermission handler");
                     if (isPermissionCallback)
                         Logger.logInfoAndShowToast(TermuxActivity.this, LOG_TAG,
                             getString(com.termux.shared.R.string.msg_storage_permission_granted_on_request));
@@ -1109,16 +1112,25 @@ protected void onDraw(Canvas canvas) {
         }
     }
 
+    /**
+     * In one case I ran `termux-setup-storage` and got permission denied which also breaks loading gestures from storage.
+     * I was able to restore termux permissions by visiting Settings->Applications->Termux->Permissions
+     * and revoking/denying permission and re-running `termux-setup-storage`.
+     *
+     * Problem is currently this REQUIRES storage access, maybe it shouldn't? Just use resource if no file is present!
+     */
     void loadGestureConf() {
-        Logger.logDebug(LOG_TAG, "loadGestureConf()");
+        // TODO, why does logDebug() not show up in emulator logcat output?
+        Logger.logError(LOG_TAG, "loadGestureConf()");
         try {
             String gesturesFilePath = Environment.getExternalStorageDirectory().getAbsolutePath() + "/gesture.conf";
-            Logger.logDebug(LOG_TAG, "gesturesFilePath="+gesturesFilePath);
+            Logger.logError(LOG_TAG, "gesturesFilePath="+gesturesFilePath);
             File gesturesFile = new File(gesturesFilePath);
-            Logger.logDebug(LOG_TAG, "gesturesFile="+gesturesFile);
+            Logger.logError(LOG_TAG, "gesturesFile="+gesturesFile);
 
             // if gesture.conf isn't at /sdcard/gesture.conf then copy from resources
             if (!gesturesFile.exists()) {
+                Logger.logError(LOG_TAG, "gesturesFile doesn't exist, try copying from resources...");
                 InputStream is = null;
                 OutputStream os = null;
                 try {
@@ -1131,7 +1143,6 @@ void loadGestureConf() {
                         os.write(buffer, 0, length);
                     }
                 } catch(Exception e) {
-                    e.printStackTrace();
                     Logger.logError(LOG_TAG, "copy raw resource gesture.conf failed: "+e);
                 } finally {
                     if (is != null) {
@@ -1142,35 +1153,43 @@ void loadGestureConf() {
                     }
                 }
             }
+            /**
+             * we prefer gesture.conf but if the above copy didn't work (no permissions for example)
+             * then we use the resource instead.
+             */
+            BufferedReader reader = null;
             gestures = new Properties();
-            if (gesturesFile.isFile()) {
-                BufferedReader reader = null;
-                try {
-                    reader = new BufferedReader(new FileReader(gesturesFile));
-                    String line = reader.readLine();
-                    while (line != null) {
-                        if (line.startsWith("#")) {
-                            Logger.logError(LOG_TAG, "comment line: "+line);
+            if (gesturesFile.exists()) {
+                Logger.logError(LOG_TAG, "trying to read gestures from gesturesFile: " + gesturesFile.getAbsolutePath());
+                reader = new BufferedReader(new FileReader(gesturesFile));
+            } else {
+                Logger.logError(LOG_TAG, "copy of gestures resource failed, read gestures from resource");
+                reader = new BufferedReader(new InputStreamReader(getResources().openRawResource(R.raw.gesture)));
+            }
+            try {
+                String line = reader.readLine();
+                while (line != null) {
+                    if (line.startsWith("#")) {
+                        Logger.logError(LOG_TAG, "comment line: "+line);
+                    } else {
+                        String parts[] = line.split(" ");
+                        if (parts.length != 2) {
+                            Logger.logError(LOG_TAG, "bad line: "+line);
                         } else {
-                            String parts[] = line.split(" ");
-                            if (parts.length != 2) {
-                                Logger.logError(LOG_TAG, "bad line: "+line);
-                            } else {
-                                Logger.logError(LOG_TAG, "key: "+parts[0]+", value: "+parts[1]);
-                                gestures.setProperty(parts[0],parts[1]);
-                            }
+                            Logger.logError(LOG_TAG, "key: "+parts[0]+", value: "+parts[1]);
+                            gestures.setProperty(parts[0],parts[1]);
                         }
-                        line = reader.readLine();
-                    }
-                } finally {
-                    if (reader != null) {
-                        reader.close();
                     }
+                    line = reader.readLine();
+                }
+            } finally {
+                if (reader != null) {
+                    reader.close();
                 }
             }
             Logger.logError(LOG_TAG, "gestures="+gestures);
         } catch (Exception e) {
-            Logger.logError(LOG_TAG, "Error in loadGestures()");
+            Logger.logError(LOG_TAG, "Error in loadGestureConf(): " + e);
         }
     }
 

From b188206dd3008a2c09ee31fff22b3fec4b3233d3 Mon Sep 17 00:00:00 2001
From: Craig Comstock <craig@unreasonablefarm.org>
Date: Sat, 13 Jan 2024 09:49:34 -0600
Subject: [PATCH 896/912] trying to debug focus/redraw issues on timex
 familyconnect senior watch

---
 .../terminal/TermuxTerminalSessionActivityClient.java    | 2 ++
 .../termux/app/terminal/TermuxTerminalViewClient.java    | 1 +
 app/src/main/res/layout/activity_termux.xml              | 3 ++-
 .../main/java/com/termux/terminal/TerminalEmulator.java  | 1 +
 .../src/main/java/com/termux/view/TerminalRenderer.java  | 5 +++++
 .../src/main/java/com/termux/view/TerminalView.java      | 9 ++++++++-
 6 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionActivityClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionActivityClient.java
index cd38163116..6c93cb8cb9 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionActivityClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionActivityClient.java
@@ -116,6 +116,8 @@ public void onReloadActivityStyling() {
 
     @Override
     public void onTextChanged(@NonNull TerminalSession changedSession) {
+        Logger.logInfo(LOG_TAG, "CRAIG: onTextChanged()");
+        // CRAIG TODO, is this getting bumped when screen doesn't refresh?
         if (!mActivity.isVisible()) return;
 
         if (mActivity.getCurrentSession() == changedSession) mActivity.getTerminalView().onScreenUpdated();
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
index a3d09d3d52..b4976b05dd 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
@@ -612,6 +612,7 @@ public void setSoftKeyboardState(boolean isStartup, boolean isReloadTermuxProper
         mActivity.getTerminalView().setOnFocusChangeListener(new View.OnFocusChangeListener() {
             @Override
             public void onFocusChange(View view, boolean hasFocus) {
+                Logger.logInfo(LOG_TAG, "CRAIG: mActivity.getTerminalView().setOnFocusChangeListener().onFocusChange()");
                 // Force show soft keyboard if TerminalView or toolbar text input view has
                 // focus and close it if they don't
                 boolean textInputViewHasFocus = false;
diff --git a/app/src/main/res/layout/activity_termux.xml b/app/src/main/res/layout/activity_termux.xml
index 9a771c09a1..088078d106 100644
--- a/app/src/main/res/layout/activity_termux.xml
+++ b/app/src/main/res/layout/activity_termux.xml
@@ -41,8 +41,9 @@
 
                 <RelativeLayout
                     android:id="@+id/gesturelayout"
-                    android:layout_width="fill_parent"
+                    android:layout_width="100dp"
                     android:layout_height="wrap_content"
+                    android:alpha="0.8"
                     android:background="@android:color/transparent">
                 </RelativeLayout>
 
diff --git a/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java b/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
index b0be6f3440..d3a6824032 100644
--- a/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
+++ b/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
@@ -498,6 +498,7 @@ private void setDefaultTabStops() {
      * @param length the number of bytes in the array to process
      */
     public void append(byte[] buffer, int length) {
+        mClient.logInfo(LOG_TAG, "CRAIG: append(buffer, length="+length+")");
         for (int i = 0; i < length; i++)
             processByte(buffer[i]);
     }
diff --git a/terminal-view/src/main/java/com/termux/view/TerminalRenderer.java b/terminal-view/src/main/java/com/termux/view/TerminalRenderer.java
index a4bef7d37c..99526ebb0e 100644
--- a/terminal-view/src/main/java/com/termux/view/TerminalRenderer.java
+++ b/terminal-view/src/main/java/com/termux/view/TerminalRenderer.java
@@ -11,6 +11,9 @@
 import com.termux.terminal.TextStyle;
 import com.termux.terminal.WcWidth;
 
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
 /**
  * Renderer of a {@link TerminalEmulator} into a {@link Canvas}.
  * <p/>
@@ -56,6 +59,8 @@ public TerminalRenderer(int textSize, Typeface typeface) {
     /** Render the terminal to a canvas with at a specified row scroll, and an optional rectangular selection. */
     public final void render(TerminalEmulator mEmulator, Canvas canvas, int topRow,
                              int selectionY1, int selectionY2, int selectionX1, int selectionX2) {
+        Logger log = Logger.getLogger("TerminalRenderer");
+        log.log(Level.INFO, "render()");
         final boolean reverseVideo = mEmulator.isReverseVideo();
         final int endRow = topRow + mEmulator.mRows;
         final int columns = mEmulator.mColumns;
diff --git a/terminal-view/src/main/java/com/termux/view/TerminalView.java b/terminal-view/src/main/java/com/termux/view/TerminalView.java
index 435c102515..455ae2af2b 100644
--- a/terminal-view/src/main/java/com/termux/view/TerminalView.java
+++ b/terminal-view/src/main/java/com/termux/view/TerminalView.java
@@ -451,10 +451,15 @@ protected int computeVerticalScrollOffset() {
     }
 
     public void onScreenUpdated() {
+        mClient.logInfo(LOG_TAG, "CRAIG: onScreenUpdated()");
+        // CRAIG TODO the TermuxTerminalSessionActivityClient notifies here
         onScreenUpdated(false);
     }
 
     public void onScreenUpdated(boolean skipScrolling) {
+        // CRAIG TODO is this bumped when screen isn't refreshed?
+        mClient.logInfo(LOG_TAG, "CRAIG: onScreenUpdated(skipScrolling="+skipScrolling+")");
+
         if (mEmulator == null) return;
 
         int rowsInHistory = mEmulator.getScreen().getActiveTranscriptRows();
@@ -494,7 +499,8 @@ public void onScreenUpdated(boolean skipScrolling) {
 
         mEmulator.clearScrollCounter();
 
-        invalidate();
+        mClient.logInfo(LOG_TAG, "CRAIG: onScreenUpdated(), calling invalidate()");
+        invalidate(); // CRAIG TODO, does invalidate() cause onRender()
         if (mAccessibilityEnabled) setContentDescription(getText());
     }
 
@@ -1005,6 +1011,7 @@ public void updateSize() {
 
     @Override
     protected void onDraw(Canvas canvas) {
+        mClient.logInfo(LOG_TAG, "onDraw()");
         if (mEmulator == null) {
             canvas.drawColor(0XFF000000);
         } else {

From 102d2c4ac76b83ea3314b639e8f9279828fa4e27 Mon Sep 17 00:00:00 2001
From: Craig Comstock <craig@unreasonablefarm.org>
Date: Sat, 13 Jan 2024 15:26:14 -0600
Subject: [PATCH 897/912] further debugging, nearly there, seem to be getting
 the wrong mClient so updates going the wrong place

---
 app/src/main/AndroidManifest.xml                     |  2 ++
 app/src/main/java/com/termux/app/SplashActivity.java |  4 ++++
 app/src/main/java/com/termux/app/TermuxActivity.java | 10 +++++++++-
 .../TermuxTerminalSessionActivityClient.java         |  2 +-
 .../app/terminal/TermuxTerminalViewClient.java       | 12 ++++++++++++
 app/src/main/res/layout/activity_termux.xml          |  3 +--
 gradle.properties                                    |  3 ++-
 i                                                    |  2 ++
 launch.sh                                            |  1 +
 settings.sh                                          |  1 +
 .../java/com/termux/terminal/TerminalSession.java    |  6 ++++++
 .../src/main/java/com/termux/view/TerminalView.java  |  9 +++++++++
 uninstall.sh                                         |  1 +
 13 files changed, 51 insertions(+), 5 deletions(-)
 create mode 100644 app/src/main/java/com/termux/app/SplashActivity.java
 create mode 100755 i
 create mode 100755 launch.sh
 create mode 100755 settings.sh
 create mode 100644 uninstall.sh

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3c3d9b8fb0..6ccd9b5e18 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -62,12 +62,14 @@
             tools:targetApi="n">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+
                 <category android:name="android.intent.category.LAUNCHER" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.HOME" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+
                 <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
             </intent-filter>
 
diff --git a/app/src/main/java/com/termux/app/SplashActivity.java b/app/src/main/java/com/termux/app/SplashActivity.java
new file mode 100644
index 0000000000..9e4c791687
--- /dev/null
+++ b/app/src/main/java/com/termux/app/SplashActivity.java
@@ -0,0 +1,4 @@
+package com.termux.app;
+
+public class SplashActivity {
+}
diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index 51f85f2937..724a579f0a 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -235,7 +235,8 @@ public void handleMessage(Message msg) {
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
-        Logger.logDebug(LOG_TAG, "onCreate");
+        System.out.println("CRAIG: TermuxActivity.onCreate("+savedInstanceState+"), this="+this);
+        //Logger.logDebug(LOG_TAG, "onCreate("+savedInstanceState+"), this="+this);
         mIsOnResumeAfterOnCreate = true;
 
         if (savedInstanceState != null)
@@ -542,6 +543,7 @@ public void removeTermuxActivityRootViewGlobalLayoutListener() {
 
 
     private void setTermuxTerminalViewAndClients() {
+        System.out.println("CRAIG: setTermuxTerminalViewAndClients()");
         // Set termux terminal view and session clients
         mTermuxTerminalSessionActivityClient = new TermuxTerminalSessionActivityClient(this);
         mTermuxTerminalViewClient = new TermuxTerminalViewClient(this, mTermuxTerminalSessionActivityClient);
@@ -1073,6 +1075,7 @@ public static Intent newInstance(@NonNull final Context context) {
         return intent;
     }
 
+    /*
     class SketchSheetView extends View {
         public SketchSheetView(Context context) {
             super(context);
@@ -1103,6 +1106,7 @@ public boolean onTouchEvent(MotionEvent event) {
 
         @Override
         protected void onDraw(Canvas canvas) {
+            Log.e(LOG_TAG, "CRAIG: SketchSheetView, onDraw()");
             super.onDraw(canvas);
             if (DrawingClassArrayList.size() > 0) {
                 canvas.drawPath(
@@ -1111,6 +1115,7 @@ protected void onDraw(Canvas canvas) {
             }
         }
     }
+*/
 
     /**
      * In one case I ran `termux-setup-storage` and got permission denied which also breaks loading gestures from storage.
@@ -1317,6 +1322,8 @@ public boolean onTouchEvent(MotionEvent event) {
                     gi--; // just keep pushing the last point into the last slot
                 }
             }
+
+            Logger.logDebug(LOG_TAG, "CRAIG: onTouchEvent(), calling invalidate()");
             invalidate();
             return true;
         }
@@ -1596,6 +1603,7 @@ String handleGesture(Gesture gs, int screen_width, int screen_height, int minimu
 
         @Override
         protected void onDraw(Canvas canvas) {
+            Log.e("GESTURE", "CRAIG: GestureView, onDraw");
             super.onDraw(canvas);
             //	    Log.e("GESTURE", "onDraw(), DrawingClassArrayList.size="+DrawingClassArrayList.size());
 
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionActivityClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionActivityClient.java
index 6c93cb8cb9..0ecfb4e1f9 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionActivityClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionActivityClient.java
@@ -116,7 +116,7 @@ public void onReloadActivityStyling() {
 
     @Override
     public void onTextChanged(@NonNull TerminalSession changedSession) {
-        Logger.logInfo(LOG_TAG, "CRAIG: onTextChanged()");
+        Logger.logInfo(LOG_TAG, "CRAIG: onTextChanged("+changedSession+")");
         // CRAIG TODO, is this getting bumped when screen doesn't refresh?
         if (!mActivity.isVisible()) return;
 
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
index b4976b05dd..18dfb3d3c1 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
@@ -44,6 +44,8 @@
 import com.termux.terminal.TerminalEmulator;
 import com.termux.terminal.TerminalSession;
 
+import java.io.PrintWriter;
+import java.io.StringWriter;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -74,6 +76,15 @@ public class TermuxTerminalViewClient extends TermuxTerminalViewClientBase {
     private static final String LOG_TAG = "TermuxTerminalViewClient";
 
     public TermuxTerminalViewClient(TermuxActivity activity, TermuxTerminalSessionActivityClient termuxTerminalSessionActivityClient) {
+        System.out.println("CRAIG: new TermuxTerminalViewClient(), activity="+activity+", termuxTerminalSessionActivityClient="+termuxTerminalSessionActivityClient);
+        try {
+            throw new Exception("BOOM");
+        } catch( Exception e) {
+            StringWriter sw = new StringWriter();
+            PrintWriter pw = new PrintWriter(sw);
+            e.printStackTrace(pw);
+            System.out.println("CRAIG: stacktrace: " + sw.toString());
+        }
         this.mActivity = activity;
         this.mTermuxTerminalSessionActivityClient = termuxTerminalSessionActivityClient;
     }
@@ -86,6 +97,7 @@ public TermuxActivity getActivity() {
      * Should be called when mActivity.onCreate() is called
      */
     public void onCreate() {
+        System.out.println("CRAIG: TermuxTerminalViewClient.onCreate()");
         onReloadProperties();
 
         mActivity.getTerminalView().setTextSize(mActivity.getPreferences().getFontSize());
diff --git a/app/src/main/res/layout/activity_termux.xml b/app/src/main/res/layout/activity_termux.xml
index 088078d106..56ff90c154 100644
--- a/app/src/main/res/layout/activity_termux.xml
+++ b/app/src/main/res/layout/activity_termux.xml
@@ -41,9 +41,8 @@
 
                 <RelativeLayout
                     android:id="@+id/gesturelayout"
-                    android:layout_width="100dp"
+                    android:layout_width="200dp"
                     android:layout_height="wrap_content"
-                    android:alpha="0.8"
                     android:background="@android:color/transparent">
                 </RelativeLayout>
 
diff --git a/gradle.properties b/gradle.properties
index 90de122196..2876c92c0f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -20,7 +20,8 @@ org.gradle.jvmargs=-Xmx2048M \
 --add-exports=jdk.unsupported/sun.misc=ALL-UNNAMED
 android.useAndroidX=true
 
-minSdkVersion=21
+# so I can attach an onscrollchange listener to debug view refresh problems
+minSdkVersion=23
 targetSdkVersion=28
 ndkVersion=22.1.7171670
 compileSdkVersion=30
diff --git a/i b/i
new file mode 100755
index 0000000000..ba91c88fea
--- /dev/null
+++ b/i
@@ -0,0 +1,2 @@
+adb shell logcat -c
+adb shell logcat | tee log
diff --git a/launch.sh b/launch.sh
new file mode 100755
index 0000000000..a212f326c0
--- /dev/null
+++ b/launch.sh
@@ -0,0 +1 @@
+adb shell am start -n com.termux/.app.TermuxActivity
diff --git a/settings.sh b/settings.sh
new file mode 100755
index 0000000000..ae033c369a
--- /dev/null
+++ b/settings.sh
@@ -0,0 +1 @@
+adb shell am start -p com.android.settings com.android.intent.LAUNCHER 1
diff --git a/terminal-emulator/src/main/java/com/termux/terminal/TerminalSession.java b/terminal-emulator/src/main/java/com/termux/terminal/TerminalSession.java
index b068be203b..3f746c98b6 100644
--- a/terminal-emulator/src/main/java/com/termux/terminal/TerminalSession.java
+++ b/terminal-emulator/src/main/java/com/termux/terminal/TerminalSession.java
@@ -222,6 +222,7 @@ public TerminalEmulator getEmulator() {
 
     /** Notify the {@link #mClient} that the screen has changed. */
     protected void notifyScreenUpdate() {
+        System.out.println("CRAIG: TerminalSession.notifyScreenUpdate() calling mClient.onTextChanged(), mClient="+mClient);
         mClient.onTextChanged(this);
     }
 
@@ -340,7 +341,10 @@ class MainThreadHandler extends Handler {
 
         @Override
         public void handleMessage(Message msg) {
+            Logger.logError(mClient, LOG_TAG, "CRAIG: handleMessage(" + msg + ")" );
+
             int bytesRead = mProcessToTerminalIOQueue.read(mReceiveBuffer, false);
+            Logger.logError(mClient, LOG_TAG, "CRAIG: bytesRead="+bytesRead);
             if (bytesRead > 0) {
                 mEmulator.append(mReceiveBuffer, bytesRead);
                 notifyScreenUpdate();
@@ -361,6 +365,8 @@ public void handleMessage(Message msg) {
                 exitDescription += " - press Enter]";
 
                 byte[] bytesToWrite = exitDescription.getBytes(StandardCharsets.UTF_8);
+                Logger.logError(mClient, LOG_TAG, "CRAIG: after MSG_PROCESS_EXITED" );
+
                 mEmulator.append(bytesToWrite, bytesToWrite.length);
                 notifyScreenUpdate();
 
diff --git a/terminal-view/src/main/java/com/termux/view/TerminalView.java b/terminal-view/src/main/java/com/termux/view/TerminalView.java
index 455ae2af2b..4891d262b8 100644
--- a/terminal-view/src/main/java/com/termux/view/TerminalView.java
+++ b/terminal-view/src/main/java/com/termux/view/TerminalView.java
@@ -135,6 +135,7 @@ public final class TerminalView extends View {
 
     public TerminalView(Context context, AttributeSet attributes) { // NO_UCD (unused code)
         super(context, attributes);
+        TerminalView self = this;
         mGestureRecognizer = new GestureAndScaleRecognizer(context, new GestureAndScaleRecognizer.Listener() {
 
             boolean scrolledWithFinger;
@@ -168,6 +169,7 @@ public boolean onSingleTapUp(MotionEvent event) {
 
             @Override
             public boolean onScroll(MotionEvent e, float distanceX, float distanceY) {
+                System.out.println( "TerminalView/GestureHandler, CRAIG: onScroll()");
                 if (mEmulator == null) return true;
                 if (mEmulator.isMouseTrackingActive() && e.isFromSource(InputDevice.SOURCE_MOUSE)) {
                     // If moving with mouse pointer while pressing button, report that instead of scroll.
@@ -195,6 +197,7 @@ public boolean onScale(float focusX, float focusY, float scale) {
 
             @Override
             public boolean onFling(final MotionEvent e2, float velocityX, float velocityY) {
+                System.out.println( "TerminalView/GestureHandler, CRAIG: onFling()");
                 if (mEmulator == null) return true;
                 // Do not start scrolling until last fling has been taken care of:
                 if (!mScroller.isFinished()) return true;
@@ -268,6 +271,7 @@ public void onLongPress(MotionEvent event) {
      *                           for communication between {@link TerminalView} and its client.
      */
     public void setTerminalViewClient(TerminalViewClient client) {
+        System.out.println("CRAIG: setTerminalViewClient("+client+")");
         this.mClient = client;
     }
 
@@ -501,6 +505,9 @@ public void onScreenUpdated(boolean skipScrolling) {
 
         mClient.logInfo(LOG_TAG, "CRAIG: onScreenUpdated(), calling invalidate()");
         invalidate(); // CRAIG TODO, does invalidate() cause onRender()
+        mClient.logInfo(LOG_TAG, "CRAIG: onScreenUpdated(), after invalidate(), now call requestLayout()");
+        this.getParent().requestLayout(); // maybe not needed?
+        mClient.logInfo(LOG_TAG, "CRAIG: onScreenUpdated(), after requestLayout()");
         if (mAccessibilityEnabled) setContentDescription(getText());
     }
 
@@ -588,6 +595,8 @@ void doScroll(MotionEvent event, int rowsDown) {
                 // e.g. less, which shifts to the alt screen without mouse handling.
                 handleKeyCode(up ? KeyEvent.KEYCODE_DPAD_UP : KeyEvent.KEYCODE_DPAD_DOWN, 0);
             } else {
+                System.out.println("CRAIG: doScroll() calling invalidate() on this="+this);
+                System.out.println("CRAIG: doScroll(), this.mClient=" + this.mClient);
                 mTopRow = Math.min(0, Math.max(-(mEmulator.getScreen().getActiveTranscriptRows()), mTopRow + (up ? -1 : 1)));
                 if (!awakenScrollBars()) invalidate();
             }
diff --git a/uninstall.sh b/uninstall.sh
new file mode 100644
index 0000000000..03c39acff8
--- /dev/null
+++ b/uninstall.sh
@@ -0,0 +1 @@
+adb shell pm uninstall com.termux

From e09f346633c967f66d8f012d3417b419a7e63c87 Mon Sep 17 00:00:00 2001
From: Craig Comstock <craig@unreasonablefarm.org>
Date: Sun, 14 Jan 2024 10:45:58 -0600
Subject: [PATCH 898/912] refactor to remove gesture stuff as much as possible
 from termuxactivity class

---
 .../java/com/termux/app/DrawingClass.java     |  22 +
 .../main/java/com/termux/app/GestureView.java | 582 ++++++++++++++++
 .../java/com/termux/app/TermuxActivity.java   | 620 +-----------------
 app/src/main/res/layout/activity_termux.xml   |   8 +-
 4 files changed, 616 insertions(+), 616 deletions(-)
 create mode 100644 app/src/main/java/com/termux/app/DrawingClass.java
 create mode 100644 app/src/main/java/com/termux/app/GestureView.java

diff --git a/app/src/main/java/com/termux/app/DrawingClass.java b/app/src/main/java/com/termux/app/DrawingClass.java
new file mode 100644
index 0000000000..27df4f3c87
--- /dev/null
+++ b/app/src/main/java/com/termux/app/DrawingClass.java
@@ -0,0 +1,22 @@
+package com.termux.app;
+
+import android.graphics.Paint;
+import android.graphics.Path;
+
+public class DrawingClass {
+    Path DrawingClassPath;
+    Paint DrawingClassPaint;
+
+    public Path getPath() {
+        return DrawingClassPath;
+    }
+    public void setPath(Path path) {
+        this.DrawingClassPath = path;
+    }
+    public Paint getPaint() {
+        return DrawingClassPaint;
+    }
+    public void setPaint(Paint paint) {
+        this.DrawingClassPaint = paint;
+    }
+}
diff --git a/app/src/main/java/com/termux/app/GestureView.java b/app/src/main/java/com/termux/app/GestureView.java
new file mode 100644
index 0000000000..17824bf4f8
--- /dev/null
+++ b/app/src/main/java/com/termux/app/GestureView.java
@@ -0,0 +1,582 @@
+package com.termux.app;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.Path;
+import android.os.Environment;
+import android.os.Handler;
+import android.os.Message;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.MotionEvent;
+import android.view.View;
+
+import com.termux.app.terminal.TermuxTerminalViewClient;
+import com.termux.shared.logger.Logger;
+import com.termux.terminal.TerminalSession;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.FileReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.Properties;
+
+public final class GestureView extends View {
+
+    Paint paint;
+    Path path2;
+    Bitmap bitmap;
+    Canvas canvas;
+    Properties gestures;
+    int mHandlerCounter = 0; // keep track of which counter is "current" and only allow that one to cancel
+
+    private TermuxTerminalViewClient mTermuxTerminalViewClient;
+    private TermuxActivity mTermuxActivity;
+    private InputStream mGestureConfInputStream;
+
+    private static final String LOG_TAG = "GestureView";
+
+    private static Handler mHandler = null;
+
+    public GestureView(Context context, AttributeSet attributeSet) {
+        super(context, attributeSet);
+
+        paint = new Paint();
+        path2 = new Path();
+        paint.setDither(true);
+        paint.setColor(Color.parseColor("#FF6600"));
+        paint.setStyle(Paint.Style.STROKE);
+        paint.setStrokeJoin(Paint.Join.ROUND);
+        paint.setStrokeCap(Paint.Cap.ROUND);
+        paint.setStrokeWidth(8);
+
+        GestureView self = this;
+
+        mHandler = new Handler() {
+
+            @Override
+            public void handleMessage(Message msg) {
+                if (msg.what == mHandlerCounter) {
+                    self.clearDrawing();
+                    self.invalidate();
+                }
+            }
+        };
+
+        bitmap = Bitmap.createBitmap(820,480,Bitmap.Config.ARGB_4444);
+        canvas = new Canvas(bitmap);
+    }
+
+    public void setTerminalViewClient(TermuxTerminalViewClient client) {
+        this.mTermuxTerminalViewClient = client;
+    }
+
+    public void setTermuxActivity(TermuxActivity termuxActivity) {
+        mTermuxActivity = termuxActivity;
+    }
+
+    public void setGestureConfInputStream(InputStream gestureConfInputStream) {
+        mGestureConfInputStream = gestureConfInputStream;
+    }
+
+    private ArrayList<DrawingClass> DrawingClassArrayList = new ArrayList<DrawingClass>();
+
+    // gesture stuff
+    class TsEvent {
+        public int x;
+        public int y;
+        public int type;
+    }
+    TsEvent[] events = new TsEvent[300];
+
+    boolean slash, dot, shift, control, escape, alt, caps, prefix = false;
+
+    class Point {
+        public int x;
+        public int y;
+    }
+
+    int MAX_POINTS = 300;
+    class Gesture {
+        public int minx = 0;
+        public int maxx = 0 ;
+        public int miny = 0;
+        public int maxy = 0;
+        public int numPoints = 0;
+        public Point[] points = new Point[MAX_POINTS]; // how very C of me. :p but a limit is good
+    }
+    Gesture gs = new Gesture();
+    int gi = 0;
+    int view_width, view_height = 0;
+
+    @Override
+    protected void onSizeChanged(int xNew, int yNew, int xOld, int yOld) {
+        super.onSizeChanged(xNew, yNew, xOld, yOld);
+        view_width = xNew;
+        view_height = yNew;
+    }
+
+
+    /**
+     * In one case I ran `termux-setup-storage` and got permission denied which also breaks loading gestures from storage.
+     * I was able to restore termux permissions by visiting Settings->Applications->Termux->Permissions
+     * and revoking/denying permission and re-running `termux-setup-storage`.
+     *
+     * Problem is currently this REQUIRES storage access, maybe it shouldn't? Just use resource if no file is present!
+     */
+    public void loadGestureConf() {
+        // TODO, why does logDebug() not show up in emulator logcat output?
+        Logger.logError(LOG_TAG, "loadGestureConf()");
+        try {
+            String gesturesFilePath = Environment.getExternalStorageDirectory().getAbsolutePath() + "/gesture.conf";
+            Logger.logError(LOG_TAG, "gesturesFilePath="+gesturesFilePath);
+            File gesturesFile = new File(gesturesFilePath);
+            Logger.logError(LOG_TAG, "gesturesFile="+gesturesFile);
+
+            // if gesture.conf isn't at /sdcard/gesture.conf then copy from resources
+            if (!gesturesFile.exists()) {
+                Logger.logError(LOG_TAG, "gesturesFile doesn't exist, try copying from resources...");
+                InputStream is = mGestureConfInputStream;
+                OutputStream os = null;
+                try {
+                    // copy from resources
+                    os = new FileOutputStream(gesturesFile);
+                    byte[] buffer = new byte[1024];
+                    int length;
+                    while ((length = is.read(buffer)) > 0) {
+                        os.write(buffer, 0, length);
+                    }
+                } catch(Exception e) {
+                    Logger.logError(LOG_TAG, "copy raw resource gesture.conf failed: "+e);
+                } finally {
+                    if (is != null) {
+                        is.close();
+                    }
+                    if (os != null) {
+                        os.close();
+                    }
+                }
+            }
+            /**
+             * we prefer gesture.conf but if the above copy didn't work (no permissions for example)
+             * then we use the resource instead.
+             */
+            BufferedReader reader = null;
+            gestures = new Properties();
+            if (gesturesFile.exists()) {
+                Logger.logError(LOG_TAG, "trying to read gestures from gesturesFile: " + gesturesFile.getAbsolutePath());
+                reader = new BufferedReader(new FileReader(gesturesFile));
+            } else {
+                Logger.logError(LOG_TAG, "copy of gestures resource failed, read gestures from resource");
+                reader = new BufferedReader(new InputStreamReader(mGestureConfInputStream));
+            }
+            try {
+                String line = reader.readLine();
+                while (line != null) {
+                    if (line.startsWith("#")) {
+                        Logger.logError(LOG_TAG, "comment line: "+line);
+                    } else {
+                        String parts[] = line.split(" ");
+                        if (parts.length != 2) {
+                            Logger.logError(LOG_TAG, "bad line: "+line);
+                        } else {
+                            Logger.logError(LOG_TAG, "key: "+parts[0]+", value: "+parts[1]);
+                            gestures.setProperty(parts[0],parts[1]);
+                        }
+                    }
+                    line = reader.readLine();
+                }
+            } finally {
+                if (reader != null) {
+                    reader.close();
+                }
+            }
+            Logger.logError(LOG_TAG, "gestures="+gestures);
+        } catch (Exception e) {
+            Logger.logError(LOG_TAG, "Error in loadGestureConf(): " + e);
+        }
+    }
+
+    protected void clearDrawing() {
+        DrawingClassArrayList.clear();
+    }
+
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+        DrawingClass pathWithPaint = new DrawingClass();
+        canvas.drawPath(path2, paint);
+        if (event.getAction() == MotionEvent.ACTION_DOWN) {
+
+            mHandlerCounter++;
+            if (mHandlerCounter > 50) { // certainly you can't draw more than 50 gestures in a second right?
+                mHandlerCounter = 0;
+            }
+
+            int x = (int)event.getX();
+            int y = (int)event.getY();
+            //		Log.e("GESTURE", "ACTION_DOWN, x="+x+", y="+y);
+
+            path2.reset(); // each gesture is separate
+            path2.moveTo(x, y);
+            path2.lineTo(x+1, y+1);
+            pathWithPaint.setPath(path2);
+            pathWithPaint.setPaint(paint);
+            DrawingClassArrayList.add(pathWithPaint);
+
+            // init a new gesture
+            gs = new Gesture();
+            gi = 0;
+            gs.minx = view_width;
+            gs.miny = view_height;
+
+            // update things as normal
+            updateMax(gs, x, y);
+            gs.points[gi] = new Point();
+            gs.points[gi].x = x;
+            gs.points[gi].y = y;
+            gi++;
+            if (gi > MAX_POINTS - 1) {
+                gi--; // just keep pushing the last point into the last slot
+            }
+        } else if (event.getAction() == MotionEvent.ACTION_UP) {
+            gs.numPoints = gi;
+
+            // TODO how to get the physical size of the screen so we can make the
+            // minimum chunk ratio (fourth parameter to handleGesture()) be about
+            // the size of the average human finger?
+            // TODO maybe add the minimum chunk ratio as a config in gesture.conf?
+            // For big screen phone like nexus5 view_width / 6 was good
+            // but for kc05 watch I need something a bit more forgiving view_width / 4? (nope, try 5)
+            // watch 240x240, chunk (width/4)=60
+            // nexus5 1080x1920, chunk (width/6)=320
+            String output = handleGesture(gs, view_width, view_height, (int)(view_width / 4.5));
+            Logger.logDebug(LOG_TAG, "handleGesture()=>'"+output+"'");
+            gs = new Gesture();
+            gi = 0;
+
+            mHandler.sendEmptyMessageDelayed(mHandlerCounter, 1000); // TODO delay should be configurable in a file
+
+        } else if (event.getAction() == MotionEvent.ACTION_MOVE) {
+            int x = (int)event.getX();
+            int y = (int)event.getY();
+            //		Log.e("GESTURE", "ACTION_MOVE, x="+x+", y="+y);
+
+            path2.lineTo(event.getX(), event.getY());
+            pathWithPaint.setPath(path2);
+            pathWithPaint.setPaint(paint);
+            DrawingClassArrayList.add(pathWithPaint);
+
+            updateMax(gs, x, y);
+            gs.points[gi] = new Point();
+            gs.points[gi].x = x;
+            gs.points[gi].y = y;
+            gi++;
+            if (gi > MAX_POINTS - 1) {
+                gi--; // just keep pushing the last point into the last slot
+            }
+        }
+
+        Logger.logDebug(LOG_TAG, "CRAIG: onTouchEvent(), calling invalidate()");
+        invalidate();
+        return true;
+    }
+
+    void updateMax(Gesture gs, int x, int y) {
+        if (x > gs.maxx) {
+            gs.maxx = x;
+        }
+        if (x < gs.minx) {
+            gs.minx = x;
+        }
+        if (y > gs.maxy) {
+            gs.maxy = y;
+        }
+        if (y < gs.miny) {
+            gs.miny = y;
+        }
+    }
+
+    // TODO UTF-8, other character set support? Use a String instead? auto-support for such things?
+    String handleGesture(Gesture gs, int screen_width, int screen_height, int minimum_chunk_size) {
+        //	    Log.e("TERMUX_ACTIVITY", "handleGesture(), screen_width="+screen_width+", screen_height="+screen_height+", minimum_chunk_size="+minimum_chunk_size);
+
+        String toput = "";
+        int MAX_KEYS = 50;
+        int key_x[] = new int[MAX_KEYS];
+        int key_y[] = new int[MAX_KEYS];
+        int i, kxi, kyi;
+        int sx, sy;
+        int tx, ty;
+        int rx, ry;
+        i = 0;
+        kxi = kyi = -1;
+        sx = (gs.maxx - gs.minx) / 3;
+        sy = (gs.maxy - gs.miny) / 3;
+        if (sx < minimum_chunk_size) {
+            sx = minimum_chunk_size;
+        }
+        if (sy < minimum_chunk_size) {
+            sy = minimum_chunk_size;
+        }
+        int nw, ne, se, sw;
+        nw = ne = se = sw = 0;
+        //	    Log.e("TERMUX_ACTIVITY", "handleGesture(), numPoints="+gs.numPoints+", minx="+gs.minx+", maxx="+gs.maxx+", miny="+gs.miny+", maxy="+gs.maxy+", sx="+sx+", sy="+sy);
+        for (; i < gs.numPoints; i++) {
+            rx = gs.points[i].x - gs.minx;
+            tx = rx / sx;
+            ry = gs.points[i].y - gs.miny;
+            ty = ry / sy;
+            if (tx == 3) {
+                tx = 2;
+            }
+            if (ty == 3) {
+                ty = 2;
+            }
+            //		Logger.logError(LOG_TAG, "handleGesture(), rx="+rx+", tx="+tx+", ry="+ry+", ty="+ty);
+
+            if (kxi == -1 || key_x[kxi] != tx) {
+                key_x[++kxi] = tx;
+                if (kxi > MAX_KEYS - 2) {
+                    kxi = MAX_KEYS - 2;
+                }
+            }
+            if (kyi == -1 || key_y[kyi] != ty) {
+                key_y[++kyi] = ty;
+                if (kyi > MAX_KEYS - 2) {
+                    kyi = MAX_KEYS - 2;
+                }
+            }
+
+            if (tx == 0 && ty == 0) {
+                nw = 1;
+            }
+            if (tx == 2 && ty == 0) {
+                ne = 1;
+            }
+            if (tx == 2 && ty == 2) {
+                se = 1;
+            }
+            if (tx == 0 && ty == 2) {
+                sw = 1;
+            }
+        }
+        if (kxi == -1) {
+            key_x[++kxi] = 0;
+            if (kxi > MAX_KEYS - 2) {
+                kxi = MAX_KEYS - 2;
+            }
+        }
+        if (kyi == -1) {
+            key_y[++kyi] = 0;
+            if (kyi > MAX_KEYS - 2) {
+                kyi = MAX_KEYS - 2;
+            }
+        }
+        String tmp, key = "";
+        if (dot) {
+            key += ".";
+            dot = false;
+        }
+        if (slash) {
+            key += "/";
+            slash = false;
+        }
+
+        i = 0;
+        for (; i <= kxi; i++) {
+            key += key_x[i];
+        }
+        key += ":";
+        i = 0;
+        for (; i <= kyi; i++) {
+            key += key_y[i];
+        }
+        if (key.equals("0:0") || key.equals(".0:0")) {
+            //		Log.d("TERMUX_ACTIVITY", "gesture, gs.maxy="+gs.maxy+", gs.miny="+gs.min
+            if (gs.maxy > screen_height - minimum_chunk_size) {
+                key += "s";
+            }
+            if (gs.miny < minimum_chunk_size) {
+                key += "n";
+            }
+            if (gs.maxx > screen_width - minimum_chunk_size) {
+                key += "e";
+            }
+            if (gs.minx < minimum_chunk_size) {
+                key += "w";
+            }
+        }
+
+        if (nw == 1 || ne == 1 || sw == 1 || se == 1) {
+            key += "x";
+            if (nw == 1) {
+                key += "1";
+            }
+            if (ne == 1) {
+                key += "2";
+            }
+            if (se == 1) {
+                key += "3";
+            }
+            if (sw == 1) {
+                key += "4";
+            }
+        }
+
+        // at this point we have our key, I think, let's just print it out and see if that much works. :+1:
+        Logger.logError(LOG_TAG, "handleGesture(), key='"+key+"'");
+
+        if (gestures == null) {
+            // TODO this might slow down the first recog but how else to do it?
+            Logger.logError(LOG_TAG, "gesture.conf not loaded, do it now");
+            //if (ensureStoragePermissionGranted()) {
+            loadGestureConf();
+            //} else {
+            //    Logger.logError(LOG_TAG, "unable to get storage permission, can't load gesture, bailing");
+            //   return "";
+            //}
+        }
+        String value = gestures.getProperty(key);
+        Logger.logError(LOG_TAG, "value from gesture.conf: "+value);
+        //letterView.setGravity(Gravity.CENTER_VERTICAL | Gravity.CENTER_HORIZONTAL);
+        if (value != null) {
+            // first translate some special names to single character
+            if (value.equals("enter")) {
+                toput = "" + (char)0x0d;
+            } else if (value.equals("prefix")) {
+                // TODO 2023-may-17, remove all 2-line business
+                // TODO if in prefix mode already and keys are up or down or home or end
+                // then move 2-line "first line" around but keep current line (prompt)
+                // as second line in 2-line display
+/*
+                    if (prefix) {
+                        Log.e("CRAIG", "prefix-prefix entered, toggle visibility of lineView and mTerminalView");
+                        toggleViewVisibility(lineView);
+                        toggleViewVisibility(mTerminalView);
+                        updateLineView();
+                    }
+ */
+                prefix = !prefix;
+                // gesture prefix char
+                // TODO might be nice to have some graphical indication
+                // of being in prefix mode or control, shift, etc
+                toput = "";
+            } else if (value.equals("tab")) {
+                toput = "" + (char)0x09;
+            } else if (value.equals("backspace")) {
+                toput = "" + (char)0x08;
+            } else if (value.equals("space")) {
+                toput = " ";
+            } else if (value.equals("dot")) {
+                if (dot) {
+                    toput = ".";
+                }
+                dot = !dot;
+            } else if (value.equals("shift")) {
+                if (shift && caps) {
+                    caps = false; shift = false;
+                } else if (shift && !caps) {
+                    caps = true; shift = false;
+                } else if (!shift && caps) {
+                    shift = false; caps = false;
+                } else {
+                    shift = true;
+                }
+            } else if (value.equals("control")) {
+                control = !control;
+            } else {
+                toput = value;
+
+                if (value.length() == 1) {
+                    if (caps || shift) {
+                        toput = "" + (char)(toput.charAt(0) - 32);
+                    }
+                    if (shift && !caps) {
+                        shift = !shift;
+                    }
+                    if (prefix) {
+                        // TODO 2023-may-17, remove 2-line stuff
+                        // TODO for both 2-line and console view, need to manage keyboard input focus
+                            /*
+                            if (toput.equals("b")) { // big letter display
+                                toggleViewVisibility(letterView);
+                            } else if (toput.equals("i")) { // image display
+                                //                        toggleViewVisibility(graphicsView); // TODO
+                            } else if (toput.equals("g")) { // gesture layer
+                                toggleViewVisibility(gestureView);
+                            }
+                             */
+                        prefix = !prefix; // regardless, get out of prefix mode
+                        toput = ""; // empty out the char, don't put anything
+                    }
+                    if (control) {
+                        toput = "" + (char)(toput.charAt(0) - 96);
+                        control = !control;
+                    }
+                } // value is length 1, simple char
+
+                if (prefix) {
+                    // font size controls to replace pinch zoom
+                    if (toput.equals("\u001BOA")) { // up
+                        mTermuxTerminalViewClient.changeFontSize(true);
+                        toput = ""; // no output, just font size change
+                    }
+                    if (toput.equals("\u001BOB")) { // down
+                        mTermuxTerminalViewClient.changeFontSize(false);
+                        toput = ""; // no output, just font size change
+                    }
+                    prefix = !prefix;
+                }
+            }
+
+            Logger.logError(LOG_TAG, "toput='"+toput+"' toput.length="+toput.length());
+
+            if (toput.length() > 0) {
+                TerminalSession session = mTermuxActivity.getCurrentTermSession();
+                if (session != null) {
+                    if (session.isRunning()) {
+                        // todo check that toput is "disaplayable" :)
+                        session.write(toput);
+                    }
+                }
+            }
+            // TODO this is odd, but wanted to avoid printing out OD OC etc for arrow keys
+/*
+                if (toput.length() == 1) {
+                    letterView.setTextColor(Color.GREEN);
+                    letterView.setText(toput);
+            } else {
+                //		letterView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 30);
+                letterView.setTextColor(Color.RED);
+                letterView.setText("key not found: "+key);
+             */
+        }
+        return toput;
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        Log.e("GESTURE", "CRAIG: GestureView, onDraw");
+        super.onDraw(canvas);
+        //	    Log.e("GESTURE", "onDraw(), DrawingClassArrayList.size="+DrawingClassArrayList.size());
+
+        if (DrawingClassArrayList.size() > 0) {
+            canvas.drawPath(
+                DrawingClassArrayList.get(DrawingClassArrayList.size() - 1).getPath(),
+                DrawingClassArrayList.get(DrawingClassArrayList.size() - 1).getPaint());
+        } else {
+            canvas.drawColor(Color.TRANSPARENT);
+        }
+    }
+
+
+}
+
+
diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index 724a579f0a..23f316d2ea 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -9,24 +9,14 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.ServiceConnection;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
-import android.graphics.Path;
 import android.net.Uri;
 import android.os.Bundle;
-import android.os.Environment;
-import android.os.Handler;
 import android.os.IBinder;
-import android.os.Message;
-import android.util.Log;
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
 import android.view.Gravity;
 import android.view.Menu;
 import android.view.MenuItem;
-import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowManager;
@@ -75,16 +65,7 @@
 import androidx.drawerlayout.widget.DrawerLayout;
 import androidx.viewpager.widget.ViewPager;
 
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.FileReader;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Properties;
 
 /**
  * A terminal emulator activity.
@@ -213,25 +194,7 @@ public final class TermuxActivity extends AppCompatActivity implements ServiceCo
 
     private static final String LOG_TAG = "TermuxActivity";
 
-    // gesture graphics things
-    RelativeLayout gestureLayout;
-    Paint paint;
     GestureView gestureView;
-    Path path2;
-    Bitmap bitmap;
-    Canvas canvas;
-    Properties gestures;
-
-    private Handler mHandler = new Handler() {
-        @Override
-        public void handleMessage(Message msg) {
-            if (msg.what == mHandlerCounter) {
-                gestureView.clearDrawing();
-                gestureView.invalidate();
-            }
-        }
-    };
-    int mHandlerCounter = 0; // keep track of which counter is "current" and only allow that one to cancel
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -255,19 +218,11 @@ public void onCreate(Bundle savedInstanceState) {
 
         setContentView(R.layout.activity_termux);
 
-        gestureLayout = (RelativeLayout) findViewById(R.id.gesturelayout);
-        gestureView = new GestureView(TermuxActivity.this);
-        paint = new Paint();
-        path2 = new Path();
-        gestureLayout.addView(gestureView, new ViewGroup.LayoutParams(
-            RelativeLayout.LayoutParams.MATCH_PARENT,
-            RelativeLayout.LayoutParams.MATCH_PARENT));
-        paint.setDither(true);
-        paint.setColor(Color.parseColor("#FF6600"));
-        paint.setStyle(Paint.Style.STROKE);
-        paint.setStrokeJoin(Paint.Join.ROUND);
-        paint.setStrokeCap(Paint.Cap.ROUND);
-        paint.setStrokeWidth(8);
+        //gestureLayout = (RelativeLayout) findViewById(R.id.gesturelayout);
+        //gestureView = new GestureView(TermuxActivity.this);
+        gestureView = (GestureView) findViewById(R.id.gesture_view);
+        gestureView.setTermuxActivity(this);
+        gestureView.setGestureConfInputStream(getResources().openRawResource(R.raw.gesture));
 
         // Load termux shared preferences
         // This will also fail if TermuxConstants.TERMUX_PACKAGE_NAME does not equal applicationId
@@ -296,6 +251,7 @@ public void onCreate(Bundle savedInstanceState) {
         }
 
         setTermuxTerminalViewAndClients();
+        gestureView.setTerminalViewClient(this.mTermuxTerminalViewClient);
 
         // TODO, for gesture branch I never want this toolbar since gestures handle these extra keys nicely
         //setTerminalToolbarView(savedInstanceState);
@@ -336,7 +292,7 @@ public void onCreate(Bundle savedInstanceState) {
     }
 
     @Nullable
-    TerminalSession getCurrentTermSession() {
+    public TerminalSession getCurrentTermSession() {
         return mTerminalView.getCurrentSession();
     }
 
@@ -844,7 +800,7 @@ public void run() {
                             getString(com.termux.shared.R.string.msg_storage_permission_granted_on_request));
 
                     TermuxInstaller.setupStorageSymlinks(TermuxActivity.this);
-                    loadGestureConf();
+                    gestureView.loadGestureConf();
                 } else {
                     if (isPermissionCallback)
                         Logger.logInfoAndShowToast(TermuxActivity.this, LOG_TAG,
@@ -1075,564 +1031,4 @@ public static Intent newInstance(@NonNull final Context context) {
         return intent;
     }
 
-    /*
-    class SketchSheetView extends View {
-        public SketchSheetView(Context context) {
-            super(context);
-            bitmap = Bitmap.createBitmap(820,480,Bitmap.Config.ARGB_4444);
-            canvas = new Canvas(bitmap);
-            //	    this.setBackgroundColor(Color.WHITE);
-        }
-        private ArrayList<DrawingClass> DrawingClassArrayList = new ArrayList<DrawingClass>();
-
-        @Override
-        public boolean onTouchEvent(MotionEvent event) {
-            DrawingClass pathWithPaint = new DrawingClass();
-            canvas.drawPath(path2, paint);
-            if (event.getAction() == MotionEvent.ACTION_DOWN) {
-                path2.reset(); // each gesture is separate
-                path2.moveTo(event.getX(), event.getY());
-                //		path2.moveTo(event.getX(), event.getY());
-                //		path2.lineTo(event.getX(), event.getY());
-            } else if (event.getAction() == MotionEvent.ACTION_MOVE) {
-                path2.lineTo(event.getX(), event.getY());
-                pathWithPaint.setPath(path2);
-                pathWithPaint.setPaint(paint);
-                DrawingClassArrayList.add(pathWithPaint);
-            }
-            invalidate();
-            return true;
-        }
-
-        @Override
-        protected void onDraw(Canvas canvas) {
-            Log.e(LOG_TAG, "CRAIG: SketchSheetView, onDraw()");
-            super.onDraw(canvas);
-            if (DrawingClassArrayList.size() > 0) {
-                canvas.drawPath(
-                    DrawingClassArrayList.get(DrawingClassArrayList.size() - 1).getPath(),
-                    DrawingClassArrayList.get(DrawingClassArrayList.size() - 1).getPaint());
-            }
-        }
-    }
-*/
-
-    /**
-     * In one case I ran `termux-setup-storage` and got permission denied which also breaks loading gestures from storage.
-     * I was able to restore termux permissions by visiting Settings->Applications->Termux->Permissions
-     * and revoking/denying permission and re-running `termux-setup-storage`.
-     *
-     * Problem is currently this REQUIRES storage access, maybe it shouldn't? Just use resource if no file is present!
-     */
-    void loadGestureConf() {
-        // TODO, why does logDebug() not show up in emulator logcat output?
-        Logger.logError(LOG_TAG, "loadGestureConf()");
-        try {
-            String gesturesFilePath = Environment.getExternalStorageDirectory().getAbsolutePath() + "/gesture.conf";
-            Logger.logError(LOG_TAG, "gesturesFilePath="+gesturesFilePath);
-            File gesturesFile = new File(gesturesFilePath);
-            Logger.logError(LOG_TAG, "gesturesFile="+gesturesFile);
-
-            // if gesture.conf isn't at /sdcard/gesture.conf then copy from resources
-            if (!gesturesFile.exists()) {
-                Logger.logError(LOG_TAG, "gesturesFile doesn't exist, try copying from resources...");
-                InputStream is = null;
-                OutputStream os = null;
-                try {
-                    // copy from resources
-                    is = getResources().openRawResource(R.raw.gesture); // TODO extension is .conf? matters?
-                    os = new FileOutputStream(gesturesFile);
-                    byte[] buffer = new byte[1024];
-                    int length;
-                    while ((length = is.read(buffer)) > 0) {
-                        os.write(buffer, 0, length);
-                    }
-                } catch(Exception e) {
-                    Logger.logError(LOG_TAG, "copy raw resource gesture.conf failed: "+e);
-                } finally {
-                    if (is != null) {
-                        is.close();
-                    }
-                    if (os != null) {
-                        os.close();
-                    }
-                }
-            }
-            /**
-             * we prefer gesture.conf but if the above copy didn't work (no permissions for example)
-             * then we use the resource instead.
-             */
-            BufferedReader reader = null;
-            gestures = new Properties();
-            if (gesturesFile.exists()) {
-                Logger.logError(LOG_TAG, "trying to read gestures from gesturesFile: " + gesturesFile.getAbsolutePath());
-                reader = new BufferedReader(new FileReader(gesturesFile));
-            } else {
-                Logger.logError(LOG_TAG, "copy of gestures resource failed, read gestures from resource");
-                reader = new BufferedReader(new InputStreamReader(getResources().openRawResource(R.raw.gesture)));
-            }
-            try {
-                String line = reader.readLine();
-                while (line != null) {
-                    if (line.startsWith("#")) {
-                        Logger.logError(LOG_TAG, "comment line: "+line);
-                    } else {
-                        String parts[] = line.split(" ");
-                        if (parts.length != 2) {
-                            Logger.logError(LOG_TAG, "bad line: "+line);
-                        } else {
-                            Logger.logError(LOG_TAG, "key: "+parts[0]+", value: "+parts[1]);
-                            gestures.setProperty(parts[0],parts[1]);
-                        }
-                    }
-                    line = reader.readLine();
-                }
-            } finally {
-                if (reader != null) {
-                    reader.close();
-                }
-            }
-            Logger.logError(LOG_TAG, "gestures="+gestures);
-        } catch (Exception e) {
-            Logger.logError(LOG_TAG, "Error in loadGestureConf(): " + e);
-        }
-    }
-
-
-
-    class GestureView extends View {
-        public GestureView(Context context) {
-            super(context);
-            bitmap = Bitmap.createBitmap(820,480,Bitmap.Config.ARGB_4444);
-            canvas = new Canvas(bitmap);
-        }
-
-        private ArrayList<DrawingClass> DrawingClassArrayList = new ArrayList<DrawingClass>();
-
-        // gesture stuff
-        class TsEvent {
-            public int x;
-            public int y;
-            public int type;
-        }
-        TsEvent[] events = new TsEvent[300];
-
-        boolean slash, dot, shift, control, escape, alt, caps, prefix = false;
-
-        class Point {
-            public int x;
-            public int y;
-        }
-
-        int MAX_POINTS = 300;
-        class Gesture {
-            public int minx = 0;
-            public int maxx = 0 ;
-            public int miny = 0;
-            public int maxy = 0;
-            public int numPoints = 0;
-            public Point[] points = new Point[MAX_POINTS]; // how very C of me. :p but a limit is good
-        }
-        Gesture gs = new Gesture();
-        int gi = 0;
-        int view_width, view_height = 0;
-
-        @Override
-        protected void onSizeChanged(int xNew, int yNew, int xOld, int yOld) {
-            super.onSizeChanged(xNew, yNew, xOld, yOld);
-            view_width = xNew;
-            view_height = yNew;
-        }
-
-        protected void clearDrawing() {
-            DrawingClassArrayList.clear();
-        }
-
-        @Override
-        public boolean onTouchEvent(MotionEvent event) {
-            DrawingClass pathWithPaint = new DrawingClass();
-            canvas.drawPath(path2, paint);
-            if (event.getAction() == MotionEvent.ACTION_DOWN) {
-
-                mHandlerCounter++;
-                if (mHandlerCounter > 50) { // certainly you can't draw more than 50 gestures in a second right?
-                    mHandlerCounter = 0;
-                }
-
-                int x = (int)event.getX();
-                int y = (int)event.getY();
-                //		Log.e("GESTURE", "ACTION_DOWN, x="+x+", y="+y);
-
-                path2.reset(); // each gesture is separate
-                path2.moveTo(x, y);
-                path2.lineTo(x+1, y+1);
-                pathWithPaint.setPath(path2);
-                pathWithPaint.setPaint(paint);
-                DrawingClassArrayList.add(pathWithPaint);
-
-                // init a new gesture
-                gs = new Gesture();
-                gi = 0;
-                gs.minx = view_width;
-                gs.miny = view_height;
-
-                // update things as normal
-                updateMax(gs, x, y);
-                gs.points[gi] = new Point();
-                gs.points[gi].x = x;
-                gs.points[gi].y = y;
-                gi++;
-                if (gi > MAX_POINTS - 1) {
-                    gi--; // just keep pushing the last point into the last slot
-                }
-            } else if (event.getAction() == MotionEvent.ACTION_UP) {
-                gs.numPoints = gi;
-
-                // TODO how to get the physical size of the screen so we can make the
-                // minimum chunk ratio (fourth parameter to handleGesture()) be about
-                // the size of the average human finger?
-                // TODO maybe add the minimum chunk ratio as a config in gesture.conf?
-                // For big screen phone like nexus5 view_width / 6 was good
-                // but for kc05 watch I need something a bit more forgiving view_width / 4? (nope, try 5)
-                // watch 240x240, chunk (width/4)=60
-                // nexus5 1080x1920, chunk (width/6)=320
-                String output = handleGesture(gs, view_width, view_height, (int)(view_width / 4.5));
-                Logger.logDebug(LOG_TAG, "handleGesture()=>'"+output+"'");
-                gs = new Gesture();
-                gi = 0;
-
-                mHandler.sendEmptyMessageDelayed(mHandlerCounter, 1000); // TODO delay should be configurable in a file
-
-            } else if (event.getAction() == MotionEvent.ACTION_MOVE) {
-                int x = (int)event.getX();
-                int y = (int)event.getY();
-                //		Log.e("GESTURE", "ACTION_MOVE, x="+x+", y="+y);
-
-                path2.lineTo(event.getX(), event.getY());
-                pathWithPaint.setPath(path2);
-                pathWithPaint.setPaint(paint);
-                DrawingClassArrayList.add(pathWithPaint);
-
-                updateMax(gs, x, y);
-                gs.points[gi] = new Point();
-                gs.points[gi].x = x;
-                gs.points[gi].y = y;
-                gi++;
-                if (gi > MAX_POINTS - 1) {
-                    gi--; // just keep pushing the last point into the last slot
-                }
-            }
-
-            Logger.logDebug(LOG_TAG, "CRAIG: onTouchEvent(), calling invalidate()");
-            invalidate();
-            return true;
-        }
-
-        void updateMax(Gesture gs, int x, int y) {
-            if (x > gs.maxx) {
-                gs.maxx = x;
-            }
-            if (x < gs.minx) {
-                gs.minx = x;
-            }
-            if (y > gs.maxy) {
-                gs.maxy = y;
-            }
-            if (y < gs.miny) {
-                gs.miny = y;
-            }
-        }
-
-        // TODO UTF-8, other character set support? Use a String instead? auto-support for such things?
-        String handleGesture(Gesture gs, int screen_width, int screen_height, int minimum_chunk_size) {
-            //	    Log.e("TERMUX_ACTIVITY", "handleGesture(), screen_width="+screen_width+", screen_height="+screen_height+", minimum_chunk_size="+minimum_chunk_size);
-
-            String toput = "";
-            int MAX_KEYS = 50;
-            int key_x[] = new int[MAX_KEYS];
-            int key_y[] = new int[MAX_KEYS];
-            int i, kxi, kyi;
-            int sx, sy;
-            int tx, ty;
-            int rx, ry;
-            i = 0;
-            kxi = kyi = -1;
-            sx = (gs.maxx - gs.minx) / 3;
-            sy = (gs.maxy - gs.miny) / 3;
-            if (sx < minimum_chunk_size) {
-                sx = minimum_chunk_size;
-            }
-            if (sy < minimum_chunk_size) {
-                sy = minimum_chunk_size;
-            }
-            int nw, ne, se, sw;
-            nw = ne = se = sw = 0;
-            //	    Log.e("TERMUX_ACTIVITY", "handleGesture(), numPoints="+gs.numPoints+", minx="+gs.minx+", maxx="+gs.maxx+", miny="+gs.miny+", maxy="+gs.maxy+", sx="+sx+", sy="+sy);
-            for (; i < gs.numPoints; i++) {
-                rx = gs.points[i].x - gs.minx;
-                tx = rx / sx;
-                ry = gs.points[i].y - gs.miny;
-                ty = ry / sy;
-                if (tx == 3) {
-                    tx = 2;
-                }
-                if (ty == 3) {
-                    ty = 2;
-                }
-                //		Logger.logError(LOG_TAG, "handleGesture(), rx="+rx+", tx="+tx+", ry="+ry+", ty="+ty);
-
-                if (kxi == -1 || key_x[kxi] != tx) {
-                    key_x[++kxi] = tx;
-                    if (kxi > MAX_KEYS - 2) {
-                        kxi = MAX_KEYS - 2;
-                    }
-                }
-                if (kyi == -1 || key_y[kyi] != ty) {
-                    key_y[++kyi] = ty;
-                    if (kyi > MAX_KEYS - 2) {
-                        kyi = MAX_KEYS - 2;
-                    }
-                }
-
-                if (tx == 0 && ty == 0) {
-                    nw = 1;
-                }
-                if (tx == 2 && ty == 0) {
-                    ne = 1;
-                }
-                if (tx == 2 && ty == 2) {
-                    se = 1;
-                }
-                if (tx == 0 && ty == 2) {
-                    sw = 1;
-                }
-            }
-            if (kxi == -1) {
-                key_x[++kxi] = 0;
-                if (kxi > MAX_KEYS - 2) {
-                    kxi = MAX_KEYS - 2;
-                }
-            }
-            if (kyi == -1) {
-                key_y[++kyi] = 0;
-                if (kyi > MAX_KEYS - 2) {
-                    kyi = MAX_KEYS - 2;
-                }
-            }
-            String tmp, key = "";
-            if (dot) {
-                key += ".";
-                dot = false;
-            }
-            if (slash) {
-                key += "/";
-                slash = false;
-            }
-
-            i = 0;
-            for (; i <= kxi; i++) {
-                key += key_x[i];
-            }
-            key += ":";
-            i = 0;
-            for (; i <= kyi; i++) {
-                key += key_y[i];
-            }
-            if (key.equals("0:0") || key.equals(".0:0")) {
-                //		Log.d("TERMUX_ACTIVITY", "gesture, gs.maxy="+gs.maxy+", gs.miny="+gs.min
-                if (gs.maxy > screen_height - minimum_chunk_size) {
-                    key += "s";
-                }
-                if (gs.miny < minimum_chunk_size) {
-                    key += "n";
-                }
-                if (gs.maxx > screen_width - minimum_chunk_size) {
-                    key += "e";
-                }
-                if (gs.minx < minimum_chunk_size) {
-                    key += "w";
-                }
-            }
-
-            if (nw == 1 || ne == 1 || sw == 1 || se == 1) {
-                key += "x";
-                if (nw == 1) {
-                    key += "1";
-                }
-                if (ne == 1) {
-                    key += "2";
-                }
-                if (se == 1) {
-                    key += "3";
-                }
-                if (sw == 1) {
-                    key += "4";
-                }
-            }
-
-            // at this point we have our key, I think, let's just print it out and see if that much works. :+1:
-            Logger.logError(LOG_TAG, "handleGesture(), key='"+key+"'");
-
-            if (gestures == null) {
-                // TODO this might slow down the first recog but how else to do it?
-                Logger.logError(LOG_TAG, "gesture.conf not loaded, do it now");
-                //if (ensureStoragePermissionGranted()) {
-                    loadGestureConf();
-                //} else {
-                //    Logger.logError(LOG_TAG, "unable to get storage permission, can't load gesture, bailing");
-                 //   return "";
-                //}
-            }
-            String value = gestures.getProperty(key);
-            Logger.logError(LOG_TAG, "value from gesture.conf: "+value);
-            //letterView.setGravity(Gravity.CENTER_VERTICAL | Gravity.CENTER_HORIZONTAL);
-            if (value != null) {
-                // first translate some special names to single character
-                if (value.equals("enter")) {
-                    toput = "" + (char)0x0d;
-                } else if (value.equals("prefix")) {
-                    // TODO 2023-may-17, remove all 2-line business
-                    // TODO if in prefix mode already and keys are up or down or home or end
-                    // then move 2-line "first line" around but keep current line (prompt)
-                    // as second line in 2-line display
-/*
-                    if (prefix) {
-                        Log.e("CRAIG", "prefix-prefix entered, toggle visibility of lineView and mTerminalView");
-                        toggleViewVisibility(lineView);
-                        toggleViewVisibility(mTerminalView);
-                        updateLineView();
-                    }
- */
-                    prefix = !prefix;
-                    // gesture prefix char
-                    // TODO might be nice to have some graphical indication
-                    // of being in prefix mode or control, shift, etc
-                    toput = "";
-                } else if (value.equals("tab")) {
-                    toput = "" + (char)0x09;
-                } else if (value.equals("backspace")) {
-                    toput = "" + (char)0x08;
-                } else if (value.equals("space")) {
-                    toput = " ";
-                } else if (value.equals("dot")) {
-                    if (dot) {
-                        toput = ".";
-                    }
-                    dot = !dot;
-                } else if (value.equals("shift")) {
-                    if (shift && caps) {
-                        caps = false; shift = false;
-                    } else if (shift && !caps) {
-                        caps = true; shift = false;
-                    } else if (!shift && caps) {
-                        shift = false; caps = false;
-                    } else {
-                        shift = true;
-                    }
-                } else if (value.equals("control")) {
-                    control = !control;
-                } else {
-                    toput = value;
-
-                    if (value.length() == 1) {
-                        if (caps || shift) {
-                            toput = "" + (char)(toput.charAt(0) - 32);
-                        }
-                        if (shift && !caps) {
-                            shift = !shift;
-                        }
-                        if (prefix) {
-                            // TODO 2023-may-17, remove 2-line stuff
-                            // TODO for both 2-line and console view, need to manage keyboard input focus
-                            /*
-                            if (toput.equals("b")) { // big letter display
-                                toggleViewVisibility(letterView);
-                            } else if (toput.equals("i")) { // image display
-                                //                        toggleViewVisibility(graphicsView); // TODO
-                            } else if (toput.equals("g")) { // gesture layer
-                                toggleViewVisibility(gestureView);
-                            }
-                             */
-                            prefix = !prefix; // regardless, get out of prefix mode
-                            toput = ""; // empty out the char, don't put anything
-                        }
-                        if (control) {
-                            toput = "" + (char)(toput.charAt(0) - 96);
-                            control = !control;
-                        }
-                    } // value is length 1, simple char
-
-                    if (prefix) {
-                        // font size controls to replace pinch zoom
-                        if (toput.equals("\u001BOA")) { // up
-                            mTermuxTerminalViewClient.changeFontSize(true);
-                            toput = ""; // no output, just font size change
-                        }
-                        if (toput.equals("\u001BOB")) { // down
-                            mTermuxTerminalViewClient.changeFontSize(false);
-                            toput = ""; // no output, just font size change
-                        }
-                        prefix = !prefix;
-                    }
-                }
-
-                Logger.logError(LOG_TAG, "toput='"+toput+"' toput.length="+toput.length());
-
-                if (toput.length() > 0) {
-                    TerminalSession session = getCurrentTermSession();
-                    if (session != null) {
-                        if (session.isRunning()) {
-                            // todo check that toput is "disaplayable" :)
-                            session.write(toput);
-                        }
-                    }
-                }
-                // TODO this is odd, but wanted to avoid printing out OD OC etc for arrow keys
-/*
-                if (toput.length() == 1) {
-                    letterView.setTextColor(Color.GREEN);
-                    letterView.setText(toput);
-            } else {
-                //		letterView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 30);
-                letterView.setTextColor(Color.RED);
-                letterView.setText("key not found: "+key);
-             */
-            }
-            return toput;
-        }
-
-        @Override
-        protected void onDraw(Canvas canvas) {
-            Log.e("GESTURE", "CRAIG: GestureView, onDraw");
-            super.onDraw(canvas);
-            //	    Log.e("GESTURE", "onDraw(), DrawingClassArrayList.size="+DrawingClassArrayList.size());
-
-            if (DrawingClassArrayList.size() > 0) {
-                canvas.drawPath(
-                    DrawingClassArrayList.get(DrawingClassArrayList.size() - 1).getPath(),
-                    DrawingClassArrayList.get(DrawingClassArrayList.size() - 1).getPaint());
-            } else {
-                canvas.drawColor(Color.TRANSPARENT);
-            }
-        }
-    }
-
-    public class DrawingClass {
-        Path DrawingClassPath;
-        Paint DrawingClassPaint;
-
-        public Path getPath() {
-            return DrawingClassPath;
-        }
-        public void setPath(Path path) {
-            this.DrawingClassPath = path;
-        }
-        public Paint getPaint() {
-            return DrawingClassPaint;
-        }
-        public void setPaint(Paint paint) {
-            this.DrawingClassPaint = paint;
-        }
-    }
-
 }
diff --git a/app/src/main/res/layout/activity_termux.xml b/app/src/main/res/layout/activity_termux.xml
index 56ff90c154..f5f8c98167 100644
--- a/app/src/main/res/layout/activity_termux.xml
+++ b/app/src/main/res/layout/activity_termux.xml
@@ -39,12 +39,12 @@
                     android:autofillHints="password"
                     tools:ignore="UnusedAttribute" />
 
-                <RelativeLayout
-                    android:id="@+id/gesturelayout"
-                    android:layout_width="200dp"
+                <com.termux.app.GestureView
+                    android:id="@+id/gesture_view"
+                    android:layout_width="300px"
                     android:layout_height="wrap_content"
                     android:background="@android:color/transparent">
-                </RelativeLayout>
+                </com.termux.app.GestureView>
 
             </FrameLayout>
 

From bf12d19dbce7a8f1b11d03278798fdbaba91fe66 Mon Sep 17 00:00:00 2001
From: Craig Comstock <craig@unreasonablefarm.org>
Date: Sun, 14 Jan 2024 17:08:15 -0600
Subject: [PATCH 899/912] improve gesture conf loading and more
 no-update-display debugging, near sessions maybe

---
 app/src/main/java/com/termux/app/GestureView.java  | 11 ++++++++++-
 .../main/java/com/termux/app/TermuxActivity.java   | 14 ++++++++------
 .../TermuxTerminalSessionActivityClient.java       |  3 +++
 .../app/terminal/TermuxTerminalViewClient.java     |  2 ++
 install.sh                                         |  1 +
 stop-tcl-launcher.sh                               |  2 ++
 .../java/com/termux/terminal/TerminalSession.java  |  5 +++--
 .../main/java/com/termux/view/TerminalView.java    |  3 +++
 uninstall.sh                                       |  0
 9 files changed, 32 insertions(+), 9 deletions(-)
 create mode 100755 install.sh
 create mode 100755 stop-tcl-launcher.sh
 mode change 100644 => 100755 uninstall.sh

diff --git a/app/src/main/java/com/termux/app/GestureView.java b/app/src/main/java/com/termux/app/GestureView.java
index 17824bf4f8..d459cc66dc 100644
--- a/app/src/main/java/com/termux/app/GestureView.java
+++ b/app/src/main/java/com/termux/app/GestureView.java
@@ -37,7 +37,9 @@ public final class GestureView extends View {
     Properties gestures;
     int mHandlerCounter = 0; // keep track of which counter is "current" and only allow that one to cancel
 
+    // need the viewclient to change fontsize
     private TermuxTerminalViewClient mTermuxTerminalViewClient;
+    // the activity has the terminal session in which we inject characters recognized
     private TermuxActivity mTermuxActivity;
     private InputStream mGestureConfInputStream;
 
@@ -140,6 +142,10 @@ public void loadGestureConf() {
             File gesturesFile = new File(gesturesFilePath);
             Logger.logError(LOG_TAG, "gesturesFile="+gesturesFile);
 
+            if (gesturesFile.exists() && gesturesFile.length() == 0) {
+                // empty file? remove it, reload from resources
+                gesturesFile.delete();
+            }
             // if gesture.conf isn't at /sdcard/gesture.conf then copy from resources
             if (!gesturesFile.exists()) {
                 Logger.logError(LOG_TAG, "gesturesFile doesn't exist, try copying from resources...");
@@ -198,6 +204,9 @@ public void loadGestureConf() {
                     reader.close();
                 }
             }
+            if (gestures.size() == 0) {
+                // file was read but was empty, delete file to reload from resources next time
+            }
             Logger.logError(LOG_TAG, "gestures="+gestures);
         } catch (Exception e) {
             Logger.logError(LOG_TAG, "Error in loadGestureConf(): " + e);
@@ -433,7 +442,7 @@ String handleGesture(Gesture gs, int screen_width, int screen_height, int minimu
         // at this point we have our key, I think, let's just print it out and see if that much works. :+1:
         Logger.logError(LOG_TAG, "handleGesture(), key='"+key+"'");
 
-        if (gestures == null) {
+        if (gestures == null || gestures.size() == 0) {
             // TODO this might slow down the first recog but how else to do it?
             Logger.logError(LOG_TAG, "gesture.conf not loaded, do it now");
             //if (ensureStoragePermissionGranted()) {
diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index 23f316d2ea..a47d125a10 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -194,7 +194,7 @@ public final class TermuxActivity extends AppCompatActivity implements ServiceCo
 
     private static final String LOG_TAG = "TermuxActivity";
 
-    GestureView gestureView;
+    GestureView mGestureView;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -220,9 +220,8 @@ public void onCreate(Bundle savedInstanceState) {
 
         //gestureLayout = (RelativeLayout) findViewById(R.id.gesturelayout);
         //gestureView = new GestureView(TermuxActivity.this);
-        gestureView = (GestureView) findViewById(R.id.gesture_view);
-        gestureView.setTermuxActivity(this);
-        gestureView.setGestureConfInputStream(getResources().openRawResource(R.raw.gesture));
+        mGestureView = (GestureView) findViewById(R.id.gesture_view);
+        mGestureView.setGestureConfInputStream(getResources().openRawResource(R.raw.gesture));
 
         // Load termux shared preferences
         // This will also fail if TermuxConstants.TERMUX_PACKAGE_NAME does not equal applicationId
@@ -251,7 +250,6 @@ public void onCreate(Bundle savedInstanceState) {
         }
 
         setTermuxTerminalViewAndClients();
-        gestureView.setTerminalViewClient(this.mTermuxTerminalViewClient);
 
         // TODO, for gesture branch I never want this toolbar since gestures handle these extra keys nicely
         //setTerminalToolbarView(savedInstanceState);
@@ -513,6 +511,9 @@ private void setTermuxTerminalViewAndClients() {
 
         if (mTermuxTerminalSessionActivityClient != null)
             mTermuxTerminalSessionActivityClient.onCreate();
+
+        mGestureView.setTermuxActivity(this);
+        mGestureView.setTerminalViewClient(mTermuxTerminalViewClient);
     }
 
     private void setTermuxSessionsListView() {
@@ -784,6 +785,7 @@ private void toggleKeepScreenOn() {
      * if targeting targetSdkVersion 30 (android 11) and running on sdk 30 (android 11) and higher.
      */
     public void requestStoragePermission(boolean isPermissionCallback) {
+
         Logger.logDebug(LOG_TAG, "requestStoragePermission()");
         new Thread() {
             @Override
@@ -800,7 +802,7 @@ public void run() {
                             getString(com.termux.shared.R.string.msg_storage_permission_granted_on_request));
 
                     TermuxInstaller.setupStorageSymlinks(TermuxActivity.this);
-                    gestureView.loadGestureConf();
+                    mGestureView.loadGestureConf();
                 } else {
                     if (isPermissionCallback)
                         Logger.logInfoAndShowToast(TermuxActivity.this, LOG_TAG,
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionActivityClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionActivityClient.java
index 0ecfb4e1f9..912d03cbf5 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionActivityClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionActivityClient.java
@@ -118,8 +118,11 @@ public void onReloadActivityStyling() {
     public void onTextChanged(@NonNull TerminalSession changedSession) {
         Logger.logInfo(LOG_TAG, "CRAIG: onTextChanged("+changedSession+")");
         // CRAIG TODO, is this getting bumped when screen doesn't refresh?
+        // CRAIG FIXME, onTextChanged() which calls onScreenUpdated() is not being called in the "bad state" for my issue 2024-01-14 :)
         if (!mActivity.isVisible()) return;
 
+        // CRAIG TODO, maybe the sessions are getting mixed up? onTextChanged() isn't even called!?
+        System.out.println("CRAIGSESSION: TermuxTerminalSessionActivityClient.onTextChanged(), currentSession="+mActivity.getCurrentSession()+", changedSession="+changedSession);
         if (mActivity.getCurrentSession() == changedSession) mActivity.getTerminalView().onScreenUpdated();
     }
 
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
index 18dfb3d3c1..d1bb45da2a 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
@@ -97,6 +97,7 @@ public TermuxActivity getActivity() {
      * Should be called when mActivity.onCreate() is called
      */
     public void onCreate() {
+        // TODO ah! a new viewclient is created but that isn't updated in the gestureview or even activity?
         System.out.println("CRAIG: TermuxTerminalViewClient.onCreate()");
         onReloadProperties();
 
@@ -369,6 +370,7 @@ public boolean onLongPress(MotionEvent event) {
 
 
 
+    // CRAIG note: this method doesn't affect my refresh screen problem issue
     @Override
     public boolean onCodePoint(final int codePoint, boolean ctrlDown, TerminalSession session) {
         if (mVirtualFnKeyDown) {
diff --git a/install.sh b/install.sh
new file mode 100755
index 0000000000..7ca0f2da1a
--- /dev/null
+++ b/install.sh
@@ -0,0 +1 @@
+adb install ./app/build/outputs/apk/debug/termux-app_apt-android-7-debug_armeabi-v7a.apk
diff --git a/stop-tcl-launcher.sh b/stop-tcl-launcher.sh
new file mode 100755
index 0000000000..013466bd3c
--- /dev/null
+++ b/stop-tcl-launcher.sh
@@ -0,0 +1,2 @@
+adb shell ps -efl | grep launcher
+adb shell am force-stop com.tcl.wearable.launcher
diff --git a/terminal-emulator/src/main/java/com/termux/terminal/TerminalSession.java b/terminal-emulator/src/main/java/com/termux/terminal/TerminalSession.java
index 3f746c98b6..bfd9e905bc 100644
--- a/terminal-emulator/src/main/java/com/termux/terminal/TerminalSession.java
+++ b/terminal-emulator/src/main/java/com/termux/terminal/TerminalSession.java
@@ -86,6 +86,7 @@ public TerminalSession(String shellPath, String cwd, String[] args, String[] env
         this.mEnv = env;
         this.mTranscriptRows = transcriptRows;
         this.mClient = client;
+        System.out.println("CRAIGSESSION, new TerminalSession()");
     }
 
     /**
@@ -222,7 +223,7 @@ public TerminalEmulator getEmulator() {
 
     /** Notify the {@link #mClient} that the screen has changed. */
     protected void notifyScreenUpdate() {
-        System.out.println("CRAIG: TerminalSession.notifyScreenUpdate() calling mClient.onTextChanged(), mClient="+mClient);
+        System.out.println("CRAIGSESSION: TerminalSession.notifyScreenUpdate() calling mClient.onTextChanged(), mClient="+mClient);
         mClient.onTextChanged(this);
     }
 
@@ -344,7 +345,7 @@ public void handleMessage(Message msg) {
             Logger.logError(mClient, LOG_TAG, "CRAIG: handleMessage(" + msg + ")" );
 
             int bytesRead = mProcessToTerminalIOQueue.read(mReceiveBuffer, false);
-            Logger.logError(mClient, LOG_TAG, "CRAIG: bytesRead="+bytesRead);
+            Logger.logError(mClient, LOG_TAG, "CRAIGSESSION: bytesRead="+bytesRead);
             if (bytesRead > 0) {
                 mEmulator.append(mReceiveBuffer, bytesRead);
                 notifyScreenUpdate();
diff --git a/terminal-view/src/main/java/com/termux/view/TerminalView.java b/terminal-view/src/main/java/com/termux/view/TerminalView.java
index 4891d262b8..98e383f3b4 100644
--- a/terminal-view/src/main/java/com/termux/view/TerminalView.java
+++ b/terminal-view/src/main/java/com/termux/view/TerminalView.java
@@ -851,6 +851,9 @@ public boolean onKeyDown(int keyCode, KeyEvent event) {
             inputCodePoint(event.getDeviceId(), result, controlDown, leftAltDown);
         }
 
+        // CRAIG, it seems that inputCodePoint() is called above
+        // CRAIG, but no refresh, maybe just ALWAYS call invalidate() or figure out WHY inputCodePoint() sometimes DOES cause invalidate()?
+        // CRAIG, reboot the device to get a fresh "state" of affairs and trace this method to updating something
         if (mCombiningAccent != oldCombiningAccent) invalidate();
 
         return true;
diff --git a/uninstall.sh b/uninstall.sh
old mode 100644
new mode 100755

From 8c5ee2a7b18f1a9b59357828e90ff3e00078c3fd Mon Sep 17 00:00:00 2001
From: Craig Comstock <craig@unreasonablefarm.org>
Date: Sun, 14 Jan 2024 19:09:30 -0600
Subject: [PATCH 900/912] change to interstitial homeactivity like
 simple-sms-messenger does which seems to work

---
 app/src/main/AndroidManifest.xml                 | 16 ++++++++++++++--
 .../main/java/com/termux/app/HomeActivity.java   | 16 ++++++++++++++++
 2 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/java/com/termux/app/HomeActivity.java

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6ccd9b5e18..a732b80f68 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -51,6 +51,20 @@
         android:theme="@style/Theme.TermuxApp.DayNight.DarkActionBar"
         tools:targetApi="m">
 
+        <!-- attempt to fix home/launcher behavior with an interstitial activity -->
+        <activity
+            android:name=".app.HomeActivity"
+            android:exported="true">
+
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.HOME"/>
+            </intent-filter>
+        </activity>
+
         <activity
             android:name=".app.TermuxActivity"
             android:exported="true"
@@ -64,8 +78,6 @@
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.HOME" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/app/src/main/java/com/termux/app/HomeActivity.java b/app/src/main/java/com/termux/app/HomeActivity.java
new file mode 100644
index 0000000000..f370798097
--- /dev/null
+++ b/app/src/main/java/com/termux/app/HomeActivity.java
@@ -0,0 +1,16 @@
+package com.termux.app;
+
+import android.content.Intent;
+import android.os.Bundle;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+// inspired by SimpleSMSMessenger as it seems to work well as a Home Launcher app
+// maybe the in-between is helpful
+public class HomeActivity extends AppCompatActivity {
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        startActivity(new Intent(this, TermuxActivity.class));
+        finish();
+    }
+}

From b6a1d318b86bc74a1b5cd852e61a1ca215b2f5c5 Mon Sep 17 00:00:00 2001
From: Craig Comstock <craig@unreasonablefarm.org>
Date: Sun, 14 Jan 2024 19:24:02 -0600
Subject: [PATCH 901/912] revert logging in classes unaffected by gesture code

---
 .../main/java/com/termux/app/SplashActivity.java  |  4 ----
 .../TermuxTerminalSessionActivityClient.java      |  5 -----
 .../app/terminal/TermuxTerminalViewClient.java    | 15 ---------------
 gradle.properties                                 |  3 +--
 .../com/termux/terminal/TerminalEmulator.java     |  1 -
 .../java/com/termux/terminal/TerminalSession.java |  7 -------
 .../java/com/termux/view/TerminalRenderer.java    |  5 -----
 7 files changed, 1 insertion(+), 39 deletions(-)
 delete mode 100644 app/src/main/java/com/termux/app/SplashActivity.java

diff --git a/app/src/main/java/com/termux/app/SplashActivity.java b/app/src/main/java/com/termux/app/SplashActivity.java
deleted file mode 100644
index 9e4c791687..0000000000
--- a/app/src/main/java/com/termux/app/SplashActivity.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.termux.app;
-
-public class SplashActivity {
-}
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionActivityClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionActivityClient.java
index 912d03cbf5..cd38163116 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionActivityClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionActivityClient.java
@@ -116,13 +116,8 @@ public void onReloadActivityStyling() {
 
     @Override
     public void onTextChanged(@NonNull TerminalSession changedSession) {
-        Logger.logInfo(LOG_TAG, "CRAIG: onTextChanged("+changedSession+")");
-        // CRAIG TODO, is this getting bumped when screen doesn't refresh?
-        // CRAIG FIXME, onTextChanged() which calls onScreenUpdated() is not being called in the "bad state" for my issue 2024-01-14 :)
         if (!mActivity.isVisible()) return;
 
-        // CRAIG TODO, maybe the sessions are getting mixed up? onTextChanged() isn't even called!?
-        System.out.println("CRAIGSESSION: TermuxTerminalSessionActivityClient.onTextChanged(), currentSession="+mActivity.getCurrentSession()+", changedSession="+changedSession);
         if (mActivity.getCurrentSession() == changedSession) mActivity.getTerminalView().onScreenUpdated();
     }
 
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
index d1bb45da2a..a3d09d3d52 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
@@ -44,8 +44,6 @@
 import com.termux.terminal.TerminalEmulator;
 import com.termux.terminal.TerminalSession;
 
-import java.io.PrintWriter;
-import java.io.StringWriter;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -76,15 +74,6 @@ public class TermuxTerminalViewClient extends TermuxTerminalViewClientBase {
     private static final String LOG_TAG = "TermuxTerminalViewClient";
 
     public TermuxTerminalViewClient(TermuxActivity activity, TermuxTerminalSessionActivityClient termuxTerminalSessionActivityClient) {
-        System.out.println("CRAIG: new TermuxTerminalViewClient(), activity="+activity+", termuxTerminalSessionActivityClient="+termuxTerminalSessionActivityClient);
-        try {
-            throw new Exception("BOOM");
-        } catch( Exception e) {
-            StringWriter sw = new StringWriter();
-            PrintWriter pw = new PrintWriter(sw);
-            e.printStackTrace(pw);
-            System.out.println("CRAIG: stacktrace: " + sw.toString());
-        }
         this.mActivity = activity;
         this.mTermuxTerminalSessionActivityClient = termuxTerminalSessionActivityClient;
     }
@@ -97,8 +86,6 @@ public TermuxActivity getActivity() {
      * Should be called when mActivity.onCreate() is called
      */
     public void onCreate() {
-        // TODO ah! a new viewclient is created but that isn't updated in the gestureview or even activity?
-        System.out.println("CRAIG: TermuxTerminalViewClient.onCreate()");
         onReloadProperties();
 
         mActivity.getTerminalView().setTextSize(mActivity.getPreferences().getFontSize());
@@ -370,7 +357,6 @@ public boolean onLongPress(MotionEvent event) {
 
 
 
-    // CRAIG note: this method doesn't affect my refresh screen problem issue
     @Override
     public boolean onCodePoint(final int codePoint, boolean ctrlDown, TerminalSession session) {
         if (mVirtualFnKeyDown) {
@@ -626,7 +612,6 @@ public void setSoftKeyboardState(boolean isStartup, boolean isReloadTermuxProper
         mActivity.getTerminalView().setOnFocusChangeListener(new View.OnFocusChangeListener() {
             @Override
             public void onFocusChange(View view, boolean hasFocus) {
-                Logger.logInfo(LOG_TAG, "CRAIG: mActivity.getTerminalView().setOnFocusChangeListener().onFocusChange()");
                 // Force show soft keyboard if TerminalView or toolbar text input view has
                 // focus and close it if they don't
                 boolean textInputViewHasFocus = false;
diff --git a/gradle.properties b/gradle.properties
index 2876c92c0f..90de122196 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -20,8 +20,7 @@ org.gradle.jvmargs=-Xmx2048M \
 --add-exports=jdk.unsupported/sun.misc=ALL-UNNAMED
 android.useAndroidX=true
 
-# so I can attach an onscrollchange listener to debug view refresh problems
-minSdkVersion=23
+minSdkVersion=21
 targetSdkVersion=28
 ndkVersion=22.1.7171670
 compileSdkVersion=30
diff --git a/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java b/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
index d3a6824032..b0be6f3440 100644
--- a/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
+++ b/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
@@ -498,7 +498,6 @@ private void setDefaultTabStops() {
      * @param length the number of bytes in the array to process
      */
     public void append(byte[] buffer, int length) {
-        mClient.logInfo(LOG_TAG, "CRAIG: append(buffer, length="+length+")");
         for (int i = 0; i < length; i++)
             processByte(buffer[i]);
     }
diff --git a/terminal-emulator/src/main/java/com/termux/terminal/TerminalSession.java b/terminal-emulator/src/main/java/com/termux/terminal/TerminalSession.java
index bfd9e905bc..b068be203b 100644
--- a/terminal-emulator/src/main/java/com/termux/terminal/TerminalSession.java
+++ b/terminal-emulator/src/main/java/com/termux/terminal/TerminalSession.java
@@ -86,7 +86,6 @@ public TerminalSession(String shellPath, String cwd, String[] args, String[] env
         this.mEnv = env;
         this.mTranscriptRows = transcriptRows;
         this.mClient = client;
-        System.out.println("CRAIGSESSION, new TerminalSession()");
     }
 
     /**
@@ -223,7 +222,6 @@ public TerminalEmulator getEmulator() {
 
     /** Notify the {@link #mClient} that the screen has changed. */
     protected void notifyScreenUpdate() {
-        System.out.println("CRAIGSESSION: TerminalSession.notifyScreenUpdate() calling mClient.onTextChanged(), mClient="+mClient);
         mClient.onTextChanged(this);
     }
 
@@ -342,10 +340,7 @@ class MainThreadHandler extends Handler {
 
         @Override
         public void handleMessage(Message msg) {
-            Logger.logError(mClient, LOG_TAG, "CRAIG: handleMessage(" + msg + ")" );
-
             int bytesRead = mProcessToTerminalIOQueue.read(mReceiveBuffer, false);
-            Logger.logError(mClient, LOG_TAG, "CRAIGSESSION: bytesRead="+bytesRead);
             if (bytesRead > 0) {
                 mEmulator.append(mReceiveBuffer, bytesRead);
                 notifyScreenUpdate();
@@ -366,8 +361,6 @@ public void handleMessage(Message msg) {
                 exitDescription += " - press Enter]";
 
                 byte[] bytesToWrite = exitDescription.getBytes(StandardCharsets.UTF_8);
-                Logger.logError(mClient, LOG_TAG, "CRAIG: after MSG_PROCESS_EXITED" );
-
                 mEmulator.append(bytesToWrite, bytesToWrite.length);
                 notifyScreenUpdate();
 
diff --git a/terminal-view/src/main/java/com/termux/view/TerminalRenderer.java b/terminal-view/src/main/java/com/termux/view/TerminalRenderer.java
index 99526ebb0e..a4bef7d37c 100644
--- a/terminal-view/src/main/java/com/termux/view/TerminalRenderer.java
+++ b/terminal-view/src/main/java/com/termux/view/TerminalRenderer.java
@@ -11,9 +11,6 @@
 import com.termux.terminal.TextStyle;
 import com.termux.terminal.WcWidth;
 
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 /**
  * Renderer of a {@link TerminalEmulator} into a {@link Canvas}.
  * <p/>
@@ -59,8 +56,6 @@ public TerminalRenderer(int textSize, Typeface typeface) {
     /** Render the terminal to a canvas with at a specified row scroll, and an optional rectangular selection. */
     public final void render(TerminalEmulator mEmulator, Canvas canvas, int topRow,
                              int selectionY1, int selectionY2, int selectionX1, int selectionX2) {
-        Logger log = Logger.getLogger("TerminalRenderer");
-        log.log(Level.INFO, "render()");
         final boolean reverseVideo = mEmulator.isReverseVideo();
         final int endRow = topRow + mEmulator.mRows;
         final int columns = mEmulator.mColumns;

From 43135a655d0d85c1c2a9b6cef67422d240535495 Mon Sep 17 00:00:00 2001
From: Craig Comstock <craig@unreasonablefarm.org>
Date: Sun, 14 Jan 2024 19:27:00 -0600
Subject: [PATCH 902/912] remove logging, cleanup bits in termuxactivity for
 gesture version

---
 app/src/main/java/com/termux/app/TermuxActivity.java | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index a47d125a10..2c967f508c 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -198,8 +198,6 @@ public final class TermuxActivity extends AppCompatActivity implements ServiceCo
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
-        System.out.println("CRAIG: TermuxActivity.onCreate("+savedInstanceState+"), this="+this);
-        //Logger.logDebug(LOG_TAG, "onCreate("+savedInstanceState+"), this="+this);
         mIsOnResumeAfterOnCreate = true;
 
         if (savedInstanceState != null)
@@ -218,8 +216,6 @@ public void onCreate(Bundle savedInstanceState) {
 
         setContentView(R.layout.activity_termux);
 
-        //gestureLayout = (RelativeLayout) findViewById(R.id.gesturelayout);
-        //gestureView = new GestureView(TermuxActivity.this);
         mGestureView = (GestureView) findViewById(R.id.gesture_view);
         mGestureView.setGestureConfInputStream(getResources().openRawResource(R.raw.gesture));
 
@@ -497,7 +493,6 @@ public void removeTermuxActivityRootViewGlobalLayoutListener() {
 
 
     private void setTermuxTerminalViewAndClients() {
-        System.out.println("CRAIG: setTermuxTerminalViewAndClients()");
         // Set termux terminal view and session clients
         mTermuxTerminalSessionActivityClient = new TermuxTerminalSessionActivityClient(this);
         mTermuxTerminalViewClient = new TermuxTerminalViewClient(this, mTermuxTerminalSessionActivityClient);
@@ -785,8 +780,6 @@ private void toggleKeepScreenOn() {
      * if targeting targetSdkVersion 30 (android 11) and running on sdk 30 (android 11) and higher.
      */
     public void requestStoragePermission(boolean isPermissionCallback) {
-
-        Logger.logDebug(LOG_TAG, "requestStoragePermission()");
         new Thread() {
             @Override
             public void run() {
@@ -796,7 +789,6 @@ public void run() {
                 // If permission is granted, then also setup storage symlinks.
                 if(PermissionUtils.checkAndRequestLegacyOrManageExternalStoragePermission(
                     TermuxActivity.this, requestCode, !isPermissionCallback)) {
-                    Logger.logDebug(LOG_TAG, "checkAndRequestLegacyManageExternalStoragePermission handler");
                     if (isPermissionCallback)
                         Logger.logInfoAndShowToast(TermuxActivity.this, LOG_TAG,
                             getString(com.termux.shared.R.string.msg_storage_permission_granted_on_request));
@@ -1002,6 +994,7 @@ private void reloadActivityStyling(boolean recreateActivity) {
         }
 
         setMargins();
+        // gesture version has no toolbar
         //setTerminalToolbarHeight();
 
         FileReceiverActivity.updateFileReceiverActivityComponentsState(this);

From 2c4b14bed33747ed1af36b2030825fce6dba9c94 Mon Sep 17 00:00:00 2001
From: Craig Comstock <craig@unreasonablefarm.org>
Date: Sat, 17 Feb 2024 10:05:46 -0600
Subject: [PATCH 903/912] fixup gesture view to take whole screen. I had made
 it smaller to test out responsiveness that I fixed with an interstitial
 activity

---
 app/src/main/res/layout/activity_termux.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/layout/activity_termux.xml b/app/src/main/res/layout/activity_termux.xml
index f5f8c98167..4de8f75316 100644
--- a/app/src/main/res/layout/activity_termux.xml
+++ b/app/src/main/res/layout/activity_termux.xml
@@ -41,7 +41,7 @@
 
                 <com.termux.app.GestureView
                     android:id="@+id/gesture_view"
-                    android:layout_width="300px"
+                    android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
                     android:background="@android:color/transparent">
                 </com.termux.app.GestureView>

From 413dd0199633862d82a58bf51b446ae42f55c469 Mon Sep 17 00:00:00 2001
From: Craig Comstock <craig@unreasonablefarm.org>
Date: Sun, 18 Feb 2024 13:22:52 -0600
Subject: [PATCH 904/912] trying to get termux-app to sleep on a timeout. does
 not for me right now as-is.

---
 NOTES | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 NOTES

diff --git a/NOTES b/NOTES
new file mode 100644
index 0000000000..1eca23d96b
--- /dev/null
+++ b/NOTES
@@ -0,0 +1,18 @@
+Sun Feb 18 10:54:23 CST 2024
+
+need to fix termux-app not sleeping/not timing out and turning screen off
+
+02-18 10:51:06.604   776   864 I PowerManagerService: Going to sleep due to screen timeout (uid 1000)...
+02-18 10:51:06.606   776   864 W DreamManagerService: Dream ComponentInfo{com.qualcomm.qti.contextualmode/com.qualcomm.qti.contextualmode.ContextualModeDozeService} does not exist
+02-18 10:51:06.606   776   864 I PowerManagerService: Sleeping (uid 1000)...
+02-18 10:51:06.607   776   864 I DisplayPowerController: Blocking screen off
+02-18 10:51:06.607   776   864 I DisplayPowerController: Unblocked screen off after 0 ms
+02-18 10:51:06.612   776   864 D ActivityTrigger: ActivityTrigger activityPauseTrigger 
+02-18 10:51:06.613  9213  9213 D LauncherActivity: Un un-registering package update receiver
+02-18 10:51:06.620   776   862 I DisplayManagerService: Display device changed state: "Built-in Screen", OFF
+02-18 10:51:06.645   480   480 D SurfaceFlinger: Set power mode=0, type=0 flinger=0xaa1b6000
+02-18 10:51:06.646   456  5793 I SDM     : DisplayBase::SetDisplayState: Set state = 0, display 0
+02-18 10:51:06.653   776   845 D ActivityTrigger: ActivityTrigger activityStopTrigger 
+02-18 10:51:06.656  9213  9213 V LauncherActivity: Main Activity exiting..
+
+that's when simple sms messenger, but maybe termux-app not listening?

From 0cb1cc57b8dae734ac805ff3b0d0af32d1875e32 Mon Sep 17 00:00:00 2001
From: Craig Comstock <craig@unreasonablefarm.org>
Date: Tue, 25 Mar 2025 11:38:50 -0500
Subject: [PATCH 905/912] adjust iterate script to build the app

---
 i | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/i b/i
index ba91c88fea..50f89550c8 100755
--- a/i
+++ b/i
@@ -1,2 +1 @@
-adb shell logcat -c
-adb shell logcat | tee log
+./gradlew  assembleDebug

From 05fa022385dfa13cfe3479bd69cfd05531ab1ee7 Mon Sep 17 00:00:00 2001
From: Craig Comstock <craig@unreasonablefarm.org>
Date: Sun, 18 May 2025 07:22:46 -0500
Subject: [PATCH 906/912] Remove unused slash state variable and modifier

---
 app/src/main/java/com/termux/app/GestureView.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/termux/app/GestureView.java b/app/src/main/java/com/termux/app/GestureView.java
index d459cc66dc..1cf60c6341 100644
--- a/app/src/main/java/com/termux/app/GestureView.java
+++ b/app/src/main/java/com/termux/app/GestureView.java
@@ -98,7 +98,7 @@ class TsEvent {
     }
     TsEvent[] events = new TsEvent[300];
 
-    boolean slash, dot, shift, control, escape, alt, caps, prefix = false;
+    boolean dot, shift, control, escape, alt, caps, prefix = false;
 
     class Point {
         public int x;

From 4c2cd6f970ec53a0dc930365d367208588326a43 Mon Sep 17 00:00:00 2001
From: Craig Comstock <craig@unreasonablefarm.org>
Date: Sun, 18 May 2025 07:23:45 -0500
Subject: [PATCH 907/912] Fixed gesture prefix and font bigger smaller to use a
 key instead of hard-coded to enable adding more gesture prefix commands like
 copy paste

---
 .../main/java/com/termux/app/GestureView.java | 53 +++++--------------
 app/src/main/res/raw/gesture                  |  4 +-
 2 files changed, 15 insertions(+), 42 deletions(-)

diff --git a/app/src/main/java/com/termux/app/GestureView.java b/app/src/main/java/com/termux/app/GestureView.java
index 1cf60c6341..91c356e4c9 100644
--- a/app/src/main/java/com/termux/app/GestureView.java
+++ b/app/src/main/java/com/termux/app/GestureView.java
@@ -393,9 +393,10 @@ String handleGesture(Gesture gs, int screen_width, int screen_height, int minimu
             key += ".";
             dot = false;
         }
-        if (slash) {
-            key += "/";
-            slash = false;
+        if (prefix)
+        {
+            key += "\\";
+            prefix = false;
         }
 
         i = 0;
@@ -461,17 +462,6 @@ String handleGesture(Gesture gs, int screen_width, int screen_height, int minimu
                 toput = "" + (char)0x0d;
             } else if (value.equals("prefix")) {
                 // TODO 2023-may-17, remove all 2-line business
-                // TODO if in prefix mode already and keys are up or down or home or end
-                // then move 2-line "first line" around but keep current line (prompt)
-                // as second line in 2-line display
-/*
-                    if (prefix) {
-                        Log.e("CRAIG", "prefix-prefix entered, toggle visibility of lineView and mTerminalView");
-                        toggleViewVisibility(lineView);
-                        toggleViewVisibility(mTerminalView);
-                        updateLineView();
-                    }
- */
                 prefix = !prefix;
                 // gesture prefix char
                 // TODO might be nice to have some graphical indication
@@ -500,6 +490,14 @@ String handleGesture(Gesture gs, int screen_width, int screen_height, int minimu
                 }
             } else if (value.equals("control")) {
                 control = !control;
+            } else if (value.equals("font-bigger")) }
+                mTermuxTerminalViewClient.changeFontSize(true);
+                toput = "";
+                prefix = !prefix;
+            } else if (value.equals("font-smaller")) {
+                mTermuxTerminalViewClient.changeFontSize(false);
+                toput = "";
+                prefix = !prefix;
             } else {
                 toput = value;
 
@@ -510,39 +508,12 @@ String handleGesture(Gesture gs, int screen_width, int screen_height, int minimu
                     if (shift && !caps) {
                         shift = !shift;
                     }
-                    if (prefix) {
-                        // TODO 2023-may-17, remove 2-line stuff
-                        // TODO for both 2-line and console view, need to manage keyboard input focus
-                            /*
-                            if (toput.equals("b")) { // big letter display
-                                toggleViewVisibility(letterView);
-                            } else if (toput.equals("i")) { // image display
-                                //                        toggleViewVisibility(graphicsView); // TODO
-                            } else if (toput.equals("g")) { // gesture layer
-                                toggleViewVisibility(gestureView);
-                            }
-                             */
-                        prefix = !prefix; // regardless, get out of prefix mode
-                        toput = ""; // empty out the char, don't put anything
-                    }
                     if (control) {
                         toput = "" + (char)(toput.charAt(0) - 96);
                         control = !control;
                     }
                 } // value is length 1, simple char
 
-                if (prefix) {
-                    // font size controls to replace pinch zoom
-                    if (toput.equals("\u001BOA")) { // up
-                        mTermuxTerminalViewClient.changeFontSize(true);
-                        toput = ""; // no output, just font size change
-                    }
-                    if (toput.equals("\u001BOB")) { // down
-                        mTermuxTerminalViewClient.changeFontSize(false);
-                        toput = ""; // no output, just font size change
-                    }
-                    prefix = !prefix;
-                }
             }
 
             Logger.logError(LOG_TAG, "toput='"+toput+"' toput.length="+toput.length());
diff --git a/app/src/main/res/raw/gesture b/app/src/main/res/raw/gesture
index 309570e11b..9356f377cd 100644
--- a/app/src/main/res/raw/gesture
+++ b/app/src/main/res/raw/gesture
@@ -26,7 +26,7 @@
 0:210x14 shift
 012:210x24 tab 
 .012:210x124 tab
-# prefix gesture for gesture itself
+# prefix gesture for gesture itself, keys start with \ for prefixed items in this file like font-bigger and font-smaller
 210:210x13 prefix
 012:0x12 space
 .0:210x14 !
@@ -165,10 +165,12 @@
 0:0sex1 
 # Esc OA is "Up"
 0:0nx1 OA
+\0:0nx1 font-bigger
 # Esc OC is "Right"
 0:0ex1 OC
 # Esc OB is "Down"
 0:0sx1 OB
+\0:0sx1 font-smaller
 # Esc OD is "Left"
 0:0wx1 OD
 # \177 is DEL

From 046fb62c68fb599bb370e9ab64f0fd0ae1d1810a Mon Sep 17 00:00:00 2001
From: Craig Comstock <craig@unreasonablefarm.org>
Date: Sun, 18 May 2025 07:52:06 -0500
Subject: [PATCH 908/912] added clipboard-paste and TODO for clipboard-copy

---
 .../main/java/com/termux/app/GestureView.java    | 16 ++++++++++++++++
 .../main/java/com/termux/app/TermuxActivity.java |  3 ++-
 app/src/main/res/raw/gesture                     |  1 +
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/termux/app/GestureView.java b/app/src/main/java/com/termux/app/GestureView.java
index 91c356e4c9..c4c700601a 100644
--- a/app/src/main/java/com/termux/app/GestureView.java
+++ b/app/src/main/java/com/termux/app/GestureView.java
@@ -39,6 +39,7 @@ public final class GestureView extends View {
 
     // need the viewclient to change fontsize
     private TermuxTerminalViewClient mTermuxTerminalViewClient;
+    private TermuxTerminalSessionActivityClient mTermuxTerminalSessionActivityClient;
     // the activity has the terminal session in which we inject characters recognized
     private TermuxActivity mTermuxActivity;
     private InputStream mGestureConfInputStream;
@@ -47,6 +48,8 @@ public final class GestureView extends View {
 
     private static Handler mHandler = null;
 
+// todo: probably best to set the TermuxTerminalViewClient for fontsize and TermuxTerminalSessionActivityClient for clipboard in the constructor
+// but for now, set explicitly in TermuxActivity
     public GestureView(Context context, AttributeSet attributeSet) {
         super(context, attributeSet);
 
@@ -79,6 +82,9 @@ public void handleMessage(Message msg) {
     public void setTerminalViewClient(TermuxTerminalViewClient client) {
         this.mTermuxTerminalViewClient = client;
     }
+    public void setTerminalSessionActivityClient(TermuxTerminalSessionActivityClient client) {
+        this.mTermuxTerminalSessionActivityClient = client;
+    }
 
     public void setTermuxActivity(TermuxActivity termuxActivity) {
         mTermuxActivity = termuxActivity;
@@ -393,6 +399,9 @@ String handleGesture(Gesture gs, int screen_width, int screen_height, int minimu
             key += ".";
             dot = false;
         }
+        // special gesture to get into commands specific to gesture itself and interacting with the system in special ways
+        // like font +/-, copy/paste
+        // TODO: toggle back/forth to regular termux mode so you can select text
         if (prefix)
         {
             key += "\\";
@@ -498,6 +507,13 @@ String handleGesture(Gesture gs, int screen_width, int screen_height, int minimu
                 mTermuxTerminalViewClient.changeFontSize(false);
                 toput = "";
                 prefix = !prefix;
+            } else if (value.equals("clipboard-copy")) {
+// terminal/io/TermuxTerminalExtraKeys.java has mTermuxTerminalSessionActivityClient
+// termuxTerminalSessionActivityClient.onCopyTextToClipboard(session, text) // tricky, wont work really, TODO how to select when gesturing? toggle back to normal termux-app mode for a bit somehow, maybe this action moves into normal mode for selecting and then once you select in the menu toggles back to gesture mode?
+            } else if (value.equals("clipboard-paste")) {
+                mTermuxTerminalSessionActivityClient(null); // like TermuxTerminalExtraKeys
+                toput="";
+                prefix=!prefix;
             } else {
                 toput = value;
 
diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index 2c967f508c..2a40dc232e 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -508,7 +508,8 @@ private void setTermuxTerminalViewAndClients() {
             mTermuxTerminalSessionActivityClient.onCreate();
 
         mGestureView.setTermuxActivity(this);
-        mGestureView.setTerminalViewClient(mTermuxTerminalViewClient);
+        mGestureView.setTerminalViewClient(mTermuxTerminalViewClient); // for fontsize changes
+        mGestureView.setTerminalSessionActivityClient(mTermuxTerminalSessionActivityClient); // for clipboard
     }
 
     private void setTermuxSessionsListView() {
diff --git a/app/src/main/res/raw/gesture b/app/src/main/res/raw/gesture
index 9356f377cd..8e14cf183a 100644
--- a/app/src/main/res/raw/gesture
+++ b/app/src/main/res/raw/gesture
@@ -123,6 +123,7 @@
 210:01210x123 v
 210:01210x1234 v
 210:0121x2 v
+\210:0121x2 clipboard-paste
 012:0121210x1234 w
 01210:0121012x1234 x
 01210:01012x124 y

From f34efc1c1f489fad53282ef0e249ee92e3ed7aa4 Mon Sep 17 00:00:00 2001
From: Craig Comstock <craig@unreasonablefarm.org>
Date: Sun, 18 May 2025 08:07:46 -0500
Subject: [PATCH 909/912] typo fix, squashme

---
 app/src/main/java/com/termux/app/GestureView.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/termux/app/GestureView.java b/app/src/main/java/com/termux/app/GestureView.java
index c4c700601a..896eed52f9 100644
--- a/app/src/main/java/com/termux/app/GestureView.java
+++ b/app/src/main/java/com/termux/app/GestureView.java
@@ -499,7 +499,7 @@ String handleGesture(Gesture gs, int screen_width, int screen_height, int minimu
                 }
             } else if (value.equals("control")) {
                 control = !control;
-            } else if (value.equals("font-bigger")) }
+            } else if (value.equals("font-bigger")) {
                 mTermuxTerminalViewClient.changeFontSize(true);
                 toput = "";
                 prefix = !prefix;

From 7d9991cddb95179fa6528c34624a9b6b5800312c Mon Sep 17 00:00:00 2001
From: Craig Comstock <craig@unreasonablefarm.org>
Date: Sun, 18 May 2025 08:16:14 -0500
Subject: [PATCH 910/912] oops, missed import, squashme

---
 app/src/main/java/com/termux/app/GestureView.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/com/termux/app/GestureView.java b/app/src/main/java/com/termux/app/GestureView.java
index 896eed52f9..67c2e7cb93 100644
--- a/app/src/main/java/com/termux/app/GestureView.java
+++ b/app/src/main/java/com/termux/app/GestureView.java
@@ -15,6 +15,7 @@
 import android.view.View;
 
 import com.termux.app.terminal.TermuxTerminalViewClient;
+import com.termux.app.terminal.TermuxTerminalSessionActivityClient;
 import com.termux.shared.logger.Logger;
 import com.termux.terminal.TerminalSession;
 

From 91959082815e6462e33ced19a7ffa46992cb046a Mon Sep 17 00:00:00 2001
From: Craig Comstock <craig@unreasonablefarm.org>
Date: Sun, 18 May 2025 09:01:06 -0500
Subject: [PATCH 911/912] fixup clipboard bits, squashme

---
 app/src/main/java/com/termux/app/GestureView.java | 9 +++++----
 app/src/main/res/raw/gesture                      | 9 +++++++--
 i                                                 | 1 +
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/termux/app/GestureView.java b/app/src/main/java/com/termux/app/GestureView.java
index 67c2e7cb93..2f4d390817 100644
--- a/app/src/main/java/com/termux/app/GestureView.java
+++ b/app/src/main/java/com/termux/app/GestureView.java
@@ -321,6 +321,7 @@ void updateMax(Gesture gs, int x, int y) {
 
     // TODO UTF-8, other character set support? Use a String instead? auto-support for such things?
     String handleGesture(Gesture gs, int screen_width, int screen_height, int minimum_chunk_size) {
+        Log.e("TERMUX_ACTIVITY", "handleGesture(), prefix="+prefix+", dot="+dot+", shift="+shift);
         //	    Log.e("TERMUX_ACTIVITY", "handleGesture(), screen_width="+screen_width+", screen_height="+screen_height+", minimum_chunk_size="+minimum_chunk_size);
 
         String toput = "";
@@ -406,7 +407,7 @@ String handleGesture(Gesture gs, int screen_width, int screen_height, int minimu
         if (prefix)
         {
             key += "\\";
-            prefix = false;
+            prefix = !prefix;
         }
 
         i = 0;
@@ -418,7 +419,7 @@ String handleGesture(Gesture gs, int screen_width, int screen_height, int minimu
         for (; i <= kyi; i++) {
             key += key_y[i];
         }
-        if (key.equals("0:0") || key.equals(".0:0")) {
+        if (key.equals("0:0") || key.equals(".0:0") || key.equals("\\0:0")) {
             //		Log.d("TERMUX_ACTIVITY", "gesture, gs.maxy="+gs.maxy+", gs.miny="+gs.min
             if (gs.maxy > screen_height - minimum_chunk_size) {
                 key += "s";
@@ -512,7 +513,7 @@ String handleGesture(Gesture gs, int screen_width, int screen_height, int minimu
 // terminal/io/TermuxTerminalExtraKeys.java has mTermuxTerminalSessionActivityClient
 // termuxTerminalSessionActivityClient.onCopyTextToClipboard(session, text) // tricky, wont work really, TODO how to select when gesturing? toggle back to normal termux-app mode for a bit somehow, maybe this action moves into normal mode for selecting and then once you select in the menu toggles back to gesture mode?
             } else if (value.equals("clipboard-paste")) {
-                mTermuxTerminalSessionActivityClient(null); // like TermuxTerminalExtraKeys
+                this.mTermuxTerminalSessionActivityClient.onPasteTextFromClipboard(null); // like TermuxTerminalExtraKeys
                 toput="";
                 prefix=!prefix;
             } else {
@@ -560,7 +561,7 @@ String handleGesture(Gesture gs, int screen_width, int screen_height, int minimu
 
     @Override
     protected void onDraw(Canvas canvas) {
-        Log.e("GESTURE", "CRAIG: GestureView, onDraw");
+//        Log.e("GESTURE", "CRAIG: GestureView, onDraw");
         super.onDraw(canvas);
         //	    Log.e("GESTURE", "onDraw(), DrawingClassArrayList.size="+DrawingClassArrayList.size());
 
diff --git a/app/src/main/res/raw/gesture b/app/src/main/res/raw/gesture
index 8e14cf183a..31ec36d86f 100644
--- a/app/src/main/res/raw/gesture
+++ b/app/src/main/res/raw/gesture
@@ -119,11 +119,16 @@
 2101210:012x1234 s
 012:012x123 t
 012:01210x1234 u
-210:01210x124 v
+210:0121x2 v
+210:01210x12 v
 210:01210x123 v
+210:01210x124 v
 210:01210x1234 v
-210:0121x2 v
 \210:0121x2 clipboard-paste
+\210:01210x12 clipboard-paste
+\210:01210x123 clipboard-paste
+\210:01210x124 clipboard-paste
+\210:01210x1234 clipboard-paste
 012:0121210x1234 w
 01210:0121012x1234 x
 01210:01012x124 y
diff --git a/i b/i
index 50f89550c8..d6d4ce545a 100755
--- a/i
+++ b/i
@@ -1 +1,2 @@
+# todo: only build what I need: termux-bootstrap_armeabi-v7a
 ./gradlew  assembleDebug

From 7c3dfbe870331802afc2427f70ee1ef520011473 Mon Sep 17 00:00:00 2001
From: Craig Comstock <craig@unreasonablefarm.org>
Date: Sun, 18 May 2025 09:31:47 -0500
Subject: [PATCH 912/912] fixed prefix toggling properly, squashme

---
 app/src/main/java/com/termux/app/GestureView.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/main/java/com/termux/app/GestureView.java b/app/src/main/java/com/termux/app/GestureView.java
index 2f4d390817..e88e0b242f 100644
--- a/app/src/main/java/com/termux/app/GestureView.java
+++ b/app/src/main/java/com/termux/app/GestureView.java
@@ -407,7 +407,6 @@ String handleGesture(Gesture gs, int screen_width, int screen_height, int minimu
         if (prefix)
         {
             key += "\\";
-            prefix = !prefix;
         }
 
         i = 0;