Skip to content
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

Determine isPartialAccessGranted improve #140

Merged
merged 1 commit into from
Aug 14, 2024
Merged

Determine isPartialAccessGranted improve #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion tedimagepicker/src/main/java/gun0912/tedimagepicker/TedImagePickerActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,7 @@ internal class TedImagePickerActivity
root.isGone = true
return@with
}
root.isVisible = isPartialAccessGranted
root.isVisible = builder.mediaType.isPartialAccessGranted
tvPartialAccessManage.setOnClickListener { showPartialAccessManageDialog() }
val mediaTypeText = getString(builder.mediaType.nameResId)
tvPartialAccessNotice.text =
Expand Down
4 changes: 2 additions & 2 deletions tedimagepicker/src/main/java/gun0912/tedimagepicker/builder/TedImagePickerBaseBuilder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,14 +98,14 @@ open class TedImagePickerBaseBuilder<out B : TedImagePickerBaseBuilder<B>>(
@SuppressLint("CheckResult")
protected fun startInternal(context: Context) {
val requestPermissions = getRequestPermissions()
if (TedPermissionUtil.isGranted(*requestPermissions) || isPartialAccessGranted) {
if (TedPermissionUtil.isGranted(*requestPermissions) || mediaType.isPartialAccessGranted) {
startActivity(context)
} else {
TedPermission.create()
.setPermissions(*requestPermissions)
.request()
.subscribe({ permissionResult ->
if (permissionResult.isGranted || isPartialAccessGranted) {
if (permissionResult.isGranted || mediaType.isPartialAccessGranted) {
startActivity(context)
}
}, { throwable -> onErrorListener?.onError(throwable) })
Expand Down
2 changes: 1 addition & 1 deletion ...cker/src/main/java/gun0912/tedimagepicker/partialaccess/PartialAccessManageBottomSheet.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class PartialAccessManageBottomSheet : BottomSheetDialogFragment() {
override fun onCreateView(
inflater: LayoutInflater,
container: ViewGroup?,
savedInstanceState: Bundle?
savedInstanceState: Bundle?,
): View = BottomsheetPartialAccessManageBinding.inflate(inflater, container, false).also {
binding = it
}.root
Expand Down
3 changes: 2 additions & 1 deletion tedimagepicker/src/main/java/gun0912/tedimagepicker/util/Permission.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@ import com.gun0912.tedpermission.TedPermissionUtil
import gun0912.tedimagepicker.builder.type.MediaType


internal val isPartialAccessGranted: Boolean
internal val MediaType.isPartialAccessGranted: Boolean
get() = Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE
&& TedPermissionUtil.isGranted(Manifest.permission.READ_MEDIA_VISUAL_USER_SELECTED)
&& !TedPermissionUtil.isGranted(*permissions)


internal val MediaType.isFullOrPartialAccessGranted: Boolean
Expand Down