mirror of
https://github.com/signalapp/Signal-Android.git
synced 2026-04-22 18:00:02 +01:00
Rewrite the AppDependencies system.
This commit is contained in:
committed by
Cody Henthorne
parent
a0131bf39b
commit
b6a4e1f145
@@ -21,7 +21,7 @@ import com.annimon.stream.Stream;
|
||||
import org.signal.core.util.concurrent.SignalExecutors;
|
||||
import org.signal.core.util.logging.Log;
|
||||
import org.thoughtcrime.securesms.R;
|
||||
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
|
||||
import org.thoughtcrime.securesms.dependencies.AppDependencies;
|
||||
import org.thoughtcrime.securesms.mms.PartAuthority;
|
||||
import org.thoughtcrime.securesms.util.MediaUtil;
|
||||
import org.signal.core.util.SqlUtil;
|
||||
@@ -74,7 +74,7 @@ public class MediaRepository {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
|
||||
return getMediaInBucket(ApplicationDependencies.getApplication(), Media.ALL_MEDIA_BUCKET_ID);
|
||||
return getMediaInBucket(AppDependencies.getApplication(), Media.ALL_MEDIA_BUCKET_ID);
|
||||
})
|
||||
.onErrorReturn(t -> {
|
||||
Log.w(TAG, "Unable to get recent media", t);
|
||||
|
||||
@@ -16,7 +16,7 @@ import org.thoughtcrime.securesms.attachments.AttachmentId;
|
||||
import org.thoughtcrime.securesms.database.AttachmentTable;
|
||||
import org.thoughtcrime.securesms.database.AttachmentTable.TransformProperties;
|
||||
import org.thoughtcrime.securesms.database.SignalDatabase;
|
||||
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
|
||||
import org.thoughtcrime.securesms.dependencies.AppDependencies;
|
||||
import org.thoughtcrime.securesms.jobmanager.JobManager;
|
||||
import org.thoughtcrime.securesms.mms.GifSlide;
|
||||
import org.thoughtcrime.securesms.mms.ImageSlide;
|
||||
@@ -157,7 +157,7 @@ public class MediaUploadRepository {
|
||||
}
|
||||
|
||||
private void cancelUploadInternal(@NonNull Media media) {
|
||||
JobManager jobManager = ApplicationDependencies.getJobManager();
|
||||
JobManager jobManager = AppDependencies.getJobManager();
|
||||
PreUploadResult result = uploadResults.get(media);
|
||||
|
||||
if (result != null) {
|
||||
|
||||
@@ -18,7 +18,7 @@ import org.thoughtcrime.securesms.database.SignalDatabase
|
||||
import org.thoughtcrime.securesms.database.model.Mention
|
||||
import org.thoughtcrime.securesms.database.model.StoryType
|
||||
import org.thoughtcrime.securesms.database.model.databaseprotos.BodyRangeList
|
||||
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
|
||||
import org.thoughtcrime.securesms.dependencies.AppDependencies
|
||||
import org.thoughtcrime.securesms.keyvalue.SignalStore
|
||||
import org.thoughtcrime.securesms.keyvalue.StorySend
|
||||
import org.thoughtcrime.securesms.mediasend.CompositeMediaTransform
|
||||
@@ -295,7 +295,7 @@ class MediaSelectionRepository(context: Context) {
|
||||
scheduledDate: Long
|
||||
) {
|
||||
val slideDeck = SlideDeck()
|
||||
val context: Context = ApplicationDependencies.getApplication()
|
||||
val context: Context = AppDependencies.application
|
||||
|
||||
for (mediaItem in nonUploadedMedia) {
|
||||
if (MediaUtil.isVideoType(mediaItem.mimeType)) {
|
||||
|
||||
@@ -8,7 +8,7 @@ import org.signal.core.util.concurrent.SignalExecutors
|
||||
import org.thoughtcrime.securesms.contacts.paged.ContactSearchKey
|
||||
import org.thoughtcrime.securesms.database.SignalDatabase
|
||||
import org.thoughtcrime.securesms.database.model.IdentityRecord
|
||||
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
|
||||
import org.thoughtcrime.securesms.dependencies.AppDependencies
|
||||
import org.thoughtcrime.securesms.recipients.Recipient
|
||||
import java.util.concurrent.TimeUnit
|
||||
|
||||
@@ -43,8 +43,8 @@ object UntrustedRecords {
|
||||
.flatten()
|
||||
|
||||
val calculatedUntrustedWindow = System.currentTimeMillis() - changedSince
|
||||
return ApplicationDependencies
|
||||
.getProtocolStore()
|
||||
return AppDependencies
|
||||
.protocolStore
|
||||
.aci()
|
||||
.identities()
|
||||
.getIdentityRecords(recipients)
|
||||
|
||||
@@ -20,7 +20,7 @@ import io.reactivex.rxjava3.subjects.Subject
|
||||
import org.signal.core.util.getParcelableCompat
|
||||
import org.signal.core.util.logging.Log
|
||||
import org.thoughtcrime.securesms.contacts.paged.ContactSearchKey
|
||||
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
|
||||
import org.thoughtcrime.securesms.dependencies.AppDependencies
|
||||
import org.thoughtcrime.securesms.fonts.TextFont
|
||||
import org.thoughtcrime.securesms.fonts.TextToScript
|
||||
import org.thoughtcrime.securesms.fonts.TypefaceCache
|
||||
@@ -49,7 +49,7 @@ class TextStoryPostCreationViewModel(private val repository: TextStoryPostSendRe
|
||||
disposables += Observable.combineLatest(textFontSubject, scriptGuess, ::Pair)
|
||||
.observeOn(Schedulers.io())
|
||||
.distinctUntilChanged()
|
||||
.switchMapSingle { (textFont, script) -> TypefaceCache.get(ApplicationDependencies.getApplication(), textFont, script) }
|
||||
.switchMapSingle { (textFont, script) -> TypefaceCache.get(AppDependencies.application, textFont, script) }
|
||||
.subscribeOn(Schedulers.io())
|
||||
.subscribe {
|
||||
internalTypeface.onNext(it)
|
||||
|
||||
Reference in New Issue
Block a user