moparisthebest
/
k-9
mirror of https://github.com/moparisthebest/k-9
1
0
Fork 0
Code Issues Releases Wiki Activity

Restructure the code a bit

This commit is contained in:
cketti 2015-04-04 00:55:53 +02:00
parent 8bcf9b1d50
commit 09babb6e88
1 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
k9mail/src/main/java/com/fsck/k9/view/K9WebViewClient.java
View File

@ -53,21 +53,30 @@ public abstract class K9WebViewClient extends WebViewClient {
@Override
public boolean shouldOverrideUrlLoading(WebView webView, String url) {
Context context = webView.getContext();
Uri uri = Uri.parse(url);
if (!CID_SCHEME.equals(uri.getScheme())) {
Intent intent = new Intent(Intent.ACTION_VIEW, uri);
intent.addCategory(Intent.CATEGORY_BROWSABLE);
intent.putExtra(Browser.EXTRA_APPLICATION_ID, context.getPackageName());
try {
context.startActivity(intent);
return true;
} catch (ActivityNotFoundException ex) {
// If no application can handle the URL, assume that the
// WebView can handle it.
}
if (CID_SCHEME.equals(uri.getScheme())) {
return false;
}
return false;
Context context = webView.getContext();
Intent intent = createBrowserViewIntent(uri, context);
boolean overridingUrlLoading = false;
try {
context.startActivity(intent);
overridingUrlLoading = true;
} catch (ActivityNotFoundException ex) {
// If no application can handle the URL, assume that the WebView can handle it.
}
return overridingUrlLoading;
}
private Intent createBrowserViewIntent(Uri uri, Context context) {
Intent intent = new Intent(Intent.ACTION_VIEW, uri);
intent.addCategory(Intent.CATEGORY_BROWSABLE);
intent.putExtra(Browser.EXTRA_APPLICATION_ID, context.getPackageName());
return intent;
}
protected WebResourceResponse shouldInterceptRequest(WebView webView, Uri uri) {