Changed!: Remove TermuxConstants reference from Logger and set DEFAULT_LOG_TAG at application startup

agnostic-apollo · agnostic-apollo · commit 6ff5572999b7 · 2022-01-23T01:40:22.000+05:00
Plugin apps must do the same
diff --git a/app/src/main/java/com/termux/app/TermuxApplication.java b/app/src/main/java/com/termux/app/TermuxApplication.java
@@ -1,7 +1,9 @@
 package com.termux.app;
 
 import android.app.Application;
+import android.content.Context;
 
+import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.termux.crash.TermuxCrashUtils;
 import com.termux.shared.termux.settings.preferences.TermuxAppSharedPreferences;
 import com.termux.shared.logger.Logger;
@@ -14,16 +16,19 @@ public void onCreate() {
         // Set crash handler for the app
         TermuxCrashUtils.setCrashHandler(this);
 
-        // Set log level for the app
-        setLogLevel();
+        // Set log config for the app
+        setLogConfig(getApplicationContext());
+
+        Logger.logDebug("Starting Application");
     }
 
-    private void setLogLevel() {
+    public static void setLogConfig(Context context) {
+        Logger.setDefaultLogTag(TermuxConstants.TERMUX_APP_NAME);
+
         // Load the log level from shared preferences and set it to the {@link Logger.CURRENT_LOG_LEVEL}
-        TermuxAppSharedPreferences preferences = TermuxAppSharedPreferences.build(getApplicationContext());
+        TermuxAppSharedPreferences preferences = TermuxAppSharedPreferences.build(context);
         if (preferences == null) return;
         preferences.setLogLevel(null, preferences.getLogLevel());
-        Logger.logDebug("Starting Application");
     }
 }
 
diff --git a/termux-shared/src/main/java/com/termux/shared/logger/Logger.java b/termux-shared/src/main/java/com/termux/shared/logger/Logger.java
@@ -6,9 +6,10 @@
 import android.util.Log;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
+
 import com.termux.shared.R;
 import com.termux.shared.data.DataUtils;
-import com.termux.shared.termux.TermuxConstants;
 
 import java.io.IOException;
 import java.io.PrintWriter;
@@ -19,7 +20,7 @@
 
 public class Logger {
 
-    public static final String DEFAULT_LOG_TAG = TermuxConstants.TERMUX_APP_NAME;
+    private static String DEFAULT_LOG_TAG = "Logger";
 
     public static final int LOG_LEVEL_OFF = 0; // log nothing
     public static final int LOG_LEVEL_NORMAL = 1; // start logging error, warn and info messages and stacktraces
@@ -419,6 +420,20 @@ public static String getLogLevelLabel(final Context context, final int logLevel,
 
 
 
+    @NonNull
+    public static String getDefaultLogTag() {
+        return DEFAULT_LOG_TAG;
+    }
+
+    /**
+     * IllegalArgumentException will be thrown if tag.length() > 23 for Nougat (7.0) and prior releases.
+     * https://developer.android.com/reference/android/util/Log#isLoggable(java.lang.String,%20int) */
+    public static void setDefaultLogTag(@NonNull String defaultLogTag) {
+        DEFAULT_LOG_TAG = defaultLogTag.length() >= 23 ? defaultLogTag.substring(0, 22) : defaultLogTag;
+    }
+
+
+
     public static int getLogLevel() {
         return CURRENT_LOG_LEVEL;
     }
diff --git a/termux-shared/src/main/java/com/termux/shared/shell/StreamGobbler.java b/termux-shared/src/main/java/com/termux/shared/shell/StreamGobbler.java
@@ -190,7 +190,7 @@ public StreamGobbler(@NonNull String shell, @NonNull InputStream inputStream,
 
     @Override
     public void run() {
-        String defaultLogTag = Logger.DEFAULT_LOG_TAG;
+        String defaultLogTag = Logger.getDefaultLogTag();
         boolean loggingEnabled = Logger.shouldEnableLoggingForCustomLogLevel(mLogLevel);
         if (loggingEnabled)
             Logger.logVerbose(LOG_TAG, "Using custom log level: " + mLogLevel + ", current log level: " + Logger.getLogLevel());
