Siklos/Metro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Extracted deprecated methods to functions e.g. Environment.getExternalStorageDirectory()

Browse source
This commit is contained in:
Prathamesh More 2022-04-19 13:45:01 +05:30
parent aaee076718
commit 3105da068d
24 changed files with 94 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/code/name/monkey/retromusic/util/FilePathUtil.kt
View file

@ -5,10 +5,10 @@ import java.io.File
object FilePathUtil {
fun blacklistFilePaths(): List<String> {
return listOf<File>(
Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_ALARMS),
Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_RINGTONES),
Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_NOTIFICATIONS)
return listOf(
getExternalStoragePublicDirectory(Environment.DIRECTORY_ALARMS),
getExternalStoragePublicDirectory(Environment.DIRECTORY_RINGTONES),
getExternalStoragePublicDirectory(Environment.DIRECTORY_NOTIFICATIONS)
).map {
FileUtil.safeGetCanonicalPath(it)
}

12
app/src/main/java/code/name/monkey/retromusic/util/FileUtil.java
View file

@ -14,6 +14,8 @@
package code.name.monkey.retromusic.util;
import static code.name.monkey.retromusic.util.FileUtilsKt.getExternalStorageDirectory;
import android.content.Context;
import android.database.Cursor;
import android.os.Environment;
@ -22,6 +24,7 @@ import android.webkit.MimeTypeMap;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.os.EnvironmentCompat;
import java.io.BufferedReader;
import java.io.ByteArrayOutputStream;
@ -40,6 +43,7 @@ import java.util.LinkedList;
import java.util.List;
import java.util.StringTokenizer;
import code.name.monkey.retromusic.Constants;
import code.name.monkey.retromusic.adapter.Storage;
import code.name.monkey.retromusic.model.Song;
import code.name.monkey.retromusic.repository.RealSongRepository;
@ -87,7 +91,7 @@ public final class FileUtil {
if (files.size() > 0
&& files.size() < 999) { // 999 is the max amount Androids SQL implementation can handle.
selection =
MediaStore.Audio.AudioColumns.DATA + " IN (" + makePlaceholders(files.size()) + ")";
Constants.DATA + " IN (" + makePlaceholders(files.size()) + ")";
}
}
@ -96,7 +100,7 @@ public final class FileUtil {
return songCursor == null
? null
: new SortedCursor(songCursor, paths, MediaStore.Audio.AudioColumns.DATA);
: new SortedCursor(songCursor, paths, Constants.DATA);
}
private static String makePlaceholders(int len) {
@ -268,7 +272,7 @@ public final class FileUtil {
public static ArrayList<Storage> listRoots() {
ArrayList<Storage> storageItems = new ArrayList<>();
HashSet<String> paths = new HashSet<>();
String defaultPath = Environment.getExternalStorageDirectory().getPath();
String defaultPath = getExternalStorageDirectory().getPath();
String defaultPathState = Environment.getExternalStorageState();
if (defaultPathState.equals(Environment.MEDIA_MOUNTED) || defaultPathState.equals(Environment.MEDIA_MOUNTED_READ_ONLY)) {
Storage ext = new Storage();
@ -277,7 +281,7 @@ public final class FileUtil {
} else {
ext.title = "Internal Storage";
}
ext.file = Environment.getExternalStorageDirectory();
ext.file = getExternalStorageDirectory();
storageItems.add(ext);
paths.add(defaultPath);
}

18
app/src/main/java/code/name/monkey/retromusic/util/FileUtils.kt
View file

@ -2,6 +2,7 @@ package code.name.monkey.retromusic.util
import android.content.Context
import android.net.Uri
import android.os.Environment
import android.util.Log
import java.io.File
import java.io.IOException
@ -23,7 +24,13 @@ object FileUtils {
* @return the file
* @throws IOException
*/
fun createFile(context: Context, directoryName: String, fileName: String, body: String, fileType: String): File {
fun createFile(
context: Context,
directoryName: String,
fileName: String,
body: String,
fileType: String
): File {
val root = createDirectory(context, directoryName)
val filePath = "$root/$fileName$fileType"
val file = File(filePath)
@ -57,4 +64,13 @@ object FileUtils {
}
return file
}
}
@Suppress("Deprecation")
fun getExternalStorageDirectory(): File {
return Environment.getExternalStorageDirectory()
}
@Suppress("Deprecation")
fun getExternalStoragePublicDirectory(type: String): File {
return Environment.getExternalStoragePublicDirectory(type)
}

2
app/src/main/java/code/name/monkey/retromusic/util/LyricUtil.kt
View file

@ -26,7 +26,7 @@ import java.io.*
*/
object LyricUtil {
private val lrcRootPath =
Environment.getExternalStorageDirectory().toString() + "/RetroMusic/lyrics/"
getExternalStorageDirectory().toString() + "/RetroMusic/lyrics/"
private const val TAG = "LyricUtil"
fun writeLrcToLoc(
title: String, artist: String, lrcContext: String

6
app/src/main/java/code/name/monkey/retromusic/util/MusicUtil.kt
View file

@ -5,7 +5,6 @@ import android.content.Context
import android.content.Intent
import android.database.Cursor
import android.net.Uri
import android.os.Environment
import android.provider.BaseColumns
import android.provider.MediaStore
import android.util.Log
@ -14,6 +13,7 @@ import androidx.core.content.contentValuesOf
import androidx.core.net.toUri
import androidx.fragment.app.FragmentActivity
import code.name.monkey.appthemehelper.util.VersionUtils
import code.name.monkey.retromusic.Constants
import code.name.monkey.retromusic.R
import code.name.monkey.retromusic.db.PlaylistEntity
import code.name.monkey.retromusic.db.SongEntity
@ -79,7 +79,7 @@ object MusicUtil : KoinComponent {
private fun createAlbumArtDir(context: Context): File {
val albumArtDir = File(
if (VersionUtils.hasR()) context.cacheDir else Environment.getExternalStorageDirectory(),
if (VersionUtils.hasR()) context.cacheDir else getExternalStorageDirectory(),
"/albumthumbs/"
)
if (!albumArtDir.exists()) {
@ -385,7 +385,7 @@ object MusicUtil : KoinComponent {
) {
val songRepository: SongRepository = get()
val projection = arrayOf(
BaseColumns._ID, MediaStore.MediaColumns.DATA
BaseColumns._ID, Constants.DATA
)
// Split the query into multiple batches, and merge the resulting cursors
var batchStart: Int

6
app/src/main/java/code/name/monkey/retromusic/util/PlaylistsUtil.java
View file

@ -16,6 +16,8 @@ package code.name.monkey.retromusic.util;
import static android.provider.MediaStore.Audio.Playlists.EXTERNAL_CONTENT_URI;
import static code.name.monkey.retromusic.util.FileUtilsKt.getExternalStorageDirectory;
import android.content.ContentResolver;
import android.content.ContentValues;
import android.content.Context;
@ -295,12 +297,12 @@ public class PlaylistsUtil {
public static File savePlaylist(Context context, Playlist playlist) throws IOException {
return M3UWriter.write(
new File(Environment.getExternalStorageDirectory(), "Playlists"), playlist);
new File(getExternalStorageDirectory(), "Playlists"), playlist);
}
public static File savePlaylistWithSongs(PlaylistWithSongs playlist) throws IOException {
return M3UWriter.writeIO(
new File(Environment.getExternalStorageDirectory(), "Playlists"), playlist);
new File(getExternalStorageDirectory(), "Playlists"), playlist);
}
public static boolean doesPlaylistExist(@NonNull final Context context, final int playlistId) {

3
app/src/main/java/code/name/monkey/retromusic/util/UriUtil.kt
View file

@ -6,6 +6,7 @@ import android.net.Uri
import android.os.Build
import android.provider.MediaStore
import androidx.annotation.RequiresApi
import code.name.monkey.retromusic.Constants
object UriUtil {
@RequiresApi(Build.VERSION_CODES.Q)
@ -13,7 +14,7 @@ object UriUtil {
val uri = MediaStore.Files.getContentUri(MediaStore.VOLUME_EXTERNAL)
val proj = arrayOf(MediaStore.Files.FileColumns._ID)
context.contentResolver.query(
uri, proj, MediaStore.Files.FileColumns.DATA + "=?", arrayOf(path), null
uri, proj, Constants.DATA + "=?", arrayOf(path), null
)?.use { cursor ->
if (cursor.count != 0) {
cursor.moveToFirst()