jenkins-bot has submitted this change and it was merged.
Change subject: Fix possible crash when detached from activity.
......................................................................
Fix possible crash when detached from activity.
There were a couple places where an AsyncTask expects an Activity to still
be available, when it may no longer be.
Bug: 72818
Change-Id: Id2e4a17148f794b6db9c459d7a29c8c8c34d99f9
---
M wikipedia/src/main/java/org/wikipedia/nearby/NearbyFragment.java
M wikipedia/src/main/java/org/wikipedia/search/TitleSearchFragment.java
2 files changed, 9 insertions(+), 0 deletions(-)
Approvals:
BearND: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wikipedia/src/main/java/org/wikipedia/nearby/NearbyFragment.java
b/wikipedia/src/main/java/org/wikipedia/nearby/NearbyFragment.java
index 8a969b9..066c17d 100644
--- a/wikipedia/src/main/java/org/wikipedia/nearby/NearbyFragment.java
+++ b/wikipedia/src/main/java/org/wikipedia/nearby/NearbyFragment.java
@@ -317,6 +317,9 @@
new NearbyFetchTask(getActivity(), site, location) {
@Override
public void onFinish(NearbyResult result) {
+ if (!isAdded()) {
+ return;
+ }
lastResult = result;
showNearbyPages(result);
}
diff --git
a/wikipedia/src/main/java/org/wikipedia/search/TitleSearchFragment.java
b/wikipedia/src/main/java/org/wikipedia/search/TitleSearchFragment.java
index 1327af0..49dc1bc 100644
--- a/wikipedia/src/main/java/org/wikipedia/search/TitleSearchFragment.java
+++ b/wikipedia/src/main/java/org/wikipedia/search/TitleSearchFragment.java
@@ -270,6 +270,9 @@
@Override
public void onFinish(List<PageTitle> result) {
+ if (!isAdded()) {
+ return;
+ }
((PageActivity)getActivity()).setSupportProgressBarVisibility(false);
searchNetworkError.setVisibility(View.GONE);
displayResults(result);
@@ -290,6 +293,9 @@
@Override
public void onCatch(Throwable caught) {
+ if (!isAdded()) {
+ return;
+ }
((PageActivity)getActivity()).setSupportProgressBarVisibility(false);
searchNetworkError.setVisibility(View.VISIBLE);
searchResultsList.setVisibility(View.GONE);
--
To view, visit https://gerrit.wikimedia.org/r/170321
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id2e4a17148f794b6db9c459d7a29c8c8c34d99f9
Gerrit-PatchSet: 3
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: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
