Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-21 09:20:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rewrite the AppDependencies system.

Browse Source
This commit is contained in:
Greyson Parrelli
2024-05-22 15:44:24 -04:00
committed by Cody Henthorne
parent a0131bf39b
commit b6a4e1f145
560 changed files with 2909 additions and 3036 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionAnr.kt
View File

@@ -7,7 +7,7 @@ package org.thoughtcrime.securesms.logsubmit
import android.content.Context
import org.thoughtcrime.securesms.database.LogDatabase
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
import org.thoughtcrime.securesms.dependencies.AppDependencies
import java.text.SimpleDateFormat
import java.util.Date
import java.util.Locale
@@ -21,7 +21,7 @@ class LogSectionAnr : LogSection {
override fun getTitle(): String = "ANR"
override fun getContent(context: Context): CharSequence {
val anrs = LogDatabase.getInstance(ApplicationDependencies.getApplication()).anrs.getAll()
val anrs = LogDatabase.getInstance(AppDependencies.application).anrs.getAll()
return if (anrs.isEmpty()) {
"None"

4
app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionConstraints.java
View File

@@ -6,7 +6,7 @@ import androidx.annotation.NonNull;
import com.annimon.stream.Stream;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.dependencies.AppDependencies;
import org.thoughtcrime.securesms.jobmanager.Constraint;
import org.thoughtcrime.securesms.jobs.JobManagerFactories;
import org.thoughtcrime.securesms.util.Util;
@@ -23,7 +23,7 @@ final class LogSectionConstraints implements LogSection {
@Override
public @NonNull CharSequence getContent(@NonNull Context context) {
StringBuilder output = new StringBuilder();
Map<String, Constraint.Factory> factories = JobManagerFactories.getConstraintFactories(ApplicationDependencies.getApplication());
Map<String, Constraint.Factory> factories = JobManagerFactories.getConstraintFactories(AppDependencies.getApplication());
int keyLength = Stream.of(factories.keySet()).map(String::length).max(Integer::compareTo).orElse(0);
for (Map.Entry<String, Constraint.Factory> entry : factories.entrySet()) {

4
app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionExoPlayerPool.kt
View File

@@ -1,7 +1,7 @@
package org.thoughtcrime.securesms.logsubmit
import android.content.Context
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
import org.thoughtcrime.securesms.dependencies.AppDependencies
import org.thoughtcrime.securesms.video.exo.ExoPlayerPool
/**
@@ -11,7 +11,7 @@ class LogSectionExoPlayerPool : LogSection {
override fun getTitle(): String = "EXOPLAYER POOL"
override fun getContent(context: Context): CharSequence {
val poolStats = ApplicationDependencies.getExoPlayerPool().getPoolStats()
val poolStats = AppDependencies.exoPlayerPool.getPoolStats()
val owners: Map<String, List<ExoPlayerPool.OwnershipInfo>> = poolStats.owners.groupBy { it.tag }
val output = StringBuilder()

4
app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionJobs.java
View File

@@ -4,7 +4,7 @@ import android.content.Context;
import androidx.annotation.NonNull;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.dependencies.AppDependencies;
public class LogSectionJobs implements LogSection {
@@ -15,6 +15,6 @@ public class LogSectionJobs implements LogSection {
@Override
public @NonNull CharSequence getContent(@NonNull Context context) {
return ApplicationDependencies.getJobManager().getDebugInfo();
return AppDependencies.getJobManager().getDebugInfo();
}
}

4
app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionLocalMetrics.java
View File

@@ -7,7 +7,7 @@ import androidx.annotation.NonNull;
import org.thoughtcrime.securesms.database.LocalMetricsDatabase;
import org.thoughtcrime.securesms.database.LocalMetricsDatabase.EventMetrics;
import org.thoughtcrime.securesms.database.LocalMetricsDatabase.SplitMetrics;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.dependencies.AppDependencies;
import java.util.List;
@@ -19,7 +19,7 @@ final class LogSectionLocalMetrics implements LogSection {
@Override
public @NonNull CharSequence getContent(@NonNull Context context) {
List<EventMetrics> metrics = LocalMetricsDatabase.getInstance(ApplicationDependencies.getApplication()).getMetrics();
List<EventMetrics> metrics = LocalMetricsDatabase.getInstance(AppDependencies.getApplication()).getMetrics();
StringBuilder builder = new StringBuilder();

4
app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionSystemInfo.java
View File

@@ -16,7 +16,7 @@ import com.google.android.gms.common.GoogleApiAvailability;
import org.signal.core.util.FontUtil;
import org.thoughtcrime.securesms.BuildConfig;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.dependencies.AppDependencies;
import org.thoughtcrime.securesms.emoji.EmojiFiles;
import org.thoughtcrime.securesms.keyvalue.SignalStore;
import org.thoughtcrime.securesms.net.StandardUserAgentInterceptor;
@@ -75,7 +75,7 @@ public class LogSectionSystemInfo implements LogSection {
builder.append("RecipientId : ").append(SignalStore.registrationValues().isRegistrationComplete() ? Recipient.self().getId() : "N/A").append("\n");
builder.append("ACI : ").append(getCensoredAci(context)).append("\n");
builder.append("Device ID : ").append(SignalStore.account().getDeviceId()).append("\n");
builder.append("Censored : ").append(ApplicationDependencies.getSignalServiceNetworkAccess().isCensored()).append("\n");
builder.append("Censored : ").append(AppDependencies.getSignalServiceNetworkAccess().isCensored()).append("\n");
builder.append("Network Status : ").append(NetworkUtil.getNetworkStatus(context)).append("\n");
builder.append("Play Services : ").append(getPlayServicesString(context)).append("\n");
builder.append("FCM : ").append(SignalStore.account().isFcmEnabled()).append("\n");

7
app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionThreadDump.java
View File

@@ -4,8 +4,7 @@ import android.content.Context;
import androidx.annotation.NonNull;
import org.signal.core.util.concurrent.DeadlockDetector;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.dependencies.AppDependencies;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -23,8 +22,8 @@ public class LogSectionThreadDump implements LogSection {
@Override
public @NonNull CharSequence getContent(@NonNull Context context) {
Map<Thread, StackTraceElement[]> traces = ApplicationDependencies.getDeadlockDetector().getLastThreadDump();
long time = ApplicationDependencies.getDeadlockDetector().getLastThreadDumpTime();
Map<Thread, StackTraceElement[]> traces = AppDependencies.getDeadlockDetector().getLastThreadDump();
long time = AppDependencies.getDeadlockDetector().getLastThreadDumpTime();
if (traces == null) {
return "None";

4
app/src/main/java/org/thoughtcrime/securesms/logsubmit/SubmitDebugLogRepository.java
View File

@@ -20,7 +20,7 @@ import org.signal.core.util.logging.Log;
import org.signal.core.util.logging.Scrubber;
import org.signal.core.util.tracing.Tracer;
import org.thoughtcrime.securesms.database.LogDatabase;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.dependencies.AppDependencies;
import org.thoughtcrime.securesms.net.StandardUserAgentInterceptor;
import org.thoughtcrime.securesms.providers.BlobProvider;
import org.thoughtcrime.securesms.push.SignalServiceNetworkAccess;
@@ -106,7 +106,7 @@ public class SubmitDebugLogRepository {
private final ExecutorService executor;
public SubmitDebugLogRepository() {
this.context = ApplicationDependencies.getApplication();
this.context = AppDependencies.getApplication();
this.executor = SignalExecutors.SERIAL;
}

6
app/src/main/java/org/thoughtcrime/securesms/logsubmit/SubmitDebugLogViewModel.java
View File

@@ -19,7 +19,7 @@ import org.signal.paging.PagingConfig;
import org.signal.paging.PagingController;
import org.signal.paging.ProxyPagingController;
import org.thoughtcrime.securesms.database.LogDatabase;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.dependencies.AppDependencies;
import org.thoughtcrime.securesms.util.SingleLiveEvent;
import java.util.ArrayList;
@@ -54,9 +54,9 @@ public class SubmitDebugLogViewModel extends ViewModel {
this.staticLines.addAll(staticLines);
Log.blockUntilAllWritesFinished();
LogDatabase.getInstance(ApplicationDependencies.getApplication()).logs().trimToSize();
LogDatabase.getInstance(AppDependencies.getApplication()).logs().trimToSize();
LogDataSource dataSource = new LogDataSource(ApplicationDependencies.getApplication(), staticLines, firstViewTime);
LogDataSource dataSource = new LogDataSource(AppDependencies.getApplication(), staticLines, firstViewTime);
PagingConfig config = new PagingConfig.Builder().setPageSize(100)
.setBufferPages(3)
.setStartIndex(0)