Merge branch 'master' into feat/gift-codes

Author: ovitrif

app/schemas/to.bitkit.data.AppDb/5.json

@@ -0,0 +1,102 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 5,
+    "identityHash": "eb40e0b1c9efc8f3cbf698d75fc4d4b6",
+    "entities": [
+      {
+        "tableName": "config",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`walletIndex` INTEGER NOT NULL, PRIMARY KEY(`walletIndex`))",
+        "fields": [
+          {
+            "fieldPath": "walletIndex",
+            "columnName": "walletIndex",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "walletIndex"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "transfers",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `type` TEXT NOT NULL, `amountSats` INTEGER NOT NULL, `channelId` TEXT, `fundingTxId` TEXT, `lspOrderId` TEXT, `isSettled` INTEGER NOT NULL, `createdAt` INTEGER NOT NULL, `settledAt` INTEGER, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "amountSats",
+            "columnName": "amountSats",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "channelId",
+            "columnName": "channelId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "fundingTxId",
+            "columnName": "fundingTxId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "lspOrderId",
+            "columnName": "lspOrderId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isSettled",
+            "columnName": "isSettled",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "createdAt",
+            "columnName": "createdAt",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "settledAt",
+            "columnName": "settledAt",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'eb40e0b1c9efc8f3cbf698d75fc4d4b6')"
+    ]
+  }
+}

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

@@ -19,25 +19,21 @@ import dagger.assisted.AssistedInject
 import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.flow.Flow
 import to.bitkit.BuildConfig
-import to.bitkit.data.dao.TagMetadataDao
 import to.bitkit.data.dao.TransferDao
 import to.bitkit.data.entities.ConfigEntity
-import to.bitkit.data.entities.TagMetadataEntity
 import to.bitkit.data.entities.TransferEntity
 import to.bitkit.data.typeConverters.StringListConverter
 
 @Database(
     entities = [
         ConfigEntity::class,
-        TagMetadataEntity::class,
         TransferEntity::class,
     ],
-    version = 4,
+    version = 5,
 )
 @TypeConverters(StringListConverter::class)
 abstract class AppDb : RoomDatabase() {
     abstract fun configDao(): ConfigDao
-    abstract fun tagMetadataDao(): TagMetadataDao
     abstract fun transferDao(): TransferDao
 
     companion object {

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

@@ -14,7 +14,6 @@ import to.bitkit.models.BackupCategory
 import to.bitkit.models.BackupItemStatus
 import to.bitkit.models.BalanceState
 import to.bitkit.models.FxRate
-import to.bitkit.models.TransactionMetadata
 import to.bitkit.utils.Logger
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -114,22 +113,6 @@ class CacheStore @Inject constructor(
         }
     }
 
-    suspend fun addTransactionMetadata(item: TransactionMetadata) {
-        if (item.txId in store.data.first().transactionsMetadata.map { it.txId }) return
-
-        store.updateData {
-            it.copy(transactionsMetadata = it.transactionsMetadata + item)
-        }
-    }
-
-    suspend fun removeTransactionMetadata(item: TransactionMetadata) {
-        if (item.txId !in store.data.first().transactionsMetadata.map { it.txId }) return
-
-        store.updateData {
-            it.copy(transactionsMetadata = it.transactionsMetadata - item)
-        }
-    }
-
     suspend fun reset() {
         store.updateData { AppCacheData() }
         Logger.info("Deleted all app cached data.")
@@ -152,5 +135,4 @@ data class AppCacheData(
     val deletedActivities: List<String> = listOf(),
     val activitiesPendingDelete: List<String> = listOf(),
     val pendingBoostActivities: List<PendingBoostActivity> = listOf(),
-    val transactionsMetadata: List<TransactionMetadata> = listOf(),
 )