Skip to content

Change to use Fragment as a LifecycleOwner when PermissionRequester is constructed by Fragment #766

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Change to use Fragment as a LifecycleOwner when PermissionRequester is constructed by Fragment #766

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e72f76b
Change LifecycleOwner for observing LiveData when PermissionsRequeste…
omtians9425 Feb 24, 2022
ddb6fcc
Use trailing lambda syntax for LiveData.observe
omtians9425 Feb 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions ktx/src/main/java/permissions/dispatcher/ktx/FragmentExtensions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ fun Fragment.constructPermissionsRequest(
): PermissionsRequester = PermissionsRequesterImpl(
permissions = permissions,
activity = requireActivity(),
lifecycleOwner = this,
onShowRationale = onShowRationale,
onPermissionDenied = onPermissionDenied,
onNeverAskAgain = onNeverAskAgain,
Expand All @@ -50,6 +51,7 @@ fun Fragment.constructLocationPermissionRequest(
): PermissionsRequester = PermissionsRequesterImpl(
permissions = permissions.filterByApiLevel(),
activity = requireActivity(),
lifecycleOwner = this,
onShowRationale = onShowRationale,
onPermissionDenied = onPermissionDenied,
onNeverAskAgain = onNeverAskAgain,
Expand All @@ -74,6 +76,7 @@ fun Fragment.constructWriteSettingsPermissionRequest(
): PermissionsRequester = PermissionsRequesterImpl(
permissions = arrayOf(Settings.ACTION_MANAGE_WRITE_SETTINGS),
activity = requireActivity(),
lifecycleOwner = this,
onShowRationale = onShowRationale,
onPermissionDenied = onPermissionDenied,
onNeverAskAgain = null,
Expand All @@ -98,6 +101,7 @@ fun Fragment.constructSystemAlertWindowPermissionRequest(
): PermissionsRequester = PermissionsRequesterImpl(
permissions = arrayOf(Settings.ACTION_MANAGE_OVERLAY_PERMISSION),
activity = requireActivity(),
lifecycleOwner = this,
onShowRationale = onShowRationale,
onPermissionDenied = onPermissionDenied,
onNeverAskAgain = null,
Expand Down
4 changes: 2 additions & 2 deletions ktx/src/main/java/permissions/dispatcher/ktx/PermissionRequestViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@ internal class PermissionRequestViewModel : ViewModel() {
onPermissionDenied: WeakReference<Fun>?,
onNeverAskAgain: WeakReference<Fun>?
) {
permissionRequestResult.observe(owner, {
permissionRequestResult.observe(owner) {
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not main topic of this PR but fixed warning about trailing lambda syntax

when (it[key]?.getContentIfNotHandled()) {
PermissionResult.GRANTED -> requiresPermission.get()?.invoke()
PermissionResult.DENIED -> onPermissionDenied?.get()?.invoke()
PermissionResult.DENIED_AND_DISABLED -> onNeverAskAgain?.get()?.invoke()
else -> Unit
}
})
}
}

fun removeObservers(owner: LifecycleOwner) = permissionRequestResult.removeObservers(owner)
Expand Down
6 changes: 4 additions & 2 deletions ktx/src/main/java/permissions/dispatcher/ktx/PermissionsRequesterImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
package permissions.dispatcher.ktx

import androidx.fragment.app.FragmentActivity
import androidx.lifecycle.LifecycleOwner
import androidx.lifecycle.ViewModelProvider
import permissions.dispatcher.PermissionUtils.shouldShowRequestPermissionRationale
import java.lang.ref.WeakReference

internal class PermissionsRequesterImpl(
private val permissions: Array<out String>,
private val activity: FragmentActivity,
private val onShowRationale: ShowRationaleFun?,
lifecycleOwner: LifecycleOwner = activity,
val onShowRationale: ShowRationaleFun?,
private val onPermissionDenied: Fun?,
private val requiresPermission: Fun,
onNeverAskAgain: Fun?,
Expand All @@ -24,7 +26,7 @@ internal class PermissionsRequesterImpl(

init {
viewModel.observe(
activity,
lifecycleOwner,
// https://github.com/permissions-dispatcher/PermissionsDispatcher/issues/729
permissions.sortedArray().contentToString(),
WeakReference(requiresPermission),
Expand Down