Use evaluateJavascript instead of loadUrl("javascript:...") in WebApp interfaces#532
Open
jim-daf wants to merge 1 commit into
Open
Use evaluateJavascript instead of loadUrl("javascript:...") in WebApp interfaces#532jim-daf wants to merge 1 commit into
jim-daf wants to merge 1 commit into
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Closes #531.
What changes
Across the three webinfc bridge classes, every
mWebView.loadUrl("javascript:...")is replaced withmWebView.evaluateJavascript(script, null)and the"javascript:"prefix is stripped from the JS snippet strings.Files touched:
app/src/main/java/com/ds/avare/webinfc/WebAppAircraftInterface.javaapp/src/main/java/com/ds/avare/webinfc/WebAppMapInterface.javaapp/src/main/java/com/ds/avare/webinfc/WebAppPlanInterface.java26 call sites in total. Sample:
else if(MSG_CLEAR_LIST == msg.what) { - mWebView.loadUrl("javascript:list_clear()"); + mWebView.evaluateJavascript("list_clear()", null); } else if(MSG_ADD_LIST == msg.what) { - String func = "javascript:list_add(" + (String)msg.obj + ")"; - mWebView.loadUrl(func); + String func = "list_add(" + (String)msg.obj + ")"; + mWebView.evaluateJavascript(func, null); }evaluateJavascriptruns the JS without touching the WebView navigation stack, which is what every one of these helpers actually wants. The visible behaviour stays the same.