From 42c182bdb78f351c309e2d0067a24564f708576f Mon Sep 17 00:00:00 2001 From: Aayush Gupta Date: Thu, 15 Feb 2024 17:27:21 +0530 Subject: [PATCH] Revert "AppUpdateView: Show icons on incompatible updates buttons" This reverts commit d4552007a7ac330eafb58f2112c11abd4e527976. --- .../main/java/com/aurora/extensions/App.kt | 22 ------------------- .../custom/layouts/button/UpdateButton.kt | 7 ------ .../view/epoxy/views/app/AppUpdateView.kt | 8 ------- .../store/viewmodel/all/UpdatesViewModel.kt | 13 +++++++++-- app/src/main/res/drawable/ic_disabled.xml | 11 ---------- .../main/res/drawable/ic_security_fail.xml | 11 ---------- .../main/res/layout/view_update_button.xml | 6 ++--- 7 files changed, 14 insertions(+), 64 deletions(-) delete mode 100644 app/src/main/java/com/aurora/extensions/App.kt delete mode 100644 app/src/main/res/drawable/ic_disabled.xml delete mode 100644 app/src/main/res/drawable/ic_security_fail.xml diff --git a/app/src/main/java/com/aurora/extensions/App.kt b/app/src/main/java/com/aurora/extensions/App.kt deleted file mode 100644 index b02ad7fb2..000000000 --- a/app/src/main/java/com/aurora/extensions/App.kt +++ /dev/null @@ -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 - ) - } -} diff --git a/app/src/main/java/com/aurora/store/view/custom/layouts/button/UpdateButton.kt b/app/src/main/java/com/aurora/store/view/custom/layouts/button/UpdateButton.kt index f5b5196e0..f8261d32a 100644 --- a/app/src/main/java/com/aurora/store/view/custom/layouts/button/UpdateButton.kt +++ b/app/src/main/java/com/aurora/store/view/custom/layouts/button/UpdateButton.kt @@ -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, diff --git a/app/src/main/java/com/aurora/store/view/epoxy/views/app/AppUpdateView.kt b/app/src/main/java/com/aurora/store/view/epoxy/views/app/AppUpdateView.kt index 5cbe3b4ab..e973ff853 100644 --- a/app/src/main/java/com/aurora/store/view/epoxy/views/app/AppUpdateView.kt +++ b/app/src/main/java/com/aurora/store/view/epoxy/views/app/AppUpdateView.kt @@ -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})") diff --git a/app/src/main/java/com/aurora/store/viewmodel/all/UpdatesViewModel.kt b/app/src/main/java/com/aurora/store/viewmodel/all/UpdatesViewModel.kt index f8f846af9..e93317044 100644 --- a/app/src/main/java/com/aurora/store/viewmodel/all/UpdatesViewModel.kt +++ b/app/src/main/java/com/aurora/store/viewmodel/all/UpdatesViewModel.kt @@ -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) } diff --git a/app/src/main/res/drawable/ic_disabled.xml b/app/src/main/res/drawable/ic_disabled.xml deleted file mode 100644 index a13a7ff14..000000000 --- a/app/src/main/res/drawable/ic_disabled.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_security_fail.xml b/app/src/main/res/drawable/ic_security_fail.xml deleted file mode 100644 index 08b02ca58..000000000 --- a/app/src/main/res/drawable/ic_security_fail.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - diff --git a/app/src/main/res/layout/view_update_button.xml b/app/src/main/res/layout/view_update_button.xml index 83d37996e..773b548e1 100644 --- a/app/src/main/res/layout/view_update_button.xml +++ b/app/src/main/res/layout/view_update_button.xml @@ -36,7 +36,7 @@