Skip to content

Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.

Update mobile app native logo parse to support built-in icons (#2159)

Leendert de Borstbe61a1530ea0
diff --git a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/queries/ItemQueries.kt b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/queries/ItemQueries.kt
index a0f648da0..295cfb3fc 100644
--- a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/queries/ItemQueries.kt
+++ b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/queries/ItemQueries.kt
@@ -17,6 +17,8 @@ object ItemQueries {
i.ItemType,
i.FolderId,
l.FileData as Logo,
+ l.Kind as LogoKind,
+ l.Source as LogoSource,
CASE WHEN EXISTS (
SELECT 1 FROM Passkeys pk WHERE pk.ItemId = i.Id AND pk.ManifestId = i.ManifestId AND pk.IsDeleted = 0
) THEN 1 ELSE 0 END as HasPasskey,
diff --git a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/repositories/ItemRepository.kt b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/repositories/ItemRepository.kt
index a9b735ab9..22b4622c9 100644
--- a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/repositories/ItemRepository.kt
+++ b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/repositories/ItemRepository.kt
@@ -3,6 +3,7 @@ package net.aliasvault.app.vaultstore.repositories
import android.util.Log
import net.aliasvault.app.utils.DateHelpers
import net.aliasvault.app.vaultstore.VaultDatabase
+import net.aliasvault.app.vaultstore.models.AppIcons
import net.aliasvault.app.vaultstore.models.FieldKey
import net.aliasvault.app.vaultstore.models.FieldType
import net.aliasvault.app.vaultstore.models.Item
@@ -21,6 +22,7 @@ import java.util.UUID
class ItemRepository(database: VaultDatabase) : BaseRepository(database) {
companion object {
private const val TAG = "ItemRepository"
+ private const val LOGO_KIND_BUILTIN = "builtin"
private val MIN_DATE: Date = Calendar.getInstance(TimeZone.getTimeZone("UTC")).apply {
set(Calendar.YEAR, 1)
@@ -35,6 +37,16 @@ class ItemRepository(database: VaultDatabase) : BaseRepository(database) {
// MARK: - Read Operations
+ /**
+ * The bytes an item's logo is drawn from. A built-in logo carries none: it is drawn from the shared catalog, keyed by its Source.
+ */
+ private fun resolveLogo(row: Map<String, Any?>): ByteArray? {
+ if (row["LogoKind"] as? String == LOGO_KIND_BUILTIN) {
+ return (row["LogoSource"] as? String)?.let { AppIcons.svgFor(it) }?.toByteArray(Charsets.UTF_8)
+ }
+ return row["Logo"] as? ByteArray
+ }
+
/**
* Build folder paths for all folders, keyed by the folder's scoped key (manifest + id). The tree is walked
* one manifest at a time: a parent link only ever resolves inside its own namespace.
@@ -101,7 +113,7 @@ class ItemRepository(database: VaultDatabase) : BaseRepository(database) {
val name = row["Name"] as? String
val itemType = row["ItemType"] as? String ?: continue
val folderId = row["FolderId"] as? String
- val logo = row["Logo"] as? ByteArray
+ val logo = resolveLogo(row)
val hasPasskey = (row["HasPasskey"] as? Long) == 1L
val hasAttachment = (row["HasAttachment"] as? Long) == 1L
val hasTotp = (row["HasTotp"] as? Long) == 1L
diff --git a/apps/mobile-app/ios/VaultStoreKit/Database/Mappers/ItemMapper.swift b/apps/mobile-app/ios/VaultStoreKit/Database/Mappers/ItemMapper.swift
index 55d2ae5aa..bfbcb8714 100644
--- a/apps/mobile-app/ios/VaultStoreKit/Database/Mappers/ItemMapper.swift
+++ b/apps/mobile-app/ios/VaultStoreKit/Database/Mappers/ItemMapper.swift
@@ -34,8 +34,11 @@ public struct ItemRow {
self.itemType = itemType
self.folderId = row["FolderId"] as? String
- // BLOB columns arrive as base64 text
- if let logoBase64 = row["Logo"] as? String {
+ // A built-in logo carries no bytes: it is drawn from the shared catalog, keyed by its Source.
+ if row["LogoKind"] as? String == "builtin", let source = row["LogoSource"] as? String {
+ self.logo = AppIcons.svg(for: source)?.data(using: .utf8)
+ } else if let logoBase64 = row["Logo"] as? String {
+ // BLOB columns arrive as base64 text
self.logo = Data(base64Encoded: logoBase64, options: .ignoreUnknownCharacters)
} else {
self.logo = nil
diff --git a/apps/mobile-app/ios/VaultStoreKit/Database/Queries/ItemQueries.swift b/apps/mobile-app/ios/VaultStoreKit/Database/Queries/ItemQueries.swift
index 37924622d..2ca68d41f 100644
--- a/apps/mobile-app/ios/VaultStoreKit/Database/Queries/ItemQueries.swift
+++ b/apps/mobile-app/ios/VaultStoreKit/Database/Queries/ItemQueries.swift
@@ -12,6 +12,8 @@ public struct ItemQueries {
i.ItemType,
i.FolderId,
l.FileData as Logo,
+ l.Kind as LogoKind,
+ l.Source as LogoSource,
CASE WHEN EXISTS (SELECT 1 FROM Passkeys pk WHERE pk.ItemId = i.Id AND pk.ManifestId = i.ManifestId AND pk.IsDeleted = 0) THEN 1 ELSE 0 END as HasPasskey,
CASE WHEN EXISTS (SELECT 1 FROM Attachments att WHERE att.ItemId = i.Id AND att.ManifestId = i.ManifestId AND att.IsDeleted = 0) THEN 1 ELSE 0 END as HasAttachment,
CASE WHEN EXISTS (SELECT 1 FROM TotpCodes tc WHERE tc.ItemId = i.Id AND tc.ManifestId = i.ManifestId AND tc.IsDeleted = 0) THEN 1 ELSE 0 END as HasTotp,