moved to correct callback (#2821)

Co-authored-by: Gino Miceli <228050+gino-m@users.noreply.github.com>
google · Nov 25, 2024 · cf32b10 · cf32b10
1 parent 59ae309
commit cf32b10
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/...java/com/google/android/ground/ui/offlineareas/selector/DownloadProgressDialogFragment.kt b/...java/com/google/android/ground/ui/offlineareas/selector/DownloadProgressDialogFragment.kt
@@ -44,9 +44,9 @@ class DownloadProgressDialogFragment : AbstractDialogFragment() {
   }
 
   fun setVisibility(childFragmentManager: FragmentManager, newVisibility: Boolean) {
-    if (newVisibility && !isVisible) {
+    if (newVisibility && !isAdded && !isVisible) {
       show(childFragmentManager, this::class.simpleName)
-    } else if (!newVisibility && isVisible) {
+    } else if (!newVisibility && isAdded && isVisible) {
       dismiss()
     }
   }

diff --git a/...in/java/com/google/android/ground/ui/offlineareas/selector/OfflineAreaSelectorFragment.kt b/...in/java/com/google/android/ground/ui/offlineareas/selector/OfflineAreaSelectorFragment.kt
@@ -36,15 +36,12 @@ class OfflineAreaSelectorFragment : AbstractMapContainerFragment() {
   private lateinit var viewModel: OfflineAreaSelectorViewModel
   private lateinit var mapContainerViewModel: HomeScreenMapContainerViewModel
 
-  private var downloadProgressDialogFragment = DownloadProgressDialogFragment()
+  private var downloadProgressDialogFragment: DownloadProgressDialogFragment? = null
 
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
     mapContainerViewModel = getViewModel(HomeScreenMapContainerViewModel::class.java)
     viewModel = getViewModel(OfflineAreaSelectorViewModel::class.java)
-    viewModel.isDownloadProgressVisible.observe(this) {
-      downloadProgressDialogFragment.setVisibility(childFragmentManager, it)
-    }
   }
 
   override fun onCreateView(
@@ -59,6 +56,16 @@ class OfflineAreaSelectorFragment : AbstractMapContainerFragment() {
     return binding.root
   }
 
+  override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    super.onViewCreated(view, savedInstanceState)
+    viewModel.isDownloadProgressVisible.observe(viewLifecycleOwner) {
+      if (downloadProgressDialogFragment == null) {
+        downloadProgressDialogFragment = DownloadProgressDialogFragment()
+      }
+      downloadProgressDialogFragment?.setVisibility(childFragmentManager, it)
+    }
+  }
+
   override fun onMapReady(map: MapFragment) {
     // Observe events emitted by the ViewModel.
     viewLifecycleOwner.lifecycleScope.launch {