Merge remote-tracking branch 'origin/feature/v1.0.0' into feature/v1.0.0

2020-01-08 11:13:48 +08:00
parent 04796d2214 6b1b06e0a8
commit 9e3e04fd81
1 changed files with 4 additions and 3 deletions
--- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
+++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
@@ -174,10 +174,11 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme

    @Override
    public void onBackPressed() {
-        super.onBackPressed();
-        if ( getSupportFragmentManager().getBackStackEntryCount() > 0 ) {
-            getSupportFragmentManager().popBackStack();
+        if ( FragmentStack.getInstance().isEmpty() ) {
+            super.onBackPressed();
+            return;
        }
+        FragmentStack.getInstance().pop();
    }

    @Override