refactor: remove unnecessary code

Author: jvsena42

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

@@ -1,5 +1,6 @@
 package to.bitkit.repositories
 
+import androidx.room.PrimaryKey
 import com.synonym.bitkitcore.Activity
 import com.synonym.bitkitcore.Activity.Onchain
 import com.synonym.bitkitcore.ActivityFilter
@@ -20,12 +21,15 @@ import to.bitkit.data.CacheStore
 import to.bitkit.data.dto.InProgressTransfer
 import to.bitkit.data.dto.PendingBoostActivity
 import to.bitkit.data.dto.TransferType
+import to.bitkit.data.entities.TagMetadataEntity
 import to.bitkit.di.BgDispatcher
 import to.bitkit.ext.matchesPaymentId
+import to.bitkit.ext.nowTimestamp
 import to.bitkit.ext.rawId
 import to.bitkit.services.CoreService
 import to.bitkit.utils.AddressChecker
 import to.bitkit.utils.Logger
+import java.security.InvalidParameterException
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -562,6 +566,35 @@ class ActivityRepo @Inject constructor(
         }
     }
 
+    suspend fun saveTagsMetadata(
+        id: String,
+        paymentHash: String? = null,
+        txId: String? = null,
+        address: String,
+        isReceive: Boolean,
+        tags: List<String>,
+    ): Result<Unit> = withContext(bgDispatcher) {
+        return@withContext runCatching {
+
+            if (tags.isEmpty()) throw InvalidParameterException("tags must not be empty")
+
+            db.tagMetadataDao().saveTagMetadata(
+                tagMetadata = TagMetadataEntity(
+                    id = id,
+                    paymentHash = paymentHash,
+                    txId = txId,
+                    address = address,
+                    isReceive = isReceive,
+                    tags = tags,
+                    createdAt = nowTimestamp().toEpochMilli()
+                )
+            )
+        }.onFailure { e ->
+            Logger.error("getAllAvailableTags error", e, context = TAG)
+        }
+    }
+
+
     // MARK: - Development/Testing Methods
 
     /**

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

@@ -24,6 +24,7 @@ import to.bitkit.data.entities.TagMetadataEntity
 import to.bitkit.data.keychain.Keychain
 import to.bitkit.di.BgDispatcher
 import to.bitkit.env.Env
+import to.bitkit.ext.nowTimestamp
 import to.bitkit.ext.toHex
 import to.bitkit.ext.totalNextOutboundHtlcLimitSats
 import to.bitkit.models.AddressModel
@@ -451,7 +452,7 @@ class WalletRepo @Inject constructor(
                             tags = tags,
                             address = onChainAddress,
                             isReceive = true,
-                            createdAt = System.currentTimeMillis()
+                            createdAt = nowTimestamp().toEpochMilli()
                         )
                     )
                 }

app/src/main/java/to/bitkit/viewmodels/AppViewModel.kt

@@ -193,7 +193,6 @@ class AppViewModel @Inject constructor(
                 try {
                     when (event) { // TODO Create individual sheet for each type of event
                         is Event.PaymentReceived -> {
-                            handleTags(event)
                             showNewTransactionSheet(
                                 NewTransactionSheetDetails(
                                     type = NewTransactionSheetType.LIGHTNING,
@@ -260,16 +259,6 @@ class AppViewModel @Inject constructor(
         }
     }
 
-    private suspend fun handleTags(event: Event.PaymentReceived) {
-        val tags = walletRepo.searchInvoiceByPaymentHash(paymentHash = event.paymentHash).getOrNull()?.tags.orEmpty()
-        activityRepo.addTagsToTransaction(
-            paymentHashOrTxId = event.paymentHash,
-            type = ActivityFilter.LIGHTNING,
-            txType = PaymentType.RECEIVED,
-            tags = tags
-        )
-    }
-
     private fun checkGeoStatus() {
         viewModelScope.launch {
             try {
@@ -927,10 +916,11 @@ class AppViewModel @Inject constructor(
                 sendOnchain(validatedAddress.address, amount)
                     .onSuccess { txId ->
                         val tags = _sendUiState.value.selectedTags
-                        activityRepo.addTagsToTransaction(
-                            paymentHashOrTxId = txId,
-                            type = ActivityFilter.ONCHAIN,
-                            txType = PaymentType.SENT,
+                        activityRepo.saveTagsMetadata(
+                            id = txId,
+                            txId = txId,
+                            address = validatedAddress.address,
+                            isReceive = false,
                             tags = tags
                         )
                         Logger.info("Onchain send result txid: $txId", context = TAG)
@@ -966,10 +956,11 @@ class AppViewModel @Inject constructor(
                 sendLightning(bolt11, paymentAmount).onSuccess { paymentHash ->
                     Logger.info("Lightning send result payment hash: $paymentHash", context = TAG)
                     val tags = _sendUiState.value.selectedTags
-                    activityRepo.addTagsToTransaction(
-                        paymentHashOrTxId = paymentHash,
-                        type = ActivityFilter.LIGHTNING,
-                        txType = PaymentType.SENT,
+                    activityRepo.saveTagsMetadata(
+                        id = paymentHash,
+                        paymentHash = paymentHash,
+                        address = _sendUiState.value.address,
+                        isReceive = false,
                         tags = tags
                     )
                     setSendEffect(SendEffect.PaymentSuccess())