feat: polish backup & restore

app/src/main/java/to/bitkit/env/Env.kt

@@ -116,10 +116,10 @@ internal object Env {
         Logger.info("App storage path: $path")
     }
 
-    val logDir: String
+    val logDir: File
         get() {
             require(::appStoragePath.isInitialized)
-            return File(appStoragePath).resolve("logs").ensureDir().path
+            return File(appStoragePath).resolve("logs").ensureDir()
         }
 
     fun ldkStoragePath(walletIndex: Int) = storagePathOf(walletIndex, network.name.lowercase(), "ldk")

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

@@ -31,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
@@ -124,7 +126,7 @@ class BackupRepo @Inject constructor(
                         old.synced == new.synced && old.required == new.required
                     }
                     .collect { status ->
-                        if (status.isRequired && !status.running && !isRestoring.value) {
+                        if (status.shouldBackup()) {
                             scheduleBackup(category)
                         }
                     }
@@ -270,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.value) {
+            if (status.shouldBackup()) {
                 triggerBackup(category)
             } else {
                 // Backup no longer needed, reset running flag
@@ -366,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().copy(onchainAddress = "") // Force onchain address rotation
 
             val payload = MetadataBackupV1(
@@ -394,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,
             )
 
@@ -417,11 +421,14 @@ class BackupRepo @Inject constructor(
         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 ->
@@ -447,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,
                     )
                 }
@@ -497,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/repositories/LogsRepo.kt

@@ -58,8 +58,7 @@ class LogsRepo @Inject constructor(
     /** Lists log files sorted by newest first */
     suspend fun getLogs(): Result<List<LogFile>> = withContext(bgDispatcher) {
         try {
-            val logDir = runCatching { File(Env.logDir) }.getOrElse { return@withContext Result.failure(it) }
-            if (!logDir.exists()) return@withContext Result.failure(Exception("Logs dir not found"))
+            val logDir = Env.logDir
 
             val logFiles = logDir
                 .listFiles { file -> file.extension == "log" }

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

@@ -18,7 +18,6 @@ import org.lightningdevkit.ldknode.Event
 import to.bitkit.data.AppDb
 import to.bitkit.data.CacheStore
 import to.bitkit.data.SettingsStore
-import to.bitkit.data.backup.VssStoreIdProvider
 import to.bitkit.data.entities.TagMetadataEntity
 import to.bitkit.data.keychain.Keychain
 import to.bitkit.di.BgDispatcher
@@ -51,7 +50,6 @@ class WalletRepo @Inject constructor(
     private val lightningRepo: LightningRepo,
     private val cacheStore: CacheStore,
     private val deriveBalanceStateUseCase: DeriveBalanceStateUseCase,
-    private val vssStoreIdProvider: VssStoreIdProvider,
     private val backupRepo: BackupRepo,
 ) {
     private val repoScope = CoroutineScope(bgDispatcher + SupervisorJob())
@@ -249,7 +247,8 @@ class WalletRepo @Inject constructor(
             settingsStore.reset()
             cacheStore.reset()
             // TODO CLEAN ACTIVITY'S AND UPDATE STATE. CHECK ActivityListViewModel.removeAllActivities
-            coreService.activity.removeAll()
+            coreService.wipeData()
+            Logger.resetSession()
             setWalletExistsState()
 
             return@withContext lightningRepo.wipeStorage(walletIndex = walletIndex)

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

@@ -2,6 +2,7 @@ package to.bitkit.services
 
 import com.synonym.bitkitcore.Activity
 import com.synonym.bitkitcore.ActivityFilter
+import com.synonym.bitkitcore.ActivityTags
 import com.synonym.bitkitcore.BtOrderState2
 import com.synonym.bitkitcore.CJitStateEnum
 import com.synonym.bitkitcore.ClosedChannelDetails
@@ -28,6 +29,7 @@ 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
@@ -44,10 +46,10 @@ import com.synonym.bitkitcore.updateBlocktankUrl
 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
+import com.synonym.bitkitcore.wipeAllDatabases
 import io.ktor.client.HttpClient
 import io.ktor.client.request.get
 import io.ktor.http.HttpStatusCode
@@ -167,6 +169,19 @@ class CoreService @Inject constructor(
 
         return Pair(geoBlocked, shouldBlockLightningReceive)
     }
+
+    suspend fun wipeData(): Result<Unit> = ServiceQueue.CORE.background {
+        runCatching {
+            val result = wipeAllDatabases()
+            Logger.info("Core DB wipe: $result", context = TAG)
+        }.onFailure { e ->
+            Logger.error("Core DB wipe error", e, context = TAG)
+        }
+    }
+
+    companion object {
+        private const val TAG = "CoreService"
+    }
 }
 
 // endregion
@@ -215,14 +230,6 @@ class ActivityService(
         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 +292,18 @@ class ActivityService(
         }
     }
 
+    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)

app/src/main/java/to/bitkit/ui/components/MnemonicWordsGrid.kt

@@ -23,7 +23,6 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import to.bitkit.ui.theme.AppThemeSurface
 import to.bitkit.ui.theme.Colors
-import to.bitkit.utils.bip39Words
 
 @Composable
 fun MnemonicWordsGrid(
@@ -98,12 +97,14 @@ private fun WordItem(
     }
 }
 
+private val previewWords = List(8) { "word${it + 1}" }
+
 @Preview
 @Composable
 private fun Preview() {
     AppThemeSurface {
         MnemonicWordsGrid(
-            actualWords = bip39Words.take(n = 12),
+            actualWords = previewWords,
             showMnemonic = true,
         )
     }
@@ -114,7 +115,7 @@ private fun Preview() {
 private fun PreviewHidden() {
     AppThemeSurface {
         MnemonicWordsGrid(
-            actualWords = bip39Words.take(n = 12),
+            actualWords = previewWords,
             showMnemonic = false,
         )
     }