From 93df88854339e9051204a7903127cfcee05f1162 Mon Sep 17 00:00:00 2001 From: Andres Aguilar Date: Fri, 21 Aug 2020 15:08:35 -0700 Subject: [PATCH 1/3] Fixes crash when entering incorrect Url --- .../java/org/jellyfin/mobile/utils/ServerConnectionUtils.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/jellyfin/mobile/utils/ServerConnectionUtils.kt b/app/src/main/java/org/jellyfin/mobile/utils/ServerConnectionUtils.kt index 7f55397a..3e135763 100644 --- a/app/src/main/java/org/jellyfin/mobile/utils/ServerConnectionUtils.kt +++ b/app/src/main/java/org/jellyfin/mobile/utils/ServerConnectionUtils.kt @@ -69,6 +69,10 @@ 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){ + null + } } } From becaf839aaf4566054ffafdecfd191ff4ff8645d Mon Sep 17 00:00:00 2001 From: Andres Aguilar Date: Sat, 22 Aug 2020 19:32:26 -0700 Subject: [PATCH 2/3] Update app/src/main/java/org/jellyfin/mobile/utils/ServerConnectionUtils.kt :+1 Co-authored-by: Niels van Velzen --- .../java/org/jellyfin/mobile/utils/ServerConnectionUtils.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/org/jellyfin/mobile/utils/ServerConnectionUtils.kt b/app/src/main/java/org/jellyfin/mobile/utils/ServerConnectionUtils.kt index 3e135763..b9f8bcae 100644 --- a/app/src/main/java/org/jellyfin/mobile/utils/ServerConnectionUtils.kt +++ b/app/src/main/java/org/jellyfin/mobile/utils/ServerConnectionUtils.kt @@ -71,7 +71,7 @@ suspend fun fetchServerInfo(httpClient: OkHttpClient, url: HttpUrl): String? { return withContext(Dispatchers.IO) { try { request.execute().use { it.body?.string() } - }catch (e:IOException){ + } catch (e: IOException) { null } } From 33b3094f1227ec4a3e6b24f1927ec73ae4f9f488 Mon Sep 17 00:00:00 2001 From: Andres Aguilar Date: Sat, 22 Aug 2020 19:37:20 -0700 Subject: [PATCH 3/3] Fixed requested changes --- .../java/org/jellyfin/mobile/utils/ServerConnectionUtils.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/main/java/org/jellyfin/mobile/utils/ServerConnectionUtils.kt b/app/src/main/java/org/jellyfin/mobile/utils/ServerConnectionUtils.kt index b9f8bcae..f46cefc2 100644 --- a/app/src/main/java/org/jellyfin/mobile/utils/ServerConnectionUtils.kt +++ b/app/src/main/java/org/jellyfin/mobile/utils/ServerConnectionUtils.kt @@ -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 { @@ -72,6 +73,7 @@ suspend fun fetchServerInfo(httpClient: OkHttpClient, url: HttpUrl): String? { try { request.execute().use { it.body?.string() } } catch (e: IOException) { + Timber.e(e, "Cannot connect to server") null } }