Mastodon
/
Tusky-App-Android
mirror of https://github.com/tuskyapp/Tusky
1
0
Fork 0
Code Issues Releases Wiki Activity

fix caching of instance defaults and emojis (#2643) 

* fix caching of instance defaults and emojis

* use correct OnConflictStrategy

* rename dao methods
This commit is contained in:
Konrad Pozniak 2022-08-07 22:18:53 +02:00 committed by GitHub
parent 1c11671f3e
commit 1fed84f948
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/keylesspalace/tusky/components/instanceinfo/InstanceInfoRepository.kt
View File

@ -45,7 +45,7 @@ class InstanceInfoRepository @Inject constructor(
*/ */
suspend fun getEmojis(): List<Emoji> = withContext(Dispatchers.IO) { suspend fun getEmojis(): List<Emoji> = withContext(Dispatchers.IO) {
api.getCustomEmojis() api.getCustomEmojis()
.onSuccess { emojiList -> dao.insertOrReplace(EmojisEntity(instanceName, emojiList)) } .onSuccess { emojiList -> dao.upsert(EmojisEntity(instanceName, emojiList)) }
.getOrElse { throwable -> .getOrElse { throwable ->
Log.w(TAG, "failed to load custom emojis, falling back to cache", throwable) Log.w(TAG, "failed to load custom emojis, falling back to cache", throwable)
dao.getEmojiInfo(instanceName)?.emojiList.orEmpty() dao.getEmojiInfo(instanceName)?.emojiList.orEmpty()
@ -78,7 +78,7 @@ class InstanceInfoRepository @Inject constructor(
maxFieldNameLength = instance.pleroma?.metadata?.fieldLimits?.nameLength, maxFieldNameLength = instance.pleroma?.metadata?.fieldLimits?.nameLength,
maxFieldValueLength = instance.pleroma?.metadata?.fieldLimits?.valueLength maxFieldValueLength = instance.pleroma?.metadata?.fieldLimits?.valueLength
) )
dao.insertOrReplace(instanceEntity) dao.upsert(instanceEntity)
instanceEntity instanceEntity
}, },
{ throwable -> { throwable ->

30
app/src/main/java/com/keylesspalace/tusky/db/InstanceDao.kt
View File

@ -20,15 +20,37 @@ import androidx.room.Insert
import androidx.room.OnConflictStrategy import androidx.room.OnConflictStrategy
import androidx.room.Query import androidx.room.Query
import androidx.room.RewriteQueriesToDropUnusedColumns import androidx.room.RewriteQueriesToDropUnusedColumns
import androidx.room.Transaction
import androidx.room.Update
@Dao @Dao
interface InstanceDao { interface InstanceDao {
@Insert(onConflict = OnConflictStrategy.REPLACE, entity = InstanceEntity::class) @Insert(onConflict = OnConflictStrategy.IGNORE, entity = InstanceEntity::class)
suspend fun insertOrReplace(instance: InstanceInfoEntity) suspend fun insertOrIgnore(instance: InstanceInfoEntity): Long
@Insert(onConflict = OnConflictStrategy.REPLACE, entity = InstanceEntity::class) @Update(onConflict = OnConflictStrategy.IGNORE, entity = InstanceEntity::class)
suspend fun insertOrReplace(emojis: EmojisEntity) suspend fun updateOrIgnore(instance: InstanceInfoEntity)
@Transaction
suspend fun upsert(instance: InstanceInfoEntity) {
if (insertOrIgnore(instance) == -1L) {
updateOrIgnore(instance)
}
}
@Insert(onConflict = OnConflictStrategy.IGNORE, entity = InstanceEntity::class)
suspend fun insertOrIgnore(emojis: EmojisEntity): Long
@Update(onConflict = OnConflictStrategy.IGNORE, entity = InstanceEntity::class)
suspend fun updateOrIgnore(emojis: EmojisEntity)
@Transaction
suspend fun upsert(emojis: EmojisEntity) {
if (insertOrIgnore(emojis) == -1L) {
updateOrIgnore(emojis)
}
}
@RewriteQueriesToDropUnusedColumns @RewriteQueriesToDropUnusedColumns
@Query("SELECT * FROM InstanceEntity WHERE instance = :instance LIMIT 1") @Query("SELECT * FROM InstanceEntity WHERE instance = :instance LIMIT 1")