fankes/termux-app
2
0
Fork 0
mirror of https://github.com/fankes/termux-app.git synced 2025-09-06 02:35:19 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
agnostic-apollo
2021-10-26 07:04:08 +05:00
parent 549a772d45
commit 361bfb3961
47 changed files with 105 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/termux/app/RunCommandService.java
View File

@@ -14,8 +14,8 @@ import com.termux.shared.data.DataUtils;
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.file.FileUtils;
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

2
app/src/main/java/com/termux/app/TermuxActivity.java
View File

@@ -34,7 +34,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.android.PermissionUtils;
import com.termux.shared.termux.TermuxConstants;
import com.termux.shared.termux.TermuxConstants.TERMUX_APP.TERMUX_ACTIVITY;
import com.termux.app.activities.HelpActivity;

4
app/src/main/java/com/termux/app/TermuxInstaller.java
View File

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

4
app/src/main/java/com/termux/app/TermuxOpenReceiver.java
View File

@@ -15,9 +15,9 @@ import android.webkit.MimeTypeMap;
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;

12
app/src/main/java/com/termux/app/TermuxService.java
View File

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

2
app/src/main/java/com/termux/app/activities/SettingsActivity.java
View File

@@ -16,7 +16,7 @@ import com.termux.shared.file.FileUtils;
import com.termux.shared.models.ReportInfo;
import com.termux.app.models.UserAction;
import com.termux.shared.interact.ShareUtils;
import com.termux.shared.packages.PackageUtils;
import com.termux.shared.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;

2
app/src/main/java/com/termux/app/terminal/TermuxSessionsListViewController.java
View File

@@ -20,7 +20,7 @@ import androidx.core.content.ContextCompat;
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;

2
app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java
View File

@@ -13,7 +13,7 @@ import android.text.TextUtils;
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;

2
app/src/main/java/com/termux/app/utils/CrashUtils.java
View File

@@ -11,7 +11,7 @@ import androidx.annotation.Nullable;
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;

14
app/src/main/java/com/termux/app/utils/PluginUtils.java
View File

@@ -10,15 +10,15 @@ import androidx.annotation.Nullable;
import com.termux.R;
import com.termux.shared.activities.ReportActivity;
import com.termux.shared.file.FileUtils;
import com.termux.shared.file.TermuxFileUtils;
import com.termux.shared.models.ResultConfig;
import com.termux.shared.models.ResultData;
import com.termux.shared.models.errors.Errno;
import com.termux.shared.models.errors.Error;
import com.termux.shared.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.termux.settings.preferences.TermuxPreferenceConstants.T
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;

4
app/src/main/java/com/termux/filepicker/TermuxFileReceiverActivity.java
View File

@@ -12,9 +12,9 @@ import androidx.annotation.NonNull;
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;

1
termux-shared/src/main/java/com/termux/shared/android/AndroidUtils.java
View File

@@ -11,7 +11,6 @@ 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;

2
termux-shared/src/main/java/com/termux/shared/packages/PackageUtils.java → termux-shared/src/main/java/com/termux/shared/android/PackageUtils.java
View File

@@ -1,4 +1,4 @@
package com.termux.shared.packages;
package com.termux.shared.android;
import android.app.ActivityManager;
import android.app.admin.DevicePolicyManager;

6
termux-shared/src/main/java/com/termux/shared/packages/PermissionUtils.java → termux-shared/src/main/java/com/termux/shared/android/PermissionUtils.java
View File

@@ -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.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;
import com.termux.shared.errors.Error;
import com.termux.shared.errors.FunctionErrno;
import com.termux.shared.view.ActivityUtils;
import java.util.ArrayList;

2
termux-shared/src/main/java/com/termux/shared/crash/CrashHandler.java
View File

@@ -7,7 +7,7 @@ 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.errors.Error;
import com.termux.shared.errors.Error;
import com.termux.shared.android.AndroidUtils;
import java.nio.charset.Charset;

2
termux-shared/src/main/java/com/termux/shared/models/errors/Errno.java → termux-shared/src/main/java/com/termux/shared/errors/Errno.java
View File

@@ -1,4 +1,4 @@
package com.termux.shared.models.errors;
package com.termux.shared.errors;
import android.app.Activity;

2
termux-shared/src/main/java/com/termux/shared/models/errors/Error.java → termux-shared/src/main/java/com/termux/shared/errors/Error.java
View File

@@ -1,4 +1,4 @@
package com.termux.shared.models.errors;
package com.termux.shared.errors;
import android.content.Context;

2
termux-shared/src/main/java/com/termux/shared/models/errors/FunctionErrno.java → termux-shared/src/main/java/com/termux/shared/errors/FunctionErrno.java
View File

