Skip to content

Fix issues found by round of manual test #383

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Nov 1, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,12 @@ public class FacebookProvider implements IdpProvider, FacebookCallback<LoginResu
private static final String TAG = "FacebookProvider";
private static final String EMAIL = "email";
private static final String PUBLIC_PROFILE = "public_profile";
private static final CallbackManager sCallbackManager = CallbackManager.Factory.create();

private final List<String> 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"
Expand Down Expand Up @@ -84,9 +82,8 @@ public String getProviderId() {

@Override
public void startLogin(Activity activity) {
mCallbackManager = CallbackManager.Factory.create();
LoginManager loginManager = LoginManager.getInstance();
loginManager.registerCallback(mCallbackManager, this);
loginManager.registerCallback(sCallbackManager, this);

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

Expand All @@ -110,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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,10 +89,7 @@ public FlowParameters createFromParcel(Parcel in) {
String termsOfServiceUrl = in.readString();
int smartLockEnabledInt = in.readInt();
boolean smartLockEnabled = (smartLockEnabledInt != 0);
List<String> additionalFacebookPermissions = new ArrayList<>();
in.readStringList(additionalFacebookPermissions);
List<String> additionalGooglePermissions = new ArrayList<>();
in.readStringList(additionalGooglePermissions);

return new FlowParameters(
appName,
providerInfo,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;

Expand All @@ -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());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@ public void onResult(@NonNull Status status) {
finish();
}
} else {
Log.w(TAG, status.getStatusMessage());
finish();
}
}
Expand Down
4 changes: 3 additions & 1 deletion common/constants.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
project.ext.firebase_version = '9.6.1'
project.ext.support_library_version = '25.0.0'
// 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']
project.ext.group = 'com.firebaseui'
Expand Down