devol
/
smalltalk-matrix
mirror of https://github.com/ouchadam/small-talk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

providing dedicated scope instead of forcing transaction callback to suspend

This commit is contained in:
Adam Brown 2022-09-04 11:59:08 +01:00
parent 4e3da03062
commit d05d86a02d
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
domains/olm/src/main/kotlin/app/dapk/st/olm/OlmWrapper.kt
View File

@ -53,7 +53,6 @@ class OlmWrapper(
true -> OlmInboundGroupSession.importSession(it.sessionKey) true -> OlmInboundGroupSession.importSession(it.sessionKey)
false -> OlmInboundGroupSession(it.sessionKey) false -> OlmInboundGroupSession(it.sessionKey)
} }
logger.crypto("import megolm ${it.sessionKey}")
olmStore.persist(it.sessionId, inBound) olmStore.persist(it.sessionId, inBound)
} }
} }

14
domains/store/src/main/kotlin/app/dapk/st/domain/OlmPersistence.kt
View File

@ -11,9 +11,9 @@ import app.dapk.st.matrix.common.Curve25519
import app.dapk.st.matrix.common.RoomId import app.dapk.st.matrix.common.RoomId
import app.dapk.st.matrix.common.SessionId import app.dapk.st.matrix.common.SessionId
import com.squareup.sqldelight.TransactionWithoutReturn import com.squareup.sqldelight.TransactionWithoutReturn
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
import kotlin.coroutines.resume
import kotlin.coroutines.suspendCoroutine
class OlmPersistence( class OlmPersistence(
private val database: DapkDb, private val database: DapkDb,
@ -83,13 +83,9 @@ class OlmPersistence(
} }
suspend fun startTransaction(action: suspend TransactionWithoutReturn.() -> Unit) { suspend fun startTransaction(action: suspend TransactionWithoutReturn.() -> Unit) {
val transaction = suspendCoroutine { val scope = CoroutineScope(dispatchers.io)
database.cryptoQueries.transaction(false) { database.cryptoQueries.transaction {
it.resume(this) scope.launch { action() }
}
}
dispatchers.withIoContext {
action(transaction)
} }
} }