From fd772eed163dc3323b3586fa04177356d7da072a Mon Sep 17 00:00:00 2001 From: Anandraj Date: Thu, 26 Mar 2020 19:17:45 -0700 Subject: [PATCH] Fixing DialogModule for Android SDK version before 26 (#285) * 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 --- .../facebook/react/modules/dialog/DialogModule.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/android-patches/patches-droid-office-grouped/DialogModule/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/DialogModule.java b/android-patches/patches-droid-office-grouped/DialogModule/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/DialogModule.java index bdec38194a8cf4..feb396d7653c20 100644 --- a/android-patches/patches-droid-office-grouped/DialogModule/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/DialogModule.java +++ b/android-patches/patches-droid-office-grouped/DialogModule/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/DialogModule.java @@ -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 {