From 1363865660b2c8ffdea2b2be0a48d3d7b262e8a5 Mon Sep 17 00:00:00 2001
From: Tom Hacohen <tom@stosb.com>
Date: Wed, 8 Feb 2017 11:46:17 +0000
Subject: [PATCH] Don't require URI in login credentials constructor.

---
 .../davdroid/ui/setup/LoginCredentials.java      | 16 ++++++++++++++++
 .../ui/setup/LoginCredentialsFragment.java       |  9 +--------
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/at/bitfire/davdroid/ui/setup/LoginCredentials.java b/app/src/main/java/at/bitfire/davdroid/ui/setup/LoginCredentials.java
index 9fb3960a..b504e8a1 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/setup/LoginCredentials.java
+++ b/app/src/main/java/at/bitfire/davdroid/ui/setup/LoginCredentials.java
@@ -12,7 +12,10 @@ import android.os.Parcel;
 import android.os.Parcelable;
 
 import java.net.URI;
+import java.net.URISyntaxException;
 
+import at.bitfire.davdroid.App;
+import at.bitfire.davdroid.Constants;
 import lombok.RequiredArgsConstructor;
 
 @RequiredArgsConstructor
@@ -20,6 +23,19 @@ public class LoginCredentials implements Parcelable {
     public final URI uri;
     public final String userName, password;
 
+    public LoginCredentials(String userName, String password) {
+        this.userName = userName;
+        this.password = password;
+
+        URI uri = null;
+        try {
+            uri = new URI(Constants.serviceUrl.toString());
+        } catch (URISyntaxException e) {
+            App.log.severe("Should never happen, it's a constant");
+        }
+        this.uri = uri;
+    }
+
     @Override
     public int describeContents() {
         return 0;
diff --git a/app/src/main/java/at/bitfire/davdroid/ui/setup/LoginCredentialsFragment.java b/app/src/main/java/at/bitfire/davdroid/ui/setup/LoginCredentialsFragment.java
index f0a9db18..ab060aeb 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/setup/LoginCredentialsFragment.java
+++ b/app/src/main/java/at/bitfire/davdroid/ui/setup/LoginCredentialsFragment.java
@@ -78,13 +78,6 @@ public class LoginCredentialsFragment extends Fragment {
     protected LoginCredentials validateLoginData() {
         boolean valid = true;
 
-        URI uri = null;
-        try {
-            uri = new URI(Constants.serviceUrl.toString());
-        } catch (URISyntaxException e) {
-            App.log.severe("Should never happen, it's a constant");
-        }
-
         String userName = editUserName.getText().toString();
         if (userName.isEmpty()) {
             editUserName.setError(getString(R.string.login_user_name_required));
@@ -97,7 +90,7 @@ public class LoginCredentialsFragment extends Fragment {
             valid = false;
         }
 
-        return valid ? new LoginCredentials(uri, userName, password) : null;
+        return valid ? new LoginCredentials(userName, password) : null;
     }
 
 }