Skip to content

Commit 1c59ce9

Browse files
committed
移除READ_MEDIA_IMAGES
1 parent c608765 commit 1c59ce9

File tree

5 files changed

+10
-9
lines changed

5 files changed

+10
-9
lines changed

app/src/main/AndroidManifest.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
1616
<uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
1717
<uses-permission android:name="android.permission.READ_MEDIA_AUDIO"/>
18-
<uses-permission android:name="android.permission.READ_MEDIA_IMAGES"/>
1918
<uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
2019

2120
<uses-feature android:name="android.hardware.sensor.accelerometer" android:required="false"/>

app/src/main/java/remix/myplayer/glide/AudioFileCoverUtils.kt

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,15 @@ object AudioFileCoverUtils {
3737
}
3838

3939
// Method 2: look for album art in external files
40-
val parent = File(path).parentFile
41-
for (fallback in FALLBACKS) {
42-
val cover = File(parent, fallback)
43-
if (cover.exists()) {
44-
return FileInputStream(cover)
40+
try {
41+
val parent = File(path).parentFile
42+
for (fallback in FALLBACKS) {
43+
val cover = File(parent, fallback)
44+
if (cover.exists()) {
45+
return FileInputStream(cover)
46+
}
4547
}
48+
} catch (ignore: Exception) {
4649
}
4750
return null
4851
}

app/src/main/java/remix/myplayer/ui/activity/base/BaseActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ open class BaseActivity : ComponentActivity(), CoroutineScope by MainScope() {
175175

176176
val NECESSARY_PERMISSIONS =
177177
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
178-
arrayOf(Permission.READ_MEDIA_AUDIO, Permission.READ_MEDIA_IMAGES)
178+
arrayOf(Permission.READ_MEDIA_AUDIO)
179179
} else if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.Q) {
180180
arrayOf(
181181
Permission.READ_EXTERNAL_STORAGE,

app/src/main/java/remix/myplayer/util/PermissionUtil.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ object PermissionUtil {
2525

2626
fun hasNecessaryPermission(): Boolean {
2727
return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
28-
has(Permission.READ_MEDIA_IMAGES, Permission.READ_MEDIA_IMAGES)
28+
has(Permission.READ_MEDIA_AUDIO)
2929
} else {
3030
has(Permission.READ_EXTERNAL_STORAGE)
3131
}

baselineprofile/src/main/java/remix/myplayer/baselineprofile/BaselineProfileGenerator.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@ private fun MacrobenchmarkScope.grantPermissions(packageName: String) {
128128
Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU -> {
129129
listOf(
130130
Manifest.permission.READ_MEDIA_AUDIO,
131-
Manifest.permission.READ_MEDIA_IMAGES,
132131
Manifest.permission.POST_NOTIFICATIONS,
133132
)
134133
}

0 commit comments

Comments
 (0)