From 6eddfb8b9702264359ed40b0332b17bc73c3045a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Wed, 23 Sep 2015 22:17:23 -0700 Subject: [PATCH] Avoid NPE in normalizeUrl Found it when trying to add a repo manually: E/AndroidRuntime(30549): java.lang.NullPointerException: Attempt to invoke virtual method 'java.lang.String java.lang.String.replaceAll(java.lang.String, java.lang.String)' on a null object reference E/AndroidRuntime(30549): at org.fdroid.fdroid.views.ManageReposActivity$AddRepo.normalizeUrl(ManageReposActivity.java:547) E/AndroidRuntime(30549): at org.fdroid.fdroid.views.ManageReposActivity$AddRepo.validateRepoDetails(ManageReposActivity.java:358) E/AndroidRuntime(30549): at org.fdroid.fdroid.views.ManageReposActivity$AddRepo.access$700(ManageReposActivity.java:218) E/AndroidRuntime(30549): at org.fdroid.fdroid.views.ManageReposActivity$AddRepo$4.afterTextChanged(ManageReposActivity.java:342) E/AndroidRuntime(30549): at android.widget.TextView.sendAfterTextChanged(TextView.java:7698) --- F-Droid/src/org/fdroid/fdroid/views/ManageReposActivity.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/F-Droid/src/org/fdroid/fdroid/views/ManageReposActivity.java b/F-Droid/src/org/fdroid/fdroid/views/ManageReposActivity.java index 718665019..41059b027 100644 --- a/F-Droid/src/org/fdroid/fdroid/views/ManageReposActivity.java +++ b/F-Droid/src/org/fdroid/fdroid/views/ManageReposActivity.java @@ -538,6 +538,9 @@ public class ManageReposActivity extends ActionBarActivity { * slashes in the path and replaces them with one. Finally, it removes trailing slashes. */ private String normalizeUrl(String urlString) throws URISyntaxException { + if (urlString == null) { + return null; + } URI uri = new URI(urlString); if (!uri.isAbsolute()) { throw new URISyntaxException(urlString, "Must provide an absolute URI for repositories");