laantungir/Amber
1
0
Fork 0
mirror of https://github.com/greenart7c3/Amber.git synced 2026-10-05 19:08:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #527 from greenart7c3/ccr-b10b912f-l5n5kv

Browse Source 
Skip permission inserts whose application no longer exists
This commit is contained in:
greenart7c3
2026-10-05 07:13:45 -03:00
committed by GitHub
parent fc2e0de5dd 842bcb296b
commit 1603ad5c26
2 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/greenart7c3/nostrsigner/database/ApplicationDao.kt
+20 -2
View File
@@ -188,12 +188,30 @@ interface ApplicationDao {
@Transaction @Transaction
suspend fun insertPermissions2Raw(permissions: List<ApplicationPermissionsEntity>): List<Long>? suspend fun insertPermissions2Raw(permissions: List<ApplicationPermissionsEntity>): List<Long>?
suspend fun insertPermissions2(permissions: List<ApplicationPermissionsEntity>): List<Long>? = insertPermissions2Raw(permissions) @Query("SELECT `key` FROM application WHERE `key` IN (:keys)")
suspend fun getExistingApplicationKeys(keys: List<String>): List<String>
/**
* Inserts permissions, skipping rows whose parent application no longer
* exists. `OnConflictStrategy.IGNORE` does not cover foreign-key failures,
* so a permission written after its application was deleted (e.g. a toggle
* racing an app delete/reset) would otherwise crash with
* `SQLITE_CONSTRAINT_FOREIGNKEY`.
*/
@Transaction
suspend fun insertPermissions2(permissions: List<ApplicationPermissionsEntity>): List<Long>? {
if (permissions.isEmpty()) return emptyList()
val existingKeys = getExistingApplicationKeys(permissions.map { it.pkKey }.distinct()).toSet()
val valid = permissions.filter { it.pkKey in existingKeys }
if (valid.isEmpty()) return emptyList()
return insertPermissions2Raw(valid)
}
@Insert(onConflict = OnConflictStrategy.REPLACE) @Insert(onConflict = OnConflictStrategy.REPLACE)
@Transaction @Transaction
suspend fun insertPermissionsRaw(permissions: List<ApplicationPermissionsEntity>): List<Long>? suspend fun insertPermissionsRaw(permissions: List<ApplicationPermissionsEntity>): List<Long>?
@Transaction
suspend fun insertPermissions(permissions: List<ApplicationPermissionsEntity>): List<Long>? { suspend fun insertPermissions(permissions: List<ApplicationPermissionsEntity>): List<Long>? {
permissions.forEach { permissions.forEach {
if (it.kind != null) { if (it.kind != null) {
@@ -212,7 +230,7 @@ interface ApplicationDao {
deletePermissions(it.pkKey, it.type) deletePermissions(it.pkKey, it.type)
} }
} }
return insertPermissions2Raw(permissions) return insertPermissions2(permissions)
} }
@Transaction @Transaction
app/src/main/java/com/greenart7c3/nostrsigner/database/CachingApplicationDao.kt
+2
View File
@@ -308,6 +308,8 @@ class CachingApplicationDao(
override suspend fun insertPermissions2Raw(permissions: List<ApplicationPermissionsEntity>): List<Long>? = delegate.insertPermissions2Raw(permissions) override suspend fun insertPermissions2Raw(permissions: List<ApplicationPermissionsEntity>): List<Long>? = delegate.insertPermissions2Raw(permissions)
override suspend fun getExistingApplicationKeys(keys: List<String>): List<String> = delegate.getExistingApplicationKeys(keys)
override suspend fun insertPermissionsRaw(permissions: List<ApplicationPermissionsEntity>): List<Long>? = delegate.insertPermissionsRaw(permissions) override suspend fun insertPermissionsRaw(permissions: List<ApplicationPermissionsEntity>): List<Long>? = delegate.insertPermissionsRaw(permissions)
override suspend fun deleteRaw(entity: ApplicationEntity) = delegate.deleteRaw(entity) override suspend fun deleteRaw(entity: ApplicationEntity) = delegate.deleteRaw(entity)