diff --git a/app/src/main/java/com/aurora/store/view/ui/onboarding/InstallerFragment.kt b/app/src/main/java/com/aurora/store/view/ui/onboarding/InstallerFragment.kt index 073aa8083..f8a0486ae 100644 --- a/app/src/main/java/com/aurora/store/view/ui/onboarding/InstallerFragment.kt +++ b/app/src/main/java/com/aurora/store/view/ui/onboarding/InstallerFragment.kt @@ -84,7 +84,7 @@ class InstallerFragment : BaseFragment() { savedInstanceState: Bundle? ): View { - if (isOAndAbove()) { + if (hasShizuku(requireContext()) && isOAndAbove()) { Shizuku.addBinderReceivedListenerSticky(shizukuAliveListener) Shizuku.addBinderDeadListener(shizukuDeadListener) Shizuku.addRequestPermissionResultListener(shizukuResultListener) @@ -114,7 +114,7 @@ class InstallerFragment : BaseFragment() { } override fun onDestroy() { - if (isOAndAbove()) { + if (hasShizuku(requireContext()) && isOAndAbove()) { Shizuku.removeBinderReceivedListener(shizukuAliveListener) Shizuku.removeBinderDeadListener(shizukuDeadListener) Shizuku.removeRequestPermissionResultListener(shizukuResultListener) diff --git a/app/src/main/java/com/aurora/store/view/ui/preferences/InstallationPreference.kt b/app/src/main/java/com/aurora/store/view/ui/preferences/InstallationPreference.kt index ed328d468..c3c45506a 100644 --- a/app/src/main/java/com/aurora/store/view/ui/preferences/InstallationPreference.kt +++ b/app/src/main/java/com/aurora/store/view/ui/preferences/InstallationPreference.kt @@ -75,7 +75,7 @@ class InstallationPreference : PreferenceFragmentCompat() { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - if (isOAndAbove()) { + if (AppInstaller.hasShizuku(requireContext()) && isOAndAbove()) { Shizuku.addBinderReceivedListenerSticky(shizukuAliveListener) Shizuku.addBinderDeadListener(shizukuDeadListener) Shizuku.addRequestPermissionResultListener(shizukuResultListener) @@ -166,7 +166,7 @@ class InstallationPreference : PreferenceFragmentCompat() { } override fun onDestroy() { - if (isOAndAbove()) { + if (AppInstaller.hasShizuku(requireContext()) && isOAndAbove()) { Shizuku.removeBinderReceivedListener(shizukuAliveListener) Shizuku.removeBinderDeadListener(shizukuDeadListener) Shizuku.removeRequestPermissionResultListener(shizukuResultListener)