Merge branch 'release/5.40.3'

Author: marcosholgado

app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt

@@ -17,7 +17,6 @@
 package com.duckduckgo.app.browser
 
 import android.Manifest
-import android.animation.AnimatorSet
 import android.animation.LayoutTransition.CHANGING
 import android.animation.LayoutTransition.DISAPPEARING
 import android.annotation.SuppressLint
@@ -116,8 +115,10 @@ import kotlin.coroutines.CoroutineContext
 
 class BrowserTabFragment : Fragment(), FindListener, CoroutineScope {
 
+    private val supervisorJob = SupervisorJob()
+
     override val coroutineContext: CoroutineContext
-        get() = SupervisorJob() + Dispatchers.Main
+        get() = supervisorJob + Dispatchers.Main
 
     @Inject
     lateinit var webViewClient: BrowserWebViewClient
@@ -963,6 +964,7 @@ class BrowserTabFragment : Fragment(), FindListener, CoroutineScope {
     }
 
     override fun onDestroy() {
+        supervisorJob.cancel()
         popupMenu.dismiss()
         destroyWebView()
         super.onDestroy()
@@ -1189,18 +1191,15 @@ class BrowserTabFragment : Fragment(), FindListener, CoroutineScope {
                     val site = viewModel.siteLiveData.value
                     val events = site?.trackingEvents
 
-                    val act = activity
-                    if (act != null) {
+                    activity?.let { activity ->
                         animatorHelper.createLoadedAnimation(
                             lastSeenCtaViewState?.cta,
-                            act,
+                            activity,
                             networksContainer,
                             loadingText,
                             omnibarViews(),
                             events
                         )
-                    } else {
-                        cancelAllAnimations()
                     }
                 }
             }

app/src/main/java/com/duckduckgo/app/global/view/DaxDialog.kt

@@ -77,7 +77,7 @@ class DaxDialog(
     }
 
     override fun onDismiss(dialog: DialogInterface) {
-        dialogText.cancelAnimation()
+        dialogText?.cancelAnimation()
         dismissListener()
         super.onDismiss(dialog)
     }

app/version/version.properties

@@ -1 +1 @@
-VERSION=5.40.2
+VERSION=5.40.3