From e38feed08bc712fde513a19877af9f574db551ac Mon Sep 17 00:00:00 2001 From: rfc2822 Date: Sat, 15 Mar 2014 13:39:02 +0100 Subject: [PATCH] Check base URL validity with new URI() instead of new URL() (fixes #184) --- .../syncadapter/EnterCredentialsFragment.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/at/bitfire/davdroid/syncadapter/EnterCredentialsFragment.java b/src/at/bitfire/davdroid/syncadapter/EnterCredentialsFragment.java index 34c95da0..b90037f3 100644 --- a/src/at/bitfire/davdroid/syncadapter/EnterCredentialsFragment.java +++ b/src/at/bitfire/davdroid/syncadapter/EnterCredentialsFragment.java @@ -10,8 +10,10 @@ ******************************************************************************/ package at.bitfire.davdroid.syncadapter; -import java.net.MalformedURLException; -import java.net.URL; +import java.net.URI; +import java.net.URISyntaxException; + +import org.apache.commons.lang.StringUtils; import android.app.DialogFragment; import android.app.Fragment; @@ -128,10 +130,10 @@ public class EnterCredentialsFragment extends Fragment implements TextWatcher { // check host name try { - URL url = new URL(URIUtils.sanitize(protocol + editBaseURL.getText().toString())); - if (url.getHost() == null || url.getHost().isEmpty()) + URI uri = new URI(URIUtils.sanitize(protocol + editBaseURL.getText().toString())); + if (StringUtils.isBlank(uri.getHost())) ok = false; - } catch (MalformedURLException e) { + } catch (URISyntaxException e) { ok = false; }