From 87b022b3a80dae827a291e640ca97ceaa76bf0fa Mon Sep 17 00:00:00 2001 From: Aaron Mandle Date: Thu, 27 Oct 2016 18:00:35 -0700 Subject: [PATCH 1/6] Fix for unknown auth code --- .../main/java/com/firebase/ui/auth/ui/FlowParameters.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/FlowParameters.java b/auth/src/main/java/com/firebase/ui/auth/ui/FlowParameters.java index ca75a290b..e119887a2 100644 --- a/auth/src/main/java/com/firebase/ui/auth/ui/FlowParameters.java +++ b/auth/src/main/java/com/firebase/ui/auth/ui/FlowParameters.java @@ -89,10 +89,7 @@ public FlowParameters createFromParcel(Parcel in) { String termsOfServiceUrl = in.readString(); int smartLockEnabledInt = in.readInt(); boolean smartLockEnabled = (smartLockEnabledInt != 0); - List additionalFacebookPermissions = new ArrayList<>(); - in.readStringList(additionalFacebookPermissions); - List additionalGooglePermissions = new ArrayList<>(); - in.readStringList(additionalGooglePermissions); + return new FlowParameters( appName, providerInfo, From bc2bf1a894900026a12289eb365bff4bafa07cef Mon Sep 17 00:00:00 2001 From: Aaron Mandle Date: Thu, 27 Oct 2016 18:25:37 -0700 Subject: [PATCH 2/6] Fix for Facebook login crash in chrome custom tab --- auth/build.gradle | 2 +- common/constants.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/auth/build.gradle b/auth/build.gradle index ed3fb5830..9c959a31e 100644 --- a/auth/build.gradle +++ b/auth/build.gradle @@ -37,7 +37,7 @@ dependencies { // See https://github.com/robolectric/robolectric/issues/1932#issuecomment-219796474 testCompile 'org.khronos:opengl-api:gl1.1-android-2.1_r1' - compile 'com.facebook.android:facebook-android-sdk:4.14.1' + compile 'com.facebook.android:facebook-android-sdk:4.16.1' compile("com.twitter.sdk.android:twitter:2.0.0@aar") { transitive = true; } diff --git a/common/constants.gradle b/common/constants.gradle index 0c04cfb8c..16bff45b7 100644 --- a/common/constants.gradle +++ b/common/constants.gradle @@ -1,5 +1,5 @@ project.ext.firebase_version = '9.6.1' -project.ext.support_library_version = '25.0.0' +project.ext.support_library_version = '24.2.1' project.ext.submodules = ['database', 'auth', 'storage'] project.ext.group = 'com.firebaseui' From 80feb7273810e350427487392eb5666b783e5786 Mon Sep 17 00:00:00 2001 From: Aaron Mandle Date: Fri, 28 Oct 2016 11:07:42 -0700 Subject: [PATCH 3/6] make callback manager static --- auth/build.gradle | 2 +- .../com/firebase/ui/auth/provider/FacebookProvider.java | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/auth/build.gradle b/auth/build.gradle index 9c959a31e..ed3fb5830 100644 --- a/auth/build.gradle +++ b/auth/build.gradle @@ -37,7 +37,7 @@ dependencies { // See https://github.com/robolectric/robolectric/issues/1932#issuecomment-219796474 testCompile 'org.khronos:opengl-api:gl1.1-android-2.1_r1' - compile 'com.facebook.android:facebook-android-sdk:4.16.1' + compile 'com.facebook.android:facebook-android-sdk:4.14.1' compile("com.twitter.sdk.android:twitter:2.0.0@aar") { transitive = true; } diff --git a/auth/src/main/java/com/firebase/ui/auth/provider/FacebookProvider.java b/auth/src/main/java/com/firebase/ui/auth/provider/FacebookProvider.java index 1cdaefc7f..0813bcf42 100644 --- a/auth/src/main/java/com/firebase/ui/auth/provider/FacebookProvider.java +++ b/auth/src/main/java/com/firebase/ui/auth/provider/FacebookProvider.java @@ -38,6 +38,7 @@ import java.util.List; import org.json.JSONException; import org.json.JSONObject; +import org.w3c.dom.CDATASection; public class FacebookProvider implements IdpProvider, FacebookCallback { protected static final String ERROR = "err"; @@ -46,14 +47,12 @@ public class FacebookProvider implements IdpProvider, FacebookCallback mScopes; - private CallbackManager mCallbackManager; private IdpCallback mCallbackObject; public FacebookProvider(Context appContext, IdpConfig idpConfig) { - mCallbackManager = CallbackManager.Factory.create(); - if (appContext.getResources().getIdentifier( "facebook_permissions", "array", appContext.getPackageName()) != 0) { Log.w(TAG, "DEVELOPER WARNING: You have defined R.array.facebook_permissions but that" @@ -84,7 +83,6 @@ public String getProviderId() { @Override public void startLogin(Activity activity) { - mCallbackManager = CallbackManager.Factory.create(); LoginManager loginManager = LoginManager.getInstance(); loginManager.registerCallback(mCallbackManager, this); From ba7a28f8399a29cb11f1f4ff8fe2d65a43fedec6 Mon Sep 17 00:00:00 2001 From: Aaron Mandle Date: Fri, 28 Oct 2016 14:18:55 -0700 Subject: [PATCH 4/6] clean up for review --- .../java/com/firebase/ui/auth/provider/FacebookProvider.java | 1 - common/constants.gradle | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/auth/src/main/java/com/firebase/ui/auth/provider/FacebookProvider.java b/auth/src/main/java/com/firebase/ui/auth/provider/FacebookProvider.java index 0813bcf42..ba3dd6133 100644 --- a/auth/src/main/java/com/firebase/ui/auth/provider/FacebookProvider.java +++ b/auth/src/main/java/com/firebase/ui/auth/provider/FacebookProvider.java @@ -38,7 +38,6 @@ import java.util.List; import org.json.JSONException; import org.json.JSONObject; -import org.w3c.dom.CDATASection; public class FacebookProvider implements IdpProvider, FacebookCallback { protected static final String ERROR = "err"; diff --git a/common/constants.gradle b/common/constants.gradle index 16bff45b7..1b86a2103 100644 --- a/common/constants.gradle +++ b/common/constants.gradle @@ -1,4 +1,6 @@ project.ext.firebase_version = '9.6.1' +// use caution when updating support library version, v25.0.0 caused issues +// with the Facebook SDK. (NoSuchMethodError startActivity) project.ext.support_library_version = '24.2.1' project.ext.submodules = ['database', 'auth', 'storage'] From 41623277eab465027198257242c6a0d019832464 Mon Sep 17 00:00:00 2001 From: Aaron Mandle Date: Fri, 28 Oct 2016 14:56:07 -0700 Subject: [PATCH 5/6] add some more logging --- .../firebase/ui/auth/ui/email/EmailHintContainerActivity.java | 4 +++- auth/src/main/java/com/firebase/ui/auth/util/SmartLock.java | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/email/EmailHintContainerActivity.java b/auth/src/main/java/com/firebase/ui/auth/ui/email/EmailHintContainerActivity.java index 94b95344c..3e8a17114 100644 --- a/auth/src/main/java/com/firebase/ui/auth/ui/email/EmailHintContainerActivity.java +++ b/auth/src/main/java/com/firebase/ui/auth/ui/email/EmailHintContainerActivity.java @@ -20,6 +20,7 @@ import android.content.IntentSender; import android.os.Bundle; +import android.util.Log; import com.firebase.ui.auth.ui.AcquireEmailHelper; import com.firebase.ui.auth.ui.ActivityHelper; import com.firebase.ui.auth.ui.AppCompatBase; @@ -29,6 +30,7 @@ import com.google.android.gms.auth.api.credentials.Credential; public class EmailHintContainerActivity extends AppCompatBase { + private static final String TAG = "EmailHintContainer"; private static final int RC_HINT = 13; private AcquireEmailHelper mAcquireEmailHelper; @@ -45,7 +47,7 @@ protected void onCreate(Bundle savedInstanceState) { startIntentSenderForResult(hintIntent.getIntentSender(), RC_HINT, null, 0, 0, 0); return; } catch (IntentSender.SendIntentException e) { - e.printStackTrace(); + Log.e(TAG, "Unable to start hint intent", e); } } finish(RESULT_CANCELED, new Intent()); diff --git a/auth/src/main/java/com/firebase/ui/auth/util/SmartLock.java b/auth/src/main/java/com/firebase/ui/auth/util/SmartLock.java index e2f695d0a..92550106b 100644 --- a/auth/src/main/java/com/firebase/ui/auth/util/SmartLock.java +++ b/auth/src/main/java/com/firebase/ui/auth/util/SmartLock.java @@ -168,6 +168,7 @@ public void onResult(@NonNull Status status) { finish(); } } else { + Log.w(TAG, status.getStatusMessage()); finish(); } } From a25e61adb7fc7b2dee4cf007e6ddda3cbb9e297e Mon Sep 17 00:00:00 2001 From: Aaron Mandle Date: Tue, 1 Nov 2016 13:34:04 -0700 Subject: [PATCH 6/6] review feedback --- .../com/firebase/ui/auth/provider/FacebookProvider.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/auth/src/main/java/com/firebase/ui/auth/provider/FacebookProvider.java b/auth/src/main/java/com/firebase/ui/auth/provider/FacebookProvider.java index ba3dd6133..0a19a772e 100644 --- a/auth/src/main/java/com/firebase/ui/auth/provider/FacebookProvider.java +++ b/auth/src/main/java/com/firebase/ui/auth/provider/FacebookProvider.java @@ -46,7 +46,7 @@ public class FacebookProvider implements IdpProvider, FacebookCallback mScopes; private IdpCallback mCallbackObject; @@ -83,7 +83,7 @@ public String getProviderId() { @Override public void startLogin(Activity activity) { LoginManager loginManager = LoginManager.getInstance(); - loginManager.registerCallback(mCallbackManager, this); + loginManager.registerCallback(sCallbackManager, this); List permissionsList = new ArrayList<>(mScopes); @@ -107,7 +107,7 @@ public void setAuthenticationCallback(IdpCallback callback) { @Override public void onActivityResult(int requestCode, int resultCode, Intent data) { - mCallbackManager.onActivityResult(requestCode, resultCode, data); + sCallbackManager.onActivityResult(requestCode, resultCode, data); } @Override