Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1028)

Unified Diff: remoting/android/java/src/org/chromium/chromoting/help/CreditsActivity.java

Issue 2769813003: [remoting android] Fix WebView deprecation warnings (Closed)
Patch Set: Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | remoting/android/java/src/org/chromium/chromoting/help/HelpActivity.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/android/java/src/org/chromium/chromoting/help/CreditsActivity.java
diff --git a/remoting/android/java/src/org/chromium/chromoting/help/CreditsActivity.java b/remoting/android/java/src/org/chromium/chromoting/help/CreditsActivity.java
index 0fda299ba67a484d4d414393f8a1a7b535f20d43..2a6e2779ff141f1701e9a876f80125e7b8e559b6 100644
--- a/remoting/android/java/src/org/chromium/chromoting/help/CreditsActivity.java
+++ b/remoting/android/java/src/org/chromium/chromoting/help/CreditsActivity.java
@@ -4,11 +4,14 @@
package org.chromium.chromoting.help;
+import android.annotation.TargetApi;
import android.net.Uri;
+import android.os.Build;
import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import android.view.MenuItem;
+import android.webkit.WebResourceRequest;
import android.webkit.WebView;
import android.webkit.WebViewClient;
@@ -36,13 +39,24 @@ public class CreditsActivity extends AppCompatActivity {
webView.getSettings().setJavaScriptEnabled(true);
webView.setWebViewClient(new WebViewClient() {
- @Override
- public boolean shouldOverrideUrlLoading(WebView view, String url) {
+ private boolean shouldOverrideUrlLoading(final Uri uri) {
// There are no internal links in the Credits page, so open any links in a
// Web browser.
- ChromotingUtil.openUrl(CreditsActivity.this, Uri.parse(url));
+ ChromotingUtil.openUrl(CreditsActivity.this, uri);
return true;
}
+
+ @TargetApi(Build.VERSION_CODES.N)
+ @Override
+ public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request) {
+ return shouldOverrideUrlLoading(request.getUrl());
+ }
+
+ @SuppressWarnings("deprecation")
+ @Override
+ public boolean shouldOverrideUrlLoading(WebView view, String url) {
+ return shouldOverrideUrlLoading(Uri.parse(url));
+ }
});
webView.loadUrl(CREDITS_URL);
}
« no previous file with comments | « no previous file | remoting/android/java/src/org/chromium/chromoting/help/HelpActivity.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698