aboutsummaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorScott Jackson <daneren2005@users.noreply.github.com>2017-08-14 08:36:01 -0700
committerGitHub <noreply@github.com>2017-08-14 08:36:01 -0700
commit9f89e7e1524cd4a6e6646e8768aa76c26ee92e79 (patch)
tree9c001adff99d91264d2211eaef813104ff18944f /app
parentea42d3c01caa05b3ff155d2e12e6f0fb35f2ed22 (diff)
parent6eb2c4c89311aa8e02219107a093041342d7d334 (diff)
downloaddsub-9f89e7e1524cd4a6e6646e8768aa76c26ee92e79.tar.gz
dsub-9f89e7e1524cd4a6e6646e8768aa76c26ee92e79.tar.bz2
dsub-9f89e7e1524cd4a6e6646e8768aa76c26ee92e79.zip
Merge pull request #818 from flamingspaz/formats
Add additional audio/video file extensions
Diffstat (limited to 'app')
-rw-r--r--app/src/main/java/github/daneren2005/dsub/util/FileUtil.java4
1 files changed, 2 insertions, 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
index 02db5fa1..fb395c77 100644
--- a/app/src/main/java/github/daneren2005/dsub/util/FileUtil.java
+++ b/app/src/main/java/github/daneren2005/dsub/util/FileUtil.java
@@ -67,8 +67,8 @@ public class FileUtil {
private static final String TAG = FileUtil.class.getSimpleName();
private static final String[] FILE_SYSTEM_UNSAFE = {"/", "\\", "..", ":", "\"", "?", "*", "<", ">", "|"};
private static final String[] FILE_SYSTEM_UNSAFE_DIR = {"\\", "..", ":", "\"", "?", "*", "<", ">", "|"};
- private static final List<String> MUSIC_FILE_EXTENSIONS = Arrays.asList("mp3", "ogg", "aac", "flac", "m4a", "wav", "wma", "opus");
- private static final List<String> VIDEO_FILE_EXTENSIONS = Arrays.asList("flv", "mp4", "m4v", "wmv", "avi", "mov", "mpg", "mkv");
+ private static final List<String> MUSIC_FILE_EXTENSIONS = Arrays.asList("mp3", "ogg", "aac", "flac", "m4a", "wav", "wma", "opus", "oga");
+ private static final List<String> VIDEO_FILE_EXTENSIONS = Arrays.asList("flv", "mp4", "m4v", "wmv", "avi", "mov", "mpg", "mkv", "3gp", "webm");
private static final List<String> PLAYLIST_FILE_EXTENSIONS = Arrays.asList("m3u");
private static final int MAX_FILENAME_LENGTH = 254 - ".complete.mp3".length();
private static File DEFAULT_MUSIC_DIR;