Commit CoperFragment only before onStateSaved (#44)

vinted · May 22, 2024 · 52f32c5 · 52f32c5
1 parent cdfc590
commit 52f32c5
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/library/src/main/java/com/vinted/coper/CoperImpl.kt b/library/src/main/java/com/vinted/coper/CoperImpl.kt
@@ -106,13 +106,17 @@ internal class CoperImpl(
         fragmentManager: FragmentManager
     ): CoperFragment {
         return suspendCancellableCoroutine { continuation ->
-            fragmentManager.beginTransaction()
-                .add(this, FRAGMENT_TAG)
-                .runOnCommit {
-                    continuation.resume(this)
-                }
-                .commit()
-            _latestCommittedFragmentFlow.value = this
+            if (!fragmentManager.isStateSaved) {
+                fragmentManager.beginTransaction()
+                    .add(this, FRAGMENT_TAG)
+                    .runOnCommit {
+                        continuation.resume(this)
+                    }
+                    .commit()
+                _latestCommittedFragmentFlow.value = this
+            } else {
+                continuation.cancel()
+            }
         }
     }