Merge branch 'release/5.40.2'

Author: marcosholgado

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

@@ -1189,14 +1189,19 @@ class BrowserTabFragment : Fragment(), FindListener, CoroutineScope {
                     val site = viewModel.siteLiveData.value
                     val events = site?.trackingEvents
 
-                    animatorHelper.createLoadedAnimation(
-                        lastSeenCtaViewState?.cta,
-                        requireActivity(),
-                        networksContainer,
-                        loadingText,
-                        omnibarViews(),
-                        events
-                    )
+                    val act = activity
+                    if (act != null) {
+                        animatorHelper.createLoadedAnimation(
+                            lastSeenCtaViewState?.cta,
+                            act,
+                            networksContainer,
+                            loadingText,
+                            omnibarViews(),
+                            events
+                        )
+                    } else {
+                        cancelAllAnimations()
+                    }
                 }
             }
         }

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

@@ -45,7 +45,7 @@ class BrowserTrackersAnimatorHelper @Inject constructor() : CoroutineScope {
     override val coroutineContext: CoroutineContext
         get() = SupervisorJob() + Dispatchers.Main
 
-    var logosStayOnScreenDuration: Long = TRACKER_LOGOS_DELAY_ON_SCREEN
+    private var logosStayOnScreenDuration: Long = TRACKER_LOGOS_DELAY_ON_SCREEN
 
     private var loadingAnimation: AnimatorSet = AnimatorSet()
     private var trackersAnimation: AnimatorSet = AnimatorSet()

app/version/version.properties

@@ -1 +1 @@
-VERSION=5.40.1
+VERSION=5.40.2