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

Consolidate S3 requests into one interface.

Browse Source
This commit is contained in:
Cody Henthorne
2022-05-11 19:21:55 -04:00
committed by Alex Hart
parent bb963f9210
commit ecc358ef40
10 changed files with 109 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/org/thoughtcrime/securesms/fonts/Fonts.kt
View File

@@ -33,8 +33,8 @@ object Fonts {
private val TAG = Log.tag(Fonts::class.java)
private const val VERSION_URL = "https://updates.signal.org/dynamic/story-fonts/version.txt"
private const val BASE_STATIC_BUCKET_URL = "https://updates.signal.org/static/story-fonts"
private const val VERSION_URI = "${S3.DYNAMIC_PATH}/story-fonts/version.txt"
private const val BASE_STATIC_BUCKET_URI = "${S3.STATIC_PATH}/story-fonts"
private const val MANIFEST = "manifest.json"
private val taskCache = Collections.synchronizedMap(mutableMapOf<FontDownloadKey, ListenableFutureTask<Typeface>>())
@@ -201,7 +201,7 @@ object Fonts {
*/
@WorkerThread
fun downloadLatestVersionLong(): Long {
return S3.getLong(VERSION_URL)
return S3.getLong(VERSION_URI)
}
/**
@@ -211,7 +211,7 @@ object Fonts {
fun downloadAndVerifyLatestManifest(context: Context, version: FontVersion, manifestPath: String): Boolean {
return S3.verifyAndWriteToDisk(
context,
"$BASE_STATIC_BUCKET_URL/${version.id}/$MANIFEST",
"$BASE_STATIC_BUCKET_URI/${version.id}/$MANIFEST",
File(getDirectory(context), manifestPath)
)
}
@@ -227,7 +227,7 @@ object Fonts {
val script: FontManifest.FontScript = resolveFontScriptFromScriptName(supportedScript, fontManifest) ?: return null
val path = getScriptPath(font, script) ?: return null
val networkPath = "$BASE_STATIC_BUCKET_URL/${fontVersion.id}/$path"
val networkPath = "$BASE_STATIC_BUCKET_URI/${fontVersion.id}/$path"
val localUUID = UUID.randomUUID().toString()
val localPath = "${fontVersion.path}/" + localUUID