athaliar/APKDownloader
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AppInstaller: Make lint happy about version check for shizuku

Browse Source 
Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>
This commit is contained in:
Aayush Gupta
2024-02-08 12:49:22 +01:00
parent 5ceb339b35
commit 473d59ad78
3 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/com/aurora/store/data/installer/AppInstaller.kt
View File

@@ -25,6 +25,8 @@ import android.content.Intent
import android.content.pm.PackageInstaller import android.content.pm.PackageInstaller
import android.content.pm.PackageManager import android.content.pm.PackageManager
import android.net.Uri import android.net.Uri
import android.os.Build
import androidx.annotation.RequiresApi
import com.aurora.extensions.isOAndAbove import com.aurora.extensions.isOAndAbove
import com.aurora.extensions.isPAndAbove import com.aurora.extensions.isPAndAbove
import com.aurora.store.BuildConfig import com.aurora.store.BuildConfig
@@ -78,6 +80,7 @@ class AppInstaller @Inject constructor(@ApplicationContext private val context:
PackageUtil.isInstalled(context, AMInstaller.AM_DEBUG_PACKAGE_NAME) PackageUtil.isInstalled(context, AMInstaller.AM_DEBUG_PACKAGE_NAME)
} }
@RequiresApi(Build.VERSION_CODES.O)
fun hasShizukuOrSui(context: Context): Boolean { fun hasShizukuOrSui(context: Context): Boolean {
return PackageUtil.isInstalled( return PackageUtil.isInstalled(
context, context,

7
app/src/main/java/com/aurora/store/view/ui/onboarding/InstallerFragment.kt
View File

@@ -28,7 +28,6 @@ import com.aurora.extensions.isMiuiOptimizationDisabled
import com.aurora.extensions.isOAndAbove import com.aurora.extensions.isOAndAbove
import com.aurora.extensions.showDialog import com.aurora.extensions.showDialog
import com.aurora.store.R import com.aurora.store.R
import com.aurora.store.data.installer.AppInstaller
import com.aurora.store.data.installer.AppInstaller.Companion.hasAppManager import com.aurora.store.data.installer.AppInstaller.Companion.hasAppManager
import com.aurora.store.data.installer.AppInstaller.Companion.hasRootAccess import com.aurora.store.data.installer.AppInstaller.Companion.hasRootAccess
import com.aurora.store.data.installer.AppInstaller.Companion.hasShizukuOrSui import com.aurora.store.data.installer.AppInstaller.Companion.hasShizukuOrSui
@@ -85,7 +84,7 @@ class InstallerFragment : BaseFragment(R.layout.fragment_onboarding_installer) {
installerId = Preferences.getInteger(requireContext(), PREFERENCE_INSTALLER_ID) installerId = Preferences.getInteger(requireContext(), PREFERENCE_INSTALLER_ID)
if (hasShizukuOrSui(requireContext()) && isOAndAbove()) { if (isOAndAbove() && hasShizukuOrSui(requireContext())) {
Shizuku.addBinderReceivedListenerSticky(shizukuAliveListener) Shizuku.addBinderReceivedListenerSticky(shizukuAliveListener)
Shizuku.addBinderDeadListener(shizukuDeadListener) Shizuku.addBinderDeadListener(shizukuDeadListener)
Shizuku.addRequestPermissionResultListener(shizukuResultListener) Shizuku.addRequestPermissionResultListener(shizukuResultListener)
@@ -121,7 +120,7 @@ class InstallerFragment : BaseFragment(R.layout.fragment_onboarding_installer) {
} }
override fun onDestroy() { override fun onDestroy() {
if (hasShizukuOrSui(requireContext()) && isOAndAbove()) { if (isOAndAbove() && hasShizukuOrSui(requireContext())) {
Shizuku.removeBinderReceivedListener(shizukuAliveListener) Shizuku.removeBinderReceivedListener(shizukuAliveListener)
Shizuku.removeBinderDeadListener(shizukuDeadListener) Shizuku.removeBinderDeadListener(shizukuDeadListener)
Shizuku.removeRequestPermissionResultListener(shizukuResultListener) Shizuku.removeRequestPermissionResultListener(shizukuResultListener)
@@ -163,7 +162,7 @@ class InstallerFragment : BaseFragment(R.layout.fragment_onboarding_installer) {
} }
} }
5 -> { 5 -> {
if (hasShizukuOrSui(requireContext()) && isOAndAbove()) { if (isOAndAbove() && hasShizukuOrSui(requireContext())) {
if (shizukuAlive && hasShizukuPerm()) { if (shizukuAlive && hasShizukuPerm()) {
this.installerId = installerId this.installerId = installerId
save(PREFERENCE_INSTALLER_ID, installerId) save(PREFERENCE_INSTALLER_ID, installerId)

12
app/src/main/java/com/aurora/store/view/ui/preferences/InstallationPreference.kt
View File

@@ -36,7 +36,6 @@ import com.aurora.store.R
import com.aurora.store.data.installer.AMInstaller import com.aurora.store.data.installer.AMInstaller
import com.aurora.store.data.installer.AppInstaller import com.aurora.store.data.installer.AppInstaller
import com.aurora.store.data.installer.ServiceInstaller import com.aurora.store.data.installer.ServiceInstaller
import com.aurora.store.data.installer.ShizukuInstaller
import com.aurora.store.util.CommonUtil import com.aurora.store.util.CommonUtil
import com.aurora.store.util.Log import com.aurora.store.util.Log
import com.aurora.store.util.PackageUtil import com.aurora.store.util.PackageUtil
@@ -97,7 +96,7 @@ class InstallationPreference : PreferenceFragmentCompat() {
setNavigationOnClickListener { findNavController().navigateUp() } setNavigationOnClickListener { findNavController().navigateUp() }
} }
if (AppInstaller.hasShizukuOrSui(requireContext()) && isOAndAbove()) { if (isOAndAbove() && AppInstaller.hasShizukuOrSui(requireContext())) {
Shizuku.addBinderReceivedListenerSticky(shizukuAliveListener) Shizuku.addBinderReceivedListenerSticky(shizukuAliveListener)
Shizuku.addBinderDeadListener(shizukuDeadListener) Shizuku.addBinderDeadListener(shizukuDeadListener)
Shizuku.addRequestPermissionResultListener(shizukuResultListener) Shizuku.addRequestPermissionResultListener(shizukuResultListener)
@@ -158,7 +157,7 @@ class InstallationPreference : PreferenceFragmentCompat() {
false false
} }
} else if (selectedId == 5) { } else if (selectedId == 5) {
if (AppInstaller.hasShizukuOrSui(requireContext()) && isOAndAbove()) { if (isOAndAbove() && AppInstaller.hasShizukuOrSui(requireContext())) {
if (shizukuAlive && AppInstaller.hasShizukuPerm()) { if (shizukuAlive && AppInstaller.hasShizukuPerm()) {
save(Preferences.PREFERENCE_INSTALLER_ID, selectedId) save(Preferences.PREFERENCE_INSTALLER_ID, selectedId)
true true
@@ -188,7 +187,7 @@ class InstallationPreference : PreferenceFragmentCompat() {
} }
override fun onDestroy() { override fun onDestroy() {
if (AppInstaller.hasShizukuOrSui(requireContext()) && isOAndAbove()) { if (isOAndAbove() && AppInstaller.hasShizukuOrSui(requireContext())) {
Shizuku.removeBinderReceivedListener(shizukuAliveListener) Shizuku.removeBinderReceivedListener(shizukuAliveListener)
Shizuku.removeBinderDeadListener(shizukuDeadListener) Shizuku.removeBinderDeadListener(shizukuDeadListener)
Shizuku.removeRequestPermissionResultListener(shizukuResultListener) Shizuku.removeRequestPermissionResultListener(shizukuResultListener)
@@ -225,9 +224,4 @@ class InstallationPreference : PreferenceFragmentCompat() {
AMInstaller.AM_DEBUG_PACKAGE_NAME AMInstaller.AM_DEBUG_PACKAGE_NAME
) )
} }
private fun checkShizukuAvailability(): Boolean {
return (PackageUtil.isInstalled(requireContext(), ShizukuInstaller.SHIZUKU_PACKAGE_NAME) || Sui.isSui()) &&
shizukuAlive && Shizuku.checkSelfPermission() == PackageManager.PERMISSION_GRANTED
}
} }