Merge pull request #452 from synonymdev/feat/backup-categories

feat: all backup categories

Author: ovitrif

.gitignore

@@ -8,10 +8,11 @@
 .externalNativeBuild
 .cxx
 local.properties
+# AI
+.ai
 .cursor
 *.local.*
 CLAUDE.md
-
 # Secrets
 google-services.json
 .env

app/src/main/java/to/bitkit/data/CacheStore.kt

@@ -31,7 +31,6 @@ class CacheStore @Inject constructor(
     private val store = context.appCacheDataStore
 
     val data: Flow<AppCacheData> = store.data
-
     val backupStatuses: Flow<Map<BackupCategory, BackupItemStatus>> = data.map { it.backupStatuses }
 
     suspend fun update(transform: (AppCacheData) -> AppCacheData) {

app/src/main/java/to/bitkit/data/SettingsStore.kt

@@ -20,7 +20,7 @@ import javax.inject.Singleton
 
 private val Context.settingsDataStore: DataStore<SettingsData> by dataStore(
     fileName = "settings.json",
-    serializer = SettingsSerializer
+    serializer = SettingsSerializer,
 )
 
 @Singleton

app/src/main/java/to/bitkit/data/WidgetsStore.kt

@@ -27,7 +27,7 @@ import javax.inject.Singleton
 
 private val Context.widgetsDataStore: DataStore<WidgetsData> by dataStore(
     fileName = "widgets.json",
-    serializer = WidgetsSerializer
+    serializer = WidgetsSerializer,
 )
 
 @Singleton

app/src/main/java/to/bitkit/data/dao/TagMetadataDao.kt

@@ -5,13 +5,21 @@ import androidx.room.Delete
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
+import androidx.room.Upsert
+import kotlinx.coroutines.flow.Flow
 import to.bitkit.data.entities.TagMetadataEntity
 
 @Dao
 interface TagMetadataDao {
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
-    suspend fun saveTagMetadata(tagMetadata: TagMetadataEntity)
+    suspend fun insert(tagMetadata: TagMetadataEntity)
+
+    @Upsert
+    suspend fun upsert(tagMetadata: TagMetadataEntity)
+
+    @Query("SELECT * FROM tag_metadata")
+    fun observeAll(): Flow<List<TagMetadataEntity>>
 
     @Query("SELECT * FROM tag_metadata")
     suspend fun getAll(): List<TagMetadataEntity>

app/src/main/java/to/bitkit/data/dao/TransferDao.kt

@@ -5,6 +5,7 @@ import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
 import androidx.room.Update
+import androidx.room.Upsert
 import kotlinx.coroutines.flow.Flow
 import to.bitkit.data.entities.TransferEntity
 
@@ -13,9 +14,18 @@ interface TransferDao {
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun insert(transfer: TransferEntity)
 
+    @Upsert
+    suspend fun upsert(transfer: TransferEntity)
+
     @Update
     suspend fun update(transfer: TransferEntity)
 
+    @Query("SELECT * FROM transfers")
+    suspend fun getAll(): List<TransferEntity>
+
+    @Query("SELECT * FROM transfers")
+    fun observeAll(): Flow<List<TransferEntity>>
+
     @Query("SELECT * FROM transfers WHERE isSettled = 0")
     fun getActiveTransfers(): Flow<List<TransferEntity>>
 

app/src/main/java/to/bitkit/data/entities/TagMetadataEntity.kt

@@ -2,7 +2,9 @@ package to.bitkit.data.entities
 
 import androidx.room.Entity
 import androidx.room.PrimaryKey
+import kotlinx.serialization.Serializable
 
+@Serializable
 @Entity(tableName = "tag_metadata")
 /**
  * @param id This will be paymentHash, txId, or address depending on context

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

@@ -134,6 +134,13 @@ internal object Env {
         return "$BIT_REFILL_URL/$page/$BITREFILL_PARAMS"
     }
 
+    /**
+     * Generates the storage path for a specified wallet index, network, and directory.
+     *
+     * Output format:
+     *
+     * `appStoragePath/network/walletN/dir`
+     */
     private fun storagePathOf(walletIndex: Int, network: String, dir: String): String {
         require(::appStoragePath.isInitialized) { "App storage path should be 'context.filesDir.absolutePath'." }
         val path = Path(appStoragePath, network, "wallet$walletIndex", dir)

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

@@ -1,3 +1,5 @@
+@file:Suppress("TooManyFunctions")
+
 package to.bitkit.ext
 
 import android.icu.text.DateFormat

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

@@ -0,0 +1,62 @@
+package to.bitkit.models
+
+import androidx.annotation.DrawableRes
+import androidx.annotation.StringRes
+import kotlinx.serialization.Serializable
+import to.bitkit.R
+
+@Serializable
+enum class BackupCategory(
+    @DrawableRes val icon: Int,
+    @StringRes val title: Int,
+) {
+    LIGHTNING_CONNECTIONS(
+        icon = R.drawable.ic_lightning,
+        title = R.string.settings__backup__category_connections,
+    ),
+    BLOCKTANK(
+        icon = R.drawable.ic_note,
+        title = R.string.settings__backup__category_connection_receipts,
+    ),
+    ACTIVITY(
+        icon = R.drawable.ic_transfer,
+        title = R.string.settings__backup__category_transaction_log,
+    ),
+    WALLET(
+        icon = R.drawable.ic_timer_alt,
+        title = R.string.settings__backup__category_wallet,
+    ),
+    SETTINGS(
+        icon = R.drawable.ic_settings,
+        title = R.string.settings__backup__category_settings,
+    ),
+    WIDGETS(
+        icon = R.drawable.ic_rectangles_two,
+        title = R.string.settings__backup__category_widgets,
+    ),
+    METADATA(
+        icon = R.drawable.ic_tag,
+        title = R.string.settings__backup__category_tags,
+    ),
+    // Descoped in v1, will return in v2:
+    // PROFILE(
+    //     icon = R.drawable.ic_user,
+    //     title = R.string.settings__backup__category_profile,
+    // ),
+    // CONTACTS(
+    //     icon = R.drawable.ic_users,
+    //     title = R.string.settings__backup__category_contacts,
+    // ),
+}
+
+/**
+ * @property running In progress
+ * @property synced Timestamp in ms of last time this backup was synced
+ * @property required Timestamp in ms of last time this backup was required
+ */
+@Serializable
+data class BackupItemStatus(
+    val running: Boolean = false,
+    val synced: Long = 0L,
+    val required: Long = 0L,
+)