Skip to content

Commit a5c8a2b

Browse files
committed
Minor cleanup
1 parent 40666ed commit a5c8a2b

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

app/src/main/java/org/thoughtcrime/securesms/database/RecipientSettingsDatabase.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ class RecipientSettingsDatabase @Inject constructor(
195195
fun cleanupRecipientSettings(addressesToKeep: Set<Address>): Int {
196196
if (addressesToKeep.isEmpty()) return 0
197197

198-
// Build a temporary lookup of strings for SQL bind args
198+
// Build a temporary lookup of strings
199199
val keepSet = addressesToKeep.mapTo(hashSetOf()) { it.toString() }
200200

201201
// Collect all rows, figure out orphans in memory
@@ -205,11 +205,11 @@ class RecipientSettingsDatabase @Inject constructor(
205205
if (orphans.isEmpty()) return 0
206206

207207
var deleted = 0
208-
val db = writableDatabase
209-
db.beginTransaction()
208+
val database = writableDatabase
209+
database.beginTransaction()
210210
try {
211211
for (address in orphans) {
212-
val rows = db.delete(
212+
val rows = database.delete(
213213
TABLE_NAME,
214214
"$COL_ADDRESS = ?",
215215
arrayOf(address.toString())
@@ -220,9 +220,9 @@ class RecipientSettingsDatabase @Inject constructor(
220220
deleted += rows
221221
}
222222
}
223-
db.setTransactionSuccessful()
223+
database.setTransactionSuccessful()
224224
} finally {
225-
db.endTransaction()
225+
database.endTransaction()
226226
}
227227
return deleted
228228
}

0 commit comments

Comments
 (0)