Merge pull request #45 from Agrimap/2.x

Guard against lazy init of child fragment manager
VictorAlbertos · Jun 20, 2017 · ade5cd2 · ade5cd2
2 parents a9fd6d2 + fa2b814
commit ade5cd2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/rx_activity_result/build.gradle b/rx_activity_result/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
 group='com.github.VictorAlbertos'
-version='0.4.1-2.x'
+version='0.4.4-2.x'
 
 android {
     compileSdkVersion 25
@@ -28,3 +28,9 @@ dependencies {
 
     testCompile 'junit:junit:4.12'
 }
+
+install {
+    repositories.mavenInstaller {
+        pom.artifactId = 'RxActivityResult'
+    }
+}
diff --git a/rx_activity_result/src/main/java/rx_activity_result2/RxActivityResult.java b/rx_activity_result/src/main/java/rx_activity_result2/RxActivityResult.java
@@ -161,7 +161,7 @@ Fragment getTargetFragment(List<Fragment> fragments) {
             for (Fragment fragment : fragments) {
                 if (fragment != null && fragment.isVisible() && fragment.getClass() == clazz) {
                     return fragment;
-                } else if (fragment != null && fragment.getChildFragmentManager() != null) {
+                } else if (fragment != null && fragment.isAdded() && fragment.getChildFragmentManager() != null) {
                     List<Fragment> childFragments = fragment.getChildFragmentManager().getFragments();
                     Fragment candidate = getTargetFragment(childFragments);
                     if (candidate != null) return candidate;