opensourcemirror
/
fdroid-client
mirror of https://gitlab.com/fdroid/fdroidclient.git
1
0
Fork 0
Code Issues Releases Wiki Activity

[db] Use `LocaleListCompat.getDefault()` 

Not a fan to bake this in everywhere, but perhaps we'll address it someday.
This commit is contained in:
Ray c 2024-04-16 02:03:51 +00:00
parent c4be61c5a8
commit 63b06c0bda
5 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libs/database/src/main/java/org/fdroid/database/DbV1StreamReceiver.kt
View File

@ -1,7 +1,5 @@
package org.fdroid.database
import android.content.res.Resources
import androidx.core.os.ConfigurationCompat.getLocales
import androidx.core.os.LocaleListCompat
import org.fdroid.CompatibilityChecker
import org.fdroid.index.IndexFormatVersion.ONE
@ -24,7 +22,7 @@ internal class DbV1StreamReceiver(
private val compatibilityChecker: CompatibilityChecker,
) : IndexV1StreamReceiver {
private val locales: LocaleListCompat = getLocales(Resources.getSystem().configuration)
private val locales: LocaleListCompat = LocaleListCompat.getDefault()
override fun receive(repo: RepoV2, version: Long, certificate: String?) {
db.getRepositoryDao().clear(repoId)

4
libs/database/src/main/java/org/fdroid/database/DbV2DiffStreamReceiver.kt
View File

@ -1,7 +1,5 @@
package org.fdroid.database
import android.content.res.Resources
import androidx.core.os.ConfigurationCompat.getLocales
import androidx.core.os.LocaleListCompat
import kotlinx.serialization.json.JsonObject
import org.fdroid.CompatibilityChecker
@ -13,7 +11,7 @@ internal class DbV2DiffStreamReceiver(
private val compatibilityChecker: CompatibilityChecker,
) : IndexV2DiffStreamReceiver {
private val locales: LocaleListCompat = getLocales(Resources.getSystem().configuration)
private val locales: LocaleListCompat = LocaleListCompat.getDefault()
override fun receiveRepoDiff(version: Long, repoJsonObject: JsonObject) {
db.getRepositoryDao().updateRepository(repoId, version, repoJsonObject)

4
libs/database/src/main/java/org/fdroid/database/DbV2StreamReceiver.kt
View File

@ -1,7 +1,5 @@
package org.fdroid.database
import android.content.res.Resources
import androidx.core.os.ConfigurationCompat.getLocales
import androidx.core.os.LocaleListCompat
import kotlinx.serialization.SerializationException
import org.fdroid.CompatibilityChecker
@ -23,7 +21,7 @@ internal class DbV2StreamReceiver(
private val compatibilityChecker: CompatibilityChecker,
) : IndexV2StreamReceiver {
private val locales: LocaleListCompat = getLocales(Resources.getSystem().configuration)
private val locales: LocaleListCompat = LocaleListCompat.getDefault()
private var clearedRepoData = false
private val nonNullFileV2: (FileV2?) -> Unit = { fileV2 ->
if (fileV2 != null) {

4
libs/database/src/main/java/org/fdroid/repo/RepoV1Fetcher.kt
View File

@ -1,8 +1,6 @@
package org.fdroid.repo
import android.content.res.Resources
import android.net.Uri
import androidx.core.os.ConfigurationCompat.getLocales
import androidx.core.os.LocaleListCompat
import kotlinx.serialization.SerializationException
import org.fdroid.database.Repository
@ -24,7 +22,7 @@ internal class RepoV1Fetcher(
private val repoUriBuilder: RepoUriBuilder,
) : RepoFetcher {
private val locales: LocaleListCompat = getLocales(Resources.getSystem().configuration)
private val locales: LocaleListCompat = LocaleListCompat.getDefault()
@Throws(SigningException::class, SerializationException::class)
override suspend fun fetchRepo(

4
libs/database/src/main/java/org/fdroid/repo/RepoV2StreamReceiver.kt
View File

@ -1,7 +1,5 @@
package org.fdroid.repo
import android.content.res.Resources
import androidx.core.os.ConfigurationCompat.getLocales
import androidx.core.os.LocaleListCompat
import org.fdroid.LocaleChooser.getBestLocale
import org.fdroid.database.AppOverviewItem
@ -78,7 +76,7 @@ internal open class RepoV2StreamReceiver(
)
}
private val locales: LocaleListCompat = getLocales(Resources.getSystem().configuration)
private val locales: LocaleListCompat = LocaleListCompat.getDefault()
override fun receive(repo: RepoV2, version: Long, certificate: String) {
receiver.onRepoReceived(