feat: integrate bitkit-core 0.1.27 minimally

ovitrif · ovitrif · commit 4ecd67b5b699 · 2025-11-14T18:49:48.000+01:00
diff --git a/app/src/main/java/to/bitkit/ext/TagMetadata.kt b/app/src/main/java/to/bitkit/ext/TagMetadata.kt
@@ -1,24 +1,31 @@
 package to.bitkit.ext
 
-import com.synonym.bitkitcore.ActivityTagsMetadata
+import com.synonym.bitkitcore.PreActivityMetadata
 import to.bitkit.data.entities.TagMetadataEntity
 
-fun TagMetadataEntity.toActivityTagsMetadata() = ActivityTagsMetadata(
-    id,
-    paymentHash,
-    txId,
-    address,
-    isReceive,
-    tags,
-    createdAt.toULong(),
+// TODO use PreActivityMetadata
+fun TagMetadataEntity.toActivityTagsMetadata() = PreActivityMetadata(
+    paymentId = id,
+    createdAt = createdAt.toULong(),
+    tags = tags,
+    paymentHash = paymentHash,
+    txId = txId,
+    address = address,
+    isReceive = isReceive,
+    feeRate = 0u,
+    isTransfer = false,
+    channelId = "",
 )
 
-fun ActivityTagsMetadata.toTagMetadataEntity() = TagMetadataEntity(
-    id,
-    paymentHash,
-    txId,
-    address,
-    isReceive,
-    tags,
-    createdAt.toLong(),
+fun PreActivityMetadata.toTagMetadataEntity() = TagMetadataEntity(
+    id = paymentId,
+    createdAt = createdAt.toLong(),
+    tags = tags,
+    paymentHash = paymentHash,
+    txId = txId,
+    address = address.orEmpty(),
+    isReceive = isReceive,
+    // feeRate = 0u,
+    // isTransfer = false,
+    // channelId = "",
 )
diff --git a/app/src/main/java/to/bitkit/models/BackupPayloads.kt b/app/src/main/java/to/bitkit/models/BackupPayloads.kt
@@ -2,11 +2,11 @@ package to.bitkit.models
 
 import com.synonym.bitkitcore.Activity
 import com.synonym.bitkitcore.ActivityTags
-import com.synonym.bitkitcore.ActivityTagsMetadata
 import com.synonym.bitkitcore.ClosedChannelDetails
 import com.synonym.bitkitcore.IBtInfo
 import com.synonym.bitkitcore.IBtOrder
 import com.synonym.bitkitcore.IcJitEntry
+import com.synonym.bitkitcore.PreActivityMetadata
 import kotlinx.serialization.Serializable
 import to.bitkit.data.AppCacheData
 import to.bitkit.data.entities.TransferEntity
@@ -22,7 +22,7 @@ data class WalletBackupV1(
 data class MetadataBackupV1(
     val version: Int = 1,
     val createdAt: Long,
-    val tagMetadata: List<ActivityTagsMetadata>,
+    val tagMetadata: List<PreActivityMetadata>,
     val cache: AppCacheData,
 )
 
diff --git a/app/src/main/java/to/bitkit/repositories/ActivityRepo.kt b/app/src/main/java/to/bitkit/repositories/ActivityRepo.kt
@@ -9,6 +9,7 @@ import com.synonym.bitkitcore.IcJitEntry
 import com.synonym.bitkitcore.LightningActivity
 import com.synonym.bitkitcore.PaymentState
 import com.synonym.bitkitcore.PaymentType
+import com.synonym.bitkitcore.PreActivityMetadata
 import com.synonym.bitkitcore.SortDirection
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.TimeoutCancellationException
@@ -628,14 +629,36 @@ class ActivityRepo @Inject constructor(
     /**
      * Get all [ActivityTags] for backup
      */
-    suspend fun getAllActivityTags(): Result<List<ActivityTags>> = withContext(bgDispatcher) {
+    suspend fun getAllActivitiesTags(): Result<List<ActivityTags>> = withContext(bgDispatcher) {
         return@withContext runCatching {
-            coreService.activity.getAllActivityTags()
+            coreService.activity.getAllActivitiesTags()
         }.onFailure { e ->
             Logger.error("getAllActivityTags error", e, context = TAG)
         }
     }
 
+    /**
+     * Get all [PreActivityMetadata] for backup
+     */
+    suspend fun getAllPreActivityMetadata(): Result<List<PreActivityMetadata>> = withContext(bgDispatcher) {
+        return@withContext runCatching {
+            coreService.activity.getAllPreActivityMetadata()
+        }.onFailure { e ->
+            Logger.error("getAllPreActivityMetadata error", e, context = TAG)
+        }
+    }
+
+    /**
+     * Upsert all [PreActivityMetadata]
+     */
+    suspend fun upsertPreActivityMetadata(list: List<PreActivityMetadata>): Result<Unit> = withContext(bgDispatcher) {
+        return@withContext runCatching {
+            coreService.activity.upsertPreActivityMetadata(list)
+        }.onFailure { e ->
+            Logger.error("upsertPreActivityMetadata error", e, context = TAG)
+        }
+    }
+
     suspend fun saveTagsMetadata(
         id: String,
         paymentHash: String? = null,
@@ -663,12 +686,19 @@ class ActivityRepo @Inject constructor(
         }
     }
 
-    suspend fun restoreFromBackup(backup: ActivityBackupV1): Result<Unit> = withContext(bgDispatcher) {
+    suspend fun restoreFromBackup(payload: ActivityBackupV1): Result<Unit> = withContext(bgDispatcher) {
         return@withContext runCatching {
-            coreService.activity.upsertList(backup.activities)
-            coreService.activity.upsertTags(backup.activityTags)
-            coreService.activity.upsertClosedChannelList(backup.closedChannels)
+            coreService.activity.upsertList(payload.activities)
+            coreService.activity.upsertTags(payload.activityTags)
+            coreService.activity.upsertClosedChannelList(payload.closedChannels)
+        }.onSuccess {
+            Logger.debug(
+                "Restored ${payload.activities.size} activities, ${payload.activityTags.size} activity tags, " +
+                    "${payload.closedChannels.size} closed channels",
+                context = TAG,
+            )
         }
+
     }
 
     // MARK: - Development/Testing Methods
diff --git a/app/src/main/java/to/bitkit/repositories/BackupRepo.kt b/app/src/main/java/to/bitkit/repositories/BackupRepo.kt
@@ -6,6 +6,7 @@ import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.currentCoroutineContext
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
@@ -15,6 +16,7 @@ import kotlinx.coroutines.flow.drop
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import kotlinx.datetime.Clock
@@ -190,6 +192,7 @@ class BackupRepo @Inject constructor(
         dataListenerJobs.add(tagMetadataJob)
 
         // METADATA - Observe entire CacheStore excluding backup statuses
+        // TODO use PreActivityMetadata
         val cacheMetadataJob = scope.launch {
             cacheStore.data
                 .map { it.copy(backupStatuses = mapOf()) }
@@ -244,7 +247,7 @@ class BackupRepo @Inject constructor(
 
     private fun startPeriodicBackupFailureCheck() {
         periodicCheckJob = scope.launch {
-            while (true) {
+            while (currentCoroutineContext().isActive) {
                 delay(BACKUP_CHECK_INTERVAL)
                 checkForFailedBackups()
             }
@@ -374,6 +377,8 @@ class BackupRepo @Inject constructor(
         BackupCategory.METADATA -> {
             val tagMetadata = db.tagMetadataDao().getAll().map { it.toActivityTagsMetadata() }
             val cacheData = cacheStore.data.first().copy(onchainAddress = "") // Force onchain address rotation
+            // TODO use PreActivityMetadata
+            // val preActivityMetadata = activityRepo.getAllPreActivityMetadata().getOrDefault(emptyList())
 
             val payload = MetadataBackupV1(
                 createdAt = currentTimeMillis(),
@@ -400,7 +405,7 @@ class BackupRepo @Inject constructor(
         BackupCategory.ACTIVITY -> {
             val activities = activityRepo.getActivities().getOrDefault(emptyList())
             val closedChannels = activityRepo.getClosedChannels().getOrDefault(emptyList())
-            val activityTags = activityRepo.getAllActivityTags().getOrDefault(emptyList())
+            val activityTags = activityRepo.getAllActivitiesTags().getOrDefault(emptyList())
 
             val payload = ActivityBackupV1(
                 createdAt = currentTimeMillis(),
@@ -430,9 +435,11 @@ class BackupRepo @Inject constructor(
                 }
                 Logger.debug("Restored caches: ${jsonLogOf(parsed.cache.copy(cachedRates = emptyList()))}", TAG)
                 onCacheRestored()
+                // TODO use PreActivityMetadata
+                // activityRepo.upsertPreActivityMetadata(parsed.tagMetadata)
                 val tagMetadata = parsed.tagMetadata.map { it.toTagMetadataEntity() }
                 db.tagMetadataDao().upsert(tagMetadata)
-                Logger.debug("Restored caches and ${tagMetadata.size} tags metadata records", TAG)
+                Logger.debug("Restored caches, ${tagMetadata.size} pre-activity metadata", TAG)
             }
 
             performRestore(BackupCategory.SETTINGS) { dataBytes ->
@@ -456,13 +463,7 @@ class BackupRepo @Inject constructor(
             }
             performRestore(BackupCategory.ACTIVITY) { dataBytes ->
                 val parsed = json.decodeFromString<ActivityBackupV1>(String(dataBytes))
-                activityRepo.restoreFromBackup(parsed).onSuccess {
-                    Logger.debug(
-                        "Restored ${parsed.activities.size} activities, ${parsed.activityTags.size} activity tags, " +
-                            "${parsed.closedChannels.size} closed channels",
-                        context = TAG,
-                    )
-                }
+                activityRepo.restoreFromBackup(parsed)
             }
 
             Logger.info("Full restore success", context = TAG)
diff --git a/app/src/main/java/to/bitkit/services/CoreService.kt b/app/src/main/java/to/bitkit/services/CoreService.kt
@@ -19,6 +19,7 @@ import com.synonym.bitkitcore.LightningActivity
 import com.synonym.bitkitcore.OnchainActivity
 import com.synonym.bitkitcore.PaymentState
 import com.synonym.bitkitcore.PaymentType
+import com.synonym.bitkitcore.PreActivityMetadata
 import com.synonym.bitkitcore.SortDirection
 import com.synonym.bitkitcore.WordCount
 import com.synonym.bitkitcore.addTags
@@ -29,7 +30,6 @@ import com.synonym.bitkitcore.estimateOrderFeeFull
 import com.synonym.bitkitcore.getActivities
 import com.synonym.bitkitcore.getActivityById
 import com.synonym.bitkitcore.getAllClosedChannels
-import com.synonym.bitkitcore.getAllTagMetadata
 import com.synonym.bitkitcore.getAllUniqueTags
 import com.synonym.bitkitcore.getCjitEntries
 import com.synonym.bitkitcore.getInfo
@@ -190,7 +190,7 @@ class CoreService @Inject constructor(
 private const val CHUNK_SIZE = 50
 
 class ActivityService(
-    private val coreService: CoreService,
+    @Suppress("unused") private val coreService: CoreService, // used to ensure CoreService inits first
     private val cacheStore: CacheStore,
 ) {
     suspend fun removeAll() {
@@ -296,8 +296,16 @@ class ActivityService(
         com.synonym.bitkitcore.upsertTags(activityTags)
     }
 
-    suspend fun getAllActivityTags(): List<ActivityTags> = ServiceQueue.CORE.background {
-        getAllTagMetadata().map { ActivityTags(it.id, tags = it.tags) }
+    suspend fun getAllActivitiesTags(): List<ActivityTags> = ServiceQueue.CORE.background {
+        com.synonym.bitkitcore.getAllActivitiesTags()
+    }
+
+    suspend fun getAllPreActivityMetadata(): List<PreActivityMetadata> = ServiceQueue.CORE.background {
+        com.synonym.bitkitcore.getAllPreActivityMetadata()
+    }
+
+    suspend fun upsertPreActivityMetadata(list: List<PreActivityMetadata>) = ServiceQueue.CORE.background {
+        com.synonym.bitkitcore.upsertPreActivityMetadata(list)
     }
 
     suspend fun upsertClosedChannelList(closedChannels: List<ClosedChannelDetails>) = ServiceQueue.CORE.background {
@@ -595,7 +603,7 @@ class ActivityService(
 // region Blocktank
 
 class BlocktankService(
-    private val coreService: CoreService,
+    @Suppress("unused") private val coreService: CoreService, // used to ensure CoreService inits first
     private val lightningService: LightningService,
 ) {
     suspend fun info(refresh: Boolean = true): IBtInfo? {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -44,7 +44,7 @@ activity-compose = { module = "androidx.activity:activity-compose", version.ref
 appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" }
 barcode-scanning = { module = "com.google.mlkit:barcode-scanning", version.ref = "barcodeScanning" }
 biometric = { module = "androidx.biometric:biometric", version.ref = "biometric" }
-bitkitcore = { module = "com.synonym:bitkit-core-android", version = "0.1.24" }
+bitkitcore = { module = "com.synonym:bitkit-core-android", version = "0.1.27" }
 bouncycastle-provider-jdk = { module = "org.bouncycastle:bcprov-jdk18on", version.ref = "bouncyCastle" }
 camera-camera2 = { module = "androidx.camera:camera-camera2", version.ref = "camera" }
 camera-lifecycle = { module = "androidx.camera:camera-lifecycle", version.ref = "camera" }
