DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Catch and log exceptions thrown in message listeners provided by apps (#3297)

Browse Source 
FlutterView's host message processing methods are invoked from native code,
and the JNI wrappers will abort the process if the Java side has an uncaught
exception.
This commit is contained in:
Jason Simmons 2016-12-07 14:47:40 -08:00 committed by GitHub
parent cd04cf5ced
commit 2f32e8054d
1 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
shell/platform/android/io/flutter/view/FlutterView.java
View File

@ -547,18 +547,29 @@ public class FlutterView extends SurfaceView
private void handlePlatformMessage(String channel, String message, final int responseId) {
OnMessageListener listener = mOnMessageListeners.get(channel);
if (listener != null) {
nativeInvokePlatformMessageResponseCallback(mNativePlatformView, responseId, listener.onMessage(this, message));
String response = null;
try {
response = listener.onMessage(this, message);
} catch (Exception ex) {
Log.e(TAG, "Uncaught exception in message listener", ex);
}
nativeInvokePlatformMessageResponseCallback(mNativePlatformView, responseId, response);
return;
}
OnMessageListenerAsync asyncListener = mAsyncOnMessageListeners.get(channel);
if (asyncListener != null) {
asyncListener.onMessage(this, message, new MessageResponse() {
@Override
public void send(String response) {
nativeInvokePlatformMessageResponseCallback(mNativePlatformView, responseId, response);
}
});
try {
asyncListener.onMessage(this, message, new MessageResponse() {
@Override
public void send(String response) {
nativeInvokePlatformMessageResponseCallback(mNativePlatformView, responseId, response);
}
});
} catch (Exception ex) {
Log.e(TAG, "Uncaught exception in async message listener", ex);
nativeInvokePlatformMessageResponseCallback(mNativePlatformView, responseId, null);
}
return;
}
@ -572,8 +583,14 @@ public class FlutterView extends SurfaceView
@CalledByNative
private void handlePlatformMessageResponse(int responseId, String response) {
MessageReplyCallback callback = mPendingResponses.remove(responseId);
if (callback != null)
callback.onReply(response);
if (callback != null) {
try {
callback.onReply(response);
} catch (Exception ex) {
Log.e(TAG, "Uncaught exception in message listener reply", ex);
return;
}
}
}
@CalledByNative