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

Fix Logger function modifier order

Browse Source
This commit is contained in:
agnostic-apollo
2021-04-06 12:23:00 +05:00
parent 38323b1c2a
commit 18b004a2ba
1 changed files with 36 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
app/src/main/java/com/termux/app/utils/Logger.java
View File

@@ -31,7 +31,7 @@ public class Logger {
static public void logMesssage(int logLevel, String tag, String message) { public static void logMesssage(int logLevel, String tag, String message) {
if(logLevel == Log.ERROR && CURRENT_LOG_LEVEL >= LOG_LEVEL_NORMAL) if(logLevel == Log.ERROR && CURRENT_LOG_LEVEL >= LOG_LEVEL_NORMAL)
Log.e(getFullTag(tag), message); Log.e(getFullTag(tag), message);
else if(logLevel == Log.WARN && CURRENT_LOG_LEVEL >= LOG_LEVEL_NORMAL) else if(logLevel == Log.WARN && CURRENT_LOG_LEVEL >= LOG_LEVEL_NORMAL)
@@ -46,57 +46,57 @@ public class Logger {
static public void logError(String tag, String message) { public static void logError(String tag, String message) {
logMesssage(Log.ERROR, tag, message); logMesssage(Log.ERROR, tag, message);
} }
static public void logError(String message) { public static void logError(String message) {
logMesssage(Log.ERROR, DEFAULT_LOG_TAG, message); logMesssage(Log.ERROR, DEFAULT_LOG_TAG, message);
} }
static public void logWarn(String tag, String message) { public static void logWarn(String tag, String message) {
logMesssage(Log.WARN, tag, message); logMesssage(Log.WARN, tag, message);
} }
static public void logWarn(String message) { public static void logWarn(String message) {
logMesssage(Log.WARN, DEFAULT_LOG_TAG, message); logMesssage(Log.WARN, DEFAULT_LOG_TAG, message);
} }
static public void logInfo(String tag, String message) { public static void logInfo(String tag, String message) {
logMesssage(Log.INFO, tag, message); logMesssage(Log.INFO, tag, message);
} }
static public void logInfo(String message) { public static void logInfo(String message) {
logMesssage(Log.INFO, DEFAULT_LOG_TAG, message); logMesssage(Log.INFO, DEFAULT_LOG_TAG, message);
} }
static public void logDebug(String tag, String message) { public static void logDebug(String tag, String message) {
logMesssage(Log.DEBUG, tag, message); logMesssage(Log.DEBUG, tag, message);
} }
static public void logDebug(String message) { public static void logDebug(String message) {
logMesssage(Log.DEBUG, DEFAULT_LOG_TAG, message); logMesssage(Log.DEBUG, DEFAULT_LOG_TAG, message);
} }
static public void logVerbose(String tag, String message) { public static void logVerbose(String tag, String message) {
logMesssage(Log.VERBOSE, tag, message); logMesssage(Log.VERBOSE, tag, message);
} }
static public void logVerbose(String message) { public static void logVerbose(String message) {
logMesssage(Log.VERBOSE, DEFAULT_LOG_TAG, message); logMesssage(Log.VERBOSE, DEFAULT_LOG_TAG, message);
} }
static public void logErrorAndShowToast(Context context, String tag, String message) { public static void logErrorAndShowToast(Context context, String tag, String message) {
if (context == null) return; if (context == null) return;
if(CURRENT_LOG_LEVEL >= LOG_LEVEL_NORMAL) { if(CURRENT_LOG_LEVEL >= LOG_LEVEL_NORMAL) {
@@ -105,13 +105,13 @@ public class Logger {
} }
} }
static public void logErrorAndShowToast(Context context, String message) { public static void logErrorAndShowToast(Context context, String message) {
logErrorAndShowToast(context, DEFAULT_LOG_TAG, message); logErrorAndShowToast(context, DEFAULT_LOG_TAG, message);
} }
static public void logDebugAndShowToast(Context context, String tag, String message) { public static void logDebugAndShowToast(Context context, String tag, String message) {
if (context == null) return; if (context == null) return;
if(CURRENT_LOG_LEVEL >= LOG_LEVEL_DEBUG) { if(CURRENT_LOG_LEVEL >= LOG_LEVEL_DEBUG) {
@@ -120,35 +120,35 @@ public class Logger {
} }
} }
static public void logDebugAndShowToast(Context context, String message) { public static void logDebugAndShowToast(Context context, String message) {
logDebugAndShowToast(context, DEFAULT_LOG_TAG, message); logDebugAndShowToast(context, DEFAULT_LOG_TAG, message);
} }
static public void logStackTraceWithMessage(String tag, String message, Throwable throwable) { public static void logStackTraceWithMessage(String tag, String message, Throwable throwable) {
if(CURRENT_LOG_LEVEL >= LOG_LEVEL_NORMAL) if(CURRENT_LOG_LEVEL >= LOG_LEVEL_NORMAL)
Log.e(getFullTag(tag), getMessageAndStackTraceString(message, throwable)); Log.e(getFullTag(tag), getMessageAndStackTraceString(message, throwable));
} }
static public void logStackTraceWithMessage(String message, Throwable throwable) { public static void logStackTraceWithMessage(String message, Throwable throwable) {
logStackTraceWithMessage(DEFAULT_LOG_TAG, message, throwable); logStackTraceWithMessage(DEFAULT_LOG_TAG, message, throwable);
} }
static public void logStackTrace(String tag, Throwable throwable) { public static void logStackTrace(String tag, Throwable throwable) {
logStackTraceWithMessage(tag, null, throwable); logStackTraceWithMessage(tag, null, throwable);
} }
static public void logStackTrace(Throwable throwable) { public static void logStackTrace(Throwable throwable) {
logStackTraceWithMessage(DEFAULT_LOG_TAG, null, throwable); logStackTraceWithMessage(DEFAULT_LOG_TAG, null, throwable);
} }
static public void logStackTracesWithMessage(String tag, String message, List<Throwable> throwableList) { public static void logStackTracesWithMessage(String tag, String message, List<Throwable> throwableList) {
if(CURRENT_LOG_LEVEL >= LOG_LEVEL_NORMAL) if(CURRENT_LOG_LEVEL >= LOG_LEVEL_NORMAL)
Log.e(getFullTag(tag), getMessageAndStackTracesString(message, throwableList)); Log.e(getFullTag(tag), getMessageAndStackTracesString(message, throwableList));
} }
static public String getMessageAndStackTraceString(String message, Throwable throwable) { public static String getMessageAndStackTraceString(String message, Throwable throwable) {
if(message == null && throwable == null) if(message == null && throwable == null)
return null; return null;
else if(message != null && throwable != null) else if(message != null && throwable != null)
@@ -159,7 +159,7 @@ public class Logger {
return getStackTraceString(throwable); return getStackTraceString(throwable);
} }
static public String getMessageAndStackTracesString(String message, List<Throwable> throwableList) { public static String getMessageAndStackTracesString(String message, List<Throwable> throwableList) {
if(message == null && (throwableList == null || throwableList.size() == 0)) if(message == null && (throwableList == null || throwableList.size() == 0))
return null; return null;
else if(message != null && (throwableList != null && throwableList.size() != 0)) else if(message != null && (throwableList != null && throwableList.size() != 0))
@@ -170,7 +170,7 @@ public class Logger {
return getStackTracesString(null, getStackTraceStringArray(throwableList)); return getStackTracesString(null, getStackTraceStringArray(throwableList));
} }
static public String getStackTraceString(Throwable throwable) { public static String getStackTraceString(Throwable throwable) {
if(throwable == null) return null; if(throwable == null) return null;
String stackTraceString = null; String stackTraceString = null;
@@ -188,7 +188,8 @@ public class Logger {
return stackTraceString; return stackTraceString;
} }
private static String[] getStackTraceStringArray(Throwable throwable) {
public static String[] getStackTraceStringArray(Throwable throwable) {
return getStackTraceStringArray(Collections.singletonList(throwable)); return getStackTraceStringArray(Collections.singletonList(throwable));
} }
@@ -210,7 +211,10 @@ public class Logger {
stackTracesString.append(" -"); stackTracesString.append(" -");
} else { } else {
for (int i = 0; i != stackTraceStringArray.length; i++) { for (int i = 0; i != stackTraceStringArray.length; i++) {
stackTracesString.append("\n\nStacktrace ").append(i + 1).append("\n```\n").append(stackTraceStringArray[i]).append("\n```\n"); if(stackTraceStringArray.length > 1)
stackTracesString.append("\n\nStacktrace ").append(i + 1);
stackTracesString.append("\n```\n").append(stackTraceStringArray[i]).append("\n```\n");
} }
} }
@@ -218,14 +222,17 @@ public class Logger {
} }
public static String getStackTracesMarkdownString(String label, String[] stackTraceStringArray) { public static String getStackTracesMarkdownString(String label, String[] stackTraceStringArray) {
if(label == null) label = "StackTraces:"; if(label == null) label = "StackTraces";
StringBuilder stackTracesString = new StringBuilder("### " + label); StringBuilder stackTracesString = new StringBuilder("### " + label);
if (stackTraceStringArray == null || stackTraceStringArray.length == 0) { if (stackTraceStringArray == null || stackTraceStringArray.length == 0) {
stackTracesString.append("\n\n`-`"); stackTracesString.append("\n\n`-`");
} else { } else {
for (int i = 0; i != stackTraceStringArray.length; i++) { for (int i = 0; i != stackTraceStringArray.length; i++) {
stackTracesString.append("\n\n\n#### Stacktrace ").append(i + 1).append("\n\n```\n").append(stackTraceStringArray[i]).append("\n```"); if(stackTraceStringArray.length > 1)
stackTracesString.append("\n\n\n#### Stacktrace ").append(i + 1);
stackTracesString.append("\n\n```\n").append(stackTraceStringArray[i]).append("\n```");
} }
} }
@@ -250,7 +257,7 @@ public class Logger {
static public void showToast(final Context context, final String toastText, boolean longDuration) { public static void showToast(final Context context, final String toastText, boolean longDuration) {
if (context == null) return; if (context == null) return;
new Handler(Looper.getMainLooper()).post(() -> Toast.makeText(context, toastText, longDuration ? Toast.LENGTH_LONG : Toast.LENGTH_SHORT).show()); new Handler(Looper.getMainLooper()).post(() -> Toast.makeText(context, toastText, longDuration ? Toast.LENGTH_LONG : Toast.LENGTH_SHORT).show());
@@ -313,7 +320,7 @@ public class Logger {
return CURRENT_LOG_LEVEL; return CURRENT_LOG_LEVEL;
} }
static public String getFullTag(String tag) { public static String getFullTag(String tag) {
if(DEFAULT_LOG_TAG.equals(tag)) if(DEFAULT_LOG_TAG.equals(tag))
return tag; return tag;
else else