Compare commits

..

3 Commits

Author SHA1 Message Date
GitHub Actions
044631b05d chore: bump version to 4.11.81 [skip ci] 2026-04-07 10:45:54 +00:00
4bc5b4d790 Merge branch 'master' of http://synbox.ruv.wtf:8418/litruv/cinny-mobile
Some checks failed
Build / increment-version (push) Successful in 7s
Build / build-android (push) Successful in 5m11s
Build / create-release (push) Failing after 3m7s
2026-04-07 20:45:46 +10:00
da52ec84b7 fix: improve handling of joined rooms and event notifications in MatrixSyncService 2026-04-07 20:45:44 +10:00
2 changed files with 6 additions and 5 deletions

View File

@@ -143,10 +143,11 @@ class MatrixSyncService : Service() {
val nm = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager val nm = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
ensureMessageChannel(nm) ensureMessageChannel(nm)
joinedRooms.keys().forEach { roomId -> val roomIds = joinedRooms.keys().asSequence().toList()
for (roomId in roomIds) {
val timeline = joinedRooms.optJSONObject(roomId) val timeline = joinedRooms.optJSONObject(roomId)
?.optJSONObject("timeline") ?: return@forEach ?.optJSONObject("timeline") ?: continue
val events = timeline.optJSONArray("events") ?: return@forEach val events = timeline.optJSONArray("events") ?: continue
for (i in 0 until events.length()) { for (i in 0 until events.length()) {
val event = events.optJSONObject(i) ?: continue val event = events.optJSONObject(i) ?: continue
@@ -157,7 +158,7 @@ class MatrixSyncService : Service() {
if (eventId.isNotBlank() && !shownEventIds.add(eventId)) continue if (eventId.isNotBlank() && !shownEventIds.add(eventId)) continue
val content = event.optJSONObject("content") ?: continue val content = event.optJSONObject("content") ?: continue
val body = content.optString("body").ifBlank { continue } val body = content.optString("body").takeIf { it.isNotBlank() } ?: continue
val sender = event.optString("sender") val sender = event.optString("sender")
val senderName = sender.substringAfter("@").substringBefore(":") val senderName = sender.substringAfter("@").substringBefore(":")

View File

@@ -1,6 +1,6 @@
{ {
"name": "paarrot", "name": "paarrot",
"version": "4.11.80", "version": "4.11.81",
"description": "Paarrot - A Matrix client based on Cinny", "description": "Paarrot - A Matrix client based on Cinny",
"engines": { "engines": {
"node": ">=18.0.0" "node": ">=18.0.0"