jenkins-bot has submitted this change and it was merged.
Change subject: Fix possible crash in History and Saved Pages.
......................................................................
Fix possible crash in History and Saved Pages.
Note: this fixes the crash, but doesn't quite answer the question of why
onLoadFinished() is sometimes called with a null Cursor...
Bug: T107355
Change-Id: I6a47bc587a0bebd2ba217511c5bcac03ec8d7600
---
M wikipedia/src/main/java/org/wikipedia/history/HistoryFragment.java
M wikipedia/src/main/java/org/wikipedia/savedpages/SavedPagesFragment.java
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
BearND: Looks good to me, but someone else must approve
Sniedzielski: Looks good to me, approved
Niedzielski: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/wikipedia/src/main/java/org/wikipedia/history/HistoryFragment.java
b/wikipedia/src/main/java/org/wikipedia/history/HistoryFragment.java
index 60d25fa..4506b9a 100644
--- a/wikipedia/src/main/java/org/wikipedia/history/HistoryFragment.java
+++ b/wikipedia/src/main/java/org/wikipedia/history/HistoryFragment.java
@@ -221,7 +221,7 @@
@Override
public void onLoadFinished(Loader<Cursor> cursorLoader, Cursor cursor) {
- if (!isAdded()) {
+ if (!isAdded() || cursor == null) {
return;
}
diff --git
a/wikipedia/src/main/java/org/wikipedia/savedpages/SavedPagesFragment.java
b/wikipedia/src/main/java/org/wikipedia/savedpages/SavedPagesFragment.java
index 36f4b1b..e102423 100644
--- a/wikipedia/src/main/java/org/wikipedia/savedpages/SavedPagesFragment.java
+++ b/wikipedia/src/main/java/org/wikipedia/savedpages/SavedPagesFragment.java
@@ -250,7 +250,7 @@
@Override
public void onLoadFinished(Loader<Cursor> cursorLoader, Cursor cursor) {
- if (!isAdded()) {
+ if (!isAdded() || cursor == null) {
return;
}
--
To view, visit https://gerrit.wikimedia.org/r/227895
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6a47bc587a0bebd2ba217511c5bcac03ec8d7600
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant <dbr...@wikimedia.org>
Gerrit-Reviewer: BearND <bsitzm...@wikimedia.org>
Gerrit-Reviewer: Brion VIBBER <br...@wikimedia.org>
Gerrit-Reviewer: Dbrant <dbr...@wikimedia.org>
Gerrit-Reviewer: Mholloway <mhollo...@wikimedia.org>
Gerrit-Reviewer: Niedzielski <sniedziel...@wikimedia.org>
Gerrit-Reviewer: Sniedzielski <sniedziel...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
