From a8f90405a9ebd01d29f19cd524afedd191651a4b Mon Sep 17 00:00:00 2001 From: Bnyro Date: Tue, 14 Jun 2022 14:40:16 +0200 Subject: [PATCH] share dialog crash fixed --- app/src/main/java/com/github/libretube/MainActivity.kt | 6 +++--- .../java/com/github/libretube/util/DescriptionAdapter.kt | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/github/libretube/MainActivity.kt b/app/src/main/java/com/github/libretube/MainActivity.kt index 4e26f1451..db9894118 100644 --- a/app/src/main/java/com/github/libretube/MainActivity.kt +++ b/app/src/main/java/com/github/libretube/MainActivity.kt @@ -207,7 +207,7 @@ class MainActivity : AppCompatActivity() { val bundle = Bundle() bundle.putString("videoId", watch) // for time stamped links - if (data.query?.contains("t=")!!) { + if (data.query != null && data.query?.contains("t=")!!) { val timeStamp = data.query.toString().split("t=")[1] bundle.putLong("timeStamp", timeStamp.toLong()) } @@ -227,7 +227,7 @@ class MainActivity : AppCompatActivity() { var bundle = Bundle() bundle.putString("videoId", watch.replace("v=", "")) // for time stamped links - if (data.query?.contains("t=")!!) { + if (data.query != null && data.query?.contains("t=")!!) { val timeStamp = data.query.toString().split("t=")[1] bundle.putLong("timeStamp", timeStamp.toLong()) } @@ -237,7 +237,7 @@ class MainActivity : AppCompatActivity() { var bundle = Bundle() bundle.putString("videoId", watch) // for time stamped links - if (data.query?.contains("t=")!!) { + if (data.query != null && data.query?.contains("t=")!!) { val timeStamp = data.query.toString().split("t=")[1] bundle.putLong("timeStamp", timeStamp.toLong()) } diff --git a/app/src/main/java/com/github/libretube/util/DescriptionAdapter.kt b/app/src/main/java/com/github/libretube/util/DescriptionAdapter.kt index aab8853d1..bd9de4aea 100644 --- a/app/src/main/java/com/github/libretube/util/DescriptionAdapter.kt +++ b/app/src/main/java/com/github/libretube/util/DescriptionAdapter.kt @@ -36,6 +36,7 @@ class DescriptionAdapter( lateinit var bitmap: Bitmap val thread = Thread { try { + // try to parse the thumbnailUrl to a Bitmap val inputStream = URL(thumbnailUrl).openStream() bitmap = BitmapFactory.decodeStream(inputStream) } catch (ex: java.lang.Exception) { @@ -44,6 +45,7 @@ class DescriptionAdapter( } thread.start() thread.join() + // return bitmap if initialized return try { bitmap } catch (e: Exception) {