From fb2713378142908bea0789312778c111f1df3376 Mon Sep 17 00:00:00 2001 From: Dimi Paun Date: Fri, 5 Oct 2018 20:28:13 -0400 Subject: [PATCH] Fix for #1416: set the classloader at Intent creation time. This is because the exception happens _before_ we get to read the FlowParameters from the extras/bundle. --- .../java/com/firebase/ui/auth/ui/HelperActivityBase.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/HelperActivityBase.java b/auth/src/main/java/com/firebase/ui/auth/ui/HelperActivityBase.java index c588ad30d..e6908aabf 100644 --- a/auth/src/main/java/com/firebase/ui/auth/ui/HelperActivityBase.java +++ b/auth/src/main/java/com/firebase/ui/auth/ui/HelperActivityBase.java @@ -8,6 +8,7 @@ import android.support.annotation.RestrictTo; import android.support.v7.app.AppCompatActivity; +import com.firebase.ui.auth.AuthUI; import com.firebase.ui.auth.ErrorCodes; import com.firebase.ui.auth.IdpResponse; import com.firebase.ui.auth.data.model.FlowParameters; @@ -29,11 +30,13 @@ protected static Intent createBaseIntent( @NonNull Context context, @NonNull Class target, @NonNull FlowParameters flowParams) { - return new Intent( + Intent intent = new Intent( checkNotNull(context, "context cannot be null"), checkNotNull(target, "target activity cannot be null")) .putExtra(ExtraConstants.FLOW_BUNDLE, checkNotNull(flowParams, "flowParams cannot be null").toBundle()); + intent.setExtrasClassLoader(AuthUI.class.getClassLoader()); + return intent; } @Override