Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-20 08:39:22 +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

8
app/src/main/java/org/thoughtcrime/securesms/stickers/StickerManagementRepository.java
View File

@@ -11,7 +11,7 @@ import org.thoughtcrime.securesms.database.SignalDatabase;
import org.thoughtcrime.securesms.database.StickerTable;
import org.thoughtcrime.securesms.database.StickerTable.StickerPackRecordReader;
import org.thoughtcrime.securesms.database.model.StickerPackRecord;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.dependencies.AppDependencies;
import org.thoughtcrime.securesms.jobmanager.JobManager;
import org.thoughtcrime.securesms.jobs.MultiDeviceStickerPackOperationJob;
import org.thoughtcrime.securesms.jobs.StickerPackDownloadJob;
@@ -38,7 +38,7 @@ final class StickerManagementRepository {
void fetchUnretrievedReferencePacks() {
SignalExecutors.SERIAL.execute(() -> {
JobManager jobManager = ApplicationDependencies.getJobManager();
JobManager jobManager = AppDependencies.getJobManager();
try (Cursor cursor = attachmentDatabase.getUnavailableStickerPacks()) {
while (cursor != null && cursor.moveToNext()) {
@@ -79,14 +79,14 @@ final class StickerManagementRepository {
stickerDatabase.uninstallPack(packId);
if (TextSecurePreferences.isMultiDevice(context)) {
ApplicationDependencies.getJobManager().add(new MultiDeviceStickerPackOperationJob(packId, packKey, MultiDeviceStickerPackOperationJob.Type.REMOVE));
AppDependencies.getJobManager().add(new MultiDeviceStickerPackOperationJob(packId, packKey, MultiDeviceStickerPackOperationJob.Type.REMOVE));
}
});
}
void installStickerPack(@NonNull String packId, @NonNull String packKey, boolean notify) {
SignalExecutors.SERIAL.execute(() -> {
JobManager jobManager = ApplicationDependencies.getJobManager();
JobManager jobManager = AppDependencies.getJobManager();
if (stickerDatabase.isPackAvailableAsReference(packId)) {
stickerDatabase.markPackAsInstalled(packId, notify);

6
app/src/main/java/org/thoughtcrime/securesms/stickers/StickerManagementViewModel.java
View File

@@ -10,7 +10,7 @@ import androidx.lifecycle.ViewModelProvider;
import org.thoughtcrime.securesms.database.DatabaseObserver;
import org.thoughtcrime.securesms.database.model.StickerPackRecord;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.dependencies.AppDependencies;
import org.thoughtcrime.securesms.stickers.StickerManagementRepository.PackResult;
import java.util.List;
@@ -31,7 +31,7 @@ final class StickerManagementViewModel extends ViewModel {
repository.getStickerPacks(packs::postValue);
};
ApplicationDependencies.getDatabaseObserver().registerStickerPackObserver(observer);
AppDependencies.getDatabaseObserver().registerStickerPackObserver(observer);
}
void init() {
@@ -62,7 +62,7 @@ final class StickerManagementViewModel extends ViewModel {
@Override
protected void onCleared() {
ApplicationDependencies.getDatabaseObserver().unregisterObserver(observer);
AppDependencies.getDatabaseObserver().unregisterObserver(observer);
}
static class Factory extends ViewModelProvider.NewInstanceFactory {

4
app/src/main/java/org/thoughtcrime/securesms/stickers/StickerPackPreviewRepository.java
View File

@@ -15,7 +15,7 @@ import org.thoughtcrime.securesms.database.SignalDatabase;
import org.thoughtcrime.securesms.database.StickerTable;
import org.thoughtcrime.securesms.database.model.StickerPackRecord;
import org.thoughtcrime.securesms.database.model.StickerRecord;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.dependencies.AppDependencies;
import org.signal.core.util.Hex;
import org.whispersystems.signalservice.api.SignalServiceMessageReceiver;
import org.whispersystems.signalservice.api.messages.SignalServiceStickerManifest;
@@ -33,7 +33,7 @@ public final class StickerPackPreviewRepository {
private final SignalServiceMessageReceiver receiver;
public StickerPackPreviewRepository(@NonNull Context context) {
this.receiver = ApplicationDependencies.getSignalServiceMessageReceiver();
this.receiver = AppDependencies.getSignalServiceMessageReceiver();
this.stickerDatabase = SignalDatabase.stickers();
}

6
app/src/main/java/org/thoughtcrime/securesms/stickers/StickerPackPreviewViewModel.java
View File

@@ -10,7 +10,7 @@ import androidx.lifecycle.ViewModel;
import androidx.lifecycle.ViewModelProvider;
import org.thoughtcrime.securesms.database.DatabaseObserver;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.dependencies.AppDependencies;
import org.thoughtcrime.securesms.stickers.StickerPackPreviewRepository.StickerManifestResult;
import java.util.Optional;
@@ -41,7 +41,7 @@ final class StickerPackPreviewViewModel extends ViewModel {
}
};
ApplicationDependencies.getDatabaseObserver().registerStickerPackObserver(packObserver);
AppDependencies.getDatabaseObserver().registerStickerPackObserver(packObserver);
}
LiveData<Optional<StickerManifestResult>> getStickerManifest(@NonNull String packId, @NonNull String packKey) {
@@ -63,7 +63,7 @@ final class StickerPackPreviewViewModel extends ViewModel {
@Override
protected void onCleared() {
ApplicationDependencies.getDatabaseObserver().unregisterObserver(packObserver);
AppDependencies.getDatabaseObserver().unregisterObserver(packObserver);
}
static class Factory extends ViewModelProvider.NewInstanceFactory {

4
app/src/main/java/org/thoughtcrime/securesms/stickers/StickerRemoteUriLoader.java
View File

@@ -7,7 +7,7 @@ import com.bumptech.glide.load.model.ModelLoader;
import com.bumptech.glide.load.model.ModelLoaderFactory;
import com.bumptech.glide.load.model.MultiModelLoaderFactory;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.dependencies.AppDependencies;
import org.whispersystems.signalservice.api.SignalServiceMessageReceiver;
import java.io.InputStream;
@@ -38,7 +38,7 @@ public final class StickerRemoteUriLoader implements ModelLoader<StickerRemoteUr
@Override
public @NonNull ModelLoader<StickerRemoteUri, InputStream> build(@NonNull MultiModelLoaderFactory multiFactory) {
return new StickerRemoteUriLoader(ApplicationDependencies.getSignalServiceMessageReceiver());
return new StickerRemoteUriLoader(AppDependencies.getSignalServiceMessageReceiver());
}
@Override