Skip to content

Commit 354fe19

Browse files
agnostic-apolloagnostic-apollo
authored
Merge pull request #2002 from agnostic-apollo/termux-various-fixes-and-improvements
2 parents bbb6f44 + ae1c9ba commit 354fe19

File tree

6 files changed

+113
-44
lines changed

6 files changed

+113
-44
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import com.termux.shared.termux.TermuxConstants.TERMUX_APP.TERMUX_SERVICE;
2828
import com.termux.shared.settings.preferences.TermuxAppSharedPreferences;
2929
import com.termux.shared.shell.TermuxSession;
30-
import com.termux.shared.shell.TermuxTerminalSessionClientBase;
30+
import com.termux.shared.terminal.TermuxTerminalSessionClientBase;
3131
import com.termux.shared.logger.Logger;
3232
import com.termux.shared.notification.NotificationUtils;
3333
import com.termux.shared.packages.PermissionUtils;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import com.termux.shared.shell.TermuxSession;
1717
import com.termux.shared.interact.DialogUtils;
1818
import com.termux.app.TermuxActivity;
19-
import com.termux.shared.shell.TermuxTerminalSessionClientBase;
19+
import com.termux.shared.terminal.TermuxTerminalSessionClientBase;
2020
import com.termux.shared.termux.TermuxConstants;
2121
import com.termux.app.TermuxService;
2222
import com.termux.shared.settings.properties.TermuxPropertyConstants;

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

+2-39
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import com.termux.R;
2222
import com.termux.app.TermuxActivity;
2323
import com.termux.shared.shell.ShellUtils;
24+
import com.termux.shared.terminal.TermuxTerminalViewClientBase;
2425
import com.termux.shared.termux.TermuxConstants;
2526
import com.termux.app.activities.ReportActivity;
2627
import com.termux.app.models.ReportInfo;
@@ -35,7 +36,6 @@
3536
import com.termux.terminal.KeyHandler;
3637
import com.termux.terminal.TerminalEmulator;
3738
import com.termux.terminal.TerminalSession;
38-
import com.termux.view.TerminalViewClient;
3939

4040
import java.util.Arrays;
4141
import java.util.Collections;
@@ -44,7 +44,7 @@
4444

4545
import androidx.drawerlayout.widget.DrawerLayout;
4646

