Skip to content

Commit 3fb3b06

Browse files
committed
refactor: use core tag metadata model
1 parent 4aaa73b commit 3fb3b06

File tree

3 files changed

+32
-5
lines changed

3 files changed

+32
-5
lines changed
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
package to.bitkit.ext
2+
3+
import com.synonym.bitkitcore.ActivityTagsMetadata
4+
import to.bitkit.data.entities.TagMetadataEntity
5+
6+
fun TagMetadataEntity.toActivityTagsMetadata() = ActivityTagsMetadata(
7+
id,
8+
paymentHash,
9+
txId,
10+
address,
11+
isReceive,
12+
tags,
13+
createdAt.toULong(),
14+
)
15+
16+
fun ActivityTagsMetadata.TagMetadataEntity() = TagMetadataEntity(
17+
id,
18+
paymentHash,
19+
txId,
20+
address,
21+
isReceive,
22+
tags,
23+
createdAt.toLong(),
24+
)

app/src/main/java/to/bitkit/models/BackupPayloads.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package to.bitkit.models
22

33
import com.synonym.bitkitcore.Activity
4+
import com.synonym.bitkitcore.ActivityTagsMetadata
45
import com.synonym.bitkitcore.ClosedChannelDetails
56
import com.synonym.bitkitcore.IBtInfo
67
import com.synonym.bitkitcore.IBtOrder
78
import com.synonym.bitkitcore.IcJitEntry
89
import kotlinx.serialization.Serializable
910
import to.bitkit.data.AppCacheData
10-
import to.bitkit.data.entities.TagMetadataEntity
1111
import to.bitkit.data.entities.TransferEntity
1212

1313
@Serializable
@@ -21,7 +21,7 @@ data class WalletBackupV1(
2121
data class MetadataBackupV1(
2222
val version: Int = 1,
2323
val createdAt: Long,
24-
val tagMetadata: List<TagMetadataEntity>,
24+
val tagMetadata: List<ActivityTagsMetadata>,
2525
val cache: AppCacheData,
2626
)
2727

app/src/main/java/to/bitkit/repositories/BackupRepo.kt

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ import to.bitkit.di.IoDispatcher
3131
import to.bitkit.di.json
3232
import to.bitkit.ext.formatPlural
3333
import to.bitkit.ext.nowMillis
34+
import to.bitkit.ext.toActivityTagsMetadata
35+
import to.bitkit.ext.TagMetadataEntity
3436
import to.bitkit.models.ActivityBackupV1
3537
import to.bitkit.models.BackupCategory
3638
import to.bitkit.models.BackupItemStatus
@@ -366,7 +368,7 @@ class BackupRepo @Inject constructor(
366368
}
367369

368370
BackupCategory.METADATA -> {
369-
val tagMetadata = db.tagMetadataDao().getAll()
371+
val tagMetadata = db.tagMetadataDao().getAll().map { it.toActivityTagsMetadata() }
370372
val cacheData = cacheStore.data.first()
371373

372374
val payload = MetadataBackupV1(
@@ -422,8 +424,9 @@ class BackupRepo @Inject constructor(
422424
}
423425
Logger.debug("Restored caches: ${jsonLogOf(parsed.cache.copy(cachedRates = emptyList()))}", TAG)
424426
onCacheRestored()
425-
db.tagMetadataDao().upsert(parsed.tagMetadata)
426-
Logger.debug("Restored caches and ${parsed.tagMetadata.size} tags metadata records", TAG)
427+
val tagMetadata = parsed.tagMetadata.map { it.TagMetadataEntity() }
428+
db.tagMetadataDao().upsert(tagMetadata)
429+
Logger.debug("Restored caches and ${tagMetadata.size} tags metadata records", TAG)
427430
}
428431

429432
performRestore(BackupCategory.SETTINGS) { dataBytes ->

0 commit comments

Comments
 (0)