Skip to content

Commit

Permalink
[android-sdk] Auth/reuath with permissions was broken by WebDialog ch…
Browse files Browse the repository at this point in the history
…anges.

Summary: Previous change broke passing permissions parameters to auth dialog on auth/reauth requests.

Test Plan:
- Ran HelloFacebook without TOSed user, was able to log in and post status update successfully following permission
upgrade on reauth.

Revert Plan:

Reviewers: mmarucheck, mingfli, karthiks

Reviewed By: mmarucheck

Differential Revision: https://phabricator.fb.com/D634984

Blame Revision: 610413

Task ID: 1901243
  • Loading branch information
Chris Lang committed Nov 19, 2012
1 parent f1107dd commit 0627d02
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion facebook/src/com/facebook/LoginActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ private void setResultAndFinish(int resultCode, Bundle bundle) {
}
};

WebDialog.Builder builder = new Session.AuthDialogBuilder(this, getIntent().getStringExtra("client_id"))
WebDialog.Builder builder = new Session.AuthDialogBuilder(this, getIntent().getStringExtra("client_id"), parameters)
.setOnCompleteListener(listener);
builder.build().show();
}
Expand Down
6 changes: 3 additions & 3 deletions facebook/src/com/facebook/Session.java
Original file line number Diff line number Diff line change
Expand Up @@ -1301,7 +1301,7 @@ public void onComplete(Bundle values, FacebookException error) {
}
};

WebDialog.Builder builder = new Session.AuthDialogBuilder(activityContext, applicationId)
WebDialog.Builder builder = new Session.AuthDialogBuilder(activityContext, applicationId, parameters)
.setOnCompleteListener(listener);
builder.build().show();

Expand Down Expand Up @@ -2039,8 +2039,8 @@ static class AuthDialogBuilder extends WebDialog.Builder {
private static final String OAUTH_DIALOG = "oauth";
static final String REDIRECT_URI = "fbconnect://success";

public AuthDialogBuilder(Context context, String applicationId) {
super(context, applicationId, OAUTH_DIALOG, null);
public AuthDialogBuilder(Context context, String applicationId, Bundle parameters) {
super(context, applicationId, OAUTH_DIALOG, parameters);
}

@Override
Expand Down

0 comments on commit 0627d02

Please sign in to comment.