Brion VIBBER has submitted this change and it was merged.

Change subject: Exit the activity if there is no pages left to pop.
......................................................................


Exit the activity if there is no pages left to pop.

Change-Id: Iaa5d30c986096ce7f844e63816260edb67efbb68
---
M wikipedia/src/main/java/org/wikimedia/wikipedia/PageActivity.java
1 file changed, 6 insertions(+), 1 deletion(-)

Approvals:
  Brion VIBBER: Verified; Looks good to me, approved



diff --git a/wikipedia/src/main/java/org/wikimedia/wikipedia/PageActivity.java 
b/wikipedia/src/main/java/org/wikimedia/wikipedia/PageActivity.java
index dc7e3d4..87ab957 100644
--- a/wikipedia/src/main/java/org/wikimedia/wikipedia/PageActivity.java
+++ b/wikipedia/src/main/java/org/wikimedia/wikipedia/PageActivity.java
@@ -39,7 +39,12 @@
     @Override
     public void onBackPressed() {
         if (!searchAriclesFragment.handleBackPressed()) {
-            getSupportFragmentManager().popBackStack();
+            if (getSupportFragmentManager().getBackStackEntryCount() == 0) {
+                // Everything we could pop has been popped....
+                finish();
+            } else {
+                getSupportFragmentManager().popBackStack();
+            }
         }
     }
 

-- 
To view, visit https://gerrit.wikimedia.org/r/95690
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iaa5d30c986096ce7f844e63816260edb67efbb68
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda <[email protected]>
Gerrit-Reviewer: Brion VIBBER <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to