Fix NPE in spoiler renderer.

cody-signal · cody-signal · commit 07bd8b2fa34a · 2023-06-21T10:10:01.000-04:00
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
@@ -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
@@ -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)
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -64,10 +64,10 @@ fun TextView.setRelativeDrawables(`
`64`	`64`	`* Get a lifecycle associated with this view. Care must be taken to ensure`
`65`	`65`	`* if activity fallback occurs that the context of the view is correct.`
`66`	`66`	`*/`
`67`		`-fun View.getLifecycle(): Lifecycle {`
	`67`	`+fun View.getLifecycle(): Lifecycle? {`
`68`	`68`	`return try {`
`69`	`69`	`findFragment<Fragment>().viewLifecycleOwner.lifecycle`
`70`	`70`	`} catch (e: IllegalStateException) {`
`71`		`- ViewUtil.getActivityLifecycle(this)!!`
	`71`	`+ ViewUtil.getActivityLifecycle(this)`
`72`	`72`	`}`
`73`	`73`	`}`