chore: cleanup

Author: ovitrif

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

@@ -143,7 +143,6 @@ internal object Env {
      */
     private fun storagePathOf(walletIndex: Int, network: String, dir: String): String {
         require(::appStoragePath.isInitialized) { "App storage path should be 'context.filesDir.absolutePath'." }
-        // appStoragePath/network/walletN/dir
         val path = Path(appStoragePath, network, "wallet$walletIndex", dir)
             .toFile()
             .ensureDir()

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

@@ -1,49 +1,51 @@
 package to.bitkit.models
 
+import androidx.annotation.DrawableRes
+import androidx.annotation.StringRes
 import kotlinx.serialization.Serializable
 import to.bitkit.R
 
 @Serializable
 enum class BackupCategory(
-    val uiIcon: Int,
-    val uiTitle: Int,
+    @DrawableRes val icon: Int,
+    @StringRes val title: Int,
 ) {
     LIGHTNING_CONNECTIONS(
-        uiIcon = R.drawable.ic_lightning,
-        uiTitle = R.string.settings__backup__category_connections,
+        icon = R.drawable.ic_lightning,
+        title = R.string.settings__backup__category_connections,
     ),
     BLOCKTANK(
-        uiIcon = R.drawable.ic_note,
-        uiTitle = R.string.settings__backup__category_connection_receipts,
+        icon = R.drawable.ic_note,
+        title = R.string.settings__backup__category_connection_receipts,
     ),
     ACTIVITY(
-        uiIcon = R.drawable.ic_transfer,
-        uiTitle = R.string.settings__backup__category_transaction_log,
+        icon = R.drawable.ic_transfer,
+        title = R.string.settings__backup__category_transaction_log,
     ),
     WALLET(
-        uiIcon = R.drawable.ic_timer_alt,
-        uiTitle = R.string.settings__backup__category_wallet,
+        icon = R.drawable.ic_timer_alt,
+        title = R.string.settings__backup__category_wallet,
     ),
     SETTINGS(
-        uiIcon = R.drawable.ic_settings,
-        uiTitle = R.string.settings__backup__category_settings,
+        icon = R.drawable.ic_settings,
+        title = R.string.settings__backup__category_settings,
     ),
     WIDGETS(
-        uiIcon = R.drawable.ic_rectangles_two,
-        uiTitle = R.string.settings__backup__category_widgets,
+        icon = R.drawable.ic_rectangles_two,
+        title = R.string.settings__backup__category_widgets,
     ),
     METADATA(
-        uiIcon = R.drawable.ic_tag,
-        uiTitle = R.string.settings__backup__category_tags,
+        icon = R.drawable.ic_tag,
+        title = R.string.settings__backup__category_tags,
     ),
     // Descoped in v1, will return in v2:
     // PROFILE(
-    //     uiIcon = R.drawable.ic_user,
-    //     uiTitle = R.string.settings__backup__category_profile,
+    //     icon = R.drawable.ic_user,
+    //     title = R.string.settings__backup__category_profile,
     // ),
     // CONTACTS(
-    //     uiIcon = R.drawable.ic_users,
-    //     uiTitle = R.string.settings__backup__category_contacts,
+    //     icon = R.drawable.ic_users,
+    //     title = R.string.settings__backup__category_contacts,
     // ),
 }
 

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

@@ -9,26 +9,13 @@ import to.bitkit.data.AppCacheData
 import to.bitkit.data.entities.TagMetadataEntity
 import to.bitkit.data.entities.TransferEntity
 
-/**
- * Wallet backup payload (v1)
- *
- * Contains:
- * - Transfer entities from Room database
- */
 @Serializable
 data class WalletBackupV1(
     val version: Int = 1,
     val createdAt: Long,
     val transfers: List<TransferEntity>,
 )
 
-/**
- * Metadata backup payload (v1)
- *
- * Contains:
- * - Tag metadata entities from Room database
- * - Entire AppCacheData from CacheStore
- */
 @Serializable
 data class MetadataBackupV1(
     val version: Int = 1,
@@ -37,14 +24,6 @@ data class MetadataBackupV1(
     val cache: AppCacheData,
 )
 
-/**
- * Blocktank backup payload (v1)
- *
- * Contains:
- * - List of IBtOrder from bitkit-core
- * - List of IcJitEntry from bitkit-core
- * - IBtInfo from bitkit-core
- */
 @Serializable
 data class BlocktankBackupV1(
     val version: Int = 1,
@@ -54,12 +33,6 @@ data class BlocktankBackupV1(
     val info: IBtInfo? = null,
 )
 
-/**
- * Activity backup payload (v1)
- *
- * Contains:
- * - ALL activities (onchain + lightning) from bitkit-core
- */
 @Serializable
 data class ActivityBackupV1(
     val version: Int = 1,

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

@@ -51,10 +51,6 @@ class ActivityRepo @Inject constructor(
 ) {
     val isSyncingLdkNodePayments = MutableStateFlow(false)
 
-    /**
-     * Emits a timestamp whenever activities are modified (insert, update, delete, tag changes, etc.)
-     * Used to trigger backups and UI updates.
-     */
     private val _activitiesChanged = MutableStateFlow(0L)
     val activitiesChanged: StateFlow<Long> = _activitiesChanged
 
@@ -83,7 +79,6 @@ class ActivityRepo @Inject constructor(
                     boostPendingActivities()
                     transferRepo.syncTransferStates()
                     isSyncingLdkNodePayments.value = false
-                    // Note: We don't call notifyActivitiesChanged() here to avoid backups on every sync.
                     return@withContext Result.success(Unit)
                 }.onFailure { e ->
                     Logger.error("Failed to sync ldk-node payments", e, context = TAG)

app/src/main/java/to/bitkit/ui/settings/BackupSettingsScreen.kt

@@ -174,11 +174,11 @@ private fun BackupStatusItem(
     ) {
         BackupStatusIcon(
             status = uiState.status,
-            iconRes = uiState.category.uiIcon,
+            iconRes = uiState.category.icon,
         )
 
         Column(modifier = Modifier.weight(1f)) {
-            BodyMSB(text = stringResource(uiState.category.uiTitle))
+            BodyMSB(text = stringResource(uiState.category.title))
             CaptionB(text = subtitle, color = Colors.White64, maxLines = 1)
         }
 
@@ -251,7 +251,7 @@ private fun Preview() {
             val timestamp = System.currentTimeMillis() - (minutesAgo * 60 * 1000)
 
             when (it.category) {
-                BackupCategory.ACTIVITY -> it.copy(disableRetry = true)
+                BackupCategory.LIGHTNING_CONNECTIONS -> it.copy(disableRetry = true)
                 BackupCategory.WALLET -> it.copy(status = BackupItemStatus(running = true, required = 1))
                 BackupCategory.METADATA -> it.copy(status = BackupItemStatus(required = 1))
                 else -> it.copy(status = BackupItemStatus(synced = timestamp, required = timestamp))