Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-02-27 13:13:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make our loggers singletons.

Browse Source
This commit is contained in:
Greyson Parrelli
2025-08-04 11:31:45 -04:00
committed by Cody Henthorne
parent ec7a2f734a
commit 26df14124b
10 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
View File

@@ -334,7 +334,7 @@ public class ApplicationContext extends Application implements AppForegroundObse
@VisibleForTesting
protected void initializeLogging() {
Log.initialize(RemoteConfig::internalUser, new AndroidLogger(), new PersistentLogger(this));
Log.initialize(RemoteConfig::internalUser, AndroidLogger.INSTANCE, PersistentLogger.getInstance(this));
SignalProtocolLoggerProvider.setProvider(new CustomSignalProtocolLogger());
SignalProtocolLoggerProvider.initializeLogging(BuildConfig.LIBSIGNAL_LOG_LEVEL);

20
app/src/main/java/org/thoughtcrime/securesms/logging/PersistentLogger.kt
View File

@@ -25,9 +25,7 @@ import java.util.Locale
* - Main thread creates a [LogRequest] object and puts it in a queue
* - The [WriteThread] constantly pulls from that queue, formats the logs, and writes them to the database.
*/
class PersistentLogger(
application: Application
) : Log.Logger() {
class PersistentLogger private constructor(application: Application) : Log.Logger() {
companion object {
private const val LOG_V = "V"
@@ -35,6 +33,22 @@ class PersistentLogger(
private const val LOG_I = "I"
private const val LOG_W = "W"
private const val LOG_E = "E"
@Volatile
private var instance: PersistentLogger? = null
@JvmStatic
fun getInstance(application: Application): PersistentLogger {
if (instance == null) {
synchronized(PersistentLogger::class.java) {
if (instance == null) {
instance = PersistentLogger(application)
}
}
}
return requireNotNull(instance)
}
}
private val logEntries = LogRequests()

2
app/src/main/java/org/thoughtcrime/securesms/providers/AvatarProvider.kt
View File

@@ -78,7 +78,7 @@ class AvatarProvider : BaseContentProvider() {
SignalStore.init(application)
Log.initialize(RemoteConfig::internalUser, AndroidLogger(), PersistentLogger(application))
Log.initialize(RemoteConfig::internalUser, AndroidLogger, PersistentLogger.getInstance(application))
if (!AppDependencies.isInitialized) {
Log.i(TAG, "Initializing AppDependencies.")