feat: polish backup & restore

app/src/main/java/to/bitkit/ext/TagMetadata.kt

@@ -0,0 +1,24 @@
+package to.bitkit.ext
+
+import com.synonym.bitkitcore.ActivityTagsMetadata
+import to.bitkit.data.entities.TagMetadataEntity
+
+fun TagMetadataEntity.toActivityTagsMetadata() = ActivityTagsMetadata(
+    id,
+    paymentHash,
+    txId,
+    address,
+    isReceive,
+    tags,
+    createdAt.toULong(),
+)
+
+fun ActivityTagsMetadata.toTagMetadataEntity() = TagMetadataEntity(
+    id,
+    paymentHash,
+    txId,
+    address,
+    isReceive,
+    tags,
+    createdAt.toLong(),
+)

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

@@ -1,13 +1,14 @@
 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 kotlinx.serialization.Serializable
 import to.bitkit.data.AppCacheData
-import to.bitkit.data.entities.TagMetadataEntity
 import to.bitkit.data.entities.TransferEntity
 
 @Serializable
@@ -21,7 +22,7 @@ data class WalletBackupV1(
 data class MetadataBackupV1(
     val version: Int = 1,
     val createdAt: Long,
-    val tagMetadata: List<TagMetadataEntity>,
+    val tagMetadata: List<ActivityTagsMetadata>,
     val cache: AppCacheData,
 )
 
@@ -39,5 +40,6 @@ data class ActivityBackupV1(
     val version: Int = 1,
     val createdAt: Long,
     val activities: List<Activity>,
+    val activityTags: List<ActivityTags>,
     val closedChannels: List<ClosedChannelDetails>,
 )

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

@@ -2,6 +2,7 @@ package to.bitkit.repositories
 
 import com.synonym.bitkitcore.Activity
 import com.synonym.bitkitcore.ActivityFilter
+import com.synonym.bitkitcore.ActivityTags
 import com.synonym.bitkitcore.ClosedChannelDetails
 import com.synonym.bitkitcore.IcJitEntry
 import com.synonym.bitkitcore.LightningActivity
@@ -622,6 +623,17 @@ class ActivityRepo @Inject constructor(
         }
     }
 
