Skip to content

Commit 72f884d

Browse files
SUPERCILEXsamtstern
authored andcommitted
Fix NPE getting fragment manager (#821)
Signed-off-by: Alex Saveau <[email protected]>
1 parent 9440888 commit 72f884d

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

auth/src/main/java/com/firebase/ui/auth/util/signincontainer/IdpSignInContainer.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
package com.firebase.ui.auth.util.signincontainer;
1616

17+
import android.content.Context;
1718
import android.content.Intent;
1819
import android.os.Bundle;
1920
import android.support.annotation.Nullable;
@@ -27,6 +28,7 @@
2728
import com.firebase.ui.auth.ErrorCodes;
2829
import com.firebase.ui.auth.IdpResponse;
2930
import com.firebase.ui.auth.ResultCodes;
31+
import com.firebase.ui.auth.User;
3032
import com.firebase.ui.auth.provider.FacebookProvider;
3133
import com.firebase.ui.auth.provider.GoogleProvider;
3234
import com.firebase.ui.auth.provider.IdpProvider;
@@ -38,7 +40,6 @@
3840
import com.firebase.ui.auth.ui.FragmentBase;
3941
import com.firebase.ui.auth.ui.HelperActivityBase;
4042
import com.firebase.ui.auth.ui.TaskFailureLogger;
41-
import com.firebase.ui.auth.User;
4243
import com.firebase.ui.auth.ui.idp.CredentialSignInHandler;
4344
import com.google.firebase.auth.AuthCredential;
4445
import com.google.firebase.auth.FacebookAuthProvider;
@@ -82,6 +83,16 @@ public static IdpSignInContainer getInstance(FragmentActivity activity) {
8283
}
8384
}
8485

86+
@Override
87+
public void onAttach(Context context) {
88+
super.onAttach(context);
89+
if (!(getActivity() instanceof HelperActivityBase)) {
90+
throw new RuntimeException("Can only attach IdpSignInContainer to HelperActivityBase.");
91+
}
92+
93+
mActivity = (HelperActivityBase) getActivity();
94+
}
95+
8596
@Override
8697
public void onCreate(@Nullable Bundle savedInstanceState) {
8798
super.onCreate(savedInstanceState);
@@ -122,17 +133,6 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
122133
}
123134
}
124135

125-
@Override
126-
public void onActivityCreated(@Nullable Bundle savedInstanceState) {
127-
super.onActivityCreated(savedInstanceState);
128-
129-
if (!(getActivity() instanceof HelperActivityBase)) {
130-
throw new RuntimeException("Can only attach IdpSignInContainer to HelperActivityBase.");
131-
}
132-
133-
mActivity = (HelperActivityBase) getActivity();
134-
}
135-
136136
@Override
137137
public void onSaveInstanceState(Bundle outState) {
138138
outState.putBoolean(ExtraConstants.HAS_EXISTING_INSTANCE, true);

0 commit comments

Comments
 (0)