47-
public class TermuxTerminalViewClient implements TerminalViewClient {
47+
public class TermuxTerminalViewClient extends TermuxTerminalViewClientBase {
4848

4949
final TermuxActivity mActivity;
5050

@@ -440,41 +440,4 @@ public void doPaste() {
440440
session.getEmulator().paste(paste.toString());
441441
}
442442

443-
444-
445-
@Override
446-
public void logError(String tag, String message) {
447-
Logger.logError(tag, message);
448-
}
449-
450-
@Override
451-
public void logWarn(String tag, String message) {
452-
Logger.logWarn(tag, message);
453-
}
454-
455-
@Override
456-
public void logInfo(String tag, String message) {
457-
Logger.logInfo(tag, message);
458-
}
459-
460-
@Override
461-
public void logDebug(String tag, String message) {
462-
Logger.logDebug(tag, message);
463-
}
464-
465-
@Override
466-
public void logVerbose(String tag, String message) {
467-
Logger.logVerbose(tag, message);
468-
}
469-
470-
@Override
471-
public void logStackTraceWithMessage(String tag, String message, Exception e) {
472-
Logger.logStackTraceWithMessage(tag, message, e);
473-
}
474-
475-
@Override
476-
public void logStackTrace(String tag, Exception e) {
477-
Logger.logStackTrace(tag, e);
478-
}
479-
480443
}

‎termux-shared/src/main/java/com/termux/shared/shell/TermuxTerminalSessionClientBase.java ‎termux-shared/src/main/java/com/termux/shared/terminal/TermuxTerminalSessionClientBase.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.termux.shared.shell;
1+
package com.termux.shared.terminal;
22

33
import com.termux.shared.logger.Logger;
44
import com.termux.terminal.TerminalSession;

‎termux-shared/src/main/java/com/termux/shared/terminal/TermuxTerminalViewClientBase.java

+105
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,105 @@
1+
package com.termux.shared.terminal;
2+
3+
import android.view.KeyEvent;
4+
import android.view.MotionEvent;
5+
6+
import com.termux.shared.logger.Logger;
7+
import com.termux.terminal.TerminalSession;
8+
import com.termux.view.TerminalViewClient;
9+
10+
public class TermuxTerminalViewClientBase implements TerminalViewClient {
11+
12+
public TermuxTerminalViewClientBase() {
13+
}
14+
15+
@Override
16+
public float onScale(float scale) {
17+
return 1.0f;
18+
}
19+
20+
@Override
21+
public void onSingleTapUp(MotionEvent e) {
22+
}
23+
24+
public boolean shouldBackButtonBeMappedToEscape() {
25+
return false;
26+
}
27+
28+
public boolean shouldEnforceCharBasedInput() {
29+
return false;
30+
}
31+
32+
public boolean shouldUseCtrlSpaceWorkaround() {
33+
return false;
34+
}
35+
36+
@Override
37+
public void copyModeChanged(boolean copyMode) {
38+
}
39+
40+
@Override
41+
public boolean onKeyDown(int keyCode, KeyEvent e, TerminalSession session) {
42+
return false;
43+
}
44+
45+
@Override
46+
public boolean onKeyUp(int keyCode, KeyEvent e) {
47+
return false;
48+
}
49+
50+
@Override
51+
public boolean onLongPress(MotionEvent event) {
52+
return false;
53+
}
54+
55+
@Override
56+
public boolean readControlKey() {
57+
return false;
58+
}
59+
60+
@Override
61+
public boolean readAltKey() {
62+
return false;
63+
}
64+
65+
@Override
66+
public boolean onCodePoint(int codePoint, boolean ctrlDown, TerminalSession session) {
67+
return false;
68+
}
69+
70+
@Override
71+
public void logError(String tag, String message) {
72+
Logger.logError(tag, message);
73+
}
74+
75+
@Override
76+
public void logWarn(String tag, String message) {
77+
Logger.logWarn(tag, message);
78+
}
79+
80+
@Override
81+
public void logInfo(String tag, String message) {
82+
Logger.logInfo(tag, message);
83+
}
84+
85+
@Override
86+
public void logDebug(String tag, String message) {
87+
Logger.logDebug(tag, message);
88+
}
89+
90+
@Override
91+
public void logVerbose(String tag, String message) {
92+
Logger.logVerbose(tag, message);
93+
}
94+
95+
@Override
96+
public void logStackTraceWithMessage(String tag, String message, Exception e) {
97+
Logger.logStackTraceWithMessage(tag, message, e);
98+
}
99+
100+
@Override
101+
public void logStackTrace(String tag, Exception e) {
102+
Logger.logStackTrace(tag, e);
103+
}
104+
105+
}

‎termux-shared/src/main/res/raw/apt_info_script. ‎termux-shared/src/main/res/raw/apt_info_script.sh

+3-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ subscribed_repositories() {
2020
else
2121
echo "#### sources.list.d/$(basename "$filename")"
2222
fi
23-
echo "\`$supl_sources\`"
23+
echo "\`$supl_sources\` "
2424
fi
2525
done < <(find "@TERMUX_PREFIX@/etc/apt/sources.list.d" -maxdepth 1 ! -type d)
2626
}
@@ -37,7 +37,7 @@ updatable_packages() {
3737
if [ -z "$updatable" ];then
3838
echo "All packages up to date"
3939
else
40-
echo "\`$updatable\`"
40+
echo $'```\n'"$updatable"$'\n```\n'
4141
fi
4242
fi
4343
}
@@ -50,6 +50,7 @@ $(subscribed_repositories)
5050
5151
5252
### Updatable Packages
53+
5354
$(updatable_packages)
5455
##
5556

0 commit comments

Comments
 (0)