Skip to content

Commit

Permalink
Fixing DialogModule for Android SDK version before 26 (facebook#285)
Browse files Browse the repository at this point in the history
* Fixing DialogModule for Android SDK version before 26

* Adding a comment

Adding a comment .. as a workaround to retrigger Apple PR

Co-authored-by: Anandraj Govindan <anandrag@microsoft.com>
  • Loading branch information
mganandraj and mganandraj authored Mar 27, 2020
1 parent 058aa0b commit fd772ee
Showing 1 changed file with 5 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -88,14 +88,14 @@ public void showPendingAlert() {
- if (arguments.containsKey(KEY_CANCELABLE)) {
- alertFragment.setCancelable(arguments.getBoolean(KEY_CANCELABLE));
+ if(isUsingPlatformFragmentManager()) {
+ PlatformAlertFragment PlatformAlertFragment = new PlatformAlertFragment(actionListener, arguments);
+ if (mIsInForeground && !mPlatformFragmentManager.isStateSaved()) {
+ PlatformAlertFragment platformAlertFragment = new PlatformAlertFragment(actionListener, arguments);
+ if (mIsInForeground) { // isStateSaved not available in sdk v25 and lower
+ if (arguments.containsKey(KEY_CANCELABLE)) {
+ PlatformAlertFragment.setCancelable(arguments.getBoolean(KEY_CANCELABLE));
+ platformAlertFragment.setCancelable(arguments.getBoolean(KEY_CANCELABLE));
+ }
+ PlatformAlertFragment.show(mPlatformFragmentManager, FRAGMENT_TAG);
+ platformAlertFragment.show(mPlatformFragmentManager, FRAGMENT_TAG);
+ } else {
+ mFragmentToShow = PlatformAlertFragment;
+ mFragmentToShow = platformAlertFragment;
}
- alertFragment.show(mFragmentManager, FRAGMENT_TAG);
} else {
Expand Down

0 comments on commit fd772ee

Please # to comment.