Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'null-uri-path' into 'master'

Browse Source 
Avoid NPE in Uri.getPath().replaceAll()

Fixes #533.

See merge request !199
This commit is contained in:
Peter Serwylo 2016-02-03 09:17:11 +00:00
commit 02c8fac906
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
F-Droid/src/org/fdroid/fdroid/views/ManageReposActivity.java
View File

@ -583,10 +583,13 @@ public class ManageReposActivity extends ActionBarActivity {
} }
uri = uri.normalize(); uri = uri.normalize();
String path = uri.getPath().replaceAll("//*/", "/"); // Collapse multiple forward slashes into 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) == '/') { if (path.length() > 0 && path.charAt(path.length() - 1) == '/') {
path = path.substring(0, path.length() - 1); path = path.substring(0, path.length() - 1);
} }
}
return new URI(uri.getScheme(), uri.getUserInfo(), uri.getHost(), uri.getPort(), return new URI(uri.getScheme(), uri.getUserInfo(), uri.getHost(), uri.getPort(),
path, uri.getQuery(), uri.getFragment()).toString(); path, uri.getQuery(), uri.getFragment()).toString();