Make bottom sheet more robust

Author: CrisBarreiro

…ng/impl/ContingencyMessageBottomSheet.kt …ContingencyMessageBottomSheetFragment.ktad-blocking/ad-blocking-impl/src/main/java/com/duckduckgo/adblocking/impl/ContingencyMessageBottomSheet.kt renamed to ad-blocking/ad-blocking-impl/src/main/java/com/duckduckgo/adblocking/impl/ContingencyMessageBottomSheetFragment.kt ad-blocking/ad-blocking-impl/src/main/java/com/duckduckgo/adblocking/impl/ContingencyMessageBottomSheet.kt renamed to ad-blocking/ad-blocking-impl/src/main/java/com/duckduckgo/adblocking/impl/ContingencyMessageBottomSheetFragment.kt

@@ -16,20 +16,29 @@
 
 package com.duckduckgo.adblocking.impl
 
-import android.annotation.SuppressLint
-import android.content.Context
+import android.os.Bundle
 import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
 import com.duckduckgo.adblocking.impl.databinding.BottomSheetContingencyMessageBinding
-import com.google.android.material.bottomsheet.BottomSheetDialog
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 
-@SuppressLint("NoBottomSheetDialog")
-class ContingencyMessageBottomSheet(context: Context) : BottomSheetDialog(context) {
+class ContingencyMessageBottomSheetFragment : BottomSheetDialogFragment() {
 
-    private val binding = BottomSheetContingencyMessageBinding.inflate(LayoutInflater.from(context))
-
-    init {
-        setContentView(binding.root)
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?,
+    ): View {
+        val binding = BottomSheetContingencyMessageBinding.inflate(inflater, container, false)
         binding.contingencyMessageCloseButton.setOnClickListener { dismiss() }
         binding.contingencyMessagePrimaryButton.setOnClickListener { dismiss() }
+        return binding.root
+    }
+
+    companion object {
+        const val TAG = "ContingencyMessageBottomSheet"
+
+        fun newInstance() = ContingencyMessageBottomSheetFragment()
     }
 }

ad-blocking/ad-blocking-impl/src/main/java/com/duckduckgo/adblocking/impl/ContingencyMessageView.kt

@@ -16,11 +16,19 @@
 
 package com.duckduckgo.adblocking.impl
 
+import android.view.ViewTreeObserver
 import android.webkit.WebView
 import androidx.annotation.UiThread
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentManager
+import androidx.lifecycle.findViewTreeLifecycleOwner
+import androidx.lifecycle.lifecycleScope
 import com.duckduckgo.di.scopes.AppScope
 import com.squareup.anvil.annotations.ContributesBinding
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.suspendCancellableCoroutine
 import javax.inject.Inject
+import kotlin.coroutines.resume
 
 interface ContingencyMessageView {
     @UiThread
@@ -31,6 +39,32 @@ interface ContingencyMessageView {
 class RealContingencyMessageView @Inject constructor() : ContingencyMessageView {
 
     override fun show(webView: WebView) {
-        ContingencyMessageBottomSheet(webView.context).show()
+        val lifecycleOwner = webView.findViewTreeLifecycleOwner() ?: return
+        lifecycleOwner.lifecycleScope.launch {
+            webView.awaitWindowFocus()
+            val fragment: Fragment = FragmentManager.findFragment(webView)
+            val fragmentManager = fragment.childFragmentManager
+            if (fragmentManager.findFragmentByTag(ContingencyMessageBottomSheetFragment.TAG) == null) {
+                ContingencyMessageBottomSheetFragment.newInstance()
+                    .show(fragmentManager, ContingencyMessageBottomSheetFragment.TAG)
+            }
+        }
+    }
+}
+
+private suspend fun WebView.awaitWindowFocus() {
+    if (hasWindowFocus()) return
+    suspendCancellableCoroutine { continuation ->
+        val observer = viewTreeObserver
+        val listener = object : ViewTreeObserver.OnWindowFocusChangeListener {
+            override fun onWindowFocusChanged(hasFocus: Boolean) {
+                if (hasFocus) {
+                    observer.removeOnWindowFocusChangeListener(this)
+                    continuation.resume(Unit)
+                }
+            }
+        }
+        observer.addOnWindowFocusChangeListener(listener)
+        continuation.invokeOnCancellation { observer.removeOnWindowFocusChangeListener(listener) }
     }
 }