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

Improve conversation list cold start performance.

Browse Source
This commit is contained in:
Clark
2023-02-28 11:39:30 -05:00
committed by Greyson Parrelli
parent 10e8c6d795
commit f3693c966a
7 changed files with 92 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/src/main/java/org/thoughtcrime/securesms/emoji/EmojiFiles.kt
View File

@@ -4,6 +4,7 @@ import android.content.Context
import android.net.Uri
import com.fasterxml.jackson.annotation.JsonIgnore
import com.fasterxml.jackson.annotation.JsonProperty
import com.fasterxml.jackson.databind.JsonNode
import com.fasterxml.jackson.databind.ObjectMapper
import com.fasterxml.jackson.module.kotlin.readValue
import com.fasterxml.jackson.module.kotlin.registerKotlinModule
@@ -142,7 +143,6 @@ object EmojiFiles {
private fun getDirectory(context: Context): File = File(context.getEmojiDirectory(), this.uuid.toString()).apply { mkdir() }
companion object {
private val objectMapper = ObjectMapper().registerKotlinModule()
@JvmStatic
@@ -150,7 +150,12 @@ object EmojiFiles {
fun readVersion(context: Context, skipValidation: Boolean = false): Version? {
val version = try {
getInputStream(context, context.getVersionFile()).use {
objectMapper.readValue(it, Version::class.java)
val tree: JsonNode = objectMapper.readTree(it)
Version(
version = tree["version"].asInt(),
uuid = objectMapper.convertValue(tree["uuid"], UUID::class.java),
density = tree["density"].asText()
)
}
} catch (e: Exception) {
Log.w(TAG, "Could not read current emoji version from disk.", e)
@@ -222,8 +227,15 @@ object EmojiFiles {
@JvmStatic
fun read(context: Context, version: Version): NameCollection {
try {
getInputStream(context, context.getNameFile(version.uuid)).use {
return objectMapper.readValue(it)
getInputStream(context, context.getNameFile(version.uuid)).use { inputStream ->
val tree: JsonNode = objectMapper.readTree(inputStream)
val elements = tree["names"].elements().asSequence().map {
Name(
name = it["name"].asText(),
uuid = objectMapper.convertValue(it["uuid"], UUID::class.java)
)
}.toList()
return NameCollection(objectMapper.convertValue(tree["versionUuid"], UUID::class.java), elements)
}
} catch (e: Exception) {
return NameCollection(version.uuid, listOf())