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

fixup! Fix AuroraOSS/AuroraStore#981 allow Sui without Shizuku app

Browse Source 
Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>
This commit is contained in:
Aayush Gupta
2023-12-18 15:40:12 +05:30
parent db609d9e81
commit 8f518d026a
3 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -80,12 +80,11 @@ open class AppInstaller private constructor(var context: Context) {
PackageUtil.isInstalled(context, AMInstaller.AM_DEBUG_PACKAGE_NAME) PackageUtil.isInstalled(context, AMInstaller.AM_DEBUG_PACKAGE_NAME)
} }
fun hasShizuku(context: Context): Boolean {
return PackageUtil.isInstalled(context, ShizukuInstaller.SHIZUKU_PACKAGE_NAME)
}
fun hasShizukuOrSui(context: Context): Boolean { fun hasShizukuOrSui(context: Context): Boolean {
return hasShizuku(context) || Sui.isSui() return PackageUtil.isInstalled(
context,
ShizukuInstaller.SHIZUKU_PACKAGE_NAME
) || Sui.isSui()
} }
fun hasShizukuPerm(): Boolean { fun hasShizukuPerm(): Boolean {

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

@@ -28,9 +28,9 @@ 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.hasShizuku
import com.aurora.store.data.installer.AppInstaller.Companion.hasShizukuOrSui import com.aurora.store.data.installer.AppInstaller.Companion.hasShizukuOrSui
import com.aurora.store.data.installer.AppInstaller.Companion.hasShizukuPerm import com.aurora.store.data.installer.AppInstaller.Companion.hasShizukuPerm
import com.aurora.store.data.model.Installer import com.aurora.store.data.model.Installer
@@ -85,6 +85,12 @@ 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()) {
Shizuku.addBinderReceivedListenerSticky(shizukuAliveListener)
Shizuku.addBinderDeadListener(shizukuDeadListener)
Shizuku.addRequestPermissionResultListener(shizukuResultListener)
}
// RecyclerView // RecyclerView
binding.epoxyRecycler.withModels { binding.epoxyRecycler.withModels {
setFilterDuplicates(true) setFilterDuplicates(true)
@@ -115,7 +121,7 @@ class InstallerFragment : BaseFragment(R.layout.fragment_onboarding_installer) {
} }
override fun onDestroy() { override fun onDestroy() {
if (hasShizuku(requireContext()) && isOAndAbove()) { if (hasShizukuOrSui(requireContext()) && isOAndAbove()) {
Shizuku.removeBinderReceivedListener(shizukuAliveListener) Shizuku.removeBinderReceivedListener(shizukuAliveListener)
Shizuku.removeBinderDeadListener(shizukuDeadListener) Shizuku.removeBinderDeadListener(shizukuDeadListener)
Shizuku.removeRequestPermissionResultListener(shizukuResultListener) Shizuku.removeRequestPermissionResultListener(shizukuResultListener)

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

@@ -97,7 +97,7 @@ class InstallationPreference : PreferenceFragmentCompat() {
setNavigationOnClickListener { findNavController().navigateUp() } setNavigationOnClickListener { findNavController().navigateUp() }
} }
if (AppInstaller.hasShizuku(requireContext()) && isOAndAbove()) { if (AppInstaller.hasShizukuOrSui(requireContext()) && isOAndAbove()) {
Shizuku.addBinderReceivedListenerSticky(shizukuAliveListener) Shizuku.addBinderReceivedListenerSticky(shizukuAliveListener)
Shizuku.addBinderDeadListener(shizukuDeadListener) Shizuku.addBinderDeadListener(shizukuDeadListener)
Shizuku.addRequestPermissionResultListener(shizukuResultListener) Shizuku.addRequestPermissionResultListener(shizukuResultListener)
@@ -188,7 +188,7 @@ class InstallationPreference : PreferenceFragmentCompat() {
} }
override fun onDestroy() { override fun onDestroy() {
if (AppInstaller.hasShizuku(requireContext()) && isOAndAbove()) { if (AppInstaller.hasShizukuOrSui(requireContext()) && isOAndAbove()) {
Shizuku.removeBinderReceivedListener(shizukuAliveListener) Shizuku.removeBinderReceivedListener(shizukuAliveListener)
Shizuku.removeBinderDeadListener(shizukuDeadListener) Shizuku.removeBinderDeadListener(shizukuDeadListener)
Shizuku.removeRequestPermissionResultListener(shizukuResultListener) Shizuku.removeRequestPermissionResultListener(shizukuResultListener)