+    /**
+     * Get all [ActivityTags] for backup
+     */
+    suspend fun getAllActivityTags(): Result<List<ActivityTags>> = withContext(bgDispatcher) {
+        return@withContext runCatching {
+            coreService.activity.getAllActivityTags()
+        }.onFailure { e ->
+            Logger.error("getAllActivityTags error", e, context = TAG)
+        }
+    }
+
     suspend fun saveTagsMetadata(
         id: String,
         paymentHash: String? = null,
@@ -652,6 +664,7 @@ class ActivityRepo @Inject constructor(
     suspend fun restoreFromBackup(backup: ActivityBackupV1): Result<Unit> = withContext(bgDispatcher) {
         return@withContext runCatching {
             coreService.activity.upsertList(backup.activities)
+            coreService.activity.upsertTags(backup.activityTags)
             coreService.activity.upsertClosedChannelList(backup.closedChannels)
         }
     }

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

@@ -7,10 +7,14 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.drop
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import kotlinx.datetime.Clock
@@ -27,6 +31,8 @@ import to.bitkit.di.IoDispatcher
 import to.bitkit.di.json
 import to.bitkit.ext.formatPlural
 import to.bitkit.ext.nowMillis
+import to.bitkit.ext.toActivityTagsMetadata
+import to.bitkit.ext.toTagMetadataEntity
 import to.bitkit.models.ActivityBackupV1
 import to.bitkit.models.BackupCategory
 import to.bitkit.models.BackupItemStatus
@@ -63,7 +69,8 @@ class BackupRepo @Inject constructor(
     private val dataListenerJobs = mutableListOf<Job>()
     private var periodicCheckJob: Job? = null
     private var isObserving = false
-    private var isRestoring = false
+    private val _isRestoring = MutableStateFlow(false)
+    val isRestoring: StateFlow<Boolean> = _isRestoring.asStateFlow()
 
     private var lastNotificationTime = 0L
 
@@ -119,7 +126,7 @@ class BackupRepo @Inject constructor(
                         old.synced == new.synced && old.required == new.required
                     }
                     .collect { status ->
-                        if (status.isRequired && !status.running && !isRestoring) {
+                        if (status.shouldBackup()) {
                             scheduleBackup(category)
                         }
                     }
@@ -137,7 +144,7 @@ class BackupRepo @Inject constructor(
                 .distinctUntilChanged()
                 .drop(1)
                 .collect {
-                    if (isRestoring) return@collect
+                    if (isRestoring.value) return@collect
                     markBackupRequired(BackupCategory.SETTINGS)
                 }
         }
@@ -148,7 +155,7 @@ class BackupRepo @Inject constructor(
                 .distinctUntilChanged()
                 .drop(1)
                 .collect {
-                    if (isRestoring) return@collect
+                    if (isRestoring.value) return@collect
                     markBackupRequired(BackupCategory.WIDGETS)
                 }
         }
@@ -160,7 +167,7 @@ class BackupRepo @Inject constructor(
                 .distinctUntilChanged()
                 .drop(1)
                 .collect {
-                    if (isRestoring) return@collect
+                    if (isRestoring.value) return@collect
                     markBackupRequired(BackupCategory.WALLET)
                 }
         }
@@ -172,7 +179,7 @@ class BackupRepo @Inject constructor(
                 .distinctUntilChanged()
                 .drop(1)
                 .collect {
-                    if (isRestoring) return@collect
+                    if (isRestoring.value) return@collect
                     markBackupRequired(BackupCategory.METADATA)
                 }
         }
@@ -185,7 +192,7 @@ class BackupRepo @Inject constructor(
                 .distinctUntilChanged()
                 .drop(1)
                 .collect {
-                    if (isRestoring) return@collect
+                    if (isRestoring.value) return@collect
                     markBackupRequired(BackupCategory.METADATA)
                 }
         }
@@ -196,7 +203,7 @@ class BackupRepo @Inject constructor(
             blocktankRepo.blocktankState
                 .drop(1)
                 .collect {
-                    if (isRestoring) return@collect
+                    if (isRestoring.value) return@collect
                     markBackupRequired(BackupCategory.BLOCKTANK)
                 }
         }
@@ -207,7 +214,7 @@ class BackupRepo @Inject constructor(
             activityRepo.activitiesChanged
                 .drop(1)
                 .collect {
-                    if (isRestoring) return@collect
+                    if (isRestoring.value) return@collect
                     markBackupRequired(BackupCategory.ACTIVITY)
                 }
         }
@@ -220,7 +227,7 @@ class BackupRepo @Inject constructor(
                     val lastSync = lightningService.status?.latestLightningWalletSyncTimestamp?.toLong()
                         ?.let { it * 1000 } // Convert seconds to millis
                         ?: return@collect
-                    if (isRestoring) return@collect
+                    if (isRestoring.value) return@collect
                     cacheStore.updateBackupStatus(BackupCategory.LIGHTNING_CONNECTIONS) {
                         it.copy(required = lastSync, synced = lastSync, running = false)
                     }
@@ -265,7 +272,7 @@ class BackupRepo @Inject constructor(
 
             // Double-check if backup is still needed
             val status = cacheStore.backupStatuses.first()[category] ?: BackupItemStatus()
-            if (status.isRequired && !isRestoring) {
+            if (status.shouldBackup()) {
                 triggerBackup(category)
             } else {
                 // Backup no longer needed, reset running flag
@@ -361,7 +368,7 @@ class BackupRepo @Inject constructor(
         }
 
         BackupCategory.METADATA -> {
-            val tagMetadata = db.tagMetadataDao().getAll()
+            val tagMetadata = db.tagMetadataDao().getAll().map { it.toActivityTagsMetadata() }
             val cacheData = cacheStore.data.first()
 
             val payload = MetadataBackupV1(
@@ -389,10 +396,12 @@ 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 payload = ActivityBackupV1(
                 createdAt = currentTimeMillis(),
                 activities = activities,
+                activityTags = activityTags,
                 closedChannels = closedChannels,
             )
 
@@ -407,16 +416,19 @@ class BackupRepo @Inject constructor(
     ): Result<Unit> = withContext(ioDispatcher) {
         Logger.debug("Full restore starting", context = TAG)
 
-        isRestoring = true
+        _isRestoring.update { true }
 
         return@withContext try {
             performRestore(BackupCategory.METADATA) { dataBytes ->
                 val parsed = json.decodeFromString<MetadataBackupV1>(String(dataBytes))
-                cacheStore.update { parsed.cache }
+                cacheStore.update {
+                    parsed.cache.copy(onchainAddress = "") // Fore onchain address rotation
+                }
                 Logger.debug("Restored caches: ${jsonLogOf(parsed.cache.copy(cachedRates = emptyList()))}", TAG)
                 onCacheRestored()
-                db.tagMetadataDao().upsert(parsed.tagMetadata)
-                Logger.debug("Restored caches and ${parsed.tagMetadata.size} tags metadata records", TAG)
+                val tagMetadata = parsed.tagMetadata.map { it.toTagMetadataEntity() }
+                db.tagMetadataDao().upsert(tagMetadata)
+                Logger.debug("Restored caches and ${tagMetadata.size} tags metadata records", TAG)
             }
 
             performRestore(BackupCategory.SETTINGS) { dataBytes ->
@@ -442,7 +454,8 @@ class BackupRepo @Inject constructor(
                 val parsed = json.decodeFromString<ActivityBackupV1>(String(dataBytes))
                 activityRepo.restoreFromBackup(parsed).onSuccess {
                     Logger.debug(
-                        "Restored ${parsed.activities.size} activities, ${parsed.closedChannels.size} closed channels",
+                        "Restored ${parsed.activities.size} activities, ${parsed.activityTags.size} activity tags, " +
+                            "${parsed.closedChannels.size} closed channels",
                         context = TAG,
                     )
                 }
@@ -454,7 +467,7 @@ class BackupRepo @Inject constructor(
             Logger.warn("Full restore error", e = e, context = TAG)
             Result.failure(e)
         } finally {
-            isRestoring = false
+            _isRestoring.update { true }
         }
     }
 
@@ -492,6 +505,8 @@ class BackupRepo @Inject constructor(
 
     private fun currentTimeMillis(): Long = nowMillis(clock)
 
+    private fun BackupItemStatus.shouldBackup() = this.isRequired && !this.running && !isRestoring.value
+
     companion object {
         private const val TAG = "BackupRepo"
 

app/src/main/java/to/bitkit/services/CoreService.kt

@@ -2,6 +2,8 @@
 
 import com.synonym.bitkitcore.Activity
 import com.synonym.bitkitcore.ActivityFilter
+import com.synonym.bitkitcore.ActivityTags
+import com.synonym.bitkitcore.ActivityTagsMetadata
 import com.synonym.bitkitcore.BtOrderState2
 import com.synonym.bitkitcore.CJitStateEnum
 import com.synonym.bitkitcore.ClosedChannelDetails
@@ -28,6 +30,7 @@
 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
@@ -44,7 +47,6 @@
 import com.synonym.bitkitcore.upsertActivities
 import com.synonym.bitkitcore.upsertActivity
 import com.synonym.bitkitcore.upsertCjitEntries
-import com.synonym.bitkitcore.upsertClosedChannel
 import com.synonym.bitkitcore.upsertClosedChannels
 import com.synonym.bitkitcore.upsertInfo
 import com.synonym.bitkitcore.upsertOrders
@@ -215,14 +217,6 @@
         upsertActivities(activities)
     }
 
-    suspend fun upsertClosedChannelItem(closedChannel: ClosedChannelDetails) = ServiceQueue.CORE.background {
-        upsertClosedChannel(closedChannel)
-    }
-
-    suspend fun upsertClosedChannelList(closedChannels: List<ClosedChannelDetails>) = ServiceQueue.CORE.background {
-        upsertClosedChannels(closedChannels)
-    }
-
     suspend fun getActivity(id: String): Activity? {
         return ServiceQueue.CORE.background {
             getActivityById(id)
@@ -285,6 +279,18 @@
         }
     }
 
+    suspend fun upsertTags(activityTags: List<ActivityTags>) = ServiceQueue.CORE.background {
+        com.synonym.bitkitcore.upsertTags(activityTags)
+    }
+
+    suspend fun getAllActivityTags(): List<ActivityTags> = ServiceQueue.CORE.background {
+        getAllTagMetadata().map { ActivityTags(it.id, tags = it.tags) }
+    }
+
+    suspend fun upsertClosedChannelList(closedChannels: List<ClosedChannelDetails>) = ServiceQueue.CORE.background {
+        upsertClosedChannels(closedChannels)
+    }
+
     suspend fun closedChannels(
         sortDirection: SortDirection,
     ): List<ClosedChannelDetails> = ServiceQueue.CORE.background {

app/src/main/java/to/bitkit/ui/MainActivity.kt

@@ -151,7 +151,8 @@ class MainActivity : FragmentActivity() {
                     }
                 )
 
-                if (appViewModel.showNewTransaction) {
+                val showNewTransaction by appViewModel.showNewTransaction.collectAsStateWithLifecycle()
+                if (showNewTransaction) {
                     NewTransactionSheet(
                         appViewModel = appViewModel,
                         currencyViewModel = currencyViewModel,
@@ -241,8 +242,6 @@ private fun OnboardingNav(
                     scope.launch {
                         runCatching {
                             appViewModel.resetIsAuthenticatedState()
-                            walletViewModel.setInitNodeLifecycleState()
-                            walletViewModel.setRestoringWalletState()
                             walletViewModel.restoreWallet(mnemonic, passphrase)
                         }.onFailure {
                             appViewModel.toast(it)
@@ -258,7 +257,6 @@ private fun OnboardingNav(
                     scope.launch {
                         runCatching {
                             appViewModel.resetIsAuthenticatedState()
-                            walletViewModel.setInitNodeLifecycleState()
                             walletViewModel.createWallet(bip39Passphrase = passphrase)
                         }.onFailure {
                             appViewModel.toast(it)