jenkins-bot has submitted this change and it was merged.

Change subject: Fixed crash when fragment is detached from Activity.
......................................................................


Fixed crash when fragment is detached from Activity.

Bug: 64493
Change-Id: I214f801f92520ffedad0aafa3c15d2aa5e1524f5
---
M wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
1 file changed, 11 insertions(+), 1 deletion(-)

Approvals:
  BearND: Checked; Looks good to me, approved
  jenkins-bot: Verified



diff --git a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java 
b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
index fd73dcc..13e0b17 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
@@ -3,7 +3,7 @@
 import android.content.*;
 import android.os.*;
 import android.support.v4.app.*;
-import android.support.v4.widget.*;
+import android.util.*;
 import android.view.*;
 import android.widget.*;
 import org.json.*;
@@ -306,6 +306,11 @@
 
         @Override
         public void onFinish(List<Section> result) {
+            // have we been unwittingly detached from our Activity?
+            if (!isAdded()) {
+                Log.d("PageViewFragment", "Detached from activity, so stopping 
update.");
+                return;
+            }
             page = new Page(title, (ArrayList<Section>) result, 
pageProperties);
             editHandler.setPage(page);
             displayLeadSection();
@@ -347,6 +352,11 @@
 
         @Override
         public void onFinish(List<Section> result) {
+            // have we been unwittingly detached from our Activity?
+            if (!isAdded()) {
+                Log.d("PageViewFragment", "Detached from activity, so stopping 
update.");
+                return;
+            }
             ArrayList<Section> newSections = (ArrayList<Section>) 
page.getSections().clone();
             newSections.addAll(result);
             page = new Page(page.getTitle(), newSections, 
page.getPageProperties());

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I214f801f92520ffedad0aafa3c15d2aa5e1524f5
Gerrit-PatchSet: 2
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant <dbr...@wikimedia.org>
Gerrit-Reviewer: BearND <bsitzm...@wikimedia.org>
Gerrit-Reviewer: Yuvipanda <yuvipa...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>

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

Reply via email to