Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-21 17:29:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Convert StickerTable to kotlin.

Browse Source
This commit is contained in:
Greyson Parrelli
2025-01-07 16:59:45 -05:00
parent 1509e3ed79
commit 465c852e8b
23 changed files with 574 additions and 819 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/java/org/thoughtcrime/securesms/keyboard/sticker/StickerKeyboardRepository.kt
View File

@@ -2,6 +2,7 @@ package org.thoughtcrime.securesms.keyboard.sticker
import android.net.Uri
import org.signal.core.util.concurrent.SignalExecutors
import org.signal.core.util.nullIfBlank
import org.thoughtcrime.securesms.R
import org.thoughtcrime.securesms.database.StickerTable
import org.thoughtcrime.securesms.database.StickerTable.StickerPackRecordReader
@@ -18,11 +19,11 @@ class StickerKeyboardRepository(private val stickerTable: StickerTable) {
SignalExecutors.BOUNDED.execute {
val packs: MutableList<KeyboardStickerPack> = mutableListOf()
StickerPackRecordReader(stickerTable.installedStickerPacks).use { reader ->
var pack: StickerPackRecord? = reader.next
StickerPackRecordReader(stickerTable.getInstalledStickerPacks()).use { reader ->
var pack: StickerPackRecord? = reader.getNext()
while (pack != null) {
packs += KeyboardStickerPack(packId = pack.packId, title = pack.title.orElse(null), coverUri = pack.cover.uri)
pack = reader.next
packs += KeyboardStickerPack(packId = pack.packId, title = pack.title.nullIfBlank(), coverUri = pack.cover.uri)
pack = reader.getNext()
}
}
@@ -30,10 +31,10 @@ class StickerKeyboardRepository(private val stickerTable: StickerTable) {
val stickers: MutableList<StickerRecord> = mutableListOf()
StickerRecordReader(stickerTable.getStickersForPack(p.packId)).use { reader ->
var sticker: StickerRecord? = reader.next
var sticker: StickerRecord? = reader.getNext()
while (sticker != null) {
stickers.add(sticker)
sticker = reader.next
sticker = reader.getNext()
}
}
@@ -52,10 +53,10 @@ class StickerKeyboardRepository(private val stickerTable: StickerTable) {
val recentStickers: MutableList<StickerRecord> = mutableListOf()
StickerRecordReader(stickerTable.getRecentlyUsedStickers(RECENT_LIMIT)).use { reader ->
var recentSticker: StickerRecord? = reader.next
var recentSticker: StickerRecord? = reader.getNext()
while (recentSticker != null) {
recentStickers.add(recentSticker)
recentSticker = reader.next
recentSticker = reader.getNext()
}
}

4
app/src/main/java/org/thoughtcrime/securesms/keyboard/sticker/StickerSearchRepository.kt
View File

@@ -44,10 +44,10 @@ class StickerSearchRepository {
private fun StickerRecordReader.readAll(): List<StickerRecord> {
val stickers: MutableList<StickerRecord> = mutableListOf()
use { reader ->
var record: StickerRecord? = reader.next
var record: StickerRecord? = reader.getNext()
while (record != null) {
stickers.add(record)
record = reader.next
record = reader.getNext()
}
}
return stickers