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

4
app/src/main/java/org/thoughtcrime/securesms/glide/BadgeLoader.java
View File

@@ -10,7 +10,7 @@ import com.bumptech.glide.load.model.ModelLoaderFactory;
import com.bumptech.glide.load.model.MultiModelLoaderFactory;
import org.thoughtcrime.securesms.badges.models.Badge;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.dependencies.AppDependencies;
import java.io.InputStream;
@@ -38,7 +38,7 @@ public class BadgeLoader implements ModelLoader<Badge, InputStream> {
}
public static Factory createFactory() {
return new Factory(ApplicationDependencies.getSignalOkHttpClient());
return new Factory(AppDependencies.getSignalOkHttpClient());
}
public static class Factory implements ModelLoaderFactory<Badge, InputStream> {

6
app/src/main/java/org/thoughtcrime/securesms/glide/GiftBadgeModel.kt
View File

@@ -13,7 +13,7 @@ import okhttp3.OkHttpClient
import org.signal.libsignal.zkgroup.receipts.ReceiptCredentialPresentation
import org.thoughtcrime.securesms.components.settings.app.subscription.getBadge
import org.thoughtcrime.securesms.database.model.databaseprotos.GiftBadge
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
import org.thoughtcrime.securesms.dependencies.AppDependencies
import java.io.InputStream
import java.security.MessageDigest
import java.util.Locale
@@ -46,7 +46,7 @@ data class GiftBadgeModel(val giftBadge: GiftBadge) : Key {
override fun loadData(priority: Priority, callback: DataFetcher.DataCallback<in InputStream>) {
try {
val receiptCredentialPresentation = ReceiptCredentialPresentation(giftBadge.giftBadge.redemptionToken.toByteArray())
val giftBadgeResponse = ApplicationDependencies.getDonationsService().getDonationsConfiguration(Locale.getDefault())
val giftBadgeResponse = AppDependencies.donationsService.getDonationsConfiguration(Locale.getDefault())
if (giftBadgeResponse.result.isPresent) {
val badge = giftBadgeResponse.result.get().getBadge(receiptCredentialPresentation.receiptLevel.toInt())
okHttpStreamFetcher = OkHttpStreamFetcher(client, GlideUrl(badge.imageUrl.toString()))
@@ -91,7 +91,7 @@ data class GiftBadgeModel(val giftBadge: GiftBadge) : Key {
companion object {
@JvmStatic
fun createFactory(): Factory {
return Factory(ApplicationDependencies.getSignalOkHttpClient())
return Factory(AppDependencies.signalOkHttpClient)
}
}
}