Skip to content

Commit 328646d

Browse files
committed
#556 [fix] 이미지 권한 sdk 버전 별 분기 처리
1 parent 09de99d commit 328646d

File tree

3 files changed

+18
-5
lines changed

3 files changed

+18
-5
lines changed

app/src/main/AndroidManifest.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
package="com.teamsparker.android">
44

55
<uses-permission android:name="android.permission.INTERNET" />
6-
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
6+
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="32" />
7+
<uses-permission android:name="android.permission.READ_MEDIA_IMAGES" android:minSdkVersion="33" />
78
<uses-permission android:name="android.permission.CAMERA" />
89
<uses-permission
910
android:name="android.permission.WRITE_EXTERNAL_STORAGE"

app/src/main/java/com/teamsparker/android/ui/auth/profile/ProfileBottomSheet.kt

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,11 +91,17 @@ class ProfileBottomSheet : BottomSheetDialogFragment() {
9191
}
9292

9393
private fun initFromAlbumBtnClickListener() {
94+
val permission = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
95+
android.Manifest.permission.READ_MEDIA_IMAGES
96+
} else {
97+
android.Manifest.permission.READ_EXTERNAL_STORAGE
98+
}
99+
94100
binding.tvProfileBottomFromAlbum.setOnClickListener {
95101
when (PackageManager.PERMISSION_GRANTED) {
96102
ContextCompat.checkSelfPermission(
97103
requireContext(),
98-
android.Manifest.permission.READ_EXTERNAL_STORAGE
104+
permission,
99105
) -> {
100106
fromAlbumActivityLauncher.launch(
101107
Intent(
@@ -107,7 +113,7 @@ class ProfileBottomSheet : BottomSheetDialogFragment() {
107113
else -> {
108114
ActivityCompat.requestPermissions(
109115
requireActivity(),
110-
arrayOf(android.Manifest.permission.READ_EXTERNAL_STORAGE),
116+
arrayOf(permission),
111117
REQUEST_READ_STORAGE_PERMISSION
112118
)
113119
}

app/src/main/java/com/teamsparker/android/ui/certify/CertifyBottomSheet.kt

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,11 +105,17 @@ class CertifyBottomSheet : BottomSheetDialogFragment() {
105105
}
106106

107107
private fun initFromAlbumBtnClickListener() {
108+
val permission = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
109+
android.Manifest.permission.READ_MEDIA_IMAGES
110+
} else {
111+
android.Manifest.permission.READ_EXTERNAL_STORAGE
112+
}
113+
108114
binding.tvCertifyAlbum.setOnClickListener {
109115
when (PackageManager.PERMISSION_GRANTED) {
110116
ContextCompat.checkSelfPermission(
111117
requireContext(),
112-
android.Manifest.permission.READ_EXTERNAL_STORAGE
118+
permission,
113119
),
114120
-> {
115121
fromAlbumActivityLauncher.launch(
@@ -122,7 +128,7 @@ class CertifyBottomSheet : BottomSheetDialogFragment() {
122128
else -> {
123129
ActivityCompat.requestPermissions(
124130
requireActivity(),
125-
arrayOf(android.Manifest.permission.READ_EXTERNAL_STORAGE),
131+
arrayOf(permission),
126132
REQUEST_READ_STORAGE_PERMISSION
127133
)
128134
}

0 commit comments

Comments
 (0)