Skip to content
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.

Sign up for GitHub

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

Jump to bottom

getLoginStatus return object fix #584

Merged
merged 1 commit into from Jul 25, 2014
Merged

getLoginStatus return object fix #584

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions platforms/android/src/org/apache/cordova/facebook/ConnectPlugin.java
View file
Open in desktop
Expand Up @@ -217,7 +217,7 @@ public void call(Session session, SessionState state, Exception exception) {
}
return true;
} else if (action.equals("getLoginStatus")) {
callbackContext.success(Session.getActiveSession().getState().toString());
callbackContext.success(getResponse());
return true;
} else if (action.equals("getAccessToken")) {
Session session = Session.getActiveSession();
Expand Down Expand Up @@ -569,7 +569,6 @@ public JSONObject getResponse() {
"\"expiresIn\": \""+expiresIn+"\","+
"\"session_key\": true,"+
"\"sig\": \"...\","+
"\"userId\": \""+this.userID+"\","+
"\"userID\": \""+this.userID+"\""+
"}"+
"}";
Expand Down
11 changes: 5 additions & 6 deletions ...rms/ios/HelloCordova/Plugins/com.phonegap.plugins.facebookconnect/FacebookConnectPlugin.m
View file
Open in desktop
Expand Up @@ -501,13 +501,12 @@ - (void) makeGraphCall:(NSString *)graphPath
}];
}

- (NSDictionary*) responseObject
{
NSString* status = @"unknown";
NSDictionary* sessionDict = nil;
- (NSDictionary *)responseObject {
NSString *status = @"unknown";
NSDictionary *sessionDict = nil;

NSTimeInterval expiresTimeInterval = [FBSession.activeSession.accessTokenData.expirationDate timeIntervalSinceNow];
NSString* expiresIn = @"0";
NSString *expiresIn = @"0";
if (expiresTimeInterval > 0) {
expiresIn = [NSString stringWithFormat:@"%0.0f", expiresTimeInterval];
}
Expand All @@ -521,7 +520,7 @@ - (NSDictionary*) responseObject
@"secret" : @"...",
@"session_key" : [NSNumber numberWithBool:YES],
@"sig" : @"...",
@"userID" : self.userid,
@"userID" : self.userid
};
}

Expand Down
2 changes: 1 addition & 1 deletion www/js/facebookConnectPlugin.js
View file
Open in desktop
Expand Up @@ -15,7 +15,7 @@ if (!window.cordova) {
// Try will catch errors when SDK has not been init
try {
FB.getLoginStatus(function (response) {
s(response.status);
s(response);
});
} catch (error) {
if (!f) {
Expand Down