@@ -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 {

7
termux-shared/src/main/java/com/termux/shared/file/FileUtils.java
View File

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

9
termux-shared/src/main/java/com/termux/shared/models/errors/FileUtilsErrno.java → termux-shared/src/main/java/com/termux/shared/file/FileUtilsErrno.java
View File

@@ -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");

2
termux-shared/src/main/java/com/termux/shared/file/tests/FileUtilsTests.java
View File

@@ -6,7 +6,7 @@ import androidx.annotation.NonNull;
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;

4
termux-shared/src/main/java/com/termux/shared/interact/ShareUtils.java
View File

@@ -18,8 +18,8 @@ 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;
import com.termux.shared.packages.PermissionUtils;
import com.termux.shared.errors.Error;
import com.termux.shared.android.PermissionUtils;
import java.nio.charset.Charset;

2
termux-shared/src/main/java/com/termux/shared/models/net/UriScheme.java → termux-shared/src/main/java/com/termux/shared/net/uri/UriScheme.java
View File

@@ -1,4 +1,4 @@
package com.termux.shared.models.net;
package com.termux.shared.net.uri;
import android.net.Uri;

3
termux-shared/src/main/java/com/termux/shared/net/UriUtils.java → termux-shared/src/main/java/com/termux/shared/net/uri/UriUtils.java
View File

@@ -1,4 +1,4 @@
package com.termux.shared.net;
package com.termux.shared.net.uri;
import android.net.Uri;
@@ -6,7 +6,6 @@ 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 {

2
termux-shared/src/main/java/com/termux/shared/net/UrlUtils.java → termux-shared/src/main/java/com/termux/shared/net/url/UrlUtils.java
View File

@@ -1,4 +1,4 @@
package com.termux.shared.net;
package com.termux.shared.net.url;
import androidx.annotation.Nullable;

11
termux-shared/src/main/java/com/termux/shared/models/ExecutionCommand.java → termux-shared/src/main/java/com/termux/shared/shell/command/ExecutionCommand.java
View File

@@ -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 android.net.Uri;
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 class ExecutionCommand {
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;

2
termux-shared/src/main/java/com/termux/shared/models/ResultConfig.java → termux-shared/src/main/java/com/termux/shared/shell/command/result/ResultConfig.java
View File

@@ -1,4 +1,4 @@
package com.termux.shared.models;
package com.termux.shared.shell.command.result;
import android.app.PendingIntent;

6
termux-shared/src/main/java/com/termux/shared/models/ResultData.java → termux-shared/src/main/java/com/termux/shared/shell/command/result/ResultData.java
View File

@@ -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;

11
termux-shared/src/main/java/com/termux/shared/shell/ResultSender.java → termux-shared/src/main/java/com/termux/shared/shell/command/result/ResultSender.java
View File

@@ -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 android.os.Bundle;
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 {

4
termux-shared/src/main/java/com/termux/shared/models/errors/ResultSenderErrno.java → termux-shared/src/main/java/com/termux/shared/shell/command/result/ResultSenderErrno.java
View File

@@ -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 {

13
termux-shared/src/main/java/com/termux/shared/shell/TermuxTask.java → termux-shared/src/main/java/com/termux/shared/shell/command/runner/app/TermuxTask.java
View File

@@ -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 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;
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;

80
termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
View File

@@ -2,17 +2,13 @@ package com.termux.shared.termux;
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 @@ import java.util.List;
*
* - 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 final class TermuxConstants {
}
/**
* 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.
*/

8
termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
View File

@@ -17,11 +17,11 @@ import com.termux.shared.file.FileUtils;
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;

8
termux-shared/src/main/java/com/termux/shared/termux/file/TermuxFileUtils.java
View File

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

2
termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxAPIAppSharedPreferences.java
View File

@@ -8,7 +8,7 @@ import androidx.annotation.NonNull;
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;

2
termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxAppSharedPreferences.java
View File

@@ -8,7 +8,7 @@ import android.util.TypedValue;
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;

2
termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxBootAppSharedPreferences.java
View File

@@ -8,7 +8,7 @@ import androidx.annotation.NonNull;
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;

2
termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxFloatAppSharedPreferences.java
View File

@@ -9,7 +9,7 @@ import androidx.annotation.Nullable;
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;

2
termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxStylingAppSharedPreferences.java
View File

@@ -8,7 +8,7 @@ import androidx.annotation.NonNull;
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;

2
termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxTaskerAppSharedPreferences.java
View File

@@ -7,7 +7,7 @@ import android.content.SharedPreferences;
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;

2
termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxWidgetAppSharedPreferences.java
View File

@@ -8,7 +8,7 @@ import androidx.annotation.NonNull;
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;

2
termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxPropertyConstants.java
View File

@@ -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;

4
termux-shared/src/main/java/com/termux/shared/termux/shell/TermuxShellUtils.java
View File

@@ -4,11 +4,11 @@ import android.content.Context;
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;

8
termux-shared/src/main/java/com/termux/shared/termux/shell/TermuxSession.java → termux-shared/src/main/java/com/termux/shared/termux/shell/command/runner/terminal/TermuxSession.java
View File

@@ -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 android.system.OsConstants;
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;

2
termux-shared/src/main/java/com/termux/shared/models/theme/NightMode.java → termux-shared/src/main/java/com/termux/shared/theme/NightMode.java
View File

@@ -1,4 +1,4 @@
package com.termux.shared.models.theme;
package com.termux.shared.theme;
import androidx.appcompat.app.AppCompatDelegate;

2
termux-shared/src/main/java/com/termux/shared/theme/ThemeUtils.java
View File

@@ -3,8 +3,6 @@ package com.termux.shared.theme;
import android.content.Context;
import android.content.res.Configuration;
import com.termux.shared.models.theme.NightMode;
public class ThemeUtils {
/**

4
termux-shared/src/main/java/com/termux/shared/view/ActivityUtils.java
View File

@@ -11,8 +11,8 @@ 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;
import com.termux.shared.errors.Error;
import com.termux.shared.errors.FunctionErrno;
public class ActivityUtils {