Merge pull request #1027 from Teovald/3.0

Catch IllegalStateException in onAttach for v3
bumptech · Mar 4, 2016 · 82209f7 · 82209f7
2 parents 1a10191 + ac3b33a
commit 82209f7
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 8 deletions.
diff --git a/library/src/main/java/com/bumptech/glide/manager/RequestManagerFragment.java b/library/src/main/java/com/bumptech/glide/manager/RequestManagerFragment.java
@@ -5,6 +5,7 @@
 import android.app.Activity;
 import android.app.Fragment;
 import android.os.Build;
+import android.util.Log;
 
 import com.bumptech.glide.RequestManager;
 
@@ -23,6 +24,9 @@
  */
 @TargetApi(Build.VERSION_CODES.HONEYCOMB)
 public class RequestManagerFragment extends Fragment {
+
+    private static final String TAG = "RMFragment";
+
     private final ActivityFragmentLifecycle lifecycle;
     private final RequestManagerTreeNode requestManagerTreeNode = new FragmentRequestManagerTreeNode();
     private RequestManager requestManager;
@@ -114,10 +118,18 @@ private boolean isDescendant(Fragment fragment) {
     @Override
     public void onAttach(Activity activity) {
         super.onAttach(activity);
-        rootRequestManagerFragment = RequestManagerRetriever.get()
-                .getRequestManagerFragment(getActivity().getFragmentManager());
-        if (rootRequestManagerFragment != this) {
-            rootRequestManagerFragment.addChildRequestManagerFragment(this);
+        try {
+            rootRequestManagerFragment = RequestManagerRetriever.get()
+                    .getRequestManagerFragment(getActivity().getFragmentManager());
+            if (rootRequestManagerFragment != this) {
+                rootRequestManagerFragment.addChildRequestManagerFragment(this);
+            }
+        } catch (IllegalStateException e) {
+            // OnAttach can be called after the activity is destroyed, see #497.
+            if (Log.isLoggable(TAG, Log.WARN)) {
+                Log.w(TAG, "Unable to register fragment with root", e);
+
+            }
         }
     }
 

diff --git a/library/src/main/java/com/bumptech/glide/manager/SupportRequestManagerFragment.java b/library/src/main/java/com/bumptech/glide/manager/SupportRequestManagerFragment.java
@@ -3,6 +3,7 @@
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.support.v4.app.Fragment;
+import android.util.Log;
 
 import com.bumptech.glide.RequestManager;
 
@@ -20,6 +21,9 @@
  * @see com.bumptech.glide.RequestManager
  */
 public class SupportRequestManagerFragment extends Fragment {
+
+    private static final String TAG = "SupportRMFragment";
+
     private RequestManager requestManager;
     private final ActivityFragmentLifecycle lifecycle;
     private final RequestManagerTreeNode requestManagerTreeNode =
@@ -113,10 +117,18 @@ private boolean isDescendant(Fragment fragment) {
     @Override
     public void onAttach(Activity activity) {
         super.onAttach(activity);
-        rootRequestManagerFragment = RequestManagerRetriever.get()
-                .getSupportRequestManagerFragment(getActivity().getSupportFragmentManager());
-        if (rootRequestManagerFragment != this) {
-            rootRequestManagerFragment.addChildRequestManagerFragment(this);
+        try {
+            rootRequestManagerFragment = RequestManagerRetriever.get()
+                    .getSupportRequestManagerFragment(getActivity().getSupportFragmentManager());
+            if (rootRequestManagerFragment != this) {
+                rootRequestManagerFragment.addChildRequestManagerFragment(this);
+            }
+        } catch (IllegalStateException e) {
+            // OnAttach can be called after the activity is destroyed, see #497.
+            if (Log.isLoggable(TAG, Log.WARN)) {
+                Log.w(TAG, "Unable to register fragment with root", e);
+
+            }
         }
     }