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

Renamed database classes to table classes.

Browse Source 
Because they're not databases. They're tables.
This commit is contained in:
Greyson Parrelli
2022-11-29 10:47:12 -05:00
committed by Cody Henthorne
parent b190f9495a
commit 7949996c5c
382 changed files with 3420 additions and 3464 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/org/thoughtcrime/securesms/keyboard/emoji/search/EmojiSearchRepository.kt
View File

@@ -8,7 +8,7 @@ import org.signal.core.util.concurrent.SignalExecutors
import org.thoughtcrime.securesms.components.emoji.Emoji
import org.thoughtcrime.securesms.components.emoji.EmojiPageModel
import org.thoughtcrime.securesms.components.emoji.RecentEmojiPageModel
import org.thoughtcrime.securesms.database.EmojiSearchDatabase
import org.thoughtcrime.securesms.database.EmojiSearchTable
import org.thoughtcrime.securesms.database.SignalDatabase
import org.thoughtcrime.securesms.emoji.EmojiSource
import org.thoughtcrime.securesms.util.TextSecurePreferences
@@ -22,11 +22,11 @@ private val NOT_PUNCTUATION = "[^\\p{Punct}]".toRegex()
class EmojiSearchRepository(private val context: Context) {
private val emojiSearchDatabase: EmojiSearchDatabase = SignalDatabase.emojiSearch
private val emojiSearchTable: EmojiSearchTable = SignalDatabase.emojiSearch
fun submitQuery(query: String, limit: Int = EMOJI_SEARCH_LIMIT): Single<List<String>> {
val result = if (query.length >= MINIMUM_INLINE_QUERY_THRESHOLD && NOT_PUNCTUATION.matches(query.substring(query.lastIndex))) {
Single.fromCallable { emojiSearchDatabase.query(query, limit) }
Single.fromCallable { emojiSearchTable.query(query, limit) }
} else {
Single.just(emptyList())
}
@@ -39,7 +39,7 @@ class EmojiSearchRepository(private val context: Context) {
consumer.accept(RecentEmojiPageModel(context, TextSecurePreferences.RECENT_STORAGE_KEY))
} else {
SignalExecutors.SERIAL.execute {
val emoji: List<String> = emojiSearchDatabase.query(query, limit)
val emoji: List<String> = emojiSearchTable.query(query, limit)
val displayEmoji: List<Emoji> = emoji
.mapNotNull { canonical -> EmojiSource.latest.canonicalToVariations[canonical] }

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

@@ -3,9 +3,9 @@ package org.thoughtcrime.securesms.keyboard.sticker
import android.net.Uri
import org.signal.core.util.concurrent.SignalExecutors
import org.thoughtcrime.securesms.R
import org.thoughtcrime.securesms.database.StickerDatabase
import org.thoughtcrime.securesms.database.StickerDatabase.StickerPackRecordReader
import org.thoughtcrime.securesms.database.StickerDatabase.StickerRecordReader
import org.thoughtcrime.securesms.database.StickerTable
import org.thoughtcrime.securesms.database.StickerTable.StickerPackRecordReader
import org.thoughtcrime.securesms.database.StickerTable.StickerRecordReader
import org.thoughtcrime.securesms.database.model.StickerPackRecord
import org.thoughtcrime.securesms.database.model.StickerRecord
import java.util.function.Consumer
@@ -13,12 +13,12 @@ import java.util.function.Consumer
private const val RECENT_LIMIT = 24
private const val RECENT_PACK_ID = "RECENT"
class StickerKeyboardRepository(private val stickerDatabase: StickerDatabase) {
class StickerKeyboardRepository(private val stickerTable: StickerTable) {
fun getStickerPacks(consumer: Consumer<List<KeyboardStickerPack>>) {
SignalExecutors.BOUNDED.execute {
val packs: MutableList<KeyboardStickerPack> = mutableListOf()
StickerPackRecordReader(stickerDatabase.installedStickerPacks).use { reader ->
StickerPackRecordReader(stickerTable.installedStickerPacks).use { reader ->
var pack: StickerPackRecord? = reader.next
while (pack != null) {
packs += KeyboardStickerPack(packId = pack.packId, title = pack.title.orElse(null), coverUri = pack.cover.uri)
@@ -29,7 +29,7 @@ class StickerKeyboardRepository(private val stickerDatabase: StickerDatabase) {
val fullPacks: MutableList<KeyboardStickerPack> = packs.map { p ->
val stickers: MutableList<StickerRecord> = mutableListOf()
StickerRecordReader(stickerDatabase.getStickersForPack(p.packId)).use { reader ->
StickerRecordReader(stickerTable.getStickersForPack(p.packId)).use { reader ->
var sticker: StickerRecord? = reader.next
while (sticker != null) {
stickers.add(sticker)
@@ -51,7 +51,7 @@ class StickerKeyboardRepository(private val stickerDatabase: StickerDatabase) {
private fun getRecentStickerPack(): KeyboardStickerPack {
val recentStickers: MutableList<StickerRecord> = mutableListOf()
StickerRecordReader(stickerDatabase.getRecentlyUsedStickers(RECENT_LIMIT)).use { reader ->
StickerRecordReader(stickerTable.getRecentlyUsedStickers(RECENT_LIMIT)).use { reader ->
var recentSticker: StickerRecord? = reader.next
while (recentSticker != null) {
recentStickers.add(recentSticker)

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

@@ -2,10 +2,10 @@ package org.thoughtcrime.securesms.keyboard.sticker
import androidx.annotation.WorkerThread
import org.thoughtcrime.securesms.components.emoji.EmojiUtil
import org.thoughtcrime.securesms.database.EmojiSearchDatabase
import org.thoughtcrime.securesms.database.EmojiSearchTable
import org.thoughtcrime.securesms.database.SignalDatabase
import org.thoughtcrime.securesms.database.StickerDatabase
import org.thoughtcrime.securesms.database.StickerDatabase.StickerRecordReader
import org.thoughtcrime.securesms.database.StickerTable
import org.thoughtcrime.securesms.database.StickerTable.StickerRecordReader
import org.thoughtcrime.securesms.database.model.StickerRecord
private const val RECENT_LIMIT = 24
@@ -13,17 +13,17 @@ private const val EMOJI_SEARCH_RESULTS_LIMIT = 20
class StickerSearchRepository {
private val emojiSearchDatabase: EmojiSearchDatabase = SignalDatabase.emojiSearch
private val stickerDatabase: StickerDatabase = SignalDatabase.stickers
private val emojiSearchTable: EmojiSearchTable = SignalDatabase.emojiSearch
private val stickerTable: StickerTable = SignalDatabase.stickers
@WorkerThread
fun search(query: String): List<StickerRecord> {
if (query.isEmpty()) {
return StickerRecordReader(stickerDatabase.getRecentlyUsedStickers(RECENT_LIMIT)).readAll()
return StickerRecordReader(stickerTable.getRecentlyUsedStickers(RECENT_LIMIT)).readAll()
}
val maybeEmojiQuery: List<StickerRecord> = findStickersForEmoji(query)
val searchResults: List<StickerRecord> = emojiSearchDatabase.query(query, EMOJI_SEARCH_RESULTS_LIMIT)
val searchResults: List<StickerRecord> = emojiSearchTable.query(query, EMOJI_SEARCH_RESULTS_LIMIT)
.map { findStickersForEmoji(it) }
.flatten()
@@ -36,7 +36,7 @@ class StickerSearchRepository {
return EmojiUtil.getAllRepresentations(searchEmoji)
.filterNotNull()
.map { candidate -> StickerRecordReader(stickerDatabase.getStickersByEmoji(candidate)).readAll() }
.map { candidate -> StickerRecordReader(stickerTable.getStickersByEmoji(candidate)).readAll() }
.flatten()
}
}