Go back to just using getExternalFilesDirs on Android 11+

getExternalMediaDirs was depreciated in Android 11 since they want people to just contribute to MediaStore directly instead: https://developer.android.com/reference/android/content/Context#getExternalMediaDirs()
daneren2005 · Sep 12, 2020 · 976ed49 · 976ed49
1 parent 04f1c5a
commit 976ed49
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/src/main/java/github/daneren2005/dsub/util/FileUtil.java b/app/src/main/java/github/daneren2005/dsub/util/FileUtil.java
@@ -453,7 +453,7 @@ public static File getSubsonicDirectory(Context context) {
     public static File getDefaultMusicDirectory(Context context) {
 		if(DEFAULT_MUSIC_DIR == null) {
 			File[] dirs;
-			if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+			if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && Build.VERSION.SDK_INT < Build.VERSION_CODES.R) {
 				dirs = context.getExternalMediaDirs();
 			} else {
 				dirs = ContextCompat.getExternalFilesDirs(context, null);

diff --git a/app/src/main/java/github/daneren2005/dsub/view/CacheLocationPreference.java b/app/src/main/java/github/daneren2005/dsub/view/CacheLocationPreference.java
@@ -67,7 +67,7 @@ protected void onBindDialogView(View view) {
 			Button externalLocation = (Button) cacheButtonsWrapper.findViewById(R.id.location_external);
 
 			File[] dirs;
-			if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+			if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && Build.VERSION.SDK_INT < Build.VERSION_CODES.R) {
 				dirs = context.getExternalMediaDirs();
 			} else {
 				dirs = ContextCompat.getExternalFilesDirs(context, null);