Wrap Android dismiss methods in try-catch blocks (#449)

* Wrap Android dismiss methods in try-catch blocks * Move try-catch block to dismissDialog method
react-native-datetimepicker · May 20, 2021 · 08072ae · 08072ae
1 parent f9238ab
commit 08072ae
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/android/src/main/java/com/reactcommunity/rndatetimepicker/Common.java b/android/src/main/java/com/reactcommunity/rndatetimepicker/Common.java
@@ -16,14 +16,18 @@ public static void dismissDialog(FragmentActivity activity, String fragmentTag,
       return;
     }
 
-    FragmentManager fragmentManager = activity.getSupportFragmentManager();
-    final DialogFragment oldFragment = (DialogFragment) fragmentManager.findFragmentByTag(fragmentTag);
+    try {
+      FragmentManager fragmentManager = activity.getSupportFragmentManager();
+      final DialogFragment oldFragment = (DialogFragment) fragmentManager.findFragmentByTag(fragmentTag);
 
-    boolean fragmentFound = oldFragment != null;
-    if (fragmentFound) {
-      oldFragment.dismiss();
-    }
+      boolean fragmentFound = oldFragment != null;
+      if (fragmentFound) {
+        oldFragment.dismiss();
+      }
 
-    promise.resolve(fragmentFound);
+      promise.resolve(fragmentFound);
+    } catch (Exception e) {
+      promise.reject(e);
+    }
   }
 }