diff --git a/server-android/src/main/java/com/tangem/server_android/data/LocalStorage.kt b/server-android/src/main/java/com/tangem/server_android/data/LocalStorage.kt index 92d09b438a..5521ab0217 100644 --- a/server-android/src/main/java/com/tangem/server_android/data/LocalStorage.kt +++ b/server-android/src/main/java/com/tangem/server_android/data/LocalStorage.kt @@ -158,13 +158,13 @@ class LocalStorage @SuppressLint("ResourceType") private fun putResourceArtworkToCatalog(resourceId: Int, forceSave: Boolean) { - context.resources.openRawResource(R.drawable.card_default).use { putArtworkToCatalog(context.resources.getResourceEntryName(resourceId), true, it.readBytes(), null, forceSave) } + context.resources.openRawResource(resourceId).use { + putArtworkToCatalog(context.resources.getResourceEntryName(resourceId), true, it.readBytes(), null, forceSave) + } } private fun putArtworkToCatalog(artworkId: String, isResource: Boolean, data: ByteArray, updateDate: Date?, forceSave: Boolean = true) { - val artworkInfo = ArtworkInfo( - isResource, Util.bytesToHex(Util.calculateSHA256(data)), updateDate - ) + val artworkInfo = ArtworkInfo(isResource, calculateImageHash(data), updateDate) artworks[artworkId.toLowerCase()] = artworkInfo if (forceSave) { val sArtworks = Gson().toJson(artworks) @@ -172,6 +172,12 @@ class LocalStorage } } + private fun calculateImageHash(data: ByteArray): String { + val encodedData = Util.bytesToHex(data).toUpperCase(Locale.US).toByteArray() + val hash = Util.calculateSHA256(encodedData) + return Util.bytesToHex(hash).toUpperCase(Locale.US) + } + private fun getArtworkBitmap(artworkId: String): Bitmap? { if (artworkId.isBlank()) return null val info = artworks[artworkId.toLowerCase()] ?: return null diff --git a/server-android/src/main/res/drawable/card_tg046.png b/server-android/src/main/res/drawable/card_tg046.png index fc7846de6c..fc89853dbd 100644 Binary files a/server-android/src/main/res/drawable/card_tg046.png and b/server-android/src/main/res/drawable/card_tg046.png differ