jenkins-bot has submitted this change and it was merged.
Change subject: Fix possible NPE when recreating MainActivity.
......................................................................
Fix possible NPE when recreating MainActivity.
Bug: T147190
Change-Id: I8fc6993b0408dad7c493a1b53bd79b573ca85cec
---
M app/src/main/java/org/wikipedia/page/PageActivity.java
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Mholloway: Looks good to me, approved
jenkins-bot: Verified
diff --git a/app/src/main/java/org/wikipedia/page/PageActivity.java
b/app/src/main/java/org/wikipedia/page/PageActivity.java
index 95ce012..73e4d42 100644
--- a/app/src/main/java/org/wikipedia/page/PageActivity.java
+++ b/app/src/main/java/org/wikipedia/page/PageActivity.java
@@ -676,7 +676,8 @@
}
private boolean shouldRecreateMainActivity() {
- return getIntent().getAction().equals(Intent.ACTION_VIEW);
+ return getIntent().getAction() == null
+ || getIntent().getAction().equals(Intent.ACTION_VIEW);
}
private void loadMainPageIfNoTabs() {
--
To view, visit https://gerrit.wikimedia.org/r/313798
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8fc6993b0408dad7c493a1b53bd79b573ca85cec
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant <[email protected]>
Gerrit-Reviewer: BearND <[email protected]>
Gerrit-Reviewer: Brion VIBBER <[email protected]>
Gerrit-Reviewer: Mholloway <[email protected]>
Gerrit-Reviewer: Niedzielski <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
