From ef4f5fe00216916352b1120355ffc4825cb0de2b Mon Sep 17 00:00:00 2001 From: Sam Date: Thu, 11 Oct 2018 23:39:46 -0500 Subject: [PATCH 1/2] =?UTF-8?q?Revert=20"Fix=20#1416=20-=20Wrap=20flow=20p?= =?UTF-8?q?arams=20into=20a=20Bundle=20to=20avoid=20a=20ClassNotFoundEx?= =?UTF-8?q?=E2=80=A6=20(#1453)"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 1f3b18e1646704792804072e89f04d27b207e886. --- .../firebase/ui/auth/data/model/FlowParameters.java | 11 ++--------- .../com/firebase/ui/auth/ui/HelperActivityBase.java | 4 ++-- .../com/firebase/ui/auth/util/ExtraConstants.java | 1 - .../test/java/com/firebase/ui/auth/AuthUITest.java | 10 ++++++---- 4 files changed, 10 insertions(+), 16 deletions(-) diff --git a/auth/src/main/java/com/firebase/ui/auth/data/model/FlowParameters.java b/auth/src/main/java/com/firebase/ui/auth/data/model/FlowParameters.java index 73a5b40fb..e5679f35b 100644 --- a/auth/src/main/java/com/firebase/ui/auth/data/model/FlowParameters.java +++ b/auth/src/main/java/com/firebase/ui/auth/data/model/FlowParameters.java @@ -14,7 +14,6 @@ package com.firebase.ui.auth.data.model; import android.content.Intent; -import android.os.Bundle; import android.os.Parcel; import android.os.Parcelable; import android.support.annotation.DrawableRes; @@ -89,14 +88,8 @@ public FlowParameters( */ public static FlowParameters fromIntent(Intent intent) { //this is required to fix #1416 - ClassNotFound for FlowParameters - Bundle bundle = intent.getBundleExtra(ExtraConstants.FLOW_BUNDLE); - return bundle.getParcelable(ExtraConstants.FLOW_PARAMS); - } - - public Bundle toBundle() { - Bundle bundle = new Bundle(); - bundle.putParcelable(ExtraConstants.FLOW_PARAMS, this); - return bundle; + intent.setExtrasClassLoader(AuthUI.class.getClassLoader()); + return intent.getParcelableExtra(ExtraConstants.FLOW_PARAMS); } @Override 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 e6908aabf..658f73530 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 @@ -33,8 +33,8 @@ protected static Intent createBaseIntent( 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()); + .putExtra(ExtraConstants.FLOW_PARAMS, + checkNotNull(flowParams, "flowParams cannot be null")); intent.setExtrasClassLoader(AuthUI.class.getClassLoader()); return intent; } diff --git a/auth/src/main/java/com/firebase/ui/auth/util/ExtraConstants.java b/auth/src/main/java/com/firebase/ui/auth/util/ExtraConstants.java index 72b44e15f..96e5a6627 100644 --- a/auth/src/main/java/com/firebase/ui/auth/util/ExtraConstants.java +++ b/auth/src/main/java/com/firebase/ui/auth/util/ExtraConstants.java @@ -21,7 +21,6 @@ */ @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) public final class ExtraConstants { - public static final String FLOW_BUNDLE = "extra_flow_bundle"; public static final String FLOW_PARAMS = "extra_flow_params"; public static final String IDP_RESPONSE = "extra_idp_response"; public static final String USER = "extra_user"; diff --git a/auth/src/test/java/com/firebase/ui/auth/AuthUITest.java b/auth/src/test/java/com/firebase/ui/auth/AuthUITest.java index d7d1e0551..f5ef5d526 100644 --- a/auth/src/test/java/com/firebase/ui/auth/AuthUITest.java +++ b/auth/src/test/java/com/firebase/ui/auth/AuthUITest.java @@ -45,9 +45,10 @@ public void setUp() { @Test public void testCreateStartIntent_shouldHaveEmailAsDefaultProvider() { - FlowParameters flowParameters = FlowParameters.fromIntent(mAuthUi + FlowParameters flowParameters = mAuthUi .createSignInIntentBuilder() - .build()); + .build() + .getParcelableExtra(ExtraConstants.FLOW_PARAMS); assertEquals(1, flowParameters.providers.size()); assertEquals(EmailAuthProvider.PROVIDER_ID, flowParameters.providers.get(0).getProviderId()); @@ -63,7 +64,7 @@ public void testCreateStartIntent_shouldOnlyAllowOneInstanceOfAnIdp() { @Test public void testCreatingStartIntent() { - FlowParameters flowParameters = FlowParameters.fromIntent(mAuthUi + FlowParameters flowParameters = mAuthUi .createSignInIntentBuilder() .setAvailableProviders(Arrays.asList( new IdpConfig.EmailBuilder().build(), @@ -71,7 +72,8 @@ public void testCreatingStartIntent() { new IdpConfig.FacebookBuilder().build(), new IdpConfig.AnonymousBuilder().build())) .setTosAndPrivacyPolicyUrls(TestConstants.TOS_URL, TestConstants.PRIVACY_URL) - .build()); + .build() + .getParcelableExtra(ExtraConstants.FLOW_PARAMS); assertEquals(4, flowParameters.providers.size()); assertEquals(TestHelper.MOCK_APP.getName(), flowParameters.appName); From 53dbef7d16aeba08b45ba852c2fde6e6effe1731 Mon Sep 17 00:00:00 2001 From: Sam Date: Thu, 11 Oct 2018 23:40:09 -0500 Subject: [PATCH 2/2] Revert "fix #1416 - ClassNotFound for FlowParameters (#1451)" This reverts commit 0786884eab33c7a41091d66d20149bc25d49353a. --- .../java/com/firebase/ui/auth/data/model/FlowParameters.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/auth/src/main/java/com/firebase/ui/auth/data/model/FlowParameters.java b/auth/src/main/java/com/firebase/ui/auth/data/model/FlowParameters.java index e5679f35b..c05398360 100644 --- a/auth/src/main/java/com/firebase/ui/auth/data/model/FlowParameters.java +++ b/auth/src/main/java/com/firebase/ui/auth/data/model/FlowParameters.java @@ -87,8 +87,6 @@ public FlowParameters( * Extract FlowParameters from an Intent. */ public static FlowParameters fromIntent(Intent intent) { - //this is required to fix #1416 - ClassNotFound for FlowParameters - intent.setExtrasClassLoader(AuthUI.class.getClassLoader()); return intent.getParcelableExtra(ExtraConstants.FLOW_PARAMS); }