Skip to content

Use evaluateJavascript in ArticleWebView and guard external startActivity calls #211

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jim-daf wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use evaluateJavascript in ArticleWebView and guard external startActivity calls #211

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 14 additions & 5 deletions src/itkach/aard2/ArticleWebView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ public void onPageStarted(WebView view, String url, Bitmap favicon) {
List<Long> tsList = new ArrayList<Long>();
tsList.add(System.currentTimeMillis());
times.put(url, tsList);
view.loadUrl("javascript:" + styleSwitcherJs);
view.evaluateJavascript(styleSwitcherJs, null);
try {
timer.schedule(applyStylePref, 250, 200);
} catch (IllegalStateException ex) {
Expand Down Expand Up @@ -192,8 +192,8 @@ public void onPageFinished(WebView view, String url) {
else {
Log.w(TAG, "onPageFinished: Unexpected page finished event for " + url);
}
view.loadUrl("javascript:" + styleSwitcherJs +
";$SLOB.setStyleTitles($styleSwitcher.getTitles())");
view.evaluateJavascript(styleSwitcherJs +
";$SLOB.setStyleTitles($styleSwitcher.getTitles())", null);
applyStylePref();
}

Expand Down Expand Up @@ -232,7 +232,11 @@ public boolean shouldOverrideUrlLoading(WebView view,

if (isExternal(uri)) {
Intent browserIntent = new Intent(Intent.ACTION_VIEW, uri);
getContext().startActivity(browserIntent);
try {
getContext().startActivity(browserIntent);
} catch (android.content.ActivityNotFoundException e) {
Log.w(TAG, "No app to handle " + uri, e);
}
return true;
}

Expand All @@ -252,7 +256,12 @@ public boolean shouldOverrideUrlLoading(WebView view,
if (scheme.equals("http") && host.equals(LOCALHOST) && uri.getQueryParameter("blob") == null) {
Intent intent = new Intent(getContext(), ArticleCollectionActivity.class);
intent.setData(uri);
getContext().startActivity(intent);
try {
getContext().startActivity(intent);
} catch (android.content.ActivityNotFoundException e) {
Log.w(TAG, "Failed to open ArticleCollectionActivity for " + uri, e);
return false;
}
Log.d(TAG, "Overriding loading of " + url);
return true;
}
Expand Down