UpdatePreferences: Drop Google apps filter

Doesn't covers all possible apps nor makes sense as lot of
android core system apps are developed by Google. Users should
blacklist apps manually which they don't want to be updated instead.

Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>
This commit is contained in:
Aayush Gupta
2024-11-21 13:33:28 +07:00
parent 277198762b
commit b7cf4c5918
59 changed files with 63 additions and 198 deletions

View File

@@ -75,9 +75,6 @@ class UpdateWorker @AssistedInject constructor(
private val isAuroraOnlyFilterEnabled: Boolean
get() = Preferences.getBoolean(appContext, Preferences.PREFERENCE_FILTER_AURORA_ONLY, false)
private val isGoogleFilterEnabled: Boolean
get() = Preferences.getBoolean(appContext, Preferences.PREFERENCE_FILTER_GOOGLE)
private val isFDroidFilterEnabled: Boolean
get() = Preferences.getBoolean(appContext, Preferences.PREFERENCE_FILTER_FDROID)
@@ -165,9 +162,7 @@ class UpdateWorker @AssistedInject constructor(
val filteredPackages = if (isAuroraOnlyFilterEnabled) {
packages.filter { CertUtil.isAuroraStoreApp(appContext, it.packageName) }
} else {
packages
.filterNot { if (isFDroidFilterEnabled) CertUtil.isFDroidApp(appContext, it.packageName) else false }
.filterNot { if (isGoogleFilterEnabled) CertUtil.isGoogleApp(it.packageName) else false }
packages.filterNot { if (isFDroidFilterEnabled) CertUtil.isFDroidApp(appContext, it.packageName) else false }
}
val updates = appDetailsHelper.getAppByPackageName(filteredPackages.map { it.packageName })

View File

@@ -44,16 +44,6 @@ object CertUtil {
return context.packageManager.getUpdateOwnerPackageNameCompat(packageName) == "com.huawei.appmarket"
}
fun isGoogleApp(packageName: String): Boolean {
return packageName.contains("com.google") || listOf(
"com.chrome.beta",
"com.chrome.canary",
"com.chrome.dev",
"com.android.chrome",
"com.niksoftware.snapseed"
).contains(packageName)
}
fun isAuroraStoreApp(context: Context, packageName: String): Boolean {
val packageInstaller = context.packageManager.getUpdateOwnerPackageNameCompat(packageName)
return listOf(

View File

@@ -37,7 +37,6 @@ object Preferences {
const val PREFERENCE_SIMILAR = "PREFERENCE_SIMILAR"
const val PREFERENCE_INTRO = "PREFERENCE_INTRO"
const val PREFERENCE_FILTER_GOOGLE = "PREFERENCE_FILTER_GOOGLE"
const val PREFERENCE_FILTER_FDROID = "PREFERENCE_FILTER_FDROID"
const val PREFERENCE_FILTER_AURORA_ONLY = "PREFERENCE_FILTER_AURORA_ONLY"

View File

@@ -46,7 +46,6 @@ import com.aurora.store.util.Preferences.PREFERENCE_DEFAULT_SELECTED_TAB
import com.aurora.store.util.Preferences.PREFERENCE_DISPENSER_URLS
import com.aurora.store.util.Preferences.PREFERENCE_FILTER_AURORA_ONLY
import com.aurora.store.util.Preferences.PREFERENCE_FILTER_FDROID
import com.aurora.store.util.Preferences.PREFERENCE_FILTER_GOOGLE
import com.aurora.store.util.Preferences.PREFERENCE_FOR_YOU
import com.aurora.store.util.Preferences.PREFERENCE_INSTALLER_ID
import com.aurora.store.util.Preferences.PREFERENCE_INTRO
@@ -164,7 +163,6 @@ class OnboardingFragment : BaseFragment<FragmentOnboardingBinding>() {
/*Filters*/
save(PREFERENCE_FILTER_AURORA_ONLY, false)
save(PREFERENCE_FILTER_FDROID, true)
save(PREFERENCE_FILTER_GOOGLE, false)
/*Network*/
// TODO: Gather feedback and drop setting default dispenser for all builds

View File

@@ -33,7 +33,6 @@ import com.aurora.store.data.model.UpdateMode
import com.aurora.store.util.Preferences
import com.aurora.store.util.Preferences.PREFERENCE_FILTER_AURORA_ONLY
import com.aurora.store.util.Preferences.PREFERENCE_FILTER_FDROID
import com.aurora.store.util.Preferences.PREFERENCE_FILTER_GOOGLE
import com.aurora.store.util.Preferences.PREFERENCE_UPDATES_AUTO
import com.aurora.store.util.Preferences.PREFERENCE_UPDATES_CHECK_INTERVAL
import com.aurora.store.util.Preferences.PREFERENCE_UPDATES_EXTENDED
@@ -50,63 +49,57 @@ class UpdatesPreference : BasePreferenceFragment() {
override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
setPreferencesFromResource(R.xml.preferences_updates, rootKey)
val nonAuroraFilters: List<SwitchPreferenceCompat> = listOfNotNull(
findPreference(PREFERENCE_FILTER_FDROID),
findPreference(PREFERENCE_FILTER_GOOGLE)
)
findPreference<ListPreference>(PREFERENCE_UPDATES_AUTO)?.setOnPreferenceChangeListener { _, newValue ->
val updateCheckIntervalPref =
findPreference<SeekBarPreference>(PREFERENCE_UPDATES_CHECK_INTERVAL)
findPreference<ListPreference>(PREFERENCE_UPDATES_AUTO)
?.setOnPreferenceChangeListener { _, newValue ->
val updateCheckIntervalPref =
findPreference<SeekBarPreference>(PREFERENCE_UPDATES_CHECK_INTERVAL)
when (UpdateMode.entries[newValue.toString().toInt()]) {
UpdateMode.DISABLED -> {
updateCheckIntervalPref?.isEnabled = false
updateHelper.cancelAutomatedCheck()
requireContext().save(PREFERENCE_UPDATES_AUTO, 0)
true
}
UpdateMode.CHECK_AND_NOTIFY -> {
if (permissionProvider.isGranted(PermissionType.POST_NOTIFICATIONS)) {
updateCheckIntervalPref?.isEnabled = true
updateHelper.scheduleAutomatedCheck()
true
} else {
permissionProvider.request(PermissionType.POST_NOTIFICATIONS) {
if (it) {
updateCheckIntervalPref?.isEnabled = true
requireContext().save(PREFERENCE_UPDATES_AUTO, 1)
updateHelper.scheduleAutomatedCheck()
activity?.recreate()
}
}
false
}
}
UpdateMode.CHECK_AND_INSTALL -> {
if (permissionProvider.isGranted(PermissionType.DOZE_WHITELIST)) {
updateCheckIntervalPref?.isEnabled = true
updateHelper.scheduleAutomatedCheck()
true
} else {
permissionProvider.request(PermissionType.DOZE_WHITELIST) {
if (it) {
updateCheckIntervalPref?.isEnabled = true
requireContext().save(PREFERENCE_UPDATES_AUTO, 2)
updateHelper.scheduleAutomatedCheck()
activity?.recreate()
}
}
false
}
}
else -> false
when (UpdateMode.entries[newValue.toString().toInt()]) {
UpdateMode.DISABLED -> {
updateCheckIntervalPref?.isEnabled = false
updateHelper.cancelAutomatedCheck()
requireContext().save(PREFERENCE_UPDATES_AUTO, 0)
true
}
UpdateMode.CHECK_AND_NOTIFY -> {
if (permissionProvider.isGranted(PermissionType.POST_NOTIFICATIONS)) {
updateCheckIntervalPref?.isEnabled = true
updateHelper.scheduleAutomatedCheck()
true
} else {
permissionProvider.request(PermissionType.POST_NOTIFICATIONS) {
if (it) {
updateCheckIntervalPref?.isEnabled = true
requireContext().save(PREFERENCE_UPDATES_AUTO, 1)
updateHelper.scheduleAutomatedCheck()
activity?.recreate()
}
}
false
}
}
UpdateMode.CHECK_AND_INSTALL -> {
if (permissionProvider.isGranted(PermissionType.DOZE_WHITELIST)) {
updateCheckIntervalPref?.isEnabled = true
updateHelper.scheduleAutomatedCheck()
true
} else {
permissionProvider.request(PermissionType.DOZE_WHITELIST) {
if (it) {
updateCheckIntervalPref?.isEnabled = true
requireContext().save(PREFERENCE_UPDATES_AUTO, 2)
updateHelper.scheduleAutomatedCheck()
activity?.recreate()
}
}
false
}
}
else -> false
}
}
findPreference<SeekBarPreference>(PREFERENCE_UPDATES_CHECK_INTERVAL)?.apply {
isEnabled = Preferences.getInteger(requireContext(), PREFERENCE_UPDATES_AUTO) != 0
@@ -118,14 +111,15 @@ class UpdatesPreference : BasePreferenceFragment() {
findPreference<SwitchPreferenceCompat>(PREFERENCE_FILTER_AURORA_ONLY)
?.setOnPreferenceChangeListener { _, newValue ->
nonAuroraFilters.forEach { it.isEnabled = !newValue.toString().toBoolean() }
findPreference<SwitchPreferenceCompat>(PREFERENCE_FILTER_FDROID)?.isEnabled =
!newValue.toString().toBoolean()
updateHelper.checkUpdatesNow()
true
}
nonAuroraFilters.forEach {
it.isEnabled = !Preferences.getBoolean(requireContext(), PREFERENCE_FILTER_AURORA_ONLY)
it.setOnPreferenceChangeListener { _, _ ->
findPreference<SwitchPreferenceCompat>(PREFERENCE_FILTER_FDROID)?.apply {
isEnabled = !Preferences.getBoolean(requireContext(), PREFERENCE_FILTER_AURORA_ONLY)
setOnPreferenceChangeListener { _, _ ->
updateHelper.checkUpdatesNow()
true
}