Skip to content

fix(deps): update sqldelight to v2.1.0 #4735

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
+20 −16
Open

fix(deps): update sqldelight to v2.1.0 #4735

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a2403e
fix(deps): update sqldelight to v2.1.0
renovate[bot] May 16, 2025
804919c
Ignore new returned value from database query which know have type Qu…
bmarty May 21, 2025
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
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ serialization_json = "1.8.1"
coil = "3.1.0"
showkase = "1.0.3"
appyx = "1.7.0"
sqldelight = "2.0.2"
sqldelight = "2.1.0"
wysiwyg = "2.38.3"
telephoto = "0.15.1"

Expand Down
34 changes: 19 additions & 15 deletions .../src/main/kotlin/io/element/android/libraries/sessionstorage/impl/DatabaseSessionStore.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,25 +48,29 @@ class DatabaseSessionStore @Inject constructor(
}
}

override suspend fun storeData(sessionData: SessionData) = sessionDataMutex.withLock {
database.sessionDataQueries.insertSessionData(sessionData.toDbModel())
override suspend fun storeData(sessionData: SessionData) {
sessionDataMutex.withLock {
database.sessionDataQueries.insertSessionData(sessionData.toDbModel())
}
}

override suspend fun updateData(sessionData: SessionData) = sessionDataMutex.withLock {
val result = database.sessionDataQueries.selectByUserId(sessionData.userId)
.executeAsOneOrNull()
?.toApiModel()
override suspend fun updateData(sessionData: SessionData) {
sessionDataMutex.withLock {
val result = database.sessionDataQueries.selectByUserId(sessionData.userId)
.executeAsOneOrNull()
?.toApiModel()

if (result == null) {
Timber.e("User ${sessionData.userId} not found in session database")
return
}
if (result == null) {
Timber.e("User ${sessionData.userId} not found in session database")
return
}
// Copy new data from SDK, but keep login timestamp
database.sessionDataQueries.updateSession(
sessionData.copy(
loginTimestamp = result.loginTimestamp,
).toDbModel()
)
database.sessionDataQueries.updateSession(
sessionData.copy(
loginTimestamp = result.loginTimestamp,
).toDbModel()
)
}
}

override suspend fun getLatestSession(): SessionData? {
Expand Down
Loading