From 2910aceb3fbd2eb36c679bfe31c2ebd9cb145f67 Mon Sep 17 00:00:00 2001 From: janisslsm <97699850+janisslsm@users.noreply.github.com> Date: Mon, 16 May 2022 13:34:13 +0300 Subject: [PATCH] Don't retrieve segments if no category is enabled --- .../com/github/libretube/PlayerFragment.kt | 61 +++++++++++-------- 1 file changed, 34 insertions(+), 27 deletions(-) diff --git a/app/src/main/java/com/github/libretube/PlayerFragment.kt b/app/src/main/java/com/github/libretube/PlayerFragment.kt index 96ab68380..9c41a40dc 100644 --- a/app/src/main/java/com/github/libretube/PlayerFragment.kt +++ b/app/src/main/java/com/github/libretube/PlayerFragment.kt @@ -322,34 +322,41 @@ class PlayerFragment : Fragment() { return@launchWhenCreated } if(SponsorBlockSettings.sponsorBlockEnabled) { - segmentData = try { - val categories: ArrayList = arrayListOf() - if (SponsorBlockSettings.introEnabled) { - categories.add("intro") - } - if (SponsorBlockSettings.selfPromoEnabled) { - categories.add("selfpromo") - } - if (SponsorBlockSettings.interactionEnabled) { - categories.add("interaction") - } - if (SponsorBlockSettings.sponsorsEnabled) { - categories.add("sponsor") - } - if (SponsorBlockSettings.outroEnabled) { - categories.add("outro") - } + val categories: ArrayList = arrayListOf() + if (SponsorBlockSettings.introEnabled) { + categories.add("intro") + } + if (SponsorBlockSettings.selfPromoEnabled) { + categories.add("selfpromo") + } + if (SponsorBlockSettings.interactionEnabled) { + categories.add("interaction") + } + if (SponsorBlockSettings.sponsorsEnabled) { + categories.add("sponsor") + } + if (SponsorBlockSettings.outroEnabled) { + categories.add("outro") + } + if(categories.size > 0) { + segmentData = try { - RetrofitInstance.api.getSegments(videoId!!, "[\"" + TextUtils.join("\",\"", categories) + "\"]") - } 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() - return@launchWhenCreated - } catch (e: HttpException) { - Log.e(TAG, "HttpException, unexpected response") - Toast.makeText(context, R.string.server_error, Toast.LENGTH_SHORT).show() - return@launchWhenCreated + RetrofitInstance.api.getSegments( + videoId!!, + "[\"" + TextUtils.join("\",\"", categories) + "\"]" + ) + } 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() + return@launchWhenCreated + } catch (e: HttpException) { + Log.e(TAG, "HttpException, unexpected response") + Toast.makeText(context, R.string.server_error, Toast.LENGTH_SHORT) + .show() + return@launchWhenCreated + } } }