jellyfin/jellyfin-android
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-android.git synced 2026-09-03 05:10:27 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #33 from andresesfm/patch-1

Browse Source 
Fixes crash when entering incorrect Url
This commit is contained in:
Max Rumpf
2020-08-23 09:56:27 +02:00
committed by GitHub
parent 1790d3a454 33b3094f12
commit 9e96f4f051
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/org/jellyfin/mobile/utils/ServerConnectionUtils.kt
+7 -1
View File
@@ -12,6 +12,7 @@ import org.jellyfin.mobile.utils.Constants.SERVER_INFO_PATH
import org.json.JSONException
import org.json.JSONObject
import timber.log.Timber
import java.io.IOException
suspend fun WebappActivity.checkServerUrlAndConnection(enteredUrl: String): HttpUrl? {
val normalizedUrl = enteredUrl.run {
@@ -69,6 +70,11 @@ suspend fun fetchServerInfo(httpClient: OkHttpClient, url: HttpUrl): String? {
val serverInfoUrl = url.resolve(SERVER_INFO_PATH) ?: return null
val request = httpClient.newCall(Request.Builder().url(serverInfoUrl).build())
return withContext(Dispatchers.IO) {
request.execute().use { it.body?.string() }
try {
request.execute().use { it.body?.string() }
} catch (e: IOException) {
Timber.e(e, "Cannot connect to server")
null
}
}
}