Merge pull request #10338 from wordpress-mobile/issue/fix-potential-npe-in-wpwebviewactivity

khaykov · web-flow · commit 793d2b826b17 · 2019-08-07T21:49:46.000-07:00
Fix potential NPE in WPWebviewActivity
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/WPWebViewActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/WPWebViewActivity.java
@@ -249,8 +249,10 @@ private void showSubtitle(ActionBar actionBar) {
         }
 
         String originalUrl = extras.getString(URL_TO_LOAD);
-        Uri uri = Uri.parse(originalUrl);
-        actionBar.setSubtitle(uri.getHost());
+        if (originalUrl != null) {
+            Uri uri = Uri.parse(originalUrl);
+            actionBar.setSubtitle(uri.getHost());
+        }
     }
 
     private void initRetryButton() {

Original file line number	Diff line number	Diff line change
`@@ -249,8 +249,10 @@ private void showSubtitle(ActionBar actionBar) {`
`249`	`249`	`}`
`250`	`250`
`251`	`251`	`String originalUrl = extras.getString(URL_TO_LOAD);`
`252`		`- Uri uri = Uri.parse(originalUrl);`
`253`		`- actionBar.setSubtitle(uri.getHost());`
	`252`	`+ if (originalUrl != null) {`
	`253`	`+ Uri uri = Uri.parse(originalUrl);`
	`254`	`+ actionBar.setSubtitle(uri.getHost());`
	`255`	`+ }`
`254`	`256`	`}`
`255`	`257`
`256`	`258`	`private void initRetryButton() {`