fixup! fixup! Implement Shizuku installer support

Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>
This commit is contained in:
Aayush Gupta
2023-06-30 17:56:26 +05:30
parent 8a58a26792
commit ed64eb3226
2 changed files with 24 additions and 7 deletions

View File

@@ -84,9 +84,11 @@ class InstallerFragment : BaseFragment() {
savedInstanceState: Bundle? savedInstanceState: Bundle?
): View { ): View {
Shizuku.addBinderReceivedListenerSticky(shizukuAliveListener) if (isOAndAbove()) {
Shizuku.addBinderDeadListener(shizukuDeadListener) Shizuku.addBinderReceivedListenerSticky(shizukuAliveListener)
Shizuku.addRequestPermissionResultListener(shizukuResultListener) Shizuku.addBinderDeadListener(shizukuDeadListener)
Shizuku.addRequestPermissionResultListener(shizukuResultListener)
}
B = FragmentOnboardingInstallerBinding.bind( B = FragmentOnboardingInstallerBinding.bind(
inflater.inflate( inflater.inflate(
@@ -112,7 +114,11 @@ class InstallerFragment : BaseFragment() {
} }
override fun onDestroy() { override fun onDestroy() {
Shizuku.removeRequestPermissionResultListener(shizukuResultListener) if (isOAndAbove()) {
Shizuku.removeBinderReceivedListener(shizukuAliveListener)
Shizuku.removeBinderDeadListener(shizukuDeadListener)
Shizuku.removeRequestPermissionResultListener(shizukuResultListener)
}
super.onDestroy() super.onDestroy()
} }

View File

@@ -75,9 +75,11 @@ class InstallationPreference : PreferenceFragmentCompat() {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) { override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState) super.onViewCreated(view, savedInstanceState)
Shizuku.addBinderReceivedListenerSticky(shizukuAliveListener) if (isOAndAbove()) {
Shizuku.addBinderDeadListener(shizukuDeadListener) Shizuku.addBinderReceivedListenerSticky(shizukuAliveListener)
Shizuku.addRequestPermissionResultListener(shizukuResultListener) Shizuku.addBinderDeadListener(shizukuDeadListener)
Shizuku.addRequestPermissionResultListener(shizukuResultListener)
}
val abandonPreference: Preference? = val abandonPreference: Preference? =
findPreference(Preferences.INSTALLATION_ABANDON_SESSION) findPreference(Preferences.INSTALLATION_ABANDON_SESSION)
@@ -163,6 +165,15 @@ class InstallationPreference : PreferenceFragmentCompat() {
} }
} }
override fun onDestroy() {
if (isOAndAbove()) {
Shizuku.removeBinderReceivedListener(shizukuAliveListener)
Shizuku.removeBinderDeadListener(shizukuDeadListener)
Shizuku.removeRequestPermissionResultListener(shizukuResultListener)
}
super.onDestroy()
}
private fun checkRootAvailability(): Boolean { private fun checkRootAvailability(): Boolean {
return Shell.getShell().isRoot return Shell.getShell().isRoot
} }