Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Check for null or empty String speechUrl before playing #475

Merged
merged 2 commits into from
Nov 9, 2017
Merged

Check for null or empty String speechUrl before playing #475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b3b1e98
Check for null or empty String speechUrl before playing
danesfeder Nov 8, 2017
9639433
Merge branch 'master' into dan-polly-bug
danesfeder Nov 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions ...c/main/java/com/mapbox/services/android/navigation/ui/v5/voice/polly/InstructionTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import com.amazonaws.services.polly.model.SynthesizeSpeechPresignRequest;
import com.amazonaws.services.polly.model.VoiceId;

public class InstructionTask extends AsyncTask<String, Void, Void> {
public class InstructionTask extends AsyncTask<String, Void, String> {

private AmazonPollyPresigningClient client;
private TaskListener listener;
Expand All @@ -19,12 +19,16 @@ public class InstructionTask extends AsyncTask<String, Void, Void> {
}

@Override
protected Void doInBackground(String... strings) {
listener.onFinished(retrieveAudioUrl(strings[0]));
return null;
protected String doInBackground(String... strings) {
return retrieveSpeechUrl(strings[0]);
}

private String retrieveAudioUrl(String instruction) {
@Override
protected void onPostExecute(String speechUrl) {
listener.onFinished(speechUrl);
}

private String retrieveSpeechUrl(String instruction) {
SynthesizeSpeechPresignRequest synthesizeSpeechPresignRequest =
new SynthesizeSpeechPresignRequest()
.withText(instruction)
Expand Down
10 changes: 6 additions & 4 deletions ...i/src/main/java/com/mapbox/services/android/navigation/ui/v5/voice/polly/PollyPlayer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,10 +135,12 @@ public void onFinished(String instructionUrl) {
}

private void playInstruction(String instruction) {
pollyMediaPlayer = new MediaPlayer();
setDataSource(instruction);
pollyMediaPlayer.prepareAsync();
setListeners();
if (!TextUtils.isEmpty(instruction)) {
pollyMediaPlayer = new MediaPlayer();
setDataSource(instruction);
pollyMediaPlayer.prepareAsync();
setListeners();
}
}

private void pauseInstruction() {
Expand Down