From ee8c8d8fe1b0903e9572e6621445fa425333ae69 Mon Sep 17 00:00:00 2001
From: Tom Hacohen <tom@stosb.com>
Date: Tue, 25 Aug 2020 13:52:50 +0300
Subject: [PATCH] Login credentials: keep the default uri (even if null).

We need this for etebase compat.
---
 .../ui/setup/BaseConfigurationFinder.kt         | 11 +++++++----
 .../syncadapter/ui/setup/LoginCredentials.kt    | 17 +----------------
 2 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/app/src/main/java/com/etesync/syncadapter/ui/setup/BaseConfigurationFinder.kt b/app/src/main/java/com/etesync/syncadapter/ui/setup/BaseConfigurationFinder.kt
index 6785e5e6..87649439 100644
--- a/app/src/main/java/com/etesync/syncadapter/ui/setup/BaseConfigurationFinder.kt
+++ b/app/src/main/java/com/etesync/syncadapter/ui/setup/BaseConfigurationFinder.kt
@@ -13,6 +13,7 @@ import com.etesync.journalmanager.Crypto
 import com.etesync.journalmanager.Exceptions
 import com.etesync.journalmanager.JournalAuthenticator
 import com.etesync.journalmanager.UserInfoManager
+import com.etesync.syncadapter.Constants
 import com.etesync.syncadapter.log.Logger
 import com.etesync.syncadapter.model.CollectionInfo
 import okhttp3.HttpUrl
@@ -36,15 +37,17 @@ class BaseConfigurationFinder(protected val context: Context, protected val cred
         val cardDavConfig = findInitialConfiguration(CollectionInfo.Type.ADDRESS_BOOK)
         val calDavConfig = findInitialConfiguration(CollectionInfo.Type.CALENDAR)
 
-        val authenticator = JournalAuthenticator(httpClient, credentials.uri?.toHttpUrlOrNull()!!)
+        val uri = credentials.uri ?: URI(Constants.serviceUrl.toString())
+
+        val authenticator = JournalAuthenticator(httpClient, uri.toHttpUrlOrNull()!!)
 
         var authtoken: String? = null
         var userInfo: UserInfoManager.UserInfo? = null
         try {
             authtoken = authenticator.getAuthToken(credentials.userName, credentials.password)
 
-            val authenticatedHttpClient = HttpClient.Builder(context, credentials.uri.host, authtoken!!).build().okHttpClient
-            val userInfoManager = UserInfoManager(authenticatedHttpClient, credentials.uri.toHttpUrlOrNull()!!)
+            val authenticatedHttpClient = HttpClient.Builder(context, uri.host, authtoken!!).build().okHttpClient
+            val userInfoManager = UserInfoManager(authenticatedHttpClient, uri.toHttpUrlOrNull()!!)
             userInfo = userInfoManager.fetch(credentials.userName)
         } catch (e: Exceptions.HttpException) {
             Logger.log.warning(e.message)
@@ -55,7 +58,7 @@ class BaseConfigurationFinder(protected val context: Context, protected val cred
         }
 
         return Configuration(
-                credentials.uri,
+                uri,
                 credentials.userName, authtoken,
                 cardDavConfig, calDavConfig,
                 userInfo,
diff --git a/app/src/main/java/com/etesync/syncadapter/ui/setup/LoginCredentials.kt b/app/src/main/java/com/etesync/syncadapter/ui/setup/LoginCredentials.kt
index 47244cca..5709553c 100644
--- a/app/src/main/java/com/etesync/syncadapter/ui/setup/LoginCredentials.kt
+++ b/app/src/main/java/com/etesync/syncadapter/ui/setup/LoginCredentials.kt
@@ -15,22 +15,7 @@ import com.etesync.syncadapter.log.Logger
 import java.net.URI
 import java.net.URISyntaxException
 
-class LoginCredentials(_uri: URI?, val userName: String, val password: String) : Parcelable {
-    val uri: URI?
-
-    init {
-        var uri = _uri
-
-        if (uri == null) {
-            try {
-                uri = URI(Constants.serviceUrl.toString())
-            } catch (e: URISyntaxException) {
-                Logger.log.severe("Should never happen, it's a constant")
-            }
-
-        }
-        this.uri = uri
-    }
+class LoginCredentials(val uri: URI?, val userName: String, val password: String) : Parcelable {
 
     override fun describeContents(): Int {
         return 0