Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-12 18:59:06 +01:00
Code Issues Projects Releases Wiki Activity

Refactor persistent logging to bramble-core.

Browse Source
This commit is contained in:
akwizgran
2020-07-04 12:16:55 +01:00
parent ca5c18ece3
commit cda722a8b2
11 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
briar-api/src/main/java/org/briarproject/briar/api/logging/PersistentLogManager.java → bramble-api/src/main/java/org/briarproject/bramble/api/logging/PersistentLogManager.java
View File

@@ -1,4 +1,4 @@
package org.briarproject.briar.api.logging;
package org.briarproject.bramble.api.logging;
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
import org.briarproject.bramble.api.settings.Settings;

2
bramble-core/src/main/java/org/briarproject/bramble/BrambleCoreModule.java
View File

@@ -13,6 +13,7 @@ import org.briarproject.bramble.identity.IdentityModule;
import org.briarproject.bramble.io.IoModule;
import org.briarproject.bramble.keyagreement.KeyAgreementModule;
import org.briarproject.bramble.lifecycle.LifecycleModule;
import org.briarproject.bramble.logging.LoggingModule;
import org.briarproject.bramble.plugin.PluginModule;
import org.briarproject.bramble.properties.PropertiesModule;
import org.briarproject.bramble.record.RecordModule;
@@ -41,6 +42,7 @@ import dagger.Module;
IoModule.class,
KeyAgreementModule.class,
LifecycleModule.class,
LoggingModule.class,
PluginModule.class,
PropertiesModule.class,
RecordModule.class,

2
briar-core/src/main/java/org/briarproject/briar/logging/BriefLogFormatter.java → bramble-core/src/main/java/org/briarproject/bramble/logging/BriefLogFormatter.java
View File

@@ -1,4 +1,4 @@
package org.briarproject.briar.logging;
package org.briarproject.bramble.logging;
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;

2
briar-core/src/main/java/org/briarproject/briar/logging/FlushingStreamHandler.java → bramble-core/src/main/java/org/briarproject/bramble/logging/FlushingStreamHandler.java
View File

@@ -1,4 +1,4 @@
package org.briarproject.briar.logging;
package org.briarproject.bramble.logging;
import java.io.OutputStream;
import java.util.concurrent.Executor;

4
briar-core/src/main/java/org/briarproject/briar/logging/LoggingModule.java → bramble-core/src/main/java/org/briarproject/bramble/logging/LoggingModule.java
View File

@@ -1,7 +1,7 @@
package org.briarproject.briar.logging;
package org.briarproject.bramble.logging;
import org.briarproject.bramble.api.lifecycle.LifecycleManager;
import org.briarproject.briar.api.logging.PersistentLogManager;
import org.briarproject.bramble.api.logging.PersistentLogManager;
import java.util.logging.Formatter;

4
briar-core/src/main/java/org/briarproject/briar/logging/PersistentLogManagerImpl.java → bramble-core/src/main/java/org/briarproject/bramble/logging/PersistentLogManagerImpl.java
View File

@@ -1,4 +1,4 @@
package org.briarproject.briar.logging;
package org.briarproject.bramble.logging;
import org.briarproject.bramble.api.crypto.CryptoComponent;
import org.briarproject.bramble.api.crypto.SecretKey;
@@ -8,13 +8,13 @@ import org.briarproject.bramble.api.db.Transaction;
import org.briarproject.bramble.api.lifecycle.IoExecutor;
import org.briarproject.bramble.api.lifecycle.LifecycleManager.OpenDatabaseHook;
import org.briarproject.bramble.api.lifecycle.ShutdownManager;
import org.briarproject.bramble.api.logging.PersistentLogManager;
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
import org.briarproject.bramble.api.settings.Settings;
import org.briarproject.bramble.api.system.Scheduler;
import org.briarproject.bramble.api.transport.StreamReaderFactory;
import org.briarproject.bramble.api.transport.StreamWriter;
import org.briarproject.bramble.api.transport.StreamWriterFactory;
import org.briarproject.briar.api.logging.PersistentLogManager;
import java.io.File;
import java.io.FileInputStream;

2
briar-android/src/main/java/org/briarproject/briar/android/AndroidComponent.java
View File

