From 16f68d71eb89f020fdc856ae51ae246c3763cb30 Mon Sep 17 00:00:00 2001 From: Devota Aabel Date: Mon, 7 May 2018 16:58:02 -0400 Subject: [PATCH 1/5] Added null check to make sure a file is actually returned --- .../navigation/ui/v5/voice/InstructionDownloadTask.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/voice/InstructionDownloadTask.java b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/voice/InstructionDownloadTask.java index 318b99c1680..ee276fa2fe0 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/voice/InstructionDownloadTask.java +++ b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/voice/InstructionDownloadTask.java @@ -73,7 +73,11 @@ private File saveAsFile(ResponseBody responseBody) { @Override protected void onPostExecute(File instructionFile) { - taskListener.onFinishedDownloading(instructionFile); + if (instructionFile == null) { + taskListener.onErrorDownloading(); + } else { + taskListener.onFinishedDownloading(instructionFile); + } } public interface TaskListener { From 0b1e9c0aac9eaf401b6792874d32bb4bd4523f23 Mon Sep 17 00:00:00 2001 From: Devota Aabel Date: Mon, 14 May 2018 10:51:34 -0400 Subject: [PATCH 2/5] Added nonnull annotation --- .../navigation/ui/v5/voice/InstructionDownloadTask.java | 3 ++- .../android/navigation/ui/v5/voice/MapboxSpeechPlayer.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/voice/InstructionDownloadTask.java b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/voice/InstructionDownloadTask.java index ee276fa2fe0..913a1e1feed 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/voice/InstructionDownloadTask.java +++ b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/voice/InstructionDownloadTask.java @@ -1,6 +1,7 @@ package com.mapbox.services.android.navigation.ui.v5.voice; import android.os.AsyncTask; +import android.support.annotation.NonNull; import java.io.File; import java.io.FileOutputStream; @@ -81,7 +82,7 @@ protected void onPostExecute(File instructionFile) { } public interface TaskListener { - void onFinishedDownloading(File file); + void onFinishedDownloading(@NonNull File file); void onErrorDownloading(); } diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/voice/MapboxSpeechPlayer.java b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/voice/MapboxSpeechPlayer.java index ea07894a139..9fcda77253d 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/voice/MapboxSpeechPlayer.java +++ b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/voice/MapboxSpeechPlayer.java @@ -245,7 +245,7 @@ private void clearInstructionUrls() { private void executeInstructionTask(ResponseBody responseBody) { new InstructionDownloadTask(mapboxCache.getPath(), new InstructionDownloadTask.TaskListener() { @Override - public void onFinishedDownloading(File instructionFile) { + public void onFinishedDownloading(@NonNull File instructionFile) { playInstructionIfUpNext(instructionFile); instructionQueue.add(instructionFile); } From 703b8efd7315598f5dc0fefc3c6b2a9bb79e4d1e Mon Sep 17 00:00:00 2001 From: Devota Aabel Date: Mon, 14 May 2018 13:46:46 -0400 Subject: [PATCH 3/5] Removed wierd looping code --- .../v5/voice/NavigationInstructionPlayer.java | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/voice/NavigationInstructionPlayer.java b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/voice/NavigationInstructionPlayer.java index 0288e763a44..c1c607710ed 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/voice/NavigationInstructionPlayer.java +++ b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/voice/NavigationInstructionPlayer.java @@ -18,7 +18,6 @@ public class NavigationInstructionPlayer implements InstructionListener { private AudioFocusRequest instructionFocusRequest; private MapboxSpeechPlayer mapboxSpeechPlayer; private AndroidSpeechPlayer androidSpeechPlayer; - private InstructionListener instructionListener; private Queue instructionQueue; private boolean isMuted; @@ -55,35 +54,19 @@ public void onDestroy() { androidSpeechPlayer.onDestroy(); } - public void setInstructionListener(InstructionListener instructionListener) { - this.instructionListener = instructionListener; - } - @Override public void onStart() { - if (instructionListener != null) { - instructionListener.onStart(); - } - requestAudioFocus(); instructionQueue.remove(); } @Override public void onDone() { - if (instructionListener != null) { - instructionListener.onDone(); - } - abandonAudioFocus(); } @Override public void onError(boolean isMapboxPlayer) { - if (instructionListener != null) { - instructionListener.onError(isMapboxPlayer); - } - if (isMapboxPlayer) { // If mapbox player failed, try android speech player androidSpeechPlayer.play(instructionQueue.peek().getAnnouncement()); } else { // If android speech player fails, just drop the instruction From a76a48497db470b5004f7dbd350364f1db0ea8b5 Mon Sep 17 00:00:00 2001 From: Devota Aabel Date: Mon, 14 May 2018 13:52:30 -0400 Subject: [PATCH 4/5] Made interface package private --- .../android/navigation/ui/v5/voice/InstructionListener.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/voice/InstructionListener.java b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/voice/InstructionListener.java index 30579d19828..79146d9aef3 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/voice/InstructionListener.java +++ b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/voice/InstructionListener.java @@ -1,6 +1,6 @@ package com.mapbox.services.android.navigation.ui.v5.voice; -public interface InstructionListener { +interface InstructionListener { void onStart(); From b52e60d7219d21c3bf2ae83d35b0d72573ce6c33 Mon Sep 17 00:00:00 2001 From: Devota Aabel Date: Mon, 14 May 2018 14:26:01 -0400 Subject: [PATCH 5/5] Removed comments --- .../navigation/ui/v5/voice/NavigationInstructionPlayer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/voice/NavigationInstructionPlayer.java b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/voice/NavigationInstructionPlayer.java index c1c607710ed..74cefadcf4d 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/voice/NavigationInstructionPlayer.java +++ b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/voice/NavigationInstructionPlayer.java @@ -67,9 +67,9 @@ public void onDone() { @Override public void onError(boolean isMapboxPlayer) { - if (isMapboxPlayer) { // If mapbox player failed, try android speech player + if (isMapboxPlayer) { androidSpeechPlayer.play(instructionQueue.peek().getAnnouncement()); - } else { // If android speech player fails, just drop the instruction + } else { instructionQueue.remove(); } }