Skip to content

Commit cce75a8

Browse files
authored
Fix issues found by round of manual test (#383)
* Fix for unknown auth code * Fix for Facebook login crash in chrome custom tab * make callback manager static * clean up for review * add some more logging * review feedback
1 parent f9d4ab6 commit cce75a8

File tree

5 files changed

+11
-12
lines changed

5 files changed

+11
-12
lines changed

auth/src/main/java/com/firebase/ui/auth/provider/FacebookProvider.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,12 @@ public class FacebookProvider implements IdpProvider, FacebookCallback<LoginResu
4646
private static final String TAG = "FacebookProvider";
4747
private static final String EMAIL = "email";
4848
private static final String PUBLIC_PROFILE = "public_profile";
49+
private static final CallbackManager sCallbackManager = CallbackManager.Factory.create();
4950

5051
private final List<String> mScopes;
51-
private CallbackManager mCallbackManager;
5252
private IdpCallback mCallbackObject;
5353

5454
public FacebookProvider(Context appContext, IdpConfig idpConfig) {
55-
mCallbackManager = CallbackManager.Factory.create();
56-
5755
if (appContext.getResources().getIdentifier(
5856
"facebook_permissions", "array", appContext.getPackageName()) != 0) {
5957
Log.w(TAG, "DEVELOPER WARNING: You have defined R.array.facebook_permissions but that"
@@ -84,9 +82,8 @@ public String getProviderId() {
8482

8583
@Override
8684
public void startLogin(Activity activity) {
87-
mCallbackManager = CallbackManager.Factory.create();
8885
LoginManager loginManager = LoginManager.getInstance();
89-
loginManager.registerCallback(mCallbackManager, this);
86+
loginManager.registerCallback(sCallbackManager, this);
9087

9188
List<String> permissionsList = new ArrayList<>(mScopes);
9289

@@ -110,7 +107,7 @@ public void setAuthenticationCallback(IdpCallback callback) {
110107

111108
@Override
112109
public void onActivityResult(int requestCode, int resultCode, Intent data) {
113-
mCallbackManager.onActivityResult(requestCode, resultCode, data);
110+
sCallbackManager.onActivityResult(requestCode, resultCode, data);
114111
}
115112

116113
@Override

auth/src/main/java/com/firebase/ui/auth/ui/FlowParameters.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,7 @@ public FlowParameters createFromParcel(Parcel in) {
8989
String termsOfServiceUrl = in.readString();
9090
int smartLockEnabledInt = in.readInt();
9191
boolean smartLockEnabled = (smartLockEnabledInt != 0);
92-
List<String> additionalFacebookPermissions = new ArrayList<>();
93-
in.readStringList(additionalFacebookPermissions);
94-
List<String> additionalGooglePermissions = new ArrayList<>();
95-
in.readStringList(additionalGooglePermissions);
92+
9693
return new FlowParameters(
9794
appName,
9895
providerInfo,

auth/src/main/java/com/firebase/ui/auth/ui/email/EmailHintContainerActivity.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import android.content.IntentSender;
2121
import android.os.Bundle;
2222

23+
import android.util.Log;
2324
import com.firebase.ui.auth.ui.AcquireEmailHelper;
2425
import com.firebase.ui.auth.ui.ActivityHelper;
2526
import com.firebase.ui.auth.ui.AppCompatBase;
@@ -29,6 +30,7 @@
2930
import com.google.android.gms.auth.api.credentials.Credential;
3031

3132
public class EmailHintContainerActivity extends AppCompatBase {
33+
private static final String TAG = "EmailHintContainer";
3234
private static final int RC_HINT = 13;
3335
private AcquireEmailHelper mAcquireEmailHelper;
3436

@@ -45,7 +47,7 @@ protected void onCreate(Bundle savedInstanceState) {
4547
startIntentSenderForResult(hintIntent.getIntentSender(), RC_HINT, null, 0, 0, 0);
4648
return;
4749
} catch (IntentSender.SendIntentException e) {
48-
e.printStackTrace();
50+
Log.e(TAG, "Unable to start hint intent", e);
4951
}
5052
}
5153
finish(RESULT_CANCELED, new Intent());

auth/src/main/java/com/firebase/ui/auth/util/SmartLock.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,7 @@ public void onResult(@NonNull Status status) {
168168
finish();
169169
}
170170
} else {
171+
Log.w(TAG, status.getStatusMessage());
171172
finish();
172173
}
173174
}

common/constants.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
project.ext.firebase_version = '9.6.1'
2-
project.ext.support_library_version = '25.0.0'
2+
// use caution when updating support library version, v25.0.0 caused issues
3+
// with the Facebook SDK. (NoSuchMethodError startActivity)
4+
project.ext.support_library_version = '24.2.1'
35

46
project.ext.submodules = ['database', 'auth', 'storage']
57
project.ext.group = 'com.firebaseui'

0 commit comments

Comments
 (0)