Skip to content

Commit 3ef8c58

Browse files
committed
Keep from crashing when handler not found
1 parent b585ac8 commit 3ef8c58

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

WebViewJavascriptBridge/WebViewJavascriptBridge.m

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -132,11 +132,15 @@ - (void)_flushMessageQueue {
132132
handler = [self.responseCallbacks objectForKey:[message objectForKey:@"responseId"]];
133133
}
134134

135-
@try {
136-
handler([message objectForKey:@"data"], responseCallback);
137-
}
138-
@catch (NSException *exception) {
139-
NSLog(@"WebViewJavascriptBridge: WARNING: handler threw. %@ %@", message, exception);
135+
if (handler) {
136+
@try {
137+
handler([message objectForKey:@"data"], responseCallback);
138+
}
139+
@catch (NSException *exception) {
140+
NSLog(@"WebViewJavascriptBridge: WARNING: handler threw. %@ %@", message, exception);
141+
}
142+
} else {
143+
NSLog(@"WebViewJavascriptBridge: WARNING: handler not found (%@)", [message objectForKey:@"handlerName"]);
140144
}
141145
}
142146
}

0 commit comments

Comments
 (0)