@@ -20,6 +20,7 @@ import org.briarproject.bramble.api.keyagreement.PayloadEncoder;
import org.briarproject.bramble.api.keyagreement.PayloadParser;
import org.briarproject.bramble.api.lifecycle.IoExecutor;
import org.briarproject.bramble.api.lifecycle.LifecycleManager;
import org.briarproject.bramble.api.logging.PersistentLogManager;
import org.briarproject.bramble.api.plugin.PluginManager;
import org.briarproject.bramble.api.settings.SettingsManager;
import org.briarproject.bramble.api.system.AndroidExecutor;
@@ -46,7 +47,6 @@ import org.briarproject.briar.api.feed.FeedManager;
import org.briarproject.briar.api.forum.ForumManager;
import org.briarproject.briar.api.forum.ForumSharingManager;
import org.briarproject.briar.api.introduction.IntroductionManager;
import org.briarproject.briar.api.logging.PersistentLogManager;
import org.briarproject.briar.api.messaging.MessagingManager;
import org.briarproject.briar.api.messaging.PrivateMessageFactory;
import org.briarproject.briar.api.privategroup.GroupMessageFactory;

2
briar-android/src/main/java/org/briarproject/briar/android/BriarApplicationImpl.java
View File

@@ -19,6 +19,7 @@ import org.acra.ReportingInteractionMode;
import org.acra.annotation.ReportsCrashes;
import org.briarproject.bramble.BrambleAndroidEagerSingletons;
import org.briarproject.bramble.BrambleCoreEagerSingletons;
import org.briarproject.bramble.api.logging.PersistentLogManager;
import org.briarproject.briar.BriarCoreEagerSingletons;
import org.briarproject.briar.BuildConfig;
import org.briarproject.briar.R;
@@ -27,7 +28,6 @@ import org.briarproject.briar.android.reporting.BriarReportPrimer;
import org.briarproject.briar.android.reporting.BriarReportSenderFactory;
import org.briarproject.briar.android.reporting.DevReportActivity;
import org.briarproject.briar.android.util.UiUtils;
import org.briarproject.briar.api.logging.PersistentLogManager;
import java.io.File;
import java.io.IOException;

2
briar-android/src/main/java/org/briarproject/briar/android/reporting/BriarReportPrimer.java
View File

@@ -14,10 +14,10 @@ import android.os.Looper;
import org.acra.builder.ReportBuilder;
import org.acra.builder.ReportPrimer;
import org.briarproject.bramble.api.Pair;
import org.briarproject.bramble.api.logging.PersistentLogManager;
import org.briarproject.briar.BuildConfig;
import org.briarproject.briar.android.AndroidComponent;
import org.briarproject.briar.android.BriarApplication;
import org.briarproject.briar.api.logging.PersistentLogManager;
import java.io.File;
import java.io.IOException;

2
briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsActivity.java
View File

@@ -7,12 +7,12 @@ import android.view.MenuItem;
import android.widget.Toast;
import org.briarproject.bramble.api.lifecycle.IoExecutor;
import org.briarproject.bramble.api.logging.PersistentLogManager;
import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
import org.briarproject.briar.R;
import org.briarproject.briar.android.activity.ActivityComponent;
import org.briarproject.briar.android.activity.BriarActivity;
import org.briarproject.briar.api.logging.PersistentLogManager;
import java.io.File;
import java.io.FileOutputStream;

2
briar-core/src/main/java/org/briarproject/briar/BriarCoreModule.java
View File

@@ -6,7 +6,6 @@ import org.briarproject.briar.feed.DnsModule;
import org.briarproject.briar.feed.FeedModule;
import org.briarproject.briar.forum.ForumModule;
import org.briarproject.briar.introduction.IntroductionModule;
import org.briarproject.briar.logging.LoggingModule;
import org.briarproject.briar.messaging.MessagingModule;
import org.briarproject.briar.privategroup.PrivateGroupModule;
import org.briarproject.briar.privategroup.invitation.GroupInvitationModule;
@@ -23,7 +22,6 @@ import dagger.Module;
ForumModule.class,
GroupInvitationModule.class,
IntroductionModule.class,
LoggingModule.class,
MessagingModule.class,
PrivateGroupModule.class,
SharingModule.class,