arno/etesync-android
1
0
Fork 0
mirror of https://github.com/etesync/android synced 2025-07-04 13:52:40 +00:00
Code Issues Releases Wiki Activity

Use the library's isServerEtebase function.

Browse Source
This commit is contained in:
Tom Hacohen 2020-10-07 14:17:38 +03:00
parent 12d25a7785
commit 9ce152f5be
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/src/main/java/com/etesync/syncadapter/ui/setup/BaseConfigurationFinder.kt
View File

@ -11,18 +11,16 @@ import android.content.Context
import com.etebase.client.Account import com.etebase.client.Account
import com.etebase.client.Client import com.etebase.client.Client
import com.etebase.client.exceptions.EtebaseException import com.etebase.client.exceptions.EtebaseException
import com.etesync.syncadapter.HttpClient
import com.etesync.journalmanager.Crypto import com.etesync.journalmanager.Crypto
import com.etesync.journalmanager.Exceptions import com.etesync.journalmanager.Exceptions
import com.etesync.journalmanager.JournalAuthenticator import com.etesync.journalmanager.JournalAuthenticator
import com.etesync.journalmanager.UserInfoManager import com.etesync.journalmanager.UserInfoManager
import com.etesync.syncadapter.Constants import com.etesync.syncadapter.Constants
import com.etesync.syncadapter.HttpClient
import com.etesync.syncadapter.log.Logger import com.etesync.syncadapter.log.Logger
import com.etesync.syncadapter.model.CollectionInfo import com.etesync.syncadapter.model.CollectionInfo
import okhttp3.HttpUrl
import okhttp3.HttpUrl.Companion.toHttpUrlOrNull import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
import okhttp3.OkHttpClient import okhttp3.OkHttpClient
import okhttp3.Request
import java.io.IOException import java.io.IOException
import java.io.Serializable import java.io.Serializable
import java.net.URI import java.net.URI
@ -37,18 +35,13 @@ class BaseConfigurationFinder(protected val context: Context, protected val cred
private fun isServerEtebase(): Boolean { private fun isServerEtebase(): Boolean {
if (credentials.uri != null) { if (credentials.uri != null) {
val remote = credentials.uri.toHttpUrlOrNull()!!.newBuilder() val client = Client.create(httpClient, credentials.uri.toString())
.addPathSegments("api/v1/authentication/is_etebase/") return try {
.build() Account.isEtebaseServer(client)
true
val request = Request.Builder() } catch (e: EtebaseException) {
.get() false
.url(remote) }
.build()
val response = httpClient.newCall(request).execute()
return response.isSuccessful
} else { } else {
return !credentials.userName.contains("@") return !credentials.userName.contains("@")
} }