Skip to content

Commit 3ba791a

Browse files
author
LisoUseInAIKyrios
authored
refactor(YouTube - Enabling debugging): Adjust logger formatting to preserve backwards compatibility (#5054)
1 parent 443b54b commit 3ba791a

File tree

1 file changed

+19
-18
lines changed
  • extensions/shared/library/src/main/java/app/revanced/extension/shared

1 file changed

+19
-18
lines changed

extensions/shared/library/src/main/java/app/revanced/extension/shared/Logger.java

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,10 @@ private enum LogLevel {
4141
ERROR
4242
}
4343

44-
private static final String REVANCED_LOG_TAG = "revanced";
44+
/**
45+
* Log tag prefix. Only used for system logging.
46+
*/
47+
private static final String REVANCED_LOG_TAG_PREFIX = "revanced: ";
4548

4649
private static final String LOGGER_CLASS_NAME = Logger.class.getName();
4750

@@ -90,17 +93,13 @@ private static void logInternal(LogLevel logLevel, LogMessage message, @Nullable
9093
String messageString = message.buildMessageString();
9194
String className = getOuterClassSimpleName(message);
9295

93-
StringBuilder logBuilder = new StringBuilder(className.length() + 2
94-
+ messageString.length());
95-
logBuilder.append(className).append(": ").append(messageString);
96-
97-
String toastMessage = showToast ? logBuilder.toString() : null;
96+
String logText = messageString;
9897

9998
// Append exception message if present.
10099
if (ex != null) {
101100
var exceptionMessage = ex.getMessage();
102101
if (exceptionMessage != null) {
103-
logBuilder.append("\nException: ").append(exceptionMessage);
102+
logText += "\nException: " + exceptionMessage;
104103
}
105104
}
106105

@@ -111,29 +110,31 @@ private static void logInternal(LogLevel logLevel, LogMessage message, @Nullable
111110
// Remove the stacktrace elements of this class.
112111
final int loggerIndex = stackTrace.lastIndexOf(LOGGER_CLASS_NAME);
113112
final int loggerBegins = stackTrace.indexOf('\n', loggerIndex);
114-
logBuilder.append(stackTrace, loggerBegins, stackTrace.length());
113+
logText += stackTrace.substring(loggerBegins);
115114
}
116115

117-
String logText = logBuilder.toString();
118-
LogBufferManager.appendToLogBuffer(logText);
116+
// Do not include "revanced:" prefix in clipboard logs.
117+
String managerToastString = className + ": " + logText;
118+
LogBufferManager.appendToLogBuffer(managerToastString);
119119

120+
String logTag = REVANCED_LOG_TAG_PREFIX + className;
120121
switch (logLevel) {
121122
case DEBUG:
122-
if (ex == null) Log.d(REVANCED_LOG_TAG, logText);
123-
else Log.d(REVANCED_LOG_TAG, logText, ex);
123+
if (ex == null) Log.d(logTag, logText);
124+
else Log.d(logTag, logText, ex);
124125
break;
125126
case INFO:
126-
if (ex == null) Log.i(REVANCED_LOG_TAG, logText);
127-
else Log.i(REVANCED_LOG_TAG, logText, ex);
127+
if (ex == null) Log.i(logTag, logText);
128+
else Log.i(logTag, logText, ex);
128129
break;
129130
case ERROR:
130-
if (ex == null) Log.e(REVANCED_LOG_TAG, logText);
131-
else Log.e(REVANCED_LOG_TAG, logText, ex);
131+
if (ex == null) Log.e(logTag, logText);
132+
else Log.e(logTag, logText, ex);
132133
break;
133134
}
134135

135-
if (toastMessage != null) {
136-
Utils.showToastLong(toastMessage);
136+
if (showToast) {
137+
Utils.showToastLong(managerToastString);
137138
}
138139
}
139140

0 commit comments

Comments
 (0)