From 361bfb3961ccb54402253dc1ffc3f851c4139e65 Mon Sep 17 00:00:00 2001 From: agnostic-apollo Date: Tue, 26 Oct 2021 07:04:08 +0500 Subject: [PATCH] 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 08f7dd97..737a9d8c 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.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 diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java index bf5837ec..31883f19 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.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; diff --git a/app/src/main/java/com/termux/app/TermuxInstaller.java b/app/src/main/java/com/termux/app/TermuxInstaller.java index 6b3b8f0a..f31230aa 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.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; diff --git a/app/src/main/java/com/termux/app/TermuxOpenReceiver.java b/app/src/main/java/com/termux/app/TermuxOpenReceiver.java index 1e307cc9..9d3a01ef 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 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; diff --git a/app/src/main/java/com/termux/app/TermuxService.java b/app/src/main/java/com/termux/app/TermuxService.java index 74a74562..ee600a04 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.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; 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 05b402c7..d0431bc7 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.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; 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 5e10d66d..98a460e3 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 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; 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 5c83c66f..750b7264 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.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; 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 25651545..b93e8237 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 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; 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 94591e63..6d44557a 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 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; diff --git a/app/src/main/java/com/termux/filepicker/TermuxFileReceiverActivity.java b/app/src/main/java/com/termux/filepicker/TermuxFileReceiverActivity.java index adb09e47..45c99e68 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 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; 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 b40d0cde..6f2cadd1 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 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; 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 e827bb09..29126f56 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 0ab49d64..355305fc 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.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; 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 8b670c34..7e40c63a 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 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; 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 d330787c..ae860915 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 56a04e97..6272b3e4 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 ff3759cc..533a9f5c 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 e3688728..9a83c2fa 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.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; 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 cdf3c0f8..b39870b8 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 06944505..927a20a8 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 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; 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 ae510d31..4faf3f31 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.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; 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 74ac2421..c32be0d5 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 b642c65c..29940452 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 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 { 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 0e9101f3..63ca3a05 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 b908e1d0..1c1c53cd 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 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; 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 77bdad7f..e3ab5caf 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 2501653e..3e425320 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 e77634c0..181afcaa 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 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 { 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 1cb92818..e21a146c 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 da27e996..ca31d921 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 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; 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 14b63278..ca61b0e5 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 @@ 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. */ 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 b2e40b94..93a9fd1e 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.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; 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 704c93e3..54aa2813 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 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; 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 1bc0171d..c056c57b 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.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; 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 b2f986ec..95c358f7 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 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; 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 85bd822d..c5e3f43f 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.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; 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 0e0a8620..40e0316e 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 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; 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 10bbb677..b9344393 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.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; 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 0945a33b..509869b6 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 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; 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 a6e181cd..0049c82b 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.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; 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 a657613c..30febbd3 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 aad62427..10583977 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 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; 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 ce13ea87..76e62c7c 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 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; 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 f37ac57f..8f4ff416 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 0d73a7a9..914aaf8d 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 @@ package com.termux.shared.theme; 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 963d5970..36df09a4 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 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 {