Revert "AppUpdateView: Show icons on incompatible updates buttons"

This reverts commit d4552007a7.
This commit is contained in:
Aayush Gupta
2024-02-15 17:27:21 +05:30
parent 454dc3dd33
commit 42c182bdb7
7 changed files with 14 additions and 64 deletions

View File

@@ -1,22 +0,0 @@
package com.aurora.extensions
import android.content.Context
import android.content.pm.PackageManager
import com.aurora.gplayapi.data.models.App
import com.aurora.store.util.CertUtil
fun App.isEnabled(context: Context): Boolean {
return context.packageManager.getApplicationInfo(
this.packageName,
PackageManager.GET_META_DATA
).enabled
}
fun App.hasValidCertificate(context: Context): Boolean {
return this.certificateSetList.any {
it.certificateSet in CertUtil.getEncodedCertificateHashes(
context,
this.packageName
)
}
}

View File

@@ -22,7 +22,6 @@ package com.aurora.store.view.custom.layouts.button
import android.content.Context
import android.util.AttributeSet
import android.widget.RelativeLayout
import androidx.annotation.DrawableRes
import com.aurora.extensions.getString
import com.aurora.extensions.runOnUiThread
import com.aurora.store.R
@@ -73,12 +72,6 @@ class UpdateButton : RelativeLayout {
B.btnPositive.text = getString(text)
}
fun setIcon(@DrawableRes drawable: Int) {
B.btnPositive.setIconResource(drawable)
B.btnNegative.setIconResource(drawable)
B.btnQueued.setIconResource(drawable)
}
fun updateState(downloadStatus: DownloadStatus) {
val displayChild = when (downloadStatus) {
DownloadStatus.QUEUED,

View File

@@ -32,9 +32,7 @@ import com.airbnb.epoxy.CallbackProp
import com.airbnb.epoxy.ModelProp
import com.airbnb.epoxy.ModelView
import com.airbnb.epoxy.OnViewRecycled
import com.aurora.extensions.hasValidCertificate
import com.aurora.extensions.invisible
import com.aurora.extensions.isEnabled
import com.aurora.extensions.px
import com.aurora.gplayapi.data.models.App
import com.aurora.store.R
@@ -83,12 +81,6 @@ class AppUpdateView : RelativeLayout {
transformations(RoundedCornersTransformation(8.px.toFloat()))
}
if (isEnabled(context)) {
if (!hasValidCertificate(context)) B.btnAction.setIcon(R.drawable.ic_security_fail)
} else {
B.btnAction.setIcon(R.drawable.ic_disabled)
}
B.txtLine2.text = developerName
B.txtLine3.text = ("${CommonUtil.addSiPrefix(size)}$updatedOn")
B.txtLine4.text = ("$versionName (${versionCode})")

View File

@@ -23,8 +23,8 @@ import android.app.Application
import android.util.Log
import androidx.core.content.pm.PackageInfoCompat
import androidx.lifecycle.viewModelScope
import com.aurora.extensions.hasValidCertificate
import com.aurora.gplayapi.data.models.App
import com.aurora.store.util.CertUtil
import com.aurora.store.util.DownloadWorkerUtil
import com.aurora.store.util.Preferences
import dagger.hilt.android.lifecycle.HiltViewModel
@@ -67,7 +67,16 @@ class UpdatesViewModel @Inject constructor(
}
}.sortedBy { it.displayName.lowercase(Locale.getDefault()) }.also { apps ->
if (!isExtendedUpdateEnabled) {
_updates.emit(apps.filter { it.hasValidCertificate(getApplication()) })
_updates.emit(
apps.filter { app ->
app.certificateSetList.any {
it.certificateSet in CertUtil.getEncodedCertificateHashes(
getApplication(),
app.packageName
)
}
}
)
} else {
_updates.emit(apps)
}