danog/termux-api
1
0
Fork 0
mirror of https://github.com/danog/termux-api.git synced 2024-11-26 20:04:42 +01:00
Code Issues Projects Releases Wiki Activity

MediaPlayerAPI: remove extension pattern check

Browse Source 
There are way more possibilities and extension doesn't guarantee
anything about the file.
This commit is contained in:
Tom Yan 2018-04-04 17:55:21 +08:00 committed by Fredrik Fornwall
parent 35ba761e3a
commit 1be62a5c91
1 changed files with 10 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
app/src/main/java/com/termux/api/MediaPlayerAPI.java
View File

@ -14,7 +14,6 @@ import com.termux.api.util.TermuxApiLogger;
import java.io.File;
import java.io.IOException;
import java.io.PrintWriter;
import java.util.regex.Pattern;
/**
* API that enables playback of standard audio formats such as:
@ -171,17 +170,6 @@ public class MediaPlayerAPI {
});
}
/**
* Checks to see if the specified file exists and is a supported media type
* @param file
* @return
*/
protected static boolean isValidMediaFile(File file) {
final String MEDIA_PATTERN = ".3gp|.flac|.mkv|.mp3|.ogg|.wav$";
Pattern pattern = Pattern.compile(MEDIA_PATTERN);
return pattern.matcher(file.getName()).find();
}
/**
* -----
* Media Command Handlers
@ -210,20 +198,16 @@ public class MediaPlayerAPI {
File mediaFile = new File(intent.getStringExtra("file"));
if (!isValidMediaFile(mediaFile)) {
result.error = "Invalid file: " + mediaFile.getName();
} else {
if (player.isPlaying()) {
player.stop();
player.reset();
}
try {
player.setDataSource(context, Uri.fromFile(mediaFile));
player.prepareAsync();
result.message = "Now Playing: " + mediaFile.getName();
} catch (IOException e) {
result.error = e.getMessage();
}
if (player.isPlaying()) {
player.stop();
player.reset();
}
try {
player.setDataSource(context, Uri.fromFile(mediaFile));
player.prepareAsync();
result.message = "Now Playing: " + mediaFile.getName();
} catch (IOException e) {
result.error = e.getMessage();
}
return result;
}