From c6385caf0f2d1904386c6034ae70b1c17782eb8b Mon Sep 17 00:00:00 2001
From: Jarne Demeulemeester
 <32322857+jarnedemeulemeester@users.noreply.github.com>
Date: Fri, 29 Apr 2022 23:49:41 +0200
Subject: [PATCH] Fix trailing slash in baseUrl not loading images (#114)

---
 app/src/main/java/dev/jdtech/jellyfin/BindingAdapters.kt      | 4 +++-
 .../java/dev/jdtech/jellyfin/fragments/AddServerFragment.kt   | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/dev/jdtech/jellyfin/BindingAdapters.kt b/app/src/main/java/dev/jdtech/jellyfin/BindingAdapters.kt
index 42b74dec..5aa03e73 100644
--- a/app/src/main/java/dev/jdtech/jellyfin/BindingAdapters.kt
+++ b/app/src/main/java/dev/jdtech/jellyfin/BindingAdapters.kt
@@ -106,7 +106,7 @@ fun bindSeasonPoster(imageView: ImageView, seasonId: UUID) {
 private fun ImageView.loadImage(url: String, @DrawableRes errorPlaceHolderId: Int? = null): View {
     val api = JellyfinApi.getInstance(context.applicationContext)
 
-    return Glide
+    Glide
         .with(context)
         .load("${api.api.baseUrl}$url")
         .transition(DrawableTransitionOptions.withCrossFade())
@@ -114,6 +114,8 @@ private fun ImageView.loadImage(url: String, @DrawableRes errorPlaceHolderId: In
         .error(errorPlaceHolderId)
         .into(this)
         .view
+
+    return this
 }
 
 private fun View.posterDescription(name: String?) {
diff --git a/app/src/main/java/dev/jdtech/jellyfin/fragments/AddServerFragment.kt b/app/src/main/java/dev/jdtech/jellyfin/fragments/AddServerFragment.kt
index 9cada6c0..678f8fc5 100644
--- a/app/src/main/java/dev/jdtech/jellyfin/fragments/AddServerFragment.kt
+++ b/app/src/main/java/dev/jdtech/jellyfin/fragments/AddServerFragment.kt
@@ -82,7 +82,7 @@ class AddServerFragment : Fragment() {
 
     private fun connectToServer() {
         val serverAddress = binding.editTextServerAddress.text.toString()
-        viewModel.checkServer(serverAddress)
+        viewModel.checkServer(serverAddress.removeSuffix("/"))
     }
 
     private fun navigateToLoginFragment() {