wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1055562 - crash in java.lang.IllegalStateException: Callback has already been executed, v2. r=wesj

Browse Source
This commit is contained in:
Randall Barker 2014-10-31 13:19:00 +01:00
parent f93d3699b0
commit 6d26261829
1 changed files with 39 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
mobile/android/base/ChromeCast.java
View File

@ -48,6 +48,25 @@ class ChromeCast implements GeckoMediaPlayer {
private MirrorChannel mMirrorChannel;
private boolean mApplicationStarted = false;
// EventCallback which is actually a GeckoEventCallback is sometimes being invoked more
// than once. That causes the IllegalStateException to be thrown. To prevent a crash,
// catch the exception and report it as an error to the log.
private static void sendSuccess(final EventCallback callback, final String msg) {
try {
callback.sendSuccess(msg);
} catch (final IllegalStateException e) {
Log.e(LOGTAG, "Attempting to invoke callback.sendSuccess more than once.", e);
}
}
private static void sendError(final EventCallback callback, final String msg) {
try {
callback.sendError(msg);
} catch (final IllegalStateException e) {
Log.e(LOGTAG, "Attempting to invoke callback.sendError more than once.", e);
}
}
// Callback to start playback of a url on a remote device
private class VideoPlayCallback implements ResultCallback<ApplicationConnectionResult>,
RemoteMediaPlayer.OnStatusUpdatedListener,
@ -101,7 +120,7 @@ class ChromeCast implements GeckoMediaPlayer {
startPlayback();
} else {
callback.sendError(status.toString());
sendError(callback, status.toString());
}
}
@ -118,13 +137,13 @@ class ChromeCast implements GeckoMediaPlayer {
@Override
public void onResult(MediaChannelResult result) {
if (result.getStatus().isSuccess()) {
callback.sendSuccess(null);
sendSuccess(callback, null);
debug("Media loaded successfully");
return;
}
debug("Media load failed " + result.getStatus());
callback.sendError(result.getStatus().toString());
sendError(callback, result.getStatus().toString());
}
});
@ -135,7 +154,7 @@ class ChromeCast implements GeckoMediaPlayer {
debug("Problem opening media during loading", e);
}
callback.sendError("");
sendError(callback, "");
}
}
@ -198,7 +217,7 @@ class ChromeCast implements GeckoMediaPlayer {
// Sometimes apiClient is null here. See bug 1061032
if (apiClient != null && !apiClient.isConnected()) {
debug("Connection failed");
callback.sendError("Not connected");
sendError(callback, "Not connected");
return;
}
@ -223,13 +242,13 @@ class ChromeCast implements GeckoMediaPlayer {
@Override
public void start(final EventCallback callback) {
// Nothing to be done here
callback.sendSuccess(null);
sendSuccess(callback, null);
}
@Override
public void stop(final EventCallback callback) {
// Nothing to be done here
callback.sendSuccess(null);
sendSuccess(callback, null);
}
public boolean verifySession(final EventCallback callback) {
@ -245,7 +264,7 @@ class ChromeCast implements GeckoMediaPlayer {
if (msg != null) {
debug(msg);
if (callback != null) {
callback.sendError(msg);
sendError(callback, msg);
}
return false;
}
@ -266,15 +285,15 @@ class ChromeCast implements GeckoMediaPlayer {
Status status = result.getStatus();
if (!status.isSuccess()) {
debug("Unable to play: " + status.getStatusCode());
callback.sendError(status.toString());
sendError(callback, status.toString());
} else {
callback.sendSuccess(null);
sendSuccess(callback, null);
}
}
});
} catch(IllegalStateException ex) {
// The media player may throw if the session has been killed. For now, we're just catching this here.
callback.sendError("Error playing");
sendError(callback, "Error playing");
}
}
@ -291,15 +310,15 @@ class ChromeCast implements GeckoMediaPlayer {
Status status = result.getStatus();
if (!status.isSuccess()) {
debug("Unable to pause: " + status.getStatusCode());
callback.sendError(status.toString());
sendError(callback, status.toString());
} else {
callback.sendSuccess(null);
sendSuccess(callback, null);
}
}
});
} catch(IllegalStateException ex) {
// The media player may throw if the session has been killed. For now, we're just catching this here.
callback.sendError("Error pausing");
sendError(callback, "Error pausing");
}
}
@ -322,7 +341,7 @@ class ChromeCast implements GeckoMediaPlayer {
apiClient = null;
if (callback != null) {
callback.sendSuccess(null);
sendSuccess(callback, null);
}
return;
@ -332,13 +351,13 @@ class ChromeCast implements GeckoMediaPlayer {
}
if (callback != null) {
callback.sendError(result.getStatus().toString());
sendError(callback, result.getStatus().toString());
}
}
});
} catch(IllegalStateException ex) {
// The media player may throw if the session has been killed. For now, we're just catching this here.
callback.sendError("Error stopping");
sendError(callback, "Error stopping");
}
}
@ -376,9 +395,7 @@ class ChromeCast implements GeckoMediaPlayer {
}
}
private class MirrorCallback implements ResultCallback<ApplicationConnectionResult> {
// See Bug 1055562, callback is set to null after it has been
// invoked so that it will not be called a second time.
EventCallback callback;
final EventCallback callback;
MirrorCallback(final EventCallback callback) {
this.callback = callback;
}
@ -386,10 +403,6 @@ class ChromeCast implements GeckoMediaPlayer {
@Override
public void onResult(ApplicationConnectionResult result) {
if (callback == null) {
Log.e(LOGTAG, "Attempting to invoke MirrorChannel callback more than once.");
return;
}
Status status = result.getStatus();
if (status.isSuccess()) {
ApplicationMetadata applicationMetadata = result.getApplicationMetadata();
@ -406,16 +419,14 @@ class ChromeCast implements GeckoMediaPlayer {
mMirrorChannel
.getNamespace(),
mMirrorChannel);
callback.sendSuccess(null);
callback = null;
sendSuccess(callback, null);
} catch (IOException e) {
Log.e(LOGTAG, "Exception while creating channel", e);
}
GeckoAppShell.sendEventToGecko(GeckoEvent.createBroadcastEvent("Casting:Mirror", route.getId()));
} else {
callback.sendError(status.toString());
callback = null;
sendError(callback, status.toString());
}
}
}