mirrors/TM-SGNL-Android
1
0
Fork 0
mirror of https://github.com/micahflee/TM-SGNL-Android.git synced 2025-07-07 21:35:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

NEW - use logger adapter to route logs to tm logger

Browse source
This commit is contained in:
TELEMESSAGE\Davidt 2024-02-14 09:23:06 +02:00
parent fd6894b607
commit d1521fbbfd
3 changed files with 42 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/org/tm/archive/ApplicationContext.java
View file

@ -304,7 +304,7 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
@VisibleForTesting
protected void initializeLogging() {
Log.initialize(FeatureFlags::internalUser, new AndroidLogger(), new PersistentLogger(this));
Log.initialize(FeatureFlags::internalUser, createLogger(), new PersistentLogger(this)); // TM_SA
SignalProtocolLoggerProvider.setProvider(new CustomSignalProtocolLogger());
@ -315,6 +315,8 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
});
}
protected Log.Logger createLogger() { return new AndroidLogger(); } // TM_SA
private void initializeCrashHandling() {
final Thread.UncaughtExceptionHandler originalHandler = Thread.getDefaultUncaughtExceptionHandler();
Thread.setDefaultUncaughtExceptionHandler(new SignalUncaughtExceptionHandler(originalHandler));

34
app/src/tm/java/org/archiver/SignalLoggerAdapter.kt Normal file
View file

@ -0,0 +1,34 @@
package org.archiver
import android.app.Application
import com.tm.logger.Log
class SignalLoggerAdapter(application: Application) : org.signal.core.util.logging.Log.Logger() {
init {
Log.createInstance(application.applicationContext)
}
override fun v(tag: String, message: String?, t: Throwable?, keepLonger: Boolean) {
Log.v(tag, message, t)
}
override fun d(tag: String, message: String?, t: Throwable?, keepLonger: Boolean) {
Log.d(tag, message, t)
}
override fun i(tag: String, message: String?, t: Throwable?, keepLonger: Boolean) {
Log.i(tag, message, t)
}
override fun w(tag: String, message: String?, t: Throwable?, keepLonger: Boolean) {
Log.w(tag, message, t)
}
override fun e(tag: String, message: String?, t: Throwable?, keepLonger: Boolean) {
Log.e(tag, message, t)
}
override fun flush() {}
}

5
app/src/tm/java/org/tm/archive/TeleMessageSignalApplication.kt
View file

@ -15,6 +15,7 @@ import com.tm.authenticatorsdk.selfAuthenticator.AuthenticatorConstants
import com.tm.logger.Log
import org.archiver.ArchiveConstants
import org.archiver.ArchiveLogger
import org.archiver.SignalLoggerAdapter
import org.archiver.device.CallManagerRecordingDelegate
import org.archiver.di.TeleMessageApplicationDependencyProvider
import org.archiver.di.TeleMessageApplicationDependencyProvider.Companion.getSdkModule
@ -44,6 +45,10 @@ class TeleMessageSignalApplication : ApplicationContext() {
super.beforeInitializeCallManager()
}
override fun createLogger(): org.signal.core.util.logging.Log.Logger {
return SignalLoggerAdapter(this)
}
private fun initializeSdk() {
val database = SignalDatabase.instance ?: return
val module = getSdkModule(database)