From a028b3f6a25fb9e953d4ea5057e10c9d4d9eaece Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Tue, 2 Feb 2016 21:55:45 +0000
Subject: [PATCH] Avoid NPE in Uri.getPath().replaceAll()
Fixes #533.
---
.../src/org/fdroid/fdroid/views/ManageReposActivity.java | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/F-Droid/src/org/fdroid/fdroid/views/ManageReposActivity.java b/F-Droid/src/org/fdroid/fdroid/views/ManageReposActivity.java
index 312ad9ec4..f5c7dfd0d 100644
--- a/F-Droid/src/org/fdroid/fdroid/views/ManageReposActivity.java
+++ b/F-Droid/src/org/fdroid/fdroid/views/ManageReposActivity.java
@@ -583,9 +583,12 @@ public class ManageReposActivity extends ActionBarActivity {
}
uri = uri.normalize();
- String path = uri.getPath().replaceAll("//*/", "/"); // Collapse multiple forward slashes into 1.
- if (path.length() > 0 && path.charAt(path.length() - 1) == '/') {
- path = path.substring(0, path.length() - 1);
+ String path = uri.getPath();
+ if (path != null) {
+ path = path.replaceAll("//*/", "/"); // Collapse multiple forward slashes into 1.
+ if (path.length() > 0 && path.charAt(path.length() - 1) == '/') {
+ path = path.substring(0, path.length() - 1);
+ }
}
return new URI(uri.getScheme(), uri.getUserInfo(), uri.getHost(), uri.getPort(),