kavin/LibreTube
1
0
Fork 0
mirror of https://github.com/libre-tube/LibreTube.git synced 2025-04-29 08:20:32 +05:30
Code Issues Projects Releases Wiki Activity

Merge pull request #3226 from Bnyro/master

Browse Source 
Fix crash on some videos when the instance is down
This commit is contained in:
Bnyro 2023-03-03 17:10:58 +01:00 committed by GitHub
commit 9e239e6a79
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/github/libretube/ui/dialogs/LoginDialog.kt
View File

@ -72,9 +72,9 @@ class LoginDialog(
RetrofitInstance.authApi.login(login) RetrofitInstance.authApi.login(login)
} }
} catch (e: HttpException) { } catch (e: HttpException) {
val errorMessage = e.response()?.errorBody()?.string()?.let { val errorMessage = e.response()?.errorBody()?.string()?.runCatching {
JsonHelper.json.decodeFromString<Token>(it).error JsonHelper.json.decodeFromString<Token>(this).error
} ?: context?.getString(R.string.server_error) ?: "" }?.getOrNull() ?: context?.getString(R.string.server_error) ?: ""
Toast.makeText(context, errorMessage, Toast.LENGTH_SHORT).show() Toast.makeText(context, errorMessage, Toast.LENGTH_SHORT).show()
return@launchWhenCreated return@launchWhenCreated
} catch (e: Exception) { } catch (e: Exception) {

6
app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt
View File

@ -648,9 +648,9 @@ class PlayerFragment : Fragment(R.layout.fragment_player), OnlinePlayerOptions {
Toast.makeText(context, R.string.unknown_error, Toast.LENGTH_LONG).show() Toast.makeText(context, R.string.unknown_error, Toast.LENGTH_LONG).show()
return@launchWhenCreated return@launchWhenCreated
} catch (e: HttpException) { } catch (e: HttpException) {
val errorMessage = e.response()?.errorBody()?.string()?.let { val errorMessage = e.response()?.errorBody()?.string()?.runCatching {
JsonHelper.json.decodeFromString<Message>(it).message JsonHelper.json.decodeFromString<Message>(this).message
} ?: context?.getString(R.string.server_error) ?: "" }?.getOrNull() ?: context?.getString(R.string.server_error) ?: ""
Toast.makeText(context, errorMessage, Toast.LENGTH_LONG).show() Toast.makeText(context, errorMessage, Toast.LENGTH_LONG).show()
return@launchWhenCreated return@launchWhenCreated
} }