corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1039048 - Don't eat IllegalArgumentExceptions in dispatchEvent. r=jchen

Browse Source
This commit is contained in:
Brian Nicholson
2014-07-24 17:55:33 -07:00
parent be937b8b9c
commit c5bff47572
1 changed files with 24 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
mobile/android/base/EventDispatcher.java
View File

@@ -140,35 +140,32 @@ public final class EventDispatcher {
} }
public void dispatchEvent(final NativeJSContainer message) { public void dispatchEvent(final NativeJSContainer message) {
EventCallback callback = null; // First try native listeners.
try { final String type = message.getString("type");
// First try native listeners.
final String type = message.getString("type");
final List<NativeEventListener> listeners; final List<NativeEventListener> listeners;
synchronized (mGeckoThreadNativeListeners) { synchronized (mGeckoThreadNativeListeners) {
listeners = mGeckoThreadNativeListeners.get(type); listeners = mGeckoThreadNativeListeners.get(type);
}
final String guid = message.optString(GUID, null);
if (guid != null) {
callback = new GeckoEventCallback(guid, type);
}
if (listeners != null) {
if (listeners.size() == 0) {
Log.w(LOGTAG, "No listeners for " + type);
}
for (final NativeEventListener listener : listeners) {
listener.handleMessage(type, message, callback);
}
// If we found native listeners, we assume we don't have any JSON listeners
// and return early. This assumption is checked when registering listeners.
return;
}
} catch (final IllegalArgumentException e) {
// Message doesn't have a "type" property, fallback to JSON
} }
final String guid = message.optString(GUID, null);
EventCallback callback = null;
if (guid != null) {
callback = new GeckoEventCallback(guid, type);
}
if (listeners != null) {
if (listeners.size() == 0) {
Log.w(LOGTAG, "No listeners for " + type);
}
for (final NativeEventListener listener : listeners) {
listener.handleMessage(type, message, callback);
}
// If we found native listeners, we assume we don't have any JSON listeners
// and return early. This assumption is checked when registering listeners.
return;
}
try { try {
// If we didn't find native listeners, try JSON listeners. // If we didn't find native listeners, try JSON listeners.
dispatchEvent(new JSONObject(message.toString()), callback); dispatchEvent(new JSONObject(message.toString()), callback);