From a462021cb60cfde3fd740acde84c09f30f58c274 Mon Sep 17 00:00:00 2001 From: greenart7c3 Date: Fri, 13 Jun 2025 12:46:50 -0300 Subject: [PATCH] Delete history when deleting an application --- .../com/greenart7c3/nostrsigner/database/ApplicationDao.kt | 3 +++ .../com/greenart7c3/nostrsigner/service/BunkerRequestUtils.kt | 1 + .../com/greenart7c3/nostrsigner/ui/EditConfigurationScreen.kt | 1 + 3 files changed, 5 insertions(+) diff --git a/app/src/main/java/com/greenart7c3/nostrsigner/database/ApplicationDao.kt b/app/src/main/java/com/greenart7c3/nostrsigner/database/ApplicationDao.kt index 4821d9d9..bf9aa1b2 100644 --- a/app/src/main/java/com/greenart7c3/nostrsigner/database/ApplicationDao.kt +++ b/app/src/main/java/com/greenart7c3/nostrsigner/database/ApplicationDao.kt @@ -169,6 +169,9 @@ interface ApplicationDao { @Query("SELECT * FROM history2 ORDER BY time DESC") fun getAllHistory(): Flow> + @Query("DELETE FROM history2 where pkKey = :pk") + suspend fun deleteHistory(pk: String) + @Insert @Transaction suspend fun insertLog(logEntity: LogEntity) diff --git a/app/src/main/java/com/greenart7c3/nostrsigner/service/BunkerRequestUtils.kt b/app/src/main/java/com/greenart7c3/nostrsigner/service/BunkerRequestUtils.kt index c9317441..da906e3d 100644 --- a/app/src/main/java/com/greenart7c3/nostrsigner/service/BunkerRequestUtils.kt +++ b/app/src/main/java/com/greenart7c3/nostrsigner/service/BunkerRequestUtils.kt @@ -467,6 +467,7 @@ object BunkerRequestUtils { if (oldKey.isNotBlank()) { database.applicationDao().delete(oldKey) + database.applicationDao().deleteHistory(oldKey) } var savedApplication = database.applicationDao().getByKey(key) diff --git a/app/src/main/java/com/greenart7c3/nostrsigner/ui/EditConfigurationScreen.kt b/app/src/main/java/com/greenart7c3/nostrsigner/ui/EditConfigurationScreen.kt index 5b20f408..3ce18935 100644 --- a/app/src/main/java/com/greenart7c3/nostrsigner/ui/EditConfigurationScreen.kt +++ b/app/src/main/java/com/greenart7c3/nostrsigner/ui/EditConfigurationScreen.kt @@ -320,6 +320,7 @@ fun EditConfigurationScreen( application?.let { scope.launch(Dispatchers.IO) { Amber.instance.getDatabase(account.npub).applicationDao().delete(it.application) + Amber.instance.getDatabase(account.npub).applicationDao().deleteHistory(it.application.key) Amber.instance.checkForNewRelays()