[MediaWiki-commits] [Gerrit] Back button goes back to calling activity from onboarding ac... - change (apps...wikipedia)

[BearND (Code Review)]

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/180401

Change subject: Back button goes back to calling activity from onboarding 
activity
......................................................................

Back button goes back to calling activity from onboarding activity

Change-Id: I13695441c202dfcecfee462599fc70ae1fa9eb37
---
M wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
1 file changed, 5 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/01/180401/1

diff --git a/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java 
b/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
index f575abd..ac6ee9c 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
@@ -65,6 +65,7 @@
     public static final int ACTIVITY_REQUEST_LANGLINKS = 0;
     public static final int ACTIVITY_REQUEST_EDIT_SECTION = 1;
     public static final int ACTIVITY_REQUEST_GALLERY = 2;
+    public static final int ACTIVITY_REQUEST_ONBOARDING = 3;
 
     private Bus bus;
     private WikipediaApp app;
@@ -237,7 +238,8 @@
         new RecurringTasksExecutor(this).run();
 
         if (showOnboarding()) {
-            startActivity(new Intent(this, OnboardingActivity.class));
+            startActivityForResult(new Intent(this, OnboardingActivity.class),
+                    ACTIVITY_REQUEST_ONBOARDING);
         }
     }
 
@@ -711,6 +713,8 @@
                     handleIntent(data);
                 }
             });
+        } else if (requestCode == ACTIVITY_REQUEST_ONBOARDING) {
+            finish();
         } else {
             super.onActivityResult(requestCode, resultCode, data);
         }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I13695441c202dfcecfee462599fc70ae1fa9eb37
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: BearND <bsitzm...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits