Merge pull request #961 from YoKeyword/dev

v1.3.6
YoKeyword · Aug 14, 2018 · c0fed6f · c0fed6f
2 parents 018bd92 + e43ead1
commit c0fed6f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/fragmentation_core/src/main/java/me/yokeyword/fragmentation/TransactionDelegate.java b/fragmentation_core/src/main/java/me/yokeyword/fragmentation/TransactionDelegate.java
@@ -247,19 +247,23 @@ void pop(final FragmentManager fm) {
             @Override
             public void run() {
                 handleAfterSaveInStateTransactionException(fm, "pop()");
-                removeTopFragment(fm);
                 FragmentationMagician.popBackStackAllowingStateLoss(fm);
+                removeTopFragment(fm);
             }
         });
     }
 
     private void removeTopFragment(FragmentManager fm) {
-        ISupportFragment top = SupportHelper.getBackStackTopFragment(fm);
-        if (top != null) {
-            fm.beginTransaction()
-                    .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_CLOSE)
-                    .remove((Fragment) top)
-                    .commitAllowingStateLoss();
+        try { // Safe popBackStack()
+            ISupportFragment top = SupportHelper.getBackStackTopFragment(fm);
+            if (top != null) {
+                fm.beginTransaction()
+                        .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_CLOSE)
+                        .remove((Fragment) top)
+                        .commitAllowingStateLoss();
+            }
+        } catch (Exception ignored) {
+
         }
     }
 

diff --git a/fragmentation_core/src/main/java/me/yokeyword/fragmentation/queue/Action.java b/fragmentation_core/src/main/java/me/yokeyword/fragmentation/queue/Action.java
@@ -7,7 +7,7 @@
  */
 
 public abstract class Action {
-    public static final int BUFFER_TIME = 60;
+    public static final long DEFAULT_POP_TIME = 300L;
 
     public static final int ACTION_NORMAL = 0;
     public static final int ACTION_POP = 1;

diff --git a/fragmentation_core/src/main/java/me/yokeyword/fragmentation/queue/ActionQueue.java b/fragmentation_core/src/main/java/me/yokeyword/fragmentation/queue/ActionQueue.java
@@ -58,8 +58,7 @@ private void handleAction() {
     private void executeNextAction(Action action) {
         if (action.action == Action.ACTION_POP) {
             ISupportFragment top = SupportHelper.getBackStackTopFragment(action.fragmentManager);
-            if (top == null) return;
-            action.duration = top.getSupportDelegate().getExitAnimDuration();
+            action.duration = top == null ? Action.DEFAULT_POP_TIME : top.getSupportDelegate().getExitAnimDuration();
         }
 
         mMainHandler.postDelayed(new Runnable() {