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

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandler.java

Issue 1139753003: Revert of Catch Exception for Intent.parseUri instead of URISyntaxException (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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
Index: chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandler.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandler.java
index ed93d8826ecdd4e9cab03b5edc9f6c870cd391ce..dc8a1fc8f172324fa59a983dc4ea307682e734c9 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandler.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandler.java
@@ -10,10 +10,10 @@
import android.content.Intent;
import android.net.Uri;
import android.provider.Browser;
+import android.util.Log;
import android.webkit.WebView;
import org.chromium.base.CommandLine;
-import org.chromium.base.Log;
import org.chromium.base.VisibleForTesting;
import org.chromium.chrome.browser.ChromeSwitches;
import org.chromium.chrome.browser.UrlConstants;
@@ -22,6 +22,7 @@
import org.chromium.ui.base.PageTransition;
import java.net.URI;
+import java.net.URISyntaxException;
import java.util.List;
/**
@@ -78,8 +79,8 @@
// Perform generic parsing of the URI to turn it into an Intent.
try {
intent = Intent.parseUri(params.getUrl(), Intent.URI_INTENT_SCHEME);
- } catch (Exception ex) {
- Log.w(TAG, "Bad URI " + params.getUrl(), ex);
+ } catch (URISyntaxException ex) {
+ Log.w(TAG, "Bad URI " + params.getUrl() + ": " + ex.getMessage());
return OverrideUrlLoadingResult.NO_OVERRIDE;
}
@@ -282,7 +283,7 @@
try {
currentUri = new URI(params.getUrl());
previousUri = new URI(params.getReferrerUrl());
- } catch (Exception e) {
+ } catch (URISyntaxException e) {
currentUri = null;
previousUri = null;
}
@@ -294,7 +295,7 @@
try {
previousIntent = Intent.parseUri(
params.getReferrerUrl(), Intent.URI_INTENT_SCHEME);
- } catch (Exception e) {
+ } catch (URISyntaxException e) {
previousIntent = null;
}
@@ -385,7 +386,7 @@
try {
Intent intent = Intent.parseUri(url, Intent.URI_INTENT_SCHEME);
return intent.getPackage() != null || mDelegate.canResolveActivity(intent);
- } catch (Exception ex) {
+ } catch (URISyntaxException ex) {
// Ignore the error.
}
return false;

Powered by Google App Engine
This is Rietveld 408576698