Skip to content

Commit aaecad0

Browse files
committed
优化 Android 14 媒体权限处理逻辑
1 parent d26af75 commit aaecad0

File tree

2 files changed

+2
-13
lines changed

2 files changed

+2
-13
lines changed

library/src/main/java/com/hjq/permissions/PermissionDelegateImplV34.java

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,6 @@ public boolean isGrantedPermission(@NonNull Context context, @NonNull String per
2020
return PermissionUtils.checkSelfPermission(context, Permission.READ_MEDIA_VISUAL_USER_SELECTED);
2121
}
2222

23-
// 如果用户授予了部分照片访问,那么 READ_MEDIA_VISUAL_USER_SELECTED 权限状态是授予的,而 READ_MEDIA_IMAGES 权限状态是拒绝的
24-
if (PermissionUtils.equalsPermission(permission, Permission.READ_MEDIA_IMAGES) &&
25-
!PermissionUtils.checkSelfPermission(context, Permission.READ_MEDIA_IMAGES)) {
26-
return PermissionUtils.checkSelfPermission(context, Permission.READ_MEDIA_VISUAL_USER_SELECTED);
27-
}
28-
29-
// 如果用户授予了部分视频访问,那么 READ_MEDIA_VISUAL_USER_SELECTED 权限状态是授予的,而 READ_MEDIA_VIDEO 权限状态是拒绝的
30-
if (PermissionUtils.equalsPermission(permission, Permission.READ_MEDIA_VIDEO) &&
31-
!PermissionUtils.checkSelfPermission(context, Permission.READ_MEDIA_VIDEO)) {
32-
return PermissionUtils.checkSelfPermission(context, Permission.READ_MEDIA_VISUAL_USER_SELECTED);
33-
}
34-
3523
return super.isGrantedPermission(context, permission);
3624
}
3725

library/src/main/java/com/hjq/permissions/PermissionUtils.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,8 @@ static void optimizePermissionResults(Activity activity, @NonNull String[] permi
208208
if (AndroidVersion.isAndroid14() &&
209209
PermissionUtils.containsPermission(
210210
new String[] {Permission.READ_MEDIA_IMAGES, Permission.READ_MEDIA_VIDEO}, permission)) {
211-
grantResults[i] = PermissionApi.getPermissionResult(activity, permission);
211+
grantResults[i] = PermissionApi.getPermissionResult(activity,
212+
Permission.READ_MEDIA_VISUAL_USER_SELECTED);
212213
continue;
213214
}
214215

0 commit comments

Comments
 (0)