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

Do not call success callbackon Android when Activity is signaled to be destroyed. #198

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Do not call success callbackon Android when Activity is signaled to be destroyed. #198

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
50c5ad9
Handler invokes onHandlerDestroyed() method instead of destroy(..) wh…
wspresto Nov 15, 2018
ce976ad
Fixing typo.
wspresto Nov 15, 2018
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
4 changes: 2 additions & 2 deletions src/android/AudioHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ public void onDestroy() {
onLastPlayerReleased();
}
for (AudioPlayer audio : this.players.values()) {
audio.destroy();
audio.onHandlerDestroyed();
}
this.players.clear();
}
Expand Down Expand Up @@ -273,7 +273,7 @@ private boolean release(String id) {
if (players.isEmpty()) {
onLastPlayerReleased();
}
audio.destroy();
audio.destroy(true);
return true;
}

Expand Down
24 changes: 18 additions & 6 deletions src/android/AudioPlayer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,13 +118,18 @@ private String generateTempFile() {

/**
* Destroy player and stop audio playing or recording.
* @param broadcastStateChange - if false, setting the state of this oject will not send a status change to the client.
*/
public void destroy() {
public void destroy(boolean broadcastStateChange) {
// Stop any play or record
if (this.player != null) {
if ((this.state == STATE.MEDIA_RUNNING) || (this.state == STATE.MEDIA_PAUSED)) {
this.player.stop();
this.player.stop();
}
if (broadcastStateChange) {
this.setState(STATE.MEDIA_STOPPED);
} else { // Do not call the success callback.
this.state = STATE.MEDIA_STOPPED;
}
this.player.release();
this.player = null;
Expand Down Expand Up @@ -522,19 +527,26 @@ public boolean onError(MediaPlayer player, int arg1, int arg2) {
LOG.d(LOG_TAG, "AudioPlayer.onError(" + arg1 + ", " + arg2 + ")");

// we don't want to send success callback
// so we don't call setState() here
this.state = STATE.MEDIA_STOPPED;
this.destroy();
this.destroy(false);
// Send error notification to JavaScript
sendErrorStatus(arg1);

return false;
}

/**
* Lifecyle method called by handler whenever it has been destroyed.
*/
public void onHandlerDestroyed() {
destroy(false);
sendErrorStatus(MEDIA_ERR_ABORTED);
}

/**
* Set the state and send it to JavaScript.
*
* @param state
* @param state - state to transition to

*/
private void setState(STATE state) {
if (this.state != state) {
Expand Down