Skip to content
Snippets Groups Projects
Commit f956b486 authored by Geoffrey Métais's avatar Geoffrey Métais
Browse files

Get device directories with current context

(cherry picked from commit 500289eb)
parent 65716ff3
No related branches found
No related tags found
No related merge requests found
......@@ -217,7 +217,7 @@ public class MediaParsingService extends Service implements DevicesDiscoveryCb {
shouldInit |= initCode == Medialibrary.ML_INIT_DB_RESET;
if (initCode != Medialibrary.ML_INIT_FAILED) {
final List<String> devices = new ArrayList<>();
Collections.addAll(devices, AndroidDevices.getMediaDirectories());
Collections.addAll(devices, AndroidDevices.getMediaDirectories(context));
final SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
for (final String device : devices) {
final boolean isMainStorage = TextUtils.equals(device, AndroidDevices.EXTERNAL_PUBLIC_DIRECTORY);
......
......@@ -169,10 +169,14 @@ public class AndroidDevices {
}
public static String[] getMediaDirectories() {
return getMediaDirectories(VLCApplication.getAppContext());
}
public static String[] getMediaDirectories(Context ctx) {
final List<String> list = new ArrayList<>();
list.add(EXTERNAL_PUBLIC_DIRECTORY);
list.addAll(getExternalStorageDirectories());
list.addAll(Arrays.asList(CustomDirectories.getCustomDirectories()));
list.addAll(Arrays.asList(CustomDirectories.getCustomDirectories(ctx)));
return list.toArray(new String[list.size()]);
}
......
......@@ -20,6 +20,7 @@
package org.videolan.vlc.util;
import android.content.Context;
import android.content.SharedPreferences;
import android.preference.PreferenceManager;
......@@ -74,7 +75,11 @@ public class CustomDirectories {
}
public static String[] getCustomDirectories() {
SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(VLCApplication.getAppContext());
return getCustomDirectories(VLCApplication.getAppContext());
}
public static String[] getCustomDirectories(Context ctx) {
final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(ctx);
final String custom_paths = preferences.getString("custom_paths", "");
if (custom_paths.equals(""))
return new String[0];
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment