Skip to content

Commit a0ced69

Browse files
committed
fix crash because fragment maybe null !!
1 parent a80fb66 commit a0ced69

File tree

1 file changed

+10
-7
lines changed

1 file changed

+10
-7
lines changed

Diff for: flipper-backstack/src/main/java/fr/afaucogney/mobile/flipper/internal/model/BackStackLegacyExt.kt

+10-7
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,23 @@ internal fun FlipperObject.Builder.addBackStackInfo(activity: Activity): Flipper
2020
backStack.put(entry.id.toString(), "${entry.name}")
2121
}
2222
val addedFragments = FlipperObject.Builder()
23-
activity.supportFragmentManager.fragments.forEachIndexed { index, fragment ->
24-
addedFragments.put("$index", "$fragment, ${fragment.tag}")
25-
}
23+
activity.supportFragmentManager
24+
.fragments
25+
.forEachIndexed { index, fragment ->
26+
addedFragments.put("$index", "$fragment, ${fragment?.tag}")
27+
}
2628
val activeFragments = FlipperObject.Builder()
27-
activity.supportFragmentManager.getActiveFragments()?.forEachIndexed { index, fragment ->
28-
activeFragments.put("$index", "$fragment, ${fragment.tag}")
29+
activity.supportFragmentManager
30+
.getActiveFragments()
31+
?.forEachIndexed { index, fragment ->
32+
activeFragments.put("$index", "$fragment, ${fragment?.tag}")
2933
}
3034
put(
3135
BACKSTACK_LEGACY,
3236
FlipperObject.Builder()
3337
.put(
3438
FRAGMENT_MANAGER,
3539
activity.supportFragmentManager.toString()
36-
// Integer.toHexString(System.identityHashCode(activity.supportFragmentManager))
3740
)
3841
.put(ENTRIES, backStack)
3942
.put(ADDED_FRAGMENTS, addedFragments)
@@ -43,6 +46,6 @@ internal fun FlipperObject.Builder.addBackStackInfo(activity: Activity): Flipper
4346
}
4447
}
4548

46-
private fun FragmentManager.getActiveFragments(): List<Fragment>? {
49+
private fun FragmentManager.getActiveFragments(): List<Fragment?>? {
4750
return this.getPrivateFunction("getActiveFragments")
4851
}

0 commit comments

Comments
 (0)