Merge pull request #2002 from agnostic-apollo/termux-various-fixes-and-improvements

app/src/main/java/com/termux/app/TermuxService.java

@@ -27,7 +27,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.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;

app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java

@@ -16,7 +16,7 @@ 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.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;

app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java

@@ -21,6 +21,7 @@ import android.widget.Toast;
 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.shared.termux.TermuxUtils;
 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 java.util.List;
 
 import androidx.drawerlayout.widget.DrawerLayout;
 
-public class TermuxTerminalViewClient implements TerminalViewClient {
+public class TermuxTerminalViewClient extends TermuxTerminalViewClientBase {
 
     final TermuxActivity mActivity;
 
@@ -440,41 +440,4 @@ public class TermuxTerminalViewClient implements TerminalViewClient {
             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);
-    }
-
 }

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;

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);
+    }
+
+}

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)
 ##