From 07bd8b2fa34a0d0abe494ee81bcc6766298d60c2 Mon Sep 17 00:00:00 2001
From: Cody Henthorne <cody@signal.org>
Date: Wed, 21 Jun 2023 10:10:01 -0400
Subject: [PATCH] Fix NPE in spoiler renderer.

---
 .../securesms/components/spoiler/SpoilerRendererDelegate.kt   | 2 +-
 .../java/org/thoughtcrime/securesms/util/ViewExtensions.kt    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/spoiler/SpoilerRendererDelegate.kt b/app/src/main/java/org/thoughtcrime/securesms/components/spoiler/SpoilerRendererDelegate.kt
index be0737895d..752fdf2751 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/spoiler/SpoilerRendererDelegate.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/spoiler/SpoilerRendererDelegate.kt
@@ -56,7 +56,7 @@ class SpoilerRendererDelegate @JvmOverloads constructor(
     view.addOnAttachStateChangeListener(object : OnAttachStateChangeListener {
       override fun onViewDetachedFromWindow(v: View) = stopAnimating()
       override fun onViewAttachedToWindow(v: View) {
-        view.getLifecycle().addObserver(object : DefaultLifecycleObserver {
+        view.getLifecycle()?.addObserver(object : DefaultLifecycleObserver {
           override fun onResume(owner: LifecycleOwner) {
             canAnimate = true
             systemAnimationsEnabled = !AccessibilityUtil.areAnimationsDisabled(view.context)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/ViewExtensions.kt b/app/src/main/java/org/thoughtcrime/securesms/util/ViewExtensions.kt
index e437bd4e2a..1a0cf5f5dc 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/ViewExtensions.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/ViewExtensions.kt
@@ -64,10 +64,10 @@ fun TextView.setRelativeDrawables(
  * Get a lifecycle associated with this view. Care must be taken to ensure
  * if activity fallback occurs that the context of the view is correct.
  */
-fun View.getLifecycle(): Lifecycle {
+fun View.getLifecycle(): Lifecycle? {
   return try {
     findFragment<Fragment>().viewLifecycleOwner.lifecycle
   } catch (e: IllegalStateException) {
-    ViewUtil.getActivityLifecycle(this)!!
+    ViewUtil.getActivityLifecycle(this)
   }
 }