norohind/vanilla
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Really fix file picker.

Browse Source
This commit is contained in:
Adrian Ulrich 2018-08-26 16:47:22 +02:00
parent 3f0c7bb7a3
commit 4bd4fb700a
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/ch/blinkenlights/android/vanilla/FileSystemAdapter.java
View File

@ -440,8 +440,10 @@ public class FileSystemAdapter
*/ */
public void onItemClicked(Intent intent) { public void onItemClicked(Intent intent) {
boolean isFolder = intent.getBooleanExtra(LibraryAdapter.DATA_EXPANDABLE, false); boolean isFolder = intent.getBooleanExtra(LibraryAdapter.DATA_EXPANDABLE, false);
boolean isHeader = intent.getLongExtra(LibraryAdapter.DATA_ID, LibraryAdapter.INVALID_ID)
== LibraryAdapter.HEADER_ID;
if (FileUtils.canDispatchIntent(intent) && FileUtils.dispatchIntent(mActivity, intent)) if (!isHeader && FileUtils.canDispatchIntent(intent) && FileUtils.dispatchIntent(mActivity, intent))
return; return;
if (isFolder) { if (isFolder) {

2
app/src/main/java/ch/blinkenlights/android/vanilla/SlidingPlaybackActivity.java
View File

@ -248,7 +248,7 @@ public class SlidingPlaybackActivity extends PlaybackActivity
query = allSource.buildSongQuery(projection); query = allSource.buildSongQuery(projection);
query.data = id; query.data = id;
} else if (type == MediaUtils.TYPE_FILE) { } else if (type == MediaUtils.TYPE_FILE) {
query = MediaUtils.buildFileQuery(intent.getStringExtra(LibraryAdapter.DATA_FILE), projection, false /* recursive */); query = MediaUtils.buildFileQuery(intent.getStringExtra(LibraryAdapter.DATA_FILE), projection, true /* recursive */);
} else { } else {
query = MediaUtils.buildQuery(type, id, projection, null); query = MediaUtils.buildQuery(type, id, projection, null);
} }

4
app/src/main/java/ch/blinkenlights/android/vanilla/SongTimeline.java
View File

@ -749,7 +749,11 @@ public final class SongTimeline {
int added = 0; // Items actually added to the queue int added = 0; // Items actually added to the queue
if (count == 0 && type == MediaUtils.TYPE_FILE && query.selectionArgs.length == 1) { if (count == 0 && type == MediaUtils.TYPE_FILE && query.selectionArgs.length == 1) {
// This seems to be a simple file query which lead to no results.
// Assume that this was a LIKE query for an unindexed file, so drop the '%' char
// at the end and return a fileCursor for it.
String pathQuery = query.selectionArgs[0]; String pathQuery = query.selectionArgs[0];
pathQuery = pathQuery.substring(0,pathQuery.length()-1);
cursor.close(); // close old version cursor.close(); // close old version
cursor = MediaUtils.getCursorForFileQuery(pathQuery); cursor = MediaUtils.getCursorForFileQuery(pathQuery);
count = cursor.getCount(); count = cursor.getCount();