From d7436aaf2ca7e5f3f638500572f12e829c30c5e9 Mon Sep 17 00:00:00 2001 From: Krunal Patel Date: Sat, 26 Nov 2022 23:16:49 +0530 Subject: [PATCH] Fix plain text links and NPE when opening link from external source --- .../java/com/github/libretube/ui/fragments/PlayerFragment.kt | 3 +++ .../java/com/github/libretube/ui/views/CustomExoPlayerView.kt | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) 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 f66f46550..6863f25f8 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 @@ -16,6 +16,7 @@ import android.os.Handler import android.os.Looper import android.os.PowerManager import android.text.format.DateUtils +import android.text.util.Linkify import android.util.Base64 import android.util.Log import android.view.LayoutInflater @@ -945,6 +946,8 @@ class PlayerFragment : BaseFragment(), OnlinePlayerOptions { if (description.contains("<") && description.contains(">")) { binding.playerDescription.setFormattedHtml(description) } else { + // Links can be present as plain text + binding.playerDescription.autoLinkMask = Linkify.WEB_URLS binding.playerDescription.text = description } diff --git a/app/src/main/java/com/github/libretube/ui/views/CustomExoPlayerView.kt b/app/src/main/java/com/github/libretube/ui/views/CustomExoPlayerView.kt index 9b4ece133..1e407a661 100644 --- a/app/src/main/java/com/github/libretube/ui/views/CustomExoPlayerView.kt +++ b/app/src/main/java/com/github/libretube/ui/views/CustomExoPlayerView.kt @@ -442,7 +442,7 @@ internal class CustomExoPlayerView( it.layoutParams = params } - if (PlayerHelper.swipeGestureEnabled) { + if (PlayerHelper.swipeGestureEnabled && this::brightnessHelper.isInitialized) { when (newConfig?.orientation) { Configuration.ORIENTATION_LANDSCAPE -> brightnessHelper.restoreSavedBrightness() else -> brightnessHelper.resetToSystemBrightness(false)