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

Kotlin

Browse source
This commit is contained in:
h4h13 2018-11-28 13:18:19 +05:30
parent 5d2a30b65a
commit 8e6ab40d93
23 changed files with 266 additions and 253 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4,8 +4,6 @@ import android.content.Context;
import android.database.Cursor;
import android.os.Environment;
import android.provider.MediaStore;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import android.webkit.MimeTypeMap;
import java.io.BufferedReader;
@ -22,6 +20,8 @@ import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import code.name.monkey.retromusic.loaders.SongLoader;
import code.name.monkey.retromusic.loaders.SortedCursor;
import code.name.monkey.retromusic.model.Song;
@ -47,7 +47,7 @@ public final class FileUtil {
@NonNull
public static Observable<ArrayList<Song>> matchFilesWithMediaStore(@NonNull Context context,
@Nullable List<File> files) {
return SongLoader.getSongs(makeSongCursor(context, files));
return SongLoader.Companion.getSongs(makeSongCursor(context, files));
}
public static String safeGetCanonicalPath(File file) {
@ -75,8 +75,7 @@ public final class FileUtil {
}
}
Cursor songCursor = SongLoader
.makeSongCursor(context, selection, selection == null ? null : paths);
Cursor songCursor = SongLoader.Companion.makeSongCursor(context, selection, selection == null ? null : paths);
return songCursor == null ? null
: new SortedCursor(songCursor, paths, MediaStore.Audio.AudioColumns.DATA);

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

@ -224,7 +224,7 @@ public class MusicUtil {
cursor.moveToFirst();
while (!cursor.isAfterLast()) {
final int id = cursor.getInt(0);
Song song = SongLoader.getSong(activity, id).blockingFirst();
Song song = SongLoader.Companion.getSong(activity, id).blockingFirst();
MusicPlayerRemote.removeFromQueue(song);
cursor.moveToNext();
}