From 1cab1864034d0ebf1b0623c4ea6e31b8dbf69223 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Mon, 18 Dec 2023 17:24:55 +0100
Subject: [PATCH] Moved TTFD to end of splash screen

---
 .../java/org/linphone/ui/main/MainActivity.kt    | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/org/linphone/ui/main/MainActivity.kt b/app/src/main/java/org/linphone/ui/main/MainActivity.kt
index cbc084736..13d696681 100644
--- a/app/src/main/java/org/linphone/ui/main/MainActivity.kt
+++ b/app/src/main/java/org/linphone/ui/main/MainActivity.kt
@@ -34,7 +34,6 @@ import androidx.annotation.MainThread
 import androidx.annotation.UiThread
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.core.view.children
-import androidx.core.view.doOnAttach
 import androidx.databinding.DataBindingUtil
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
@@ -152,20 +151,17 @@ class MainActivity : GenericActivity() {
             }
         }
 
-        binding.root.doOnAttach {
-            Log.i("$TAG Report UI has been fully drawn (TTFD)")
-            try {
-                reportFullyDrawn()
-            } catch (se: SecurityException) {
-                Log.e("$TAG Security exception when doing reportFullyDrawn(): $se")
-            }
-        }
-
         // Wait for fragment to be displayed before hiding the splashscreen
         binding.root.viewTreeObserver.addOnPreDrawListener(
             object : ViewTreeObserver.OnPreDrawListener {
                 override fun onPreDraw(): Boolean {
                     return if (sharedViewModel.isFirstFragmentReady) {
+                        Log.i("$TAG Report UI has been fully drawn (TTFD)")
+                        try {
+                            reportFullyDrawn()
+                        } catch (se: SecurityException) {
+                            Log.e("$TAG Security exception when doing reportFullyDrawn(): $se")
+                        }
                         binding.root.viewTreeObserver.removeOnPreDrawListener(this)
                         true
                     } else {