avior/Neo-Store
1
0
Fork 0
mirror of https://github.com/Aviortheking/Neo-Store.git synced 2025-06-09 09:19:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up

Browse Source
This commit is contained in:
machiav3lli 2022-02-01 00:24:40 +01:00
parent d5c1fb9fb6
commit 63c7a65e21
6 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/kotlin/com/looker/droidify/MainApplication.kt
View File

@ -83,9 +83,9 @@ class MainApplication : Application(), ImageLoaderFactory {
addAction(Intent.ACTION_PACKAGE_REMOVED) addAction(Intent.ACTION_PACKAGE_REMOVED)
addDataScheme("package") addDataScheme("package")
}) })
val installedItems = val installedItems = packageManager
packageManager.getInstalledPackages(Android.PackageManager.signaturesFlag) .getInstalledPackages(Android.PackageManager.signaturesFlag)
.map { it.toInstalledItem() } .map { it.toInstalledItem() }
CoroutineScope(Dispatchers.Default).launch { CoroutineScope(Dispatchers.Default).launch {
db.installedDao.put(*installedItems.toTypedArray()) db.installedDao.put(*installedItems.toTypedArray())
} }

1
src/main/kotlin/com/looker/droidify/database/DAOs.kt
View File

@ -285,7 +285,6 @@ interface InstalledDao : BaseDao<Installed> {
} }
@Query("SELECT * FROM memory_installed WHERE package_name = :packageName") @Query("SELECT * FROM memory_installed WHERE package_name = :packageName")
fun get(packageName: String): Cursor
@Query("SELECT * FROM memory_installed WHERE package_name = :packageName") @Query("SELECT * FROM memory_installed WHERE package_name = :packageName")
fun getObject(packageName: String): Installed? fun getObject(packageName: String): Installed?

2
src/main/kotlin/com/looker/droidify/service/SyncService.kt
View File

@ -443,7 +443,7 @@ class SyncService : ConnectionService<SyncService.Binder>() {
// run startUpdate on every item // run startUpdate on every item
productItems.map { productItem -> productItems.map { productItem ->
Pair( Pair(
db.installedDao.getObject(productItem.packageName), db.installedDao.get(productItem.packageName),
db.repositoryDao.get(productItem.repositoryId) db.repositoryDao.get(productItem.repositoryId)
) )
} }

2
src/main/kotlin/com/looker/droidify/ui/fragments/AppDetailFragment.kt
View File

@ -160,7 +160,7 @@ class AppDetailFragment() : ScreenFragment(), AppDetailAdapter.Callbacks {
} }
.flatMapSingle { products -> .flatMapSingle { products ->
RxUtils RxUtils
.querySingle { Nullable(screenActivity.db.installedDao.getObject(packageName)) } .querySingle { Nullable(screenActivity.db.installedDao.get(packageName)) }
.map { Pair(products, it) } .map { Pair(products, it) }
} }
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())

3
src/main/kotlin/com/looker/droidify/ui/viewmodels/MainActivityViewModelX.kt
View File

@ -1,9 +1,6 @@
package com.looker.droidify.ui.viewmodels package com.looker.droidify.ui.viewmodels
import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModel
import com.looker.droidify.database.CursorOwner
class MainActivityViewModelX : ViewModel() { class MainActivityViewModelX : ViewModel() {
val activeRequests = mutableMapOf<Int, CursorOwner.ActiveRequest>()
} }

9
src/main/kotlin/com/looker/droidify/utility/Utils.kt
View File

@ -9,7 +9,6 @@ import android.content.pm.Signature
import android.content.res.Configuration import android.content.res.Configuration
import android.database.Cursor import android.database.Cursor
import android.graphics.drawable.Drawable import android.graphics.drawable.Drawable
import android.os.Build
import androidx.recyclerview.widget.AsyncDifferConfig import androidx.recyclerview.widget.AsyncDifferConfig
import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.DiffUtil
import com.fasterxml.jackson.core.JsonGenerator import com.fasterxml.jackson.core.JsonGenerator
@ -136,11 +135,7 @@ object Utils {
setLocalCode = Locale.getDefault().language setLocalCode = Locale.getDefault().language
} }
val config = resources.configuration val config = resources.configuration
val sysLocale = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { val sysLocale = if (Android.sdk(24)) config.locales[0] else config.locale
config.locales[0]
} else {
config.locale
}
if (setLocalCode != sysLocale.language || setLocalCode != "${sysLocale.language}-r${sysLocale.country}") { if (setLocalCode != sysLocale.language || setLocalCode != "${sysLocale.language}-r${sysLocale.country}") {
val newLocale = getLocaleOfCode(setLocalCode) val newLocale = getLocaleOfCode(setLocalCode)
Locale.setDefault(newLocale) Locale.setDefault(newLocale)
@ -165,7 +160,7 @@ object Utils {
} }
fun Context.getLocaleOfCode(localeCode: String): Locale = when { fun Context.getLocaleOfCode(localeCode: String): Locale = when {
localeCode.isEmpty() -> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { localeCode.isEmpty() -> if (Android.sdk(24)) {
resources.configuration.locales[0] resources.configuration.locales[0]
} else { } else {
resources.configuration.locale resources.configuration.locale