Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 16 additions & 12 deletions db/src/main/java/org/odk/collect/db/sqlite/DatabaseConnection.kt
Original file line number Diff line number Diff line change
Expand Up @@ -109,27 +109,31 @@ open class DatabaseConnection @JvmOverloads constructor(

@JvmStatic
fun cleanUp() {
val openHelpersToClear = mutableListOf<String>()
synchronized(openHelpers) {
val openHelpersToClear = mutableListOf<String>()

openHelpers.forEach { (databasePath, openHelper) ->
if (!File(databasePath).exists()) {
openHelper.close()
openHelpersToClear.add(databasePath)
openHelpers.forEach { (databasePath, openHelper) ->
if (!File(databasePath).exists()) {
openHelper.close()
openHelpersToClear.add(databasePath)
}
}
}

openHelpersToClear.forEach {
openHelpers.remove(it)
openHelpersToClear.forEach {
openHelpers.remove(it)
}
}
}

@JvmStatic
fun closeAll() {
openHelpers.forEach { (_, openHelper) -> openHelper.close() }
openHelpers.clear()
synchronized(openHelpers) {
openHelpers.forEach { (_, openHelper) -> openHelper.close() }
openHelpers.clear()

toClose.forEach(SQLiteOpenHelper::close)
toClose.clear()
toClose.forEach(SQLiteOpenHelper::close)
toClose.clear()
}
}
}
}
Expand Down