From da0405935968a20bb32a8283b502c99dd7afd243 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Sat, 18 Feb 2023 10:29:26 +0100
Subject: [PATCH] Better error messages when a video is unavailable

---
 .../java/com/github/libretube/api/obj/Message.kt    |  5 ++++-
 .../github/libretube/ui/fragments/PlayerFragment.kt | 13 ++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/github/libretube/api/obj/Message.kt b/app/src/main/java/com/github/libretube/api/obj/Message.kt
index 70692071a..9fe8bbb61 100644
--- a/app/src/main/java/com/github/libretube/api/obj/Message.kt
+++ b/app/src/main/java/com/github/libretube/api/obj/Message.kt
@@ -3,4 +3,7 @@ package com.github.libretube.api.obj
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class Message(val message: String? = null)
+data class Message(
+    val error: String? = null,
+    val message: String? = null
+)
diff --git a/app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt b/app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt
index eb480588e..d76f5151e 100644
--- a/app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt
+++ b/app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt
@@ -44,10 +44,12 @@ import com.github.libretube.api.CronetHelper
 import com.github.libretube.api.JsonHelper
 import com.github.libretube.api.RetrofitInstance
 import com.github.libretube.api.obj.ChapterSegment
+import com.github.libretube.api.obj.Message
 import com.github.libretube.api.obj.PipedStream
 import com.github.libretube.api.obj.Segment
 import com.github.libretube.api.obj.StreamItem
 import com.github.libretube.api.obj.Streams
+import com.github.libretube.api.obj.Token
 import com.github.libretube.constants.IntentData
 import com.github.libretube.constants.PreferenceKeys
 import com.github.libretube.databinding.FragmentPlayerBinding
@@ -118,6 +120,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import kotlinx.datetime.LocalDate
+import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.encodeToString
 import retrofit2.HttpException
 
@@ -653,13 +656,13 @@ class PlayerFragment : Fragment(R.layout.fragment_player), OnlinePlayerOptions {
             streams = try {
                 RetrofitInstance.api.getStreams(videoId!!)
             } catch (e: IOException) {
-                println(e)
-                Log.e(TAG(), "IOException, you might not have internet connection")
-                Toast.makeText(context, R.string.unknown_error, Toast.LENGTH_SHORT).show()
+                Toast.makeText(context, R.string.unknown_error, Toast.LENGTH_LONG).show()
                 return@launchWhenCreated
             } catch (e: HttpException) {
-                Log.e(TAG(), "HttpException, unexpected response")
-                Toast.makeText(context, R.string.server_error, Toast.LENGTH_SHORT).show()
+                val errorMessage = e.response()?.errorBody()?.string()?.let {
+                    JsonHelper.json.decodeFromString<Message>(it).message
+                } ?: context?.getString(R.string.server_error) ?: ""
+                Toast.makeText(context, errorMessage, Toast.LENGTH_LONG).show()
                 return@launchWhenCreated
             }